Merge pull request #35415 from bernhardoj/fix/35373-enter-doesn't-work

Fix enter doesn't work after going back from referral page
Expensify · Feb 13, 2024 · 3791db8 · 3791db8
2 parents f438cb7 + b846422
commit 3791db8
Showing 1 changed file with 5 additions and 16 deletions.
diff --git a/src/components/OptionsSelector/BaseOptionsSelector.js b/src/components/OptionsSelector/BaseOptionsSelector.js
@@ -113,22 +113,19 @@ class BaseOptionsSelector extends Component {
 
     componentDidUpdate(prevProps, prevState) {
         if (prevState.disableEnterShortCut !== this.state.disableEnterShortCut) {
-            if (this.state.disableEnterShortCut) {
-                if (this.unsubscribeEnter) {
-                    this.unsubscribeEnter();
-                    this.unsubscribeEnter = undefined;
-                }
-            } else {
+            // Unregister the shortcut before registering a new one to avoid lingering shortcut listener
+            this.unsubscribeEnter();
+            if (!this.state.disableEnterShortCut) {
                 this.subscribeToEnterShortcut();
             }
         }
 
         if (prevProps.isFocused !== this.props.isFocused) {
+            // Unregister the shortcut before registering a new one to avoid lingering shortcut listener
+            this.unSubscribeFromKeyboardShortcut();
             if (this.props.isFocused) {
                 this.subscribeToEnterShortcut();
                 this.subscribeToCtrlEnterShortcut();
-            } else {
-                this.unSubscribeFromKeyboardShortcut();
             }
         }
 
@@ -293,9 +290,6 @@ class BaseOptionsSelector extends Component {
     }
 
     subscribeToEnterShortcut() {
-        if (this.unsubscribeEnter) {
-            this.unsubscribeEnter();
-        }
         const enterConfig = CONST.KEYBOARD_SHORTCUTS.ENTER;
         this.unsubscribeEnter = KeyboardShortcut.subscribe(
             enterConfig.shortcutKey,
@@ -308,9 +302,6 @@ class BaseOptionsSelector extends Component {
     }
 
     subscribeToCtrlEnterShortcut() {
-        if (this.unsubscribeCTRLEnter) {
-            this.unsubscribeCTRLEnter();
-        }
         const CTRLEnterConfig = CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER;
         this.unsubscribeCTRLEnter = KeyboardShortcut.subscribe(
             CTRLEnterConfig.shortcutKey,
@@ -336,12 +327,10 @@ class BaseOptionsSelector extends Component {
     unSubscribeFromKeyboardShortcut() {
         if (this.unsubscribeEnter) {
             this.unsubscribeEnter();
-            this.unsubscribeEnter = undefined;
         }
 
         if (this.unsubscribeCTRLEnter) {
             this.unsubscribeCTRLEnter();
-            this.unsubscribeCTRLEnter = undefined;
         }
     }