ignoring keydown events for keys that don't have handlers subscribed

Expensify · Oct 30, 2023 · df585fa · df585fa
1 parent 72b388a
commit df585fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.native.ts b/src/libs/KeyboardShortcut/bindHandlerToKeydownEvent/index.native.ts
@@ -1,3 +1,4 @@
+import _ from 'underscore';
 import getKeyEventModifiers from '@libs/KeyboardShortcut/getKeyEventModifiers';
 import BindHandlerToKeydownEvent from './types';
 
@@ -8,6 +9,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;