@ones-editor/editor 0.0.7-beta.42 → 0.0.7-beta.45

package/dist/index.js

@@ -23290,7 +23290,7 @@ var __publicField = (obj, key, value) => {
     const containerId = getContainerId(container);
     editor.doc.beginBatchUpdate();
     editor.undoManager.runInGroup(() => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const childContainers = [];
       Object.entries(doc2.blocks).forEach(([containerId2, blocks2]) => {
         if (containerId2 === "root")
@@ -23320,12 +23320,19 @@ var __publicField = (obj, key, value) => {
         const isTitleBlock2 = containerId === "root" && editor.getBlockByIndex(containerId, 0) === block;
         const blockIndex2 = getBlockIndex(block);
         let lastBlock22;
-        blocks.forEach((b, index2) => {
-          const newBlock2 = editor.insertBlock(containerId, blockIndex2 + index2, b, void 0, { noFocus: true });
-          if (index2 === blocks.length - 1) {
+        for (let i = 0; i < blocks.length; i++) {
+          if (i === 0) {
+            const currentBlock = editor.getBlockByIndex(containerId, blockIndex2);
+            if (currentBlock && isTextKindBlock(editor, currentBlock) && isEmptyTextBlock(editor, currentBlock) && blocks[i].type === "text") {
+              editor.insertTextToBlock(block, 0, (_a = blocks[i].text) != null ? _a : []);
+              continue;
+            }
+          }
+          const newBlock2 = editor.insertBlock(containerId, blockIndex2 + i, blocks[i], void 0, { noFocus: true });
+          if (i === blocks.length - 1) {
             lastBlock22 = newBlock2;
           }
-        });
+        }
         if (lastBlock22) {
           editor.selection.selectBlock(lastBlock22, getBlockTextLength$4(editor, lastBlock22));
         }
@@ -23337,7 +23344,7 @@ var __publicField = (obj, key, value) => {
       if (blocks.length === 1) {
         const newBlock2 = blocks[0];
         if (isTextKindBlockType(editor, newBlock2.type)) {
-          editor.insertTextToBlock(block, offset, (_a = newBlock2.text) != null ? _a : []);
+          editor.insertTextToBlock(block, offset, (_b = newBlock2.text) != null ? _b : []);
           return;
         }
         editor.breakTextBlock(block, offset);
@@ -23360,7 +23367,7 @@ var __publicField = (obj, key, value) => {
       if (!atTextEnd) {
         editor.selection.selectBlock(newBlock, 0);
         if (isTextKindBlockType(editor, lastBlock2.type)) {
-          editor.insertTextToBlock(newBlock, 0, (_b = lastBlock2.text) != null ? _b : []);
+          editor.insertTextToBlock(newBlock, 0, (_c = lastBlock2.text) != null ? _c : []);
         } else {
           editor.insertBlock(containerId, breakIndex, lastBlock2);
         }
@@ -23375,7 +23382,7 @@ var __publicField = (obj, key, value) => {
           editor.insertBlock(containerId, breakIndex, firstBlock);
           insertOtherBlockIndex += 1;
         } else {
-          editor.insertTextToBlock(block, offset, (_c = firstBlock.text) != null ? _c : []);
+          editor.insertTextToBlock(block, offset, (_d = firstBlock.text) != null ? _d : []);
         }
       } else {
         editor.insertBlock(containerId, breakIndex, firstBlock);
@@ -37584,9 +37591,6 @@ var __publicField = (obj, key, value) => {
         this._rows.push(new DocTableRow(this.colCount));
       }
       this.fillGrid();
-      if (tableData.colsWidth) {
-        assert(logger$22, this.colCount === tableData.colsWidth.length, "invalid col count");
-      }
     }
     get rowCount() {
       return this._data.rows;
@@ -47220,6 +47224,16 @@ $$${mathData.mathjaxText}$$
     const cjkCount = countCJKChars(text2);
     return text2.length + cjkCount;
   }
+  function getCellColWidthByData(col, colSpan, colsWidth = []) {
+    let width = 0;
+    if (!colsWidth || colsWidth.length === 0) {
+      return width;
+    }
+    for (let i = col; i < col + colSpan; i += 1) {
+      width += colsWidth[i] || 0;
+    }
+    return width;
+  }
   function padText(text2, length) {
     const textLength = getTextLengthWithCJK(text2);
     const paddingLength = length - textLength;
@@ -47229,6 +47243,7 @@ $$${mathData.mathjaxText}$$
     return text2;
   }
   function convertTo$d(editor, blockData, doc2, type, path) {
+    var _a;
     const table = blockData;
     const grid = new DocTableGrid(table);
     if (type === "markdown" || type === "text") {
@@ -47311,14 +47326,16 @@ $$${mathData.mathjaxText}$$
         return lines2.join("\n");
       };
       const lines = [];
-      lines.push("<table>");
+      const tableWidth = (_a = table.colsWidth) == null ? void 0 : _a.reduce((previousValue, currentValue) => previousValue + currentValue, 0).toString();
+      lines.push(`<table style="border-collapse: collapse; min-width: ${tableWidth}">`);
       for (let row = 0; row < grid.rowCount; row++) {
         let rowText = "<tr>";
         for (let col = 0; col < grid.colCount; col++) {
           const cell = grid.getCell({ row, col });
           if (!cell.virtual) {
             const cellText = getContainerHtml(cell.containerId);
-            rowText += `<td colSpan="${cell.colSpan}" rowSpan="${cell.rowSpan}">${cellText}</td>`;
+            const width = getCellColWidthByData(col, cell.colSpan, table.colsWidth).toString() || "100";
+            rowText += `<td colSpan="${cell.colSpan}" rowSpan="${cell.rowSpan}" data-width="${width}" style="padding: 8px; border: 1px solid rgb(171, 171, 171);">${cellText}</td>`;
           }
         }
         rowText += "</tr>";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "0.0.7-beta.42",
+  "version": "0.0.7-beta.45",
   "type": "module",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",