@univerjs/sheets-thread-comment 0.23.0 → 0.24.0-insiders.20260528-29f582d

package/lib/cjs/facade.js

@@ -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');

package/lib/cjs/index.js

@@ -236,7 +236,12 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends _univerjs_
 	getAllByLocation(unitId, subUnitId, row, column) {
 		const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
 		if (!current) return [];
-		return Array.from(current).map((id) => this.getComment(unitId, subUnitId, id)).filter(Boolean);
+		const comments = [];
+		for (const id of current) {
+			const comment = this.getComment(unitId, subUnitId, id);
+			if (comment) comments.push(comment);
+		}
+		return comments;
 	}
 	getComment(unitId, subUnitId, commentId) {
 		return this._threadCommentModel.getComment(unitId, subUnitId, commentId);
@@ -445,7 +450,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/config/config.ts

package/lib/es/facade.js

@@ -194,7 +194,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);
@@ -220,7 +221,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);
@@ -245,7 +247,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);
@@ -270,7 +273,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);
@@ -295,7 +299,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);
@@ -348,7 +353,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());
@@ -364,7 +370,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());
@@ -381,7 +388,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()) {
@@ -405,7 +413,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());
@@ -432,7 +441,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());
@@ -453,7 +463,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
@@ -487,7 +498,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');
@@ -533,7 +545,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');
@@ -566,7 +579,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');

package/lib/es/index.js

@@ -235,7 +235,12 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 	getAllByLocation(unitId, subUnitId, row, column) {
 		const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
 		if (!current) return [];
-		return Array.from(current).map((id) => this.getComment(unitId, subUnitId, id)).filter(Boolean);
+		const comments = [];
+		for (const id of current) {
+			const comment = this.getComment(unitId, subUnitId, id);
+			if (comment) comments.push(comment);
+		}
+		return comments;
 	}
 	getComment(unitId, subUnitId, commentId) {
 		return this._threadCommentModel.getComment(unitId, subUnitId, commentId);
@@ -444,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/config/config.ts

package/lib/facade.js

@@ -194,7 +194,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);
@@ -220,7 +221,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);
@@ -245,7 +247,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);
@@ -270,7 +273,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);
@@ -295,7 +299,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);
@@ -348,7 +353,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());
@@ -364,7 +370,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());
@@ -381,7 +388,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()) {
@@ -405,7 +413,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());
@@ -432,7 +441,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());
@@ -453,7 +463,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
@@ -487,7 +498,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');
@@ -533,7 +545,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');
@@ -566,7 +579,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');

package/lib/index.js

@@ -235,7 +235,12 @@ let SheetsThreadCommentModel = class SheetsThreadCommentModel extends Disposable
 	getAllByLocation(unitId, subUnitId, row, column) {
 		const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
 		if (!current) return [];
-		return Array.from(current).map((id) => this.getComment(unitId, subUnitId, id)).filter(Boolean);
+		const comments = [];
+		for (const id of current) {
+			const comment = this.getComment(unitId, subUnitId, id);
+			if (comment) comments.push(comment);
+		}
+		return comments;
 	}
 	getComment(unitId, subUnitId, commentId) {
 		return this._threadCommentModel.getComment(unitId, subUnitId, commentId);
@@ -444,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "0.23.0";
+var version = "0.24.0-insiders.20260528-29f582d";
 
 //#endregion
 //#region src/config/config.ts

package/lib/types/facade/f-range.d.ts

@@ -25,9 +25,9 @@ export interface IFRangeSheetsThreadCommentMixin {
      * @returns {FThreadComment | null} The comment of the start cell in the current range. If the cell does not have a comment, return `null`.
      * @example
      * ```ts
-     * const range = univerAPI.getActiveWorkbook()
-     *  .getActiveSheet()
-     *  .getActiveRange();
+     * const fWorksheet = univerAPI.getActiveWorkbook().getSheetByName('Sheet1');
+     * if (!fWorksheet) return;
+     * const range = fWorksheet.getActiveRange();
      * const comment = range.getComment();
      * ```
      */
@@ -37,9 +37,9 @@ export interface IFRangeSheetsThreadCommentMixin {
      * @returns {FThreadComment[]} The comments in the current range.
      * @example
      * ```ts
-     * const range = univerAPI.getActiveWorkbook()
-     *  .getActiveSheet()
-     *  .getActiveRange();
+     * const fWorksheet = univerAPI.getActiveWorkbook().getSheetByName('Sheet1');
+     * if (!fWorksheet) return;
+     * const range = fWorksheet.getActiveRange();
      * const comments = range.getComments();
      * comments.forEach((comment) => {
      *   console.log(comment.getContent());
@@ -65,7 +65,8 @@ export interface IFRangeSheetsThreadCommentMixin {
      *
      * // 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);
@@ -90,9 +91,9 @@ export interface IFRangeSheetsThreadCommentMixin {
      * @returns Whether the comments are cleared successfully.
      * @example
      * ```ts
-     * const range = univerAPI.getActiveWorkbook()
-     *  .getActiveSheet()
-     *  .getActiveRange();
+     * const fWorksheet = univerAPI.getActiveWorkbook().getSheetByName('Sheet1');
+     * if (!fWorksheet) return;
+     * const range = fWorksheet.getActiveRange();
      * const success = await range.clearCommentsAsync();
      * ```
      */

package/lib/types/facade/f-thread-comment.d.ts

@@ -117,7 +117,8 @@ export declare 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);
@@ -139,7 +140,8 @@ export declare 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);
@@ -161,7 +163,8 @@ export declare 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);
@@ -183,7 +186,8 @@ export declare 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);
@@ -205,7 +209,8 @@ export declare 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);
@@ -252,7 +257,8 @@ export declare 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());
@@ -266,7 +272,8 @@ export declare 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());
@@ -280,7 +287,8 @@ export declare 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()) {
@@ -299,7 +307,8 @@ export declare 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());
@@ -317,7 +326,8 @@ export declare 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());
@@ -331,7 +341,8 @@ export declare 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
@@ -355,7 +366,8 @@ export declare 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');
@@ -386,7 +398,8 @@ export declare 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');
@@ -412,7 +425,8 @@ export declare 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');

package/lib/types/facade/f-univer.d.ts

@@ -37,7 +37,8 @@ export interface IFUniverSheetsThreadCommentMixin {
      *
      * // 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);

package/lib/types/facade/f-worksheet.d.ts

@@ -27,7 +27,8 @@ export interface IFWorksheetCommentMixin {
      * @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) => {
      *   const isRoot = comment.getIsRoot();
@@ -50,7 +51,8 @@ export interface IFWorksheetCommentMixin {
      * @example
      * ```ts
      * const fWorkbook = univerAPI.getActiveWorkbook();
-     * const fWorksheet = fWorkbook.getActiveSheet();
+     * const fWorksheet = fWorkbook.getSheetByName('Sheet1');
+     * if (!fWorksheet) return;
      * const result = await fWorksheet.clearComments();
      * console.log(result);
      * ```
@@ -61,7 +63,8 @@ export interface IFWorksheetCommentMixin {
      * @param {string} commentId comment id
      * ```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');

package/lib/umd/index.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require(`@univerjs/core`),require(`@univerjs/engine-formula`),require(`@univerjs/sheets`),require(`@univerjs/thread-comment`),require(`rxjs`)):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/sheets`,`@univerjs/thread-comment`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadComment={},e.UniverCore,e.UniverEngineFormula,e.UniverSheets,e.UniverThreadComment,e.rxjs))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function o(e){"@babel/helpers - typeof";return o=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},o(e)}function s(e,t){if(o(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(o(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function c(e){var t=s(e,`string`);return o(t)==`symbol`?t:t+``}function l(e,t,n){return(t=c(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){return function(n,r){t(n,r,e)}}function d(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let f=class extends t.Disposable{constructor(e,t){super(),this._threadCommentModel=e,this._univerInstanceService=t,l(this,`_matrixMap`,new Map),l(this,`_locationMap`,new Map),l(this,`_commentUpdate$`,new a.Subject),l(this,`commentUpdate$`,this._commentUpdate$.asObservable()),this._init(),this.disposeWithMe(()=>{this._commentUpdate$.complete()})}_init(){this._initData(),this._initUpdateTransform()}_ensureCommentMatrix(e,n){let r=this._matrixMap.get(e);r||(r=new Map,this._matrixMap.set(e,r));let i=r.get(n);return i||(i=new t.ObjectMatrix,r.set(n,i)),i}_ensureCommentLocationMap(e,t){let n=this._locationMap.get(e);n||(n=new Map,this._locationMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_addCommentToMatrix(e,t,n,r){var i;let a=(i=e.getValue(t,n))==null?new Set:i;a.add(r),e.setValue(t,n,a)}_deleteCommentFromMatrix(e,t,n,r){if(t>=0&&n>=0){let i=e.getValue(t,n);i&&i.has(r)&&(i.delete(r),i.size===0&&e.realDeleteValue(t,n))}}_ensure(e,t){return{matrix:this._ensureCommentMatrix(e,t),locationMap:this._ensureCommentLocationMap(e,t)}}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:n,root:r}=e;this._addComment(t,n,r)}}_addComment(e,t,r){let i=(0,n.singleReferenceToGrid)(r.ref),a=r.parentId,{row:o,column:s}=i,c=r.id,{matrix:l,locationMap:u}=this._ensure(e,t);!a&&o>=0&&s>=0&&(this._addCommentToMatrix(l,o,s,c),u.set(c,{row:o,column:s})),a||this._commentUpdate$.next({unitId:e,subUnitId:t,payload:r,type:`add`,isRoot:!a,...i})}_initUpdateTransform(){this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:r,subUnitId:i}=e;try{if(this._univerInstanceService.getUnitType(r)!==t.UniverInstanceType.UNIVER_SHEET)return}catch{}let{matrix:a,locationMap:o}=this._ensure(r,i);switch(e.type){case`add`:this._addComment(e.unitId,e.subUnitId,e.payload);break;case`delete`:{let{isRoot:t,comment:r}=e.payload;if(t){let t=(0,n.singleReferenceToGrid)(r.ref),{row:i,column:o}=t;this._deleteCommentFromMatrix(a,i,o,r.id),this._commentUpdate$.next({...e,...t})}break}case`update`:{let{commentId:t}=e.payload,a=this._threadCommentModel.getComment(r,i,t);if(!a)return;let o=(0,n.singleReferenceToGrid)(a.ref);this._commentUpdate$.next({...e,...o});break}case`updateRef`:{let t=(0,n.singleReferenceToGrid)(e.payload.ref),{commentId:r}=e.payload,i=o.get(r);if(!i)return;let{row:s,column:c}=i;this._deleteCommentFromMatrix(a,s,c,r),o.delete(r),t.row>=0&&t.column>=0&&(this._addCommentToMatrix(a,t.row,t.column,r),o.set(r,{row:t.row,column:t.column})),this._commentUpdate$.next({...e,...t});break}case`resolve`:{let{unitId:t,subUnitId:n,payload:r}=e,{locationMap:i}=this._ensure(t,n),a=i.get(r.commentId);a&&this._commentUpdate$.next({...e,...a});break}default:break}}))}getByLocation(e,t,n,r){var i;return(i=this.getAllByLocation(e,t,n,r).filter(e=>!e.resolved)[0])==null?void 0:i.id}getAllByLocation(e,t,n,r){let i=this._ensureCommentMatrix(e,t).getValue(n,r);return i?Array.from(i).map(n=>this.getComment(e,t,n)).filter(Boolean):[]}getComment(e,t,n){return this._threadCommentModel.getComment(e,t,n)}getCommentWithChildren(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return;let a=this.getComment(e,t,i);if(a)return this._threadCommentModel.getThread(e,t,a.threadId)}showCommentMarker(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return!1;let a=this.getComment(e,t,i);return!!(a&&!a.resolved)}getSubUnitAll(e,t){return this._threadCommentModel.getUnit(e).filter(e=>e.subUnitId===t).map(e=>e.root)}};f=d([u(0,(0,t.Inject)(i.ThreadCommentModel)),u(1,t.IUniverInstanceService)],f);let p=class extends t.Disposable{constructor(e,t,r,a,o){super(),this._refRangeService=e,this._sheetsThreadCommentModel=t,this._threadCommentModel=r,this._selectionManagerService=a,this._commandService=o,l(this,`_disposableMap`,new Map),l(this,`_watcherMap`,new Map),l(this,`_handleRangeChange`,(e,t,r,a,o)=>{let s=r.id,c={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};return a?{redos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(a),commentId:s},silent:o}}],undos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(c),commentId:s},silent:o}}]}:{redos:[{id:i.DeleteCommentMutation.id,params:{unitId:e,subUnitId:t,commentId:s}}],undos:[{id:i.AddCommentMutation.id,params:{unitId:e,subUnitId:t,comment:r,sync:!0}}]}}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n){return`${e}-${t}-${n}`}_register(e,t,n){let i=n.id,a={startColumn:n.column,endColumn:n.column,startRow:n.row,endRow:n.row};this._disposableMap.set(this._getIdWithUnitId(e,t,i),this._refRangeService.registerRefRange(a,i=>{let o=(0,r.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(a,i,{selectionManagerService:this._selectionManagerService}),s=Array.isArray(o)?o[0]:o;return s&&s.startColumn===a.startColumn&&s.startRow===a.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,n,s,!1)},e,t))}_watch(e,n,r){let i=r.id,a={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};this._watcherMap.set(this._getIdWithUnitId(e,n,i),this._refRangeService.watchRange(e,n,a,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._watcherMap.get(i))==null||r.dispose(),this._watcherMap.delete(i)}_unregister(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._disposableMap.get(i))==null||r.dispose(),this._disposableMap.delete(i)}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:r,root:i}=e,a=(0,n.singleReferenceToGrid)(i.ref),o={...i,...a};this._register(t,r,o),this._watch(t,r,o)}}_initRefRange(){this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:t,subUnitId:n}=e;switch(e.type){case`add`:{if(e.payload.parentId)return;let t={...e.payload,row:e.row,column:e.column};this._register(e.unitId,e.subUnitId,t),this._watch(e.unitId,e.subUnitId,t);break}case`delete`:this._unregister(t,n,e.payload.commentId),this._unwatch(t,n,e.payload.commentId);break;case`updateRef`:{let r=this._sheetsThreadCommentModel.getComment(t,n,e.payload.commentId);if(!r)return;this._unregister(t,n,e.payload.commentId);let i={...r,row:e.row,column:e.column};e.silent||(this._unwatch(t,n,e.payload.commentId),this._watch(t,n,i)),this._register(e.unitId,e.subUnitId,i);break}}})),this.disposeWithMe((0,t.toDisposable)(()=>{this._disposableMap.forEach(e=>{e.dispose()}),this._disposableMap.clear()}))}};p=d([u(0,(0,t.Inject)(r.RefRangeService)),u(1,(0,t.Inject)(f)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,(0,t.Inject)(r.SheetsSelectionsService)),u(4,t.ICommandService)],p);var m=`@univerjs/sheets-thread-comment`,h=`0.23.0`;let g={},_=class extends t.Disposable{constructor(e,t,n,r){super(),this._univerInstanceService=e,this._sheetInterceptorService=t,this._threadCommentModel=n,this._threadCommentDataSourceService=r,this._initSheetChange()}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===r.RemoveSheetCommand.id){var n;let r=e.params,a=r.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),o=r.subUnitId||((n=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:n.getSheetId());if(!a||!o)return{redos:[],undos:[]};let s=this._threadCommentModel.ensureMap(a,o),c=Array.from(s.values()).filter(e=>!e.parentId),l=this._threadCommentDataSourceService.syncUpdateMutationToColla,u=[],d=[];return c.forEach(({children:e,...t})=>{u.push({id:i.DeleteCommentMutation.id,params:{unitId:a,subUnitId:o,commentId:t.id}}),d.push({id:i.AddCommentMutation.id,params:{unitId:a,subUnitId:o,comment:{...t,children:l?e:void 0},sync:!l}})}),{redos:u,undos:d}}else if(e.id===r.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:a}=e.params;if(!n||!r||!a)return{redos:[],undos:[]};let o=this._threadCommentModel.ensureMap(n,r),s=Array.from(o.values()).map(e=>({...e,subUnitId:a,id:(0,t.generateRandomId)(),threadId:(0,t.generateRandomId)()})).filter(e=>!e.parentId),c=this._threadCommentDataSourceService.syncUpdateMutationToColla,l=[],u=[];return s.forEach(({children:e,...t})=>{l.push({id:i.AddCommentMutation.id,params:{unitId:n,subUnitId:a,comment:{...t,children:c?e:void 0},sync:!c}}),u.push({id:i.DeleteCommentMutation.id,params:{unitId:n,subUnitId:a,commentId:t.id}})}),{redos:l,undos:u}}return{redos:[],undos:[]}}}))}};_=d([u(0,t.IUniverInstanceService),u(1,(0,t.Inject)(r.SheetInterceptorService)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,i.IThreadCommentDataSourceService)],_);let v=class extends t.Plugin{constructor(e=g,t,n){super(),this._config=e,this._injector=t,this._commandService=n}onStarting(){[[f],[p],[_]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[p],[_]])}};l(v,`pluginName`,`SHEET_THREAD_COMMENT_BASE_PLUGIN`),l(v,`packageName`,m),l(v,`version`,h),l(v,`type`,t.UniverInstanceType.UNIVER_SHEET),v=d([(0,t.DependentOn)(i.UniverThreadCommentPlugin),u(1,(0,t.Inject)(t.Injector)),u(2,(0,t.Inject)(t.ICommandService))],v),Object.defineProperty(e,`SheetsThreadCommentModel`,{enumerable:!0,get:function(){return f}}),Object.defineProperty(e,`SheetsThreadCommentRefRangeController`,{enumerable:!0,get:function(){return p}}),Object.defineProperty(e,`UniverSheetsThreadCommentPlugin`,{enumerable:!0,get:function(){return v}})});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require(`@univerjs/core`),require(`@univerjs/engine-formula`),require(`@univerjs/sheets`),require(`@univerjs/thread-comment`),require(`rxjs`)):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/sheets`,`@univerjs/thread-comment`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadComment={},e.UniverCore,e.UniverEngineFormula,e.UniverSheets,e.UniverThreadComment,e.rxjs))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function o(e){"@babel/helpers - typeof";return o=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},o(e)}function s(e,t){if(o(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(o(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function c(e){var t=s(e,`string`);return o(t)==`symbol`?t:t+``}function l(e,t,n){return(t=c(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){return function(n,r){t(n,r,e)}}function d(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let f=class extends t.Disposable{constructor(e,t){super(),this._threadCommentModel=e,this._univerInstanceService=t,l(this,`_matrixMap`,new Map),l(this,`_locationMap`,new Map),l(this,`_commentUpdate$`,new a.Subject),l(this,`commentUpdate$`,this._commentUpdate$.asObservable()),this._init(),this.disposeWithMe(()=>{this._commentUpdate$.complete()})}_init(){this._initData(),this._initUpdateTransform()}_ensureCommentMatrix(e,n){let r=this._matrixMap.get(e);r||(r=new Map,this._matrixMap.set(e,r));let i=r.get(n);return i||(i=new t.ObjectMatrix,r.set(n,i)),i}_ensureCommentLocationMap(e,t){let n=this._locationMap.get(e);n||(n=new Map,this._locationMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_addCommentToMatrix(e,t,n,r){var i;let a=(i=e.getValue(t,n))==null?new Set:i;a.add(r),e.setValue(t,n,a)}_deleteCommentFromMatrix(e,t,n,r){if(t>=0&&n>=0){let i=e.getValue(t,n);i&&i.has(r)&&(i.delete(r),i.size===0&&e.realDeleteValue(t,n))}}_ensure(e,t){return{matrix:this._ensureCommentMatrix(e,t),locationMap:this._ensureCommentLocationMap(e,t)}}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:n,root:r}=e;this._addComment(t,n,r)}}_addComment(e,t,r){let i=(0,n.singleReferenceToGrid)(r.ref),a=r.parentId,{row:o,column:s}=i,c=r.id,{matrix:l,locationMap:u}=this._ensure(e,t);!a&&o>=0&&s>=0&&(this._addCommentToMatrix(l,o,s,c),u.set(c,{row:o,column:s})),a||this._commentUpdate$.next({unitId:e,subUnitId:t,payload:r,type:`add`,isRoot:!a,...i})}_initUpdateTransform(){this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:r,subUnitId:i}=e;try{if(this._univerInstanceService.getUnitType(r)!==t.UniverInstanceType.UNIVER_SHEET)return}catch{}let{matrix:a,locationMap:o}=this._ensure(r,i);switch(e.type){case`add`:this._addComment(e.unitId,e.subUnitId,e.payload);break;case`delete`:{let{isRoot:t,comment:r}=e.payload;if(t){let t=(0,n.singleReferenceToGrid)(r.ref),{row:i,column:o}=t;this._deleteCommentFromMatrix(a,i,o,r.id),this._commentUpdate$.next({...e,...t})}break}case`update`:{let{commentId:t}=e.payload,a=this._threadCommentModel.getComment(r,i,t);if(!a)return;let o=(0,n.singleReferenceToGrid)(a.ref);this._commentUpdate$.next({...e,...o});break}case`updateRef`:{let t=(0,n.singleReferenceToGrid)(e.payload.ref),{commentId:r}=e.payload,i=o.get(r);if(!i)return;let{row:s,column:c}=i;this._deleteCommentFromMatrix(a,s,c,r),o.delete(r),t.row>=0&&t.column>=0&&(this._addCommentToMatrix(a,t.row,t.column,r),o.set(r,{row:t.row,column:t.column})),this._commentUpdate$.next({...e,...t});break}case`resolve`:{let{unitId:t,subUnitId:n,payload:r}=e,{locationMap:i}=this._ensure(t,n),a=i.get(r.commentId);a&&this._commentUpdate$.next({...e,...a});break}default:break}}))}getByLocation(e,t,n,r){var i;return(i=this.getAllByLocation(e,t,n,r).filter(e=>!e.resolved)[0])==null?void 0:i.id}getAllByLocation(e,t,n,r){let i=this._ensureCommentMatrix(e,t).getValue(n,r);if(!i)return[];let a=[];for(let n of i){let r=this.getComment(e,t,n);r&&a.push(r)}return a}getComment(e,t,n){return this._threadCommentModel.getComment(e,t,n)}getCommentWithChildren(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return;let a=this.getComment(e,t,i);if(a)return this._threadCommentModel.getThread(e,t,a.threadId)}showCommentMarker(e,t,n,r){let i=this.getByLocation(e,t,n,r);if(!i)return!1;let a=this.getComment(e,t,i);return!!(a&&!a.resolved)}getSubUnitAll(e,t){return this._threadCommentModel.getUnit(e).filter(e=>e.subUnitId===t).map(e=>e.root)}};f=d([u(0,(0,t.Inject)(i.ThreadCommentModel)),u(1,t.IUniverInstanceService)],f);let p=class extends t.Disposable{constructor(e,t,r,a,o){super(),this._refRangeService=e,this._sheetsThreadCommentModel=t,this._threadCommentModel=r,this._selectionManagerService=a,this._commandService=o,l(this,`_disposableMap`,new Map),l(this,`_watcherMap`,new Map),l(this,`_handleRangeChange`,(e,t,r,a,o)=>{let s=r.id,c={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};return a?{redos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(a),commentId:s},silent:o}}],undos:[{id:i.UpdateCommentRefMutation.id,params:{unitId:e,subUnitId:t,payload:{ref:(0,n.serializeRange)(c),commentId:s},silent:o}}]}:{redos:[{id:i.DeleteCommentMutation.id,params:{unitId:e,subUnitId:t,commentId:s}}],undos:[{id:i.AddCommentMutation.id,params:{unitId:e,subUnitId:t,comment:r,sync:!0}}]}}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n){return`${e}-${t}-${n}`}_register(e,t,n){let i=n.id,a={startColumn:n.column,endColumn:n.column,startRow:n.row,endRow:n.row};this._disposableMap.set(this._getIdWithUnitId(e,t,i),this._refRangeService.registerRefRange(a,i=>{let o=(0,r.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(a,i,{selectionManagerService:this._selectionManagerService}),s=Array.isArray(o)?o[0]:o;return s&&s.startColumn===a.startColumn&&s.startRow===a.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,n,s,!1)},e,t))}_watch(e,n,r){let i=r.id,a={startColumn:r.column,endColumn:r.column,startRow:r.row,endRow:r.row};this._watcherMap.set(this._getIdWithUnitId(e,n,i),this._refRangeService.watchRange(e,n,a,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._watcherMap.get(i))==null||r.dispose(),this._watcherMap.delete(i)}_unregister(e,t,n){var r;let i=this._getIdWithUnitId(e,t,n);(r=this._disposableMap.get(i))==null||r.dispose(),this._disposableMap.delete(i)}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:r,root:i}=e,a=(0,n.singleReferenceToGrid)(i.ref),o={...i,...a};this._register(t,r,o),this._watch(t,r,o)}}_initRefRange(){this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:t,subUnitId:n}=e;switch(e.type){case`add`:{if(e.payload.parentId)return;let t={...e.payload,row:e.row,column:e.column};this._register(e.unitId,e.subUnitId,t),this._watch(e.unitId,e.subUnitId,t);break}case`delete`:this._unregister(t,n,e.payload.commentId),this._unwatch(t,n,e.payload.commentId);break;case`updateRef`:{let r=this._sheetsThreadCommentModel.getComment(t,n,e.payload.commentId);if(!r)return;this._unregister(t,n,e.payload.commentId);let i={...r,row:e.row,column:e.column};e.silent||(this._unwatch(t,n,e.payload.commentId),this._watch(t,n,i)),this._register(e.unitId,e.subUnitId,i);break}}})),this.disposeWithMe((0,t.toDisposable)(()=>{this._disposableMap.forEach(e=>{e.dispose()}),this._disposableMap.clear()}))}};p=d([u(0,(0,t.Inject)(r.RefRangeService)),u(1,(0,t.Inject)(f)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,(0,t.Inject)(r.SheetsSelectionsService)),u(4,t.ICommandService)],p);var m=`@univerjs/sheets-thread-comment`,h=`0.24.0-insiders.20260528-29f582d`;let g={},_=class extends t.Disposable{constructor(e,t,n,r){super(),this._univerInstanceService=e,this._sheetInterceptorService=t,this._threadCommentModel=n,this._threadCommentDataSourceService=r,this._initSheetChange()}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===r.RemoveSheetCommand.id){var n;let r=e.params,a=r.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),o=r.subUnitId||((n=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:n.getSheetId());if(!a||!o)return{redos:[],undos:[]};let s=this._threadCommentModel.ensureMap(a,o),c=Array.from(s.values()).filter(e=>!e.parentId),l=this._threadCommentDataSourceService.syncUpdateMutationToColla,u=[],d=[];return c.forEach(({children:e,...t})=>{u.push({id:i.DeleteCommentMutation.id,params:{unitId:a,subUnitId:o,commentId:t.id}}),d.push({id:i.AddCommentMutation.id,params:{unitId:a,subUnitId:o,comment:{...t,children:l?e:void 0},sync:!l}})}),{redos:u,undos:d}}else if(e.id===r.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:a}=e.params;if(!n||!r||!a)return{redos:[],undos:[]};let o=this._threadCommentModel.ensureMap(n,r),s=Array.from(o.values()).map(e=>({...e,subUnitId:a,id:(0,t.generateRandomId)(),threadId:(0,t.generateRandomId)()})).filter(e=>!e.parentId),c=this._threadCommentDataSourceService.syncUpdateMutationToColla,l=[],u=[];return s.forEach(({children:e,...t})=>{l.push({id:i.AddCommentMutation.id,params:{unitId:n,subUnitId:a,comment:{...t,children:c?e:void 0},sync:!c}}),u.push({id:i.DeleteCommentMutation.id,params:{unitId:n,subUnitId:a,commentId:t.id}})}),{redos:l,undos:u}}return{redos:[],undos:[]}}}))}};_=d([u(0,t.IUniverInstanceService),u(1,(0,t.Inject)(r.SheetInterceptorService)),u(2,(0,t.Inject)(i.ThreadCommentModel)),u(3,i.IThreadCommentDataSourceService)],_);let v=class extends t.Plugin{constructor(e=g,t,n){super(),this._config=e,this._injector=t,this._commandService=n}onStarting(){[[f],[p],[_]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[p],[_]])}};l(v,`pluginName`,`SHEET_THREAD_COMMENT_BASE_PLUGIN`),l(v,`packageName`,m),l(v,`version`,h),l(v,`type`,t.UniverInstanceType.UNIVER_SHEET),v=d([(0,t.DependentOn)(i.UniverThreadCommentPlugin),u(1,(0,t.Inject)(t.Injector)),u(2,(0,t.Inject)(t.ICommandService))],v),Object.defineProperty(e,`SheetsThreadCommentModel`,{enumerable:!0,get:function(){return f}}),Object.defineProperty(e,`SheetsThreadCommentRefRangeController`,{enumerable:!0,get:function(){return p}}),Object.defineProperty(e,`UniverSheetsThreadCommentPlugin`,{enumerable:!0,get:function(){return v}})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-thread-comment",
-  "version": "0.23.0",
+  "version": "0.24.0-insiders.20260528-29f582d",
   "private": false,
   "description": "Thread comment integration for Univer Sheets.",
   "author": "DreamNum Co., Ltd. <developer@univer.ai>",
@@ -62,16 +62,16 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "0.23.0",
-    "@univerjs/engine-formula": "0.23.0",
-    "@univerjs/thread-comment": "0.23.0",
-    "@univerjs/sheets": "0.23.0"
+    "@univerjs/core": "0.24.0-insiders.20260528-29f582d",
+    "@univerjs/engine-formula": "0.24.0-insiders.20260528-29f582d",
+    "@univerjs/sheets": "0.24.0-insiders.20260528-29f582d",
+    "@univerjs/thread-comment": "0.24.0-insiders.20260528-29f582d"
   },
   "devDependencies": {
     "rxjs": "^7.8.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.5",
-    "@univerjs-infra/shared": "0.23.0"
+    "@univerjs-infra/shared": "0.24.0"
   },
   "scripts": {
     "test": "vitest run",

package/LICENSE

@@ -1,176 +0,0 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS