Skip to content

fix:62703: focus composer after emoji picker select #65770

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 2 commits into from
Jul 11, 2025
Merged

fix:62703: focus composer after emoji picker select #65770

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
641dd3b
fix:62703: composer focus after selecting emoji
Eskalifer1 Jul 9, 2025
7936c1e
Merge remote-tracking branch 'origin' into fix/62703
Eskalifer1 Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/components/EmojiPicker/EmojiPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,11 @@ import useResponsiveLayout from '@hooks/useResponsiveLayout';
import useStyleUtils from '@hooks/useStyleUtils';
import useThemeStyles from '@hooks/useThemeStyles';
import useWindowDimensions from '@hooks/useWindowDimensions';
import blurActiveElement from '@libs/Accessibility/blurActiveElement';
import type {AnchorOrigin, EmojiPickerRef, EmojiPopoverAnchor, OnEmojiSelected, OnModalHideValue, OnWillShowPicker} from '@libs/actions/EmojiPickerAction';
import {isMobileChrome} from '@libs/Browser';
import calculateAnchorPosition from '@libs/calculateAnchorPosition';
import DomUtils from '@libs/DomUtils';
import {close} from '@userActions/Modal';
import CONST from '@src/CONST';
import EmojiPickerMenu from './EmojiPickerMenu';
Expand Down Expand Up @@ -116,6 +118,10 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
* Hide the emoji picker menu.
*/
const hideEmojiPicker = (isNavigating?: boolean) => {
const activeElementId = DomUtils.getActiveElement()?.id;
if (activeElementId !== CONST.COMPOSER.NATIVE_ID) {
blurActiveElement();
}
const currOnModalHide = onModalHide.current;
onModalHide.current = () => {
if (currOnModalHide) {
Expand Down
4 changes: 2 additions & 2 deletions src/libs/focusComposerWithDelay/setTextInputSelection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@ const setSelectionRange = shouldSetSelectionRange();

const setTextInputSelection = (textInput: InputType, forcedSelectionRange: Selection) => {
if (setSelectionRange) {
(textInput as HTMLTextAreaElement).setSelectionRange(forcedSelectionRange.start, forcedSelectionRange.end);
(textInput as HTMLTextAreaElement).setSelectionRange?.(forcedSelectionRange.start, forcedSelectionRange.end);
} else {
(textInput as TextInput).setSelection(forcedSelectionRange.start, forcedSelectionRange.end);
(textInput as TextInput).setSelection?.(forcedSelectionRange.start, forcedSelectionRange.end);
}
};

Expand Down
Loading