From 2ddd3a3087eb1bae1acfd500d7aee669cd810e27 Mon Sep 17 00:00:00 2001 From: Alexander Zinchuk Date: Fri, 16 Apr 2021 14:48:18 +0300 Subject: [PATCH] Composer / Attachement: Fix multiple paste (#1014) --- src/components/middle/composer/hooks/useClipboardPaste.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/middle/composer/hooks/useClipboardPaste.ts b/src/components/middle/composer/hooks/useClipboardPaste.ts index d910bc3c5..849e3559b 100644 --- a/src/components/middle/composer/hooks/useClipboardPaste.ts +++ b/src/components/middle/composer/hooks/useClipboardPaste.ts @@ -2,7 +2,7 @@ import { StateHookSetter, useEffect } from '../../../../lib/teact/teact'; import { ApiAttachment, ApiMessage } from '../../../../api/types'; import buildAttachment from '../helpers/buildAttachment'; -import { EDITABLE_INPUT_ID } from '../../../../config'; +import { EDITABLE_INPUT_ID, EDITABLE_INPUT_MODAL_ID } from '../../../../config'; const CLIPBOARD_ACCEPTED_TYPES = ['image/png', 'image/jpeg', 'image/gif']; const MAX_MESSAGE_LENGTH = 4096; @@ -18,8 +18,8 @@ export default ( return; } - const input = document.getElementById(EDITABLE_INPUT_ID); - if (input !== document.activeElement) { + const input = document.activeElement; + if (!input || ![EDITABLE_INPUT_ID, EDITABLE_INPUT_MODAL_ID].includes(input.id)) { return; }