@ones-editor/editor 0.0.7-beta.41 → 0.0.7-beta.43

package/dist/index.js

@@ -9350,6 +9350,12 @@ var __publicField = (obj, key, value) => {
     constructor(editor, rootContainer) {
       __publicField(this, "resizeObserver");
       __publicField(this, "handleContextMenu", (event) => {
+        if (clientType.isSafari) {
+          const sel = document.getSelection();
+          if (sel && !sel.isCollapsed) {
+            sel.collapseToStart();
+          }
+        }
       });
       __publicField(this, "handleResize", () => {
         try {
@@ -9431,7 +9437,6 @@ var __publicField = (obj, key, value) => {
           this.editor.selectionHandler.handleMouseDown(event, { autoScroll: true });
         }
         if (!clientType.isMobileSafari) {
-          event.preventDefault();
           this.editor.input.focus();
         }
         if (event.button === 2) {
@@ -23285,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")
@@ -23315,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));
         }
@@ -23332,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);
@@ -23355,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);
         }
@@ -23370,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);
@@ -37579,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;
@@ -47306,14 +47315,14 @@ $$${mathData.mathjaxText}$$
         return lines2.join("\n");
       };
       const lines = [];
-      lines.push("<table>");
+      lines.push('<table style="border-collapse: collapse;">');
       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>`;
+            rowText += `<td colSpan="${cell.colSpan}" rowSpan="${cell.rowSpan}" style="border: 1px solid rgb(171, 171, 171); min-width: 20px">${cellText}</td>`;
           }
         }
         rowText += "</tr>";
@@ -50923,10 +50932,10 @@ ${codeText}
         const blockType = getBlockType(block);
         const isListBlock2 = blockType === "list";
         const isUnorderedList = isListBlock2 && ordered === false && !checkbox2;
-        const isOrderedList = isListBlock2 && ordered;
+        const isOrderedList2 = isListBlock2 && ordered;
         const isCheckList = isListBlock2 && !!checkbox2;
         this.createItem("unordered-list", UnorderedIcon, parent, isUnorderedList);
-        this.createItem("ordered-list", OrderedIcon, parent, isOrderedList);
+        this.createItem("ordered-list", OrderedIcon, parent, isOrderedList2);
         this.createItem("check-list", CheckboxIcon, parent, isCheckList);
       });
       __publicField(this, "handleClick", (editor, event) => {
@@ -55020,6 +55029,29 @@ ${codeText}
       }
     });
   }
+  function isOrderedList(elem) {
+    const startEl = elem.querySelector('[style="mso-list:Ignore"]');
+    if (startEl) {
+      const startValue = startEl.innerText;
+      return startValue && startValue.trim() !== "-";
+    }
+    return true;
+  }
+  function getListStart(elem) {
+    var _a;
+    const orderedList = isOrderedList(elem);
+    if (!orderedList) {
+      return 1;
+    }
+    const startEl = elem.querySelector('[style="mso-list:Ignore"]');
+    if (startEl) {
+      const startValue = startEl.innerText;
+      if (startValue) {
+        return (_a = Number.parseInt(startValue, 10)) != null ? _a : 1;
+      }
+    }
+    return 1;
+  }
   function getListData(elem) {
     if (!isList(elem)) {
       return {};
@@ -55027,10 +55059,10 @@ ${codeText}
     const level = getLevel(elem);
     const groupId = elem.getAttribute("data-group-id") || genId();
     return {
-      start: 1,
+      start: getListStart(elem),
       level,
       groupId,
-      ordered: true,
+      ordered: isOrderedList(elem),
       type: "list"
     };
   }

package/package.json

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