only pick text if pasting text and files

weseek · Sep 11, 2024 · f68146f · f68146f
1 parent a4dae48
commit f68146f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 8 deletions.
diff --git a/packages/editor/src/client/components-internal/CodeMirrorEditor/CodeMirrorEditor.tsx b/packages/editor/src/client/components-internal/CodeMirrorEditor/CodeMirrorEditor.tsx
@@ -100,10 +100,6 @@ export const CodeMirrorEditor = (props: Props): JSX.Element => {
         return;
       }
 
-      if (onUpload != null && event.clipboardData.types.includes('Files')) {
-        onUpload(Array.from(event.clipboardData.files));
-      }
-
       if (event.clipboardData.types.includes('text/plain')) {
 
         const textData = event.clipboardData.getData('text/plain');
@@ -114,6 +110,10 @@ export const CodeMirrorEditor = (props: Props): JSX.Element => {
 
         codeMirrorEditor?.replaceText(adjusted);
       }
+      else if (onUpload != null && event.clipboardData.types.includes('Files')) {
+        onUpload(Array.from(event.clipboardData.files));
+      }
+
     };
 
     const extension = EditorView.domEventHandlers({

diff --git a/.../editor/src/client/services-internal/file-dropzone/use-file-dropzone/use-file-dropzone.ts b/.../editor/src/client/services-internal/file-dropzone/use-file-dropzone/use-file-dropzone.ts
@@ -35,10 +35,7 @@ export const useFileDropzone = (props: Props): FileDropzoneState => {
 
   }, [onUpload, setIsUploading, acceptedUploadFileType]);
 
-  let accept: Accept | undefined;
-  if (acceptedUploadFileType === AcceptedUploadFileType.IMAGE) {
-    accept = { 'image/*': [] };
-  }
+  const accept: Accept | undefined = (acceptedUploadFileType === AcceptedUploadFileType.IMAGE) ? { 'image/*': [] } : undefined;
 
   const dzState = useDropzone({
     onDrop: dropHandler,