@univerjs/sheets-thread-comment 0.24.0 → 0.25.0-insiders.20260604-29ebbff

package/lib/cjs/facade.js

@@ -7,7 +7,7 @@ let _univerjs_engine_formula = require("@univerjs/engine-formula");
 let rxjs = require("rxjs");
 let _univerjs_core_facade = require("@univerjs/core/facade");
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/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) {
@@ -18,7 +18,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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];
@@ -31,14 +31,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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.129.0/helpers/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,
@@ -49,7 +49,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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);
@@ -57,7 +57,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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);
@@ -195,7 +195,8 @@ var FTheadCommentBuilder = class FTheadCommentBuilder extends FTheadCommentItem
 	*
 	* // Add the comment to the cell A1
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const cell = fWorksheet.getRange('A1');
 	* const result = await cell.addCommentAsync(commentBuilder);
 	* console.log(result);
@@ -221,7 +222,8 @@ var FTheadCommentBuilder = class FTheadCommentBuilder extends FTheadCommentItem
 	*
 	* // Add the comment to the cell A1
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const cell = fWorksheet.getRange('A1');
 	* const result = await cell.addCommentAsync(commentBuilder);
 	* console.log(result);
@@ -246,7 +248,8 @@ var FTheadCommentBuilder = class FTheadCommentBuilder extends FTheadCommentItem
 	*
 	* // Add the comment to the cell A1
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const cell = fWorksheet.getRange('A1');
 	* const result = await cell.addCommentAsync(commentBuilder);
 	* console.log(result);
@@ -271,7 +274,8 @@ var FTheadCommentBuilder = class FTheadCommentBuilder extends FTheadCommentItem
 	*
 	* // Add the comment to the cell A1
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const cell = fWorksheet.getRange('A1');
 	* const result = await cell.addCommentAsync(commentBuilder);
 	* console.log(result);
@@ -296,7 +300,8 @@ var FTheadCommentBuilder = class FTheadCommentBuilder extends FTheadCommentItem
 	*
 	* // Add the comment to the cell A1
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const cell = fWorksheet.getRange('A1');
 	* const result = await cell.addCommentAsync(commentBuilder);
 	* console.log(result);
@@ -349,7 +354,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	* comments.forEach((comment) => {
 	*   console.log(comment.getIsRoot());
@@ -365,7 +371,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	* comments.forEach((comment) => {
 	*   console.log(comment.getCommentData());
@@ -382,7 +389,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	* comments.forEach((comment) => {
 	*   if (comment.getIsRoot()) {
@@ -406,7 +414,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	* comments.forEach((comment) => {
 	*   console.log(comment.getRange().getA1Notation());
@@ -433,7 +442,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	* comments.forEach((comment) => {
 	*   console.log(comment.getRichText());
@@ -454,7 +464,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	* const comments = fWorksheet.getComments();
 	*
 	* // Delete the first comment
@@ -488,7 +499,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new comment
 	* const richText = univerAPI.newRichText().insertText('hello univer');
@@ -534,7 +546,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new comment
 	* const richText = univerAPI.newRichText().insertText('hello univer');
@@ -567,7 +580,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 	* @example
 	* ```ts
 	* const fWorkbook = univerAPI.getActiveWorkbook();
-	* const fWorksheet = fWorkbook.getActiveSheet();
+	* const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+	* if (!fWorksheet) return;
 	*
 	* // Create a new comment
 	* const richText = univerAPI.newRichText().insertText('hello univer');
@@ -844,26 +858,16 @@ _univerjs_core_facade.FEventName.extend(FSheetsThreadCommentEventNameMixin);
 * @ignore
 */
 var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUniver {
-	_getTargetSheet(params = {}) {
-		var _this$getActiveWorkbo;
-		const workbook = params.unitId ? this.getUniverSheet(params.unitId) : (_this$getActiveWorkbo = this.getActiveWorkbook) === null || _this$getActiveWorkbo === void 0 ? void 0 : _this$getActiveWorkbo.call(this);
-		if (!workbook) return null;
-		const worksheet = params.subUnitId ? workbook.getSheetBySheetId(params.subUnitId) : workbook.getActiveSheet();
-		if (!worksheet) return null;
-		return {
-			workbook,
-			worksheet
-		};
-	}
 	_initialize(injector) {
 		const commandService = injector.get(_univerjs_core.ICommandService);
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded, () => commandService.onCommandExecuted((commandInfo) => {
 			var _threadComment$getRan, _threadComment$getRan2, _threadComment$getRan3, _threadComment$getRan4;
 			if (commandInfo.id !== _univerjs_thread_comment.AddCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { comment } = commandInfo.params;
+			const { comment } = params;
 			const threadComment = worksheet.getCommentById(comment.id);
 			if (!threadComment) return;
 			const eventParams = {
@@ -878,10 +882,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated, () => commandService.onCommandExecuted((commandInfo) => {
 			var _threadComment$getRan5, _threadComment$getRan6, _threadComment$getRan7, _threadComment$getRan8;
 			if (commandInfo.id !== _univerjs_thread_comment.UpdateCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { payload } = commandInfo.params;
+			const { payload } = params;
 			const threadComment = worksheet.getCommentById(payload.commentId);
 			if (!threadComment) return;
 			const eventParams = {
@@ -895,10 +900,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentDeleted, () => commandService.onCommandExecuted((commandInfo) => {
 			if (commandInfo.id !== _univerjs_thread_comment.DeleteCommentCommand.id && commandInfo.id !== _univerjs_thread_comment.DeleteCommentTreeCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { commentId } = commandInfo.params;
+			const { commentId } = params;
 			const eventParams = {
 				workbook,
 				worksheet,
@@ -909,10 +915,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved, () => commandService.onCommandExecuted((commandInfo) => {
 			var _threadComment$getRan9, _threadComment$getRan10, _threadComment$getRan11, _threadComment$getRan12;
 			if (commandInfo.id !== _univerjs_thread_comment.ResolveCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { commentId, resolved } = commandInfo.params;
+			const { commentId, resolved } = params;
 			const threadComment = worksheet.getCommentById(commentId);
 			if (!threadComment) return;
 			const eventParams = {
@@ -927,10 +934,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentAdd, () => commandService.beforeCommandExecuted((commandInfo) => {
 			if (commandInfo.id !== _univerjs_thread_comment.AddCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { comment } = commandInfo.params;
+			const { comment } = params;
 			const { range } = (0, _univerjs_engine_formula.deserializeRangeWithSheet)(comment.ref);
 			const eventParams = {
 				workbook,
@@ -945,10 +953,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate, () => commandService.beforeCommandExecuted((commandInfo) => {
 			var _threadComment$getRan13, _threadComment$getRan14, _threadComment$getRan15, _threadComment$getRan16;
 			if (commandInfo.id !== _univerjs_thread_comment.UpdateCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { payload } = commandInfo.params;
+			const { payload } = params;
 			const threadComment = worksheet.getCommentById(payload.commentId);
 			if (!threadComment) return;
 			const eventParams = {
@@ -965,10 +974,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete, () => commandService.beforeCommandExecuted((commandInfo) => {
 			var _threadComment$getRan17, _threadComment$getRan18, _threadComment$getRan19, _threadComment$getRan20;
 			if (commandInfo.id !== _univerjs_thread_comment.DeleteCommentCommand.id && commandInfo.id !== _univerjs_thread_comment.DeleteCommentTreeCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { commentId } = commandInfo.params;
+			const { commentId } = params;
 			const threadComment = worksheet.getCommentById(commentId);
 			if (!threadComment) return;
 			const eventParams = {
@@ -984,10 +994,11 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve, () => commandService.beforeCommandExecuted((commandInfo) => {
 			var _getRow, _getColumn;
 			if (commandInfo.id !== _univerjs_thread_comment.ResolveCommentCommand.id) return;
-			const target = this._getTargetSheet(commandInfo.params);
+			const params = commandInfo.params;
+			const target = this.getSheetCommandTarget(params);
 			if (!target) return;
 			const { workbook, worksheet } = target;
-			const { commentId, resolved } = commandInfo.params;
+			const { commentId, resolved } = params;
 			const threadComment = worksheet.getCommentById(commentId);
 			if (!threadComment) return;
 			const eventParams = {

package/lib/cjs/index.js

@@ -5,7 +5,7 @@ let _univerjs_sheets = require("@univerjs/sheets");
 let _univerjs_thread_comment = require("@univerjs/thread-comment");
 let rxjs = require("rxjs");
 
-//#region \0@oxc-project+runtime@0.129.0/helpers/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) {
@@ -16,7 +16,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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];
@@ -29,14 +29,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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.129.0/helpers/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,
@@ -47,7 +47,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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);
@@ -55,7 +55,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.129.0/helpers/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);
@@ -450,7 +450,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "0.24.0";
+var version = "0.25.0-insiders.20260604-29ebbff";
 
 //#endregion
 //#region src/config/config.ts