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

Attachment Modal: Fix pasting from clipboard always inserted in the end (#1188)

Browse Source
This commit is contained in:
Alexander Zinchuk 2021-06-19 15:05:18 +03:00
parent 215b3d5603
commit 0b287b0f3d
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -320,7 +320,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
if (selection.rangeCount) { if (selection.rangeCount) {
const selectionRange = selection.getRangeAt(0); const selectionRange = selection.getRangeAt(0);
if (isSelectionInsideInput(selectionRange)) { if (isSelectionInsideInput(selectionRange, inputId)) {
if (IS_EMOJI_SUPPORTED) { if (IS_EMOJI_SUPPORTED) {
// Insertion will trigger `onChange` in MessageInput, so no need to setHtml in state // Insertion will trigger `onChange` in MessageInput, so no need to setHtml in state
document.execCommand('insertText', false, text); document.execCommand('insertText', false, text);
@ -347,7 +347,7 @@ const Composer: FC<OwnProps & StateProps & DispatchProps> = ({
if (selection.rangeCount) { if (selection.rangeCount) {
const selectionRange = selection.getRangeAt(0); const selectionRange = selection.getRangeAt(0);
if (isSelectionInsideInput(selectionRange)) { if (isSelectionInsideInput(selectionRange, EDITABLE_INPUT_ID)) {
document.execCommand('delete', false); document.execCommand('delete', false);
return; return;
} }

2
src/components/middle/composer/MessageInput.tsx
View File

@ -149,7 +149,7 @@ const MessageInput: FC<OwnProps & StateProps & DispatchProps> = ({
const selectedText = selectionRange.toString().trim(); const selectedText = selectionRange.toString().trim();
if ( if (
shouldSupressTextFormatter shouldSupressTextFormatter
|| !isSelectionInsideInput(selectionRange) || !isSelectionInsideInput(selectionRange, editableInputId || EDITABLE_INPUT_ID)
|| !selectedText || !selectedText
|| parseEmojiOnlyString(selectedText) || parseEmojiOnlyString(selectedText)
|| !selectionRange.START_TO_END || !selectionRange.START_TO_END

8
src/components/middle/composer/helpers/selection.ts
View File

@ -1,15 +1,13 @@
import { EDITABLE_INPUT_ID } from '../../../../config';
const MAX_NESTING_PARENTS = 5; const MAX_NESTING_PARENTS = 5;
export function isSelectionInsideInput(selectionRange: Range) { export function isSelectionInsideInput(selectionRange: Range, inputId: string) {
const { commonAncestorContainer } = selectionRange; const { commonAncestorContainer } = selectionRange;
let parentNode: HTMLElement | null = commonAncestorContainer as HTMLElement; let parentNode: HTMLElement | null = commonAncestorContainer as HTMLElement;
let iterations = 1; let iterations = 1;
while (parentNode && parentNode.id !== EDITABLE_INPUT_ID && iterations < MAX_NESTING_PARENTS) { while (parentNode && parentNode.id !== inputId && iterations < MAX_NESTING_PARENTS) {
parentNode = parentNode.parentElement; parentNode = parentNode.parentElement;
iterations++; iterations++;
} }
return Boolean(parentNode && parentNode.id === EDITABLE_INPUT_ID); return Boolean(parentNode && parentNode.id === inputId);
} }