Merge pull request #29716 from ishpaul777/fix/toggle-status-select-po…

…pover fix: made the the status emoji selector toggle popover
Expensify · Oct 18, 2023 · 7b03a4d · 7b03a4d
2 parents 651be71 + 7357034
commit 7b03a4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/src/components/EmojiPicker/EmojiPickerButtonDropdown.js b/src/components/EmojiPicker/EmojiPickerButtonDropdown.js
@@ -28,12 +28,18 @@ function EmojiPickerButtonDropdown(props) {
     const emojiPopoverAnchor = useRef(null);
     useEffect(() => EmojiPickerAction.resetEmojiPopoverAnchor, []);
 
-    const onPress = () =>
+    const onPress = () => {
+        if (EmojiPickerAction.isEmojiPickerVisible()) {
+            EmojiPickerAction.hideEmojiPicker();
+            return;
+        }
+
         EmojiPickerAction.showEmojiPicker(props.onModalHide, (emoji) => props.onInputChange(emoji), emojiPopoverAnchor.current, {
             horizontal: CONST.MODAL.ANCHOR_ORIGIN_HORIZONTAL.LEFT,
             vertical: CONST.MODAL.ANCHOR_ORIGIN_VERTICAL.TOP,
             shiftVertical: 4,
         });
+    };
 
     return (
         <Tooltip text={props.translate('reportActionCompose.emoji')}>

diff --git a/src/styles/styles.ts b/src/styles/styles.ts
@@ -3669,6 +3669,7 @@ const styles = (theme: ThemeDefault) =>
             paddingRight: 4,
             marginBottom: 32,
             alignSelf: 'flex-start',
+            ...userSelect.userSelectNone,
         },
 
         emojiPickerButtonDropdownIcon: {