@ones-editor/editor 1.1.18-beta.11 → 1.1.18-beta.12

package/dist/index.js

@@ -27108,16 +27108,16 @@ ${codeText}
       }
       this.afterRange = range;
     }
-    findContainerById(editor, id) {
+    hasDocContainerId(editor, id) {
       const blocks = editor.doc.findContainerBlocks(id);
       return !!blocks;
     }
-    findBlockById(editor, id) {
+    findDocBlockById(editor, id) {
       const blocks = editor.doc.findContainerBlocks(this.containerId);
       if (!blocks) {
-        return false;
+        return void 0;
       }
-      return blocks.some((item) => item.id === id);
+      return blocks.find((item) => item.id === id);
     }
     checkBlockData(editor, blockData) {
       if (Array.isArray(blockData.children)) {
@@ -27144,46 +27144,36 @@ ${codeText}
       this.blockIndex = blockIndex;
     }
     deleteBlock(editor, newRange) {
-      if (!this.findContainerById(editor, this.containerId)) {
+      if (!this.hasDocContainerId(editor, this.containerId)) {
         logger$2G.warn(`container (${this.containerId}) not found, deleted by others?`);
         return false;
       }
-      if (!this.findBlockById(editor, this.blockData.id)) {
-        logger$2G.warn(`block (${this.blockData.id}) not found, deleted by others?`);
-        return false;
-      }
       const container = editor.getContainerById(this.containerId);
       if (!container)
         return false;
-      const block = editor.getBlockById(this.blockData.id);
+      const block = editor.findBlockById(this.blockData.id);
       if (!block)
         return false;
-      try {
-        assert(logger$2G, this.blockIndex === getBlockIndex(block), "invalid block index");
-        editorDeleteBlockWithoutChildren(editor, block, fromDocRange(editor, newRange));
-      } catch (error2) {
-        logger$2G.warn(error2.message);
-        editor.selection.selectBlock(block, 0);
-      }
+      editorDeleteBlockWithoutChildren(editor, block, fromDocRange(editor, newRange));
       return true;
     }
     insertBlock(editor, newRange) {
-      if (!this.findContainerById(editor, this.containerId)) {
+      if (!this.hasDocContainerId(editor, this.containerId)) {
         logger$2G.warn(`container (${this.containerId}) not found, deleted by others?`);
         return false;
       }
       if (!this.checkBlockData(editor, this.blockData)) {
         return false;
       }
-      try {
-        editorInsertBlock(editor, this.containerId, this.blockIndex, cloneDeep__default.default(this.blockData), newRange);
-      } catch (error2) {
-        logger$2G.warn(error2.message);
-        const blocks = editor.doc.getContainerBlocks(this.containerId);
-        const index2 = Math.min(blocks.length - 1, this.blockIndex);
-        const block = editor.getBlockByIndex(this.containerId, index2);
-        editor.selection.selectBlock(block, 0);
+      if (!editor.findBlockByIndex(this.containerId, Math.max(0, this.blockIndex - 1))) {
+        logger$2G.warn(`block (${Math.max(0, this.blockIndex - 1)}) not found, deleted by others?`);
+        return false;
+      }
+      if (editor.findBlockById(this.blockData.id)) {
+        logger$2G.warn(`block (${this.blockData.id}) already exists, inserted by others?`);
+        return false;
       }
+      editorInsertBlock(editor, this.containerId, this.blockIndex, cloneDeep__default.default(this.blockData), newRange);
       return true;
     }
   }
@@ -27215,20 +27205,24 @@ ${codeText}
     }
     undo(editor) {
       let ret = false;
-      this.actions.concat().reverse().forEach((action) => {
+      for (const action of this.actions.concat().reverse()) {
         if (action.undo(editor)) {
           ret = true;
+        } else {
+          break;
         }
-      });
+      }
       return ret;
     }
     redo(editor) {
       let ret = false;
-      this.actions.forEach((action) => {
+      for (const action of this.actions) {
         if (action.redo(editor)) {
           ret = true;
+        } else {
+          break;
         }
-      });
+      }
       return ret;
     }
     setAfterRange(range) {
@@ -27354,11 +27348,11 @@ ${codeText}
       };
     }
     undo(editor) {
-      if (!this.findContainerById(editor, this.containerId)) {
+      if (!this.hasDocContainerId(editor, this.containerId)) {
         logger$2E.warn(`container (${this.containerId}) not found, deleted by others?`);
         return false;
       }
-      if (!this.findBlockById(editor, this.blockId)) {
+      if (!this.findDocBlockById(editor, this.blockId)) {
         logger$2E.warn(`block (${this.blockId}) not found, deleted by others?`);
         return false;
       }
@@ -27372,11 +27366,11 @@ ${codeText}
       return true;
     }
     redo(editor) {
-      if (!this.findContainerById(editor, this.containerId)) {
+      if (!this.hasDocContainerId(editor, this.containerId)) {
         logger$2E.warn(`container (${this.containerId}) not found, deleted by others?`);
         return false;
       }
-      if (!this.findBlockById(editor, this.blockId)) {
+      if (!this.findDocBlockById(editor, this.blockId)) {
         logger$2E.warn(`block (${this.blockId}) not found, deleted by others?`);
         return false;
       }
@@ -27429,7 +27423,7 @@ ${codeText}
       this.blocks = blocks;
     }
     deleteChildContainer(editor) {
-      if (!this.findContainerById(editor, this.containerId)) {
+      if (!this.hasDocContainerId(editor, this.containerId)) {
         logger$2D.warn(`container (${this.containerId}) not found, deleted by others?`);
         return false;
       }
@@ -27437,7 +27431,7 @@ ${codeText}
       return true;
     }
     insertChildContainer(editor) {
-      if (this.findContainerById(editor, this.containerId)) {
+      if (this.hasDocContainerId(editor, this.containerId)) {
         logger$2D.warn(`container (${this.containerId}) already exists`);
         return false;
       }
@@ -70531,12 +70525,8 @@ ${codeText}
         }
         if (!this.filterMemoed || ((_a = v.extra) == null ? void 0 : _a.memo)) {
           hasItems = true;
-          let name = getVersionName(v);
-          let id = `${v.version}`;
-          if (i === index2 + 1) {
-            name = "Previous version";
-            id = "prev-version";
-          }
+          const name = getVersionName(v);
+          const id = `${v.version}`;
           const item = {
             id,
             name,
@@ -77067,7 +77057,7 @@ ${data.flowchartText}
         }
       }
     });
-    editor.version = "1.1.18-beta.11";
+    editor.version = "1.1.18-beta.12";
     if (Logger$2.level === LogLevel.DEBUG) {
       window.setReauthFail = (fail) => {
         window.isReauthError = fail;
@@ -77155,7 +77145,7 @@ ${data.flowchartText}
     });
     editor.addCustom(DOC_RE_AUTH_KEYS, (editor2) => new DocReAuthCallbacks(editor2));
     OnesEditorToolbar.register(editor);
-    editor.version = "1.1.18-beta.11";
+    editor.version = "1.1.18-beta.12";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {

package/package.json

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