Handle shortcuts for single key shortcut and Ctrl or Meta combinations

Lemoncode · Sep 13, 2024 · 7c0bc3b · 7c0bc3b
1 parent 502dad6
commit 7c0bc3b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/src/pods/toolbar/shortcut/shortcut.const.ts b/src/pods/toolbar/shortcut/shortcut.const.ts
@@ -8,31 +8,31 @@ export const SHORTCUTS: Shortcut = {
   delete: {
     description: 'Delete',
     id: 'delete-button-shortcut',
-    targetKey: ['Backspace'],
+    targetKey: ['backspace'],
     targetKeyLabel: 'Backspace',
   },
   copy: {
     description: 'Copy',
     id: 'copy-button-shortcut',
-    targetKey: ['c'],
+    targetKey: ['Ctrl+c', 'Meta+c'],
     targetKeyLabel: 'Ctrl + C',
   },
   paste: {
     description: 'Paste',
     id: 'paste-button-shortcut',
-    targetKey: ['v'],
+    targetKey: ['Ctrl+v', 'Meta+v'],
     targetKeyLabel: 'Ctrl + V',
   },
   undo: {
     description: 'Undo',
     id: 'undo-button-shortcut',
-    targetKey: ['z'],
+    targetKey: ['Ctrl+z', 'Meta+z'],
     targetKeyLabel: 'Ctrl + Z',
   },
   redo: {
     description: 'Redo',
     id: 'red-button-shortcut',
-    targetKey: ['y'],
+    targetKey: ['Ctrl+y', 'Meta+y'],
     targetKeyLabel: 'Ctrl + Y',
   },
 };
diff --git a/src/pods/toolbar/shortcut/shortcut.hook.tsx b/src/pods/toolbar/shortcut/shortcut.hook.tsx
@@ -13,15 +13,15 @@ export const useShortcut = ({ targetKey, callback }: ShortcutHookProps) => {
     //const isAltKeyPressed = event.getModifierState('Alt');
     //const isCtrlKeyPressed = event.getModifierState('Control');
     const isCtrlOrCmdPressed = event.ctrlKey || event.metaKey;
+    const ctrlKey = isMacOS() ? 'Meta' : 'Ctrl';
+    const pressedKey = event.key.toLowerCase();
 
     if (
-      (isWindowsOrLinux() && isCtrlOrCmdPressed) ||
-      (isMacOS() && isCtrlOrCmdPressed)
+      targetKey.includes(pressedKey) ||
+      (isCtrlOrCmdPressed && targetKey.includes(`${ctrlKey}+${pressedKey}`))
     ) {
-      if (targetKey.includes(event.key)) {
-        event.preventDefault();
-        callback();
-      }
+      event.preventDefault();
+      callback();
     }
   };