From 6728fd4e2a8a79eb3f723eb2a083660debfe9305 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 27 Aug 2021 21:08:44 +0300 Subject: [PATCH] Middle Header: Hide tools when selecting messages to prevent history loss --- src/components/middle/HeaderActions.tsx | 8 +------- src/components/middle/HeaderMenuContainer.tsx | 18 +++++++----------- 2 files changed, 8 insertions(+), 18 deletions(-) diff --git a/src/components/middle/HeaderActions.tsx b/src/components/middle/HeaderActions.tsx index 286edff9a..0c3ff4352 100644 --- a/src/components/middle/HeaderActions.tsx +++ b/src/components/middle/HeaderActions.tsx @@ -43,7 +43,6 @@ interface StateProps { canSubscribe?: boolean; canSearch?: boolean; canMute?: boolean; - canSelect?: boolean; canLeave?: boolean; } @@ -62,7 +61,6 @@ const HeaderActions: FC = ({ canSubscribe, canSearch, canMute, - canSelect, canLeave, isRightColumnShown, joinChannel, @@ -191,7 +189,6 @@ const HeaderActions: FC = ({ canSubscribe={canSubscribe} canSearch={canSearch} canMute={canMute} - canSelect={canSelect} canLeave={canLeave} onSubscribeChannel={handleSubscribeClick} onSearchClick={handleSearchClick} @@ -208,7 +205,7 @@ export default memo(withGlobal( const chat = selectChat(global, chatId); const isChannel = Boolean(chat && isChatChannel(chat)); - if (chat?.isRestricted) { + if (chat?.isRestricted || selectIsInSelectMode(global)) { return { noMenu: true, }; @@ -227,14 +224,12 @@ export default memo(withGlobal( ); const canSearch = isMainThread || isDiscussionThread; const canMute = isMainThread && !isChatWithSelf && !canSubscribe; - const canSelect = !selectIsInSelectMode(global); const canLeave = isMainThread && !canSubscribe; const noMenu = !( (IS_SINGLE_COLUMN_LAYOUT && canSubscribe) || (IS_SINGLE_COLUMN_LAYOUT && canSearch) || canMute - || canSelect || canLeave ); @@ -247,7 +242,6 @@ export default memo(withGlobal( canSubscribe, canSearch, canMute, - canSelect, canLeave, }; }, diff --git a/src/components/middle/HeaderMenuContainer.tsx b/src/components/middle/HeaderMenuContainer.tsx index 2f81e8c21..9b16d80bd 100644 --- a/src/components/middle/HeaderMenuContainer.tsx +++ b/src/components/middle/HeaderMenuContainer.tsx @@ -37,7 +37,6 @@ export type OwnProps = { canSubscribe?: boolean; canSearch?: boolean; canMute?: boolean; - canSelect?: boolean; canLeave?: boolean; onSubscribeChannel: () => void; onSearchClick: () => void; @@ -62,7 +61,6 @@ const HeaderMenuContainer: FC = ({ canSubscribe, canSearch, canMute, - canSelect, canLeave, chat, isPrivate, @@ -183,14 +181,12 @@ const HeaderMenuContainer: FC = ({ {lang(isMuted ? 'ChatsUnmute' : 'ChatsMute')} )} - {canSelect && ( - - {lang('ReportSelectMessages')} - - )} + + {lang('ReportSelectMessages')} + {canLeave && ( = ({ onClick={handleDelete} > {lang(isPrivate - ? 'Delete' + ? 'DeleteChatUser' : (canDeleteChat ? 'GroupInfo.DeleteAndExit' : (isChannel ? 'LeaveChannel' : 'Group.LeaveGroup')))} )}