From e5537cbbc0a02bad558a08d6e685f022c7f297f1 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sat, 28 Jan 2023 02:15:32 +0100 Subject: [PATCH] Forum Panel: Close on Esc (#2360) --- src/components/left/LeftColumn.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/left/LeftColumn.tsx b/src/components/left/LeftColumn.tsx index be4a966f2..3a0c8af08 100644 --- a/src/components/left/LeftColumn.tsx +++ b/src/components/left/LeftColumn.tsx @@ -332,10 +332,10 @@ const LeftColumn: FC = ({ }, [forumPanelChatId, setGlobalSearchChatId, setGlobalSearchQuery]); useEffect( - () => (content !== LeftColumnContent.ChatList || (isFirstChatFolderActive && !isChatOpen) + () => (content !== LeftColumnContent.ChatList || (isFirstChatFolderActive && !isChatOpen && !isForumPanelOpen) ? captureEscKeyListener(() => handleReset()) : undefined), - [isFirstChatFolderActive, content, handleReset, isChatOpen], + [isFirstChatFolderActive, content, handleReset, isChatOpen, isForumPanelOpen], ); const handleHotkeySearch = useCallback((e: KeyboardEvent) => {