Browse Source

Applied easy review feedback

Samuel Maier 3 years ago
parent
commit
f859a2016d
1 changed files with 13 additions and 16 deletions
  1. 13 16
      src/App.tsx

+ 13 - 16
src/App.tsx

@@ -46,12 +46,13 @@ function getWsUri(id: string) {
   );
   );
 }
 }
 
 
-function useKeyboardCtrlIntercept(key: string, reaction: (evt: KeyboardEvent) => unknown) {
+function useKeyboardCtrlIntercept(key: string, reaction: (event: KeyboardEvent) => unknown) {
   useEffect(() => {
   useEffect(() => {
-    const wrappedReaction: typeof reaction = (evt) => {
-      if (!(evt.ctrlKey && evt.key.toLowerCase() === key.toLowerCase())) return;
-      evt.preventDefault();
-      reaction(evt);
+    const wrappedReaction: typeof reaction = (event) => {
+      if (!(event.metaKey || event.ctrlKey)) return;
+      if (event.key.toLowerCase() !== key.toLowerCase()) return;
+      event.preventDefault();
+      reaction(event);
     }
     }
     const controller = new AbortController();
     const controller = new AbortController();
     window.addEventListener("keydown", wrappedReaction, {signal: controller.signal});
     window.addEventListener("keydown", wrappedReaction, {signal: controller.signal});
@@ -76,7 +77,6 @@ function generateHue() {
  */
  */
 function downloadUri(uri: string, filename: string) {
 function downloadUri(uri: string, filename: string) {
   const downloadAnchor = document.createElement("a");
   const downloadAnchor = document.createElement("a");
-  console.log(filename);
   downloadAnchor.download = filename;
   downloadAnchor.download = filename;
   downloadAnchor.href = uri;
   downloadAnchor.href = uri;
   downloadAnchor.click();
   downloadAnchor.click();
@@ -85,7 +85,7 @@ function downloadUri(uri: string, filename: string) {
 async function eventToAsync<EventType extends keyof HTMLElementEventMap>(element: HTMLElement, eventType: EventType) {
 async function eventToAsync<EventType extends keyof HTMLElementEventMap>(element: HTMLElement, eventType: EventType) {
   const abortController = new AbortController();
   const abortController = new AbortController();
   const evt = await new Promise<HTMLElementEventMap[EventType]>((resolve) => {
   const evt = await new Promise<HTMLElementEventMap[EventType]>((resolve) => {
-    element.addEventListener(eventType, (evt) => resolve(evt), {signal: abortController.signal});
+    element.addEventListener(eventType, (event) => resolve(event), {signal: abortController.signal});
   })
   })
   abortController.abort();
   abortController.abort();
   return evt;
   return evt;
@@ -244,10 +244,10 @@ function App() {
       overflow="hidden"
       overflow="hidden"
       bgColor={darkMode ? "#1e1e1e" : "white"}
       bgColor={darkMode ? "#1e1e1e" : "white"}
       color={darkMode ? "#cbcaca" : "inherit"}
       color={darkMode ? "#cbcaca" : "inherit"}
-      onDragOver={(evt) => evt.preventDefault()}
-      onDrop={(evt) => {
-        evt.preventDefault();
-        const dragItems = evt.dataTransfer.items;
+      onDragOver={(event) => event.preventDefault()}
+      onDrop={(event) => {
+        event.preventDefault();
+        const dragItems = event.dataTransfer.items;
         if (dragItems.length !== 1) return;
         if (dragItems.length !== 1) return;
         const file = dragItems[0].getAsFile();
         const file = dragItems[0].getAsFile();
         if (file === null) return;
         if (file === null) return;
@@ -322,9 +322,6 @@ function App() {
             </InputRightElement>
             </InputRightElement>
           </InputGroup>
           </InputGroup>
 
 
-          {/* TODO:
-          * * Test
-          * */}
           <Heading mt={4} mb={1.5} size="sm">
           <Heading mt={4} mb={1.5} size="sm">
             Upload & Download 
             Upload & Download 
           </Heading>
           </Heading>
@@ -361,8 +358,8 @@ function App() {
                 leftIcon={<VscCloudDownload />}
                 leftIcon={<VscCloudDownload />}
                 mt={1}
                 mt={1}
                 flex="auto"
                 flex="auto"
-                onClick={(evt) => {
-                  evt.preventDefault();
+                onClick={(event) => {
+                  event.preventDefault();
                   handleDownloadFile();
                   handleDownloadFile();
                 }}
                 }}
               >
               >