feat: added new hot key hook since useKey doesnt ignore special keys

replaced all alpha numeric shortcuts

ts/components/buttons/CopyToClipboardButton.tsx

@@ -1,7 +1,7 @@
 import { isEmpty } from 'lodash';
 import { useState } from 'react';
 import useCopyToClipboard from 'react-use/lib/useCopyToClipboard';
-import useKey from 'react-use/lib/useKey';
+import { useHotkey } from '../../hooks/useHotkey';
 import { ToastUtils } from '../../session/utils';
 import { SessionButton, SessionButtonProps } from '../basic/SessionButton';
 import { SessionIconButton } from '../icon';
@@ -30,17 +30,7 @@ export const CopyToClipboardButton = (props: CopyToClipboardButtonProps) => {
     }
   };
 
-  useKey(
+  useHotkey('c', onClick, !hotkey);
-    (event: KeyboardEvent) => {
-      return event.key === 'c';
-    },
-    () => {
-      if (!hotkey) {
-        return;
-      }
-      onClick();
-    }
-  );
 
   return (
     <SessionButton
@@ -73,17 +63,7 @@ export const CopyToClipboardIcon = (props: CopyToClipboardIconProps) => {
     }
   };
 
-  useKey(
+  useHotkey('c', onClick, !hotkey);
-    (event: KeyboardEvent) => {
-      return event.key === 'c';
-    },
-    () => {
-      if (!hotkey) {
-        return;
-      }
-      onClick();
-    }
-  );
 
   return (
     <SessionIconButton

ts/components/dialog/EnterPasswordModal.tsx

@@ -2,7 +2,6 @@ import { useDispatch } from 'react-redux';
 import styled from 'styled-components';
 
 import { useRef } from 'react';
-import useKey from 'react-use/lib/useKey';
 import useMount from 'react-use/lib/useMount';
 import { ToastUtils } from '../../session/utils';
 import { matchesHash } from '../../util/passwordUtils';
@@ -10,6 +9,7 @@ import { matchesHash } from '../../util/passwordUtils';
 import { updateEnterPasswordModal } from '../../state/ducks/modalDialog';
 import { SpacerSM } from '../basic/Text';
 
+import { useHotkey } from '../../hooks/useHotkey';
 import { SessionWrapperModal } from '../SessionWrapperModal';
 import { SessionButton, SessionButtonColor, SessionButtonType } from '../basic/SessionButton';
 
@@ -65,16 +65,11 @@ export const EnterPasswordModal = (props: EnterPasswordModalProps) => {
     }
   });
 
-  useKey(
+  useHotkey('Enter', (event: KeyboardEvent) => {
-    (event: KeyboardEvent) => event.key === 'Enter',
+    if (event.target === passwordInputRef.current) {
-    (event: KeyboardEvent) => {
+      confirmPassword();
-      if (event.key === 'Enter') {
-        if (event.target === passwordInputRef.current) {
-          confirmPassword();
-        }
-      }
     }
-  );
+  });
 
   return (
     <SessionWrapperModal

ts/components/dialog/edit-profile/EditProfileDialog.tsx

@@ -1,13 +1,13 @@
 import { isEmpty } from 'lodash';
 import { RefObject, useRef, useState } from 'react';
 import { useDispatch } from 'react-redux';
-import useKey from 'react-use/lib/useKey';
 import styled from 'styled-components';
 
 import { Dispatch } from '@reduxjs/toolkit';
 import { SyncUtils, UserUtils } from '../../../session/utils';
 import { YourSessionIDPill, YourSessionIDSelectable } from '../../basic/YourSessionIDPill';
 
+import { useHotkey } from '../../../hooks/useHotkey';
 import { useOurAvatarPath, useOurConversationUsername } from '../../../hooks/useParamSelector';
 import { ConversationTypeEnum } from '../../../models/conversationAttributes';
 import { getConversationController } from '../../../session/conversations';
@@ -65,36 +65,34 @@ const handleKeyEditMode = (
   }
 };
 
-const handleKeyCancel =
+const handleKeyCancel = (
-  (
+  mode: ProfileDialogModes,
-    mode: ProfileDialogModes,
+  setMode: (mode: ProfileDialogModes) => void,
-    setMode: (mode: ProfileDialogModes) => void,
+  inputRef: RefObject<HTMLInputElement>,
-    inputRef: RefObject<HTMLInputElement>,
+  updatedProfileName: string,
-    updatedProfileName: string,
+  setProfileName: (name: string) => void,
-    setProfileName: (name: string) => void,
+  setProfileNameError: (error: string | undefined) => void,
-    setProfileNameError: (error: string | undefined) => void,
+  loading: boolean
-    loading: boolean
+) => {
-  ) =>
+  if (loading) {
-  () => {
+    return;
-    if (loading) {
+  }
-      return;
+  switch (mode) {
-    }
+    case 'edit':
-    switch (mode) {
+    case 'qr':
-      case 'edit':
+      if (inputRef.current !== null && document.activeElement === inputRef.current) {
-      case 'qr':
+        return;
-        if (inputRef.current !== null && document.activeElement === inputRef.current) {
+      }
-          return;
+      setMode('default');
-        }
+      if (mode === 'edit') {
-        setMode('default');
+        setProfileNameError(undefined);
-        if (mode === 'edit') {
+        setProfileName(updatedProfileName);
-          setProfileNameError(undefined);
+      }
-          setProfileName(updatedProfileName);
+      break;
-        }
+    case 'default':
-        break;
+    default:
-      case 'default':
+  }
-      default:
+};
-    }
-  };
 
 const handleKeyEscape = (
   mode: ProfileDialogModes,
@@ -249,50 +247,35 @@ export const EditProfileDialog = () => {
     );
   };
 
-  useKey(
+  useHotkey('v', () => handleKeyQRMode(mode, setMode, loading), loading);
-    (event: KeyboardEvent) => {
+  useHotkey('Enter', () => handleKeyEditMode(mode, setMode, onClickOK, loading), loading);
-      return (
+  useHotkey(
-        event.key === 'v' ||
+    'Backspace',
-        event.key === 'Enter' ||
+    () =>
-        event.key === 'Backspace' ||
+      handleKeyCancel(
-        event.key === 'Esc' ||
+        mode,
-        event.key === 'Escape'
+        setMode,
-      );
+        inputRef,
-    },
+        updatedProfileName,
-    (event: KeyboardEvent) => {
+        setProfileName,
-      switch (event.key) {
+        setProfileNameError,
-        case 'v':
+        loading
-          handleKeyQRMode(mode, setMode, loading);
+      ),
-          break;
+    loading
-        case 'Enter':
+  );
-          handleKeyEditMode(mode, setMode, onClickOK, loading);
+  useHotkey(
-          break;
+    'Escape',
-        case 'Backspace':
+    () =>
-          handleKeyCancel(
+      handleKeyEscape(
-            mode,
+        mode,
-            setMode,
+        setMode,
-            inputRef,
+        updatedProfileName,
-            updatedProfileName,
+        setProfileName,
-            setProfileName,
+        setProfileNameError,
-            setProfileNameError,
+        loading,
-            loading
+        dispatch
-          );
+      ),
-          break;
+    loading
-        case 'Esc':
-        case 'Escape':
-          handleKeyEscape(
-            mode,
-            setMode,
-            updatedProfileName,
-            setProfileName,
-            setProfileNameError,
-            loading,
-            dispatch
-          );
-          break;
-        default:
-      }
-    }
   );
 
   return (

ts/hooks/useHotkey.tsx

@@ -0,0 +1,66 @@
+import useKey, { Handler, KeyPredicate, UseKeyOptions } from 'react-use/lib/useKey';
+
+function specialKeyPressed(event: KeyboardEvent) {
+  const pressed = [];
+
+  if (event.metaKey) {
+    pressed.push('super');
+  }
+  if (event.ctrlKey) {
+    pressed.push('ctrl');
+  }
+  if (event.altKey) {
+    pressed.push('alt');
+  }
+  if (event.shiftKey) {
+    pressed.push('shift');
+  }
+
+  return pressed.join(' + ');
+}
+
+export function useHotkey(
+  key: string,
+  onPress: (event: KeyboardEvent) => void | Promise<void>,
+  disabled?: boolean
+) {
+  const opts: UseKeyOptions<HTMLElement> = {};
+
+  const predicate: KeyPredicate = event => {
+    const lowerKey = key.toLowerCase();
+    const eventKey = event.key.toLowerCase();
+
+    window.log.debug(
+      `WIP: [useHotkey] key: ${key} lowerKey: ${lowerKey} eventKey: ${eventKey} event.target: ${JSON.stringify(event)}`
+    );
+
+    switch (lowerKey) {
+      case 'esc':
+      case 'escape':
+        return eventKey === 'escape' || eventKey === 'esc';
+      default:
+        return eventKey === lowerKey;
+    }
+  };
+
+  const handler: Handler = event => {
+    if (disabled) {
+      window.log.debug(`WIP: [useHotkey] '${key}' is disabled. Triggered by ${event.key}`);
+      return;
+    }
+
+    const specialKeys = specialKeyPressed(event);
+
+    if (specialKeys) {
+      window.log.debug(
+        `WIP: [useHotkey] '${key}' was ignored because it was pressed with ${specialKeys}. Triggered by ${event.key} + ${specialKeys}`
+      );
+      return;
+    }
+
+    window.log.debug(`WIP: [useHotkey] '${key}' onPress event. Triggered by ${event.key}`);
+    void onPress(event);
+  };
+
+  useKey(predicate, handler, opts);
+}