@ones-editor/editor 2.8.35 → 2.8.37-beta.1

package/@ones-editor/comments/src/comments/comments.d.ts

@@ -1,4 +1,5 @@
 import { OnesEditor } from '../../../../@ones-editor/core';
+import CommentsList, { MobileCommentsList, MiniCommentsList } from '../comments-list';
 import { CommentRoot, OnesEditorCommentsProvider } from '../types';
 export default class OnesEditorComments {
     private editor;
@@ -9,9 +10,12 @@ export default class OnesEditorComments {
     constructor(editor: OnesEditor, provider: OnesEditorCommentsProvider);
     get commentProvider(): OnesEditorCommentsProvider;
     get isMobile(): boolean;
+    getCommentList(): CommentsList | null;
+    getMobileCommentList(): MobileCommentsList | null;
+    getMiniCommentList(): MiniCommentsList;
     destroy(): void;
     private showComment;
-    showCommentList: (groupId?: string) => void;
+    showCommentList: (groupId?: string, type?: 'current' | 'resolved') => void;
     setFirstEditingCommentActive(): void;
     isEditing(includeEmpty?: boolean): boolean;
     mount(containers: CommentRoot): void;

package/@ones-editor/comments/src/comments-helper/active-comment.d.ts

@@ -1,2 +1,4 @@
-import { OnesEditor } from '../../../../@ones-editor/core';
+import { OnesEditor, BlockElement } from '../../../../@ones-editor/core';
 export declare function activeComment(editor: OnesEditor, commentId: string, direction?: 'prev' | 'next'): void;
+export declare function getElementsByCommentId(editor: OnesEditor, commentId: string): HTMLElement[];
+export declare function getBlockByComments(editor: OnesEditor, commentId: string): BlockElement[];

package/@ones-editor/comments/src/comments-helper/get-comment-from-selection.d.ts

@@ -1,2 +1,5 @@
 import { OnesEditor } from '../../../../@ones-editor/core';
+import { OnesEditorCommentsProvider } from '../types';
 export declare function getCommentsFromSelection(editor: OnesEditor): string[];
+export declare function removeUnresolvedComments(commentProvider: OnesEditorCommentsProvider, commentIds: string[]): string[];
+export declare function removeResolvedComments(commentProvider: OnesEditorCommentsProvider, commentIds: string[]): string[];

package/@ones-editor/comments/src/comments-helper/get-comments-from-doc.d.ts

@@ -1,5 +1,9 @@
-import { OnesEditor, OnesEditorComment } from '../../../../@ones-editor/core';
+import { DocObject, OnesEditor, OnesEditorComment } from '../../../../@ones-editor/core';
 import { CommentWithChildren, OnesEditorCommentsProvider } from '../types';
+export declare function getCommentsFromDoc(doc: DocObject): Map<string, number>;
+export declare function getCommentsGroup(comments: OnesEditorComment[]): CommentWithChildren[];
 export declare function getCommentsGroupFromDoc(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider): CommentWithChildren[];
+export declare function getUnresolvedCommentsGroupFromDoc(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider): CommentWithChildren[];
+export declare function getResolvedCommentsGroupFromDoc(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider): CommentWithChildren[];
 export declare function flattenCommentGroup(comment: CommentWithChildren): OnesEditorComment[];
 export declare function getCommentsCountInDoc(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider): number;

package/@ones-editor/comments/src/comments-helper/old-version-comment.d.ts

@@ -1,4 +1,4 @@
-import { DocObject, OnesEditor, OnesEditorComment, OnesEditorDocRange, SelectionRange } from '../../../../@ones-editor/core';
+import { DocCommentResolver, DocObject, OnesEditor, OnesEditorComment, OnesEditorDocRange, SelectionRange } from '../../../../@ones-editor/core';
 export interface AddCommentToOldVersionBody {
     avatarUrl: string;
     containerId: string;
@@ -14,3 +14,4 @@ export declare function addCommentToOldVersion(editor: OnesEditor, version: numb
 export declare function replyCommentToOldVersion(editor: OnesEditor, version: number, comment: OnesEditorComment, commentDoc: DocObject): Promise<unknown>;
 export declare function updateCommentToOldDoc(editor: OnesEditor, version: number, commentId: string, commentDoc: DocObject): Promise<unknown>;
 export declare function deleteCommentFromOldDoc(editor: OnesEditor, version: number, commentId: string): Promise<unknown>;
+export declare function updateCommentResolverToOldDoc(editor: OnesEditor, version: number, commentId: string, resolver?: DocCommentResolver): Promise<unknown>;

package/@ones-editor/comments/src/comments-list/comments-list.d.ts

@@ -1,6 +1,7 @@
-import { OnesEditor } from '../../../../@ones-editor/core';
+import { OnesEditor, CommandItem } from '../../../../@ones-editor/core';
 import { TypedEmitter } from 'tiny-typed-emitter';
-import { OnesEditorCommentsEvents, OnesEditorCommentsProvider } from '../types';
+import { FixedToolbar } from '../../../../@ones-editor/ui-base';
+import { OnesEditorCommentsEvents, OnesEditorCommentsProvider, CommentListType } from '../types';
 import CommentGroupList from './group-list';
 interface CommentsListEvents {
     onSelectComment: () => void;
@@ -11,17 +12,28 @@ export default class CommentsList extends TypedEmitter<CommentsListEvents> imple
     root: HTMLElement;
     private groupsContainer;
     private list;
+    private listType;
+    private switcherItem;
+    private switcherBar;
+    private noCommentTip;
     constructor(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider);
     private get commentOptions();
     destroy(): void;
     onCreateComment(commentId: string, local: boolean): void;
     onDeleteComment(commentId: string, local: boolean): void;
     onUpdateComment(commentId: string, local: boolean): void;
+    onUpdateCommentResolver(commentId: string, local: boolean): void;
     createList(): CommentGroupList;
+    createSwitcher(): FixedToolbar;
+    setSwitcherParent(parent: HTMLElement): void;
     isEditing(includeEmpty?: boolean): boolean;
     setFirstEditingCommentActive(): void;
+    handleSwitchType: (bar: unknown, item: CommandItem) => void;
+    getListType(): CommentListType;
+    setListType(type: CommentListType): void;
     handleSelectionOnComment: () => void;
     updateCommentCount: () => void;
+    updateCommentCountTip(): void;
     handleActiveItemChanged: (index: number, direction?: 'prev' | 'next') => void;
     handleItemLayoutUpdated: () => void;
     show(groupId?: string): void;

package/@ones-editor/comments/src/comments-list/group-item.d.ts

@@ -22,6 +22,7 @@ export declare class CommentGroupItem extends TypedEmitter<CommentGroupItemEvent
     constructor(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider, comment: CommentWithChildren, groupList: CommentGroupList);
     get commentCount(): number;
     private createRoot;
+    private createFooter;
     private createQuickReply;
     private createHeader;
     private createItem;
@@ -35,6 +36,7 @@ export declare class CommentGroupItem extends TypedEmitter<CommentGroupItemEvent
     deleteMainComment(commentId: OnesEditorComment['id']): void;
     handleReadonlyChanged: (editor: OnesEditor) => void;
     edit(): void;
+    setCreatingComment(creating: boolean): void;
     getCommentEditor: () => import("../comment-editor").CommentEditor;
     destroy(): void;
     private handleResize;

package/@ones-editor/comments/src/comments-list/group-list.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="lodash" />
 import { OnesEditor, OnesEditorComment } from '../../../../@ones-editor/core';
-import { CommentWithChildren, OnesEditorCommentsProvider } from '../types';
+import { CommentListType, CommentWithChildren, OnesEditorCommentsProvider } from '../types';
 import { CommentGroupItem } from './group-item';
 import ListBase from './list-base';
 import { CommentGroupItemHandlers } from './handler';
@@ -11,8 +11,10 @@ export interface CommentGroupListEvents {
     commentCountChanged: () => void;
 }
 export default class CommentGroupList extends ListBase<CommentWithChildren, CommentGroupItem, unknown, CommentGroupListEvents> {
+    editor: OnesEditor;
+    private type;
     groupItemHandlers: CommentGroupItemHandlers;
-    constructor(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider, parent: HTMLElement);
+    constructor(editor: OnesEditor, commentsProvider: OnesEditorCommentsProvider, parent: HTMLElement, type: CommentListType);
     destroy(): void;
     dispatchScroll: import("lodash").DebouncedFunc<() => void>;
     updateItemsLayout(dispatchScroll?: boolean): void;
@@ -33,12 +35,16 @@ export default class CommentGroupList extends ListBase<CommentWithChildren, Comm
     findGroupItem: (groupId: string) => CommentGroupItem | undefined;
     handleCreateComment(comment: OnesEditorComment, local: boolean): void;
     handleDeleteComment(commentId: string): void;
+    handleResolveComment(commentId: string): void;
+    removeGroupItem(comment: OnesEditorComment): void;
     handleUpdateComment(comment: OnesEditorComment): void;
     handleContainerClick: (event: MouseEvent) => void;
     handleDocumentClick: (event: MouseEvent) => void;
     handleSelectionChanged: () => void;
     handleEditorResize: () => void;
     handleDocChanged: () => void;
+    changeType(type: CommentListType): void;
+    protected reloadList(data: CommentWithChildren[]): void;
     handleItemResize: () => void;
     handleScroll: (event: WheelEvent) => void;
     updateGroupItemSwitch: () => void;

package/@ones-editor/comments/src/comments-list/handler.d.ts

@@ -17,6 +17,7 @@ export declare class CommentGroupItemHandlers {
     handleCommentItemCancel: (groupItem: CommentGroupItem, commentId: string | null) => void;
     handleCommentItemEdit: (commentItem: CommentItem) => void;
     handleCommentItemDelete: (commentItem: CommentItem) => void;
-    execute: (element: HTMLElement, groupItem: CommentGroupItem, commentId: string | null, itemIndex: number) => void;
+    handleResolve: (groupItem: CommentGroupItem) => void;
+    execute: (element: HTMLElement, groupItem: CommentGroupItem, commentId: string | null, itemIndex: number, event: Event) => void;
     destroy(): void;
 }

package/@ones-editor/comments/src/comments-list/mini-comment/group-list.d.ts

@@ -10,7 +10,7 @@ export declare class MiniGroupList extends ListBase<MiniCommentGroup, MiniGroupI
     protected createItem(data: MiniCommentGroup): MiniGroupItem;
     protected findInsertPos(): number;
     private handleDocChanged;
-    private updateMiniCommentsGroup;
+    updateMiniCommentsGroup: () => void;
     handleCreateComment(comment: OnesEditorComment, local: boolean): void;
     handleDeleteComment(commentId: string): void;
     destroy(): void;

package/@ones-editor/comments/src/comments-list/mini-comment/mini-comments-list.d.ts

@@ -15,6 +15,7 @@ export declare class MiniCommentsList extends TypedEmitter<MiniCommentsListEvent
     onCreateComment(commentId: string, local: boolean): void;
     onDeleteComment(commentId: string, local: boolean): void;
     onUpdateComment(commentId: string, local: boolean): void;
+    onUpdateCommentResolver(commentId: string, local: boolean): void;
     private createList;
     private handleListContainerClick;
     show(): void;

package/@ones-editor/comments/src/comments-list/mobile-comments-list/mobile-comments-list.d.ts

@@ -16,6 +16,7 @@ export declare class MobileCommentsList extends TypedEmitter<MobileCommentsListE
     onCreateComment(commentId: string, local: boolean): void;
     onDeleteComment(commentId: string, local: boolean): void;
     onUpdateComment(commentId: string, local: boolean): void;
+    onUpdateCommentResolver(commentId: string, local: boolean): void;
     private get commentOptions();
     private handleRootClick;
     private createPullInfo;

package/@ones-editor/comments/src/comments-render/get-block-comments.d.ts

@@ -0,0 +1,5 @@
+import { DocObject } from '../../../../@ones-editor/core';
+type CommentIds = Set<string>;
+export declare function getBlockCommentsFromDoc(doc: DocObject): Map<string, CommentIds>;
+export declare function getBlocksByCommentId(doc: DocObject, commentId: string): string[];
+export {};

package/@ones-editor/comments/src/comments-render/index.d.ts

@@ -1,7 +1,16 @@
-import { BlockElement, BlockPath, DocBlock, DocBlockTextAttributes, OnesEditor, OnesEditorBlockRenderer, OnesEditorBlockRenderResult } from '../../../../@ones-editor/core';
+/// <reference types="lodash" />
+import { BlockElement, BlockPath, DocBlock, DocBlockTextAttributes, OnesEditor, OnesEditorBlockRenderer, OnesEditorBlockRenderResult, OnesEditorComment } from '../../../../@ones-editor/core';
+import { CommentListType } from '../types';
 export declare class OnesEditorCommentsRender implements OnesEditorBlockRenderer {
+    private type;
+    constructor(type?: CommentListType);
     renderText(editor: OnesEditor, path: BlockPath, attributes: DocBlockTextAttributes): OnesEditorBlockRenderResult;
     renderBox(editor: OnesEditor, path: BlockPath, attributes: DocBlockTextAttributes): OnesEditorBlockRenderResult;
     renderBlock(editor: OnesEditor, path: BlockPath, blockData: DocBlock): OnesEditorBlockRenderResult;
     updateBlock(editor: OnesEditor, path: BlockPath, blockElement: BlockElement, blockData: DocBlock): void;
+    getCommentStatus(editor: OnesEditor, commentId: string): "unknown" | "resolved" | "unresolved";
+    renderCommentElement(editor: OnesEditor, key: string, commentId: string, classes: string[], textAttributes: Record<string, string>): void;
+    getComments(editor: OnesEditor): OnesEditorComment[];
+    updateUnknownCommentsDelayed: import("lodash").DebouncedFunc<(editor: OnesEditor) => void>;
+    changeType(editor: OnesEditor, type: CommentListType): void;
 }

package/@ones-editor/comments/src/constant/index.d.ts

@@ -9,7 +9,8 @@ export declare enum GroupItemActions {
     CommentItemEdit = "comment-item-edit",
     QuickReply = "quick-reply",
     QuickReplyOk = "quick-reply-ok",
-    QuickReplyCancel = "quick-reply-cancel"
+    QuickReplyCancel = "quick-reply-cancel",
+    Resolve = "resolve"
 }
 export declare const GROUP_ITEM_ACTION_MARK = "group-item-action";
 export declare const LAST_COMMENT_ITEM_MARK = "last-comment-item";

package/@ones-editor/comments/src/index.d.ts

@@ -14,3 +14,4 @@ export { addCommentToTextBlocks } from './actions/add-comment-to-text-block';
 export { addCommentToBlock } from './actions/add-comment-to-block';
 export { editorAddComment } from './actions/editor-add-comment';
 export * from './comments-helper/old-version-comment';
+export * from './resolved-comments';

package/@ones-editor/comments/src/locale/en-us.d.ts

@@ -19,6 +19,15 @@ declare const _default: {
         comment: string;
         command: string;
         quickMenuCommand: string;
+        resolvedBy: string;
+        reopen: string;
+        currentComment: string;
+        resolvedComment: string;
+        removedFromDoc: string;
+        noCurrentComment: string;
+        noResolvedComment: string;
+        resolveComment: string;
+        commentHasAlreadyRemoved: string;
     };
 };
 export default _default;

package/@ones-editor/comments/src/locale/ja-jp.d.ts

@@ -19,6 +19,15 @@ declare const _default: {
         comment: string;
         command: string;
         quickMenuCommand: string;
+        resolvedBy: string;
+        reopen: string;
+        currentComment: string;
+        resolvedComment: string;
+        removedFromDoc: string;
+        noCurrentComment: string;
+        noResolvedComment: string;
+        resolveComment: string;
+        commentHasAlreadyRemoved: string;
     };
 };
 export default _default;

package/@ones-editor/comments/src/locale/zh-cn.d.ts

@@ -19,6 +19,15 @@ declare const _default: {
         comment: string;
         command: string;
         quickMenuCommand: string;
+        resolvedBy: string;
+        reopen: string;
+        currentComment: string;
+        resolvedComment: string;
+        removedFromDoc: string;
+        noCurrentComment: string;
+        noResolvedComment: string;
+        resolveComment: string;
+        commentHasAlreadyRemoved: string;
     };
 };
 export default _default;

package/@ones-editor/comments/src/resolved-comments/index.d.ts

@@ -0,0 +1,4 @@
+import { ManualCloseDialog } from '../../../../@ones-editor/ui-base';
+import { OnesEditor } from '../../../../@ones-editor/core';
+import './styles.scss';
+export declare function showResolvedComments(editor: OnesEditor): ManualCloseDialog | null;

package/@ones-editor/comments/src/resolved-comments/resolved-comment-editor.d.ts

@@ -0,0 +1,14 @@
+import type { OnesEditor, DocObject } from '../../../../@ones-editor/core';
+import { OnesEditorCommentsProvider } from '../types';
+export declare class ResolvedCommentEditor {
+    private commentsProvider;
+    private doc;
+    root: HTMLDivElement;
+    private components;
+    constructor(commentsProvider: OnesEditorCommentsProvider, doc: DocObject);
+    private createEditor;
+    get editor(): OnesEditor;
+    setDoc: (doc: DocObject) => void;
+    readonly: () => void;
+    destroy: () => void;
+}

package/@ones-editor/comments/src/resolved-comments/resolved-comment-list.d.ts

@@ -0,0 +1,4 @@
+import { OnesEditor } from '../../../../@ones-editor/core';
+export declare function createResolvedCommentList(parent: HTMLElement, editor: OnesEditor): {
+    destroy(): void;
+} | null;

package/@ones-editor/comments/src/types.d.ts

@@ -1,4 +1,4 @@
-import { DocObject, LocalDoc, OnesEditor, OnesEditorComment } from '../../../@ones-editor/core';
+import { DocCommentResolver, DocObject, LocalDoc, OnesEditor, OnesEditorComment } from '../../../@ones-editor/core';
 type EditorEvents = {
     onPreviewImage?: (editor: OnesEditor, img: HTMLImageElement) => void;
 };
@@ -12,6 +12,7 @@ export type CommentRoot = {
     container?: HTMLElement;
     miniContainer?: HTMLElement;
     mobileContainer?: HTMLElement;
+    switchBarContainer?: HTMLElement;
 };
 export interface OnesEditorCommentOptions {
     controller: OnesEditorCommentController;
@@ -21,6 +22,7 @@ export interface OnesEditorCommentOptions {
     onUpdateLayout?: (editor: OnesEditor, data: CommentData) => void;
     onCommentCountChange?: (count: number) => void;
     onCommentEditorClick?: (editor: OnesEditor, event: MouseEvent) => void;
+    onCommentListTypeChange?: (editor: OnesEditor, type: 'current' | 'resolved') => void;
     events?: EditorEvents;
     componentsOptions?: {
         [index: string]: unknown;
@@ -30,6 +32,7 @@ export interface OnesEditorCommentsEvents {
     onCreateComment: (commentId: string, local: boolean) => void;
     onDeleteComment: (commentId: string, local: boolean) => void;
     onUpdateComment: (commentId: string, local: boolean) => void;
+    onUpdateCommentResolver: (commentId: string, local: boolean) => void;
 }
 export interface OnesEditorCommentsProvider {
     getComments: () => OnesEditorComment[];
@@ -38,6 +41,7 @@ export interface OnesEditorCommentsProvider {
     localCreateComment: (comment: OnesEditorComment, doc: DocObject) => void;
     localDeleteComment: (commentId: string) => void;
     localUpdateComment: (comment: OnesEditorComment, doc: DocObject) => void;
+    localUpdateCommentResolver: (commentId: string, resolver?: DocCommentResolver) => void;
     addListener: (callback: OnesEditorCommentsEvents) => void;
     removeListener: (callback: OnesEditorCommentsEvents) => void;
     createCommentEditor: (parent: HTMLElement, doc: LocalDoc) => OnesEditor;
@@ -45,6 +49,7 @@ export interface OnesEditorCommentsProvider {
 }
 export interface CommentWithChildren extends OnesEditorComment {
     children: OnesEditorComment[];
+    removedFromDoc?: boolean;
 }
 export interface ItemBase {
     root: HTMLElement;
@@ -63,4 +68,5 @@ export interface MiniCommentGroup {
     commentIds: CommentIds;
 }
 export type MiniCommentGroups = MiniCommentGroup[];
+export type CommentListType = 'current' | 'resolved';
 export {};

package/@ones-editor/core/src/core/block-renderers/block-renderers.d.ts

@@ -4,6 +4,7 @@ export declare class EditorBlockRenderers implements OnesEditorBlockRenderers {
     private editor;
     private renders;
     constructor(editor: OnesEditor);
+    getRenderers(): OnesEditorBlockRenderer[];
     registerRender(render: OnesEditorBlockRenderer): void;
     renderBox(path: BlockPath, attributes: DocBlockTextAttributes): OnesEditorBlockRenderResult;
     renderText(path: BlockPath, attributes: DocBlockTextAttributes): OnesEditorBlockRenderResult;

package/@ones-editor/core/src/core/composition/editor-input.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { OnesEditorInput, OnesEditor, OnesEditorInputHandler, OnesEditorUndoAction, RemoteChangeType, PasteOptions } from '../types';
 import { DocObject } from '../doc';
 export interface EditorInputCallbacks {
@@ -24,6 +25,7 @@ export interface EditorInputCallbacks {
 export declare class EditorInput implements OnesEditorInput {
     editor: OnesEditor;
     composing: boolean;
+    composingTimer: NodeJS.Timeout | undefined;
     callbacks: EditorInputCallbacks;
     inputElement: HTMLTextAreaElement;
     constructor(editor: OnesEditor, callbacks: EditorInputCallbacks);

package/@ones-editor/core/src/core/doc/doc.d.ts

@@ -70,6 +70,11 @@ export interface DocInsertion {
     [index: string]: string | boolean | number | AttributeMap | undefined;
     attributes?: AttributeMap;
 }
+export interface DocCommentResolver {
+    date: number;
+    userId: string;
+    displayName: string;
+}
 export interface DocComment {
     id: string;
     groupId: string;
@@ -80,6 +85,7 @@ export interface DocComment {
     blocks: DocBlock[];
     created: number;
     modified: number;
+    resolver?: DocCommentResolver;
 }
 export type DocBlocks = DocBlock[];
 export type DocMeta = OnesEditorDocServerMeta & {
@@ -133,8 +139,10 @@ export interface OnesEditorDocCallbacks {
     onStatusChanged?: (status: OnesEditorDocStatus) => void;
     onError?: (error: Error) => void;
 }
+export type OnesEditorResourceType = 'image' | 'media' | 'file' | 'graph' | 'paste' | 'unknown';
 export interface UploadResourceOptions {
     onProgress?: (progress: number) => void;
+    resourceType?: OnesEditorResourceType;
 }
 export interface UploadResourceResult {
     resourceId: string;
@@ -247,6 +255,7 @@ export interface OnesEditorDoc extends OnesEditorDocServer {
     beginBatchUpdate: () => number;
     endBatchUpdate: () => number;
     triggerReAuth?: (auto?: boolean) => void;
+    rawData?: () => DocObject;
 }
 export interface OnesEditorDocHistoryData {
     user: {
@@ -265,6 +274,7 @@ export interface OnesEditorHistoryDataParseHandler {
     onDeleteComment: (commentId: string, local: boolean) => void;
     onCreateComment: (commentId: string, local: boolean) => void;
     onUpdateComment: (commentId: string, local: boolean) => void;
+    onUpdateCommentResolver: (commentId: string, local: boolean) => void;
 }
 export interface OnesEditorDocVersionHelper {
     getVersions: (showPublished?: boolean) => Promise<DocVersion[]>;
@@ -288,4 +298,5 @@ export interface OnesEditorComment {
     abstract: string;
     created: number;
     modified: number;
+    resolver?: DocCommentResolver;
 }

package/@ones-editor/core/src/core/types.d.ts

@@ -412,6 +412,7 @@ export interface OnesEditorBlockRenderers {
     renderChildContainer: (editor: OnesEditor, path: BlockPath, containerId: string) => OnesEditorBlockRenderResult;
     updateBlock: (editor: OnesEditor, path: BlockPath, blockElement: BlockElement, blockData: DocBlock) => void;
     registerRender: (decorator: OnesEditorBlockRenderer) => void;
+    getRenderers: () => OnesEditorBlockRenderer[];
 }
 export type OnesEditorDocSource = 'text/html' | 'text/office-html' | 'text/plain' | 'text/markdown' | 'image/*' | 'text/x-ones-editor-doc' | '*';
 export type OnesEditorDocs = Partial<Record<OnesEditorDocSource, DocObject>>;
@@ -460,6 +461,7 @@ export interface OnesEditorOptionalOptions {
     colors?: string[];
     scrollContainer?: HTMLElement;
     enableComments?: boolean;
+    enableResolveComments?: boolean;
     enableContextMenu?: boolean;
     settingsProvider?: OnesEditorSettingsProvider;
 }
@@ -469,6 +471,7 @@ export interface OnesEditorOptions {
         [index: string]: unknown;
     };
     enableComments?: boolean;
+    enableResolveComments?: boolean;
     enableContextMenu?: boolean;
     scrollContainer?: HTMLElement;
 }

package/@ones-editor/core/src/local-doc/index.d.ts

@@ -10,6 +10,7 @@ export declare class LocalDoc extends EventCallbacks<OnesEditorDocCallbacks> imp
     beginBatchUpdate(): number;
     endBatchUpdate(): number;
     toJSON(): DocObject;
+    rawData(): DocObject;
     getContainerBlocks(containerId: string): DocBlock[];
     findContainerBlocks(containerId: string): DocBlock[];
     getBlockData(containerId: string, blockIndex: number): DocBlock;

package/@ones-editor/main-toolbar/src/index.d.ts

@@ -5,10 +5,16 @@ import './locale';
 import './style.scss';
 export * from './types';
 export * from './items';
+export interface MainToolbarOptions {
+    enableFullScreen?: boolean;
+    onFullScreenClick?: (editor: OnesEditor, item: CommandItem) => void;
+}
 export declare class MainToolbar implements OnesEditorCustom {
     private editor;
+    private options;
     toolbar: FixedToolbar;
-    constructor(editor: OnesEditor, parent: HTMLElement);
+    toolbarFullScreen?: FixedToolbar;
+    constructor(editor: OnesEditor, parent: HTMLElement, options?: MainToolbarOptions);
     destroy(): void;
     setItems(items: ToolbarItem[]): void;
     getItems(): ToolbarItem[];

package/@ones-editor/main-toolbar/src/items/index.d.ts

@@ -13,5 +13,5 @@ import { FindReplaceItem } from './find';
 import { CommentItem } from './comment';
 import { ColorItem } from './text-color';
 import { MoreItem } from './more-item';
-export declare function getToolbarDefaultItems(editor: OnesEditor): (FontBoldItem | FontItalicItem | FontUnderlineItem | FontStrikethroughItem | InlineCodeItem | SuperscriptItem | SubscriptItem | InsertImageItem | InsertLinkItem | OrderedListItem | UnorderedListItem | CheckListItem | ParagraphItem | QuoteItem | SeparatorItem | AlignLeftItem | AlignCenterItem | AlignRightItem | UndoItem | RedoItem | InsertItem | FindReplaceItem | CommentItem | ColorItem | MoreItem)[];
+export declare function getToolbarDefaultItems(editor: OnesEditor): (FontBoldItem | FontItalicItem | FontUnderlineItem | FontStrikethroughItem | InlineCodeItem | SuperscriptItem | SubscriptItem | InsertLinkItem | OrderedListItem | UnorderedListItem | CheckListItem | ParagraphItem | QuoteItem | SeparatorItem | AlignLeftItem | AlignCenterItem | AlignRightItem | UndoItem | RedoItem | InsertItem | FindReplaceItem | CommentItem | ColorItem | MoreItem)[];
 export { UndoItem, RedoItem, FontBoldItem, FontItalicItem, FontUnderlineItem, FontStrikethroughItem, ColorItem, InlineCodeItem, SuperscriptItem, SubscriptItem, AlignLeftItem, AlignCenterItem, AlignRightItem, ParagraphItem, SeparatorItem, OrderedListItem, UnorderedListItem, CheckListItem, InsertImageItem, InsertLinkItem, QuoteItem, InsertItem, FindReplaceItem, CommentItem, MoreItem, };

package/@ones-editor/sharedb-doc/src/doc/comments.d.ts

@@ -1,4 +1,4 @@
-import { DocBlocks, DocObject, OnesEditorComment } from '../../../../@ones-editor/core';
+import { DocBlocks, DocCommentResolver, DocObject, OnesEditorComment } from '../../../../@ones-editor/core';
 export interface ShareDBDocCommentBase {
     id: string;
     groupId: string;
@@ -9,6 +9,7 @@ export interface ShareDBDocCommentBase {
     created: number;
     modified: number;
     blocks?: DocBlocks;
+    resolver?: DocCommentResolver;
 }
 export type ShareDBDocComment = ShareDBDocCommentBase & {
     [index: string]: DocBlocks;

package/@ones-editor/sharedb-doc/src/doc/op-parser/parse-handler.d.ts

@@ -1,5 +1,5 @@
 import { DocBlock, DocBlockTextActions, OnesEditorHistoryDataParseHandler } from '../../../../../@ones-editor/core';
-type ActionType = 'deleteBlock' | 'insertBlock' | 'deleteBlockData' | 'insertBlockData' | 'updateBlockText' | 'deleteContainer' | 'createContainer' | 'deleteComment' | 'createComment' | 'updateComment';
+type ActionType = 'deleteBlock' | 'insertBlock' | 'deleteBlockData' | 'insertBlockData' | 'updateBlockText' | 'deleteContainer' | 'createContainer' | 'deleteComment' | 'createComment' | 'updateComment' | 'updateCommentResolved';
 interface Action {
     type: ActionType;
     containerId?: string;
@@ -20,6 +20,7 @@ export declare class ParseHandler {
     onDeleteComment(commentId: string): void;
     onCreateComment(commentId: string): void;
     onUpdateComment(commentId: string): void;
+    onUpdateCommentResolver(commentId: string): void;
     end(): void;
 }
 export {};

package/@ones-editor/sharedb-doc/src/doc/sharedb-doc.d.ts

@@ -1,4 +1,4 @@
-import { BuildResourceUrlOptions, DocBlock, DocBlockDelta, DocBlockText, DocBlockTextActions, DocObject, DocVersion, EventCallbacks, OnesEditorComment, OnesEditorDoc, OnesEditorDocHistoryData, OnesEditorDocServerMeta, OnesEditorDocStatus, OnesEditorDocVersionExtra, OnesEditorDocVersionHelper, OnesEditorHistoryDataParseHandler, UploadResourceOptions, UploadResourceResult } from '../../../../@ones-editor/core';
+import { BuildResourceUrlOptions, DocBlock, DocBlockDelta, DocBlockText, DocBlockTextActions, DocCommentResolver, DocObject, DocVersion, EventCallbacks, OnesEditorComment, OnesEditorDoc, OnesEditorDocHistoryData, OnesEditorDocServerMeta, OnesEditorDocStatus, OnesEditorDocVersionExtra, OnesEditorDocVersionHelper, OnesEditorHistoryDataParseHandler, UploadResourceOptions, UploadResourceResult } from '../../../../@ones-editor/core';
 import { Doc } from 'sharedb/lib/client';
 import { LocalPresence } from 'sharedb/lib/sharedb';
 import RemoteCaretsHandler from './remote-caret-handler';
@@ -66,6 +66,7 @@ export default class ShareDBDoc extends EventCallbacks<ShareDBDocCallbacks> impl
     localCreateComment(comment: OnesEditorComment, doc: DocObject): Promise<void>;
     localDeleteComment(commentId: string): Promise<void>;
     localUpdateComment(comment: OnesEditorComment, doc: DocObject): Promise<void>;
+    localUpdateCommentResolver(commentId: string, resolver?: DocCommentResolver): Promise<void> | Promise<boolean>;
     destroy(): void;
     private handleOp;
     onDeleteBlock(containerId: string, blockIndex: number, local: boolean): void;
@@ -77,6 +78,7 @@ export default class ShareDBDoc extends EventCallbacks<ShareDBDocCallbacks> impl
     onDeleteComment(commentId: string, local: boolean): void;
     onCreateComment(commentId: string, local: boolean): void;
     onUpdateComment(commentId: string, local: boolean): void;
+    onUpdateCommentResolver(commentId: string, local: boolean): void;
     onCustomMessage(msg: unknown): void;
     addResources(resourceIds: string[]): Promise<string[]>;
     uploadResource(file: File, options?: UploadResourceOptions): Promise<UploadResourceResult>;

package/@ones-editor/sharedb-doc/src/types.d.ts

@@ -134,4 +134,5 @@ export interface ShareDBDocCallbacks extends OnesEditorDocCallbacks {
     onCreateComment?: (commentId: string, local: boolean) => void;
     onDeleteComment?: (commentId: string, local: boolean) => void;
     onUpdateComment?: (commentId: string, local: boolean) => void;
+    onUpdateCommentResolver?: (commentId: string, local: boolean) => void;
 }