Merge pull request #30602 from Expensify/rodrigo-fix-shortcut-bindings

Rodrigo fix shortcut bindings
Expensify · Oct 30, 2023 · a26b8df · a26b8df
2 parents 50a327c + 186033b
commit a26b8df
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.native.ts b/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.native.ts
@@ -8,6 +8,11 @@ const bindHandlerToKeydownEvent: BindHandlerToKeydownEvent = (getDisplayName, ev
     const eventModifiers = getKeyEventModifiers(keyCommandEvent);
     const displayName = getDisplayName(keyCommandEvent.input, eventModifiers);
 
+    // If we didn't register any event handlers for a key we ignore it
+    if (!eventHandlers[displayName]) {
+        return;
+    }
+
     // Loop over all the callbacks
     Object.values(eventHandlers[displayName]).every((callback) => {
         // Determine if the event should bubble before executing the callback (which may have side-effects)

diff --git a/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.ts b/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.ts
@@ -13,6 +13,11 @@ const bindHandlerToKeydownEvent: BindHandlerToKeydownEvent = (getDisplayName, ev
     const eventModifiers = getKeyEventModifiers(keyCommandEvent);
     const displayName = getDisplayName(keyCommandEvent.input, eventModifiers);
 
+    // If we didn't register any event handlers for a key we ignore it
+    if (!eventHandlers[displayName]) {
+        return;
+    }
+
     // Loop over all the callbacks
     Object.values(eventHandlers[displayName]).every((callback) => {
         const textArea = event.target as HTMLTextAreaElement;