@univerjs/sheets-thread-comment 1.0.0-alpha.2 → 1.0.0-alpha.3

package/lib/cjs/facade.js

@@ -431,7 +431,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		return this._injector.createInstance(_univerjs_sheets_facade.FRange, workbook, worksheet, range);
 	}
 	/**
-	* @deprecated use `getRichText` as instead
+	* @deprecated Use `getRichText` instead.
+	* @returns {IDocumentBody} The comment content.
 	*/
 	getContent() {
 		return this._thread.text;
@@ -481,13 +482,16 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `deleteAsync` as instead.
+	* @deprecated Use `deleteAsync` instead.
+	* @returns {Promise<boolean>} Whether the comment is deleted successfully.
 	*/
 	delete() {
 		return this.deleteAsync();
 	}
 	/**
-	* @deprecated use `updateAsync` as instead
+	* @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);
@@ -534,7 +538,9 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `resolveAsync` as instead
+	* @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);
@@ -740,6 +746,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FW
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onThreadCommentChange(callback) {
@@ -747,6 +754,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FW
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeAddThreadComment(callback) {
@@ -760,6 +768,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FW
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeUpdateThreadComment(callback) {
@@ -773,6 +782,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends _univerjs_sheets_facade.FW
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeDeleteThreadComment(callback) {
@@ -803,6 +813,7 @@ var FWorksheetCommentMixin = class extends _univerjs_sheets_facade.FWorksheet {
 	/**
 	* Subscribe to comment events.
 	* @param callback Callback function, param contains comment info and target cell.
+	* @returns {IDisposable} A disposable used to remove the listener.
 	*/
 	onCommented(callback) {
 		return this._injector.get(_univerjs_core.ICommandService).onCommandExecuted((command) => {
@@ -1015,6 +1026,7 @@ var FUniverSheetsThreadCommentMixin = class extends _univerjs_core_facade.FUnive
 	}
 	/**
 	* @ignore
+	* @returns {FTheadCommentBuilder} The thread comment builder.
 	*/
 	newTheadComment(comment) {
 		return new FTheadCommentBuilder(comment);

package/lib/cjs/index.js

@@ -450,7 +450,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.2";
+var version = "1.0.0-alpha.3";
 
 //#endregion
 //#region src/config/config.ts

package/lib/es/facade.js

@@ -430,7 +430,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		return this._injector.createInstance(FRange, workbook, worksheet, range);
 	}
 	/**
-	* @deprecated use `getRichText` as instead
+	* @deprecated Use `getRichText` instead.
+	* @returns {IDocumentBody} The comment content.
 	*/
 	getContent() {
 		return this._thread.text;
@@ -480,13 +481,16 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `deleteAsync` as instead.
+	* @deprecated Use `deleteAsync` instead.
+	* @returns {Promise<boolean>} Whether the comment is deleted successfully.
 	*/
 	delete() {
 		return this.deleteAsync();
 	}
 	/**
-	* @deprecated use `updateAsync` as instead
+	* @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);
@@ -533,7 +537,9 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `resolveAsync` as instead
+	* @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);
@@ -739,6 +745,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onThreadCommentChange(callback) {
@@ -746,6 +753,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeAddThreadComment(callback) {
@@ -759,6 +767,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeUpdateThreadComment(callback) {
@@ -772,6 +781,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeDeleteThreadComment(callback) {
@@ -802,6 +812,7 @@ var FWorksheetCommentMixin = class extends FWorksheet {
 	/**
 	* Subscribe to comment events.
 	* @param callback Callback function, param contains comment info and target cell.
+	* @returns {IDisposable} A disposable used to remove the listener.
 	*/
 	onCommented(callback) {
 		return this._injector.get(ICommandService).onCommandExecuted((command) => {
@@ -1014,6 +1025,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 	}
 	/**
 	* @ignore
+	* @returns {FTheadCommentBuilder} The thread comment builder.
 	*/
 	newTheadComment(comment) {
 		return new FTheadCommentBuilder(comment);

package/lib/es/index.js

@@ -449,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.2";
+var version = "1.0.0-alpha.3";
 
 //#endregion
 //#region src/config/config.ts

package/lib/facade.js

@@ -430,7 +430,8 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		return this._injector.createInstance(FRange, workbook, worksheet, range);
 	}
 	/**
-	* @deprecated use `getRichText` as instead
+	* @deprecated Use `getRichText` instead.
+	* @returns {IDocumentBody} The comment content.
 	*/
 	getContent() {
 		return this._thread.text;
@@ -480,13 +481,16 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `deleteAsync` as instead.
+	* @deprecated Use `deleteAsync` instead.
+	* @returns {Promise<boolean>} Whether the comment is deleted successfully.
 	*/
 	delete() {
 		return this.deleteAsync();
 	}
 	/**
-	* @deprecated use `updateAsync` as instead
+	* @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);
@@ -533,7 +537,9 @@ let FThreadComment = _FThreadComment = class FThreadComment {
 		});
 	}
 	/**
-	* @deprecated use `resolveAsync` as instead
+	* @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);
@@ -739,6 +745,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onThreadCommentChange(callback) {
@@ -746,6 +753,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeAddThreadComment(callback) {
@@ -759,6 +767,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeUpdateThreadComment(callback) {
@@ -772,6 +781,7 @@ var FWorkbookSheetsThreadCommentMixin = class extends FWorkbook {
 	}
 	/**
 	* @param callback
+	* @returns {IDisposable} A disposable used to remove the listener.
 	* @deprecated
 	*/
 	onBeforeDeleteThreadComment(callback) {
@@ -802,6 +812,7 @@ var FWorksheetCommentMixin = class extends FWorksheet {
 	/**
 	* Subscribe to comment events.
 	* @param callback Callback function, param contains comment info and target cell.
+	* @returns {IDisposable} A disposable used to remove the listener.
 	*/
 	onCommented(callback) {
 		return this._injector.get(ICommandService).onCommandExecuted((command) => {
@@ -1014,6 +1025,7 @@ var FUniverSheetsThreadCommentMixin = class extends FUniver {
 	}
 	/**
 	* @ignore
+	* @returns {FTheadCommentBuilder} The thread comment builder.
 	*/
 	newTheadComment(comment) {
 		return new FTheadCommentBuilder(comment);

package/lib/index.js

@@ -449,7 +449,7 @@ SheetsThreadCommentRefRangeController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-thread-comment";
-var version = "1.0.0-alpha.2";
+var version = "1.0.0-alpha.3";
 
 //#endregion
 //#region src/config/config.ts

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

@@ -317,7 +317,8 @@ export declare class FThreadComment {
      */
     getRange(): FRange | null;
     /**
-     * @deprecated use `getRichText` as instead
+     * @deprecated Use `getRichText` instead.
+     * @returns {IDocumentBody} The comment content.
      */
     getContent(): IDocumentBody;
     /**
@@ -352,11 +353,14 @@ export declare class FThreadComment {
      */
     deleteAsync(): Promise<boolean>;
     /**
-     * @deprecated use `deleteAsync` as instead.
+     * @deprecated Use `deleteAsync` instead.
+     * @returns {Promise<boolean>} Whether the comment is deleted successfully.
      */
     delete(): Promise<boolean>;
     /**
-     * @deprecated use `updateAsync` as instead
+     * @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>;
     /**
@@ -388,7 +392,9 @@ export declare class FThreadComment {
      */
     updateAsync(content: IDocumentBody | RichTextValue): Promise<boolean>;
     /**
-     * @deprecated use `resolveAsync` as instead
+     * @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>;
     /**

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

@@ -53,6 +53,7 @@ export declare class FUniverSheetsThreadCommentMixin extends FUniver implements
     _initialize(injector: Injector): void;
     /**
      * @ignore
+     * @returns {FTheadCommentBuilder} The thread comment builder.
      */
     newTheadComment(comment?: IThreadComment): FTheadCommentBuilder;
 }

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

@@ -85,21 +85,25 @@ export declare class FWorkbookSheetsThreadCommentMixin extends FWorkbook impleme
     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;

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

@@ -89,6 +89,7 @@ export declare class FWorksheetCommentMixin extends FWorksheet implements IFWork
     /**
      * Subscribe to comment events.
      * @param callback Callback function, param contains comment info and target cell.
+     * @returns {IDisposable} A disposable used to remove the listener.
      */
     onCommented(callback: (params: IAddCommentCommandParams) => void): IDisposable;
     getCommentById(commentId: string): FThreadComment | undefined;

package/lib/umd/index.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/engine-formula"),require("@univerjs/sheets"),require("@univerjs/thread-comment"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/engine-formula`,`@univerjs/sheets`,`@univerjs/thread-comment`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsThreadComment={},e.UniverCore,e.UniverEngineFormula,e.UniverSheets,e.UniverThreadComment,e.rxjs))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function o(e){"@babel/helpers - typeof";return o=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},o(e)}function s(e,t){if(o(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(o(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function c(e){var t=s(e,`string`);return o(t)==`symbol`?t:t+``}function l(e,t,n){return(t=c(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function u(e,t){return function(n,r){t(n,r,e)}}function d(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let f=class extends t.Disposable{constructor(e,t){super(),this._threadCommentModel=e,this._univerInstanceService=t,l(this,`_matrixMap`,new Map),l(this,`_locationMap`,new Map),l(this,`_commentUpdate$`,new a.Subject),l(this,`commentUpdate$`,this._commentUpdate$.asObservable()),this._init(),this.disposeWithMe(()=>{this._commentUpdate$.complete()})}_init(){this._initData(),this._initUpdateTransform()}_ensureCommentMatrix(e,n){let r=this._matrixMap.get(e);r||(r=new Map,this._matrixMap.set(e,r));let i=r.get(n);return i||(i=new t.ObjectMatrix,r.set(n,i)),i}_ensureCommentLocationMap(e,t){let n=this._locationMap.get(e);n||(n=new Map,this._locationMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_addCommentToMatrix(e,t,n,r){var i;let a=(i=e.getValue(t,n))==null?new Set:i;a.add(r),e.setValue(t,n,a)}_deleteCommentFromMatrix(e,t,n,r){if(t>=0&&n>=0){let i=e.getValue(t,n);i&&i.has(r)&&(i.delete(r),i.size===0&&e.realDeleteValue(t,n))}}_ensure(e,t){return{matrix:this._ensureCommentMatrix(e,t),locationMap:this._ensureCommentLocationMap(e,t)}}_initData(){let e=this._threadCommentModel.getAll();for(let t of e)for(let e of t.threads){let{unitId:t,subUnitId:n,root:r}=e;this._addComment(t,n,r)}}_addComment(e,t,r){let i=(0,n.singleReferenceToGrid)(r.ref),a=r.parentId,{row:o,column:s}=i,c=r.id,{matrix:l,locationMap:u}=this._ensure(e,t);!a&&o>=0&&s>=0&&(this._addCommentToMatrix(l,o,s,c),u.set(c,{row:o,column:s})),a||this._commentUpdate$.next({unitId:e,subUnitId:t,payload:r,type:`add`,isRoot:!a,...i})}_initUpdateTransform(){this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe(e=>{let{unitId:r,subUnitId:i}=e;try{if(this._univerInstanceService.getUnitType(r)!==t.UniverInstanceType.UNIVER_SHEET)return}catch{}let{matrix:a,locationMap:o}=this._ensure(r,i);switch(e.type){case`add`:this._addComment(e.unitId,e.subUnitId,e.payload);break;case`delete`:{let{isRoot:t,comment:r}=e.payload;if(t){let t=(0,n.singleReferenceToGrid)(r.ref),{row:i,column:o}=t;this._deleteCommentFromMatrix(a,i,o,r.id),this._commentUpdate$.next({...e,...t})}break}case`update`:{let{commentId:t}=e.payload,a=this._threadCommentModel.getComment(r,i,t);if(!a)return;let o=(0,n.singleReferenceToGrid)(a.ref);this._commentUpdate$.next({...e,...o});break}case`updateRef`:{let t=(0,n.singleReferenceToGrid)(e.payload.ref),{commentId:r}=e.payload,i=o.get(r);if(!i)return;let{row:s,column:c}=i;this._deleteCommentFromMatrix(a,s,c,r),o.delete(r),t.row>=0&&t.column>=0&&(this._addCommentToMatrix(a,t.row,t.column,r),o.set(r,{row:t.row,column:t.column})),this._commentUpdate$.next({...e,...t});break}case`resolve`:{let{unitId:t,subUnitId:n,payload:r}=e,{locationMap:i}=this._ensure(t,n),a=i.get(r.commentId);a&&this._commentUpdate$.next({...e,...a});break}default:break}}))}getByLocation(e,t,n,r){var i;return(i=this.getAllByLocation(e,t,n,r).filter(e=>!e.resolved)[0])==null?void 0:i.id}getAllByLocation(e,t,n,r){let i=this._ensureCommentMatrix(e,t).getValue(n,r);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.2`;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}})});
+(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.3`;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}})});

package/package.json

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