Merge pull request #35241 from software-mansion-labs/fix-cmd-enter-se…

…lectionList Fix CMD+Enter in SelectionList (cherry picked from commit 9dc595a)
Expensify · Jan 29, 2024 · a360c2a · a360c2a
1 parent 671461a
commit a360c2a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/components/SelectionList/BaseSelectionList.tsx b/src/components/SelectionList/BaseSelectionList.tsx
@@ -43,7 +43,7 @@ function BaseSelectionList<TItem extends User | RadioItem>(
         onScrollBeginDrag,
         headerMessage = '',
         confirmButtonText = '',
-        onConfirm = () => {},
+        onConfirm,
         headerContent,
         footerContent,
         showScrollIndicator = false,
@@ -379,10 +379,10 @@ function BaseSelectionList<TItem extends User | RadioItem>(
     });
 
     /** Calls confirm action when pressing CTRL (CMD) + Enter */
-    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, onConfirm, {
+    useKeyboardShortcut(CONST.KEYBOARD_SHORTCUTS.CTRL_ENTER, onConfirm ?? selectFocusedOption, {
         captureOnInputs: true,
         shouldBubble: !flattenedSections.allOptions[focusedIndex],
-        isActive: !disableKeyboardShortcuts && !!onConfirm && isFocused,
+        isActive: !disableKeyboardShortcuts && isFocused,
     });
 
     return (