From 5e7e7c14bffc6b464216dd2ed81cde7dea61a2b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hanno=20J=2E=20G=C3=B6decke?= <die.drei99@yahoo.de>
Date: Mon, 6 Mar 2023 19:01:17 +0100
Subject: [PATCH] fixed bug where mini context menu wouldn't close

---
 .../Reactions/MiniQuickEmojiReactions.js        | 17 +++++++++++++++--
 .../report/ContextMenu/ContextMenuActions.js    |  1 +
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/components/Reactions/MiniQuickEmojiReactions.js b/src/components/Reactions/MiniQuickEmojiReactions.js
index 99d50267b7cb..24bce7b20a23 100644
--- a/src/components/Reactions/MiniQuickEmojiReactions.js
+++ b/src/components/Reactions/MiniQuickEmojiReactions.js
@@ -25,8 +25,21 @@ const ICON_SIZE_SCALE_FACTOR = 1.3;
 
 const propTypes = {
     ...baseQuickEmojiReactionsPropTypes,
+
+    /**
+     * Will be called when the user closed the emoji picker
+     * without selecting an emoji.
+     */
+    onEmojiPickerClosed: PropTypes.func,
+
     ...withLocalizePropTypes,
     preferredSkinTone: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
+
+};
+
+const defaultProps = {
+    onEmojiPickerClosed: () => {},
+    ...baseQuickEmojiReactionsDefaultProps,
 };
 
 /**
@@ -43,7 +56,7 @@ const MiniQuickEmojiReactions = (props) => {
     const openEmojiPicker = () => {
         props.onPressOpenPicker();
         EmojiPickerAction.showEmojiPicker(
-            () => {},
+            props.onEmojiPickerClosed,
             (emojiCode, emojiObject) => {
                 props.onEmojiSelected(emojiObject);
             },
@@ -89,7 +102,7 @@ const MiniQuickEmojiReactions = (props) => {
 
 MiniQuickEmojiReactions.displayName = 'MiniQuickEmojiReactions';
 MiniQuickEmojiReactions.propTypes = propTypes;
-MiniQuickEmojiReactions.defaultProps = baseQuickEmojiReactionsDefaultProps;
+MiniQuickEmojiReactions.defaultProps = defaultProps;
 export default compose(
     withLocalize,
     withOnyx({
diff --git a/src/pages/home/report/ContextMenu/ContextMenuActions.js b/src/pages/home/report/ContextMenu/ContextMenuActions.js
index 72c784239a62..dbffb4d87ace 100644
--- a/src/pages/home/report/ContextMenu/ContextMenuActions.js
+++ b/src/pages/home/report/ContextMenu/ContextMenuActions.js
@@ -68,6 +68,7 @@ export default [
                         key="MiniQuickEmojiReactions"
                         onEmojiSelected={onEmojiSelected}
                         onPressOpenPicker={keepOpen}
+                        onEmojiPickerClosed={closeContextMenu}
                     />
                 );
             }