@ones-editor/editor 2.8.25-beta.3 → 2.8.25-beta.5

package/dist/index.d.ts

@@ -45,6 +45,7 @@ export * from 'tiny-typed-emitter';
 export { ShareDBDocVersionsProvider, OnesEditorIcons, isLayoutBlock, LayoutQuickMenuItemFilter, CalloutQuickMenuItemFilter, MobileCommandHandler, PasteSpecialHandler };
 export type { FileBoxData, FileEmbedData } from '../@ones-editor/file';
 export * from './helper';
+export { OnesEditorComments, OnesEditorCommentsRender } from '../@ones-editor/comments';
 export { type DocListBlock } from '../@ones-editor/list-block';
 export declare function getDefaultOnesEditorOptions(options: CreateOnesEditorOptions): {
     id: string | undefined;

package/dist/index.js

@@ -70224,6 +70224,16 @@ ${codeText}
     });
     return resultMap;
   }
+  function getBlocksByCommentId(doc2, commentId) {
+    const result = [];
+    const resultMap = getBlockCommentsFromDoc(doc2);
+    resultMap.forEach((commentIds, blockId) => {
+      if (commentIds.has(commentId)) {
+        result.push(blockId);
+      }
+    });
+    return result;
+  }
   class OnesEditorCommentsRender {
     constructor(type = "current") {
       __publicField(this, "updateUnknownCommentsDelayed", debounce__default.default((editor) => {
@@ -70482,40 +70492,51 @@ ${codeText}
     }
     onUpdateCommentResolver(commentId, local) {
       const comment = this.commentsProvider.getComment(commentId);
-      const groupItem = this.list.findGroupItem(comment.groupId);
-      if (!groupItem) {
+      if (!comment) {
         return;
       }
-      setTimeout(() => {
-        if (this.listType === "current") {
-          if (comment.resolver) {
-            this.list.handleDeleteComment(commentId);
-          } else {
-            this.list.handleCreateComment(comment, local);
-          }
-        } else {
-          if (comment.resolver) {
-            this.list.handleCreateComment(comment, local);
-          } else {
-            this.list.handleDeleteComment(commentId);
-          }
+      let type = "add";
+      if (this.listType === "current") {
+        if (comment.resolver) {
+          type = "remove";
         }
-      }, 300);
-      this.updateCommentCount();
+      } else {
+        if (!comment.resolver) {
+          type = "remove";
+        }
+      }
       const blocks = /* @__PURE__ */ new Set();
-      getElementsByCommentId(this.editor, groupItem.comment.id).forEach((element) => {
-        if (isBlock$1(element)) {
-          blocks.add(element);
-        } else {
-          const block = getParentBlock(element);
+      if (type === "remove") {
+        getElementsByCommentId(this.editor, commentId).forEach((element) => {
+          if (isBlock$1(element)) {
+            blocks.add(element);
+          } else {
+            const block = getParentBlock(element);
+            if (block) {
+              blocks.add(block);
+            }
+          }
+        });
+      } else {
+        const blockIds = getBlocksByCommentId(this.editor.doc.toJSON(), commentId);
+        blockIds.forEach((blockId) => {
+          const block = this.editor.findBlockById(blockId);
           if (block) {
             blocks.add(block);
           }
-        }
-      });
+        });
+      }
       blocks.forEach((block) => {
         this.editor.reloadBlock(block);
       });
+      setTimeout(() => {
+        if (type === "add") {
+          this.list.handleCreateComment(comment, local);
+        } else {
+          this.list.handleDeleteComment(commentId);
+        }
+        this.updateCommentCount();
+      }, 300);
     }
     createList() {
       return new CommentGroupList(this.editor, this.commentsProvider, this.groupsContainer, this.listType);
@@ -71336,6 +71357,15 @@ ${codeText}
     get isMobile() {
       return clientType.isMobile;
     }
+    getCommentList() {
+      return this.commentList;
+    }
+    getMobileCommentList() {
+      return this.mobileCommentList;
+    }
+    getMiniCommentList() {
+      return this.miniCommentList;
+    }
     destroy() {
       var _a, _b;
       (_a = this.commentList) == null ? void 0 : _a.destroy();
@@ -71607,6 +71637,19 @@ ${codeText}
       method: "delete"
     });
   }
+  function updateCommentResolverToOldDoc(editor, version, commentId, resolver) {
+    var _a, _b;
+    const doc2 = editor.doc;
+    const server = (_b = (_a = doc2.getServerMeta) == null ? void 0 : _a.call(doc2)) == null ? void 0 : _b.apiServer;
+    assert(logger$16, server, "apiServer is not set");
+    const api = `${server}/${version}/comments/${commentId}/resolver`;
+    return doc2.request(api, {
+      method: "put",
+      data: {
+        resolver
+      }
+    });
+  }
   getLogger("resolved-comment-item");
   const styles = "";
   const isAllContainersSelected = (editor) => {
@@ -71684,6 +71727,14 @@ ${codeText}
       }
     }
     onUpdateCommentResolver(commentId, local) {
+      const comments = this.editor.getCustom("editor-comments");
+      const provider = comments.commentProvider;
+      const comment = provider.getComment(commentId);
+      if (!comment) {
+        return;
+      }
+      const resolver = comment.resolver;
+      updateCommentResolverToOldDoc(this.editor, this.version, commentId, resolver);
     }
     hideToolbar(editor) {
       const toolbar2 = editor.findCustom("toolbar-handler");
@@ -90883,8 +90934,12 @@ ${data2.plantumlText}
     localUpdateCommentResolver(commentId, resolver) {
       const comment = this.getComment(commentId);
       if (comment) {
-        comment.resolver = resolver;
-        this.localUpdateComment(comment, this.getCommentDoc(commentId));
+        if (resolver) {
+          comment.resolver = resolver;
+        } else {
+          delete comment.resolver;
+        }
+        Array.from(this._listeners.values()).forEach((listener) => listener.onUpdateCommentResolver(commentId, true));
       }
     }
     createCommentEditor(parent, childDoc) {
@@ -93678,7 +93733,7 @@ ${data2.plantumlText}
         }
       }
     });
-    editor.version = "2.8.25-beta.3";
+    editor.version = "2.8.25-beta.5";
     return editor;
   }
   function isDoc(doc2) {
@@ -93791,7 +93846,7 @@ ${data2.plantumlText}
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.25-beta.3";
+    editor.version = "2.8.25-beta.5";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -139761,6 +139816,8 @@ ${data2.plantumlText}
   exports2.MoreItem = MoreItem;
   exports2.NextIcon = NextIcon;
   exports2.OnesEditorAutoSuggest = OnesEditorAutoSuggest;
+  exports2.OnesEditorComments = OnesEditorComments;
+  exports2.OnesEditorCommentsRender = OnesEditorCommentsRender;
   exports2.OnesEditorCustomDataWrapper = OnesEditorCustomDataWrapper;
   exports2.OnesEditorExclusiveBlock = OnesEditorExclusiveBlock;
   exports2.OnesEditorHoveringBlock = OnesEditorHoveringBlock;

package/package.json

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