@ones-editor/editor 2.8.25-beta.1 → 2.8.25-beta.11

package/@ones-editor/ui-base/src/icons/index.d.ts

@@ -46,6 +46,7 @@ import CommentIcon from './comment.svg?raw';
 import RefreshIcon from './refresh.svg?raw';
 import HelpIcon from './help.svg?raw';
 import CheckMarkIcon from './check-mark.svg?raw';
+import CircleCheckMarkIcon from './circle-check-mark.svg?raw';
 import TextIcon from './text.svg?raw';
 import RightArrowIcon from './right-arrow.svg?raw';
 import BilibiliIcon from './bilibili-icon.svg?raw';
@@ -126,4 +127,4 @@ import ShiftTabIcon from './shift-tab.svg?raw';
 import TableEditIcon from './table-edit.svg?raw';
 import AdjustWidthIcon from './adjust-width.svg?raw';
 import TocIcon from './toc.svg?raw';
-export { TableEditIcon, TabIcon, ShiftTabIcon, DownloadIcon, AddEmojiIcon, BallIcon, CardIcon, FoodIcon, LightIcon, SmileIcon, SymbolIcon, TreeIcon, TimeIcon, ClearIcon, CloseIcon, PrevIcon, NextIcon, MoreIcon, TextColorIcon, AddIcon, ArrowDownIcon, ArrowUpIcon, ArrowLeftIcon, ArrowRightIcon, DeleteRowIcon, DeleteColIcon, MergeCellIcon, SplitCellIcon, DeleteTableIcon, Heading1Icon, Heading2Icon, Heading3Icon, Heading4Icon, Heading5Icon, Heading6Icon, Heading7Icon, Heading8Icon, HeadingNIcon, OrderedListIcon, UnorderedListIcon, CheckListIcon, BlockquoteIcon, AlignCenterIcon, AlignLeftIcon, AlignRightIcon, ImageIcon, ImageMenuIcon, ImageErrorIcon, ImageEmptyIcon, LinkIcon, LinkOffIcon, WarningIcon, PasteSpecialIcon, LaunchIcon, CodeIcon, LayoutIcon, AudioIcon, GraphIcon, VideoIcon, FileIcon, MathIcon, MathMenuIcon, TableIcon, TableMenuIcon, BilibiliIcon, YoukuIcon, ModaoIcon, FigmaIcon, EditIcon, CommentIcon, RefreshIcon, HelpIcon, CheckMarkIcon, TextIcon, RightArrowIcon, TencentVideoIcon, WebPageIcon, UmlIcon, DividingLineIcon, HeadingH1Icon, HeadingH2Icon, HeadingH3Icon, HeadingH4Icon, HeadingH5Icon, HeadingH6Icon, HeadingH7Icon, HeadingH8Icon, CheckboxIcon, QuoteIcon, LinkHrefIcon, OrderedIcon, UnorderedIcon, CopyIcon, CutIcon, DeleteIcon, LockBlockIcon, UnLockBlockIcon, InsertBeforeIcon, InsertAfterIcon, MentionIcon, CircleAddIcon, LoadingIcon, DragIcon, UmlBrandIcon, OnesLoadingIcon, BoldIcon, ItalicIcon, UnderlineIcon, LineThroughIcon, SubscriptIcon, SuperscriptIcon, InlineCodeIcon, ToMindMapIcon, FitIcon, FullScreenIcon, ExitFullScreenIcon, CaretDownIcon, StatusIcon, AlertEmojiIcon, ForbiddenIcon, WarningFilledIcon, InformationFilledIcon, SearchIcon, CalloutIcon, LoadingCircleIcon, TextGroupIcon, AdjustWidthIcon, TocIcon, };
+export { TableEditIcon, TabIcon, ShiftTabIcon, DownloadIcon, AddEmojiIcon, BallIcon, CardIcon, FoodIcon, LightIcon, SmileIcon, SymbolIcon, TreeIcon, TimeIcon, ClearIcon, CloseIcon, PrevIcon, NextIcon, MoreIcon, TextColorIcon, AddIcon, ArrowDownIcon, ArrowUpIcon, ArrowLeftIcon, ArrowRightIcon, DeleteRowIcon, DeleteColIcon, MergeCellIcon, SplitCellIcon, DeleteTableIcon, Heading1Icon, Heading2Icon, Heading3Icon, Heading4Icon, Heading5Icon, Heading6Icon, Heading7Icon, Heading8Icon, HeadingNIcon, OrderedListIcon, UnorderedListIcon, CheckListIcon, BlockquoteIcon, AlignCenterIcon, AlignLeftIcon, AlignRightIcon, ImageIcon, ImageMenuIcon, ImageErrorIcon, ImageEmptyIcon, LinkIcon, LinkOffIcon, WarningIcon, PasteSpecialIcon, LaunchIcon, CodeIcon, LayoutIcon, AudioIcon, GraphIcon, VideoIcon, FileIcon, MathIcon, MathMenuIcon, TableIcon, TableMenuIcon, BilibiliIcon, YoukuIcon, ModaoIcon, FigmaIcon, EditIcon, CommentIcon, RefreshIcon, HelpIcon, CheckMarkIcon, CircleCheckMarkIcon, TextIcon, RightArrowIcon, TencentVideoIcon, WebPageIcon, UmlIcon, DividingLineIcon, HeadingH1Icon, HeadingH2Icon, HeadingH3Icon, HeadingH4Icon, HeadingH5Icon, HeadingH6Icon, HeadingH7Icon, HeadingH8Icon, CheckboxIcon, QuoteIcon, LinkHrefIcon, OrderedIcon, UnorderedIcon, CopyIcon, CutIcon, DeleteIcon, LockBlockIcon, UnLockBlockIcon, InsertBeforeIcon, InsertAfterIcon, MentionIcon, CircleAddIcon, LoadingIcon, DragIcon, UmlBrandIcon, OnesLoadingIcon, BoldIcon, ItalicIcon, UnderlineIcon, LineThroughIcon, SubscriptIcon, SuperscriptIcon, InlineCodeIcon, ToMindMapIcon, FitIcon, FullScreenIcon, ExitFullScreenIcon, CaretDownIcon, StatusIcon, AlertEmojiIcon, ForbiddenIcon, WarningFilledIcon, InformationFilledIcon, SearchIcon, CalloutIcon, LoadingCircleIcon, TextGroupIcon, AdjustWidthIcon, TocIcon, };

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

@@ -4326,6 +4326,15 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
   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;
@@ -4347,7 +4356,7 @@ 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 .item-head-switch .editor-text-button.resolved {
+.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 {
@@ -4404,22 +4413,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] {
-  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=resolve].resolved {
-  color: green;
+.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);
@@ -4440,9 +4450,14 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
 }
 .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;
@@ -4457,7 +4472,10 @@ div.editor-root.readonly div.editor-content div[data-type=editor-container] div[
 .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 {
@@ -32284,6 +32302,9 @@ ${codeText}
     toJSON() {
       return cloneDeep__default.default(this.doc);
     }
+    rawData() {
+      return this.doc;
+    }
     getContainerBlocks(containerId) {
       const blocks = this.doc.blocks[containerId];
       return blocks;
@@ -40755,6 +40776,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';
@@ -40910,6 +40932,7 @@ ${codeText}
     RefreshIcon,
     HelpIcon,
     CheckMarkIcon,
+    CircleCheckMarkIcon,
     TextIcon,
     RightArrowIcon: rightArrow,
     TencentVideoIcon,
@@ -63425,7 +63448,7 @@ $$${mathData.mathjaxText}$$
   function removeResolvedComments(commentProvider, commentIds) {
     return commentIds.filter((commentId) => {
       const comment = commentProvider.getComment(commentId);
-      return !comment.resolver;
+      return !(comment == null ? void 0 : comment.resolver);
     });
   }
   const logger$1F = getLogger("active-comments");
@@ -69282,8 +69305,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;
@@ -69512,10 +69535,11 @@ ${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", CheckMarkIcon);
+      const resolve = createTextButton(switchContainer, GroupItemActions.Resolve, "resolve", CircleCheckMarkIcon);
       addGroupActionToElement(switchUp, GroupItemActions.SwitchUp);
       addGroupActionToElement(switchDown, GroupItemActions.SwitchDown);
       addGroupActionToElement(resolve, GroupItemActions.Resolve);
+      addClass(resolve, "disable-active");
       if (comment.resolver) {
         addClass(resolve, "resolved");
       }
@@ -69558,6 +69582,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");
@@ -69566,6 +69591,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();
@@ -69761,7 +69798,7 @@ ${codeText}
           date: Date.now()
         });
       });
-      __publicField(this, "execute", (element, groupItem, commentId, itemIndex) => {
+      __publicField(this, "execute", (element, groupItem, commentId, itemIndex, event) => {
         const actionElement = getClosestGroupItemActionElement(element);
         if (!actionElement)
           return;
@@ -69801,6 +69838,8 @@ ${codeText}
             this.handleQuickReplyCancel(groupItem);
             break;
           case GroupItemActions.Resolve:
+            event.preventDefault();
+            event.stopPropagation();
             this.handleResolve(groupItem);
             break;
           default:
@@ -69855,7 +69894,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;
@@ -69863,7 +69904,8 @@ ${codeText}
             event.target,
             this.items[index2],
             commentId,
-            index2
+            index2,
+            event
           );
         }
       });
@@ -70127,6 +70169,7 @@ ${codeText}
         newItem.quickReply.hide();
         setTimeout(() => {
           newItem.edit();
+          newItem.setCreatingComment(true);
         }, 300);
       }
     }
@@ -70151,6 +70194,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) {
@@ -70224,10 +70273,20 @@ ${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) => {
-        const comments = editor.doc.toJSON().comments;
+        const comments = this.getComments(editor);
         const invisibleComments = Object.values(comments).filter((comment) => {
           if (comment.id !== comment.groupId) {
             return false;
@@ -70343,6 +70402,14 @@ ${codeText}
         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");
@@ -70354,8 +70421,8 @@ ${codeText}
           }
         });
       });
-      const doc2 = editor.doc.toJSON();
-      const visibleComments = Object.values(doc2.comments).filter((comment) => {
+      const comments = this.getComments(editor);
+      const visibleComments = Object.values(comments).filter((comment) => {
         if (comment.id !== comment.groupId) {
           return false;
         }
@@ -70363,7 +70430,7 @@ ${codeText}
         return ret;
       });
       const visibleCommentsId = new Set(visibleComments.map((c) => c.id));
-      const commentsFromDoc = getBlockCommentsFromDoc(doc2);
+      const commentsFromDoc = getBlockCommentsFromDoc(editor.doc.toJSON());
       commentsFromDoc.forEach((commentIds, blockId) => {
         if (Array.from(commentIds).some((c) => visibleCommentsId.has(c))) {
           const block = editor.findBlockById(blockId);
@@ -70399,6 +70466,7 @@ ${codeText}
         }]
       });
       __publicField(this, "switcherBar");
+      __publicField(this, "noResolvedCommentTip", null);
       __publicField(this, "handleSwitchType", (bar2, item) => {
         if (item.id === "current-comment") {
           this.listType = "current";
@@ -70416,6 +70484,7 @@ ${codeText}
         if (renderer) {
           renderer.changeType(this.editor, this.listType);
         }
+        this.updateNoResolvedCommentTip();
       });
       __publicField(this, "handleSelectionOnComment", () => {
         this.emit("onSelectComment");
@@ -70424,8 +70493,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;
@@ -70458,11 +70531,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);
@@ -70479,40 +70554,56 @@ ${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);
       });
+      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, this.listType);
@@ -70525,12 +70616,28 @@ ${codeText}
       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);
     }
     setFirstEditingCommentActive() {
       this.list.setFirstEditingCommentActive();
     }
+    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;
       removeClass(this.root, "hidden");
@@ -71329,6 +71436,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();
@@ -71354,6 +71470,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 = "";
@@ -71382,7 +71501,8 @@ ${codeText}
       reopen: "\u91CD\u65B0\u6253\u5F00",
       currentComment: "\u5F53\u524D\u6279\u6CE8",
       resolvedComment: "\u5DF2\u89E3\u51B3\u6279\u6CE8",
-      removedFromDoc: "\u5F15\u7528\u5185\u5BB9\u5DF2\u5220\u9664"
+      removedFromDoc: "\u5F15\u7528\u5185\u5BB9\u5DF2\u5220\u9664",
+      noResolvedComment: "\u65E0\u5DF2\u89E3\u51B3\u6279\u6CE8"
     }
   };
   const enUS$k = {
@@ -71410,7 +71530,8 @@ ${codeText}
       reopen: "Reopen",
       currentComment: "Current Annotations",
       resolvedComment: "Resolved Annotations",
-      removedFromDoc: "This annotation has been removed from the document"
+      removedFromDoc: "This annotation has been removed from the document",
+      noResolvedComment: "No resolved annotations"
     }
   };
   const jaJP$k = {
@@ -71438,7 +71559,8 @@ ${codeText}
       reopen: "\u518D\u958B",
       currentComment: "\u73FE\u5728\u306E\u6CE8\u91C8",
       resolvedComment: "\u89E3\u6C7A\u6E08\u307F\u306E\u6CE8\u91C8",
-      removedFromDoc: "\u3053\u306E\u6CE8\u91C8\u306F\u6587\u66F8\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F"
+      removedFromDoc: "\u3053\u306E\u6CE8\u91C8\u306F\u6587\u66F8\u304B\u3089\u524A\u9664\u3055\u308C\u307E\u3057\u305F",
+      noResolvedComment: "\u89E3\u6C7A\u6E08\u307F\u306E\u6CE8\u91C8\u306F\u3042\u308A\u307E\u305B\u3093"
     }
   };
   i18n$1.mergeLang({
@@ -71597,6 +71719,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) => {
@@ -71674,6 +71809,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");
@@ -90813,9 +90956,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;
@@ -90873,8 +91017,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) {
@@ -93668,7 +93816,7 @@ ${data2.plantumlText}
         }
       }
     });
-    editor.version = "2.8.25-beta.1";
+    editor.version = "2.8.25-beta.11";
     return editor;
   }
   function isDoc(doc2) {
@@ -93781,7 +93929,7 @@ ${data2.plantumlText}
       }
     });
     OnesEditorToolbar.register(editor);
-    editor.version = "2.8.25-beta.1";
+    editor.version = "2.8.25-beta.11";
     return editor;
   }
   async function showDocVersions(editor, options, serverUrl) {
@@ -139601,6 +139749,7 @@ ${data2.plantumlText}
   exports2.CheckMarkIcon = CheckMarkIcon;
   exports2.CheckboxIcon = CheckboxIcon;
   exports2.CircleAddIcon = CircleAddIcon;
+  exports2.CircleCheckMarkIcon = CircleCheckMarkIcon;
   exports2.ClearIcon = ClearIcon;
   exports2.ClipboardProvider = ClipboardProvider;
   exports2.CloseIcon = CloseIcon;
@@ -139751,6 +139900,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.1",
+  "version": "2.8.25-beta.11",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
   "dependencies": {