ConverationView.onPaste: Better handling of clipboard contents

Co-authored-by: Scott Nonnenberg <scott@signal.org>
This commit is contained in:
automated-signal 2023-10-24 13:29:37 -07:00 committed by GitHub
parent 2c3aa2c108
commit 6838477756
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 16 additions and 5 deletions

Binary file not shown.

View File

@ -34,6 +34,10 @@ body {
} }
} }
[contenteditable] {
-webkit-user-modify: read-write-plaintext-only;
}
::-webkit-scrollbar { ::-webkit-scrollbar {
// For vertical scrollbars // For vertical scrollbars
width: 9px; width: 9px;

View File

@ -57,14 +57,15 @@ export function ConversationView({
const onPaste = React.useCallback( const onPaste = React.useCallback(
(event: React.ClipboardEvent<HTMLDivElement>) => { (event: React.ClipboardEvent<HTMLDivElement>) => {
event.stopPropagation();
event.preventDefault();
if (!event.clipboardData) { if (!event.clipboardData) {
return; return;
} }
const { items } = event.clipboardData; const { items } = event.clipboardData;
const fileItems = [...items].filter(item => item.kind === 'file'); const fileItems = [...items].filter(item => item.kind === 'file');
if (fileItems.length === 0) {
return;
}
const allVisual = fileItems.every(item => { const allVisual = fileItems.every(item => {
const type = item.type.split('/')[0]; const type = item.type.split('/')[0];
@ -84,6 +85,9 @@ export function ConversationView({
files, files,
}); });
event.stopPropagation();
event.preventDefault();
return; return;
} }
@ -93,6 +97,9 @@ export function ConversationView({
conversationId, conversationId,
files: [firstAttachment], files: [firstAttachment],
}); });
event.stopPropagation();
event.preventDefault();
} }
}, },
[conversationId, processAttachments] [conversationId, processAttachments]

View File

@ -16,7 +16,7 @@ export function createEventHandler({
if ( if (
!activeElement || !activeElement ||
activeElement.matches('input, textarea') || activeElement.matches('input, textarea') ||
!activeElement.closest('[contenteditable=true]') !activeElement.closest('[contenteditable=plaintext-only]')
) { ) {
return; return;
} }

View File

@ -27,7 +27,7 @@ window.addEventListener('contextmenu', e => {
const node = e.target as Element | null; const node = e.target as Element | null;
const isEditable = Boolean( const isEditable = Boolean(
node?.closest('textarea, input, [contenteditable="true"]') node?.closest('textarea, input, [contenteditable="plaintext-only"]')
); );
const isLink = Boolean(node?.closest('a')); const isLink = Boolean(node?.closest('a'));
const isImage = Boolean(node?.closest('.Lightbox img')); const isImage = Boolean(node?.closest('.Lightbox img'));