@ones-editor/editor 1.1.18-beta.13 → 1.1.18-beta.14

package/dist/index.js

@@ -43407,7 +43407,8 @@ ${codeText}
     let prevBlock = getPrevBlock(block);
     while (prevBlock) {
       if (!isListBlock(prevBlock)) {
-        return null;
+        prevBlock = getPrevBlock(prevBlock);
+        continue;
       }
       const { level: testLevel, groupId: testGroupId, type: testType } = getListBlockProperties(prevBlock);
       if (testLevel < level) {
@@ -44214,8 +44215,10 @@ ${codeText}
     }
     const newBlock = editor.insertBlock(getContainerId(container), blockIndex, newBlockData, createBlockSimpleDocRange(newBlockData.id, 0));
     editor.deleteBlock(draggedBlock);
-    const fixStart2 = new FixStartByList(editor, newBlock);
-    fixStart2.fix();
+    if (groupId !== oldData.groupId) {
+      const fixStart2 = new FixStartByList(editor, newBlock);
+      fixStart2.fix();
+    }
     fixStart1 == null ? void 0 : fixStart1.fix();
     return true;
   }
@@ -45098,6 +45101,7 @@ ${codeText}
   }
   class ListBlockInputHandler {
     constructor(editor) {
+      __publicField(this, "fixStartByList", null);
       this.editor = editor;
     }
     handleBeforeKeyDown(editor, event) {
@@ -45139,6 +45143,66 @@ ${codeText}
       }
       return this.editor.undoManager.runInGroup(() => handleTab$2(this.editor));
     }
+    getPreListBlock(editor) {
+      const startBlock = editor.selection.startBlock;
+      if (isListBlock(startBlock)) {
+        return startBlock;
+      }
+      const preBlock = getPrevBlock(startBlock);
+      if (preBlock && isListBlock(preBlock)) {
+        return preBlock;
+      }
+      return null;
+    }
+    async handleBeforePasteDoc(editor, doc2) {
+      const preBlock = this.getPreListBlock(editor);
+      const preBlockData = preBlock ? editor.getBlockData(preBlock) : null;
+      if (preBlock) {
+        this.fixStartByList = new FixStartByWillDeletedList(editor, preBlock);
+      }
+      const groupIds = /* @__PURE__ */ new Map();
+      const getGroupId = (id) => {
+        if (groupIds.has(id)) {
+          return groupIds.get(id);
+        }
+        return id;
+      };
+      Object.values(doc2.blocks).forEach((blocks) => {
+        blocks.forEach((block, index2) => {
+          var _a;
+          if (block.type === "list") {
+            const preDocBlock = (_a = blocks[index2 - 1]) != null ? _a : preBlockData;
+            let needReset = !preDocBlock || preDocBlock.type !== "list" || preDocBlock.level !== block.level;
+            if (needReset && index2 !== 0) {
+              needReset = getGroupId(preDocBlock.groupId) !== block.groupId;
+            }
+            if (needReset) {
+              block.start = 1;
+              const newGroupId = genId();
+              groupIds.set(newGroupId, block.groupId);
+              block.groupId = newGroupId;
+            } else {
+              if (index2 === 0 && isListBlock(editor.selection.startBlock)) {
+                block.start = preDocBlock.start;
+              } else {
+                block.start = preDocBlock.start + 1;
+              }
+              block.groupId = preDocBlock.groupId;
+            }
+          }
+        });
+      });
+      return false;
+    }
+    async handleAfterPaste(editor) {
+      editor.undoManager.runInGroup(() => {
+        if (this.fixStartByList) {
+          this.fixStartByList.fix();
+          this.fixStartByList = null;
+        }
+      });
+      return false;
+    }
   }
   class ListClearSelectionHandler {
     constructor(editor) {
@@ -77058,7 +77122,7 @@ ${data.flowchartText}
         }
       }
     });
-    editor.version = "1.1.18-beta.13";
+    editor.version = "1.1.18-beta.14";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -77146,7 +77210,7 @@ ${data.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "1.1.18-beta.13";
+    editor.version = "1.1.18-beta.14";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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