@worktile/theia 19.5.0-next.1 → 19.5.0-next.3

package/fesm2022/worktile-theia.mjs

@@ -8774,7 +8774,7 @@ const withDeserializeMd = (editor) => {
         closeConversionHint(editor);
         onKeydown(event);
     };
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, contextClipboardData) => {
         const popover = editor.injector.get(ThyPopover);
         const viewContainerRef = editor.injector.get(ViewContainerRef);
         const cdr = editor.injector.get(ChangeDetectorRef);
@@ -8845,7 +8845,7 @@ const withDeserializeMd = (editor) => {
                 cdr.markForCheck();
             });
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, contextClipboardData);
     };
     return editor;
 };
@@ -10695,7 +10695,7 @@ const createTheHistoryPlugin = createPluginFactory({
 
 const withInsertDataByInvalidType = (editor) => {
     const { customInsertFragmentData } = editor;
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, clipboardData) => {
         const fragment = await extractFragment(data);
         if (fragment) {
             const isContinue = insertDataByInvalidType(editor, fragment);
@@ -10703,7 +10703,7 @@ const withInsertDataByInvalidType = (editor) => {
                 return true;
             }
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, clipboardData);
     };
     return editor;
 };
@@ -10956,24 +10956,25 @@ const createResetTypePlugin = createPluginFactory({
 
 const withDeserializeHTML = (editor) => {
     const { customInsertFragmentData } = editor;
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, contextClipboardData) => {
         const fragmentFromHTML = await extractFragmentByHTML(data);
         if (fragmentFromHTML) {
+            const newContextClipboardData = { elements: fragmentFromHTML };
             // 识别粘贴的 HTML 只有纯链接, 跳至 link
             if (fragmentFromHTML.length === 1 && fragmentFromHTML.every(block => isUrl(block?.children?.[0]?.['text']))) {
-                return customInsertFragmentData(data);
+                return customInsertFragmentData(data, newContextClipboardData);
             }
             // 无法识别HTML内容时后退一下：识别纯文本
             if (fragmentFromHTML.every(block => block.type === ElementKinds.paragraph && isLogicEmptyParagraphElement(editor, block))) {
-                return customInsertFragmentData(data);
+                return customInsertFragmentData(data, null);
             }
             // 识出纯图片并且粘贴板中存在文件则不进行处理, hook 直接右键复制图片的场景，流转到上传图片流程
             // 后续需要做识别html图片后自动上传处理
             if (fragmentFromHTML.length === 1 && fragmentFromHTML[0].type === ElementKinds.image && data.files.length > 0) {
-                return customInsertFragmentData(data);
+                return customInsertFragmentData(data, contextClipboardData || null);
             }
-            if (fragmentFromHTML.length === 1 && fragmentFromHTML[0].type === ElementKinds.table) {
-                return customInsertFragmentData(data);
+            if (isLogicTableElement(editor, fragmentFromHTML)) {
+                return customInsertFragmentData(data, newContextClipboardData);
             }
             // 过滤 text 节点的 color/background-color 属性
             fragmentFromHTML.forEach(node => filterTextFormat(node));
@@ -10997,7 +10998,7 @@ const withDeserializeHTML = (editor) => {
             Transforms.insertFragment(editor, fragmentFromHTML);
             return true;
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, contextClipboardData || null);
     };
     return editor;
 };
@@ -11005,6 +11006,10 @@ const createDeserializeHTMLPlugin = createPluginFactory({
     key: PluginKeys.deserializeHtml,
     withOverrides: withDeserializeHTML
 });
+const isLogicTableElement = (editor, elements) => {
+    const elementsFiltered = elements.filter(element => element.type !== ElementKinds.paragraph || !isLogicEmptyParagraphElement(editor, element));
+    return elementsFiltered.length === 1 && elementsFiltered[0].type === ElementKinds.table;
+};
 
 const FontSizeEditor = {
     setFontSize(editor, size) {
@@ -11888,9 +11893,10 @@ const withImage = (editor) => {
     editor.isVoid = (element) => {
         return element.type === ElementKinds.image || isVoid(element);
     };
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, contextClipboardData) => {
         const clipboardData = await getClipboardData(data);
-        if (clipboardData?.files?.length) {
+        const res = await customInsertFragmentData(data, contextClipboardData);
+        if (!res && clipboardData?.files?.length) {
             const imageFiles = [];
             const imageTypes = getPluginOptions(editor, PluginKeys.image)?.imageTypes;
             for (const file of data.files) {
@@ -11903,7 +11909,7 @@ const withImage = (editor) => {
                 return true;
             }
         }
-        return customInsertFragmentData(data);
+        return res;
     };
     editor.renderElement = (element) => {
         if (element.type === ElementKinds.image) {
@@ -12464,7 +12470,7 @@ const withLink = (editor) => {
             insertText(text);
         }
     };
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, contextClipboardData) => {
         const clipboardData = await getClipboardData(data);
         const text = clipboardData?.text;
         if (!clipboardData?.elements && text && isUrl(text)) {
@@ -12485,7 +12491,7 @@ const withLink = (editor) => {
                 return true;
             }
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, contextClipboardData);
     };
     editor.renderElement = (element) => {
         if (element.type === ElementKinds.link) {
@@ -13409,7 +13415,7 @@ const withList = (editor) => {
         }
         deleteBackward(unit);
     };
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, clipboardData) => {
         const fragment = await extractFragment(data);
         if (fragment) {
             const aboveEntry = Editor.above(editor, {
@@ -13425,7 +13431,7 @@ const withList = (editor) => {
                 return true;
             }
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, clipboardData);
     };
     editor.onKeydown = (event) => {
         const isContinue = !onKeyDownList(event, editor);
@@ -17602,17 +17608,16 @@ const withTable = (editor) => {
         }
         setFragmentData(data, originEvent);
     };
-    editor.customInsertFragmentData = async (data) => {
+    editor.customInsertFragmentData = async (data, contextClipboardData) => {
         let fragment = await extractFragment(data);
         if (!fragment) {
-            fragment = await extractFragmentByHTML(data);
+            fragment = contextClipboardData ? contextClipboardData.elements : null;
         }
         if (fragment) {
             const opts = new TableOptions();
-            if (isSelectionInTable(opts, editor) &&
-                fragment.length === 1 &&
-                Element.isElement(fragment[0]) &&
-                fragment[0].type === ElementKinds.table) {
+            const isTableFragment = fragment.length === 1 && Element.isElement(fragment[0]) && fragment[0].type === ElementKinds.table;
+            if (isSelectionInTable(opts, editor) && (isTableFragment || isLogicTableElement(editor, fragment))) {
+                fragment = fragment.filter(node => node.type === ElementKinds.table);
                 const tablePosition = createTablePosition(editor);
                 const clipboardTable = fragment[0].children;
                 const clipboardRow = clipboardTable[0].children;
@@ -17678,9 +17683,9 @@ const withTable = (editor) => {
                     });
                 });
             }
-            return customInsertFragmentData(data);
+            return customInsertFragmentData(data, contextClipboardData);
         }
-        return customInsertFragmentData(data);
+        return customInsertFragmentData(data, null);
     };
     editor.normalizeNode = ([node, path]) => {
         if (Element.isElement(node) && node.type === ElementKinds.table) {