feat(clipboard): should return both text/html and files when clipboar…

…d has files
worktile · Jun 20, 2024 · 8479774 · 8479774
1 parent 2eda267
commit 8479774
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.changeset/shy-files-matter.md b/.changeset/shy-files-matter.md
@@ -0,0 +1,5 @@
+---
+"slate-angular": minor
+---
+
+should return both text/html and files when clipboard has files
diff --git a/packages/src/utils/clipboard/clipboard.ts b/packages/src/utils/clipboard/clipboard.ts
@@ -39,11 +39,12 @@ export const createClipboardData = (html: string, elements: Element[], text: str
 export const getClipboardData = async (dataTransfer?: DataTransfer): Promise<ClipboardData> => {
     let clipboardData = null;
     if (dataTransfer) {
+        let filesData = {};
         if (dataTransfer.files.length) {
-            return { files: Array.from(dataTransfer.files) };
+            filesData = { ...filesData, files: Array.from(dataTransfer.files) };
         }
         clipboardData = getDataTransferClipboard(dataTransfer);
-        return clipboardData;
+        return { ...clipboardData, ...filesData };
     }
     if (isClipboardReadSupported()) {
         return await getNavigatorClipboard();
@@ -69,7 +70,7 @@ export const setClipboardData = async (
     if (isClipboardWriteSupported()) {
         const htmlText = buildHTMLText(wrapper, attach, elements);
         // TODO
-        // maybe fail to write when copy some cell in table 
+        // maybe fail to write when copy some cell in table
         return await setNavigatorClipboard(htmlText, elements, text);
     }
 

diff --git a/packages/src/utils/clipboard/navigator-clipboard.ts b/packages/src/utils/clipboard/navigator-clipboard.ts
@@ -36,23 +36,26 @@ export const getNavigatorClipboard = async () => {
                         return new File([blob], 'file', { type: blob.type });
                     })
                 );
-                return {
+                clipboardData = {
+                    ...clipboardData,
                     files
                 };
             }
             if (item.types.includes('text/html')) {
                 const htmlContent = await blobAsString(await item.getType('text/html'));
                 const htmlClipboardData = getClipboardFromHTMLText(htmlContent);
                 if (htmlClipboardData) {
-                    return htmlClipboardData;
+                    clipboardData = { ...clipboardData, ...htmlClipboardData };
+                    return clipboardData;
                 }
                 if (htmlContent && htmlContent.trim()) {
-                    clipboardData = { html: htmlContent };
+                    clipboardData = { ...clipboardData, html: htmlContent };
                 }
             }
             if (item.types.includes('text/plain')) {
                 const textContent = await blobAsString(await item.getType('text/plain'));
                 clipboardData = {
+                    ...clipboardData,
                     text: stripHtml(textContent)
                 };
             }