From fc4e84ac4077e21687671dd4dfc8b0443a03bebb Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Wed, 20 Jul 2022 16:02:09 +0200 Subject: [PATCH] Message Toolbar: Fix unexpected deleting from keyboard (#1952) --- src/components/middle/MessageSelectToolbar.tsx | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/components/middle/MessageSelectToolbar.tsx b/src/components/middle/MessageSelectToolbar.tsx index 25c525491..c8a83dfef 100644 --- a/src/components/middle/MessageSelectToolbar.tsx +++ b/src/components/middle/MessageSelectToolbar.tsx @@ -72,12 +72,15 @@ const MessageSelectToolbar: FC = ({ useEffect(() => { return isActive && !isDeleteModalOpen && !isReportModalOpen && !isForwardModalOpen ? captureKeyboardListeners({ - onBackspace: openDeleteModal, - onDelete: openDeleteModal, + onBackspace: canDeleteMessages ? openDeleteModal : undefined, + onDelete: canDeleteMessages ? openDeleteModal : undefined, onEsc: exitMessageSelectMode, }) : undefined; - }, [isActive, isDeleteModalOpen, isReportModalOpen, openDeleteModal, exitMessageSelectMode, isForwardModalOpen]); + }, [ + isActive, isDeleteModalOpen, isReportModalOpen, openDeleteModal, exitMessageSelectMode, isForwardModalOpen, + canDeleteMessages, + ]); const handleCopy = useCallback(() => { copySelectedMessages();