ztr/TelegramPWA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Left Column: Fix archive closing before forum panel (#3320)

Browse Source
This commit is contained in:
Alexander Zinchuk 2023-06-18 12:03:08 +02:00
parent a9118df52a
commit 4ba836e3fa
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/left/LeftColumn.tsx
View File

@ -347,9 +347,23 @@ function LeftColumn({
}); });
useEffect( useEffect(
() => (content !== LeftColumnContent.ChatList || (isFirstChatFolderActive && !isChatOpen && !isForumPanelOpen) () => {
? captureEscKeyListener(() => handleReset()) const isArchived = content === LeftColumnContent.Archived;
: undefined), const isChatList = content === LeftColumnContent.ChatList;
const noChatOrForumOpen = !isChatOpen && !isForumPanelOpen;
// We listen for escape key only in these cases:
// 1. When we are in archived chats and no chat or forum is open.
// 2. When we are in any other screen except chat list and archived chat list.
// 3. When we are in chat list and first chat folder is active and no chat or forum is open.
if ((isArchived && noChatOrForumOpen) || (!isChatList && !isArchived)
|| (isFirstChatFolderActive && noChatOrForumOpen)) {
return captureEscKeyListener(() => {
handleReset();
});
} else {
return undefined;
}
},
[isFirstChatFolderActive, content, handleReset, isChatOpen, isForumPanelOpen], [isFirstChatFolderActive, content, handleReset, isChatOpen, isForumPanelOpen],
); );