Merge pull request #35796 from callstack-internal/fix/emoji-picker-ke…

…yboard fix: Focusing emoji search input on mWeb
Expensify · Feb 5, 2024 · 301cb80 · 301cb80
2 parents 43d1576 + 82fa188
commit 301cb80
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/components/EmojiPicker/EmojiPickerMenu/index.js b/src/components/EmojiPicker/EmojiPickerMenu/index.js
@@ -91,11 +91,11 @@ function EmojiPickerMenu({forwardedRef, onEmojiSelected}) {
             }
 
             // If the input is not focused and the new index is out of range, focus the input
-            if (newIndex < 0 && !searchInputRef.current.isFocused()) {
+            if (newIndex < 0 && !searchInputRef.current.isFocused() && shouldFocusInputOnScreenFocus) {
                 searchInputRef.current.focus();
             }
         },
-        [filteredEmojis.length, highlightFirstEmoji, isUsingKeyboardMovement],
+        [filteredEmojis.length, highlightFirstEmoji, isUsingKeyboardMovement, shouldFocusInputOnScreenFocus],
     );
 
     const disabledIndexes = useMemo(() => (isListFiltered ? [] : [...headerIndices, ...spacersIndexes]), [headerIndices, isListFiltered, spacersIndexes]);