Skip to content

[CP Staging] fix:65728: new chat autofocus is not triggered #65732

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

Closed
Eskalifer1 wants to merge 1 commit into from
Closed

[CP Staging] fix:65728: new chat autofocus is not triggered #65732

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 6 additions & 1 deletion src/components/EmojiPicker/EmojiPicker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ 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 @@ -117,7 +118,6 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
* Hide the emoji picker menu.
*/
const hideEmojiPicker = (isNavigating?: boolean) => {
blurActiveElement();
const currOnModalHide = onModalHide.current;
onModalHide.current = () => {
if (currOnModalHide) {
Expand Down Expand Up @@ -149,6 +149,11 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
return;
}

const activeElementId = DomUtils.getActiveElement()?.id;
if (activeElementId !== CONST.COMPOSER.NATIVE_ID) {
blurActiveElement();
}

hideEmojiPicker(false);
if (typeof onEmojiSelected.current === 'function') {
onEmojiSelected.current(emoji, emojiObject);
Expand Down
Loading