@univerjs/sheets-thread-comment 1.0.0-insiders.20260809-70eefdd → 1.0.0-rc.0

package/lib/es/facade.js

@@ -1,6 +1,8 @@
-import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, Range, RichTextBuilder, RichTextValue, Tools, UniverInstanceType, UserManagerService, generateRandomId } from "@univerjs/core";
+import * as UniverCore from "@univerjs/core";
+import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, RichTextBuilder, RichTextValue, Tools, UniverInstanceType, UserManagerService, generateRandomId } from "@univerjs/core";
 import { SheetsThreadCommentModel } from "@univerjs/sheets-thread-comment";
 import { FRange, FWorkbook, FWorksheet } from "@univerjs/sheets/facade";
+import * as ThreadComment from "@univerjs/thread-comment";
 import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, ThreadCommentModel, UpdateCommentCommand, getDT } from "@univerjs/thread-comment";
 import { deserializeRangeWithSheet } from "@univerjs/engine-formula";
 import { FEventName, FUniver } from "@univerjs/core/facade";
@@ -605,69 +607,98 @@ FThreadComment = _FThreadComment = __decorate([
 //#endregion
 //#region src/facade/f-range.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.
+*/
+function firstNonEmpty(...values) {
+	for (const value of values) if (value) return value;
+	return UniverCore.generateRandomId();
+}
+/**
 * @ignore
 */
 var FRangeSheetsThreadCommentMixin = class extends FRange {
-	getComment() {
-		const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel);
-		const unitId = this._workbook.getUnitId();
-		const sheetId = this._worksheet.getSheetId();
-		const commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, this._range.startRow, this._range.startColumn);
-		if (!commentId) return null;
-		const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
-		if (comment) return this._injector.createInstance(FThreadComment, comment);
-		return null;
+	_initialize(injector) {
+		let dependencies;
+		Object.defineProperty(this, "_dependencies", { get: () => dependencies ??= {
+			commandService: injector.get(UniverCore.ICommandService),
+			model: injector.get(SheetsThreadCommentModel),
+			userManagerService: injector.get(UniverCore.UserManagerService)
+		} });
 	}
-	getComments() {
-		const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel);
+	_getCommentDataInRange() {
+		const model = this._dependencies.model;
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
 		const comments = [];
-		Range.foreach(this._range, (row, col) => {
-			const commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, row, col);
-			if (commentId) {
-				const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
-				if (comment) comments.push(this._injector.createInstance(FThreadComment, comment));
-			}
+		UniverCore.Range.foreach(this._range, (row, col) => {
+			const commentId = model.getByLocation(unitId, sheetId, row, col);
+			const comment = commentId ? model.getComment(unitId, sheetId, commentId) : null;
+			if (comment) comments.push(comment);
 		});
 		return comments;
 	}
-	addCommentAsync(content) {
-		var _this$getComment;
-		const injector = this._injector;
-		const currentComment = (_this$getComment = this.getComment()) === null || _this$getComment === void 0 ? void 0 : _this$getComment.getCommentData();
-		const commentService = injector.get(ICommandService);
-		const userService = injector.get(UserManagerService);
+	_getStartCellCommentData() {
+		const model = this._dependencies.model;
+		const unitId = this._workbook.getUnitId();
+		const sheetId = this._worksheet.getSheetId();
+		const commentId = model.getByLocation(unitId, sheetId, this._range.startRow, this._range.startColumn);
+		return commentId ? model.getComment(unitId, sheetId, commentId) ?? null : null;
+	}
+	getComment() {
+		const comment = this._getStartCellCommentData();
+		return comment ? this._injector.createInstance(FThreadComment, comment) : null;
+	}
+	getComments() {
+		return this._getCommentDataInRange().map((comment) => this._injector.createInstance(FThreadComment, comment));
+	}
+	addCommentAsync(content, options = {}) {
+		const { commandService, userManagerService } = this._dependencies;
+		const currentComment = this._getStartCellCommentData();
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
-		const refStr = `${Tools.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`;
-		const currentUser = userService.getCurrentUser();
-		const commentData = content instanceof FTheadCommentBuilder ? content.build() : { text: content };
-		return commentService.executeCommand(AddCommentCommand.id, {
+		const refStr = `${UniverCore.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`;
+		const currentUser = userManagerService.getCurrentUser();
+		let commentData = null;
+		let text;
+		if (content instanceof FTheadCommentBuilder) {
+			commentData = content.build();
+			text = commentData.text;
+		} else text = ThreadComment.normalizeThreadCommentContent(content);
+		return commandService.executeCommand(ThreadComment.AddCommentCommand.id, {
 			unitId,
 			subUnitId: sheetId,
 			comment: {
-				text: commentData.text,
-				dT: commentData.dT || getDT(),
-				attachments: [],
-				id: commentData.id || generateRandomId(),
+				text,
+				dT: options.dateTime ? ThreadComment.getDT(options.dateTime) : (commentData === null || commentData === void 0 ? void 0 : commentData.dT) || ThreadComment.getDT(),
+				attachments: options.attachments ?? (commentData === null || commentData === void 0 ? void 0 : commentData.attachments) ?? [],
+				id: firstNonEmpty(options.id, commentData === null || commentData === void 0 ? void 0 : commentData.id),
 				ref: refStr,
-				personId: commentData.personId || currentUser.userID,
+				personId: firstNonEmpty(options.personId, commentData === null || commentData === void 0 ? void 0 : commentData.personId, currentUser.userID),
 				parentId: currentComment === null || currentComment === void 0 ? void 0 : currentComment.id,
 				unitId,
 				subUnitId: sheetId,
-				threadId: (currentComment === null || currentComment === void 0 ? void 0 : currentComment.threadId) || generateRandomId()
+				threadId: firstNonEmpty(currentComment === null || currentComment === void 0 ? void 0 : currentComment.threadId, options.threadId, commentData === null || commentData === void 0 ? void 0 : commentData.threadId)
 			}
 		});
 	}
 	clearCommentAsync() {
-		var _this$getComment2;
-		const injector = this._injector;
-		const currentComment = (_this$getComment2 = this.getComment()) === null || _this$getComment2 === void 0 ? void 0 : _this$getComment2.getCommentData();
-		const commentService = injector.get(ICommandService);
+		const { commandService } = this._dependencies;
+		const currentComment = this._getStartCellCommentData();
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
-		if (currentComment) return commentService.executeCommand(DeleteCommentTreeCommand.id, {
+		if (currentComment) return commandService.executeCommand(ThreadComment.DeleteCommentTreeCommand.id, {
 			unitId,
 			subUnitId: sheetId,
 			threadId: currentComment.threadId,
@@ -675,9 +706,16 @@ var FRangeSheetsThreadCommentMixin = class extends FRange {
 		});
 		return Promise.resolve(true);
 	}
-	clearCommentsAsync() {
-		const promises = this.getComments().map((comment) => comment.deleteAsync());
-		return Promise.all(promises).then(() => true);
+	async clearCommentsAsync() {
+		const { commandService } = this._dependencies;
+		const unitId = this._workbook.getUnitId();
+		const subUnitId = this._worksheet.getSheetId();
+		return (await Promise.all(this._getCommentDataInRange().map((comment) => commandService.executeCommand(ThreadComment.DeleteCommentTreeCommand.id, {
+			unitId,
+			subUnitId,
+			threadId: comment.threadId,
+			commentId: comment.id
+		})))).every(Boolean);
 	}
 };
 FRange.extend(FRangeSheetsThreadCommentMixin);

package/lib/es/index.js

@@ -1,7 +1,7 @@
-import { DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, UniverInstanceType, generateRandomId, merge, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
+import { DependentOn, Disposable, ICommandService, IConfigService, IResourceManagerService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, UniverInstanceType, generateRandomId, merge, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
 import { serializeRange, singleReferenceToGrid } from "@univerjs/engine-formula";
 import { CopySheetCommand, RefRangeService, RemoveSheetCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
-import { AddCommentMutation, DeleteCommentMutation, IThreadCommentDataSourceService, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentRefMutation } from "@univerjs/thread-comment";
+import { AddCommentMutation, DeleteCommentMutation, IThreadCommentDataSourceService, TC_PLUGIN_NAME, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentRefMutation, createThreadCommentResourceHook, deserializeThreadCommentAnchor } from "@univerjs/thread-comment";
 import { Subject } from "rxjs";
 
 //#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
@@ -136,6 +136,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 		}
 	}
 	_addComment(unitId, subUnitId, comment) {
+		if (deserializeThreadCommentAnchor(comment.ref)) return;
 		const location = singleReferenceToGrid(comment.ref);
 		const parentId = comment.parentId;
 		const { row, column } = location;
@@ -170,6 +171,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					break;
 				case "delete": {
 					const { isRoot, comment } = update.payload;
+					if (deserializeThreadCommentAnchor(comment.ref)) return;
 					if (isRoot) {
 						const location = singleReferenceToGrid(comment.ref);
 						const { row, column } = location;
@@ -185,6 +187,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					const { commentId } = update.payload;
 					const comment = this._threadCommentModel.getComment(unitId, subUnitId, commentId);
 					if (!comment) return;
+					if (deserializeThreadCommentAnchor(comment.ref)) return;
 					const location = singleReferenceToGrid(comment.ref);
 					this._commentUpdate$.next({
 						...update,
@@ -193,6 +196,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					break;
 				}
 				case "updateRef": {
+					if (deserializeThreadCommentAnchor(update.payload.ref)) return;
 					const location = singleReferenceToGrid(update.payload.ref);
 					const { commentId } = update.payload;
 					const currentLoc = locationMap.get(commentId);
@@ -228,8 +232,9 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 		}));
 	}
 	getByLocation(unitId, subUnitId, row, column) {
-		var _activeComments$;
-		return (_activeComments$ = this.getAllByLocation(unitId, subUnitId, row, column).filter((comment) => !comment.resolved)[0]) === null || _activeComments$ === void 0 ? void 0 : _activeComments$.id;
+		var _activeComments;
+		const activeComments = this.getAllByLocation(unitId, subUnitId, row, column).filter((comment) => !comment.resolved);
+		return (_activeComments = activeComments[activeComments.length - 1]) === null || _activeComments === void 0 ? void 0 : _activeComments.id;
 	}
 	getAllByLocation(unitId, subUnitId, row, column) {
 		const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
@@ -383,6 +388,7 @@ let SheetsThreadCommentRefRangeController = class SheetsThreadCommentRefRangeCon
 		const datas = this._threadCommentModel.getAll();
 		for (const data of datas) for (const thread of data.threads) {
 			const { unitId, subUnitId, root } = thread;
+			if (deserializeThreadCommentAnchor(root.ref)) continue;
 			const pos = singleReferenceToGrid(root.ref);
 			const sheetComment = {
 				...root,
@@ -446,12 +452,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 ], SheetsThreadCommentRefRangeController);
 
 //#endregion
-//#region package.json
-var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-insiders.20260809-70eefdd";
-
-//#endregion
-//#region src/config/config.ts
+//#region src/types/const.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -467,21 +468,25 @@ var version = "1.0.0-insiders.20260809-70eefdd";
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config";
-const configSymbol = Symbol(SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY);
-const defaultPluginConfig = {};
+const SHEET_THREAD_COMMENT_BASE = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+const SHEET_UNIVER_THREAD_COMMENT_PLUGIN = `SHEET_${TC_PLUGIN_NAME}`;
 
 //#endregion
 //#region src/controllers/sheets-thread-comment-resource.controller.ts
 let SheetsThreadCommentResourceController = class SheetsThreadCommentResourceController extends Disposable {
-	constructor(_univerInstanceService, _sheetInterceptorService, _threadCommentModel, _threadCommentDataSourceService) {
+	constructor(_resourceManagerService, _univerInstanceService, _sheetInterceptorService, _threadCommentModel, _threadCommentDataSourceService) {
 		super();
+		this._resourceManagerService = _resourceManagerService;
 		this._univerInstanceService = _univerInstanceService;
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._threadCommentModel = _threadCommentModel;
 		this._threadCommentDataSourceService = _threadCommentDataSourceService;
+		this._initSnapshot();
 		this._initSheetChange();
 	}
+	_initSnapshot() {
+		this.disposeWithMe(this._resourceManagerService.registerPluginResource(createThreadCommentResourceHook(this._threadCommentModel, this._threadCommentDataSourceService, SHEET_UNIVER_THREAD_COMMENT_PLUGIN, [UniverInstanceType.UNIVER_SHEET])));
+	}
 	_initSheetChange() {
 		this.disposeWithMe(this._sheetInterceptorService.interceptCommand({ getMutations: (commandInfo) => {
 			if (commandInfo.id === RemoveSheetCommand.id) {
@@ -577,14 +582,20 @@ let SheetsThreadCommentResourceController = class SheetsThreadCommentResourceCon
 	}
 };
 SheetsThreadCommentResourceController = __decorate([
-	__decorateParam(0, IUniverInstanceService),
-	__decorateParam(1, Inject(SheetInterceptorService)),
-	__decorateParam(2, Inject(ThreadCommentModel)),
-	__decorateParam(3, IThreadCommentDataSourceService)
+	__decorateParam(0, IResourceManagerService),
+	__decorateParam(1, IUniverInstanceService),
+	__decorateParam(2, Inject(SheetInterceptorService)),
+	__decorateParam(3, Inject(ThreadCommentModel)),
+	__decorateParam(4, IThreadCommentDataSourceService)
 ], SheetsThreadCommentResourceController);
 
 //#endregion
-//#region src/types/const.ts
+//#region package.json
+var name = "@univerjs/sheets-thread-comment";
+var version = "1.0.0-rc.0";
+
+//#endregion
+//#region src/config/config.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -600,7 +611,9 @@ SheetsThreadCommentResourceController = __decorate([
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const SHEET_THREAD_COMMENT_BASE = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+const SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config";
+const configSymbol = Symbol(SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY);
+const defaultPluginConfig = {};
 
 //#endregion
 //#region src/plugin.ts
@@ -637,4 +650,4 @@ UniverSheetsThreadCommentPlugin = __decorate([
 ], UniverSheetsThreadCommentPlugin);
 
 //#endregion
-export { SheetsThreadCommentModel, SheetsThreadCommentRefRangeController, UniverSheetsThreadCommentPlugin };
+export { SHEET_UNIVER_THREAD_COMMENT_PLUGIN, SheetsThreadCommentModel, SheetsThreadCommentRefRangeController, SheetsThreadCommentResourceController, UniverSheetsThreadCommentPlugin };

package/lib/facade.js

@@ -1,6 +1,8 @@
-import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, Range, RichTextBuilder, RichTextValue, Tools, UniverInstanceType, UserManagerService, generateRandomId } from "@univerjs/core";
+import * as UniverCore from "@univerjs/core";
+import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, RichTextBuilder, RichTextValue, Tools, UniverInstanceType, UserManagerService, generateRandomId } from "@univerjs/core";
 import { SheetsThreadCommentModel } from "@univerjs/sheets-thread-comment";
 import { FRange, FWorkbook, FWorksheet } from "@univerjs/sheets/facade";
+import * as ThreadComment from "@univerjs/thread-comment";
 import { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, ThreadCommentModel, UpdateCommentCommand, getDT } from "@univerjs/thread-comment";
 import { deserializeRangeWithSheet } from "@univerjs/engine-formula";
 import { FEventName, FUniver } from "@univerjs/core/facade";
@@ -605,69 +607,98 @@ FThreadComment = _FThreadComment = __decorate([
 //#endregion
 //#region src/facade/f-range.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.
+*/
+function firstNonEmpty(...values) {
+	for (const value of values) if (value) return value;
+	return UniverCore.generateRandomId();
+}
+/**
 * @ignore
 */
 var FRangeSheetsThreadCommentMixin = class extends FRange {
-	getComment() {
-		const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel);
-		const unitId = this._workbook.getUnitId();
-		const sheetId = this._worksheet.getSheetId();
-		const commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, this._range.startRow, this._range.startColumn);
-		if (!commentId) return null;
-		const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
-		if (comment) return this._injector.createInstance(FThreadComment, comment);
-		return null;
+	_initialize(injector) {
+		let dependencies;
+		Object.defineProperty(this, "_dependencies", { get: () => dependencies ??= {
+			commandService: injector.get(UniverCore.ICommandService),
+			model: injector.get(SheetsThreadCommentModel),
+			userManagerService: injector.get(UniverCore.UserManagerService)
+		} });
 	}
-	getComments() {
-		const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel);
+	_getCommentDataInRange() {
+		const model = this._dependencies.model;
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
 		const comments = [];
-		Range.foreach(this._range, (row, col) => {
-			const commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, row, col);
-			if (commentId) {
-				const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
-				if (comment) comments.push(this._injector.createInstance(FThreadComment, comment));
-			}
+		UniverCore.Range.foreach(this._range, (row, col) => {
+			const commentId = model.getByLocation(unitId, sheetId, row, col);
+			const comment = commentId ? model.getComment(unitId, sheetId, commentId) : null;
+			if (comment) comments.push(comment);
 		});
 		return comments;
 	}
-	addCommentAsync(content) {
-		var _this$getComment;
-		const injector = this._injector;
-		const currentComment = (_this$getComment = this.getComment()) === null || _this$getComment === void 0 ? void 0 : _this$getComment.getCommentData();
-		const commentService = injector.get(ICommandService);
-		const userService = injector.get(UserManagerService);
+	_getStartCellCommentData() {
+		const model = this._dependencies.model;
+		const unitId = this._workbook.getUnitId();
+		const sheetId = this._worksheet.getSheetId();
+		const commentId = model.getByLocation(unitId, sheetId, this._range.startRow, this._range.startColumn);
+		return commentId ? model.getComment(unitId, sheetId, commentId) ?? null : null;
+	}
+	getComment() {
+		const comment = this._getStartCellCommentData();
+		return comment ? this._injector.createInstance(FThreadComment, comment) : null;
+	}
+	getComments() {
+		return this._getCommentDataInRange().map((comment) => this._injector.createInstance(FThreadComment, comment));
+	}
+	addCommentAsync(content, options = {}) {
+		const { commandService, userManagerService } = this._dependencies;
+		const currentComment = this._getStartCellCommentData();
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
-		const refStr = `${Tools.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`;
-		const currentUser = userService.getCurrentUser();
-		const commentData = content instanceof FTheadCommentBuilder ? content.build() : { text: content };
-		return commentService.executeCommand(AddCommentCommand.id, {
+		const refStr = `${UniverCore.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`;
+		const currentUser = userManagerService.getCurrentUser();
+		let commentData = null;
+		let text;
+		if (content instanceof FTheadCommentBuilder) {
+			commentData = content.build();
+			text = commentData.text;
+		} else text = ThreadComment.normalizeThreadCommentContent(content);
+		return commandService.executeCommand(ThreadComment.AddCommentCommand.id, {
 			unitId,
 			subUnitId: sheetId,
 			comment: {
-				text: commentData.text,
-				dT: commentData.dT || getDT(),
-				attachments: [],
-				id: commentData.id || generateRandomId(),
+				text,
+				dT: options.dateTime ? ThreadComment.getDT(options.dateTime) : (commentData === null || commentData === void 0 ? void 0 : commentData.dT) || ThreadComment.getDT(),
+				attachments: options.attachments ?? (commentData === null || commentData === void 0 ? void 0 : commentData.attachments) ?? [],
+				id: firstNonEmpty(options.id, commentData === null || commentData === void 0 ? void 0 : commentData.id),
 				ref: refStr,
-				personId: commentData.personId || currentUser.userID,
+				personId: firstNonEmpty(options.personId, commentData === null || commentData === void 0 ? void 0 : commentData.personId, currentUser.userID),
 				parentId: currentComment === null || currentComment === void 0 ? void 0 : currentComment.id,
 				unitId,
 				subUnitId: sheetId,
-				threadId: (currentComment === null || currentComment === void 0 ? void 0 : currentComment.threadId) || generateRandomId()
+				threadId: firstNonEmpty(currentComment === null || currentComment === void 0 ? void 0 : currentComment.threadId, options.threadId, commentData === null || commentData === void 0 ? void 0 : commentData.threadId)
 			}
 		});
 	}
 	clearCommentAsync() {
-		var _this$getComment2;
-		const injector = this._injector;
-		const currentComment = (_this$getComment2 = this.getComment()) === null || _this$getComment2 === void 0 ? void 0 : _this$getComment2.getCommentData();
-		const commentService = injector.get(ICommandService);
+		const { commandService } = this._dependencies;
+		const currentComment = this._getStartCellCommentData();
 		const unitId = this._workbook.getUnitId();
 		const sheetId = this._worksheet.getSheetId();
-		if (currentComment) return commentService.executeCommand(DeleteCommentTreeCommand.id, {
+		if (currentComment) return commandService.executeCommand(ThreadComment.DeleteCommentTreeCommand.id, {
 			unitId,
 			subUnitId: sheetId,
 			threadId: currentComment.threadId,
@@ -675,9 +706,16 @@ var FRangeSheetsThreadCommentMixin = class extends FRange {
 		});
 		return Promise.resolve(true);
 	}
-	clearCommentsAsync() {
-		const promises = this.getComments().map((comment) => comment.deleteAsync());
-		return Promise.all(promises).then(() => true);
+	async clearCommentsAsync() {
+		const { commandService } = this._dependencies;
+		const unitId = this._workbook.getUnitId();
+		const subUnitId = this._worksheet.getSheetId();
+		return (await Promise.all(this._getCommentDataInRange().map((comment) => commandService.executeCommand(ThreadComment.DeleteCommentTreeCommand.id, {
+			unitId,
+			subUnitId,
+			threadId: comment.threadId,
+			commentId: comment.id
+		})))).every(Boolean);
 	}
 };
 FRange.extend(FRangeSheetsThreadCommentMixin);

package/lib/index.js

@@ -1,7 +1,7 @@
-import { DependentOn, Disposable, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, UniverInstanceType, generateRandomId, merge, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
+import { DependentOn, Disposable, ICommandService, IConfigService, IResourceManagerService, IUniverInstanceService, Inject, Injector, ObjectMatrix, Plugin, UniverInstanceType, generateRandomId, merge, sequenceExecuteAsync, toDisposable, touchDependencies } from "@univerjs/core";
 import { serializeRange, singleReferenceToGrid } from "@univerjs/engine-formula";
 import { CopySheetCommand, RefRangeService, RemoveSheetCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
-import { AddCommentMutation, DeleteCommentMutation, IThreadCommentDataSourceService, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentRefMutation } from "@univerjs/thread-comment";
+import { AddCommentMutation, DeleteCommentMutation, IThreadCommentDataSourceService, TC_PLUGIN_NAME, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentRefMutation, createThreadCommentResourceHook, deserializeThreadCommentAnchor } from "@univerjs/thread-comment";
 import { Subject } from "rxjs";
 
 //#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
@@ -136,6 +136,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 		}
 	}
 	_addComment(unitId, subUnitId, comment) {
+		if (deserializeThreadCommentAnchor(comment.ref)) return;
 		const location = singleReferenceToGrid(comment.ref);
 		const parentId = comment.parentId;
 		const { row, column } = location;
@@ -170,6 +171,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					break;
 				case "delete": {
 					const { isRoot, comment } = update.payload;
+					if (deserializeThreadCommentAnchor(comment.ref)) return;
 					if (isRoot) {
 						const location = singleReferenceToGrid(comment.ref);
 						const { row, column } = location;
@@ -185,6 +187,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					const { commentId } = update.payload;
 					const comment = this._threadCommentModel.getComment(unitId, subUnitId, commentId);
 					if (!comment) return;
+					if (deserializeThreadCommentAnchor(comment.ref)) return;
 					const location = singleReferenceToGrid(comment.ref);
 					this._commentUpdate$.next({
 						...update,
@@ -193,6 +196,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 					break;
 				}
 				case "updateRef": {
+					if (deserializeThreadCommentAnchor(update.payload.ref)) return;
 					const location = singleReferenceToGrid(update.payload.ref);
 					const { commentId } = update.payload;
 					const currentLoc = locationMap.get(commentId);
@@ -228,8 +232,9 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 		}));
 	}
 	getByLocation(unitId, subUnitId, row, column) {
-		var _activeComments$;
-		return (_activeComments$ = this.getAllByLocation(unitId, subUnitId, row, column).filter((comment) => !comment.resolved)[0]) === null || _activeComments$ === void 0 ? void 0 : _activeComments$.id;
+		var _activeComments;
+		const activeComments = this.getAllByLocation(unitId, subUnitId, row, column).filter((comment) => !comment.resolved);
+		return (_activeComments = activeComments[activeComments.length - 1]) === null || _activeComments === void 0 ? void 0 : _activeComments.id;
 	}
 	getAllByLocation(unitId, subUnitId, row, column) {
 		const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
@@ -383,6 +388,7 @@ let SheetsThreadCommentRefRangeController = class SheetsThreadCommentRefRangeCon
 		const datas = this._threadCommentModel.getAll();
 		for (const data of datas) for (const thread of data.threads) {
 			const { unitId, subUnitId, root } = thread;
+			if (deserializeThreadCommentAnchor(root.ref)) continue;
 			const pos = singleReferenceToGrid(root.ref);
 			const sheetComment = {
 				...root,
@@ -446,12 +452,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 ], SheetsThreadCommentRefRangeController);
 
 //#endregion
-//#region package.json
-var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-insiders.20260809-70eefdd";
-
-//#endregion
-//#region src/config/config.ts
+//#region src/types/const.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -467,21 +468,25 @@ var version = "1.0.0-insiders.20260809-70eefdd";
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config";
-const configSymbol = Symbol(SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY);
-const defaultPluginConfig = {};
+const SHEET_THREAD_COMMENT_BASE = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+const SHEET_UNIVER_THREAD_COMMENT_PLUGIN = `SHEET_${TC_PLUGIN_NAME}`;
 
 //#endregion
 //#region src/controllers/sheets-thread-comment-resource.controller.ts
 let SheetsThreadCommentResourceController = class SheetsThreadCommentResourceController extends Disposable {
-	constructor(_univerInstanceService, _sheetInterceptorService, _threadCommentModel, _threadCommentDataSourceService) {
+	constructor(_resourceManagerService, _univerInstanceService, _sheetInterceptorService, _threadCommentModel, _threadCommentDataSourceService) {
 		super();
+		this._resourceManagerService = _resourceManagerService;
 		this._univerInstanceService = _univerInstanceService;
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._threadCommentModel = _threadCommentModel;
 		this._threadCommentDataSourceService = _threadCommentDataSourceService;
+		this._initSnapshot();
 		this._initSheetChange();
 	}
+	_initSnapshot() {
+		this.disposeWithMe(this._resourceManagerService.registerPluginResource(createThreadCommentResourceHook(this._threadCommentModel, this._threadCommentDataSourceService, SHEET_UNIVER_THREAD_COMMENT_PLUGIN, [UniverInstanceType.UNIVER_SHEET])));
+	}
 	_initSheetChange() {
 		this.disposeWithMe(this._sheetInterceptorService.interceptCommand({ getMutations: (commandInfo) => {
 			if (commandInfo.id === RemoveSheetCommand.id) {
@@ -577,14 +582,20 @@ let SheetsThreadCommentResourceController = class SheetsThreadCommentResourceCon
 	}
 };
 SheetsThreadCommentResourceController = __decorate([
-	__decorateParam(0, IUniverInstanceService),
-	__decorateParam(1, Inject(SheetInterceptorService)),
-	__decorateParam(2, Inject(ThreadCommentModel)),
-	__decorateParam(3, IThreadCommentDataSourceService)
+	__decorateParam(0, IResourceManagerService),
+	__decorateParam(1, IUniverInstanceService),
+	__decorateParam(2, Inject(SheetInterceptorService)),
+	__decorateParam(3, Inject(ThreadCommentModel)),
+	__decorateParam(4, IThreadCommentDataSourceService)
 ], SheetsThreadCommentResourceController);
 
 //#endregion
-//#region src/types/const.ts
+//#region package.json
+var name = "@univerjs/sheets-thread-comment";
+var version = "1.0.0-rc.0";
+
+//#endregion
+//#region src/config/config.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -600,7 +611,9 @@ SheetsThreadCommentResourceController = __decorate([
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-const SHEET_THREAD_COMMENT_BASE = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+const SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY = "sheets-thread-comment.config";
+const configSymbol = Symbol(SHEETS_THREAD_COMMENT_PLUGIN_CONFIG_KEY);
+const defaultPluginConfig = {};
 
 //#endregion
 //#region src/plugin.ts
@@ -637,4 +650,4 @@ UniverSheetsThreadCommentPlugin = __decorate([
 ], UniverSheetsThreadCommentPlugin);
 
 //#endregion
-export { SheetsThreadCommentModel, SheetsThreadCommentRefRangeController, UniverSheetsThreadCommentPlugin };
+export { SHEET_UNIVER_THREAD_COMMENT_PLUGIN, SheetsThreadCommentModel, SheetsThreadCommentRefRangeController, SheetsThreadCommentResourceController, UniverSheetsThreadCommentPlugin };

package/lib/types/controllers/sheets-thread-comment-resource.controller.d.ts

@@ -13,14 +13,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { Disposable, IUniverInstanceService } from '@univerjs/core';
+import { Disposable, IResourceManagerService, IUniverInstanceService } from '@univerjs/core';
 import { SheetInterceptorService } from '@univerjs/sheets';
 import { IThreadCommentDataSourceService, ThreadCommentModel } from '@univerjs/thread-comment';
 export declare class SheetsThreadCommentResourceController extends Disposable {
+    private readonly _resourceManagerService;
     private readonly _univerInstanceService;
-    private _sheetInterceptorService;
-    private _threadCommentModel;
-    private _threadCommentDataSourceService;
-    constructor(_univerInstanceService: IUniverInstanceService, _sheetInterceptorService: SheetInterceptorService, _threadCommentModel: ThreadCommentModel, _threadCommentDataSourceService: IThreadCommentDataSourceService);
+    private readonly _sheetInterceptorService;
+    private readonly _threadCommentModel;
+    private readonly _threadCommentDataSourceService;
+    constructor(_resourceManagerService: IResourceManagerService, _univerInstanceService: IUniverInstanceService, _sheetInterceptorService: SheetInterceptorService, _threadCommentModel: ThreadCommentModel, _threadCommentDataSourceService: IThreadCommentDataSourceService);
+    private _initSnapshot;
     private _initSheetChange;
 }