Fix undo shortcut triggering in places it shouldn't be (#80)

anthonyec · May 24, 2023 · 0c89fe6 · 0c89fe6
1 parent 813906a
commit 0c89fe6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/popup/components/context_menu/index.jsx b/src/popup/components/context_menu/index.jsx
@@ -1,7 +1,5 @@
 import React, { useEffect, useLayoutEffect, useRef, useState } from 'react';
 
-import { clamp } from '../../lib/clamp';
-
 import './context_menu.css';
 
 const PADDING = 5;
@@ -117,6 +115,10 @@ export default function ContextMenu({
 
   useEffect(() => {
     const handleKeyDown = (event) => {
+      if (event.code === 'KeyZ' && event.metaKey) {
+        dismiss();
+      }
+
       if (executingAction) {
         return;
       }

diff --git a/src/popup/components/text_field/index.jsx b/src/popup/components/text_field/index.jsx
@@ -9,6 +9,13 @@ export default function TextField({
 }) {
   const [value, setValue] = useState(defaultValue);
 
+  const handleKeyDown = (event) => {
+    if (event.code === 'KeyZ' && event.metaKey) {
+      // Prevent undo hook from happening, but allow undo in the textfield.
+      event.stopPropagation();
+    }
+  };
+
   // When `defaultValue` prop changes, change the local state with that value.
   useEffect(() => {
     setValue(defaultValue);
@@ -26,6 +33,7 @@ export default function TextField({
         className="text-field__input"
         type="text"
         value={value}
+        onKeyDown={handleKeyDown}
         onChange={handleOnChange}
       />
     </div>