Merge pull request #50974 from bernhardoj/fix/50314-context-menu-immediately-closes-when-open-it-while-emoji-picker-is-open

stitesExpensify · web-flow · commit e2018aab2df2 · 2024-10-17T12:03:00.000-06:00
Fix when emoji picker is opened, right-clicking on message opens and closes context menu
diff --git a/src/components/EmojiPicker/EmojiPicker.tsx b/src/components/EmojiPicker/EmojiPicker.tsx
@@ -56,7 +56,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em
      *
      * Don't directly get the ref from emojiPopoverAnchorRef, instead use getEmojiPopoverAnchor()
      */
-    const getEmojiPopoverAnchor = useCallback(() => emojiPopoverAnchorRef.current ?? emojiPopoverAnchorRef?.current, []);
+    const getEmojiPopoverAnchor = useCallback(() => emojiPopoverAnchorRef.current ?? (emojiPopoverAnchorRef as EmojiPopoverAnchor), []);
 
     /**
      * Show the emoji picker menu.

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ function EmojiPicker({viewportOffsetTop}: EmojiPickerProps, ref: ForwardedRef<Em`
`56`	`56`	`*`
`57`	`57`	`* Don't directly get the ref from emojiPopoverAnchorRef, instead use getEmojiPopoverAnchor()`
`58`	`58`	`*/`
`59`		`- const getEmojiPopoverAnchor = useCallback(() => emojiPopoverAnchorRef.current ?? emojiPopoverAnchorRef?.current, []);`
	`59`	`+ const getEmojiPopoverAnchor = useCallback(() => emojiPopoverAnchorRef.current ?? (emojiPopoverAnchorRef as EmojiPopoverAnchor), []);`
`60`	`60`
`61`	`61`	`/**`
`62`	`62`	`* Show the emoji picker menu.`