Skip to content

Commit 30d781e

Browse files
authored
Merge pull request Expensify#64807 from Eskalifer1/fix/62703
fix/62703: comoser not focused after selecting emoji
2 parents d80d99a + 50f7a85 commit 30d781e

2 files changed

Lines changed: 4 additions & 2 deletions

File tree

src/components/EmojiPicker/EmojiPicker.tsx

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
1111
import useStyleUtils from '@hooks/useStyleUtils';
1212
import useThemeStyles from '@hooks/useThemeStyles';
1313
import useWindowDimensions from '@hooks/useWindowDimensions';
14+
import blurActiveElement from '@libs/Accessibility/blurActiveElement';
1415
import type {AnchorOrigin, EmojiPickerRef, EmojiPopoverAnchor, OnEmojiSelected, OnModalHideValue, OnWillShowPicker} from '@libs/actions/EmojiPickerAction';
1516
import {isMobileChrome} from '@libs/Browser';
1617
import calculateAnchorPosition from '@libs/calculateAnchorPosition';
@@ -116,6 +117,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
116117
* Hide the emoji picker menu.
117118
*/
118119
const hideEmojiPicker = (isNavigating?: boolean) => {
120+
blurActiveElement();
119121
const currOnModalHide = onModalHide.current;
120122
onModalHide.current = () => {
121123
if (currOnModalHide) {

src/libs/focusComposerWithDelay/setTextInputSelection.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ const setSelectionRange = shouldSetSelectionRange();
66

77
const setTextInputSelection = (textInput: InputType, forcedSelectionRange: Selection) => {
88
if (setSelectionRange) {
9-
(textInput as HTMLTextAreaElement).setSelectionRange(forcedSelectionRange.start, forcedSelectionRange.end);
9+
(textInput as HTMLTextAreaElement).setSelectionRange?.(forcedSelectionRange.start, forcedSelectionRange.end);
1010
} else {
11-
(textInput as TextInput).setSelection(forcedSelectionRange.start, forcedSelectionRange.end);
11+
(textInput as TextInput).setSelection?.(forcedSelectionRange.start, forcedSelectionRange.end);
1212
}
1313
};
1414

0 commit comments

Comments
 (0)