@univerjs/sheets-thread-comment 1.0.0-alpha.7 → 1.0.0-beta.0

package/lib/es/facade.js

@@ -1,12 +1,11 @@
-import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, Range, RichTextBuilder, RichTextValue, Tools, UniverInstanceType, UserManagerService, generateRandomId, toDisposable } from "@univerjs/core";
+import { CanceledError, ICommandService, IUniverInstanceService, Inject, Injector, Range, 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 { AddCommentCommand, DeleteCommentCommand, DeleteCommentTreeCommand, ResolveCommentCommand, ThreadCommentModel, UpdateCommentCommand, getDT } from "@univerjs/thread-comment";
 import { deserializeRangeWithSheet } from "@univerjs/engine-formula";
-import { filter } from "rxjs";
 import { FEventName, FUniver } from "@univerjs/core/facade";
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -17,7 +16,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -30,14 +29,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -48,7 +47,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.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -56,7 +55,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -430,13 +429,6 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		return this._injector.createInstance(FRange, workbook, worksheet, range);
 	}
 	/**
-	* @deprecated Use `getRichText` instead.
-	* @returns {IDocumentBody} The comment content.
-	*/
-	getContent() {
-		return this._thread.text;
-	}
-	/**
 	* Get the rich text of the comment
 	* @returns {RichTextValue} The rich text of the comment
 	* @example
@@ -481,21 +473,6 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated Use `deleteAsync` instead.
-	* @returns {Promise<boolean>} Whether the comment is deleted successfully.
-	*/
-	delete() {
-		return this.deleteAsync();
-	}
-	/**
-	* @deprecated Use `updateAsync` instead.
-	* @param {IDocumentBody} content The new content of the comment.
-	* @returns {Promise<boolean>} Whether the comment is updated successfully.
-	*/
-	async update(content) {
-		return this.updateAsync(content);
-	}
-	/**
 	* Update the comment content
 	* @param {IDocumentBody | RichTextValue} content The new content of the comment
 	* @returns {Promise<boolean>} Whether the comment is updated successfully
@@ -537,14 +514,6 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated Use `resolveAsync` instead.
-	* @param {boolean} [resolved] Whether the comment is resolved.
-	* @returns {Promise<boolean>} Set the comment to resolved or not operation result.
-	*/
-	resolve(resolved) {
-		return this.resolveAsync(resolved);
-	}
-	/**
 	* Resolve the comment
 	* @param {boolean} resolved Whether the comment is resolved
 	* @returns {Promise<boolean>} Set the comment to resolved or not operation result
@@ -575,7 +544,7 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 			unitId: this._thread.unitId,
 			subUnitId: this._thread.subUnitId,
 			commentId: this._thread.id,
-			resolved: resolved !== null && resolved !== void 0 ? resolved : !this._thread.resolved
+			resolved: resolved ?? !this._thread.resolved
 		});
 	}
 	/**
@@ -663,7 +632,7 @@ var FRangeSheetsThreadCommentMixin = class extends FRange {
 		});
 		return comments;
 	}
-	addComment(content) {
+	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();
@@ -691,7 +660,7 @@ var FRangeSheetsThreadCommentMixin = class extends FRange {
 			}
 		});
 	}
-	clearComment() {
+	clearCommentAsync() {
 		var _this$getComment2;
 		const injector = this._injector;
 		const currentComment = (_this$getComment2 = this.getComment()) === null || _this$getComment2 === void 0 ? void 0 : _this$getComment2.getCommentData();
@@ -706,25 +675,31 @@ var FRangeSheetsThreadCommentMixin = class extends FRange {
 		});
 		return Promise.resolve(true);
 	}
-	clearComments() {
+	clearCommentsAsync() {
 		const promises = this.getComments().map((comment) => comment.deleteAsync());
 		return Promise.all(promises).then(() => true);
 	}
-	addCommentAsync(content) {
-		return this.addComment(content);
-	}
-	clearCommentAsync() {
-		return this.clearComment();
-	}
-	clearCommentsAsync() {
-		return this.clearComments();
-	}
 };
 FRange.extend(FRangeSheetsThreadCommentMixin);
 
 //#endregion
 //#region src/facade/f-workbook.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.
+*/
+/**
 * @ignore
 */
 var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
@@ -743,56 +718,6 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 		const promises = this.getComments().map((comment) => comment.deleteAsync());
 		return Promise.all(promises).then(() => true);
 	}
-	/**
-	* @param callback
-	* @returns {IDisposable} A disposable used to remove the listener.
-	* @deprecated
-	*/
-	onThreadCommentChange(callback) {
-		return toDisposable(this._threadCommentModel.commentUpdate$.pipe(filter((change) => change.unitId === this._workbook.getUnitId())).subscribe(callback));
-	}
-	/**
-	* @param callback
-	* @returns {IDisposable} A disposable used to remove the listener.
-	* @deprecated
-	*/
-	onBeforeAddThreadComment(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === AddCommentCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeAddThreadComment");
-			}
-		}));
-	}
-	/**
-	* @param callback
-	* @returns {IDisposable} A disposable used to remove the listener.
-	* @deprecated
-	*/
-	onBeforeUpdateThreadComment(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === UpdateCommentCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment");
-			}
-		}));
-	}
-	/**
-	* @param callback
-	* @returns {IDisposable} A disposable used to remove the listener.
-	* @deprecated
-	*/
-	onBeforeDeleteThreadComment(callback) {
-		return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === DeleteCommentCommand.id || commandInfo.id === DeleteCommentTreeCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment");
-			}
-		}));
-	}
 };
 FWorkbook.extend(FWorkbookSheetsThreadCommentMixin);
 
@@ -871,7 +796,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 	_initialize(injector) {
 		const commandService = injector.get(ICommandService);
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded, () => commandService.onCommandExecuted((commandInfo) => {
-			var _threadComment$getRan, _threadComment$getRan2, _threadComment$getRan3, _threadComment$getRan4;
+			var _threadComment$getRan, _threadComment$getRan2;
 			if (commandInfo.id !== AddCommentCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -883,14 +808,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_threadComment$getRan = (_threadComment$getRan2 = threadComment.getRange()) === null || _threadComment$getRan2 === void 0 ? void 0 : _threadComment$getRan2.getRow()) !== null && _threadComment$getRan !== void 0 ? _threadComment$getRan : 0,
-				col: (_threadComment$getRan3 = (_threadComment$getRan4 = threadComment.getRange()) === null || _threadComment$getRan4 === void 0 ? void 0 : _threadComment$getRan4.getColumn()) !== null && _threadComment$getRan3 !== void 0 ? _threadComment$getRan3 : 0,
+				row: ((_threadComment$getRan = threadComment.getRange()) === null || _threadComment$getRan === void 0 ? void 0 : _threadComment$getRan.getRow()) ?? 0,
+				col: ((_threadComment$getRan2 = threadComment.getRange()) === null || _threadComment$getRan2 === void 0 ? void 0 : _threadComment$getRan2.getColumn()) ?? 0,
 				comment: threadComment
 			};
 			this.fireEvent(this.Event.CommentAdded, eventParams);
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated, () => commandService.onCommandExecuted((commandInfo) => {
-			var _threadComment$getRan5, _threadComment$getRan6, _threadComment$getRan7, _threadComment$getRan8;
+			var _threadComment$getRan3, _threadComment$getRan4;
 			if (commandInfo.id !== UpdateCommentCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -902,8 +827,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_threadComment$getRan5 = (_threadComment$getRan6 = threadComment.getRange()) === null || _threadComment$getRan6 === void 0 ? void 0 : _threadComment$getRan6.getRow()) !== null && _threadComment$getRan5 !== void 0 ? _threadComment$getRan5 : 0,
-				col: (_threadComment$getRan7 = (_threadComment$getRan8 = threadComment.getRange()) === null || _threadComment$getRan8 === void 0 ? void 0 : _threadComment$getRan8.getColumn()) !== null && _threadComment$getRan7 !== void 0 ? _threadComment$getRan7 : 0,
+				row: ((_threadComment$getRan3 = threadComment.getRange()) === null || _threadComment$getRan3 === void 0 ? void 0 : _threadComment$getRan3.getRow()) ?? 0,
+				col: ((_threadComment$getRan4 = threadComment.getRange()) === null || _threadComment$getRan4 === void 0 ? void 0 : _threadComment$getRan4.getColumn()) ?? 0,
 				comment: threadComment
 			};
 			this.fireEvent(this.Event.CommentUpdated, eventParams);
@@ -923,7 +848,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			this.fireEvent(this.Event.CommentDeleted, eventParams);
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved, () => commandService.onCommandExecuted((commandInfo) => {
-			var _threadComment$getRan9, _threadComment$getRan10, _threadComment$getRan11, _threadComment$getRan12;
+			var _threadComment$getRan5, _threadComment$getRan6;
 			if (commandInfo.id !== ResolveCommentCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -935,8 +860,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_threadComment$getRan9 = (_threadComment$getRan10 = threadComment.getRange()) === null || _threadComment$getRan10 === void 0 ? void 0 : _threadComment$getRan10.getRow()) !== null && _threadComment$getRan9 !== void 0 ? _threadComment$getRan9 : 0,
-				col: (_threadComment$getRan11 = (_threadComment$getRan12 = threadComment.getRange()) === null || _threadComment$getRan12 === void 0 ? void 0 : _threadComment$getRan12.getColumn()) !== null && _threadComment$getRan11 !== void 0 ? _threadComment$getRan11 : 0,
+				row: ((_threadComment$getRan5 = threadComment.getRange()) === null || _threadComment$getRan5 === void 0 ? void 0 : _threadComment$getRan5.getRow()) ?? 0,
+				col: ((_threadComment$getRan6 = threadComment.getRange()) === null || _threadComment$getRan6 === void 0 ? void 0 : _threadComment$getRan6.getColumn()) ?? 0,
 				comment: threadComment,
 				resolved
 			};
@@ -961,7 +886,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			if (eventParams.cancel) throw new CanceledError();
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
-			var _threadComment$getRan13, _threadComment$getRan14, _threadComment$getRan15, _threadComment$getRan16;
+			var _threadComment$getRan7, _threadComment$getRan8;
 			if (commandInfo.id !== UpdateCommentCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -973,8 +898,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_threadComment$getRan13 = (_threadComment$getRan14 = threadComment.getRange()) === null || _threadComment$getRan14 === void 0 ? void 0 : _threadComment$getRan14.getRow()) !== null && _threadComment$getRan13 !== void 0 ? _threadComment$getRan13 : 0,
-				col: (_threadComment$getRan15 = (_threadComment$getRan16 = threadComment.getRange()) === null || _threadComment$getRan16 === void 0 ? void 0 : _threadComment$getRan16.getColumn()) !== null && _threadComment$getRan15 !== void 0 ? _threadComment$getRan15 : 0,
+				row: ((_threadComment$getRan7 = threadComment.getRange()) === null || _threadComment$getRan7 === void 0 ? void 0 : _threadComment$getRan7.getRow()) ?? 0,
+				col: ((_threadComment$getRan8 = threadComment.getRange()) === null || _threadComment$getRan8 === void 0 ? void 0 : _threadComment$getRan8.getColumn()) ?? 0,
 				comment: threadComment,
 				newContent: RichTextValue.createByBody(payload.text)
 			};
@@ -982,7 +907,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			if (eventParams.cancel) throw new CanceledError();
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
-			var _threadComment$getRan17, _threadComment$getRan18, _threadComment$getRan19, _threadComment$getRan20;
+			var _threadComment$getRan9, _threadComment$getRan10;
 			if (commandInfo.id !== DeleteCommentCommand.id && commandInfo.id !== DeleteCommentTreeCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -994,15 +919,14 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_threadComment$getRan17 = (_threadComment$getRan18 = threadComment.getRange()) === null || _threadComment$getRan18 === void 0 ? void 0 : _threadComment$getRan18.getRow()) !== null && _threadComment$getRan17 !== void 0 ? _threadComment$getRan17 : 0,
-				col: (_threadComment$getRan19 = (_threadComment$getRan20 = threadComment.getRange()) === null || _threadComment$getRan20 === void 0 ? void 0 : _threadComment$getRan20.getColumn()) !== null && _threadComment$getRan19 !== void 0 ? _threadComment$getRan19 : 0,
+				row: ((_threadComment$getRan9 = threadComment.getRange()) === null || _threadComment$getRan9 === void 0 ? void 0 : _threadComment$getRan9.getRow()) ?? 0,
+				col: ((_threadComment$getRan10 = threadComment.getRange()) === null || _threadComment$getRan10 === void 0 ? void 0 : _threadComment$getRan10.getColumn()) ?? 0,
 				comment: threadComment
 			};
 			this.fireEvent(this.Event.BeforeCommentDelete, eventParams);
 			if (eventParams.cancel) throw new CanceledError();
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve, () => commandService.beforeCommandExecuted((commandInfo) => {
-			var _getRow, _getColumn;
 			if (commandInfo.id !== ResolveCommentCommand.id) return;
 			const params = commandInfo.params;
 			const target = this.getSheetCommandTarget(params);
@@ -1014,8 +938,8 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 			const eventParams = {
 				workbook,
 				worksheet,
-				row: (_getRow = threadComment.getRange().getRow()) !== null && _getRow !== void 0 ? _getRow : 0,
-				col: (_getColumn = threadComment.getRange().getColumn()) !== null && _getColumn !== void 0 ? _getColumn : 0,
+				row: threadComment.getRange().getRow() ?? 0,
+				col: threadComment.getRange().getColumn() ?? 0,
 				comment: threadComment,
 				resolved
 			};

package/lib/es/index.js

@@ -1,10 +1,10 @@
 import { DependentOn, Disposable, ICommandService, IConfigService, 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, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
+import { CopySheetCommand, RefRangeService, RemoveSheetCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
 import { AddCommentMutation, DeleteCommentMutation, IThreadCommentDataSourceService, ThreadCommentModel, UniverThreadCommentPlugin, UpdateCommentRefMutation } from "@univerjs/thread-comment";
 import { Subject } from "rxjs";
 
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -15,7 +15,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -28,14 +28,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -46,7 +46,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.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -54,7 +54,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -109,8 +109,7 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 		return subUnitMap;
 	}
 	_addCommentToMatrix(matrix, row, column, commentId) {
-		var _matrix$getValue;
-		const current = (_matrix$getValue = matrix.getValue(row, column)) !== null && _matrix$getValue !== void 0 ? _matrix$getValue : /* @__PURE__ */ new Set();
+		const current = matrix.getValue(row, column) ?? /* @__PURE__ */ new Set();
 		current.add(commentId);
 		matrix.setValue(row, column, current);
 	}
@@ -449,7 +448,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.7";
+var version = "1.0.0-beta.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -631,7 +630,7 @@ _defineProperty(UniverSheetsThreadCommentPlugin, "packageName", name);
 _defineProperty(UniverSheetsThreadCommentPlugin, "version", version);
 _defineProperty(UniverSheetsThreadCommentPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsThreadCommentPlugin = __decorate([
-	DependentOn(UniverThreadCommentPlugin),
+	DependentOn(UniverThreadCommentPlugin, UniverSheetsPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, Inject(ICommandService)),
 	__decorateParam(3, IConfigService)