@univerjs/sheets-thread-comment 0.15.2-insiders.20260124-12fc7f0 → 0.15.3-insiders.20260131-b9b8805

package/lib/es/facade.js

@@ -1,27 +1,27 @@
-var L = Object.defineProperty;
-var N = (i, e, r) => e in i ? L(i, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : i[e] = r;
-var M = (i, e, r) => N(i, typeof e != "symbol" ? e + "" : e, r);
-import { Inject as T, Injector as V, ICommandService as p, IUniverInstanceService as q, UserManagerService as W, UniverInstanceType as G, RichTextValue as k, generateRandomId as R, RichTextBuilder as J, Tools as F, Range as K, toDisposable as S, CanceledError as E } from "@univerjs/core";
-import { SheetsThreadCommentModel as b } from "@univerjs/sheets-thread-comment";
-import { FRange as j, FWorkbook as H, FWorksheet as O } from "@univerjs/sheets/facade";
-import { DeleteCommentTreeCommand as w, DeleteCommentCommand as y, getDT as B, UpdateCommentCommand as x, ResolveCommentCommand as D, AddCommentCommand as f, ThreadCommentModel as Q } from "@univerjs/thread-comment";
-import { deserializeRangeWithSheet as X } from "@univerjs/engine-formula";
-import { filter as Y } from "rxjs";
-import { FEventName as z, FUniver as $ } from "@univerjs/core/facade";
-var Z = Object.getOwnPropertyDescriptor, ee = (i, e, r, t) => {
-  for (var n = t > 1 ? void 0 : t ? Z(e, r) : e, o = i.length - 1, s; o >= 0; o--)
-    (s = i[o]) && (n = s(n) || n);
-  return n;
-}, _ = (i, e) => (r, t) => e(r, t, i);
-class A {
+var z = Object.defineProperty;
+var $ = (o, e, n) => e in o ? z(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
+var D = (o, e, n) => $(o, typeof e != "symbol" ? e + "" : e, n);
+import { Inject as B, Injector as L, UserManagerService as M, UniverInstanceType as N, RichTextValue as p, generateRandomId as E, RichTextBuilder as V, Tools as j, ICommandService as f, IUniverInstanceService as q, Range as G, toDisposable as b, CanceledError as U } from "@univerjs/core";
+import { SheetsThreadCommentModel as v } from "@univerjs/sheets-thread-comment";
+import { FRange as A, FWorkbook as W, FWorksheet as P } from "@univerjs/sheets/facade";
+import { DeleteCommentTreeCommand as w, DeleteCommentCommand as R, getDT as x, UpdateCommentCommand as y, ResolveCommentCommand as T, AddCommentCommand as _, ThreadCommentModel as J } from "@univerjs/thread-comment";
+import { deserializeRangeWithSheet as F } from "@univerjs/engine-formula";
+import { filter as K } from "rxjs";
+import { FEventName as H, FUniver as O } from "@univerjs/core/facade";
+var Q = Object.getOwnPropertyDescriptor, X = (o, e, n, t) => {
+  for (var r = t > 1 ? void 0 : t ? Q(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (r = s(r) || r);
+  return r;
+}, I = (o, e) => (n, t) => e(n, t, o);
+class S {
   constructor(e) {
-    M(this, "_comment", {
-      id: R(),
+    D(this, "_comment", {
+      id: E(),
       ref: "",
       threadId: "",
       dT: "",
       personId: "",
-      text: J.newEmptyData().body,
+      text: V.newEmptyData().body,
       attachments: [],
       unitId: "",
       subUnitId: ""
@@ -39,7 +39,7 @@ class A {
    * ```
    */
   static create(e) {
-    return new A(e);
+    return new S(e);
   }
   /**
    * Get the person id of the comment
@@ -75,7 +75,7 @@ class A {
    * ```
    */
   get content() {
-    return k.createByBody(this._comment.text);
+    return p.createByBody(this._comment.text);
   }
   /**
    * Get the id of the comment
@@ -112,12 +112,12 @@ class A {
    * ```
    */
   copy() {
-    return U.create(F.deepClone(this._comment));
+    return k.create(j.deepClone(this._comment));
   }
 }
-class U extends A {
+class k extends S {
   static create(e) {
-    return new U(e);
+    return new k(e);
   }
   /**
    * Set the content of the comment
@@ -140,7 +140,7 @@ class U extends A {
    * ```
    */
   setContent(e) {
-    return e instanceof k ? this._comment.text = e.getData().body : this._comment.text = e, this;
+    return e instanceof p ? this._comment.text = e.getData().body : this._comment.text = e, this;
   }
   /**
    * Set the person id of the comment
@@ -188,7 +188,7 @@ class U extends A {
    * ```
    */
   setDateTime(e) {
-    return this._comment.dT = B(e), this;
+    return this._comment.dT = x(e), this;
   }
   /**
    * Set the id of the comment
@@ -258,17 +258,17 @@ class U extends A {
     return this._comment;
   }
 }
-let I = class {
+let l = class {
   /**
    * @ignore
    */
-  constructor(i, e, r, t, n, o, s) {
-    this._thread = i, this._parent = e, this._injector = r, this._commandService = t, this._univerInstanceService = n, this._threadCommentModel = o, this._userManagerService = s;
+  constructor(o, e, n, t, r, i, s) {
+    this._thread = o, this._parent = e, this._injector = n, this._commandService = t, this._univerInstanceService = r, this._threadCommentModel = i, this._userManagerService = s;
   }
   _getRef() {
-    var r;
-    const i = ((r = this._parent) == null ? void 0 : r.ref) || this._thread.ref;
-    return X(i).range;
+    var n;
+    const o = ((n = this._parent) == null ? void 0 : n.ref) || this._thread.ref;
+    return F(o).range;
   }
   /**
    * Whether the comment is a root comment
@@ -300,7 +300,7 @@ let I = class {
    * ```
    */
   getCommentData() {
-    const { children: i, ...e } = this._thread;
+    const { children: o, ...e } = this._thread;
     return e;
   }
   /**
@@ -322,9 +322,9 @@ let I = class {
    * ```
    */
   getReplies() {
-    var r;
-    const i = this._getRef(), e = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, i.startRow, i.startColumn);
-    return (r = e == null ? void 0 : e.children) == null ? void 0 : r.map((t) => this._injector.createInstance(I, t));
+    var n;
+    const o = this._getRef(), e = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, o.startRow, o.startColumn);
+    return (n = e == null ? void 0 : e.children) == null ? void 0 : n.map((t) => this._injector.createInstance(l, t));
   }
   /**
    * Get the range of the comment
@@ -340,14 +340,14 @@ let I = class {
    * ```
    */
   getRange() {
-    const i = this._univerInstanceService.getUnit(this._thread.unitId, G.UNIVER_SHEET);
-    if (!i)
+    const o = this._univerInstanceService.getUnit(this._thread.unitId, N.UNIVER_SHEET);
+    if (!o)
       return null;
-    const e = i.getSheetBySheetId(this._thread.subUnitId);
+    const e = o.getSheetBySheetId(this._thread.subUnitId);
     if (!e)
       return null;
-    const r = this._getRef();
-    return this._injector.createInstance(j, i, e, r);
+    const n = this._getRef();
+    return this._injector.createInstance(A, o, e, n);
   }
   // eslint-disable-next-line
   /**
@@ -370,8 +370,8 @@ let I = class {
    * ```
    */
   getRichText() {
-    const i = this._thread.text;
-    return k.create({ body: i, documentStyle: {}, id: "d" });
+    const o = this._thread.text;
+    return p.create({ body: o, documentStyle: {}, id: "d" });
   }
   /**
    * Delete the comment and it's replies
@@ -389,7 +389,7 @@ let I = class {
    */
   deleteAsync() {
     return this._commandService.executeCommand(
-      this.getIsRoot() ? w.id : y.id,
+      this.getIsRoot() ? w.id : R.id,
       {
         commentId: this._thread.id,
         unitId: this._thread.unitId,
@@ -408,8 +408,8 @@ let I = class {
   /**
    * @deprecated use `updateAsync` as instead
    */
-  async update(i) {
-    return this.updateAsync(i);
+  async update(o) {
+    return this.updateAsync(o);
   }
   /**
    * Update the comment content
@@ -437,10 +437,10 @@ let I = class {
    * }, 3000);
    * ```
    */
-  async updateAsync(i) {
-    const e = i instanceof k ? i.getData().body : i, r = B();
+  async updateAsync(o) {
+    const e = o instanceof p ? o.getData().body : o, n = x();
     return await this._commandService.executeCommand(
-      x.id,
+      y.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
@@ -448,7 +448,7 @@ let I = class {
           commentId: this._thread.id,
           text: e,
           updated: !0,
-          updateT: r
+          updateT: n
         }
       }
     );
@@ -457,8 +457,8 @@ let I = class {
   /**
    * @deprecated use `resolveAsync` as instead
    */
-  resolve(i) {
-    return this.resolveAsync(i);
+  resolve(o) {
+    return this.resolveAsync(o);
   }
   /**
    * Resolve the comment
@@ -485,14 +485,14 @@ let I = class {
    * }, 3000);
    * ```
    */
-  resolveAsync(i) {
+  resolveAsync(o) {
     return this._commandService.executeCommand(
-      D.id,
+      T.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         commentId: this._thread.id,
-        resolved: i != null ? i : !this._thread.resolved
+        resolved: o != null ? o : !this._thread.resolved
       }
     );
   }
@@ -521,88 +521,88 @@ let I = class {
    * console.log(result);
    * ```
    */
-  replyAsync(i) {
-    var r;
-    const e = i.build();
+  replyAsync(o) {
+    var n;
+    const e = o.build();
     return this._commandService.executeCommand(
-      f.id,
+      _.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         comment: {
-          id: R(),
+          id: E(),
           parentId: this._thread.id,
           threadId: this._thread.threadId,
-          ref: ((r = this._parent) == null ? void 0 : r.ref) || this._thread.ref,
+          ref: ((n = this._parent) == null ? void 0 : n.ref) || this._thread.ref,
           unitId: this._thread.unitId,
           subUnitId: this._thread.subUnitId,
           text: e.text,
           attachments: e.attachments,
-          dT: e.dT || B(),
+          dT: e.dT || x(),
           personId: e.personId || this._userManagerService.getCurrentUser().userID
         }
       }
     );
   }
 };
-I = ee([
-  _(2, T(V)),
-  _(3, p),
-  _(4, q),
-  _(5, T(b)),
-  _(6, T(W))
-], I);
-class te extends j {
+l = X([
+  I(2, B(L)),
+  I(3, f),
+  I(4, q),
+  I(5, B(v)),
+  I(6, B(M))
+], l);
+class Y extends A {
   getComment() {
-    const r = this._injector.get(b), t = this._workbook.getUnitId(), n = this._worksheet.getSheetId(), o = r.getByLocation(t, n, this._range.startRow, this._range.startColumn);
-    if (!o)
+    const n = this._injector.get(v), t = this._workbook.getUnitId(), r = this._worksheet.getSheetId(), i = n.getByLocation(t, r, this._range.startRow, this._range.startColumn);
+    if (!i)
       return null;
-    const s = r.getComment(t, n, o);
-    return s ? this._injector.createInstance(I, s) : null;
+    const s = n.getComment(t, r, i);
+    return s ? this._injector.createInstance(l, s) : null;
   }
   getComments() {
-    const r = this._injector.get(b), t = this._workbook.getUnitId(), n = this._worksheet.getSheetId(), o = [];
-    return K.foreach(this._range, (s, h) => {
-      const c = r.getByLocation(t, n, s, h);
-      if (c) {
-        const m = r.getComment(t, n, c);
-        m && o.push(this._injector.createInstance(I, m));
+    const n = this._injector.get(v), t = this._workbook.getUnitId(), r = this._worksheet.getSheetId(), i = [];
+    return G.foreach(this._range, (s, a) => {
+      const m = n.getByLocation(t, r, s, a);
+      if (m) {
+        const d = n.getComment(t, r, m);
+        d && i.push(this._injector.createInstance(l, d));
       }
-    }), o;
+    }), i;
   }
   addComment(e) {
-    var a;
-    const r = this._injector, t = (a = this.getComment()) == null ? void 0 : a.getCommentData(), n = r.get(p), o = r.get(W), s = this._workbook.getUnitId(), h = this._worksheet.getSheetId(), c = `${F.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, m = o.getCurrentUser(), d = e instanceof U ? e.build() : { text: e };
-    return n.executeCommand(f.id, {
+    var c;
+    const n = this._injector, t = (c = this.getComment()) == null ? void 0 : c.getCommentData(), r = n.get(f), i = n.get(M), s = this._workbook.getUnitId(), a = this._worksheet.getSheetId(), m = `${j.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, d = i.getCurrentUser(), h = e instanceof k ? e.build() : { text: e };
+    return r.executeCommand(_.id, {
       unitId: s,
-      subUnitId: h,
+      subUnitId: a,
       comment: {
-        text: d.text,
-        dT: d.dT || B(),
+        text: h.text,
+        dT: h.dT || x(),
         attachments: [],
-        id: d.id || R(),
-        ref: c,
-        personId: d.personId || m.userID,
+        id: h.id || E(),
+        ref: m,
+        personId: h.personId || d.userID,
         parentId: t == null ? void 0 : t.id,
         unitId: s,
-        subUnitId: h,
-        threadId: (t == null ? void 0 : t.threadId) || R()
+        subUnitId: a,
+        threadId: (t == null ? void 0 : t.threadId) || E()
       }
     });
   }
   clearComment() {
     var s;
-    const e = this._injector, r = (s = this.getComment()) == null ? void 0 : s.getCommentData(), t = e.get(p), n = this._workbook.getUnitId(), o = this._worksheet.getSheetId();
-    return r ? t.executeCommand(w.id, {
-      unitId: n,
-      subUnitId: o,
-      threadId: r.threadId,
-      commentId: r.id
+    const e = this._injector, n = (s = this.getComment()) == null ? void 0 : s.getCommentData(), t = e.get(f), r = this._workbook.getUnitId(), i = this._worksheet.getSheetId();
+    return n ? t.executeCommand(w.id, {
+      unitId: r,
+      subUnitId: i,
+      threadId: n.threadId,
+      commentId: n.id
     }) : Promise.resolve(!0);
   }
   clearComments() {
-    const r = this.getComments().map((t) => t.deleteAsync());
-    return Promise.all(r).then(() => !0);
+    const n = this.getComments().map((t) => t.deleteAsync());
+    return Promise.all(n).then(() => !0);
   }
   addCommentAsync(e) {
     return this.addComment(e);
@@ -614,43 +614,43 @@ class te extends j {
     return this.clearComments();
   }
 }
-j.extend(te);
-class ne extends H {
+A.extend(Y);
+class Z extends W {
   /**
    * @ignore
    */
   _initialize() {
     Object.defineProperty(this, "_threadCommentModel", {
       get() {
-        return this._injector.get(Q);
+        return this._injector.get(J);
       }
     });
   }
   getComments() {
-    return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map((e) => this._injector.createInstance(I, e.root));
+    return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map((e) => this._injector.createInstance(l, e.root));
   }
   clearComments() {
-    const r = this.getComments().map((t) => t.deleteAsync());
-    return Promise.all(r).then(() => !0);
+    const n = this.getComments().map((t) => t.deleteAsync());
+    return Promise.all(n).then(() => !0);
   }
   /**
    * @param callback
    * @deprecated
    */
   onThreadCommentChange(e) {
-    return S(this._threadCommentModel.commentUpdate$.pipe(Y((r) => r.unitId === this._workbook.getUnitId())).subscribe(e));
+    return b(this._threadCommentModel.commentUpdate$.pipe(K((n) => n.unitId === this._workbook.getUnitId())).subscribe(e));
   }
   /**
    * @param callback
    * @deprecated
    */
   onBeforeAddThreadComment(e) {
-    return S(this._commandService.beforeCommandExecuted((r, t) => {
-      const n = r.params;
-      if (r.id === f.id) {
-        if (n.unitId !== this._workbook.getUnitId())
+    return b(this._commandService.beforeCommandExecuted((n, t) => {
+      const r = n.params;
+      if (n.id === _.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(n, t) === !1)
+        if (e(r, t) === !1)
           throw new Error("Command is stopped by the hook onBeforeAddThreadComment");
       }
     }));
@@ -660,12 +660,12 @@ class ne extends H {
    * @deprecated
    */
   onBeforeUpdateThreadComment(e) {
-    return S(this._commandService.beforeCommandExecuted((r, t) => {
-      const n = r.params;
-      if (r.id === x.id) {
-        if (n.unitId !== this._workbook.getUnitId())
+    return b(this._commandService.beforeCommandExecuted((n, t) => {
+      const r = n.params;
+      if (n.id === y.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(n, t) === !1)
+        if (e(r, t) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment");
       }
     }));
@@ -675,46 +675,46 @@ class ne extends H {
    * @deprecated
    */
   onBeforeDeleteThreadComment(e) {
-    return S(this._commandService.beforeCommandExecuted((r, t) => {
-      const n = r.params;
-      if (r.id === y.id || r.id === w.id) {
-        if (n.unitId !== this._workbook.getUnitId())
+    return b(this._commandService.beforeCommandExecuted((n, t) => {
+      const r = n.params;
+      if (n.id === R.id || n.id === w.id) {
+        if (r.unitId !== this._workbook.getUnitId())
           return;
-        if (e(n, t) === !1)
+        if (e(r, t) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment");
       }
     }));
   }
 }
-H.extend(ne);
-class re extends O {
+W.extend(Z);
+class ee extends P {
   getComments() {
-    return this._injector.get(b).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => this._injector.createInstance(I, t));
+    return this._injector.get(v).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((t) => this._injector.createInstance(l, t));
   }
   clearComments() {
-    const r = this.getComments().map((t) => t.deleteAsync());
-    return Promise.all(r).then(() => !0);
+    const n = this.getComments().map((t) => t.deleteAsync());
+    return Promise.all(n).then(() => !0);
   }
   /**
    * Subscribe to comment events.
    * @param callback Callback function, param contains comment info and target cell.
    */
   onCommented(e) {
-    return this._injector.get(p).onCommandExecuted((t) => {
-      if (t.id === f.id) {
-        const n = t.params;
-        e(n);
+    return this._injector.get(f).onCommandExecuted((t) => {
+      if (t.id === _.id) {
+        const r = t.params;
+        e(r);
       }
     });
   }
   getCommentById(e) {
-    const t = this._injector.get(b).getComment(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
+    const t = this._injector.get(v).getComment(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
     if (t)
-      return this._injector.createInstance(I, t);
+      return this._injector.createInstance(l, t);
   }
 }
-O.extend(re);
-const l = {
+P.extend(ee);
+const C = {
   CommentAdded: "CommentAdded",
   BeforeCommentAdd: "BeforeCommentAdd",
   CommentUpdated: "CommentUpdated",
@@ -724,223 +724,213 @@ const l = {
   CommentResolved: "CommentResolved",
   BeforeCommentResolve: "BeforeCommentResolve"
 };
-class oe extends z {
+class te extends H {
   get CommentAdded() {
-    return l.CommentAdded;
+    return C.CommentAdded;
   }
   get BeforeCommentAdd() {
-    return l.BeforeCommentAdd;
+    return C.BeforeCommentAdd;
   }
   get CommentUpdated() {
-    return l.CommentUpdated;
+    return C.CommentUpdated;
   }
   get BeforeCommentUpdate() {
-    return l.BeforeCommentUpdate;
+    return C.BeforeCommentUpdate;
   }
   get CommentDeleted() {
-    return l.CommentDeleted;
+    return C.CommentDeleted;
   }
   get BeforeCommentDelete() {
-    return l.BeforeCommentDelete;
+    return C.BeforeCommentDelete;
   }
   get CommentResolved() {
-    return l.CommentResolved;
+    return C.CommentResolved;
   }
   get BeforeCommentResolve() {
-    return l.BeforeCommentResolve;
+    return C.BeforeCommentResolve;
   }
 }
-z.extend(oe);
-class se extends $ {
+H.extend(te);
+class ne extends O {
+  _getTargetSheet(e = {}) {
+    var r;
+    const n = e.unitId ? this.getUniverSheet(e.unitId) : (r = this.getActiveWorkbook) == null ? void 0 : r.call(this);
+    if (!n) return null;
+    const t = e.subUnitId ? n.getSheetBySheetId(e.subUnitId) : n.getActiveSheet();
+    return t ? {
+      workbook: n,
+      worksheet: t
+    } : null;
+  }
   // eslint-disable-next-line max-lines-per-function
   _initialize(e) {
-    const r = e.get(p);
-    this.registerEventHandler(
-      this.Event.CommentAdded,
-      () => r.onCommandExecuted((t) => {
-        var d, a, u, g, C;
-        if (t.id !== f.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (d = this.getActiveWorkbook) == null ? void 0 : d.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { comment: c } = h, m = s.getRange(c.ref).getComment();
-        m && this.fireEvent(this.Event.CommentAdded, {
-          workbook: o,
-          worksheet: s,
-          row: (u = (a = m.getRange()) == null ? void 0 : a.getRow()) != null ? u : 0,
-          col: (C = (g = m.getRange()) == null ? void 0 : g.getColumn()) != null ? C : 0,
-          comment: m
-        });
-      })
-    ), this.registerEventHandler(
-      this.Event.CommentUpdated,
-      () => r.onCommandExecuted((t) => {
-        var d, a, u, g, C;
-        if (t.id !== x.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (d = this.getActiveWorkbook) == null ? void 0 : d.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c } = h.payload, m = s.getCommentById(c);
-        m && this.fireEvent(this.Event.CommentUpdated, {
-          workbook: o,
-          worksheet: s,
-          row: (u = (a = m.getRange()) == null ? void 0 : a.getRow()) != null ? u : 0,
-          col: (C = (g = m.getRange()) == null ? void 0 : g.getColumn()) != null ? C : 0,
-          comment: m
-        });
-      })
-    ), this.registerEventHandler(
-      this.Event.CommentDeleted,
-      () => r.onCommandExecuted((t) => {
-        var m;
-        if (t.id !== y.id && t.id !== w.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (m = this.getActiveWorkbook) == null ? void 0 : m.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c } = h;
-        this.fireEvent(this.Event.CommentDeleted, {
-          workbook: o,
-          worksheet: s,
-          commentId: c
-        });
-      })
-    ), this.registerEventHandler(
-      this.Event.CommentResolved,
-      () => r.onCommandExecuted((t) => {
-        var a, u, g;
-        if (t.id !== D.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (a = this.getActiveWorkbook) == null ? void 0 : a.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c, resolved: m } = h, d = s.getComments().find((C) => C.getCommentData().id === c);
-        d && this.fireEvent(this.Event.CommentResolved, {
-          workbook: o,
-          worksheet: s,
-          row: (u = d.getRange().getRow()) != null ? u : 0,
-          col: (g = d.getRange().getColumn()) != null ? g : 0,
-          comment: d,
-          resolved: m
-        });
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeCommentAdd,
-      () => r.beforeCommandExecuted((t) => {
-        var a, u, g;
-        if (t.id !== f.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (a = this.getActiveWorkbook) == null ? void 0 : a.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { comment: c } = h, m = s.getActiveRange();
-        if (!m) return;
-        const d = {
-          workbook: o,
-          worksheet: s,
-          row: (u = m.getRow()) != null ? u : 0,
-          col: (g = m.getColumn()) != null ? g : 0,
-          comment: A.create(c)
-        };
-        if (this.fireEvent(this.Event.BeforeCommentAdd, d), d.cancel)
-          throw new E();
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeCommentUpdate,
-      () => r.beforeCommandExecuted((t) => {
-        var a, u, g, C, v;
-        if (t.id !== x.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (a = this.getActiveWorkbook) == null ? void 0 : a.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c, text: m } = h.payload, d = s.getCommentById(c);
-        if (d) {
-          const P = {
-            workbook: o,
+    const n = e.get(f);
+    this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.CommentAdded,
+        () => n.onCommandExecuted((t) => {
+          var d, h, c, u;
+          if (t.id !== _.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { comment: a } = t.params, m = s.getCommentById(a.id);
+          m && this.fireEvent(this.Event.CommentAdded, {
+            workbook: i,
             worksheet: s,
-            row: (g = (u = d.getRange()) == null ? void 0 : u.getRow()) != null ? g : 0,
-            col: (v = (C = d.getRange()) == null ? void 0 : C.getColumn()) != null ? v : 0,
-            comment: d,
-            newContent: k.createByBody(m)
-          };
-          if (this.fireEvent(this.Event.BeforeCommentUpdate, P), P.cancel)
-            throw new E();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeCommentDelete,
-      () => r.beforeCommandExecuted((t) => {
-        var d, a, u, g, C;
-        if (t.id !== y.id && t.id !== w.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (d = this.getActiveWorkbook) == null ? void 0 : d.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c } = h, m = s.getCommentById(c);
-        if (m) {
-          const v = {
-            workbook: o,
+            row: (h = (d = m.getRange()) == null ? void 0 : d.getRow()) != null ? h : 0,
+            col: (u = (c = m.getRange()) == null ? void 0 : c.getColumn()) != null ? u : 0,
+            comment: m
+          });
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.CommentUpdated,
+        () => n.onCommandExecuted((t) => {
+          var d, h, c, u;
+          if (t.id !== y.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { payload: a } = t.params, m = s.getCommentById(a.commentId);
+          m && this.fireEvent(this.Event.CommentUpdated, {
+            workbook: i,
             worksheet: s,
-            row: (u = (a = m.getRange()) == null ? void 0 : a.getRow()) != null ? u : 0,
-            col: (C = (g = m.getRange()) == null ? void 0 : g.getColumn()) != null ? C : 0,
+            row: (h = (d = m.getRange()) == null ? void 0 : d.getRow()) != null ? h : 0,
+            col: (u = (c = m.getRange()) == null ? void 0 : c.getColumn()) != null ? u : 0,
             comment: m
-          };
-          if (this.fireEvent(this.Event.BeforeCommentDelete, v), v.cancel)
-            throw new E();
-        }
-      })
-    ), this.registerEventHandler(
-      this.Event.BeforeCommentResolve,
-      () => r.beforeCommandExecuted((t) => {
-        var a, u, g;
-        if (t.id !== D.id) return;
-        const n = t.params;
-        if (!n) return;
-        const o = n.unitId ? this.getUniverSheet(n.unitId) : (a = this.getActiveWorkbook) == null ? void 0 : a.call(this);
-        if (!o) return;
-        const s = o.getSheetBySheetId(n.subUnitId || n.sheetId) || o.getActiveSheet();
-        if (!s) return;
-        const h = t.params, { commentId: c, resolved: m } = h, d = s.getComments().find((C) => C.getCommentData().id === c);
-        if (d) {
-          const C = {
-            workbook: o,
+          });
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.CommentDeleted,
+        () => n.onCommandExecuted((t) => {
+          if (t.id !== R.id && t.id !== w.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { commentId: a } = t.params;
+          this.fireEvent(this.Event.CommentDeleted, {
+            workbook: i,
+            worksheet: s,
+            commentId: a
+          });
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.CommentResolved,
+        () => n.onCommandExecuted((t) => {
+          var h, c, u, g;
+          if (t.id !== T.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { commentId: a, resolved: m } = t.params, d = s.getCommentById(a);
+          d && this.fireEvent(this.Event.CommentResolved, {
+            workbook: i,
             worksheet: s,
-            row: (u = d.getRange().getRow()) != null ? u : 0,
-            col: (g = d.getRange().getColumn()) != null ? g : 0,
+            row: (c = (h = d.getRange()) == null ? void 0 : h.getRow()) != null ? c : 0,
+            col: (g = (u = d.getRange()) == null ? void 0 : u.getColumn()) != null ? g : 0,
             comment: d,
             resolved: m
+          });
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeCommentAdd,
+        () => n.beforeCommandExecuted((t) => {
+          if (t.id !== _.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { comment: a } = t.params, { range: m } = F(a.ref), d = {
+            workbook: i,
+            worksheet: s,
+            row: m.startRow,
+            col: m.startColumn,
+            comment: S.create(a)
           };
-          if (this.fireEvent(this.Event.BeforeCommentResolve, C), C.cancel)
-            throw new E();
-        }
-      })
+          if (this.fireEvent(this.Event.BeforeCommentAdd, d), d.cancel)
+            throw new U();
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeCommentUpdate,
+        () => n.beforeCommandExecuted((t) => {
+          var d, h, c, u;
+          if (t.id !== y.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { payload: a } = t.params, m = s.getCommentById(a.commentId);
+          if (m) {
+            const g = {
+              workbook: i,
+              worksheet: s,
+              row: (h = (d = m.getRange()) == null ? void 0 : d.getRow()) != null ? h : 0,
+              col: (u = (c = m.getRange()) == null ? void 0 : c.getColumn()) != null ? u : 0,
+              comment: m,
+              newContent: p.createByBody(a.text)
+            };
+            if (this.fireEvent(this.Event.BeforeCommentUpdate, g), g.cancel)
+              throw new U();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeCommentDelete,
+        () => n.beforeCommandExecuted((t) => {
+          var d, h, c, u;
+          if (t.id !== R.id && t.id !== w.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { commentId: a } = t.params, m = s.getCommentById(a);
+          if (m) {
+            const g = {
+              workbook: i,
+              worksheet: s,
+              row: (h = (d = m.getRange()) == null ? void 0 : d.getRow()) != null ? h : 0,
+              col: (u = (c = m.getRange()) == null ? void 0 : c.getColumn()) != null ? u : 0,
+              comment: m
+            };
+            if (this.fireEvent(this.Event.BeforeCommentDelete, g), g.cancel)
+              throw new U();
+          }
+        })
+      )
+    ), this.disposeWithMe(
+      this.registerEventHandler(
+        this.Event.BeforeCommentResolve,
+        () => n.beforeCommandExecuted((t) => {
+          var h, c;
+          if (t.id !== T.id) return;
+          const r = this._getTargetSheet(t.params);
+          if (!r) return;
+          const { workbook: i, worksheet: s } = r, { commentId: a, resolved: m } = t.params, d = s.getCommentById(a);
+          if (d) {
+            const u = {
+              workbook: i,
+              worksheet: s,
+              row: (h = d.getRange().getRow()) != null ? h : 0,
+              col: (c = d.getRange().getColumn()) != null ? c : 0,
+              comment: d,
+              resolved: m
+            };
+            if (this.fireEvent(this.Event.BeforeCommentResolve, u), u.cancel)
+              throw new U();
+          }
+        })
+      )
     );
   }
   /**
    * @ignore
    */
   newTheadComment(e) {
-    return new U(e);
+    return new k(e);
   }
 }
-$.extend(se);
+O.extend(ne);
 export {
-  I as FThreadComment
+  l as FThreadComment
 };