From c122802006a29576519af26c709f90764cddb1e5 Mon Sep 17 00:00:00 2001
From: Eskalifer1 <artemkryt1800@gmail.com>
Date: Wed, 9 Jul 2025 13:45:59 +0300
Subject: [PATCH] fix:65728: new chat autofocus is not triggered

---
 src/components/EmojiPicker/EmojiPicker.tsx | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx
index 1b4f960e47456..f139e1a518081 100644
--- a/src/components/EmojiPicker/EmojiPicker.tsx
+++ b/src/components/EmojiPicker/EmojiPicker.tsx
@@ -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';
@@ -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) {
@@ -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);