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

Forward Modal: Fix backspace deletes selected messages (#1917)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-06-27 22:02:50 +02:00
parent 53e87868fa
commit cf586ca20f
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/middle/MessageSelectToolbar.tsx
View File

@ -39,6 +39,7 @@ type StateProps = {
canReportMessages?: boolean;
canDownloadMessages?: boolean;
hasProtectedMessage?: boolean;
isForwardModalOpen?: boolean;
selectedMessageIds?: number[];
};
@ -52,6 +53,7 @@ const MessageSelectToolbar: FC<OwnProps & StateProps> = ({
canReportMessages,
canDownloadMessages,
hasProtectedMessage,
isForwardModalOpen,
selectedMessageIds,
}) => {
const {
@ -68,14 +70,14 @@ const MessageSelectToolbar: FC<OwnProps & StateProps> = ({
useCopySelectedMessages(Boolean(isActive), copySelectedMessages);
useEffect(() => {
return isActive && !isDeleteModalOpen && !isReportModalOpen
return isActive && !isDeleteModalOpen && !isReportModalOpen && !isForwardModalOpen
? captureKeyboardListeners({
onBackspace: openDeleteModal,
onDelete: openDeleteModal,
onEsc: exitMessageSelectMode,
})
: undefined;
}, [isActive, isDeleteModalOpen, isReportModalOpen, openDeleteModal, exitMessageSelectMode]);
}, [isActive, isDeleteModalOpen, isReportModalOpen, openDeleteModal, exitMessageSelectMode, isForwardModalOpen]);
const handleCopy = useCallback(() => {
copySelectedMessages();
@ -176,6 +178,7 @@ export default memo(withGlobal<OwnProps>(
const canDownload = selectCanDownloadSelectedMessages(global);
const { messageIds: selectedMessageIds } = global.selectedMessages || {};
const hasProtectedMessage = chatId ? selectHasProtectedMessage(global, chatId, selectedMessageIds) : false;
const isForwardModalOpen = global.forwardMessages.isModalShown;
return {
isSchedule: messageListType === 'scheduled',
@ -185,6 +188,7 @@ export default memo(withGlobal<OwnProps>(
canDownloadMessages: canDownload,
selectedMessageIds,
hasProtectedMessage,
isForwardModalOpen,
};
},
)(MessageSelectToolbar));