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

package/fesm2022/worktile-theia.mjs

@@ -10972,7 +10972,7 @@ const withDeserializeHTML = (editor) => {
             if (fragmentFromHTML.length === 1 && fragmentFromHTML[0].type === ElementKinds.image && data.files.length > 0) {
                 return customInsertFragmentData(data);
             }
-            if (fragmentFromHTML.length === 1 && fragmentFromHTML[0].type === ElementKinds.table) {
+            if (isLogicTableElement(editor, fragmentFromHTML)) {
                 return customInsertFragmentData(data);
             }
             // 过滤 text 节点的 color/background-color 属性
@@ -11005,6 +11005,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) {
@@ -11890,7 +11894,8 @@ const withImage = (editor) => {
     };
     editor.customInsertFragmentData = async (data) => {
         const clipboardData = await getClipboardData(data);
-        if (clipboardData?.files?.length) {
+        const res = await customInsertFragmentData(data);
+        if (!res && clipboardData?.files?.length) {
             const imageFiles = [];
             const imageTypes = getPluginOptions(editor, PluginKeys.image)?.imageTypes;
             for (const file of data.files) {
@@ -11903,7 +11908,6 @@ const withImage = (editor) => {
                 return true;
             }
         }
-        return customInsertFragmentData(data);
     };
     editor.renderElement = (element) => {
         if (element.type === ElementKinds.image) {
@@ -17609,10 +17613,9 @@ const withTable = (editor) => {
         }
         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;