From e28a07588ecd86857011d1ae4783015036ac393a Mon Sep 17 00:00:00 2001 From: Jamie Kyle <113370520+jamiebuilds-signal@users.noreply.github.com> Date: Tue, 2 Jan 2024 11:56:21 -0800 Subject: [PATCH] Fix EmojiPicker shortcut with panel open --- ts/components/emoji/EmojiButton.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ts/components/emoji/EmojiButton.tsx b/ts/components/emoji/EmojiButton.tsx index 5407316c8..2f2480950 100644 --- a/ts/components/emoji/EmojiButton.tsx +++ b/ts/components/emoji/EmojiButton.tsx @@ -122,9 +122,9 @@ export const EmojiButton = React.memo(function EmojiButtonInner({ const commandOrCtrl = commandKey || controlKey; const key = KeyboardLayout.lookup(event); - // We don't want to open up if the conversation has any panels open - const panels = document.querySelectorAll('.conversation .panel'); - if (panels && panels.length > 1) { + // We don't want to open up if the current conversation panel is hidden + const parentPanel = buttonRef.current?.closest('.ConversationPanel'); + if (parentPanel?.classList.contains('ConversationPanel__hidden')) { return; }