From e6be2825683b6c38dda418130f106c4f53470d99 Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Wed, 11 Jun 2025 15:58:43 -0400
Subject: [PATCH] [MM-61562] Ensure emoji picker focus returns to button when
 not selecting an emoji (#31370)

Co-authored-by: Mattermost Build <build@mattermost.com>
---
 .../advanced_text_editor/use_editor_emoji_picker.tsx      | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/channels/src/components/advanced_text_editor/use_editor_emoji_picker.tsx b/webapp/channels/src/components/advanced_text_editor/use_editor_emoji_picker.tsx
index 484beb7bfa..bbcfa1861e 100644
--- a/webapp/channels/src/components/advanced_text_editor/use_editor_emoji_picker.tsx
+++ b/webapp/channels/src/components/advanced_text_editor/use_editor_emoji_picker.tsx
@@ -42,6 +42,7 @@ const useEditorEmojiPicker = (
     const enableGifPicker = useSelector((state: GlobalState) => getConfig(state).EnableGifPicker === 'true');
 
     const [showEmojiPicker, setShowEmojiPicker] = useState(false);
+    const [emojiSelected, setEmojiSelected] = useState(false);
 
     const toggleEmojiPicker = useCallback((e?: React.MouseEvent<HTMLButtonElement, MouseEvent>): void => {
         e?.stopPropagation();
@@ -78,6 +79,7 @@ const useEditorEmojiPicker = (
             message: newMessage,
         });
 
+        setEmojiSelected(true);
         setShowEmojiPicker(false);
     }, [draft, caretPosition, handleDraftChange, setCaretPosition]);
 
@@ -102,13 +104,15 @@ const useEditorEmojiPicker = (
 
     // Focus textbox when the emoji picker closes
     useDidUpdate(() => {
-        if (!showEmojiPicker) {
+        if (!showEmojiPicker && emojiSelected) {
+            setEmojiSelected(false);
+
             // Wait a frame to let the emoji picker's focus trap disappear before changing focus
             requestAnimationFrame(() => {
                 focusTextbox();
             });
         }
-    }, [showEmojiPicker]);
+    }, [showEmojiPicker, emojiSelected]);
 
     const {
         emojiPicker,