From 6c9e54aaf102a0f3ee78feb5bba38f92443668c3 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Sun, 19 Mar 2023 22:31:00 -0500 Subject: [PATCH] Selection Toolbar: Does not copy to clipboard (#2801) --- src/components/middle/MessageSelectToolbar.tsx | 2 +- .../middle/hooks/useCopySelectedMessages.ts | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/middle/MessageSelectToolbar.tsx b/src/components/middle/MessageSelectToolbar.tsx index 527680723..59dd68abe 100644 --- a/src/components/middle/MessageSelectToolbar.tsx +++ b/src/components/middle/MessageSelectToolbar.tsx @@ -71,7 +71,7 @@ const MessageSelectToolbar: FC = ({ const [isDeleteModalOpen, openDeleteModal, closeDeleteModal] = useFlag(); const [isReportModalOpen, openReportModal, closeReportModal] = useFlag(); - useCopySelectedMessages(Boolean(isActive), copySelectedMessages); + useCopySelectedMessages(isActive); const handleExitMessageSelectMode = useCallback(() => { exitMessageSelectMode(); diff --git a/src/components/middle/hooks/useCopySelectedMessages.ts b/src/components/middle/hooks/useCopySelectedMessages.ts index 91d17f17b..007e8b221 100644 --- a/src/components/middle/hooks/useCopySelectedMessages.ts +++ b/src/components/middle/hooks/useCopySelectedMessages.ts @@ -1,16 +1,14 @@ +import { getActions } from '../../../global'; + import { useHotkeys } from '../../../hooks/useHotkeys'; -const useCopySelectedMessages = (isActive: boolean, copySelectedMessages: NoneToVoidFunction) => { +const useCopySelectedMessages = (isActive?: boolean) => { function handleCopy(e: KeyboardEvent) { - if (!isActive) { - return; - } - e.preventDefault(); - copySelectedMessages(); + getActions().copySelectedMessages(); } - useHotkeys({ 'Mod+C': handleCopy }); + useHotkeys(isActive ? { 'Mod+C': handleCopy } : undefined); }; export default useCopySelectedMessages;