@univerjs/docs-thread-comment-ui 0.25.0-insiders.20260623-012b5a8 → 0.25.1

package/lib/es/index.js

@@ -1,10 +1,10 @@
 import { BuildTextUtils, CommandType, CustomDecorationType, DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, Plugin, SHEET_EDITOR_UNITS, UniverInstanceType, UserManagerService, isInternalEditorID, merge, sequenceExecute } from "@univerjs/core";
-import { DocBackScrollRenderController, DocRenderController, DocSelectionRenderService, FLOAT_TOOLBAR_MENU_POSITION, addCustomDecorationBySelectionFactory, deleteCustomDecorationFactory } from "@univerjs/docs-ui";
+import { DocBackScrollRenderController, DocRenderController, DocSelectionRenderService, addCustomDecorationBySelectionFactory, deleteCustomDecorationFactory } from "@univerjs/docs-ui";
 import { AddCommentMutation, IThreadCommentDataSourceService, ThreadCommentModel, getDT } from "@univerjs/thread-comment";
 import { SetActiveCommentOperation, ThreadCommentPanel, ThreadCommentPanelService, UniverThreadCommentUIPlugin } from "@univerjs/thread-comment-ui";
 import { DOC_INTERCEPTOR_POINT, DocInterceptorService, DocSelectionManagerService, DocSkeletonManagerService, RichTextEditingMutation, SetTextSelectionsOperation } from "@univerjs/docs";
 import { DocumentEditArea, IRenderManagerService, withCurrentTypeOfRenderer } from "@univerjs/engine-render";
-import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IMenuManagerService, ISidebarService, IconManager, MenuItemType, RibbonInsertGroup, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
+import { ComponentManager, ContextMenuGroup, ContextMenuPosition, IMenuManagerService, ISidebarService, MenuItemType, RibbonInsertGroup, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
 import { BehaviorSubject, Observable, debounceTime, filter } from "rxjs";
 import { CommentIcon } from "@univerjs/icons";
 import { useEffect, useMemo, useState } from "react";
@@ -87,7 +87,7 @@ const DeleteDocCommentComment = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -98,7 +98,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -111,14 +111,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -129,7 +129,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -137,7 +137,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -272,7 +272,7 @@ const StartAddCommentOperation = {
 //#endregion
 //#region package.json
 var name = "@univerjs/docs-thread-comment-ui";
-var version = "0.25.0-insiders.20260623-012b5a8";
+var version = "0.25.1";
 
 //#endregion
 //#region src/config/config.ts
@@ -280,6 +280,87 @@ const DOCS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY = "docs-thread-comment-ui.config"
 const configSymbol = Symbol(DOCS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
+//#endregion
+//#region src/controllers/doc-thread-comment-selection.controller.ts
+let DocThreadCommentSelectionController = class DocThreadCommentSelectionController extends Disposable {
+	constructor(_threadCommentPanelService, _univerInstanceService, _commandService, _docThreadCommentService, _renderManagerService, _threadCommentModel) {
+		super();
+		this._threadCommentPanelService = _threadCommentPanelService;
+		this._univerInstanceService = _univerInstanceService;
+		this._commandService = _commandService;
+		this._docThreadCommentService = _docThreadCommentService;
+		this._renderManagerService = _renderManagerService;
+		this._threadCommentModel = _threadCommentModel;
+		this._initSelectionChange();
+		this._initActiveCommandChange();
+	}
+	_initSelectionChange() {
+		let lastSelection;
+		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
+			if (commandInfo.id === SetTextSelectionsOperation.id) {
+				const { unitId, ranges } = commandInfo.params;
+				if (isInternalEditorID(unitId)) return;
+				const doc = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
+				const primary = ranges[0];
+				if ((lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.startOffset) === (primary === null || primary === void 0 ? void 0 : primary.startOffset) && (lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.endOffset) === (primary === null || primary === void 0 ? void 0 : primary.endOffset)) return;
+				lastSelection = primary;
+				if (primary && doc) {
+					const { startOffset, endOffset, collapsed } = primary;
+					let customRange;
+					if (collapsed) {
+						var _doc$getBody;
+						customRange = (_doc$getBody = doc.getBody()) === null || _doc$getBody === void 0 || (_doc$getBody = _doc$getBody.customDecorations) === null || _doc$getBody === void 0 ? void 0 : _doc$getBody.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1);
+					} else {
+						var _doc$getBody2;
+						customRange = (_doc$getBody2 = doc.getBody()) === null || _doc$getBody2 === void 0 || (_doc$getBody2 = _doc$getBody2.customDecorations) === null || _doc$getBody2 === void 0 ? void 0 : _doc$getBody2.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1);
+					}
+					if (customRange) {
+						const comment = this._threadCommentModel.getComment(unitId, DEFAULT_DOC_SUBUNIT_ID, customRange.id);
+						if (comment && !comment.resolved) this._commandService.executeCommand(ShowCommentPanelOperation.id, { activeComment: {
+							unitId,
+							subUnitId: DEFAULT_DOC_SUBUNIT_ID,
+							commentId: customRange.id
+						} });
+						return;
+					}
+				}
+				if (!this._threadCommentPanelService.activeCommentId) return;
+				const addingComment = this._docThreadCommentService.addingComment;
+				const activeComment = this._threadCommentPanelService.activeCommentId;
+				if (addingComment && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.unitId) === addingComment.unitId && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.subUnitId) === "default_doc" && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.commentId) === addingComment.id) return;
+				this._commandService.executeCommand(SetActiveCommentOperation.id);
+			}
+		}));
+	}
+	_initActiveCommandChange() {
+		this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((activeComment) => {
+			var _this$_docThreadComme;
+			if (activeComment) {
+				const doc = this._univerInstanceService.getUnit(activeComment.unitId);
+				if (doc) {
+					var _this$_renderManagerS, _doc$getBody3;
+					const backScrollController = (_this$_renderManagerS = this._renderManagerService.getRenderById(activeComment.unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocBackScrollRenderController);
+					const customRange = (_doc$getBody3 = doc.getBody()) === null || _doc$getBody3 === void 0 || (_doc$getBody3 = _doc$getBody3.customDecorations) === null || _doc$getBody3 === void 0 ? void 0 : _doc$getBody3.find((range) => range.id === activeComment.commentId);
+					if (customRange && backScrollController) backScrollController.scrollToRange({
+						startOffset: customRange.startIndex,
+						endOffset: customRange.endIndex,
+						collapsed: false
+					});
+				}
+			}
+			if (!activeComment || activeComment.commentId !== ((_this$_docThreadComme = this._docThreadCommentService.addingComment) === null || _this$_docThreadComme === void 0 ? void 0 : _this$_docThreadComme.id)) this._docThreadCommentService.endAdd();
+		}));
+	}
+};
+DocThreadCommentSelectionController = __decorate([
+	__decorateParam(0, Inject(ThreadCommentPanelService)),
+	__decorateParam(1, IUniverInstanceService),
+	__decorateParam(2, ICommandService),
+	__decorateParam(3, Inject(DocThreadCommentService)),
+	__decorateParam(4, IRenderManagerService),
+	__decorateParam(5, Inject(ThreadCommentModel))
+], DocThreadCommentSelectionController);
+
 //#endregion
 //#region src/menu/menu.ts
 const shouldDisableAddComment = (accessor) => {
@@ -323,7 +404,20 @@ function ToolbarDocCommentMenuItemFactory(accessor) {
 }
 
 //#endregion
-//#region src/views/DocThreadCommentPanel.tsx
+//#region src/menu/schema.ts
+const menuSchema = {
+	[RibbonInsertGroup.MEDIA]: { [ToggleCommentPanelOperation.id]: {
+		order: 3,
+		menuItemFactory: ToolbarDocCommentMenuItemFactory
+	} },
+	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.DATA]: { [StartAddCommentOperation.id]: {
+		order: 1,
+		menuItemFactory: AddDocCommentMenuItemFactory
+	} } }
+};
+
+//#endregion
+//#region src/views/doc-thread-comment-panel/index.tsx
 const DocThreadCommentPanel = () => {
 	const univerInstanceService = useDependency(IUniverInstanceService);
 	const injector = useDependency(Injector);
@@ -402,7 +496,7 @@ const DocThreadCommentPanel = () => {
 };
 
 //#endregion
-//#region src/controllers/components.controller.ts
+//#region src/controllers/doc-thread-comment-ui.controller.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -418,105 +512,41 @@ const DocThreadCommentPanel = () => {
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-let ComponentsController = class ComponentsController extends Disposable {
-	constructor(_componentManager, _iconManager) {
+let DocThreadCommentUIController = class DocThreadCommentUIController extends Disposable {
+	constructor(_commandService, _menuManagerService, _componentManager) {
 		super();
+		this._commandService = _commandService;
+		this._menuManagerService = _menuManagerService;
 		this._componentManager = _componentManager;
-		this._iconManager = _iconManager;
-		this._registerComponents();
-		this._registerIcons();
+		this._initCommands();
+		this._initMenus();
+		this._initComponents();
 	}
-	_registerComponents() {
-		[[DOCS_THREAD_COMMENT_PANEL, DocThreadCommentPanel]].forEach(([id, comp]) => {
-			this.disposeWithMe(this._componentManager.register(id, comp));
+	_initCommands() {
+		[
+			AddDocCommentComment,
+			DeleteDocCommentComment,
+			ShowCommentPanelOperation,
+			StartAddCommentOperation,
+			ToggleCommentPanelOperation
+		].forEach((command) => {
+			this.disposeWithMe(this._commandService.registerCommand(command));
 		});
 	}
-	_registerIcons() {
-		this.disposeWithMe(this._iconManager.register({ CommentIcon }));
-	}
-};
-ComponentsController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, Inject(IconManager))], ComponentsController);
-
-//#endregion
-//#region src/controllers/doc-thread-comment-selection.controller.ts
-let DocThreadCommentSelectionController = class DocThreadCommentSelectionController extends Disposable {
-	constructor(_threadCommentPanelService, _univerInstanceService, _commandService, _docThreadCommentService, _renderManagerService, _threadCommentModel) {
-		super();
-		this._threadCommentPanelService = _threadCommentPanelService;
-		this._univerInstanceService = _univerInstanceService;
-		this._commandService = _commandService;
-		this._docThreadCommentService = _docThreadCommentService;
-		this._renderManagerService = _renderManagerService;
-		this._threadCommentModel = _threadCommentModel;
-		this._initSelectionChange();
-		this._initActiveCommandChange();
-	}
-	_initSelectionChange() {
-		let lastSelection;
-		this.disposeWithMe(this._commandService.onCommandExecuted((commandInfo) => {
-			if (commandInfo.id === SetTextSelectionsOperation.id) {
-				const { unitId, ranges } = commandInfo.params;
-				if (isInternalEditorID(unitId)) return;
-				const doc = this._univerInstanceService.getUnit(unitId, UniverInstanceType.UNIVER_DOC);
-				const primary = ranges[0];
-				if ((lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.startOffset) === (primary === null || primary === void 0 ? void 0 : primary.startOffset) && (lastSelection === null || lastSelection === void 0 ? void 0 : lastSelection.endOffset) === (primary === null || primary === void 0 ? void 0 : primary.endOffset)) return;
-				lastSelection = primary;
-				if (primary && doc) {
-					const { startOffset, endOffset, collapsed } = primary;
-					let customRange;
-					if (collapsed) {
-						var _doc$getBody;
-						customRange = (_doc$getBody = doc.getBody()) === null || _doc$getBody === void 0 || (_doc$getBody = _doc$getBody.customDecorations) === null || _doc$getBody === void 0 ? void 0 : _doc$getBody.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1);
-					} else {
-						var _doc$getBody2;
-						customRange = (_doc$getBody2 = doc.getBody()) === null || _doc$getBody2 === void 0 || (_doc$getBody2 = _doc$getBody2.customDecorations) === null || _doc$getBody2 === void 0 ? void 0 : _doc$getBody2.find((value) => value.startIndex <= startOffset && value.endIndex >= endOffset - 1);
-					}
-					if (customRange) {
-						const comment = this._threadCommentModel.getComment(unitId, DEFAULT_DOC_SUBUNIT_ID, customRange.id);
-						if (comment && !comment.resolved) this._commandService.executeCommand(ShowCommentPanelOperation.id, { activeComment: {
-							unitId,
-							subUnitId: DEFAULT_DOC_SUBUNIT_ID,
-							commentId: customRange.id
-						} });
-						return;
-					}
-				}
-				if (!this._threadCommentPanelService.activeCommentId) return;
-				const addingComment = this._docThreadCommentService.addingComment;
-				const activeComment = this._threadCommentPanelService.activeCommentId;
-				if (addingComment && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.unitId) === addingComment.unitId && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.subUnitId) === "default_doc" && (activeComment === null || activeComment === void 0 ? void 0 : activeComment.commentId) === addingComment.id) return;
-				this._commandService.executeCommand(SetActiveCommentOperation.id);
-			}
-		}));
+	_initMenus() {
+		this._menuManagerService.mergeMenu(menuSchema);
 	}
-	_initActiveCommandChange() {
-		this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe((activeComment) => {
-			var _this$_docThreadComme;
-			if (activeComment) {
-				const doc = this._univerInstanceService.getUnit(activeComment.unitId);
-				if (doc) {
-					var _this$_renderManagerS, _doc$getBody3;
-					const backScrollController = (_this$_renderManagerS = this._renderManagerService.getRenderById(activeComment.unitId)) === null || _this$_renderManagerS === void 0 ? void 0 : _this$_renderManagerS.with(DocBackScrollRenderController);
-					const customRange = (_doc$getBody3 = doc.getBody()) === null || _doc$getBody3 === void 0 || (_doc$getBody3 = _doc$getBody3.customDecorations) === null || _doc$getBody3 === void 0 ? void 0 : _doc$getBody3.find((range) => range.id === activeComment.commentId);
-					if (customRange && backScrollController) backScrollController.scrollToRange({
-						startOffset: customRange.startIndex,
-						endOffset: customRange.endIndex,
-						collapsed: false
-					});
-				}
-			}
-			if (!activeComment || activeComment.commentId !== ((_this$_docThreadComme = this._docThreadCommentService.addingComment) === null || _this$_docThreadComme === void 0 ? void 0 : _this$_docThreadComme.id)) this._docThreadCommentService.endAdd();
-		}));
+	_initComponents() {
+		[[DOCS_THREAD_COMMENT_PANEL, DocThreadCommentPanel], ["CommentIcon", CommentIcon]].forEach(([id, comp]) => {
+			this.disposeWithMe(this._componentManager.register(id, comp));
+		});
 	}
 };
-DocThreadCommentSelectionController = __decorate([
-	__decorateParam(0, Inject(ThreadCommentPanelService)),
-	__decorateParam(1, IUniverInstanceService),
-	__decorateParam(2, ICommandService),
-	__decorateParam(3, Inject(DocThreadCommentService)),
-	__decorateParam(4, IRenderManagerService),
-	__decorateParam(5, Inject(ThreadCommentModel))
-], DocThreadCommentSelectionController);
+DocThreadCommentUIController = __decorate([
+	__decorateParam(0, ICommandService),
+	__decorateParam(1, IMenuManagerService),
+	__decorateParam(2, Inject(ComponentManager))
+], DocThreadCommentUIController);
 
 //#endregion
 //#region src/controllers/render-controllers/render.controller.ts
@@ -603,66 +633,6 @@ DocThreadCommentRenderController = __decorate([
 	__decorateParam(6, ICommandService)
 ], DocThreadCommentRenderController);
 
-//#endregion
-//#region src/menu/schema.ts
-const menuSchema = {
-	[RibbonInsertGroup.MEDIA]: { [ToggleCommentPanelOperation.id]: {
-		order: 3,
-		menuItemFactory: ToolbarDocCommentMenuItemFactory
-	} },
-	[FLOAT_TOOLBAR_MENU_POSITION]: { [StartAddCommentOperation.id]: {
-		order: 21,
-		menuItemFactory: AddDocCommentMenuItemFactory
-	} },
-	[ContextMenuPosition.MAIN_AREA]: { [ContextMenuGroup.DATA]: { [StartAddCommentOperation.id]: {
-		order: 1,
-		menuItemFactory: AddDocCommentMenuItemFactory
-	} } }
-};
-
-//#endregion
-//#region src/controllers/ui.controller.ts
-/**
-* Copyright 2023-present DreamNum Co., Ltd.
-*
-* Licensed under the Apache License, Version 2.0 (the "License");
-* you may not use this file except in compliance with the License.
-* You may obtain a copy of the License at
-*
-*     http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
-let DocThreadCommentUIController = class DocThreadCommentUIController extends Disposable {
-	constructor(_commandService, _menuManagerService) {
-		super();
-		this._commandService = _commandService;
-		this._menuManagerService = _menuManagerService;
-		this._initCommands();
-		this._initMenus();
-	}
-	_initCommands() {
-		[
-			AddDocCommentComment,
-			DeleteDocCommentComment,
-			ShowCommentPanelOperation,
-			StartAddCommentOperation,
-			ToggleCommentPanelOperation
-		].forEach((command) => {
-			this.disposeWithMe(this._commandService.registerCommand(command));
-		});
-	}
-	_initMenus() {
-		this._menuManagerService.appendRootMenu({ [FLOAT_TOOLBAR_MENU_POSITION]: {} });
-		this._menuManagerService.mergeMenu(menuSchema);
-	}
-};
-DocThreadCommentUIController = __decorate([__decorateParam(0, ICommandService), __decorateParam(1, IMenuManagerService)], DocThreadCommentUIController);
-
 //#endregion
 //#region src/plugin.ts
 let UniverDocsThreadCommentUIPlugin = class UniverDocsThreadCommentUIPlugin extends Plugin {
@@ -677,8 +647,6 @@ let UniverDocsThreadCommentUIPlugin = class UniverDocsThreadCommentUIPlugin exte
 		this._configService.setConfig(DOCS_THREAD_COMMENT_UI_PLUGIN_CONFIG_KEY, rest);
 	}
 	onStarting() {
-		this._injector.add([ComponentsController]);
-		this._injector.get(ComponentsController);
 		[
 			[DocThreadCommentUIController],
 			[DocThreadCommentSelectionController],