@ones-editor/editor 3.1.2-beta.2 → 3.1.2-beta.ONES22301271.2

package/dist/index.js

@@ -27250,9 +27250,16 @@ var __publicField = (obj, key, value) => {
   const logger$3I = getLogger("delete-block");
   function getAllChildContainers(editor, blockData, containerIds) {
     if (blockData.children) {
-      containerIds.push(...blockData.children);
       blockData.children.forEach((childContainerId) => {
-        const childBlocks = editor.getChildContainerData(childContainerId);
+        if (containerIds.has(childContainerId)) {
+          return;
+        }
+        const childBlocks = editor.doc.findContainerBlocks(childContainerId);
+        if (!Array.isArray(childBlocks)) {
+          logger$3I.warn(`skip invalid child container while deleting: parentBlock=${blockData.id}, container=${childContainerId}`);
+          return;
+        }
+        containerIds.add(childContainerId);
         childBlocks.forEach((childBlock) => {
           getAllChildContainers(editor, childBlock, containerIds);
         });
@@ -27284,31 +27291,31 @@ var __publicField = (obj, key, value) => {
         }
       }
       const blockData = editorDeleteBlockWithoutChildren(editor, block, newRange);
-      const childContainerIds = [];
+      const childContainerIds = /* @__PURE__ */ new Set();
       getAllChildContainers(editor, blockData, childContainerIds);
-      if (childContainerIds.length > 0) {
-        editor.doc.localDeleteChildContainers(childContainerIds);
+      if (childContainerIds.size > 0) {
+        editor.doc.localDeleteChildContainers(Array.from(childContainerIds));
       }
       return blockData;
     });
   }
   function editorDeleteChildContainer(editor, containerId) {
-    const containerIds = [containerId];
+    const containerIds = /* @__PURE__ */ new Set([containerId]);
     const childBlocks = editor.doc.getContainerBlocks(containerId);
     childBlocks.forEach((childBlock) => {
       getAllChildContainers(editor, childBlock, containerIds);
     });
-    editor.doc.localDeleteChildContainers(containerIds);
+    editor.doc.localDeleteChildContainers(Array.from(containerIds));
   }
   function editorDeleteChildContainers(editor, childContainerIds) {
-    const containerIds = [...childContainerIds];
+    const containerIds = new Set(childContainerIds);
     childContainerIds.forEach((containerId) => {
       const childBlocks = editor.doc.getContainerBlocks(containerId);
       childBlocks.forEach((childBlock) => {
         getAllChildContainers(editor, childBlock, containerIds);
       });
     });
-    editor.doc.localDeleteChildContainers(containerIds);
+    editor.doc.localDeleteChildContainers(Array.from(containerIds));
   }
   const logger$3H = getLogger("merge-text-block");
   function editorMergeTextBlock(editor, block1, block2) {
@@ -32135,7 +32142,7 @@ ${codeText}
   const logger$3a = getLogger("editor");
   class Editor extends tinyTypedEmitter.TypedEmitter {
     constructor(parent, doc2, optionalOptions) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
       super();
       __publicField(this, "parent");
       __publicField(this, "rootElement");
@@ -32180,22 +32187,27 @@ ${codeText}
       this.setMaxListeners(100);
       this.options = {
         colors: (_a = optionalOptions == null ? void 0 : optionalOptions.colors) != null ? _a : ["#B21B57", "#008796", "#7241CC", "#CC4C08", "#5D8F00", "#BD2C1C", "#D17D00"],
-        componentsOptions: (_c = (_b = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _b.options) != null ? _c : {},
+        readonly: (_b = optionalOptions == null ? void 0 : optionalOptions.readonly) != null ? _b : false,
+        componentsOptions: (_d = (_c = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _c.options) != null ? _d : {},
         scrollContainer: optionalOptions == null ? void 0 : optionalOptions.scrollContainer,
-        enableComments: (_d = optionalOptions == null ? void 0 : optionalOptions.enableComments) != null ? _d : true,
-        enableResolveComments: (_e = optionalOptions == null ? void 0 : optionalOptions.enableResolveComments) != null ? _e : true,
-        enableContextMenu: (_f = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _f : true,
-        dateTimeFormatter: (_g = optionalOptions == null ? void 0 : optionalOptions.dateTimeFormatter) != null ? _g : (v) => v.toLocaleString()
+        enableComments: (_e = optionalOptions == null ? void 0 : optionalOptions.enableComments) != null ? _e : true,
+        enableResolveComments: (_f = optionalOptions == null ? void 0 : optionalOptions.enableResolveComments) != null ? _f : true,
+        enableContextMenu: (_g = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _g : true,
+        dateTimeFormatter: (_h = optionalOptions == null ? void 0 : optionalOptions.dateTimeFormatter) != null ? _h : (v) => v.toLocaleString()
       };
-      this.settingsProvider = (_h = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _h : new DefaultSettingsProvider(this);
+      this._readonly = this.options.readonly;
+      this.settingsProvider = (_i = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _i : new DefaultSettingsProvider(this);
       registerComponents(this, optionalOptions == null ? void 0 : optionalOptions.components);
-      this.blockHooks.push(...(_j = (_i = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _i.blockHooks) != null ? _j : []);
-      this.id = (_k = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _k : genId();
+      this.blockHooks.push(...(_k = (_j = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _j.blockHooks) != null ? _k : []);
+      this.id = (_l = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _l : genId();
       this.clientId = genId();
       this.undoManager = new UndoManager(this);
       this.doc = new EditorDoc(this, doc2, this.undoManager);
       this.parent = parent;
       this.rootElement = createElement("div", ["editor-root"], this.parent);
+      if (this._readonly) {
+        addClass(this.rootElement, "readonly");
+      }
       this.rootElement.setAttribute("data-editor-client-id", this.clientId);
       this.contentElement = createElement("div", ["editor-content"], this.rootElement);
       this.rootContainerObject = createRootContainer(this);
@@ -32213,7 +32225,7 @@ ${codeText}
         addClass(this.rootElement, "safari");
       }
       if (this._readonly) {
-        addClass(this.rootElement, "readonly");
+        this.readonly = true;
       }
       this.emit("load", this, false);
     }
@@ -64281,7 +64293,7 @@ $$${mathData.mathjaxText}$$
     return attributes.filter((attribute) => attribute.startsWith("comment-")).map((attribute) => attribute.replace("comment-", ""));
   }
   const logger$1I = getLogger("doc-comments");
-  function addBlockComments$1(doc2, block, result, resultSet) {
+  function addBlockComments$1(doc2, block, result, resultSet, invalidContainers) {
     if (block.comments) {
       const blockComments = block.comments;
       if (Array.isArray(blockComments)) {
@@ -64317,19 +64329,23 @@ $$${mathData.mathjaxText}$$
     children.forEach((childContainerId) => {
       const childBlocks = doc2.blocks[childContainerId];
       if (!Array.isArray(childBlocks)) {
-        logger$1I.error(`skip invalid comment child container: parent=${block.id}, container=${childContainerId}`);
+        if (!invalidContainers.has(childContainerId)) {
+          invalidContainers.add(childContainerId);
+          logger$1I.warn(`skip invalid comment child container: parentBlock=${block.id}, container=${childContainerId}`);
+        }
         return;
       }
       childBlocks.forEach((subBlock) => {
-        addBlockComments$1(doc2, subBlock, result, resultSet);
+        addBlockComments$1(doc2, subBlock, result, resultSet, invalidContainers);
       });
     });
   }
   function getCommentsFromDoc(doc2) {
     const result = [];
     const resultSet = /* @__PURE__ */ new Set();
+    const invalidContainers = /* @__PURE__ */ new Set();
     doc2.blocks.root.forEach((block) => {
-      addBlockComments$1(doc2, block, result, resultSet);
+      addBlockComments$1(doc2, block, result, resultSet, invalidContainers);
     });
     const resultMap = /* @__PURE__ */ new Map();
     result.forEach((commentId, index2) => resultMap.set(commentId, index2));
@@ -71511,7 +71527,7 @@ ${codeText}
     }
   }
   const logger$1f = getLogger("block-comments");
-  function addBlockComments(doc2, block, resultMap) {
+  function addBlockComments(doc2, block, resultMap, invalidContainers) {
     if (block.comments) {
       const blockComments = block.comments;
       if (Array.isArray(blockComments)) {
@@ -71551,18 +71567,22 @@ ${codeText}
     children.forEach((childContainerId) => {
       const childBlocks = doc2.blocks[childContainerId];
       if (!Array.isArray(childBlocks)) {
-        logger$1f.error(`skip invalid comment child container: parent=${block.id}, container=${childContainerId}`);
+        if (!invalidContainers.has(childContainerId)) {
+          invalidContainers.add(childContainerId);
+          logger$1f.warn(`skip invalid comment child container: parentBlock=${block.id}, container=${childContainerId}`);
+        }
         return;
       }
       childBlocks.forEach((subBlock) => {
-        addBlockComments(doc2, subBlock, resultMap);
+        addBlockComments(doc2, subBlock, resultMap, invalidContainers);
       });
     });
   }
   function getBlockCommentsFromDoc(doc2) {
     const resultMap = /* @__PURE__ */ new Map();
+    const invalidContainers = /* @__PURE__ */ new Set();
     doc2.blocks.root.forEach((block) => {
-      addBlockComments(doc2, block, resultMap);
+      addBlockComments(doc2, block, resultMap, invalidContainers);
     });
     return resultMap;
   }
@@ -97080,7 +97100,7 @@ ${JSON.stringify(error2, null, 2)}`);
         }
       }
     });
-    editor.version = "3.1.2-beta.2";
+    editor.version = "3.1.2-beta.ONES22301271.2";
     return editor;
   }
   function isDoc(doc2) {
@@ -97099,35 +97119,31 @@ ${JSON.stringify(error2, null, 2)}`);
     const enableComments = options == null ? void 0 : options.enableComments;
     const quickMenu = (_c = (_b = options.componentsOptions) == null ? void 0 : _b.quickMenu) != null ? _c : { id: "quick-menu", trigger: ["/"], commandProviders: [] };
     (_d = quickMenu.commandProviders) == null ? void 0 : _d.push(new GraphCommandProvider());
-    let editorForCleanup;
+    const editor = createEditor(root2, doc2, {
+      id: options.id,
+      readonly: options.readonly,
+      scrollContainer: options == null ? void 0 : options.scrollContainer,
+      enableResolveComments: options == null ? void 0 : options.enableResolveComments,
+      enableComments,
+      dateTimeFormatter: options.dateTimeFormatter,
+      components: {
+        blocks: [...StandardBlocks, ...(_f = (_e = options.components) == null ? void 0 : _e.blocks) != null ? _f : []],
+        commandProviders: [new TableBlockCommandProvider()],
+        decorators: [new CodeTextDecorator(), new RemoteCaretsDecorator()],
+        embeds: [...StandardEmbeds, ...((_g = options.components) == null ? void 0 : _g.embeds) || []],
+        boxes: [MathjaxBox, MentionBox, FileBox, StatusBox, ...((_h = options.components) == null ? void 0 : _h.boxes) || []],
+        insertions: [RemoteCaretsInsertion],
+        blockHooks: [...((_i = options.components) == null ? void 0 : _i.blockHooks) || []],
+        textRenders: [
+          enableComments && new OnesEditorCommentsRender(),
+          new BlockPaddingRender(),
+          ...((_j = options.components) == null ? void 0 : _j.textRenders) || []
+        ].filter(Boolean),
+        options: { ...options.componentsOptions, quickMenu }
+      },
+      shortcuts: [TableShortcuts, FindReplaceShortcuts, TextStyleShortcuts, DefaultShortcuts]
+    });
     try {
-      const editor = createEditor(root2, doc2, {
-        id: options.id,
-        scrollContainer: options == null ? void 0 : options.scrollContainer,
-        enableResolveComments: options == null ? void 0 : options.enableResolveComments,
-        enableComments,
-        dateTimeFormatter: options.dateTimeFormatter,
-        components: {
-          blocks: [...StandardBlocks, ...(_f = (_e = options.components) == null ? void 0 : _e.blocks) != null ? _f : []],
-          commandProviders: [new TableBlockCommandProvider()],
-          decorators: [new CodeTextDecorator(), new RemoteCaretsDecorator()],
-          embeds: [...StandardEmbeds, ...((_g = options.components) == null ? void 0 : _g.embeds) || []],
-          boxes: [MathjaxBox, MentionBox, FileBox, StatusBox, ...((_h = options.components) == null ? void 0 : _h.boxes) || []],
-          insertions: [RemoteCaretsInsertion],
-          blockHooks: [...((_i = options.components) == null ? void 0 : _i.blockHooks) || []],
-          textRenders: [
-            enableComments && new OnesEditorCommentsRender(),
-            new BlockPaddingRender(),
-            ...((_j = options.components) == null ? void 0 : _j.textRenders) || []
-          ].filter(Boolean),
-          options: { ...options.componentsOptions, quickMenu }
-        },
-        shortcuts: [TableShortcuts, FindReplaceShortcuts, TextStyleShortcuts, DefaultShortcuts]
-      });
-      editorForCleanup = editor;
-      if (options.readonly) {
-        editor.readonly = true;
-      }
       if (options.compact) {
         addClass(editor.rootElement, "compact");
         if (options.headingButton === false)
@@ -97220,19 +97236,14 @@ ${JSON.stringify(error2, null, 2)}`);
       OnesEditorDropTarget.register(editor);
       OnesEditorTocProvider.register(editor);
       OnesEditorExclusiveBlock.register(editor);
-      editor.version = "3.1.2-beta.2";
+      editor.version = "3.1.2-beta.ONES22301271.2";
       return editor;
     } catch (error2) {
-      if (editorForCleanup) {
-        try {
-          editorForCleanup.destroy();
-        } catch (destroyError) {
-          logger.error(destroyError);
-        }
-      } else {
-        doc2.destroy();
+      try {
+        editor.destroy();
+      } catch (destroyError) {
+        logger.error(`failed to rollback local editor: ${destroyError.message}`);
       }
-      root2.replaceChildren();
       throw error2;
     }
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ones-editor/editor",
-  "version": "3.1.2-beta.2",
+  "version": "3.1.2-beta.ONES22301271.2",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {