@ones-editor/editor 2.8.27 → 2.8.28-beta.1

package/dist/index.js

@@ -4116,6 +4116,7 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
 .comment-item-root .item-head-tools {
   display: flex;
   align-items: center;
+  justify-content: center;
   visibility: hidden;
 }
 .comment-item-root .item-head-tools .editor-text-button {
@@ -4125,8 +4126,8 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   color: #0064ff;
 }
 .comment-item-root .item-head-tools .editor-text-button svg {
-  width: 20px;
-  height: 20px;
+  width: 16px;
+  height: 16px;
 }
 .comment-item-root .item-head-tools.active {
   visibility: visible;
@@ -4319,6 +4320,36 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   will-change: width;
   font-family: var(--editor-font-family);
 }
+.editor-web-comment-root.disable-resolve .comment-groups-container .item-head-switch .editor-text-button[data-button-id=resolve] {
+  display: none;
+}
+.editor-web-comment-root.disable-resolve .comment-groups-container .comment-actions button.comment-reopen {
+  display: none;
+}
+.editor-web-comment-root[list-type=resolved] .comment-groups-container {
+  display: flex;
+  flex-direction: column;
+  gap: 20px;
+  padding-left: 8px;
+  padding-top: 60px;
+}
+.editor-web-comment-root[list-type=resolved] .comment-groups-container .comment-no-resolved-tip {
+  font-size: 12px;
+  width: 100%;
+  color: #BEBFC2;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  margin-top: 100px;
+}
+.editor-web-comment-root[list-type=resolved] .comment-groups-container .comment-group-item-root {
+  position: inherit;
+  transform: none;
+}
+.editor-web-comment-root[list-type=resolved] .comment-groups-container .comment-group-item-root::before {
+  left: 8px;
+  right: 8px;
+}
 .editor-web-comment-root .comment-groups-container .comment-group-item-root {
   position: absolute;
   left: 50%;
@@ -4332,8 +4363,17 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   box-shadow: var(--editor-box-shadow);
   padding-bottom: 10px;
 }
+.editor-web-comment-root .comment-groups-container .comment-group-item-root.resolved .comment-item-head .item-head-switch {
+  display: none;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root.resolved .item-head-tools {
+  display: none;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root.resolved .comment-quick-reply {
+  display: none;
+}
 .editor-web-comment-root .comment-groups-container .comment-group-item-root:not(.no-animation) {
-  transition: top 0.2s ease-in, opacity 0.35s ease-in;
+  transition: top 0.2s ease-in, opacity 0.2s ease-in;
 }
 .editor-web-comment-root .comment-groups-container .comment-group-item-root::before {
   content: "";
@@ -4380,16 +4420,23 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   display: flex;
   align-items: center;
   height: 22px;
-  visibility: hidden;
 }
 .editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-head .item-head-switch .editor-text-button {
   padding: 0;
   width: var(--editor-comment-switch-button-width);
-  margin: 3px 0;
+  margin-right: 5px;
   color: #606060;
+  width: 16px;
+  height: 16px;
 }
 .editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-head .item-head-switch .editor-text-button[data-button-id=switch-up] {
-  margin-right: 16px;
+  visibility: hidden;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-head .item-head-switch .editor-text-button[data-button-id=switch-down] {
+  visibility: hidden;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-head .item-head-switch .editor-text-button[data-button-id=resolve] {
+  margin-right: 0;
 }
 .editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-head .item-head-switch .editor-text-button:not(.disabled):hover {
   color: var(--text-button-color-hover);
@@ -4398,15 +4445,57 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   color: rgba(96, 96, 96, 0.5019607843);
   cursor: not-allowed;
 }
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer {
+  font-size: 12px;
+  line-height: 20px;
+  color: #87888A;
+  margin-top: 10px;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer .comment-actions {
+  display: flex;
+  align-items: center;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer .comment-actions .comment-date {
+  flex: 1;
+  white-space: nowrap;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer .comment-actions .removed-tips {
+  color: #87888A;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  overflow: hidden;
+  margin-left: 10px;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer .comment-actions .comment-reopen {
+  background: none;
+  border: none;
+  cursor: pointer;
+  color: #575859;
+  font-size: 12px;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root .comment-item-footer .comment-actions .comment-reopen:hover {
+  color: #0064FF;
+}
 .editor-web-comment-root .comment-groups-container .comment-group-item-root.active::before {
   background-color: #f59300;
 }
-.editor-web-comment-root .comment-groups-container .comment-group-item-root.active .item-head-switch {
+.editor-web-comment-root .comment-groups-container .comment-group-item-root.active .item-head-switch .editor-text-button[data-button-id=switch-up] {
+  visibility: visible;
+}
+.editor-web-comment-root .comment-groups-container .comment-group-item-root.active .item-head-switch .editor-text-button[data-button-id=switch-down] {
   visibility: visible;
 }
 .editor-web-comment-root .comment-groups-container .comment-group-item-root.readonly .comment-quick-reply .quick-reply-button.invisible {
   display: none;
 }
+.editor-web-comment-root .comment-switcher-container {
+  position: absolute;
+  z-index: 1;
+  top: 0;
+  left: 0;
+  right: 0;
+  font-size: 14px;
+}
 .editor-mobile-comments-root {
   position: fixed;
   left: 0;
@@ -4508,6 +4597,82 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
 }
 :is(.editor-web-comment-root, .editor-mobile-comments-root, .editor-mini-comment-root).hidden {
   display: none;
+}.resolved-comment-list .resolved-comment-group-item-root {
+  padding: 10px 20px;
+  border-bottom: 1px solid #f0f0f0;
+  margin-right: 10px;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-group-head {
+  margin-bottom: 5px;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-group-head span {
+  padding: 0 5px;
+  display: inline-block;
+  line-height: 2;
+  background-color: #FFF0D9;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container {
+  padding-left: 10px;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root {
+  position: relative;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root:not(.no-children)::before,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root:not(.no-children)::before {
+  content: " ";
+  display: block;
+  position: absolute;
+  left: 10px;
+  width: 1px;
+  background-color: #DFE1E5;
+  overflow: hidden;
+  opacity: 0.8;
+  top: 21px;
+  bottom: -12px;
+  transform: scaleX(0.5);
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root .comment-head,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root .comment-head {
+  padding: 0;
+  position: relative;
+  display: flex;
+  align-items: center;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root .comment-head .comment-avatar,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root .comment-head .comment-avatar {
+  margin-right: 5px;
+  width: var(--editor-comment-avatar-width, 22px);
+  height: var(--editor-comment-avatar-width, 22px);
+  border-radius: 100%;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root .comment-head .comment-username,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root .comment-head .comment-username {
+  font-size: var(--editor-comment-username-font-size, 12px);
+  color: #2d2d2e;
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root .comment-head .comment-modified,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root .comment-head .comment-modified {
+  margin-left: 10px;
+  font-size: 12px;
+  color: #87888a;
+  flex-grow: 1;
+  white-space: nowrap;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root .comment-editor,
+.resolved-comment-list .resolved-comment-group-item-root .comment-container .resolved-comment-item-root .comment-editor {
+  border: none;
+  padding-top: 0;
+  margin-top: 0;
+  padding-left: 10px;
+  margin-left: 0;
+}
+.resolved-comment-list .resolved-comment-group-item-root .comment-children-container .resolved-comment-item-root:last-child::before {
+  display: none;
 }div[data-type=editor-block].table-block {
   --table-bar-width: 6px;
   --table-bar-left: -6px;
@@ -9207,22 +9372,22 @@ var __publicField = (obj, key, value) => {
   function toFloat(value) {
     return parseFloat(value) || 0;
   }
-  function getBordersSize(styles) {
+  function getBordersSize(styles2) {
     var positions = [];
     for (var _i = 1; _i < arguments.length; _i++) {
       positions[_i - 1] = arguments[_i];
     }
     return positions.reduce(function(size, position) {
-      var value = styles["border-" + position + "-width"];
+      var value = styles2["border-" + position + "-width"];
       return size + toFloat(value);
     }, 0);
   }
-  function getPaddings(styles) {
+  function getPaddings(styles2) {
     var positions = ["top", "right", "bottom", "left"];
     var paddings = {};
     for (var _i = 0, positions_1 = positions; _i < positions_1.length; _i++) {
       var position = positions_1[_i];
-      var value = styles["padding-" + position];
+      var value = styles2["padding-" + position];
       paddings[position] = toFloat(value);
     }
     return paddings;
@@ -9236,17 +9401,17 @@ var __publicField = (obj, key, value) => {
     if (!clientWidth && !clientHeight) {
       return emptyRect;
     }
-    var styles = getWindowOf(target).getComputedStyle(target);
-    var paddings = getPaddings(styles);
+    var styles2 = getWindowOf(target).getComputedStyle(target);
+    var paddings = getPaddings(styles2);
     var horizPad = paddings.left + paddings.right;
     var vertPad = paddings.top + paddings.bottom;
-    var width = toFloat(styles.width), height = toFloat(styles.height);
-    if (styles.boxSizing === "border-box") {
+    var width = toFloat(styles2.width), height = toFloat(styles2.height);
+    if (styles2.boxSizing === "border-box") {
       if (Math.round(width + horizPad) !== clientWidth) {
-        width -= getBordersSize(styles, "left", "right") + horizPad;
+        width -= getBordersSize(styles2, "left", "right") + horizPad;
       }
       if (Math.round(height + vertPad) !== clientHeight) {
-        height -= getBordersSize(styles, "top", "bottom") + vertPad;
+        height -= getBordersSize(styles2, "top", "bottom") + vertPad;
       }
     }
     if (!isDocumentElement(target)) {
@@ -9901,8 +10066,8 @@ var __publicField = (obj, key, value) => {
       el.setAttribute(key, value);
     });
   }
-  function setStyles(el, styles) {
-    Object.entries(styles).forEach(([key, value]) => {
+  function setStyles(el, styles2) {
+    Object.entries(styles2).forEach(([key, value]) => {
       el.style.setProperty(key, value);
     });
   }
@@ -12322,12 +12487,12 @@ var __publicField = (obj, key, value) => {
       return blockClass.getBlockStyles(editor, block);
     }
     const data2 = editor.getBlockData(block);
-    const styles = Object.fromEntries(Object.entries(data2).filter(([key]) => key.startsWith("style-")));
-    Object.entries(styles).forEach(([, value]) => {
+    const styles2 = Object.fromEntries(Object.entries(data2).filter(([key]) => key.startsWith("style-")));
+    Object.entries(styles2).forEach(([, value]) => {
       const type = typeof value;
       assert(logger$4C, type === "string" || type === "number" || type === "boolean", "invalid style value");
     });
-    return styles;
+    return styles2;
   }
   function getContainerWidth(container, options) {
     const ret = container.getBoundingClientRect().width;
@@ -24916,7 +25081,7 @@ var __publicField = (obj, key, value) => {
       if (attributes) {
         let string = op.insert;
         const tags = [];
-        let styles = "";
+        let styles2 = "";
         if (attributes["style-bold"]) {
           tags.push("strong");
         }
@@ -24934,25 +25099,25 @@ var __publicField = (obj, key, value) => {
         }
         const fontBgColor = Object.keys(attributes).find((k) => k.startsWith("style-bg-color-"));
         if (fontBgColor) {
-          styles += `background-color: ${styleBackgroundColorToHighlight$1(fontBgColor)};`;
+          styles2 += `background-color: ${styleBackgroundColorToHighlight$1(fontBgColor)};`;
         }
         const fontColor = Object.keys(attributes).find((k) => k.startsWith("style-color-"));
         if (fontColor) {
-          styles += `color: ${styleColorToColor$1(fontColor)};`;
+          styles2 += `color: ${styleColorToColor$1(fontColor)};`;
         }
         if (attributes.link) {
           string = `<a href="${attributes.link}">${string}</a>`;
         }
         let prefix = tags.map((s) => `<${s}>`).join("");
         let suffix = tags.reverse().map((s) => `</${s}>`).join("");
-        if (styles) {
+        if (styles2) {
           if (attributes.link) {
-            string = `<a href="${attributes.link}" style="${styles}">${op.insert}</a>`;
+            string = `<a href="${attributes.link}" style="${styles2}">${op.insert}</a>`;
           } else {
             if (prefix) {
-              prefix = prefix.replace(">", ` style="${styles}">`);
+              prefix = prefix.replace(">", ` style="${styles2}">`);
             } else {
-              prefix = `<span style="${styles}">`;
+              prefix = `<span style="${styles2}">`;
               suffix = "</span>";
             }
           }
@@ -25395,6 +25560,9 @@ var __publicField = (obj, key, value) => {
       __publicField(this, "renders", []);
       this.editor = editor;
     }
+    getRenderers() {
+      return this.renders;
+    }
     registerRender(render) {
       this.renders.push(render);
     }
@@ -25632,8 +25800,8 @@ var __publicField = (obj, key, value) => {
     renderBlock(editor, path, blockData) {
       var _a, _b;
       const attributes = {};
-      const styles = Object.entries(blockData).filter((k) => k[0].startsWith("style-"));
-      styles.forEach(([key, value]) => {
+      const styles2 = Object.entries(blockData).filter((k) => k[0].startsWith("style-"));
+      styles2.forEach(([key, value]) => {
         attributes[`data-${key}`] = `${value}`;
       });
       const classes = [];
@@ -25840,6 +26008,7 @@ var __publicField = (obj, key, value) => {
     constructor(editor, callbacks) {
       __publicField(this, "editor");
       __publicField(this, "composing", false);
+      __publicField(this, "composingTimer");
       __publicField(this, "callbacks");
       __publicField(this, "inputElement");
       __publicField(this, "handleBlur", () => {
@@ -25899,12 +26068,13 @@ var __publicField = (obj, key, value) => {
         if (!this.editor.isWritable()) {
           return;
         }
+        clearTimeout(this.composingTimer);
         this.composing = true;
         this.callbacks.onCompositionStart(event);
       });
       __publicField(this, "handleCompositionend", (event) => {
         if (isSafari()) {
-          setTimeout(() => {
+          this.composingTimer = setTimeout(() => {
             this.composing = false;
           }, 100);
         } else {
@@ -31604,7 +31774,7 @@ ${codeText}
   const logger$38 = getLogger("editor");
   class Editor extends tinyTypedEmitter.TypedEmitter {
     constructor(parent, doc2, optionalOptions) {
-      var _a, _b, _c, _d, _e, _f, _g, _h, _i;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       super();
       __publicField(this, "parent");
       __publicField(this, "rootElement");
@@ -31650,12 +31820,13 @@ ${codeText}
         componentsOptions: (_c = (_b = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _b.options) != null ? _c : {},
         scrollContainer: optionalOptions == null ? void 0 : optionalOptions.scrollContainer,
         enableComments: (_d = optionalOptions == null ? void 0 : optionalOptions.enableComments) != null ? _d : true,
-        enableContextMenu: (_e = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _e : true
+        enableResolveComments: (_e = optionalOptions == null ? void 0 : optionalOptions.enableResolveComments) != null ? _e : true,
+        enableContextMenu: (_f = optionalOptions == null ? void 0 : optionalOptions.enableContextMenu) != null ? _f : true
       };
-      this.settingsProvider = (_f = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _f : new DefaultSettingsProvider(this);
+      this.settingsProvider = (_g = optionalOptions == null ? void 0 : optionalOptions.settingsProvider) != null ? _g : new DefaultSettingsProvider(this);
       registerComponents(this, optionalOptions == null ? void 0 : optionalOptions.components);
-      this.blockHooks.push(...(_h = (_g = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _g.blockHooks) != null ? _h : []);
-      this.id = (_i = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _i : genId();
+      this.blockHooks.push(...(_i = (_h = optionalOptions == null ? void 0 : optionalOptions.components) == null ? void 0 : _h.blockHooks) != null ? _i : []);
+      this.id = (_j = optionalOptions == null ? void 0 : optionalOptions.id) != null ? _j : genId();
       this.clientId = genId();
       this.undoManager = new UndoManager(this);
       this.doc = new EditorDoc(this, doc2, this.undoManager);
@@ -32141,6 +32312,9 @@ ${codeText}
     toJSON() {
       return cloneDeep__default.default(this.doc);
     }
+    rawData() {
+      return this.doc;
+    }
     getContainerBlocks(containerId) {
       const blocks = this.doc.blocks[containerId];
       return blocks;
@@ -38661,6 +38835,12 @@ ${codeText}
         commentId
       });
     }
+    onUpdateCommentResolver(commentId) {
+      this.pushActions({
+        type: "updateCommentResolved",
+        commentId
+      });
+    }
     end() {
       const actions2 = this.actions;
       const deletedBlocks = /* @__PURE__ */ new Set();
@@ -38735,6 +38915,9 @@ ${codeText}
         } else if (action.type === "updateComment") {
           const a = action;
           this.outerHandler.onUpdateComment(a.commentId, this.local);
+        } else if (action.type === "updateCommentResolved") {
+          const a = action;
+          this.outerHandler.onUpdateCommentResolver(a.commentId, this.local);
         }
       });
       Array.from(updatingBlockDataDeltaMap.entries()).forEach(([blockId, objectData]) => {
@@ -38912,7 +39095,14 @@ ${codeText}
     assert(logger$2W, commentId, `invalid comment op, no commentId: ${JSON.stringify(ops)}`);
     assert(logger$2W, actions2, `invalid comment op, no actions: ${JSON.stringify(ops)}`);
     if (typeof actions2 === "string") {
-      logger$2W.error(`unknown comment op, ${JSON.stringify(ops)}`);
+      const data2 = ops[3];
+      if (actions2 === "resolver" && typeof data2 === "object") {
+        if (parseType === "upsert") {
+          handler.onUpdateCommentResolver(commentId);
+        }
+      } else {
+        logger$2W.error(`unknown comment op, ${JSON.stringify(ops)}`);
+      }
     } else {
       if (actions2.i && actions2.r) {
         if (parseType === "upsert") {
@@ -39022,7 +39212,8 @@ ${codeText}
       avatarUrl,
       abstract,
       created,
-      modified
+      modified,
+      resolver: resolved
     } = shareDBComment;
     return {
       id,
@@ -39032,7 +39223,8 @@ ${codeText}
       avatarUrl,
       abstract,
       created,
-      modified
+      modified,
+      resolver: resolved
     };
   }
   function commentToShareDbComment(comment, doc2) {
@@ -39504,6 +39696,21 @@ ${codeText}
       const op = ["comments", comment.id, { r: true, i: shareDBComment }];
       return this.submitOp(op);
     }
+    localUpdateCommentResolver(commentId, resolver) {
+      const oldComment = this.getComment(commentId);
+      const oldResolved = oldComment.resolver;
+      const op = ["comments", commentId, "resolver", {}];
+      if (!oldResolved && !resolver) {
+        return Promise.resolve(true);
+      }
+      if (oldResolved !== void 0) {
+        op[3] = { r: true };
+      }
+      if (resolver) {
+        op[3].i = resolver;
+      }
+      return this.submitOp(op);
+    }
     destroy() {
       var _a;
       this.destroyed = true;
@@ -39580,6 +39787,13 @@ ${codeText}
         return (_a = cb.onUpdateComment) == null ? void 0 : _a.call(cb, commentId, local);
       });
     }
+    onUpdateCommentResolver(commentId, local) {
+      assert(logger$2T, this.callbacks.length > 0, "no callbacks");
+      this.callbacks.forEach((cb) => {
+        var _a;
+        return (_a = cb.onUpdateCommentResolver) == null ? void 0 : _a.call(cb, commentId, local);
+      });
+    }
     onCustomMessage(msg) {
       const message = msg;
       if ((message == null ? void 0 : message.type) === "custom" && (message == null ? void 0 : message.clientId) !== this.client.clientId) {
@@ -40609,6 +40823,7 @@ ${codeText}
   const RefreshIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M15.3498 7.51663L12.9692 9.49971L10.5902 7.51663" stroke="currentColor"/>\n<path d="M12.811 9.5C12.9344 9.02057 13 8.51795 13 8C13 4.68629 10.3137 2 7 2C3.68629 2 1 4.68629 1 8C1 11.3137 3.68629 14 7 14C8.39546 14 9.67966 13.5236 10.6988 12.7246" stroke="currentColor"/>\n</svg>';
   const HelpIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M15 8C15 11.8659 11.8659 15 8 15C4.13408 15 1 11.8659 1 8C1 4.13408 4.13408 1 8 1C11.8659 1 15 4.13408 15 8Z" stroke="currentColor"/>\n<path d="M6 6.41815C6 5.81984 6.55057 4.52136 7.98652 4.52136C9.24198 4.52136 10 5.42027 10 6.41815C10 7.24315 9.34611 7.76435 8.89738 8.21308C7.99992 9.11055 7.99992 10.0001 7.99992 10.0001" stroke="currentColor"/>\n<path d="M8 11V13" stroke="currentColor"/>\n</svg>\n';
   const CheckMarkIcon = '<svg width="16" height="16" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg" stroke-width="2">\n  <path d="m1 7.4 1.497-1.498 3.861 3.86L12.85 2.45l1.498 1.497-6.491 7.312.005.007-.096.095-1.318 1.486L1 7.399Z" fill="currentColor" fill-rule="nonzero"></path>\n</svg>';
+  const CircleCheckMarkIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M10.9825 5.99158L7.19788 10.0128L5.30554 8.12045" stroke="currentColor" stroke-linejoin="round"/>\n<circle cx="8.03119" cy="7.99481" r="4.98883" stroke="currentColor"/>\n</svg>\n';
   const TextIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M2.5 4L2.5 1.5L13.5 1.5V4" stroke="currentColor" stroke-linejoin="round"/>\n<path d="M8 14.5V2" stroke="currentColor"/>\n<path d="M5 14.5H11" stroke="currentColor" stroke-linejoin="round"/>\n</svg>\n';
   const rightArrow = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M5.76573 4.17763L9.58809 7.99999L5.76573 11.8209" stroke="currentColor" stroke-width="2"/>\n</svg>\n';
   const BilibiliIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M11.3909 3.71427H11.8891C12.7699 3.74577 13.5043 4.05144 14.09 4.63244C14.6757 5.21285 14.979 5.94435 15 6.82577V11.1191C14.979 11.9999 14.6757 12.7344 14.09 13.32C13.5043 13.9057 12.7705 14.209 11.8891 14.23H4.11092C3.23008 14.209 2.49567 13.9057 1.91 13.32C1.32433 12.7344 1.021 12.0005 1 11.1191V6.82577C1.021 5.94435 1.32433 5.21285 1.91 4.63244C2.49567 4.05144 3.2295 3.74577 4.11092 3.71427H4.56242L3.87758 3.06094C3.80715 2.99237 3.75151 2.9101 3.71409 2.81921C3.67667 2.72831 3.65826 2.63072 3.66 2.53244C3.66 2.32477 3.73233 2.1486 3.87758 2.00335L3.89333 1.9876C4.04908 1.84235 4.22758 1.77002 4.43 1.77002C4.63242 1.77002 4.81092 1.84235 4.96667 1.9876L6.63092 3.59002C6.67233 3.63144 6.70908 3.67285 6.74 3.71427H9.22908C9.25335 3.66813 9.28486 3.62618 9.32242 3.59002L10.9867 1.9876C11.1424 1.84235 11.3209 1.77002 11.5233 1.77002C11.7258 1.77002 11.9095 1.8581 12.0652 2.00335C12.221 2.1486 12.2933 2.32477 12.2933 2.53244C12.2933 2.73952 12.221 2.91569 12.0757 3.06094L11.3909 3.71427ZM4.11092 5.22335C3.67575 5.23385 3.31 5.38435 3.01425 5.67427C2.71908 5.96477 2.56567 6.33344 2.55575 6.7791V11.1658C2.56567 11.6114 2.71908 11.9795 3.01425 12.27C3.31 12.5605 3.67575 12.711 4.11092 12.7209H11.8891C12.3242 12.711 12.69 12.5605 12.9858 12.27C13.2809 11.9795 13.4343 11.6114 13.4442 11.1658V6.7791C13.4343 6.33285 13.2809 5.96477 12.9858 5.67427C12.69 5.38435 12.3242 5.23385 11.8891 5.22335H4.11092ZM5.66667 7.4791C5.88425 7.4791 6.06567 7.55144 6.21092 7.69669C6.35675 7.84194 6.43433 8.0286 6.44425 8.25669V8.94094C6.43433 9.16902 6.35675 9.35569 6.21092 9.50094C6.06567 9.64677 5.88425 9.7191 5.66667 9.7191C5.44908 9.7191 5.26767 9.64619 5.12242 9.50094C4.97658 9.35569 4.899 9.16902 4.88908 8.94094V8.25669C4.88908 8.0391 4.96433 7.85477 5.11425 7.70427C5.26475 7.55435 5.44908 7.4791 5.66667 7.4791ZM10.3333 7.4791C10.5509 7.4791 10.7323 7.55144 10.8776 7.69669C11.0234 7.84194 11.101 8.0286 11.1109 8.25669V8.94094C11.101 9.16902 11.0234 9.35569 10.8776 9.50094C10.7323 9.64677 10.5509 9.7191 10.3333 9.7191C10.1157 9.7191 9.93433 9.64619 9.78908 9.50094C9.64325 9.35569 9.56567 9.16902 9.55575 8.94094V8.25669C9.56567 8.0286 9.64325 7.84194 9.78908 7.69669C9.93433 7.55144 10.1157 7.4791 10.3333 7.4791Z" fill="#07A3D7"/>\n</svg>\n';
@@ -40764,6 +40979,7 @@ ${codeText}
     RefreshIcon,
     HelpIcon,
     CheckMarkIcon,
+    CircleCheckMarkIcon,
     TextIcon,
     RightArrowIcon: rightArrow,
     TencentVideoIcon,
@@ -50551,7 +50767,7 @@ ${codeText}
     });
     return !!ret;
   }
-  function addBlockClasses(from, to, styles) {
+  function addBlockClasses(from, to, styles2) {
     const container = getParentContainer(from);
     if (to) {
       const container2 = getParentContainer(to);
@@ -50562,18 +50778,18 @@ ${codeText}
       const toIndex = getBlockIndex(to);
       assert(logger$24, fromIndex <= toIndex, "invalid block index");
     }
-    addClass(from, ...styles);
+    addClass(from, ...styles2);
     if (!to || to === from) {
       return;
     }
     let next2 = getNextBlock(from);
     while (next2 !== to) {
       assert(logger$24, next2, "no next button");
-      addClass(next2, ...styles);
+      addClass(next2, ...styles2);
       next2 = getNextBlock(next2);
     }
     if (next2) {
-      addClass(next2, ...styles);
+      addClass(next2, ...styles2);
     }
   }
   async function requestMindmapFullscreen(editor, block, mindmapTools) {
@@ -51561,7 +51777,7 @@ ${codeText}
         html = `<input type="checkbox" disabled="disabled" /> ${html}`;
       }
       let listTag = "ul";
-      let styles = "";
+      let styles2 = "";
       if (list2.ordered) {
         html = `<li value="${list2.start}">${html}</li>`;
         listTag = "ol";
@@ -51569,18 +51785,18 @@ ${codeText}
           case 2:
           case 5:
           case 8:
-            styles = "list-style-type: lower-alpha;";
+            styles2 = "list-style-type: lower-alpha;";
             break;
           case 3:
           case 6:
-            styles = "list-style-type: lower-roman;";
+            styles2 = "list-style-type: lower-roman;";
             break;
         }
       } else {
         html = `<li>${html}</li>`;
       }
       if (isFirstListItem(editor, blockData, doc2, path)) {
-        html = `<${listTag}${styles ? ` style="${styles}"` : ""}>${html}`;
+        html = `<${listTag}${styles2 ? ` style="${styles2}"` : ""}>${html}`;
       }
       if (isLastListItem(editor, blockData, doc2, path)) {
         html = `${html}</${listTag}>`;
@@ -62396,13 +62612,13 @@ $$${mathData.mathjaxText}$$
       if (!op.attributes) {
         return /* @__PURE__ */ new Map();
       }
-      const styles = Object.entries(op.attributes).filter(([key]) => {
+      const styles2 = Object.entries(op.attributes).filter(([key]) => {
         if (key.startsWith("style-")) {
           return true;
         }
         return false;
       });
-      return new Map(styles);
+      return new Map(styles2);
     };
     if (text2.length === 0) {
       return /* @__PURE__ */ new Map();
@@ -62446,11 +62662,11 @@ $$${mathData.mathjaxText}$$
     if (getTextLength(text2) === 0) {
       return textStyles;
     }
-    let styles = getIntersectionStyles(text2);
-    styles = mergeActiveStyle(editor, styles);
+    let styles2 = getIntersectionStyles(text2);
+    styles2 = mergeActiveStyle(editor, styles2);
     function getTextStyle(item) {
       const { id, icon, desc, name } = item;
-      const value = styles.get(id);
+      const value = styles2.get(id);
       if (value !== void 0) {
         return {
           id,
@@ -63046,6 +63262,7 @@ $$${mathData.mathjaxText}$$
     GroupItemActions2["QuickReply"] = "quick-reply";
     GroupItemActions2["QuickReplyOk"] = "quick-reply-ok";
     GroupItemActions2["QuickReplyCancel"] = "quick-reply-cancel";
+    GroupItemActions2["Resolve"] = "resolve";
     return GroupItemActions2;
   })(GroupItemActions || {});
   const GROUP_ITEM_ACTION_MARK = "group-item-action";
@@ -63093,7 +63310,7 @@ $$${mathData.mathjaxText}$$
     return attributes.filter((attribute) => attribute.startsWith("comment-")).map((attribute) => attribute.replace("comment-", ""));
   }
   const logger$1G = getLogger("doc-comments");
-  function addBlockComments(doc2, block, result, resultSet) {
+  function addBlockComments$1(doc2, block, result, resultSet) {
     if (block.comments) {
       const blockComments = block.comments;
       if (Array.isArray(blockComments)) {
@@ -63129,7 +63346,7 @@ $$${mathData.mathjaxText}$$
     children.forEach((childContainerId) => {
       const childBlocks = doc2.blocks[childContainerId];
       childBlocks.forEach((subBlock) => {
-        addBlockComments(doc2, subBlock, result, resultSet);
+        addBlockComments$1(doc2, subBlock, result, resultSet);
       });
     });
   }
@@ -63137,7 +63354,7 @@ $$${mathData.mathjaxText}$$
     const result = [];
     const resultSet = /* @__PURE__ */ new Set();
     doc2.blocks.root.forEach((block) => {
-      addBlockComments(doc2, block, result, resultSet);
+      addBlockComments$1(doc2, block, result, resultSet);
     });
     const resultMap = /* @__PURE__ */ new Map();
     result.forEach((commentId, index2) => resultMap.set(commentId, index2));
@@ -63193,6 +63410,26 @@ $$${mathData.mathjaxText}$$
     });
     return result;
   }
+  function getUnresolvedCommentsGroupFromDoc(editor, commentsProvider) {
+    return getCommentsGroupFromDoc(editor, commentsProvider).filter((group) => !group.resolver);
+  }
+  function getResolvedCommentsGroupFromDoc(editor, commentsProvider) {
+    const doc2 = editor.doc.toJSON();
+    const commentsMap = getCommentsFromDoc(doc2);
+    const commentGroup = getCommentsGroup(commentsProvider.getComments());
+    const result = commentGroup.filter((group) => group.resolver).sort((group1, group2) => {
+      var _a, _b, _c, _d;
+      const date1 = (_b = (_a = group1.resolver) == null ? void 0 : _a.date) != null ? _b : 0;
+      const date2 = (_d = (_c = group2.resolver) == null ? void 0 : _c.date) != null ? _d : 0;
+      return date2 - date1;
+    });
+    result.forEach((group) => {
+      if (!commentsMap.has(group.id)) {
+        group.removedFromDoc = true;
+      }
+    });
+    return result;
+  }
   function flattenCommentGroup(comment) {
     const { children, ...raw } = comment;
     const comments = [raw];
@@ -63249,6 +63486,18 @@ $$${mathData.mathjaxText}$$
     const commentIds = intersection__default.default(comments1, comments2);
     return commentIds;
   }
+  function removeUnresolvedComments(commentProvider, commentIds) {
+    return commentIds.filter((commentId) => {
+      const comment = commentProvider.getComment(commentId);
+      return !!comment.resolver;
+    });
+  }
+  function removeResolvedComments(commentProvider, commentIds) {
+    return commentIds.filter((commentId) => {
+      const comment = commentProvider.getComment(commentId);
+      return !(comment == null ? void 0 : comment.resolver);
+    });
+  }
   const logger$1F = getLogger("active-comments");
   function inactiveComment(editor, commentId) {
     const activeCommentElements = editor.rootContainer.querySelectorAll(`span.comment[comment-${commentId}],[data-type=editor-block].comment[comment-${commentId}]`);
@@ -63304,6 +63553,11 @@ $$${mathData.mathjaxText}$$
       }
     }
   }
+  function getElementsByCommentId(editor, commentId) {
+    const lowerCommentId = commentId.toLocaleLowerCase();
+    const elements = editor.rootContainer.querySelectorAll(`span.comment[comment-${lowerCommentId}],[data-type=editor-block].comment[comment-${lowerCommentId}]`);
+    return Array.from(elements);
+  }
   function isImageBlock(block) {
     return getBlockType(block) === "embed" && getEmbedType(block) === "image";
   }
@@ -69036,8 +69290,9 @@ ${codeText}
       return items;
     }
     reloadList(data2) {
+      this._items.forEach((item) => item.destroy());
       this.container.innerHTML = "";
-      this.createList(data2);
+      this._items = this.createList(data2);
     }
     insertItem(data2) {
       const index2 = this.findInsertPos(data2);
@@ -69110,8 +69365,8 @@ ${codeText}
       });
     }
   }
-  const switchUpIcon = '<svg width="17" height="16" viewBox="0 0 17 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M2.00218 11.0005L8.00341 4.99923L14.0046 11.0005" stroke="currentColor" fill="transparent" stroke-width="1.5" stroke-linejoin="bevel"/>\n</svg>';
-  const switchDownIcon = '<svg width="17" height="16" viewBox="0 0 17 16" xmlns="http://www.w3.org/2000/svg">\n<path d="M14.0029 4.99933L8.00172 11.0006L2.00049 4.99933" stroke="currentColor" fill="transparent" stroke-width="1.5" stroke-linejoin="bevel"/>\n</svg>';
+  const switchUpIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M4.17757 10.2343L7.99993 6.41191L11.8208 10.2343" stroke="currentColor"/>\n</svg>\n';
+  const switchDownIcon = '<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">\n<path d="M4.17757 5.76573L7.99993 9.58809L11.8208 5.76573" stroke="currentColor"/>\n</svg>\n';
   const index$8 = "";
   const REPLY_EDITOR_EDITING_CLS = "reply-editor-editing";
   const { t: t$3 } = i18n$1;
@@ -69234,6 +69489,9 @@ ${codeText}
       __publicField(this, "quickReply");
       __publicField(this, "createRoot", () => {
         const root2 = createElement("div", ["comment-group-item-root"], null);
+        if (this.comment.resolver) {
+          addClass(root2, "resolved");
+        }
         return root2;
       });
       __publicField(this, "createChildrenList", () => {
@@ -69290,6 +69548,7 @@ ${codeText}
       this.mainItem = this.createItem();
       this.childrenList = this.createChildrenList();
       this.quickReply = this.createQuickReply();
+      this.createFooter();
       this.editor.on("readonlyChanged", this.handleReadonlyChanged);
       this.resizeObserver = new index$g(this.handleResize);
       this.resizeObserver.observe(this.root);
@@ -69299,6 +69558,29 @@ ${codeText}
       const count = getCommentItemCountInGroupItem(this.root);
       return count;
     }
+    createFooter() {
+      if (!this.comment.resolver) {
+        return null;
+      }
+      const footer = createElement("div", ["comment-item-footer"], this.root);
+      const modified = createElement("span", ["comment-modified"], footer);
+      const date = new Date(this.comment.modified);
+      const resolver = this.comment.resolver;
+      assert(logger$1h, resolver, "resolver should not be null");
+      const text2 = i18n$1.t("comment.resolvedBy", { name: resolver.displayName, date: fromNowString(date) });
+      modified.innerText = text2;
+      const actions2 = createElement("div", ["comment-actions"], footer);
+      createElement("span", ["comment-date"], actions2, fromNowString(new Date(resolver.date)));
+      if (this.comment.removedFromDoc) {
+        createElement("span", ["removed-tips"], actions2, i18n$1.t("comment.removedFromDoc"));
+      } else {
+        const reopen = createElement("button", ["comment-reopen"], actions2, i18n$1.t("comment.reopen"));
+        reopen.onclick = () => {
+          this.commentsProvider.localUpdateCommentResolver(this.comment.id, void 0);
+        };
+      }
+      return footer;
+    }
     createQuickReply() {
       const { editor, commentsProvider, comment } = this;
       const commentQuickReply = new CommentQuickReply(editor, commentsProvider, comment, this);
@@ -69313,8 +69595,15 @@ ${codeText}
       const switchContainer = createElement("span", ["item-head-switch"], head);
       const switchUp = createTextButton(switchContainer, GroupItemActions.SwitchUp, "up", switchUpIcon);
       const switchDown = createTextButton(switchContainer, GroupItemActions.SwitchDown, "down", switchDownIcon);
+      const resolve = createTextButton(switchContainer, GroupItemActions.Resolve, "resolve", CircleCheckMarkIcon);
       addGroupActionToElement(switchUp, GroupItemActions.SwitchUp);
       addGroupActionToElement(switchDown, GroupItemActions.SwitchDown);
+      addGroupActionToElement(resolve, GroupItemActions.Resolve);
+      resolve.setAttribute(`data-editor-tooltip-${this.editor.clientId}`, i18n$1.t("comment.resolveComment"));
+      addClass(resolve, "disable-active");
+      if (comment.resolver) {
+        addClass(resolve, "resolved");
+      }
       return head;
     }
     createItem() {
@@ -69354,6 +69643,7 @@ ${codeText}
     handleUpdateMainComment(comment) {
       assert(logger$1h, comment.id === this.mainItem.comment.id, "invalid comment");
       this.mainItem.reloadDoc();
+      this.setCreatingComment(false);
     }
     deleteMainComment(commentId) {
       assert(logger$1h, commentId === this.mainItem.comment.id, "invalid comment");
@@ -69362,6 +69652,18 @@ ${codeText}
     edit() {
       this.mainItem.edit();
     }
+    setCreatingComment(creating) {
+      const resolveButton = this.header.querySelector('.editor-text-button[group-item-action="resolve"]');
+      if (!resolveButton) {
+        return;
+      }
+      resolveButton.disabled = creating;
+      if (creating) {
+        resolveButton.classList.add("disabled");
+      } else {
+        resolveButton.classList.remove("disabled");
+      }
+    }
     destroy() {
       this.quickReply.destroy();
       this.mainItem.destroy();
@@ -69547,7 +69849,17 @@ ${codeText}
         this.commentsProvider.localDeleteComment(comment.id);
         quickReply.show();
       });
-      __publicField(this, "execute", (element, groupItem, commentId, itemIndex) => {
+      __publicField(this, "handleResolve", (groupItem) => {
+        const { commentsProvider } = this;
+        const comment = commentsProvider.getComment(groupItem.comment.id);
+        const user = this.groupList.editor.doc.getUser();
+        commentsProvider.localUpdateCommentResolver(comment.id, {
+          userId: user.userId,
+          displayName: user.displayName,
+          date: Date.now()
+        });
+      });
+      __publicField(this, "execute", (element, groupItem, commentId, itemIndex, event) => {
         const actionElement = getClosestGroupItemActionElement(element);
         if (!actionElement)
           return;
@@ -69586,6 +69898,11 @@ ${codeText}
           case GroupItemActions.QuickReplyCancel:
             this.handleQuickReplyCancel(groupItem);
             break;
+          case GroupItemActions.Resolve:
+            event.preventDefault();
+            event.stopPropagation();
+            this.handleResolve(groupItem);
+            break;
           default:
             const exhaustiveCheck = actionId;
             logger$1f.debug(`not implement handler for ${exhaustiveCheck}`);
@@ -69599,8 +69916,8 @@ ${codeText}
   }
   const logger$1e = getLogger("comment-group-list");
   class CommentGroupList extends ListBase {
-    constructor(editor, commentsProvider, parent) {
-      super(editor, commentsProvider, parent, getCommentsGroupFromDoc(editor, commentsProvider), {});
+    constructor(editor, commentsProvider, parent, type) {
+      super(editor, commentsProvider, parent, getUnresolvedCommentsGroupFromDoc(editor, commentsProvider), {});
       __publicField(this, "groupItemHandlers");
       __publicField(this, "dispatchScroll", debounce__default.default(() => {
         this.editor.scrollContainer.dispatchEvent(new Event("scroll"));
@@ -69638,7 +69955,9 @@ ${codeText}
         const commentId = getClosestCommentItemId(event.target);
         const index2 = this.items.findIndex((item) => item.root === itemRoot);
         if (index2 !== -1) {
-          if (this.activeIndex !== index2) {
+          const disableActive = !!event.target.closest(".disable-active");
+          const enableActive = !disableActive;
+          if (this.activeIndex !== index2 && enableActive) {
             this.setActiveItem(index2);
           }
           const { groupItemHandlers } = this;
@@ -69646,7 +69965,8 @@ ${codeText}
             event.target,
             this.items[index2],
             commentId,
-            index2
+            index2,
+            event
           );
         }
       });
@@ -69687,7 +70007,7 @@ ${codeText}
       __publicField(this, "handleSelectionChanged", () => {
         setTimeout(() => {
           var _a;
-          const commentIds = getCommentsFromSelection(this.editor);
+          const commentIds = this.type === "current" ? removeResolvedComments(this.commentsProvider, getCommentsFromSelection(this.editor)) : removeUnresolvedComments(this.commentsProvider, getCommentsFromSelection(this.editor));
           if (commentIds.length > 0) {
             if (((_a = this.activeItem) == null ? void 0 : _a.comment.id) && commentIds.includes(this.activeItem.comment.id)) {
               return;
@@ -69728,7 +70048,9 @@ ${codeText}
         const top = Number.parseFloat(firstItem.style.top);
         const targetTop = Number.parseFloat(firstItem.getAttribute("data-target-top") || "0");
         if (!Number.isNaN(top) && !Number.isNaN(targetTop) && top < targetTop) {
-          arrangeItems(this.editor, this.items, null, Math.min(top + (0 - event.deltaY) * 3, targetTop));
+          if (this.type === "current") {
+            arrangeItems(this.editor, this.items, null, Math.min(top + (0 - event.deltaY) * 3, targetTop));
+          }
         }
       });
       __publicField(this, "updateGroupItemSwitch", () => {
@@ -69737,7 +70059,7 @@ ${codeText}
         activeItem.updateSwitchButton();
       });
       __publicField(this, "updateComments", debounce__default.default(() => {
-        const commentsGroup = getCommentsGroupFromDoc(this.editor, this.commentsProvider);
+        const commentsGroup = this.type === "current" ? getUnresolvedCommentsGroupFromDoc(this.editor, this.commentsProvider) : getResolvedCommentsGroupFromDoc(this.editor, this.commentsProvider);
         let hasBeenChanged = false;
         for (let i = 0; i < commentsGroup.length; i++) {
           const comment = commentsGroup[i];
@@ -69760,6 +70082,8 @@ ${codeText}
           this.emit("commentCountChanged");
         }
       }, 100));
+      this.editor = editor;
+      this.type = type;
       this.updateItemsLayout();
       this.bindEvents();
       this.editor.addListener("selectionChanged", this.handleSelectionChanged);
@@ -69780,7 +70104,9 @@ ${codeText}
       document.removeEventListener("click", this.handleDocumentClick);
     }
     updateItemsLayout(dispatchScroll = true) {
-      arrangeItems(this.editor, this.items, this.activeItem);
+      if (this.type === "current") {
+        arrangeItems(this.editor, this.items, this.activeItem);
+      }
       if (dispatchScroll) {
         this.dispatchScroll();
       }
@@ -69804,7 +70130,7 @@ ${codeText}
       return item;
     }
     findInsertPos(data2) {
-      const commentsMap = getCommentsGroupFromDoc(this.editor, this.commentsProvider);
+      const commentsMap = getUnresolvedCommentsGroupFromDoc(this.editor, this.commentsProvider);
       const index2 = commentsMap.findIndex((group) => group.id === data2.id);
       if (index2 === -1) {
         return -1;
@@ -69904,6 +70230,7 @@ ${codeText}
         newItem.quickReply.hide();
         setTimeout(() => {
           newItem.edit();
+          newItem.setCreatingComment(true);
         }, 300);
       }
     }
@@ -69928,6 +70255,12 @@ ${codeText}
         }
       }
     }
+    handleResolveComment(commentId) {
+      const item = this.findItem(commentId);
+      if (item) {
+        this.deleteItem(item.comment.id);
+      }
+    }
     handleUpdateComment(comment) {
       const group = this.findItemAsGroupId(comment.groupId);
       if (group && group.comment.id !== comment.id) {
@@ -69939,6 +70272,239 @@ ${codeText}
         item.handleUpdateMainComment(comment);
       }
     }
+    changeType(type) {
+      this.type = type;
+      const comments = this.type === "current" ? getUnresolvedCommentsGroupFromDoc(this.editor, this.commentsProvider) : getResolvedCommentsGroupFromDoc(this.editor, this.commentsProvider);
+      this.reloadList(comments);
+      if (this.type === "current") {
+        setTimeout(() => {
+          arrangeItems(this.editor, this.items, null);
+        });
+      }
+    }
+    reloadList(data2) {
+      super.reloadList(data2);
+      this._items.forEach((item) => item.addListener("resize", this.handleItemResize));
+    }
+  }
+  function addBlockComments(doc2, block, resultMap) {
+    if (block.comments) {
+      const blockComments = block.comments;
+      if (Array.isArray(blockComments)) {
+        blockComments.forEach((commentId) => {
+          const commentIds = resultMap.get(block.id);
+          if (commentIds) {
+            commentIds.add(commentId);
+          } else {
+            resultMap.set(block.id, /* @__PURE__ */ new Set([commentId]));
+          }
+        });
+      }
+    }
+    if (block.text) {
+      const text2 = block.text;
+      text2.forEach((op) => {
+        if (op.attributes) {
+          const prefix = "comment-";
+          Object.entries(op.attributes).forEach(([key, value]) => {
+            if (key.startsWith(prefix)) {
+              const commentId = value;
+              const commentIds = resultMap.get(block.id);
+              if (commentIds) {
+                commentIds.add(commentId);
+              } else {
+                resultMap.set(block.id, /* @__PURE__ */ new Set([commentId]));
+              }
+            }
+          });
+        }
+      });
+    }
+    const children = block.children;
+    if (!children) {
+      return;
+    }
+    children.forEach((childContainerId) => {
+      const childBlocks = doc2.blocks[childContainerId];
+      childBlocks.forEach((subBlock) => {
+        addBlockComments(doc2, subBlock, resultMap);
+      });
+    });
+  }
+  function getBlockCommentsFromDoc(doc2) {
+    const resultMap = /* @__PURE__ */ new Map();
+    doc2.blocks.root.forEach((block) => {
+      addBlockComments(doc2, block, resultMap);
+    });
+    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) => {
+        const comments = this.getComments(editor);
+        const invisibleComments = Object.values(comments).filter((comment) => {
+          if (comment.id !== comment.groupId) {
+            return false;
+          }
+          const ret = this.type === "current" ? !!comment.resolver : !comment.resolver;
+          return ret;
+        });
+        const root2 = editor.rootContainer;
+        const effectedElements = /* @__PURE__ */ new Set();
+        invisibleComments.forEach((comment) => {
+          const key = `comment-${comment.id.toLocaleLowerCase()}`;
+          const elements = root2.querySelectorAll(`[${key}]`);
+          elements.forEach((elem) => {
+            elem.removeAttribute(key);
+            effectedElements.add(elem);
+          });
+        });
+        effectedElements.forEach((elem) => {
+          const commentAttributes = Array.from(elem.attributes).filter((a) => a.name.startsWith("comment-"));
+          if (commentAttributes.length === 0) {
+            elem.classList.remove("comment");
+          }
+        });
+      }));
+      this.type = type;
+    }
+    renderText(editor, path, attributes) {
+      const classes = [];
+      const textAttributes = {};
+      Object.entries(attributes).forEach(([key, value]) => {
+        if (key.startsWith("comment-")) {
+          this.renderCommentElement(editor, key, value, classes, textAttributes);
+        }
+      });
+      return { classes, attributes: textAttributes };
+    }
+    renderBox(editor, path, attributes) {
+      const classes = [];
+      const textAttributes = {};
+      Object.entries(attributes).forEach(([key, value]) => {
+        if (key.startsWith("comment-")) {
+          this.renderCommentElement(editor, key, value, classes, textAttributes);
+        }
+      });
+      return { classes, attributes: textAttributes };
+    }
+    renderBlock(editor, path, blockData) {
+      const comments = blockData.comments;
+      if (!comments || comments.length === 0) {
+        return {};
+      }
+      const classes = [];
+      const attributes = {};
+      comments.forEach((commentId) => {
+        const key = `comment-${commentId.toLocaleLowerCase()}`;
+        this.renderCommentElement(editor, key, commentId, classes, attributes);
+      });
+      return {
+        classes,
+        attributes
+      };
+    }
+    updateBlock(editor, path, blockElement, blockData) {
+      const comments = blockData.comments;
+      removeClass(blockElement, "comment");
+      Array.from(blockElement.attributes).forEach((a) => {
+        if (a.name.startsWith("comment-")) {
+          blockElement.removeAttribute(a.name);
+        }
+      });
+      if (!comments || comments.length === 0) {
+        return;
+      }
+      addClass(blockElement, "comment");
+      const classList = [];
+      comments.forEach((commentId) => {
+        const key = `comment-${commentId.toLocaleLowerCase()}`;
+        this.renderCommentElement(editor, key, commentId, classList, {});
+      });
+      if (classList.length > 0) {
+        addClass(blockElement, ...classList);
+      }
+    }
+    getCommentStatus(editor, commentId) {
+      const comments = editor.findCustom("editor-comments");
+      if (!comments) {
+        return "unknown";
+      }
+      const commentsProvider = comments.commentProvider;
+      const comment = commentsProvider.getComment(commentId);
+      if (!comment) {
+        return "unknown";
+      }
+      if (comment.resolver) {
+        return "resolved";
+      }
+      return "unresolved";
+    }
+    renderCommentElement(editor, key, commentId, classes, textAttributes) {
+      const status = this.getCommentStatus(editor, commentId);
+      if (this.type === "current") {
+        if (status === "resolved") {
+          return;
+        }
+      } else {
+        if (status === "unresolved") {
+          return;
+        }
+      }
+      classes.push("comment");
+      textAttributes[key] = commentId;
+      if (status === "unknown") {
+        this.updateUnknownCommentsDelayed(editor);
+      }
+    }
+    getComments(editor) {
+      const editorComments = editor.findCustom("editor-comments");
+      if (!editorComments) {
+        return [];
+      }
+      const commentProvider = editorComments.commentProvider;
+      return commentProvider.getComments();
+    }
+    changeType(editor, type) {
+      this.type = type;
+      const elements = editor.rootContainer.querySelectorAll(".comment");
+      elements.forEach((elem) => {
+        elem.classList.remove("comment");
+        Array.from(elem.attributes).forEach((a) => {
+          if (a.name.startsWith("comment-")) {
+            elem.removeAttribute(a.name);
+          }
+        });
+      });
+      const comments = this.getComments(editor);
+      const visibleComments = Object.values(comments).filter((comment) => {
+        if (comment.id !== comment.groupId) {
+          return false;
+        }
+        const ret = this.type === "current" ? !comment.resolver : !!comment.resolver;
+        return ret;
+      });
+      const visibleCommentsId = new Set(visibleComments.map((c) => c.id));
+      const commentsFromDoc = getBlockCommentsFromDoc(editor.doc.toJSON());
+      commentsFromDoc.forEach((commentIds, blockId) => {
+        if (Array.from(commentIds).some((c) => visibleCommentsId.has(c))) {
+          const block = editor.findBlockById(blockId);
+          if (block) {
+            editor.reloadBlock(block);
+          }
+        }
+      });
+    }
   }
   const COMMENT_MINI_CLS = "comment-mini";
   getLogger("comment-list");
@@ -69948,6 +70514,43 @@ ${codeText}
       __publicField(this, "root");
       __publicField(this, "groupsContainer");
       __publicField(this, "list");
+      __publicField(this, "listType", "current");
+      __publicField(this, "switcherItem", {
+        id: "switch-comment",
+        name: i18n$1.t("comment.currentComment"),
+        dropdown: true,
+        manualShowChildren: true,
+        childrenPlacement: "bottom-start",
+        children: [{
+          id: "current-comment",
+          name: i18n$1.t("comment.currentComment"),
+          states: ["checked"]
+        }, {
+          id: "resolved-comment",
+          name: i18n$1.t("comment.resolvedComment")
+        }]
+      });
+      __publicField(this, "switcherBar");
+      __publicField(this, "noResolvedCommentTip", null);
+      __publicField(this, "handleSwitchType", (bar2, item) => {
+        if (item.id === "current-comment") {
+          this.listType = "current";
+        } else {
+          this.listType = "resolved";
+        }
+        this.root.setAttribute("list-type", this.listType);
+        this.switcherItem.name = this.listType === "current" ? i18n$1.t("comment.currentComment") : i18n$1.t("comment.resolvedComment");
+        const children = this.switcherItem.children;
+        children[0].states = this.listType === "current" ? ["checked"] : [];
+        children[1].states = this.listType === "resolved" ? ["checked"] : [];
+        this.switcherBar.updateItems([this.switcherItem]);
+        this.list.changeType(this.listType);
+        const renderer = this.editor.editorBlockRenders.getRenderers().find((r) => r instanceof OnesEditorCommentsRender);
+        if (renderer) {
+          renderer.changeType(this.editor, this.listType);
+        }
+        this.updateNoResolvedCommentTip();
+      });
       __publicField(this, "handleSelectionOnComment", () => {
         this.emit("onSelectComment");
       });
@@ -69955,8 +70558,12 @@ ${codeText}
         var _a, _b;
         const count = getCommentsCountInDoc(this.editor, this.commentsProvider);
         (_b = (_a = this.commentOptions) == null ? void 0 : _a.onCommentCountChange) == null ? void 0 : _b.call(_a, count);
+        this.updateNoResolvedCommentTip();
       });
       __publicField(this, "handleActiveItemChanged", (index2, direction) => {
+        if (this.listType === "resolved") {
+          return;
+        }
         setTimeout(() => {
           var _a, _b;
           const item = this.list.activeItem;
@@ -69973,13 +70580,18 @@ ${codeText}
       this.editor = editor;
       this.commentsProvider = commentsProvider;
       this.root = createElement("div", ["editor-web-comment-root"], null);
+      this.root.setAttribute("list-type", this.listType);
       this.groupsContainer = createElement("div", ["comment-groups-container"], this.root);
       this.list = this.createList();
+      this.switcherBar = this.createSwitcher();
       this.commentsProvider.addListener(this);
       this.list.addListener("activeItemChanged", this.handleActiveItemChanged);
       this.list.addListener("itemLayoutUpdated", this.handleItemLayoutUpdated);
       this.list.addListener("selectionOnComment", this.handleSelectionOnComment);
       this.list.addListener("commentCountChanged", this.updateCommentCount);
+      if (!this.editor.options.enableResolveComments) {
+        this.root.classList.add("disable-resolve");
+      }
       this.updateCommentCount();
     }
     get commentOptions() {
@@ -69987,10 +70599,13 @@ ${codeText}
       return commentOptions;
     }
     destroy() {
+      var _a;
       this.list.removeAllListeners();
       this.commentsProvider.removeListener(this);
       this.list.destroy();
       this.root.remove();
+      this.switcherBar.destroy();
+      (_a = this.noResolvedCommentTip) == null ? void 0 : _a.remove();
     }
     onCreateComment(commentId, local) {
       const comment = this.commentsProvider.getComment(commentId);
@@ -70005,8 +70620,73 @@ ${codeText}
       const comment = this.commentsProvider.getComment(commentId);
       this.list.handleUpdateComment(comment);
     }
+    onUpdateCommentResolver(commentId, local) {
+      const comment = this.commentsProvider.getComment(commentId);
+      if (!comment) {
+        return;
+      }
+      let type = "add";
+      if (this.listType === "current") {
+        if (comment.resolver) {
+          type = "remove";
+        }
+      } else {
+        if (!comment.resolver) {
+          type = "remove";
+        }
+      }
+      const blocks = /* @__PURE__ */ new Set();
+      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);
+      });
+      const commentGroup = getCommentsGroup(this.commentsProvider.getComments());
+      const commentWithChildren = commentGroup.find((group) => group.groupId === comment.groupId);
+      if (!commentWithChildren) {
+        return;
+      }
+      setTimeout(() => {
+        if (type === "add") {
+          this.list.handleCreateComment(commentWithChildren, local);
+        } else {
+          this.list.handleResolveComment(commentId);
+        }
+        this.updateCommentCount();
+      }, 300);
+    }
     createList() {
-      return new CommentGroupList(this.editor, this.commentsProvider, this.groupsContainer);
+      return new CommentGroupList(this.editor, this.commentsProvider, this.groupsContainer, this.listType);
+    }
+    createSwitcher() {
+      const container = createElement("div", ["comment-switcher-container"], this.root);
+      const commandBar2 = new FixedToolbar(container, [this.switcherItem], {
+        id: "comment-switcher"
+      });
+      commandBar2.addListener("click", this.handleSwitchType);
+      return commandBar2;
+    }
+    setSwitcherParent(parent) {
+      this.switcherBar.content.remove();
+      parent.append(this.switcherBar.content);
     }
     isEditing(includeEmpty) {
       return this.list.isEditing(includeEmpty);
@@ -70014,14 +70694,30 @@ ${codeText}
     setFirstEditingCommentActive() {
       this.list.setFirstEditingCommentActive();
     }
-    show(groupId) {
+    updateNoResolvedCommentTip() {
       var _a;
+      if (this.listType === "resolved" && this.list.items.length === 0) {
+        if (!this.noResolvedCommentTip) {
+          this.noResolvedCommentTip = createElement("div", ["comment-no-resolved-tip"], this.groupsContainer);
+          this.noResolvedCommentTip.innerText = i18n$1.t("comment.noResolvedComment");
+        }
+        return;
+      }
+      (_a = this.noResolvedCommentTip) == null ? void 0 : _a.remove();
+      this.noResolvedCommentTip = null;
+    }
+    show(groupId) {
+      var _a, _b;
       removeClass(this.root, "hidden");
       if (groupId) {
+        if (this.listType !== "current") {
+          const commandItem = (_a = this.switcherItem.children) == null ? void 0 : _a[0];
+          this.handleSwitchType(this.switcherBar, commandItem);
+        }
         const index2 = this.list.findItemIndex(groupId);
         this.list.setActiveItem(index2);
       }
-      (_a = this.commentOptions) == null ? void 0 : _a.controller.showCommentList();
+      (_b = this.commentOptions) == null ? void 0 : _b.controller.showCommentList();
     }
     hide() {
       addClass(this.root, "hidden");
@@ -70149,7 +70845,7 @@ ${codeText}
   const logger$1c = getLogger("mobile-group-list");
   class MobileGroupList extends ListBase {
     constructor(editor, commentsProvider, parent, scrollElement) {
-      super(editor, commentsProvider, parent, getCommentsGroupFromDoc(editor, commentsProvider), {});
+      super(editor, commentsProvider, parent, getUnresolvedCommentsGroupFromDoc(editor, commentsProvider), {});
       __publicField(this, "scroller");
       __publicField(this, "refreshScroller", () => {
         this.scroller.refresh();
@@ -70197,7 +70893,7 @@ ${codeText}
         this.updateComments();
       });
       __publicField(this, "updateComments", debounce__default.default(() => {
-        const commentsGroup = getCommentsGroupFromDoc(this.editor, this.commentsProvider);
+        const commentsGroup = getUnresolvedCommentsGroupFromDoc(this.editor, this.commentsProvider);
         for (let i = 0; i < commentsGroup.length; i++) {
           const comment = commentsGroup[i];
           const groupItem = this.findGroupItem(comment.groupId);
@@ -70231,7 +70927,7 @@ ${codeText}
       return item;
     }
     findInsertPos(data2) {
-      const commentsMap = getCommentsGroupFromDoc(this.editor, this.commentsProvider);
+      const commentsMap = getUnresolvedCommentsGroupFromDoc(this.editor, this.commentsProvider);
       const index2 = commentsMap.findIndex((group) => group.id === data2.id);
       if (index2 === -1) {
         return -1;
@@ -70367,6 +71063,8 @@ ${codeText}
       const comment = this.commentsProvider.getComment(commentId);
       this.list.handleUpdateComment(comment);
     }
+    onUpdateCommentResolver(commentId, local) {
+    }
     get commentOptions() {
       const commentOptions = this.editor.getComponentOptions("comment");
       return commentOptions;
@@ -70392,7 +71090,7 @@ ${codeText}
     }
   }
   function getMiniCommentsGroupFromDoc(editor, commentsProvider) {
-    const commentsGroupFromDoc = getCommentsGroupFromDoc(editor, commentsProvider);
+    const commentsGroupFromDoc = getUnresolvedCommentsGroupFromDoc(editor, commentsProvider);
     const miniCommentGroups = /* @__PURE__ */ new Map();
     for (const commentGroup of commentsGroupFromDoc) {
       const blockId = getBlockIdByGroupId(editor, commentGroup.groupId);
@@ -70539,6 +71237,9 @@ ${codeText}
     }
     onUpdateComment(commentId, local) {
     }
+    onUpdateCommentResolver(commentId, local) {
+      this.list.updateMiniCommentsGroup();
+    }
     show() {
       removeClass(this.root, "hidden");
     }
@@ -70807,6 +71508,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();
@@ -70832,6 +71542,9 @@ ${codeText}
       if (containers.mobileContainer && this.mobileCommentList) {
         containers.mobileContainer.append(this.mobileCommentList.root);
       }
+      if (containers.switchBarContainer && this.commentList) {
+        this.commentList.setSwitcherParent(containers.switchBarContainer);
+      }
     }
   }
   const style$7 = "";
@@ -70855,7 +71568,14 @@ ${codeText}
       more: "\u66F4\u591A",
       comment: "\u6DFB\u52A0\u6279\u6CE8",
       command: "\u6DFB\u52A0\u6279\u6CE8",
-      quickMenuCommand: "\u6DFB\u52A0\u6279\u6CE8"
+      quickMenuCommand: "\u6DFB\u52A0\u6279\u6CE8",
+      resolvedBy: "\u5DF2\u7531 {name} \u6210\u5458\u89E3\u51B3",
+      reopen: "\u91CD\u65B0\u6253\u5F00",
+      currentComment: "\u5F53\u524D\u6279\u6CE8",
+      resolvedComment: "\u5DF2\u89E3\u51B3\u6279\u6CE8",
+      removedFromDoc: "\u5F15\u7528\u5185\u5BB9\u5DF2\u5220\u9664",
+      noResolvedComment: "\u65E0\u5DF2\u89E3\u51B3\u6279\u6CE8",
+      resolveComment: "\u6807\u8BB0\u4E3A\u5DF2\u89E3\u51B3"
     }
   };
   const enUS$k = {
@@ -70878,7 +71598,14 @@ ${codeText}
       more: "More",
       comment: "Add annotation",
       command: "Add annotation",
-      quickMenuCommand: "Add annotation"
+      quickMenuCommand: "Add annotation",
+      resolvedBy: "Resolved by {name}",
+      reopen: "Reopen",
+      currentComment: "Unresolved annotations",
+      resolvedComment: "Resolved annotations",
+      removedFromDoc: "Quoted content deleted.",
+      noResolvedComment: "No resolved annotations.",
+      resolveComment: "Mark as resolved"
     }
   };
   const jaJP$k = {
@@ -70901,7 +71628,14 @@ ${codeText}
       more: "\u305D\u306E\u4ED6",
       comment: "\u6CE8\u91C8\u3092\u8FFD\u52A0",
       command: "\u6CE8\u91C8\u3092\u8FFD\u52A0",
-      quickMenuCommand: "\u6CE8\u91C8\u3092\u8FFD\u52A0"
+      quickMenuCommand: "\u6CE8\u91C8\u3092\u8FFD\u52A0",
+      resolvedBy: "{name}\u3055\u3093\u304C\u89E3\u6C7A\u3057\u307E\u3057\u305F",
+      reopen: "\u518D\u958B",
+      currentComment: "\u672A\u89E3\u6C7A\u30B3\u30E1\u30F3\u30C8",
+      resolvedComment: "\u89E3\u6C7A\u6E08\u307F\u30B3\u30E1\u30F3\u30C8",
+      removedFromDoc: "\u5F15\u7528\u3055\u308C\u305F\u5185\u5BB9\u306F\u524A\u9664\u3055\u308C\u307E\u3057\u305F\u3002",
+      noResolvedComment: "\u89E3\u6C7A\u6E08\u307F\u30B3\u30E1\u30F3\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002",
+      resolveComment: "\u89E3\u6C7A\u3055\u308C\u307E\u3057\u305F"
     }
   };
   i18n$1.mergeLang({
@@ -70909,61 +71643,6 @@ ${codeText}
     "en-US": enUS$k,
     "ja-JP": jaJP$k
   });
-  class OnesEditorCommentsRender {
-    renderText(editor, path, attributes) {
-      const classes = [];
-      const textAttributes = {};
-      Object.entries(attributes).forEach(([key, value]) => {
-        if (key.startsWith("comment-")) {
-          classes.push("comment");
-          textAttributes[key] = value;
-        }
-      });
-      return { classes, attributes: textAttributes };
-    }
-    renderBox(editor, path, attributes) {
-      const classes = [];
-      const textAttributes = {};
-      Object.entries(attributes).forEach(([key, value]) => {
-        if (key.startsWith("comment-")) {
-          classes.push("comment");
-          textAttributes[key] = value;
-        }
-      });
-      return { classes, attributes: textAttributes };
-    }
-    renderBlock(editor, path, blockData) {
-      const comments = blockData.comments;
-      if (!comments || comments.length === 0) {
-        return {};
-      }
-      const classes = ["comment"];
-      const attributes = {};
-      comments.forEach((commentId) => {
-        attributes[`comment-${commentId.toLocaleLowerCase()}`] = commentId;
-      });
-      return {
-        classes,
-        attributes
-      };
-    }
-    updateBlock(editor, path, blockElement, blockData) {
-      const comments = blockData.comments;
-      removeClass(blockElement, "comment");
-      Array.from(blockElement.attributes).forEach((a) => {
-        if (a.name.startsWith("comment-")) {
-          blockElement.removeAttribute(a.name);
-        }
-      });
-      if (!comments || comments.length === 0) {
-        return;
-      }
-      addClass(blockElement, "comment");
-      comments.forEach((commentId) => {
-        blockElement.setAttribute(`comment-${commentId.toLocaleLowerCase()}`, commentId);
-      });
-    }
-  }
   class OnesEditorCommentPlaceholderHandler {
     constructor(editor) {
       __publicField(this, "handleUpdateCompositionText", (editor, containerId, blockIndex, offset, end) => {
@@ -71115,6 +71794,21 @@ ${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) => {
     var _a;
     const range = editor.selection.range;
@@ -71189,6 +71883,16 @@ ${codeText}
         await updateCommentToOldDoc(this.editor, this.version, commentId, comments.commentProvider.getCommentDoc(commentId));
       }
     }
+    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");
       toolbar2 == null ? void 0 : toolbar2.disableTextToolbar();
@@ -76501,14 +77205,14 @@ ${docStr}
   }
   function isList(elem) {
     var _a;
-    const styles = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
-    return styles.findIndex((style2) => style2.startsWith("level")) !== -1;
+    const styles2 = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
+    return styles2.findIndex((style2) => style2.startsWith("level")) !== -1;
   }
   function getOfficeListGroupId(elem) {
     var _a;
-    const styles = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
-    for (let i = 0; i < styles.length; i++) {
-      const name = styles[i];
+    const styles2 = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
+    for (let i = 0; i < styles2.length; i++) {
+      const name = styles2[i];
       if (name.startsWith("mso-list:")) {
         return name;
       }
@@ -76517,9 +77221,9 @@ ${docStr}
   }
   function getLevel(elem) {
     var _a, _b;
-    const styles = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
-    for (let i = 0; i < styles.length; i++) {
-      const name = styles[i];
+    const styles2 = Array.from(((_a = elem.getAttribute("style")) != null ? _a : "").split(" "));
+    for (let i = 0; i < styles2.length; i++) {
+      const name = styles2[i];
       if (name.startsWith("level")) {
         const level = (_b = Number.parseInt(name.substring(5), 10)) != null ? _b : void 0;
         if (level) {
@@ -80123,6 +80827,8 @@ ${docStr}
     }
     onUpdateComment() {
     }
+    onUpdateCommentResolver(commentId, local) {
+    }
   }
   async function playHistoryData(doc2, versionHelper, historyData) {
     for (const data2 of historyData) {
@@ -90294,6 +91000,9 @@ ${data2.plantumlText}
     localUpdateComment(comment, doc2) {
       this.doc.localUpdateComment(comment, doc2);
     }
+    localUpdateCommentResolver(commentId, resolver) {
+      this.doc.localUpdateCommentResolver(commentId, resolver);
+    }
     onCreateComment(commentId, local) {
       Array.from(this.listeners.values()).forEach((listener) => listener.onCreateComment(commentId, local));
     }
@@ -90303,6 +91012,9 @@ ${data2.plantumlText}
     onUpdateComment(commentId, local) {
       Array.from(this.listeners.values()).forEach((listener) => listener.onUpdateComment(commentId, local));
     }
+    onUpdateCommentResolver(commentId, local) {
+      Array.from(this.listeners.values()).forEach((listener) => listener.onUpdateCommentResolver(commentId, local));
+    }
     addListener(callback) {
       this.listeners.add(callback);
     }
@@ -90328,9 +91040,10 @@ ${data2.plantumlText}
     constructor(editor, localDoc) {
       __publicField(this, "_listeners", /* @__PURE__ */ new Set());
       __publicField(this, "_doc");
+      var _a, _b;
       this.editor = editor;
       this.localDoc = localDoc;
-      this._doc = this.localDoc.toJSON();
+      this._doc = ((_b = (_a = this.localDoc).rawData) == null ? void 0 : _b.call(_a)) || this.localDoc.toJSON();
     }
     get doc() {
       return this._doc;
@@ -90385,6 +91098,17 @@ ${data2.plantumlText}
       this._doc.comments[id] = shareDBComment;
       Array.from(this._listeners.values()).forEach((listener) => listener.onUpdateComment(id, true));
     }
+    localUpdateCommentResolver(commentId, resolver) {
+      const comment = this.getComment(commentId);
+      if (comment) {
+        if (resolver) {
+          comment.resolver = resolver;
+        } else {
+          delete comment.resolver;
+        }
+        Array.from(this._listeners.values()).forEach((listener) => listener.onUpdateCommentResolver(commentId, true));
+      }
+    }
     createCommentEditor(parent, childDoc) {
       const commentEditor = createCommentEditor(this.editor, {
         root: parent,
@@ -91123,8 +91847,8 @@ ${data2.plantumlText}
     const inlineStyles = attributesOfText(text2, "inlineStyle");
     if (inlineStyles == null)
       return;
-    const styles = inlineStyles.split(";");
-    for (const style2 of styles) {
+    const styles2 = inlineStyles.split(";");
+    for (const style2 of styles2) {
       const pair = style2.split(":");
       if (pair.length !== 2)
         continue;
@@ -92940,6 +93664,7 @@ ${data2.plantumlText}
       id: options.id,
       scrollContainer: options == null ? void 0 : options.scrollContainer,
       enableComments: options == null ? void 0 : options.enableComments,
+      enableResolveComments: options == null ? void 0 : options.enableResolveComments,
       enableContextMenu: options == null ? void 0 : options.enableContextMenu,
       components: {
         blocks: [...StandardBlocks, ...((_d = options == null ? void 0 : options.components) == null ? void 0 : _d.blocks) || []],
@@ -93177,7 +93902,7 @@ ${data2.plantumlText}
         }
       }
     });
-    editor.version = "2.8.27";
+    editor.version = "2.8.28-beta.1";
     return editor;
   }
   function isDoc(doc2) {
@@ -93199,6 +93924,7 @@ ${data2.plantumlText}
     const editor = createEditor(root2, doc2, {
       id: options.id,
       scrollContainer: options == null ? void 0 : options.scrollContainer,
+      enableResolveComments: options == null ? void 0 : options.enableResolveComments,
       components: {
         blocks: [...StandardBlocks, ...(_f = (_e = options.components) == null ? void 0 : _e.blocks) != null ? _f : []],
         commandProviders: [new TableBlockCommandProvider()],
@@ -93290,7 +94016,7 @@ ${data2.plantumlText}
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.27";
+    editor.version = "2.8.28-beta.1";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -139110,6 +139836,7 @@ ${data2.plantumlText}
   exports2.CheckMarkIcon = CheckMarkIcon;
   exports2.CheckboxIcon = CheckboxIcon;
   exports2.CircleAddIcon = CircleAddIcon;
+  exports2.CircleCheckMarkIcon = CircleCheckMarkIcon;
   exports2.ClearIcon = ClearIcon;
   exports2.ClipboardProvider = ClipboardProvider;
   exports2.CloseIcon = CloseIcon;
@@ -139260,6 +139987,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;