fix keyboard

Lemoncode · Aug 21, 2024 · 918abab · 918abab
1 parent bf83dfd
commit 918abab
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 25 deletions.
diff --git a/src/pods/canvas/canvas.pod.tsx b/src/pods/canvas/canvas.pod.tsx
@@ -91,27 +91,6 @@ export const CanvasPod = () => {
       updateShapePosition(id, { x, y });
     };
 
-  /*
-  useEffect(() => {
-    const handleKeyDown = (e: KeyboardEvent) => {
-      const isCtrlOrCmdPressed = e.ctrlKey || e.metaKey;
-
-      if (isCtrlOrCmdPressed && e.key === 'c' && canCopy) {
-        copyShapeToClipboard();
-      }
-      if (isCtrlOrCmdPressed && e.key === 'v' && canPaste) {
-        pasteShapeFromClipboard();
-      }
-    };
-
-    window.addEventListener('keydown', handleKeyDown);
-
-    return () => {
-      window.removeEventListener('keydown', handleKeyDown);
-    };
-  }, [selectedShapeId]);
-*/
-
   {
     /* TODO: add other animation for isDraggerOver */
   }

diff --git a/src/pods/toolbar/shortcut/shortcut.const.ts b/src/pods/toolbar/shortcut/shortcut.const.ts
@@ -14,13 +14,13 @@ export const SHORTCUTS: Shortcut = {
   copy: {
     description: 'Copy',
     id: 'copy-button-shortcut',
-    targetKey: ['Ctrl', 'C'],
+    targetKey: ['c'],
     targetKeyLabel: 'Ctrl + C',
   },
   paste: {
     description: 'Paste',
     id: 'paste-button-shortcut',
-    targetKey: ['Ctrl', 'V'],
+    targetKey: ['v'],
     targetKeyLabel: 'Ctrl + V',
   },
 };
diff --git a/src/pods/toolbar/shortcut/shortcut.hook.tsx b/src/pods/toolbar/shortcut/shortcut.hook.tsx
@@ -9,12 +9,14 @@ export interface ShortcutHookProps {
 export const useShortcut = ({ targetKey, callback }: ShortcutHookProps) => {
   const handleKeyPress = (event: KeyboardEvent) => {
     const isAltKeyPressed = event.getModifierState('Alt');
-    const isCtrlKeyPressed = event.getModifierState('Control');
+    //const isCtrlKeyPressed = event.getModifierState('Control');
+    const isCtrlOrCmdPressed = event.ctrlKey || event.metaKey;
 
     if (
       (isWindowsOrLinux() && isAltKeyPressed) ||
-      (isMacOS() && isCtrlKeyPressed)
+      (isMacOS() && isCtrlOrCmdPressed)
     ) {
+      console.log('event.key', event.key);
       if (targetKey.includes(event.key)) {
         event.preventDefault();
         callback();