@univerjs/sheets-thread-comment 0.5.1 → 0.5.2

package/lib/cjs/facade.js

@@ -1 +1 @@
-"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const o=require("@univerjs/core"),a=require("@univerjs/sheets/facade"),c=require("@univerjs/sheets-thread-comment"),i=require("@univerjs/thread-comment"),g=require("@univerjs/engine-formula"),l=require("rxjs");var p=Object.defineProperty,b=Object.getOwnPropertyDescriptor,f=(m,t,e,n)=>{for(var r=n>1?void 0:n?b(t,e):t,d=m.length-1,s;d>=0;d--)(s=m[d])&&(r=(n?s(t,e,r):s(r))||r);return n&&r&&p(t,e,r),r},h=(m,t)=>(e,n)=>t(e,n,m);exports.FThreadComment=class{constructor(t,e,n,r,d,s){this._thread=t,this._parent=e,this._injector=n,this._commandService=r,this._univerInstanceService=d,this._threadCommentModel=s}_getRef(){var n;const t=((n=this._parent)==null?void 0:n.ref)||this._thread.ref;return g.deserializeRangeWithSheet(t).range}getIsRoot(){return!this._parent}getCommentData(){const{children:t,...e}=this._thread;return e}getReplies(){var n;const t=this._getRef(),e=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return(n=e==null?void 0:e.children)==null?void 0:n.map(r=>this._injector.createInstance(exports.FThreadComment,r))}getRange(){const t=this._univerInstanceService.getUnit(this._thread.unitId,o.UniverInstanceType.UNIVER_SHEET);if(!t)return null;const e=t.getSheetBySheetId(this._thread.subUnitId);if(!e)return null;const n=this._getRef();return this._injector.createInstance(a.FRange,t,e,n)}getContent(){return this._thread.text}delete(){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 update(t){const e=i.getDT();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:t,updated:!0,updateT:e}})}resolve(t){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:t!=null?t:!this._thread.resolved})}};exports.FThreadComment=f([h(2,o.Inject(o.Injector)),h(3,o.ICommandService),h(4,o.IUniverInstanceService),h(5,o.Inject(c.SheetsThreadCommentModel))],exports.FThreadComment);class T extends a.FRange{getComment(){const e=this._injector.get(c.SheetsThreadCommentModel),n=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),d=e.getByLocation(n,r,this._range.startRow,this._range.startColumn);if(!d)return null;const s=e.getComment(n,r,d);return s?this._injector.createInstance(exports.FThreadComment,s):null}addComment(t){var C;const e=this._injector,n=(C=this.getComment())==null?void 0:C.getCommentData(),r=e.get(o.ICommandService),d=e.get(o.UserManagerService),s=this._workbook.getUnitId(),u=this._worksheet.getSheetId(),_=`${o.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,I=d.getCurrentUser();return r.executeCommand(i.AddCommentCommand.id,{unitId:s,subUnitId:u,comment:{text:t,attachments:[],dT:i.getDT(),id:o.Tools.generateRandomId(),ref:_,personId:I.userID,parentId:n==null?void 0:n.id,unitId:s,subUnitId:u,threadId:n==null?void 0:n.threadId}})}clearComment(){var s;const t=this._injector,e=(s=this.getComment())==null?void 0:s.getCommentData(),n=t.get(o.ICommandService),r=this._workbook.getUnitId(),d=this._worksheet.getSheetId();return e?n.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:r,subUnitId:d,threadId:e.threadId,commentId:e.id}):Promise.resolve(!0)}}a.FRange.extend(T);class S extends a.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}onThreadCommentChange(t){return o.toDisposable(this._threadCommentModel.commentUpdate$.pipe(l.filter(e=>e.unitId===this._workbook.getUnitId())).subscribe(t))}onBeforeAddThreadComment(t){return o.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===i.AddCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeAddThreadComment")}}))}onBeforeUpdateThreadComment(t){return o.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===i.UpdateCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment")}}))}onBeforeDeleteThreadComment(t){return o.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===i.DeleteCommentCommand.id||e.id===i.DeleteCommentTreeCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment")}}))}}a.FWorkbook.extend(S);class U extends a.FWorksheet{getComments(){return this._injector.get(c.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(n=>this._injector.createInstance(exports.FThreadComment,n))}}a.FWorksheet.extend(U);
+"use strict";Object.defineProperty(exports,Symbol.toStringTag,{value:"Module"});const r=require("@univerjs/core"),c=require("@univerjs/sheets-thread-comment"),a=require("@univerjs/sheets/facade"),i=require("@univerjs/thread-comment"),g=require("@univerjs/engine-formula"),l=require("rxjs");var p=Object.defineProperty,b=Object.getOwnPropertyDescriptor,f=(m,t,e,n)=>{for(var o=n>1?void 0:n?b(t,e):t,d=m.length-1,s;d>=0;d--)(s=m[d])&&(o=(n?s(t,e,o):s(o))||o);return n&&o&&p(t,e,o),o},h=(m,t)=>(e,n)=>t(e,n,m);exports.FThreadComment=class{constructor(t,e,n,o,d,s){this._thread=t,this._parent=e,this._injector=n,this._commandService=o,this._univerInstanceService=d,this._threadCommentModel=s}_getRef(){var n;const t=((n=this._parent)==null?void 0:n.ref)||this._thread.ref;return g.deserializeRangeWithSheet(t).range}getIsRoot(){return!this._parent}getCommentData(){const{children:t,...e}=this._thread;return e}getReplies(){var n;const t=this._getRef(),e=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return(n=e==null?void 0:e.children)==null?void 0:n.map(o=>this._injector.createInstance(exports.FThreadComment,o))}getRange(){const t=this._univerInstanceService.getUnit(this._thread.unitId,r.UniverInstanceType.UNIVER_SHEET);if(!t)return null;const e=t.getSheetBySheetId(this._thread.subUnitId);if(!e)return null;const n=this._getRef();return this._injector.createInstance(a.FRange,t,e,n)}getContent(){return this._thread.text}delete(){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 update(t){const e=i.getDT();return await this._commandService.executeCommand(i.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:t,updated:!0,updateT:e}})}resolve(t){return this._commandService.executeCommand(i.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:t!=null?t:!this._thread.resolved})}};exports.FThreadComment=f([h(2,r.Inject(r.Injector)),h(3,r.ICommandService),h(4,r.IUniverInstanceService),h(5,r.Inject(c.SheetsThreadCommentModel))],exports.FThreadComment);class S extends a.FRange{getComment(){const e=this._injector.get(c.SheetsThreadCommentModel),n=this._workbook.getUnitId(),o=this._worksheet.getSheetId(),d=e.getByLocation(n,o,this._range.startRow,this._range.startColumn);if(!d)return null;const s=e.getComment(n,o,d);return s?this._injector.createInstance(exports.FThreadComment,s):null}addComment(t){var C;const e=this._injector,n=(C=this.getComment())==null?void 0:C.getCommentData(),o=e.get(r.ICommandService),d=e.get(r.UserManagerService),s=this._workbook.getUnitId(),u=this._worksheet.getSheetId(),_=`${r.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,I=d.getCurrentUser();return o.executeCommand(i.AddCommentCommand.id,{unitId:s,subUnitId:u,comment:{text:t,attachments:[],dT:i.getDT(),id:r.Tools.generateRandomId(),ref:_,personId:I.userID,parentId:n==null?void 0:n.id,unitId:s,subUnitId:u,threadId:n==null?void 0:n.threadId}})}clearComment(){var s;const t=this._injector,e=(s=this.getComment())==null?void 0:s.getCommentData(),n=t.get(r.ICommandService),o=this._workbook.getUnitId(),d=this._worksheet.getSheetId();return e?n.executeCommand(i.DeleteCommentTreeCommand.id,{unitId:o,subUnitId:d,threadId:e.threadId,commentId:e.id}):Promise.resolve(!0)}}a.FRange.extend(S);class T extends a.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(i.ThreadCommentModel)}})}onThreadCommentChange(t){return r.toDisposable(this._threadCommentModel.commentUpdate$.pipe(l.filter(e=>e.unitId===this._workbook.getUnitId())).subscribe(t))}onBeforeAddThreadComment(t){return r.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const o=e.params;if(e.id===i.AddCommentCommand.id){if(o.unitId!==this._workbook.getUnitId())return;if(t(o,n)===!1)throw new Error("Command is stopped by the hook onBeforeAddThreadComment")}}))}onBeforeUpdateThreadComment(t){return r.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const o=e.params;if(e.id===i.UpdateCommentCommand.id){if(o.unitId!==this._workbook.getUnitId())return;if(t(o,n)===!1)throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment")}}))}onBeforeDeleteThreadComment(t){return r.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const o=e.params;if(e.id===i.DeleteCommentCommand.id||e.id===i.DeleteCommentTreeCommand.id){if(o.unitId!==this._workbook.getUnitId())return;if(t(o,n)===!1)throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment")}}))}}a.FWorkbook.extend(T);class v extends a.FWorksheet{getComments(){return this._injector.get(c.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(n=>this._injector.createInstance(exports.FThreadComment,n))}onCommented(t){return this._injector.get(r.ICommandService).onCommandExecuted(n=>{if(n.id===i.AddCommentCommand.id){const o=n.params;t(o)}})}}a.FWorksheet.extend(v);

package/lib/es/facade.js

@@ -1,22 +1,22 @@
-import { Inject as g, Injector as x, UniverInstanceType as T, ICommandService as h, IUniverInstanceService as j, UserManagerService as R, Tools as l, toDisposable as m } from "@univerjs/core";
-import { FRange as c, FWorkbook as p, FWorksheet as f } from "@univerjs/sheets/facade";
-import { SheetsThreadCommentModel as u } from "@univerjs/sheets-thread-comment";
-import { DeleteCommentTreeCommand as _, DeleteCommentCommand as b, getDT as U, UpdateCommentCommand as k, ResolveCommentCommand as M, AddCommentCommand as v, ThreadCommentModel as D } from "@univerjs/thread-comment";
-import { deserializeRangeWithSheet as y } from "@univerjs/engine-formula";
-import { filter as B } from "rxjs";
-var E = Object.defineProperty, F = Object.getOwnPropertyDescriptor, P = (r, t, e, n) => {
-  for (var o = n > 1 ? void 0 : n ? F(t, e) : t, i = r.length - 1, s; i >= 0; i--)
-    (s = r[i]) && (o = (n ? s(t, e, o) : s(o)) || o);
-  return n && o && E(t, e, o), o;
-}, a = (r, t) => (e, n) => t(e, n, r);
+import { Inject as l, Injector as x, UniverInstanceType as T, ICommandService as h, IUniverInstanceService as j, UserManagerService as R, Tools as p, toDisposable as m } from "@univerjs/core";
+import { SheetsThreadCommentModel as c } from "@univerjs/sheets-thread-comment";
+import { FRange as u, FWorkbook as f, FWorksheet as b } from "@univerjs/sheets/facade";
+import { DeleteCommentTreeCommand as _, DeleteCommentCommand as U, getDT as v, UpdateCommentCommand as S, ResolveCommentCommand as M, AddCommentCommand as I, ThreadCommentModel as D } from "@univerjs/thread-comment";
+import { deserializeRangeWithSheet as E } from "@univerjs/engine-formula";
+import { filter as y } from "rxjs";
+var B = Object.defineProperty, F = Object.getOwnPropertyDescriptor, P = (o, t, e, n) => {
+  for (var r = n > 1 ? void 0 : n ? F(t, e) : t, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = (n ? s(t, e, r) : s(r)) || r);
+  return n && r && B(t, e, r), r;
+}, a = (o, t) => (e, n) => t(e, n, o);
 let d = class {
-  constructor(r, t, e, n, o, i) {
-    this._thread = r, this._parent = t, this._injector = e, this._commandService = n, this._univerInstanceService = o, this._threadCommentModel = i;
+  constructor(o, t, e, n, r, i) {
+    this._thread = o, this._parent = t, this._injector = e, this._commandService = n, this._univerInstanceService = r, this._threadCommentModel = i;
   }
   _getRef() {
     var e;
-    const r = ((e = this._parent) == null ? void 0 : e.ref) || this._thread.ref;
-    return y(r).range;
+    const o = ((e = this._parent) == null ? void 0 : e.ref) || this._thread.ref;
+    return E(o).range;
   }
   /**
    * Whether the comment is a root comment
@@ -30,7 +30,7 @@ let d = class {
    * @returns The comment data
    */
   getCommentData() {
-    const { children: r, ...t } = this._thread;
+    const { children: o, ...t } = this._thread;
     return t;
   }
   /**
@@ -39,7 +39,7 @@ let d = class {
    */
   getReplies() {
     var e;
-    const r = this._getRef(), t = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, r.startRow, r.startColumn);
+    const o = this._getRef(), t = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, o.startRow, o.startColumn);
     return (e = t == null ? void 0 : t.children) == null ? void 0 : e.map((n) => this._injector.createInstance(d, n));
   }
   /**
@@ -47,14 +47,14 @@ let d = class {
    * @returns The range of the comment
    */
   getRange() {
-    const r = this._univerInstanceService.getUnit(this._thread.unitId, T.UNIVER_SHEET);
-    if (!r)
+    const o = this._univerInstanceService.getUnit(this._thread.unitId, T.UNIVER_SHEET);
+    if (!o)
       return null;
-    const t = r.getSheetBySheetId(this._thread.subUnitId);
+    const t = o.getSheetBySheetId(this._thread.subUnitId);
     if (!t)
       return null;
     const e = this._getRef();
-    return this._injector.createInstance(c, r, t, e);
+    return this._injector.createInstance(u, o, t, e);
   }
   /**
    * Get the content of the comment
@@ -69,7 +69,7 @@ let d = class {
    */
   delete() {
     return this._commandService.executeCommand(
-      this.getIsRoot() ? _.id : b.id,
+      this.getIsRoot() ? _.id : U.id,
       {
         commentId: this._thread.id,
         unitId: this._thread.unitId,
@@ -82,16 +82,16 @@ let d = class {
    * @param content The new content of the comment
    * @returns success or not
    */
-  async update(r) {
-    const t = U();
+  async update(o) {
+    const t = v();
     return await this._commandService.executeCommand(
-      k.id,
+      S.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         payload: {
           commentId: this._thread.id,
-          text: r,
+          text: o,
           updated: !0,
           updateT: t
         }
@@ -103,65 +103,65 @@ let d = class {
    * @param resolved Whether the comment is resolved
    * @returns success or not
    */
-  resolve(r) {
+  resolve(o) {
     return this._commandService.executeCommand(
       M.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         commentId: this._thread.id,
-        resolved: r != null ? r : !this._thread.resolved
+        resolved: o != null ? o : !this._thread.resolved
       }
     );
   }
 };
 d = P([
-  a(2, g(x)),
+  a(2, l(x)),
   a(3, h),
   a(4, j),
-  a(5, g(u))
+  a(5, l(c))
 ], d);
-class A extends c {
+class A extends u {
   getComment() {
-    const e = this._injector.get(u), n = this._workbook.getUnitId(), o = this._worksheet.getSheetId(), i = e.getByLocation(n, o, this._range.startRow, this._range.startColumn);
+    const e = this._injector.get(c), n = this._workbook.getUnitId(), r = this._worksheet.getSheetId(), i = e.getByLocation(n, r, this._range.startRow, this._range.startColumn);
     if (!i)
       return null;
-    const s = e.getComment(n, o, i);
+    const s = e.getComment(n, r, i);
     return s ? this._injector.createInstance(d, s) : null;
   }
   addComment(t) {
-    var C;
-    const e = this._injector, n = (C = this.getComment()) == null ? void 0 : C.getCommentData(), o = e.get(h), i = e.get(R), s = this._workbook.getUnitId(), I = this._worksheet.getSheetId(), w = `${l.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, S = i.getCurrentUser();
-    return o.executeCommand(v.id, {
+    var g;
+    const e = this._injector, n = (g = this.getComment()) == null ? void 0 : g.getCommentData(), r = e.get(h), i = e.get(R), s = this._workbook.getUnitId(), C = this._worksheet.getSheetId(), k = `${p.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, w = i.getCurrentUser();
+    return r.executeCommand(I.id, {
       unitId: s,
-      subUnitId: I,
+      subUnitId: C,
       comment: {
         text: t,
         attachments: [],
-        dT: U(),
-        id: l.generateRandomId(),
-        ref: w,
-        personId: S.userID,
+        dT: v(),
+        id: p.generateRandomId(),
+        ref: k,
+        personId: w.userID,
         parentId: n == null ? void 0 : n.id,
         unitId: s,
-        subUnitId: I,
+        subUnitId: C,
         threadId: n == null ? void 0 : n.threadId
       }
     });
   }
   clearComment() {
     var s;
-    const t = this._injector, e = (s = this.getComment()) == null ? void 0 : s.getCommentData(), n = t.get(h), o = this._workbook.getUnitId(), i = this._worksheet.getSheetId();
+    const t = this._injector, e = (s = this.getComment()) == null ? void 0 : s.getCommentData(), n = t.get(h), r = this._workbook.getUnitId(), i = this._worksheet.getSheetId();
     return e ? n.executeCommand(_.id, {
-      unitId: o,
+      unitId: r,
       subUnitId: i,
       threadId: e.threadId,
       commentId: e.id
     }) : Promise.resolve(!0);
   }
 }
-c.extend(A);
-class W extends p {
+u.extend(A);
+class W extends f {
   _initialize() {
     Object.defineProperty(this, "_threadCommentModel", {
       get() {
@@ -170,49 +170,61 @@ class W extends p {
     });
   }
   onThreadCommentChange(t) {
-    return m(this._threadCommentModel.commentUpdate$.pipe(B((e) => e.unitId === this._workbook.getUnitId())).subscribe(t));
+    return m(this._threadCommentModel.commentUpdate$.pipe(y((e) => e.unitId === this._workbook.getUnitId())).subscribe(t));
   }
   onBeforeAddThreadComment(t) {
     return m(this._commandService.beforeCommandExecuted((e, n) => {
-      const o = e.params;
-      if (e.id === v.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+      const r = e.params;
+      if (e.id === I.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(o, n) === !1)
+        if (t(r, n) === !1)
           throw new Error("Command is stopped by the hook onBeforeAddThreadComment");
       }
     }));
   }
   onBeforeUpdateThreadComment(t) {
     return m(this._commandService.beforeCommandExecuted((e, n) => {
-      const o = e.params;
-      if (e.id === k.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+      const r = e.params;
+      if (e.id === S.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(o, n) === !1)
+        if (t(r, n) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment");
       }
     }));
   }
   onBeforeDeleteThreadComment(t) {
     return m(this._commandService.beforeCommandExecuted((e, n) => {
-      const o = e.params;
-      if (e.id === b.id || e.id === _.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+      const r = e.params;
+      if (e.id === U.id || e.id === _.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (t(o, n) === !1)
+        if (t(r, n) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment");
       }
     }));
   }
 }
-p.extend(W);
-class O extends f {
+f.extend(W);
+class O extends b {
   getComments() {
-    return this._injector.get(u).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((n) => this._injector.createInstance(d, n));
+    return this._injector.get(c).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((n) => this._injector.createInstance(d, n));
+  }
+  /**
+   * Subscribe to comment events.
+   * @param callback Callback function, param contains comment info and target cell.
+   */
+  onCommented(t) {
+    return this._injector.get(h).onCommandExecuted((n) => {
+      if (n.id === I.id) {
+        const r = n.params;
+        t(r);
+      }
+    });
   }
 }
-f.extend(O);
+b.extend(O);
 export {
   d as FThreadComment
 };

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

@@ -1,3 +1,5 @@
+import { IDisposable } from '@univerjs/core';
+import { IAddCommentCommandParams } from '@univerjs/thread-comment';
 import { FWorksheet } from '@univerjs/sheets/facade';
 import { FThreadComment } from './f-thread-comment';
 export interface IFWorksheetCommentMixin {
@@ -9,6 +11,11 @@ export interface IFWorksheetCommentMixin {
 }
 export declare class FWorksheetCommentMixin extends FWorksheet implements IFWorksheetCommentMixin {
     getComments(): FThreadComment[];
+    /**
+     * Subscribe to comment events.
+     * @param callback Callback function, param contains comment info and target cell.
+     */
+    onCommented(callback: (params: IAddCommentCommandParams) => void): IDisposable;
 }
 declare module '@univerjs/sheets/facade' {
     interface FWorksheet extends IFWorksheetCommentMixin {

package/lib/types/models/sheets-thread-comment.model.d.ts

@@ -24,7 +24,7 @@ export declare class SheetsThreadCommentModel extends Disposable {
     getByLocation(unitId: string, subUnitId: string, row: number, column: number): string | undefined;
     getAllByLocation(unitId: string, subUnitId: string, row: number, column: number): IThreadComment[];
     getComment(unitId: string, subUnitId: string, commentId: string): IThreadComment | undefined;
-    getCommentWithChildren(unitId: string, subUnitId: string, row: number, column: number): import('@univerjs/core').Nullable<import('@univerjs/thread-comment/models/thread-comment.model.js').IThreadInfo>;
+    getCommentWithChildren(unitId: string, subUnitId: string, row: number, column: number): import('@univerjs/core').Nullable<import('@univerjs/thread-comment').IThreadInfo>;
     showCommentMarker(unitId: string, subUnitId: string, row: number, column: number): boolean;
     getSubUnitAll(unitId: string, subUnitId: string): IThreadComment[];
 }

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(o,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("@univerjs/core"),require("@univerjs/sheets/facade"),require("@univerjs/sheets-thread-comment"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/sheets/facade","@univerjs/sheets-thread-comment","@univerjs/thread-comment","@univerjs/engine-formula","rxjs"],i):(o=typeof globalThis<"u"?globalThis:o||self,i(o.UniverSheetsThreadCommentFacade={},o.UniverCore,o.UniverSheetsFacade,o.UniverSheetsThreadComment,o.UniverThreadComment,o.UniverEngineFormula,o.rxjs))})(this,function(o,i,h,u,d,I,g){"use strict";var l=Object.defineProperty,f=Object.getOwnPropertyDescriptor,v=(a,t,e,n)=>{for(var r=n>1?void 0:n?f(t,e):t,m=a.length-1,s;m>=0;m--)(s=a[m])&&(r=(n?s(t,e,r):s(r))||r);return n&&r&&l(t,e,r),r},c=(a,t)=>(e,n)=>t(e,n,a);o.FThreadComment=class{constructor(t,e,n,r,m,s){this._thread=t,this._parent=e,this._injector=n,this._commandService=r,this._univerInstanceService=m,this._threadCommentModel=s}_getRef(){var n;const t=((n=this._parent)==null?void 0:n.ref)||this._thread.ref;return I.deserializeRangeWithSheet(t).range}getIsRoot(){return!this._parent}getCommentData(){const{children:t,...e}=this._thread;return e}getReplies(){var n;const t=this._getRef(),e=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return(n=e==null?void 0:e.children)==null?void 0:n.map(r=>this._injector.createInstance(o.FThreadComment,r))}getRange(){const t=this._univerInstanceService.getUnit(this._thread.unitId,i.UniverInstanceType.UNIVER_SHEET);if(!t)return null;const e=t.getSheetBySheetId(this._thread.subUnitId);if(!e)return null;const n=this._getRef();return this._injector.createInstance(h.FRange,t,e,n)}getContent(){return this._thread.text}delete(){return this._commandService.executeCommand(this.getIsRoot()?d.DeleteCommentTreeCommand.id:d.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}async update(t){const e=d.getDT();return await this._commandService.executeCommand(d.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:t,updated:!0,updateT:e}})}resolve(t){return this._commandService.executeCommand(d.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:t!=null?t:!this._thread.resolved})}},o.FThreadComment=v([c(2,i.Inject(i.Injector)),c(3,i.ICommandService),c(4,i.IUniverInstanceService),c(5,i.Inject(u.SheetsThreadCommentModel))],o.FThreadComment);class p extends h.FRange{getComment(){const e=this._injector.get(u.SheetsThreadCommentModel),n=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),m=e.getByLocation(n,r,this._range.startRow,this._range.startColumn);if(!m)return null;const s=e.getComment(n,r,m);return s?this._injector.createInstance(o.FThreadComment,s):null}addComment(t){var C;const e=this._injector,n=(C=this.getComment())==null?void 0:C.getCommentData(),r=e.get(i.ICommandService),m=e.get(i.UserManagerService),s=this._workbook.getUnitId(),_=this._worksheet.getSheetId(),b=`${i.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,j=m.getCurrentUser();return r.executeCommand(d.AddCommentCommand.id,{unitId:s,subUnitId:_,comment:{text:t,attachments:[],dT:d.getDT(),id:i.Tools.generateRandomId(),ref:b,personId:j.userID,parentId:n==null?void 0:n.id,unitId:s,subUnitId:_,threadId:n==null?void 0:n.threadId}})}clearComment(){var s;const t=this._injector,e=(s=this.getComment())==null?void 0:s.getCommentData(),n=t.get(i.ICommandService),r=this._workbook.getUnitId(),m=this._worksheet.getSheetId();return e?n.executeCommand(d.DeleteCommentTreeCommand.id,{unitId:r,subUnitId:m,threadId:e.threadId,commentId:e.id}):Promise.resolve(!0)}}h.FRange.extend(p);class U extends h.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(d.ThreadCommentModel)}})}onThreadCommentChange(t){return i.toDisposable(this._threadCommentModel.commentUpdate$.pipe(g.filter(e=>e.unitId===this._workbook.getUnitId())).subscribe(t))}onBeforeAddThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===d.AddCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeAddThreadComment")}}))}onBeforeUpdateThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===d.UpdateCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment")}}))}onBeforeDeleteThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===d.DeleteCommentCommand.id||e.id===d.DeleteCommentTreeCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment")}}))}}h.FWorkbook.extend(U);class T extends h.FWorksheet{getComments(){return this._injector.get(u.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(n=>this._injector.createInstance(o.FThreadComment,n))}}h.FWorksheet.extend(T),Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});
+(function(o,i){typeof exports=="object"&&typeof module<"u"?i(exports,require("@univerjs/core"),require("@univerjs/sheets-thread-comment"),require("@univerjs/sheets/facade"),require("@univerjs/thread-comment"),require("@univerjs/engine-formula"),require("rxjs")):typeof define=="function"&&define.amd?define(["exports","@univerjs/core","@univerjs/sheets-thread-comment","@univerjs/sheets/facade","@univerjs/thread-comment","@univerjs/engine-formula","rxjs"],i):(o=typeof globalThis<"u"?globalThis:o||self,i(o.UniverSheetsThreadCommentFacade={},o.UniverCore,o.UniverSheetsThreadComment,o.UniverSheetsFacade,o.UniverThreadComment,o.UniverEngineFormula,o.rxjs))})(this,function(o,i,u,h,s,I,g){"use strict";var l=Object.defineProperty,v=Object.getOwnPropertyDescriptor,f=(a,t,e,n)=>{for(var r=n>1?void 0:n?v(t,e):t,m=a.length-1,d;m>=0;m--)(d=a[m])&&(r=(n?d(t,e,r):d(r))||r);return n&&r&&l(t,e,r),r},c=(a,t)=>(e,n)=>t(e,n,a);o.FThreadComment=class{constructor(t,e,n,r,m,d){this._thread=t,this._parent=e,this._injector=n,this._commandService=r,this._univerInstanceService=m,this._threadCommentModel=d}_getRef(){var n;const t=((n=this._parent)==null?void 0:n.ref)||this._thread.ref;return I.deserializeRangeWithSheet(t).range}getIsRoot(){return!this._parent}getCommentData(){const{children:t,...e}=this._thread;return e}getReplies(){var n;const t=this._getRef(),e=this._threadCommentModel.getCommentWithChildren(this._thread.unitId,this._thread.subUnitId,t.startRow,t.startColumn);return(n=e==null?void 0:e.children)==null?void 0:n.map(r=>this._injector.createInstance(o.FThreadComment,r))}getRange(){const t=this._univerInstanceService.getUnit(this._thread.unitId,i.UniverInstanceType.UNIVER_SHEET);if(!t)return null;const e=t.getSheetBySheetId(this._thread.subUnitId);if(!e)return null;const n=this._getRef();return this._injector.createInstance(h.FRange,t,e,n)}getContent(){return this._thread.text}delete(){return this._commandService.executeCommand(this.getIsRoot()?s.DeleteCommentTreeCommand.id:s.DeleteCommentCommand.id,{commentId:this._thread.id,unitId:this._thread.unitId,subUnitId:this._thread.subUnitId})}async update(t){const e=s.getDT();return await this._commandService.executeCommand(s.UpdateCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,payload:{commentId:this._thread.id,text:t,updated:!0,updateT:e}})}resolve(t){return this._commandService.executeCommand(s.ResolveCommentCommand.id,{unitId:this._thread.unitId,subUnitId:this._thread.subUnitId,commentId:this._thread.id,resolved:t!=null?t:!this._thread.resolved})}},o.FThreadComment=f([c(2,i.Inject(i.Injector)),c(3,i.ICommandService),c(4,i.IUniverInstanceService),c(5,i.Inject(u.SheetsThreadCommentModel))],o.FThreadComment);class p extends h.FRange{getComment(){const e=this._injector.get(u.SheetsThreadCommentModel),n=this._workbook.getUnitId(),r=this._worksheet.getSheetId(),m=e.getByLocation(n,r,this._range.startRow,this._range.startColumn);if(!m)return null;const d=e.getComment(n,r,m);return d?this._injector.createInstance(o.FThreadComment,d):null}addComment(t){var _;const e=this._injector,n=(_=this.getComment())==null?void 0:_.getCommentData(),r=e.get(i.ICommandService),m=e.get(i.UserManagerService),d=this._workbook.getUnitId(),C=this._worksheet.getSheetId(),T=`${i.Tools.chatAtABC(this._range.startColumn)}${this._range.startRow+1}`,b=m.getCurrentUser();return r.executeCommand(s.AddCommentCommand.id,{unitId:d,subUnitId:C,comment:{text:t,attachments:[],dT:s.getDT(),id:i.Tools.generateRandomId(),ref:T,personId:b.userID,parentId:n==null?void 0:n.id,unitId:d,subUnitId:C,threadId:n==null?void 0:n.threadId}})}clearComment(){var d;const t=this._injector,e=(d=this.getComment())==null?void 0:d.getCommentData(),n=t.get(i.ICommandService),r=this._workbook.getUnitId(),m=this._worksheet.getSheetId();return e?n.executeCommand(s.DeleteCommentTreeCommand.id,{unitId:r,subUnitId:m,threadId:e.threadId,commentId:e.id}):Promise.resolve(!0)}}h.FRange.extend(p);class S extends h.FWorkbook{_initialize(){Object.defineProperty(this,"_threadCommentModel",{get(){return this._injector.get(s.ThreadCommentModel)}})}onThreadCommentChange(t){return i.toDisposable(this._threadCommentModel.commentUpdate$.pipe(g.filter(e=>e.unitId===this._workbook.getUnitId())).subscribe(t))}onBeforeAddThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===s.AddCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeAddThreadComment")}}))}onBeforeUpdateThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===s.UpdateCommentCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment")}}))}onBeforeDeleteThreadComment(t){return i.toDisposable(this._commandService.beforeCommandExecuted((e,n)=>{const r=e.params;if(e.id===s.DeleteCommentCommand.id||e.id===s.DeleteCommentTreeCommand.id){if(r.unitId!==this._workbook.getUnitId())return;if(t(r,n)===!1)throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment")}}))}}h.FWorkbook.extend(S);class U extends h.FWorksheet{getComments(){return this._injector.get(u.SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(),this._worksheet.getSheetId()).map(n=>this._injector.createInstance(o.FThreadComment,n))}onCommented(t){return this._injector.get(i.ICommandService).onCommandExecuted(n=>{if(n.id===s.AddCommentCommand.id){const r=n.params;t(r)}})}}h.FWorksheet.extend(U),Object.defineProperty(o,Symbol.toStringTag,{value:"Module"})});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-thread-comment",
-  "version": "0.5.1",
+  "version": "0.5.2",
   "private": false,
   "description": "Univer sheets thread comment base plugin",
   "author": "DreamNum <developer@univer.ai>",
@@ -51,17 +51,17 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "0.5.1",
-    "@univerjs/engine-formula": "0.5.1",
-    "@univerjs/thread-comment": "0.5.1",
-    "@univerjs/sheets": "0.5.1"
+    "@univerjs/core": "0.5.2",
+    "@univerjs/sheets": "0.5.2",
+    "@univerjs/thread-comment": "0.5.2",
+    "@univerjs/engine-formula": "0.5.2"
   },
   "devDependencies": {
     "rxjs": "^7.8.1",
     "typescript": "^5.7.2",
-    "vite": "^6.0.1",
-    "vitest": "^2.1.6",
-    "@univerjs-infra/shared": "0.5.1"
+    "vite": "^6.0.3",
+    "vitest": "^2.1.8",
+    "@univerjs-infra/shared": "0.5.2"
   },
   "space": {
     ".": {