From 01dfd7f1812aa04c13eeaae686cae0e5705791f7 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Thu, 20 Jul 2023 15:58:48 +0200 Subject: [PATCH] Forum Panel: Fix panel not opening after being closed (#3599) --- src/components/left/main/Chat.tsx | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/left/main/Chat.tsx b/src/components/left/main/Chat.tsx index dcc8671b3..333359b84 100644 --- a/src/components/left/main/Chat.tsx +++ b/src/components/left/main/Chat.tsx @@ -31,6 +31,7 @@ import { selectCurrentMessageList, selectDraft, selectIsForumPanelClosed, + selectIsForumPanelOpen, selectNotifyExceptions, selectNotifySettings, selectOutgoingStatus, @@ -89,6 +90,7 @@ type StateProps = { draft?: ApiFormattedText; isSelected?: boolean; isSelectedForum?: boolean; + isForumPanelOpen?: boolean; canScrollDown?: boolean; canChangeFolder?: boolean; lastMessageTopic?: ApiTopic; @@ -117,6 +119,7 @@ const Chat: FC = ({ withInterfaceAnimations, isSelected, isSelectedForum, + isForumPanelOpen, canScrollDown, canChangeFolder, lastMessageTopic, @@ -164,7 +167,7 @@ const Chat: FC = ({ const handleClick = useLastCallback(() => { if (isForum) { - if (isSelectedForum) { + if (isForumPanelOpen) { closeForumPanel(undefined, { forceOnHeavyAnimation: true }); } else { openForumPanel({ chatId }, { forceOnHeavyAnimation: true }); @@ -369,6 +372,7 @@ export default memo(withGlobal( draft: selectDraft(global, chatId, MAIN_THREAD_ID), isSelected, isSelectedForum, + isForumPanelOpen: selectIsForumPanelOpen(global), canScrollDown: isSelected && messageListType === 'thread', canChangeFolder: (global.chatFolders.orderedIds?.length || 0) > 1, ...(isOutgoing && chat.lastMessage && {