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

Composer: Fix duplicated pasting from clipboard (#1854)

Browse Source
This commit is contained in:
Alexander Zinchuk 2022-05-03 14:17:29 +01:00
parent e3c2ad5f4d
commit dab1585014
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/components/middle/composer/Composer.tsx
View File

@ -48,6 +48,7 @@ import {
selectEditingDraft,
selectRequestedText,
selectTheme,
selectCurrentMessageList,
} from '../../../global/selectors';
import {
getAllowedAttachmentOptions,
@ -131,6 +132,7 @@ type StateProps =
isChatWithBot?: boolean;
isChatWithSelf?: boolean;
isChannel?: boolean;
isForCurrentMessageList: boolean;
isRightColumnShown?: boolean;
isSelectModeActive?: boolean;
isForwarding?: boolean;
@ -201,6 +203,7 @@ const Composer: FC<OwnProps & StateProps> = ({
messageListType,
draft,
chat,
isForCurrentMessageList,
connectionState,
isChatWithBot,
isChatWithSelf,
@ -499,7 +502,7 @@ const Composer: FC<OwnProps & StateProps> = ({
editingDraft,
);
useDraft(draft, chatId, threadId, htmlRef, setHtml, editingMessage);
useClipboardPaste(insertTextAndUpdateCursor, setAttachments, editingMessage);
useClipboardPaste(isForCurrentMessageList, insertTextAndUpdateCursor, setAttachments, editingMessage);
const handleEmbeddedClear = useCallback(() => {
if (editingMessage) {
@ -1270,6 +1273,10 @@ export default memo(withGlobal<OwnProps>(
const sendAsUser = sendAsId ? selectUser(global, sendAsId) : undefined;
const sendAsChat = !sendAsUser && sendAsId ? selectChat(global, sendAsId) : undefined;
const requestedText = selectRequestedText(global, chatId);
const currentMessageList = selectCurrentMessageList(global);
const isForCurrentMessageList = chatId === currentMessageList?.chatId
&& threadId === currentMessageList?.threadId
&& messageListType === currentMessageList?.type;
const editingDraft = messageListType === 'scheduled'
? selectEditingScheduledDraft(global, chatId)
@ -1283,6 +1290,7 @@ export default memo(withGlobal<OwnProps>(
isChatWithBot,
isChatWithSelf,
isPrivateChat,
isForCurrentMessageList,
canScheduleUntilOnline: selectCanScheduleUntilOnline(global, chatId),
isChannel: chat ? isChatChannel(chat) : undefined,
isRightColumnShown: selectIsRightColumnShown(global),

7
src/components/middle/composer/hooks/useClipboardPaste.ts
View File

@ -9,11 +9,16 @@ const CLIPBOARD_ACCEPTED_TYPES = ['image/png', 'image/jpeg', 'image/gif'];
const MAX_MESSAGE_LENGTH = 4096;
const useClipboardPaste = (
isActive: boolean,
insertTextAndUpdateCursor: (text: string, inputId?: string) => void,
setAttachments: StateHookSetter<ApiAttachment[]>,
editedMessage: ApiMessage | undefined,
) => {
useEffect(() => {
if (!isActive) {
return undefined;
}
async function handlePaste(e: ClipboardEvent) {
if (!e.clipboardData) {
return;
@ -54,7 +59,7 @@ const useClipboardPaste = (
return () => {
document.removeEventListener('paste', handlePaste, false);
};
}, [insertTextAndUpdateCursor, editedMessage, setAttachments]);
}, [insertTextAndUpdateCursor, editedMessage, setAttachments, isActive]);
};
export default useClipboardPaste;