npm - @univerjs/sheets-thread-comment - Versions diffs - 1.0.0-alpha.6 → 1.0.0-alpha.8 - Mend

@univerjs/sheets-thread-comment 1.0.0-alpha.6 → 1.0.0-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (12) hide show

package/lib/cjs/facade.js +24 -99
package/lib/cjs/index.js +8 -8
package/lib/es/facade.js +25 -100
package/lib/es/index.js +9 -9
package/lib/facade.js +25 -100
package/lib/index.js +9 -9
package/lib/types/facade/f-range.d.ts +1 -16
package/lib/types/facade/f-thread-comment.d.ts +0 -22
package/lib/types/facade/f-workbook.d.ts +0 -42
package/lib/umd/facade.js +1 -1
package/lib/umd/index.js +1 -1
package/package.json +6 -6

package/lib/cjs/facade.js CHANGED Viewed

@@ -4,10 +4,9 @@ let _univerjs_sheets_thread_comment = require("@univerjs/sheets-thread-comment")
 let _univerjs_sheets_facade = require("@univerjs/sheets/facade");
 let _univerjs_thread_comment = require("@univerjs/thread-comment");
 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.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) {
@@ -18,7 +17,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];
@@ -31,14 +30,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,
@@ -49,7 +48,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);
@@ -57,7 +56,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);
@@ -431,13 +430,6 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		return this._injector.createInstance(_univerjs_sheets_facade.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
@@ -482,21 +474,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
@@ -538,14 +515,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
@@ -664,7 +633,7 @@ var FRangeSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FRang
 		});
 		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();
@@ -692,7 +661,7 @@ var FRangeSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FRang
 			}
 		});
 	}
-	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();
@@ -707,25 +676,31 @@ var FRangeSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FRang
 		});
 		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();
-	}
 };
 _univerjs_sheets_facade.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 _univerjs_sheets_facade.FWorkbook {
@@ -744,56 +719,6 @@ var FWorkbookSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FW
 		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 (0, _univerjs_core.toDisposable)(this._threadCommentModel.commentUpdate$.pipe((0, rxjs.filter)((change) => change.unitId === this._workbook.getUnitId())).subscribe(callback));
-	}
-	/**
-	* @param callback
-	* @returns {IDisposable} A disposable used to remove the listener.
-	* @deprecated
-	*/
-	onBeforeAddThreadComment(callback) {
-		return (0, _univerjs_core.toDisposable)(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === _univerjs_thread_comment.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 (0, _univerjs_core.toDisposable)(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === _univerjs_thread_comment.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 (0, _univerjs_core.toDisposable)(this._commandService.beforeCommandExecuted((commandInfo, options) => {
-			const params = commandInfo.params;
-			if (commandInfo.id === _univerjs_thread_comment.DeleteCommentCommand.id || commandInfo.id === _univerjs_thread_comment.DeleteCommentTreeCommand.id) {
-				if (params.unitId !== this._workbook.getUnitId()) return;
-				if (callback(params, options) === false) throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment");
-			}
-		}));
-	}
 };
 _univerjs_sheets_facade.FWorkbook.extend(FWorkbookSheetsThreadCommentMixin);

package/lib/cjs/index.js CHANGED Viewed

@@ -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.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) {
@@ -16,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];
@@ -29,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,
@@ -47,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);
@@ -55,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);
@@ -450,7 +450,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 //#endregion
 //#region src/config/config.ts
@@ -632,7 +632,7 @@ _defineProperty(UniverSheetsThreadCommentPlugin, "packageName", name);
 _defineProperty(UniverSheetsThreadCommentPlugin, "version", version);
 _defineProperty(UniverSheetsThreadCommentPlugin, "type", _univerjs_core.UniverInstanceType.UNIVER_SHEET);
 UniverSheetsThreadCommentPlugin = __decorate([
-	(0, _univerjs_core.DependentOn)(_univerjs_thread_comment.UniverThreadCommentPlugin),
+	(0, _univerjs_core.DependentOn)(_univerjs_thread_comment.UniverThreadCommentPlugin, _univerjs_sheets.UniverSheetsPlugin),
 	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_core.ICommandService)),
 	__decorateParam(3, _univerjs_core.IConfigService)

package/lib/es/facade.js CHANGED Viewed

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

package/lib/es/index.js CHANGED Viewed

@@ -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);
@@ -449,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 //#endregion
 //#region src/config/config.ts
@@ -631,7 +631,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)

package/lib/facade.js CHANGED Viewed

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

package/lib/index.js CHANGED Viewed

@@ -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);
@@ -449,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 //#endregion
 //#region src/config/config.ts
@@ -631,7 +631,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)

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

@@ -42,15 +42,11 @@ export interface IFRangeSheetsThreadCommentMixin {
      * const range = fWorksheet.getActiveRange();
      * const comments = range.getComments();
      * comments.forEach((comment) => {
-     *   console.log(comment.getContent());
+     *   console.log(comment.getRichText());
      * });
      * ```
      */
     getComments(): FThreadComment[];
-    /**
-     * @deprecated use `addCommentAsync` as instead.
-     */
-    addComment(content: IDocumentBody | FTheadCommentBuilder): Promise<boolean>;
     /**
      * Add a comment to the start cell in the current range.
      * @param content The content of the comment.
@@ -73,19 +69,11 @@ export interface IFRangeSheetsThreadCommentMixin {
      * ```
      */
     addCommentAsync(content: IDocumentBody | FTheadCommentBuilder): Promise<boolean>;
-    /**
-     * @deprecated use `clearCommentAsync` as instead.
-     */
-    clearComment(): Promise<boolean>;
     /**
      * Clear the comment of the start cell in the current range.
      * @returns Whether the comment is cleared successfully.
      */
     clearCommentAsync(): Promise<boolean>;
-    /**
-     * @deprecated use `clearCommentsAsync` as instead.
-     */
-    clearComments(): Promise<boolean>;
     /**
      * Clear all of the comments in the current range.
      * @returns Whether the comments are cleared successfully.
@@ -105,9 +93,6 @@ export interface IFRangeSheetsThreadCommentMixin {
 export declare class FRangeSheetsThreadCommentMixin extends FRange implements IFRangeSheetsThreadCommentMixin {
     getComment(): Nullable<FThreadComment>;
     getComments(): FThreadComment[];
-    addComment(content: IDocumentBody | FTheadCommentBuilder): Promise<boolean>;
-    clearComment(): Promise<boolean>;
-    clearComments(): Promise<boolean>;
     addCommentAsync(content: IDocumentBody | FTheadCommentBuilder): Promise<boolean>;
     clearCommentAsync(): Promise<boolean>;
     clearCommentsAsync(): Promise<boolean>;

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

@@ -316,11 +316,6 @@ export declare class FThreadComment {
      * ```
      */
     getRange(): FRange | null;
-    /**
-     * @deprecated Use `getRichText` instead.
-     * @returns {IDocumentBody} The comment content.
-     */
-    getContent(): IDocumentBody;
     /**
      * Get the rich text of the comment
      * @returns {RichTextValue} The rich text of the comment
@@ -352,17 +347,6 @@ export declare class FThreadComment {
      * ```
      */
     deleteAsync(): Promise<boolean>;
-    /**
-     * @deprecated Use `deleteAsync` instead.
-     * @returns {Promise<boolean>} Whether the comment is deleted successfully.
-     */
-    delete(): Promise<boolean>;
-    /**
-     * @deprecated Use `updateAsync` instead.
-     * @param {IDocumentBody} content The new content of the comment.
-     * @returns {Promise<boolean>} Whether the comment is updated successfully.
-     */
-    update(content: IDocumentBody): Promise<boolean>;
     /**
      * Update the comment content
      * @param {IDocumentBody | RichTextValue} content The new content of the comment
@@ -391,12 +375,6 @@ export declare class FThreadComment {
      * ```
      */
     updateAsync(content: IDocumentBody | RichTextValue): Promise<boolean>;
-    /**
-     * @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?: boolean): Promise<boolean>;
     /**
      * Resolve the comment
      * @param {boolean} resolved Whether the comment is resolved

package/lib/types/facade/f-workbook.d.ts CHANGED Viewed

@@ -13,8 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import type { IDisposable, IExecutionOptions } from '@univerjs/core';
-import type { CommentUpdate, IAddCommentCommandParams, IDeleteCommentCommandParams, IUpdateCommentCommandParams } from '@univerjs/thread-comment';
 import { FWorkbook } from '@univerjs/sheets/facade';
 import { ThreadCommentModel } from '@univerjs/thread-comment';
 import { FThreadComment } from './f-thread-comment';
@@ -55,22 +53,6 @@ export interface IFWorkbookSheetsThreadCommentMixin {
      * ```
      */
     clearComments(): Promise<boolean>;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.CommentUpdated, (params) => {})` as instead
-     */
-    onThreadCommentChange(callback: (commentUpdate: CommentUpdate) => void | false): IDisposable;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.BeforeCommentAdd, (params) => {})` as instead
-     */
-    onBeforeAddThreadComment(this: FWorkbook, callback: (params: IAddCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.BeforeCommentUpdate, (params) => {})` as instead
-     */
-    onBeforeUpdateThreadComment(this: FWorkbook, callback: (params: IUpdateCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
-    /**
-     * @deprecated use `univerAPI.addEvent(univerAPI.Event.BeforeCommentDelete, (params) => {})` as instead
-     */
-    onBeforeDeleteThreadComment(this: FWorkbook, callback: (params: IDeleteCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
 }
 /**
  * @ignore
@@ -83,30 +65,6 @@ export declare class FWorkbookSheetsThreadCommentMixin extends FWorkbook impleme
     _initialize(): void;
     getComments(): FThreadComment[];
     clearComments(): Promise<boolean>;
-    /**
-     * @param callback
-     * @returns {IDisposable} A disposable used to remove the listener.
-     * @deprecated
-     */
-    onThreadCommentChange(callback: (commentUpdate: CommentUpdate) => void | false): IDisposable;
-    /**
-     * @param callback
-     * @returns {IDisposable} A disposable used to remove the listener.
-     * @deprecated
-     */
-    onBeforeAddThreadComment(callback: (params: IAddCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
-    /**
-     * @param callback
-     * @returns {IDisposable} A disposable used to remove the listener.
-     * @deprecated
-     */
-    onBeforeUpdateThreadComment(callback: (params: IUpdateCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
-    /**
-     * @param callback
-     * @returns {IDisposable} A disposable used to remove the listener.
-     * @deprecated
-     */
-    onBeforeDeleteThreadComment(callback: (params: IDeleteCommentCommandParams, options: IExecutionOptions | undefined) => void | false): IDisposable;
 }
 declare module '@univerjs/sheets/facade' {
     interface FWorkbook extends IFWorkbookSheetsThreadCommentMixin {

package/lib/umd/facade.js CHANGED Viewed

	@@ -1 +1 @@
1	- (function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets-thread-comment"),require("@univerjs/sheets/facade"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("rxjs"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets-thread-comment`,`@univerjs/sheets/facade`,`@univerjs/thread-comment`,`@univerjs/engine-formula`,`rxjs`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e\|\|self,t(e.UniverSheetsThreadCommentFacade={},e.UniverCore,e.UniverSheetsThreadComment,e.UniverSheetsFacade,e.UniverThreadComment,e.UniverEngineFormula,e.rxjs,e.UniverCoreFacade))})(this,function(e,t,n,r,i,a,o,s){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function c(e){"@babel/helpers - typeof";return c=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},c(e)}function l(e,t){if(c(e)!=`object`\|\|!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t\|\|`default`);if(c(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function u(e){var t=l(e,`string`);return c(t)==`symbol`?t:t+``}function d(e,t,n){return(t=u(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function f(e,t){return function(n,r){t(n,r,e)}}function p(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}var m,h=class e{static create(t){return new e(t)}constructor(e){d(this,`_comment`,{id:(0,t.generateRandomId)(),ref:``,threadId:``,dT:``,personId:``,text:t.RichTextBuilder.newEmptyData().body,attachments:[],unitId:``,subUnitId:``}),e&&(this._comment=e)}get personId(){return this._comment.personId}get dateTime(){return this._comment.dT}get content(){return t.RichTextValue.createByBody(this._comment.text)}get id(){return this._comment.id}get threadId(){return this._comment.threadId}copy(){return g.create(t.Tools.deepClone(this._comment))}},g=class e extends h{static create(t){return new e(t)}setContent(e){return e instanceof t.RichTextValue?this._comment.text=e.getData().body:this._comment.text=e,this}setPersonId(e){return this._comment.personId=e,this}setDateTime(e){return this._comment.dT=(0,i.getDT)(e),this}setId(e){return this._comment.id=e,this}setThreadId(e){return this._comment.threadId=e,this}build(){return this._comment}};let _=m=class{constructor(e,t,n,r,i,a,o){this._thread=e,this._parent=t,this._injector=n,this._commandService=r,this._univerInstanceService=i,this._threadCommentModel=a,this._userManagerService=o}_getRef(){var e;return(0,a.deserializeRangeWithSheet)(((e=this._parent)==null?void 0:e.ref)\|\|this._thread.ref).range}getIsRoot(){return!this._parent}getCommentData(){let{children:e,...t}=this._thread;return t}getReplies(){var e;let t=this._getRef(),n=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return n==null\|\|(e=n.children)==null?void 0:e.map(e=>this._injector.createInstance(m,e))}getRange(){let e=this._univerInstanceService.getUnit(this._thread.unitId,t.UniverInstanceType.UNIVER_SHEET);if(!e)return null;let n=e.getSheetBySheetId(this._thread.subUnitId);if(!n)return null;let i=this._getRef();return this._injector.createInstance(r.FRange,e,n,i)}getContent(){return this._thread.text}getRichText(){let e=this._thread.text;return t.RichTextValue.create({body:e,documentStyle:{},id:`d`})}deleteAsync(){return this._commandService.executeCommand(this.getIsRoot()?i.DeleteCommentTreeCommand.id:i.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}delete(){return this.deleteAsync()}async update(e){return this.updateAsync(e)}async updateAsync(e){let n=e instanceof t.RichTextValue?e.getData().body:e,r=(0,i.getDT)();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:n,updated:!0,updateT:r}})}resolve(e){return this.resolveAsync(e)}resolveAsync(e){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:e==null?!this._thread.resolved:e})}replyAsync(e){var n;let r=e.build();return this._commandService.executeCommand(i.AddCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,comment:{id:(0,t.generateRandomId)(),parentId:this._thread.id,threadId:this._thread.threadId,ref:((n=this._parent)==null?void 0:n.ref)\|\|this._thread.ref,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,text:r.text,attachments:r.attachments,dT:r.dT\|\|(0,i.getDT)(),personId:r.personId\|\|this._userManagerService.getCurrentUser().userID}})}};_=m=p([f(2,(0,t.Inject)(t.Injector)),f(3,t.ICommandService),f(4,t.IUniverInstanceService),f(5,(0,t.Inject)(n.SheetsThreadCommentModel)),f(6,(0,t.Inject)(t.UserManagerService))],_);var v=class extends r.FRange{getComment(){let e=this._injector.get(n.SheetsThreadCommentModel),t=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),i=e.getByLocation(t,r,this._range.startRow,this._range.startColumn);if(!i)return null;let a=e.getComment(t,r,i);return a?this._injector.createInstance(_,a):null}getComments(){let e=this._injector.get(n.SheetsThreadCommentModel),r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=[];return t.Range.foreach(this._range,(t,n)=>{let o=e.getByLocation(r,i,t,n);if(o){let t=e.getComment(r,i,o);t&&a.push(this._injector.createInstance(_,t))}}),a}addComment(e){var n;let r=this._injector,a=(n=this.getComment())==null?void 0:n.getCommentData(),o=r.get(t.ICommandService),s=r.get(t.UserManagerService),c=this._workbook.getUnitId(),l=this._worksheet.getSheetId(),u=`${t.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,d=s.getCurrentUser(),f=e instanceof g?e.build():{text:e};return o.executeCommand(i.AddCommentCommand.id,{unitId:c,subUnitId:l,comment:{text:f.text,dT:f.dT\|\|(0,i.getDT)(),attachments:[],id:f.id\|\|(0,t.generateRandomId)(),ref:u,personId:f.personId\|\|d.userID,parentId:a==null?void 0:a.id,unitId:c,subUnitId:l,threadId:(a==null?void 0:a.threadId)\|\|(0,t.generateRandomId)()}})}clearComment(){var e;let n=this._injector,r=(e=this.getComment())==null?void 0:e.getCommentData(),a=n.get(t.ICommandService),o=this._workbook.getUnitId(),s=this._worksheet.getSheetId();return r?a.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:o,subUnitId:s,threadId:r.threadId,commentId:r.id}):Promise.resolve(!0)}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}addCommentAsync(e){return this.addComment(e)}clearCommentAsync(){return this.clearComment()}clearCommentsAsync(){return this.clearComments()}};r.FRange.extend(v);var y=class extends r.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}getComments(){return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map(e=>this._injector.createInstance(_,e.root))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}onThreadCommentChange(e){return(0,t.toDisposable)(this._threadCommentModel.commentUpdate$.pipe((0,o.filter)(e=>e.unitId===this._workbook.getUnitId())).subscribe(e))}onBeforeAddThreadComment(e){return(0,t.toDisposable)(this._commandService.beforeCommandExecuted((t,n)=>{let r=t.params;if(t.id===i.AddCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(e(r,n)===!1)throw Error(`Command is stopped by the hook onBeforeAddThreadComment`)}}))}onBeforeUpdateThreadComment(e){return(0,t.toDisposable)(this._commandService.beforeCommandExecuted((t,n)=>{let r=t.params;if(t.id===i.UpdateCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(e(r,n)===!1)throw Error(`Command is stopped by the hook onBeforeUpdateThreadComment`)}}))}onBeforeDeleteThreadComment(e){return(0,t.toDisposable)(this._commandService.beforeCommandExecuted((t,n)=>{let r=t.params;if(t.id===i.DeleteCommentCommand.id\|\|t.id===i.DeleteCommentTreeCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(e(r,n)===!1)throw Error(`Command is stopped by the hook onBeforeDeleteThreadComment`)}}))}};r.FWorkbook.extend(y);var b=class extends r.FWorksheet{getComments(){return this._injector.get(n.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(e=>this._injector.createInstance(_,e))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}onCommented(e){return this._injector.get(t.ICommandService).onCommandExecuted(t=>{if(t.id===i.AddCommentCommand.id){let n=t.params;e(n)}})}getCommentById(e){let t=this._injector.get(n.SheetsThreadCommentModel).getComment(this._workbook.getUnitId(),this._worksheet.getSheetId(),e);if(t)return this._injector.createInstance(_,t)}};r.FWorksheet.extend(b);var x=class extends s.FEventName{get CommentAdded(){return`CommentAdded`}get BeforeCommentAdd(){return`BeforeCommentAdd`}get CommentUpdated(){return`CommentUpdated`}get BeforeCommentUpdate(){return`BeforeCommentUpdate`}get CommentDeleted(){return`CommentDeleted`}get BeforeCommentDelete(){return`BeforeCommentDelete`}get CommentResolved(){return`CommentResolved`}get BeforeCommentResolve(){return`BeforeCommentResolve`}};s.FEventName.extend(x);var S=class extends s.FUniver{_initialize(e){let n=e.get(t.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.AddCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{comment:u}=o,d=l.getCommentById(u.id);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentAdded,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.UpdateCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{payload:u}=o,d=l.getCommentById(u.commentId);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentUpdated,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentDeleted,()=>n.onCommandExecuted(e=>{if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let t=e.params,n=this.getSheetCommandTarget(t);if(!n)return;let{workbook:r,worksheet:a}=n,{commentId:o}=t,s={workbook:r,worksheet:a,commentId:o};this.fireEvent(this.Event.CommentDeleted,s)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.ResolveCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{commentId:u,resolved:d}=o,f=l.getCommentById(u);if(!f)return;let p={workbook:c,worksheet:l,row:(t=(n=f.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=f.getRange())==null?void 0:a.getColumn())==null?0:r,comment:f,resolved:d};this.fireEvent(this.Event.CommentResolved,p)}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentAdd,()=>n.beforeCommandExecuted(e=>{if(e.id!==i.AddCommentCommand.id)return;let n=e.params,r=this.getSheetCommandTarget(n);if(!r)return;let{workbook:o,worksheet:s}=r,{comment:c}=n,{range:l}=(0,a.deserializeRangeWithSheet)(c.ref),u={workbook:o,worksheet:s,row:l.startRow,col:l.startColumn,comment:h.create(c)};if(this.fireEvent(this.Event.BeforeCommentAdd,u),u.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.UpdateCommentCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{payload:d}=s,f=u.getCommentById(d.commentId);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f,newContent:t.RichTextValue.createByBody(d.text)};if(this.fireEvent(this.Event.BeforeCommentUpdate,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{commentId:d}=s,f=u.getCommentById(d);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f};if(this.fireEvent(this.Event.BeforeCommentDelete,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve,()=>n.beforeCommandExecuted(e=>{var n,r;if(e.id!==i.ResolveCommentCommand.id)return;let a=e.params,o=this.getSheetCommandTarget(a);if(!o)return;let{workbook:s,worksheet:c}=o,{commentId:l,resolved:u}=a,d=c.getCommentById(l);if(!d)return;let f={workbook:s,worksheet:c,row:(n=d.getRange().getRow())==null?0:n,col:(r=d.getRange().getColumn())==null?0:r,comment:d,resolved:u};if(this.fireEvent(this.Event.BeforeCommentResolve,f),f.cancel)throw new t.CanceledError})))}newTheadComment(e){return new g(e)}};s.FUniver.extend(S),Object.defineProperty(e,"FThreadComment",{enumerable:!0,get:function(){return _}})});
1	+ (function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets-thread-comment"),require("@univerjs/sheets/facade"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("@univerjs/core/facade")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets-thread-comment`,`@univerjs/sheets/facade`,`@univerjs/thread-comment`,`@univerjs/engine-formula`,`@univerjs/core/facade`],t):(e=typeof globalThis<`u`?globalThis:e\|\|self,t(e.UniverSheetsThreadCommentFacade={},e.UniverCore,e.UniverSheetsThreadComment,e.UniverSheetsFacade,e.UniverThreadComment,e.UniverEngineFormula,e.UniverCoreFacade))})(this,function(e,t,n,r,i,a,o){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function s(e){"@babel/helpers - typeof";return s=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},s(e)}function c(e,t){if(s(e)!=`object`\|\|!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t\|\|`default`);if(s(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function l(e){var t=c(e,`string`);return s(t)==`symbol`?t:t+``}function u(e,t,n){return(t=l(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function d(e,t){return function(n,r){t(n,r,e)}}function f(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}var p,m=class e{static create(t){return new e(t)}constructor(e){u(this,`_comment`,{id:(0,t.generateRandomId)(),ref:``,threadId:``,dT:``,personId:``,text:t.RichTextBuilder.newEmptyData().body,attachments:[],unitId:``,subUnitId:``}),e&&(this._comment=e)}get personId(){return this._comment.personId}get dateTime(){return this._comment.dT}get content(){return t.RichTextValue.createByBody(this._comment.text)}get id(){return this._comment.id}get threadId(){return this._comment.threadId}copy(){return h.create(t.Tools.deepClone(this._comment))}},h=class e extends m{static create(t){return new e(t)}setContent(e){return e instanceof t.RichTextValue?this._comment.text=e.getData().body:this._comment.text=e,this}setPersonId(e){return this._comment.personId=e,this}setDateTime(e){return this._comment.dT=(0,i.getDT)(e),this}setId(e){return this._comment.id=e,this}setThreadId(e){return this._comment.threadId=e,this}build(){return this._comment}};let g=p=class{constructor(e,t,n,r,i,a,o){this._thread=e,this._parent=t,this._injector=n,this._commandService=r,this._univerInstanceService=i,this._threadCommentModel=a,this._userManagerService=o}_getRef(){var e;return(0,a.deserializeRangeWithSheet)(((e=this._parent)==null?void 0:e.ref)\|\|this._thread.ref).range}getIsRoot(){return!this._parent}getCommentData(){let{children:e,...t}=this._thread;return t}getReplies(){var e;let t=this._getRef(),n=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return n==null\|\|(e=n.children)==null?void 0:e.map(e=>this._injector.createInstance(p,e))}getRange(){let e=this._univerInstanceService.getUnit(this._thread.unitId,t.UniverInstanceType.UNIVER_SHEET);if(!e)return null;let n=e.getSheetBySheetId(this._thread.subUnitId);if(!n)return null;let i=this._getRef();return this._injector.createInstance(r.FRange,e,n,i)}getRichText(){let e=this._thread.text;return t.RichTextValue.create({body:e,documentStyle:{},id:`d`})}deleteAsync(){return this._commandService.executeCommand(this.getIsRoot()?i.DeleteCommentTreeCommand.id:i.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}async updateAsync(e){let n=e instanceof t.RichTextValue?e.getData().body:e,r=(0,i.getDT)();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:n,updated:!0,updateT:r}})}resolveAsync(e){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:e==null?!this._thread.resolved:e})}replyAsync(e){var n;let r=e.build();return this._commandService.executeCommand(i.AddCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,comment:{id:(0,t.generateRandomId)(),parentId:this._thread.id,threadId:this._thread.threadId,ref:((n=this._parent)==null?void 0:n.ref)\|\|this._thread.ref,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,text:r.text,attachments:r.attachments,dT:r.dT\|\|(0,i.getDT)(),personId:r.personId\|\|this._userManagerService.getCurrentUser().userID}})}};g=p=f([d(2,(0,t.Inject)(t.Injector)),d(3,t.ICommandService),d(4,t.IUniverInstanceService),d(5,(0,t.Inject)(n.SheetsThreadCommentModel)),d(6,(0,t.Inject)(t.UserManagerService))],g);var _=class extends r.FRange{getComment(){let e=this._injector.get(n.SheetsThreadCommentModel),t=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),i=e.getByLocation(t,r,this._range.startRow,this._range.startColumn);if(!i)return null;let a=e.getComment(t,r,i);return a?this._injector.createInstance(g,a):null}getComments(){let e=this._injector.get(n.SheetsThreadCommentModel),r=this._workbook.getUnitId(),i=this._worksheet.getSheetId(),a=[];return t.Range.foreach(this._range,(t,n)=>{let o=e.getByLocation(r,i,t,n);if(o){let t=e.getComment(r,i,o);t&&a.push(this._injector.createInstance(g,t))}}),a}addCommentAsync(e){var n;let r=this._injector,a=(n=this.getComment())==null?void 0:n.getCommentData(),o=r.get(t.ICommandService),s=r.get(t.UserManagerService),c=this._workbook.getUnitId(),l=this._worksheet.getSheetId(),u=`${t.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,d=s.getCurrentUser(),f=e instanceof h?e.build():{text:e};return o.executeCommand(i.AddCommentCommand.id,{unitId:c,subUnitId:l,comment:{text:f.text,dT:f.dT\|\|(0,i.getDT)(),attachments:[],id:f.id\|\|(0,t.generateRandomId)(),ref:u,personId:f.personId\|\|d.userID,parentId:a==null?void 0:a.id,unitId:c,subUnitId:l,threadId:(a==null?void 0:a.threadId)\|\|(0,t.generateRandomId)()}})}clearCommentAsync(){var e;let n=this._injector,r=(e=this.getComment())==null?void 0:e.getCommentData(),a=n.get(t.ICommandService),o=this._workbook.getUnitId(),s=this._worksheet.getSheetId();return r?a.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:o,subUnitId:s,threadId:r.threadId,commentId:r.id}):Promise.resolve(!0)}clearCommentsAsync(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FRange.extend(_);var v=class extends r.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}getComments(){return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map(e=>this._injector.createInstance(g,e.root))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}};r.FWorkbook.extend(v);var y=class extends r.FWorksheet{getComments(){return this._injector.get(n.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(e=>this._injector.createInstance(g,e))}clearComments(){let e=this.getComments().map(e=>e.deleteAsync());return Promise.all(e).then(()=>!0)}onCommented(e){return this._injector.get(t.ICommandService).onCommandExecuted(t=>{if(t.id===i.AddCommentCommand.id){let n=t.params;e(n)}})}getCommentById(e){let t=this._injector.get(n.SheetsThreadCommentModel).getComment(this._workbook.getUnitId(),this._worksheet.getSheetId(),e);if(t)return this._injector.createInstance(g,t)}};r.FWorksheet.extend(y);var b=class extends o.FEventName{get CommentAdded(){return`CommentAdded`}get BeforeCommentAdd(){return`BeforeCommentAdd`}get CommentUpdated(){return`CommentUpdated`}get BeforeCommentUpdate(){return`BeforeCommentUpdate`}get CommentDeleted(){return`CommentDeleted`}get BeforeCommentDelete(){return`BeforeCommentDelete`}get CommentResolved(){return`CommentResolved`}get BeforeCommentResolve(){return`BeforeCommentResolve`}};o.FEventName.extend(b);var x=class extends o.FUniver{_initialize(e){let n=e.get(t.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.CommentAdded,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.AddCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{comment:u}=o,d=l.getCommentById(u.id);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentAdded,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentUpdated,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.UpdateCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{payload:u}=o,d=l.getCommentById(u.commentId);if(!d)return;let f={workbook:c,worksheet:l,row:(t=(n=d.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=d.getRange())==null?void 0:a.getColumn())==null?0:r,comment:d};this.fireEvent(this.Event.CommentUpdated,f)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentDeleted,()=>n.onCommandExecuted(e=>{if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let t=e.params,n=this.getSheetCommandTarget(t);if(!n)return;let{workbook:r,worksheet:a}=n,{commentId:o}=t,s={workbook:r,worksheet:a,commentId:o};this.fireEvent(this.Event.CommentDeleted,s)}))),this.disposeWithMe(this.registerEventHandler(this.Event.CommentResolved,()=>n.onCommandExecuted(e=>{var t,n,r,a;if(e.id!==i.ResolveCommentCommand.id)return;let o=e.params,s=this.getSheetCommandTarget(o);if(!s)return;let{workbook:c,worksheet:l}=s,{commentId:u,resolved:d}=o,f=l.getCommentById(u);if(!f)return;let p={workbook:c,worksheet:l,row:(t=(n=f.getRange())==null?void 0:n.getRow())==null?0:t,col:(r=(a=f.getRange())==null?void 0:a.getColumn())==null?0:r,comment:f,resolved:d};this.fireEvent(this.Event.CommentResolved,p)}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentAdd,()=>n.beforeCommandExecuted(e=>{if(e.id!==i.AddCommentCommand.id)return;let n=e.params,r=this.getSheetCommandTarget(n);if(!r)return;let{workbook:o,worksheet:s}=r,{comment:c}=n,{range:l}=(0,a.deserializeRangeWithSheet)(c.ref),u={workbook:o,worksheet:s,row:l.startRow,col:l.startColumn,comment:m.create(c)};if(this.fireEvent(this.Event.BeforeCommentAdd,u),u.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentUpdate,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.UpdateCommentCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{payload:d}=s,f=u.getCommentById(d.commentId);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f,newContent:t.RichTextValue.createByBody(d.text)};if(this.fireEvent(this.Event.BeforeCommentUpdate,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentDelete,()=>n.beforeCommandExecuted(e=>{var n,r,a,o;if(e.id!==i.DeleteCommentCommand.id&&e.id!==i.DeleteCommentTreeCommand.id)return;let s=e.params,c=this.getSheetCommandTarget(s);if(!c)return;let{workbook:l,worksheet:u}=c,{commentId:d}=s,f=u.getCommentById(d);if(!f)return;let p={workbook:l,worksheet:u,row:(n=(r=f.getRange())==null?void 0:r.getRow())==null?0:n,col:(a=(o=f.getRange())==null?void 0:o.getColumn())==null?0:a,comment:f};if(this.fireEvent(this.Event.BeforeCommentDelete,p),p.cancel)throw new t.CanceledError}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeCommentResolve,()=>n.beforeCommandExecuted(e=>{var n,r;if(e.id!==i.ResolveCommentCommand.id)return;let a=e.params,o=this.getSheetCommandTarget(a);if(!o)return;let{workbook:s,worksheet:c}=o,{commentId:l,resolved:u}=a,d=c.getCommentById(l);if(!d)return;let f={workbook:s,worksheet:c,row:(n=d.getRange().getRow())==null?0:n,col:(r=d.getRange().getColumn())==null?0:r,comment:d,resolved:u};if(this.fireEvent(this.Event.BeforeCommentResolve,f),f.cancel)throw new t.CanceledError})))}newTheadComment(e){return new h(e)}};o.FUniver.extend(x),Object.defineProperty(e,"FThreadComment",{enumerable:!0,get:function(){return g}})});

package/lib/umd/index.js CHANGED Viewed

	@@ -1 +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);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=`1.0.0-alpha.6`;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,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{...a}=(0,t.merge)({},g,this._config);this._configService.setConfig(`sheets-thread-comment.config`,a)}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)),u(3,t.IConfigService)],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}})});
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);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=`1.0.0-alpha.8`;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,n,r,i){super(),this._config=e,this._injector=n,this._commandService=r,this._configService=i;let{...a}=(0,t.merge)({},g,this._config);this._configService.setConfig(`sheets-thread-comment.config`,a)}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,r.UniverSheetsPlugin),u(1,(0,t.Inject)(t.Injector)),u(2,(0,t.Inject)(t.ICommandService)),u(3,t.IConfigService)],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 CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-thread-comment",
-  "version": "1.0.0-alpha.6",
+  "version": "1.0.0-alpha.8",
   "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": "1.0.0-alpha.6",
-    "@univerjs/engine-formula": "1.0.0-alpha.6",
-    "@univerjs/thread-comment": "1.0.0-alpha.6",
-    "@univerjs/sheets": "1.0.0-alpha.6"
+    "@univerjs/core": "1.0.0-alpha.8",
+    "@univerjs/engine-formula": "1.0.0-alpha.8",
+    "@univerjs/thread-comment": "1.0.0-alpha.8",
+    "@univerjs/sheets": "1.0.0-alpha.8"
   },
   "devDependencies": {
     "rxjs": "^7.8.2",
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@univerjs-infra/shared": "1.0.0-alpha.6"
+    "@univerjs-infra/shared": "1.0.0-alpha.8"
   },
   "scripts": {
     "test": "vitest run",