@univerjs/sheets-thread-comment 0.5.4 → 0.5.5-experimental.20250123-34738ff

package/lib/es/facade.js

@@ -1,31 +1,32 @@
-var E = Object.defineProperty;
-var P = (r, e, t) => e in r ? E(r, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : r[e] = t;
-var y = (r, e, t) => P(r, typeof e != "symbol" ? e + "" : e, t);
-import { Inject as v, Injector as F, UserManagerService as S, UniverInstanceType as W, RichTextValue as l, generateRandomId as g, ICommandService as p, IUniverInstanceService as O, RichTextBuilder as $, Tools as B, Range as z, toDisposable as I, FEventName as R } from "@univerjs/core";
-import { SheetsThreadCommentModel as h } from "@univerjs/sheets-thread-comment";
-import { FRange as x, FWorkbook as j, FWorksheet as D } from "@univerjs/sheets/facade";
-import { DeleteCommentTreeCommand as T, DeleteCommentCommand as A, getDT as f, UpdateCommentCommand as M, ResolveCommentCommand as L, AddCommentCommand as b, ThreadCommentModel as N } from "@univerjs/thread-comment";
-import { deserializeRangeWithSheet as V } from "@univerjs/engine-formula";
-import { filter as H } from "rxjs";
-var q = Object.defineProperty, G = Object.getOwnPropertyDescriptor, J = (r, e, t, n) => {
-  for (var o = n > 1 ? void 0 : n ? G(e, t) : e, m = r.length - 1, s; m >= 0; m--)
-    (s = r[m]) && (o = (n ? s(e, t, o) : s(o)) || o);
-  return n && o && q(e, t, o), o;
-}, a = (r, e) => (t, n) => e(t, n, r);
-class k {
-  constructor(e) {
-    y(this, "_comment", {
-      id: g(),
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
+var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
+var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
+import { Inject, Injector, UserManagerService, UniverInstanceType, RichTextValue, generateRandomId, ICommandService, IUniverInstanceService, RichTextBuilder, Tools, Range, toDisposable, FEventName } from "@univerjs/core";
+import { SheetsThreadCommentModel } from "@univerjs/sheets-thread-comment";
+import { FRange, FWorkbook, FWorksheet } from "@univerjs/sheets/facade";
+import { DeleteCommentTreeCommand, DeleteCommentCommand, getDT, UpdateCommentCommand, ResolveCommentCommand, AddCommentCommand, ThreadCommentModel } from "@univerjs/thread-comment";
+import { deserializeRangeWithSheet } from "@univerjs/engine-formula";
+import { filter } from "rxjs";
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
+    (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
+  return kind && result && __defProp2(target, key, result), result;
+}, "__decorateClass"), __decorateParam = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam");
+const _FTheadCommentItem = class _FTheadCommentItem {
+  constructor(comment) {
+    __publicField(this, "_comment", {
+      id: generateRandomId(),
       ref: "",
       threadId: "",
       dT: "",
       personId: "",
-      text: $.newEmptyData().body,
+      text: RichTextBuilder.newEmptyData().body,
       attachments: [],
       unitId: "",
       subUnitId: ""
     });
-    e && (this._comment = e);
+    comment && (this._comment = comment);
   }
   /**
    * Create a new FTheadCommentItem
@@ -36,8 +37,8 @@ class k {
    * const comment = univerAPI.newTheadComment();
    * ```
    */
-  static create(e) {
-    return new k(e);
+  static create(comment) {
+    return new _FTheadCommentItem(comment);
   }
   /**
    * Get the person id of the comment
@@ -45,8 +46,8 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const personId = comment.personId;
    * ```
    */
@@ -59,8 +60,8 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const dateTime = comment.dateTime;
    * ```
    */
@@ -73,13 +74,13 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const content = comment.content;
    * ```
    */
   get content() {
-    return l.createByBody(this._comment.text);
+    return RichTextValue.createByBody(this._comment.text);
   }
   /**
    * Get the id of the comment
@@ -87,8 +88,8 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const id = comment.id;
    * ```
    */
@@ -101,8 +102,8 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const threadId = comment.threadId;
    * ```
    */
@@ -115,18 +116,20 @@ class k {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const newComment = comment.copy();
    * ```
    */
   copy() {
-    return U.create(B.deepClone(this._comment));
+    return FTheadCommentBuilder.create(Tools.deepClone(this._comment));
   }
-}
-class U extends k {
-  static create(e) {
-    return new U(e);
+};
+__name(_FTheadCommentItem, "FTheadCommentItem");
+let FTheadCommentItem = _FTheadCommentItem;
+const _FTheadCommentBuilder = class _FTheadCommentBuilder extends FTheadCommentItem {
+  static create(comment) {
+    return new _FTheadCommentBuilder(comment);
   }
   /**
    * Set the content of the comment
@@ -135,11 +138,11 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setContent(univerAPI.newRichText().insertText('hello zhangsan'));
+   *   .setContent(univerAPI.newRichText().insertText('hello zhangsan'));
    * ```
    */
-  setContent(e) {
-    return e instanceof l ? this._comment.text = e.getData().body : this._comment.text = e, this;
+  setContent(content) {
+    return content instanceof RichTextValue ? this._comment.text = content.getData().body : this._comment.text = content, this;
   }
   /**
    * Set the person id of the comment
@@ -148,11 +151,11 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setPersonId('123');
+   *   .setPersonId('123');
    * ```
    */
-  setPersonId(e) {
-    return this._comment.personId = e, this;
+  setPersonId(userId) {
+    return this._comment.personId = userId, this;
   }
   /**
    * Set the date time of the comment
@@ -161,11 +164,11 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setDateTime(new Date());
+   *   .setDateTime(new Date());
    * ```
    */
-  setDateTime(e) {
-    return this._comment.dT = f(e), this;
+  setDateTime(date) {
+    return this._comment.dT = getDT(date), this;
   }
   /**
    * Set the id of the comment
@@ -174,11 +177,11 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setId('123');
+   *   .setId('123');
    * ```
    */
-  setId(e) {
-    return this._comment.id = e, this;
+  setId(id) {
+    return this._comment.id = id, this;
   }
   /**
    * Set the thread id of the comment
@@ -187,11 +190,11 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setThreadId('123');
+   *   .setThreadId('123');
    * ```
    */
-  setThreadId(e) {
-    return this._comment.threadId = e, this;
+  setThreadId(threadId) {
+    return this._comment.threadId = threadId, this;
   }
   /**
    * Build the comment
@@ -199,31 +202,37 @@ class U extends k {
    * @example
    * ```ts
    * const comment = univerAPI.newTheadComment()
-   *  .setContent(univerAPI.newRichText().insertText('hello zhangsan'))
-   *  .build();
+   *   .setContent(univerAPI.newRichText().insertText('hello zhangsan'))
+   *   .build();
    * ```
    */
   build() {
     return this._comment;
   }
-}
-let i = class {
-  constructor(r, e, t, n, o, m, s) {
-    this._thread = r, this._parent = e, this._injector = t, this._commandService = n, this._univerInstanceService = o, this._threadCommentModel = m, this._userManagerService = s;
+};
+__name(_FTheadCommentBuilder, "FTheadCommentBuilder");
+let FTheadCommentBuilder = _FTheadCommentBuilder;
+var _a;
+let FThreadComment = (_a = class {
+  /**
+   * @ignore
+   */
+  constructor(_thread, _parent, _injector, _commandService, _univerInstanceService, _threadCommentModel, _userManagerService) {
+    this._thread = _thread, this._parent = _parent, this._injector = _injector, this._commandService = _commandService, this._univerInstanceService = _univerInstanceService, this._threadCommentModel = _threadCommentModel, this._userManagerService = _userManagerService;
   }
   _getRef() {
-    var t;
-    const r = ((t = this._parent) == null ? void 0 : t.ref) || this._thread.ref;
-    return V(r).range;
+    var _a2;
+    const ref = ((_a2 = this._parent) == null ? void 0 : _a2.ref) || this._thread.ref;
+    return deserializeRangeWithSheet(ref).range;
   }
   /**
    * Whether the comment is a root comment
-   * @returns Whether the comment is a root comment
+   * @returns {boolean} Whether the comment is a root comment
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const isRoot = comment.getIsRoot();
    * ```
    */
@@ -232,56 +241,57 @@ let i = class {
   }
   /**
    * Get the comment data
-   * @returns The comment data
+   * @returns {IBaseComment} The comment data
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const commentData = comment.getCommentData();
    * ```
    */
   getCommentData() {
-    const { children: r, ...e } = this._thread;
-    return e;
+    const { children, ...comment } = this._thread;
+    return comment;
   }
   /**
    * Get the replies of the comment
-   * @returns the replies of the comment
+   * @returns {FThreadComment[]} the replies of the comment
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const replies = comment.getReplies();
    * ```
    */
   getReplies() {
-    var t;
-    const r = this._getRef(), e = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, r.startRow, r.startColumn);
-    return (t = e == null ? void 0 : e.children) == null ? void 0 : t.map((n) => this._injector.createInstance(i, n));
+    var _a2;
+    const range = this._getRef(), comments = this._threadCommentModel.getCommentWithChildren(this._thread.unitId, this._thread.subUnitId, range.startRow, range.startColumn);
+    return (_a2 = comments == null ? void 0 : comments.children) == null ? void 0 : _a2.map((child) => this._injector.createInstance(FThreadComment, child));
   }
   /**
    * Get the range of the comment
-   * @returns The range of the comment
+   * @returns {FRange | null} The range of the comment
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const range = comment.getRange();
    * ```
    */
   getRange() {
-    const r = this._univerInstanceService.getUnit(this._thread.unitId, W.UNIVER_SHEET);
-    if (!r)
+    const workbook = this._univerInstanceService.getUnit(this._thread.unitId, UniverInstanceType.UNIVER_SHEET);
+    if (!workbook)
       return null;
-    const e = r.getSheetBySheetId(this._thread.subUnitId);
-    if (!e)
+    const worksheet = workbook.getSheetBySheetId(this._thread.subUnitId);
+    if (!worksheet)
       return null;
-    const t = this._getRef();
-    return this._injector.createInstance(x, r, e, t);
+    const range = this._getRef();
+    return this._injector.createInstance(FRange, workbook, worksheet, range);
   }
+  // eslint-disable-next-line
   /**
    * @deprecated use `getRichText` as instead
    */
@@ -294,14 +304,14 @@ let i = class {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const richText = comment.getRichText();
    * ```
    */
   getRichText() {
-    const r = this._thread.text;
-    return l.create({ body: r, documentStyle: {}, id: "d" });
+    const body = this._thread.text;
+    return RichTextValue.create({ body, documentStyle: {}, id: "d" });
   }
   /**
    * Delete the comment and it's replies
@@ -309,14 +319,14 @@ let i = class {
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const success = await comment.deleteAsync();
    * ```
    */
   deleteAsync() {
     return this._commandService.executeCommand(
-      this.getIsRoot() ? T.id : A.id,
+      this.getIsRoot() ? DeleteCommentTreeCommand.id : DeleteCommentCommand.id,
       {
         commentId: this._thread.id,
         unitId: this._thread.unitId,
@@ -324,271 +334,294 @@ let i = class {
       }
     );
   }
+  // eslint-disable-next-line
   /**
    * @deprecated use `deleteAsync` as instead.
    */
   delete() {
     return this.deleteAsync();
   }
+  // eslint-disable-next-line
   /**
-   * @param content
    * @deprecated use `updateAsync` as instead
    */
-  async update(r) {
-    return this.updateAsync(r);
+  async update(content) {
+    return this.updateAsync(content);
   }
   /**
    * Update the comment content
-   * @param content The new content of the comment
-   * @returns success or not
+   * @param {IDocumentBody | RichTextValue} content The new content of the comment
+   * @returns {Promise<boolean>} success or not
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const success = await comment.updateAsync(univerAPI.newRichText().insertText('hello zhangsan'));
    * ```
    */
-  async updateAsync(r) {
-    const e = r instanceof l ? r.getData().body : r, t = f();
+  async updateAsync(content) {
+    const body = content instanceof RichTextValue ? content.getData().body : content, dt = getDT();
     return await this._commandService.executeCommand(
-      M.id,
+      UpdateCommentCommand.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         payload: {
           commentId: this._thread.id,
-          text: e,
+          text: body,
           updated: !0,
-          updateT: t
+          updateT: dt
         }
       }
     );
   }
+  // eslint-disable-next-line
   /**
-   * @param resolved
    * @deprecated use `resolveAsync` as instead
    */
-  resolve(r) {
-    return this.resolveAsync(r);
+  resolve(resolved) {
+    return this.resolveAsync(resolved);
   }
   /**
    * Resolve the comment
-   * @param resolved Whether the comment is resolved
-   * @returns success or not
+   * @param {boolean} resolved Whether the comment is resolved
+   * @returns {Promise<boolean>} success or not
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    * const success = await comment.resolveAsync(true);
    * ```
    */
-  resolveAsync(r) {
+  resolveAsync(resolved) {
     return this._commandService.executeCommand(
-      L.id,
+      ResolveCommentCommand.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         commentId: this._thread.id,
-        resolved: r != null ? r : !this._thread.resolved
+        resolved: resolved != null ? resolved : !this._thread.resolved
       }
     );
   }
   /**
    * Reply to the comment
-   * @param comment The comment to reply to
-   * @returns success or not
+   * @param {FTheadCommentBuilder} comment The comment to reply to
+   * @returns {Promise<boolean>} success or not
    * @example
    * ```ts
    * const comment = univerAPI.getActiveWorkbook()
-   *  .getSheetById(sheetId)
-   *  .getCommentById(commentId);
+   *   .getSheetById(sheetId)
+   *   .getCommentById(commentId);
    *
    * const reply = univerAPI.newTheadComment()
-   *  .setContent(univerAPI.newRichText().insertText('hello zhangsan'));
+   *   .setContent(univerAPI.newRichText().insertText('hello zhangsan'));
    *
    * const success = await comment.replyAsync(reply);
    * ```
    */
-  async replyAsync(r) {
-    var t;
-    const e = r.build();
+  async replyAsync(comment) {
+    var _a2;
+    const commentData = comment.build();
     return this._commandService.executeCommand(
-      b.id,
+      AddCommentCommand.id,
       {
         unitId: this._thread.unitId,
         subUnitId: this._thread.subUnitId,
         comment: {
-          id: g(),
+          id: generateRandomId(),
           parentId: this._thread.id,
           threadId: this._thread.threadId,
-          ref: (t = this._parent) == null ? void 0 : t.ref,
+          ref: (_a2 = this._parent) == null ? void 0 : _a2.ref,
           unitId: this._thread.unitId,
           subUnitId: this._thread.subUnitId,
-          text: e.text,
-          attachments: e.attachments,
-          dT: e.dT || f(),
-          personId: e.personId || this._userManagerService.getCurrentUser().userID
+          text: commentData.text,
+          attachments: commentData.attachments,
+          dT: commentData.dT || getDT(),
+          personId: commentData.personId || this._userManagerService.getCurrentUser().userID
         }
       }
     );
   }
-};
-i = J([
-  a(2, v(F)),
-  a(3, p),
-  a(4, O),
-  a(5, v(h)),
-  a(6, v(S))
-], i);
-class K extends x {
+}, __name(_a, "FThreadComment"), _a);
+FThreadComment = __decorateClass([
+  __decorateParam(2, Inject(Injector)),
+  __decorateParam(3, ICommandService),
+  __decorateParam(4, IUniverInstanceService),
+  __decorateParam(5, Inject(SheetsThreadCommentModel)),
+  __decorateParam(6, Inject(UserManagerService))
+], FThreadComment);
+const _FRangeCommentMixin = class _FRangeCommentMixin extends FRange {
   getComment() {
-    const t = this._injector.get(h), n = this._workbook.getUnitId(), o = this._worksheet.getSheetId(), m = t.getByLocation(n, o, this._range.startRow, this._range.startColumn);
-    if (!m)
+    const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel), unitId = this._workbook.getUnitId(), sheetId = this._worksheet.getSheetId(), commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, this._range.startRow, this._range.startColumn);
+    if (!commentId)
       return null;
-    const s = t.getComment(n, o, m);
-    return s ? this._injector.createInstance(i, s) : null;
+    const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
+    return comment ? this._injector.createInstance(FThreadComment, comment) : null;
   }
   getComments() {
-    const t = this._injector.get(h), n = this._workbook.getUnitId(), o = this._worksheet.getSheetId(), m = [];
-    return z.foreach(this._range, (s, c) => {
-      const u = t.getByLocation(n, o, s, c);
-      if (u) {
-        const C = t.getComment(n, o, u);
-        C && m.push(this._injector.createInstance(i, C));
+    const sheetsTheadCommentModel = this._injector.get(SheetsThreadCommentModel), unitId = this._workbook.getUnitId(), sheetId = this._worksheet.getSheetId(), comments = [];
+    return Range.foreach(this._range, (row, col) => {
+      const commentId = sheetsTheadCommentModel.getByLocation(unitId, sheetId, row, col);
+      if (commentId) {
+        const comment = sheetsTheadCommentModel.getComment(unitId, sheetId, commentId);
+        comment && comments.push(this._injector.createInstance(FThreadComment, comment));
       }
-    }), m;
-  }
-  addComment(e) {
-    var w;
-    const t = this._injector, n = (w = this.getComment()) == null ? void 0 : w.getCommentData(), o = t.get(p), m = t.get(S), s = this._workbook.getUnitId(), c = this._worksheet.getSheetId(), u = `${B.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, C = m.getCurrentUser(), _ = e instanceof U ? e.build() : { text: e };
-    return o.executeCommand(b.id, {
-      unitId: s,
-      subUnitId: c,
+    }), comments;
+  }
+  addComment(content) {
+    var _a2;
+    const injector = this._injector, currentComment = (_a2 = this.getComment()) == null ? void 0 : _a2.getCommentData(), commentService = injector.get(ICommandService), userService = injector.get(UserManagerService), unitId = this._workbook.getUnitId(), sheetId = this._worksheet.getSheetId(), refStr = `${Tools.chatAtABC(this._range.startColumn)}${this._range.startRow + 1}`, currentUser = userService.getCurrentUser(), commentData = content instanceof FTheadCommentBuilder ? content.build() : { text: content };
+    return commentService.executeCommand(AddCommentCommand.id, {
+      unitId,
+      subUnitId: sheetId,
       comment: {
-        text: _.text,
-        dT: _.dT || f(),
+        text: commentData.text,
+        dT: commentData.dT || getDT(),
         attachments: [],
-        id: _.id || g(),
-        ref: u,
-        personId: _.personId || C.userID,
-        parentId: n == null ? void 0 : n.id,
-        unitId: s,
-        subUnitId: c,
-        threadId: (n == null ? void 0 : n.threadId) || g()
+        id: commentData.id || generateRandomId(),
+        ref: refStr,
+        personId: commentData.personId || currentUser.userID,
+        parentId: currentComment == null ? void 0 : currentComment.id,
+        unitId,
+        subUnitId: sheetId,
+        threadId: (currentComment == null ? void 0 : currentComment.threadId) || generateRandomId()
       }
     });
   }
   clearComment() {
-    var s;
-    const e = this._injector, t = (s = this.getComment()) == null ? void 0 : s.getCommentData(), n = e.get(p), o = this._workbook.getUnitId(), m = this._worksheet.getSheetId();
-    return t ? n.executeCommand(T.id, {
-      unitId: o,
-      subUnitId: m,
-      threadId: t.threadId,
-      commentId: t.id
+    var _a2;
+    const injector = this._injector, currentComment = (_a2 = this.getComment()) == null ? void 0 : _a2.getCommentData(), commentService = injector.get(ICommandService), unitId = this._workbook.getUnitId(), sheetId = this._worksheet.getSheetId();
+    return currentComment ? commentService.executeCommand(DeleteCommentTreeCommand.id, {
+      unitId,
+      subUnitId: sheetId,
+      threadId: currentComment.threadId,
+      commentId: currentComment.id
     }) : Promise.resolve(!0);
   }
   clearComments() {
-    const t = this.getComments().map((n) => n.deleteAsync());
-    return Promise.all(t).then(() => !0);
+    const promises = this.getComments().map((comment) => comment.deleteAsync());
+    return Promise.all(promises).then(() => !0);
+  }
+  addCommentAsync(content) {
+    return this.addComment(content);
   }
-}
-x.extend(K);
-class Q extends j {
+  clearCommentAsync() {
+    return this.clearComment();
+  }
+  clearCommentsAsync() {
+    return this.clearComments();
+  }
+};
+__name(_FRangeCommentMixin, "FRangeCommentMixin");
+let FRangeCommentMixin = _FRangeCommentMixin;
+FRange.extend(FRangeCommentMixin);
+const _FWorkbookThreadCommentMixin = class _FWorkbookThreadCommentMixin extends FWorkbook {
+  /**
+   * @ignore
+   */
   _initialize() {
     Object.defineProperty(this, "_threadCommentModel", {
       get() {
-        return this._injector.get(N);
+        return this._injector.get(ThreadCommentModel);
       }
     });
   }
   getComments() {
-    return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map((e) => this._injector.createInstance(i, e.root));
+    return this._threadCommentModel.getUnit(this._workbook.getUnitId()).map((i) => this._injector.createInstance(FThreadComment, i.root));
   }
   clearComments() {
-    const t = this.getComments().map((n) => n.deleteAsync());
-    return Promise.all(t).then(() => !0);
+    const promises = this.getComments().map((comment) => comment.deleteAsync());
+    return Promise.all(promises).then(() => !0);
   }
   /**
+   * @param callback
    * @deprecated
    */
-  onThreadCommentChange(e) {
-    return I(this._threadCommentModel.commentUpdate$.pipe(H((t) => t.unitId === this._workbook.getUnitId())).subscribe(e));
+  onThreadCommentChange(callback) {
+    return toDisposable(this._threadCommentModel.commentUpdate$.pipe(filter((change) => change.unitId === this._workbook.getUnitId())).subscribe(callback));
   }
   /**
+   * @param callback
    * @deprecated
    */
-  onBeforeAddThreadComment(e) {
-    return I(this._commandService.beforeCommandExecuted((t, n) => {
-      const o = t.params;
-      if (t.id === b.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+  onBeforeAddThreadComment(callback) {
+    return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
+      const params = commandInfo.params;
+      if (commandInfo.id === AddCommentCommand.id) {
+        if (params.unitId !== this._workbook.getUnitId())
           return;
-        if (e(o, n) === !1)
+        if (callback(params, options) === !1)
           throw new Error("Command is stopped by the hook onBeforeAddThreadComment");
       }
     }));
   }
   /**
+   * @param callback
    * @deprecated
    */
-  onBeforeUpdateThreadComment(e) {
-    return I(this._commandService.beforeCommandExecuted((t, n) => {
-      const o = t.params;
-      if (t.id === M.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+  onBeforeUpdateThreadComment(callback) {
+    return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
+      const params = commandInfo.params;
+      if (commandInfo.id === UpdateCommentCommand.id) {
+        if (params.unitId !== this._workbook.getUnitId())
           return;
-        if (e(o, n) === !1)
+        if (callback(params, options) === !1)
           throw new Error("Command is stopped by the hook onBeforeUpdateThreadComment");
       }
     }));
   }
   /**
+   * @param callback
    * @deprecated
    */
-  onBeforeDeleteThreadComment(e) {
-    return I(this._commandService.beforeCommandExecuted((t, n) => {
-      const o = t.params;
-      if (t.id === A.id || t.id === T.id) {
-        if (o.unitId !== this._workbook.getUnitId())
+  onBeforeDeleteThreadComment(callback) {
+    return toDisposable(this._commandService.beforeCommandExecuted((commandInfo, options) => {
+      const params = commandInfo.params;
+      if (commandInfo.id === DeleteCommentCommand.id || commandInfo.id === DeleteCommentTreeCommand.id) {
+        if (params.unitId !== this._workbook.getUnitId())
           return;
-        if (e(o, n) === !1)
+        if (callback(params, options) === !1)
           throw new Error("Command is stopped by the hook onBeforeDeleteThreadComment");
       }
     }));
   }
-}
-j.extend(Q);
-class X extends D {
+};
+__name(_FWorkbookThreadCommentMixin, "FWorkbookThreadCommentMixin");
+let FWorkbookThreadCommentMixin = _FWorkbookThreadCommentMixin;
+FWorkbook.extend(FWorkbookThreadCommentMixin);
+const _FWorksheetCommentMixin = class _FWorksheetCommentMixin extends FWorksheet {
   getComments() {
-    return this._injector.get(h).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((n) => this._injector.createInstance(i, n));
+    return this._injector.get(SheetsThreadCommentModel).getSubUnitAll(this._workbook.getUnitId(), this._worksheet.getSheetId()).map((comment) => this._injector.createInstance(FThreadComment, comment));
   }
   clearComments() {
-    const t = this.getComments().map((n) => n.deleteAsync());
-    return Promise.all(t).then(() => !0);
+    const promises = this.getComments().map((comment) => comment.deleteAsync());
+    return Promise.all(promises).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((n) => {
-      if (n.id === b.id) {
-        const o = n.params;
-        e(o);
+  onCommented(callback) {
+    return this._injector.get(ICommandService).onCommandExecuted((command) => {
+      if (command.id === AddCommentCommand.id) {
+        const params = command.params;
+        callback(params);
       }
     });
   }
-  getCommentById(e) {
-    const n = this._injector.get(h).getComment(this._workbook.getUnitId(), this._worksheet.getSheetId(), e);
-    if (n)
-      return this._injector.createInstance(i, n);
+  getCommentById(commentId) {
+    const comment = this._injector.get(SheetsThreadCommentModel).getComment(this._workbook.getUnitId(), this._worksheet.getSheetId(), commentId);
+    if (comment)
+      return this._injector.createInstance(FThreadComment, comment);
   }
-}
-D.extend(X);
-const d = {
+};
+__name(_FWorksheetCommentMixin, "FWorksheetCommentMixin");
+let FWorksheetCommentMixin = _FWorksheetCommentMixin;
+FWorksheet.extend(FWorksheetCommentMixin);
+const CommentEvent = {
   CommentAdded: "CommentAdded",
   BeforeCommentAdd: "BeforeCommentAdd",
   CommentUpdated: "CommentUpdated",
@@ -597,34 +630,35 @@ const d = {
   BeforeCommentDeleted: "BeforeCommentDeleted",
   CommentResolved: "CommentResolved",
   BeforeCommentResolve: "BeforeCommentResolve"
-};
-class Y extends R {
+}, _FCommentEvent = class _FCommentEvent extends FEventName {
   get CommentAdded() {
-    return d.CommentAdded;
+    return CommentEvent.CommentAdded;
   }
   get BeforeCommentAdd() {
-    return d.BeforeCommentAdd;
+    return CommentEvent.BeforeCommentAdd;
   }
   get CommentUpdated() {
-    return d.CommentUpdated;
+    return CommentEvent.CommentUpdated;
   }
   get BeforeCommentUpdate() {
-    return d.BeforeCommentUpdate;
+    return CommentEvent.BeforeCommentUpdate;
   }
   get CommentDeleted() {
-    return d.CommentDeleted;
+    return CommentEvent.CommentDeleted;
   }
   get BeforeCommentDeleted() {
-    return d.BeforeCommentDeleted;
+    return CommentEvent.BeforeCommentDeleted;
   }
   get CommentResolved() {
-    return d.CommentResolved;
+    return CommentEvent.CommentResolved;
   }
   get BeforeCommentResolve() {
-    return d.BeforeCommentResolve;
+    return CommentEvent.BeforeCommentResolve;
   }
-}
-R.extend(Y);
+};
+__name(_FCommentEvent, "FCommentEvent");
+let FCommentEvent = _FCommentEvent;
+FEventName.extend(FCommentEvent);
 export {
-  i as FThreadComment
+  FThreadComment
 };