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

package/lib/es/index.js

@@ -1,367 +1,368 @@
-var x = Object.defineProperty;
-var T = (i, e, n) => e in i ? x(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n;
-var h = (i, e, n) => T(i, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as l, Disposable as R, ObjectMatrix as $, UniverInstanceType as y, IUniverInstanceService as E, sequenceExecuteAsync as P, toDisposable as D, ICommandService as b, DependentOn as O, Injector as A, Plugin as j } from "@univerjs/core";
-import { singleReferenceToGrid as u, serializeRange as M } from "@univerjs/engine-formula";
-import { RefRangeService as W, SheetsSelectionsService as L, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests as B } from "@univerjs/sheets";
-import { ThreadCommentModel as S, DeleteCommentMutation as N, AddCommentMutation as V, UpdateCommentRefMutation as C, UniverThreadCommentPlugin as H } from "@univerjs/thread-comment";
-import { Subject as F } from "rxjs";
-var z = Object.defineProperty, G = Object.getOwnPropertyDescriptor, q = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? G(e, n) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
-  return t && r && z(e, n, r), r;
-}, w = (i, e) => (n, t) => e(n, t, i);
-let p = class extends R {
-  constructor(e, n) {
+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, Disposable, ObjectMatrix, UniverInstanceType, IUniverInstanceService, sequenceExecuteAsync, toDisposable, ICommandService, DependentOn, Injector, Plugin } from "@univerjs/core";
+import { singleReferenceToGrid, serializeRange } from "@univerjs/engine-formula";
+import { RefRangeService, SheetsSelectionsService, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
+import { ThreadCommentModel, DeleteCommentMutation, AddCommentMutation, UpdateCommentRefMutation, UniverThreadCommentPlugin } from "@univerjs/thread-comment";
+import { Subject } from "rxjs";
+var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(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 && __defProp$2(target, key, result), result;
+}, "__decorateClass$2"), __decorateParam$2 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$2"), _a;
+let SheetsThreadCommentModel = (_a = class extends Disposable {
+  constructor(_threadCommentModel, _univerInstanceService) {
     super();
-    h(this, "_matrixMap", /* @__PURE__ */ new Map());
-    h(this, "_locationMap", /* @__PURE__ */ new Map());
-    h(this, "_commentUpdate$", new F());
-    h(this, "commentUpdate$", this._commentUpdate$.asObservable());
-    this._threadCommentModel = e, this._univerInstanceService = n, this._init(), this.disposeWithMe(() => {
+    __publicField(this, "_matrixMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_locationMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_commentUpdate$", new Subject());
+    __publicField(this, "commentUpdate$", this._commentUpdate$.asObservable());
+    this._threadCommentModel = _threadCommentModel, this._univerInstanceService = _univerInstanceService, this._init(), this.disposeWithMe(() => {
       this._commentUpdate$.complete();
     });
   }
   _init() {
     this._initData(), this._initUpdateTransform();
   }
-  _ensureCommentMatrix(e, n) {
-    let t = this._matrixMap.get(e);
-    t || (t = /* @__PURE__ */ new Map(), this._matrixMap.set(e, t));
-    let r = t.get(n);
-    return r || (r = new $(), t.set(n, r)), r;
+  _ensureCommentMatrix(unitId, subUnitId) {
+    let unitMap = this._matrixMap.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._matrixMap.set(unitId, unitMap));
+    let subUnitMap = unitMap.get(subUnitId);
+    return subUnitMap || (subUnitMap = new ObjectMatrix(), unitMap.set(subUnitId, subUnitMap)), subUnitMap;
   }
-  _ensureCommentLocationMap(e, n) {
-    let t = this._locationMap.get(e);
-    t || (t = /* @__PURE__ */ new Map(), this._locationMap.set(e, t));
-    let r = t.get(n);
-    return r || (r = /* @__PURE__ */ new Map(), t.set(n, r)), r;
+  _ensureCommentLocationMap(unitId, subUnitId) {
+    let unitMap = this._locationMap.get(unitId);
+    unitMap || (unitMap = /* @__PURE__ */ new Map(), this._locationMap.set(unitId, unitMap));
+    let subUnitMap = unitMap.get(subUnitId);
+    return subUnitMap || (subUnitMap = /* @__PURE__ */ new Map(), unitMap.set(subUnitId, subUnitMap)), subUnitMap;
   }
-  _addCommentToMatrix(e, n, t, r) {
-    var o;
-    const s = (o = e.getValue(n, t)) != null ? o : /* @__PURE__ */ new Set();
-    s.add(r), e.setValue(n, t, s);
+  _addCommentToMatrix(matrix, row, column, commentId) {
+    var _a4;
+    const current = (_a4 = matrix.getValue(row, column)) != null ? _a4 : /* @__PURE__ */ new Set();
+    current.add(commentId), matrix.setValue(row, column, current);
   }
-  _deleteCommentFromMatrix(e, n, t, r) {
-    if (n >= 0 && t >= 0) {
-      const s = e.getValue(n, t);
-      s && s.has(r) && (s.delete(r), s.size === 0 && e.realDeleteValue(n, t));
+  _deleteCommentFromMatrix(matrix, row, column, commentId) {
+    if (row >= 0 && column >= 0) {
+      const current = matrix.getValue(row, column);
+      current && current.has(commentId) && (current.delete(commentId), current.size === 0 && matrix.realDeleteValue(row, column));
     }
   }
-  _ensure(e, n) {
-    const t = this._ensureCommentMatrix(e, n), r = this._ensureCommentLocationMap(e, n);
-    return { matrix: t, locationMap: r };
+  _ensure(unitId, subUnitId) {
+    const matrix = this._ensureCommentMatrix(unitId, subUnitId), locationMap = this._ensureCommentLocationMap(unitId, subUnitId);
+    return { matrix, locationMap };
   }
   _initData() {
-    const e = this._threadCommentModel.getAll();
-    for (const n of e)
-      for (const t of n.threads) {
-        const { unitId: r, subUnitId: s, root: o } = t;
-        this._addComment(r, s, o);
+    const datas = this._threadCommentModel.getAll();
+    for (const data of datas)
+      for (const thread of data.threads) {
+        const { unitId, subUnitId, root } = thread;
+        this._addComment(unitId, subUnitId, root);
       }
   }
-  _addComment(e, n, t) {
-    const r = u(t.ref), s = t.parentId, { row: o, column: a } = r, c = t.id, { matrix: m, locationMap: d } = this._ensure(e, n);
-    !s && o >= 0 && a >= 0 && (this._addCommentToMatrix(m, o, a, c), d.set(c, { row: o, column: a })), s || this._commentUpdate$.next({
-      unitId: e,
-      subUnitId: n,
-      payload: t,
+  _addComment(unitId, subUnitId, comment) {
+    const location = singleReferenceToGrid(comment.ref), parentId = comment.parentId, { row, column } = location, commentId = comment.id, { matrix, locationMap } = this._ensure(unitId, subUnitId);
+    !parentId && row >= 0 && column >= 0 && (this._addCommentToMatrix(matrix, row, column, commentId), locationMap.set(commentId, { row, column })), parentId || this._commentUpdate$.next({
+      unitId,
+      subUnitId,
+      payload: comment,
       type: "add",
-      isRoot: !s,
-      ...r
+      isRoot: !parentId,
+      ...location
     });
   }
   // eslint-disable-next-line max-lines-per-function
   _initUpdateTransform() {
-    this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
-      const { unitId: n, subUnitId: t } = e;
+    this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((update) => {
+      const { unitId, subUnitId } = update;
       try {
-        if (this._univerInstanceService.getUnitType(n) !== y.UNIVER_SHEET)
+        if (this._univerInstanceService.getUnitType(unitId) !== UniverInstanceType.UNIVER_SHEET)
           return;
       } catch {
       }
-      const { matrix: r, locationMap: s } = this._ensure(n, t);
-      switch (e.type) {
+      const { matrix, locationMap } = this._ensure(unitId, subUnitId);
+      switch (update.type) {
         case "add": {
-          this._addComment(e.unitId, e.subUnitId, e.payload);
+          this._addComment(update.unitId, update.subUnitId, update.payload);
           break;
         }
         case "delete": {
-          const { isRoot: o, comment: a } = e.payload;
-          if (o) {
-            const c = u(a.ref), { row: m, column: d } = c;
-            this._deleteCommentFromMatrix(r, m, d, a.id), this._commentUpdate$.next({
-              ...e,
-              ...c
+          const { isRoot, comment } = update.payload;
+          if (isRoot) {
+            const location = singleReferenceToGrid(comment.ref), { row, column } = location;
+            this._deleteCommentFromMatrix(matrix, row, column, comment.id), this._commentUpdate$.next({
+              ...update,
+              ...location
             });
           }
           break;
         }
         case "update": {
-          const { commentId: o } = e.payload, a = this._threadCommentModel.getComment(n, t, o);
-          if (!a)
+          const { commentId } = update.payload, comment = this._threadCommentModel.getComment(unitId, subUnitId, commentId);
+          if (!comment)
             return;
-          const c = u(a.ref);
+          const location = singleReferenceToGrid(comment.ref);
           this._commentUpdate$.next({
-            ...e,
-            ...c
+            ...update,
+            ...location
           });
           break;
         }
         case "updateRef": {
-          const o = u(e.payload.ref), { commentId: a } = e.payload, c = s.get(a);
-          if (!c)
+          const location = singleReferenceToGrid(update.payload.ref), { commentId } = update.payload, currentLoc = locationMap.get(commentId);
+          if (!currentLoc)
             return;
-          const { row: m, column: d } = c;
-          this._deleteCommentFromMatrix(r, m, d, a), s.delete(a), o.row >= 0 && o.column >= 0 && (this._addCommentToMatrix(r, o.row, o.column, a), s.set(a, { row: o.row, column: o.column })), this._commentUpdate$.next({
-            ...e,
-            ...o
+          const { row, column } = currentLoc;
+          this._deleteCommentFromMatrix(matrix, row, column, commentId), locationMap.delete(commentId), location.row >= 0 && location.column >= 0 && (this._addCommentToMatrix(matrix, location.row, location.column, commentId), locationMap.set(commentId, { row: location.row, column: location.column })), this._commentUpdate$.next({
+            ...update,
+            ...location
           });
           break;
         }
         case "resolve": {
-          const { unitId: o, subUnitId: a, payload: c } = e, { locationMap: m } = this._ensure(o, a), d = m.get(c.commentId);
-          d && this._commentUpdate$.next({
-            ...e,
-            ...d
+          const { unitId: unitId2, subUnitId: subUnitId2, payload } = update, { locationMap: locationMap2 } = this._ensure(unitId2, subUnitId2), location = locationMap2.get(payload.commentId);
+          location && this._commentUpdate$.next({
+            ...update,
+            ...location
           });
           break;
         }
       }
     }));
   }
-  getByLocation(e, n, t, r) {
-    var a;
-    return (a = this.getAllByLocation(e, n, t, r).filter((c) => !c.resolved)[0]) == null ? void 0 : a.id;
+  getByLocation(unitId, subUnitId, row, column) {
+    var _a4;
+    return (_a4 = this.getAllByLocation(unitId, subUnitId, row, column).filter((comment) => !comment.resolved)[0]) == null ? void 0 : _a4.id;
   }
-  getAllByLocation(e, n, t, r) {
-    const o = this._ensureCommentMatrix(e, n).getValue(t, r);
-    return o ? Array.from(o).map((a) => this.getComment(e, n, a)).filter(Boolean) : [];
+  getAllByLocation(unitId, subUnitId, row, column) {
+    const current = this._ensureCommentMatrix(unitId, subUnitId).getValue(row, column);
+    return current ? Array.from(current).map((id) => this.getComment(unitId, subUnitId, id)).filter(Boolean) : [];
   }
-  getComment(e, n, t) {
-    return this._threadCommentModel.getComment(e, n, t);
+  getComment(unitId, subUnitId, commentId) {
+    return this._threadCommentModel.getComment(unitId, subUnitId, commentId);
   }
-  getCommentWithChildren(e, n, t, r) {
-    const s = this.getByLocation(e, n, t, r);
-    if (!s)
+  getCommentWithChildren(unitId, subUnitId, row, column) {
+    const commentId = this.getByLocation(unitId, subUnitId, row, column);
+    if (!commentId)
       return;
-    const o = this.getComment(e, n, s);
-    if (o)
-      return this._threadCommentModel.getThread(e, n, o.threadId);
+    const comment = this.getComment(unitId, subUnitId, commentId);
+    if (comment)
+      return this._threadCommentModel.getThread(unitId, subUnitId, comment.threadId);
   }
-  showCommentMarker(e, n, t, r) {
-    const s = this.getByLocation(e, n, t, r);
-    if (!s)
+  showCommentMarker(unitId, subUnitId, row, column) {
+    const commentId = this.getByLocation(unitId, subUnitId, row, column);
+    if (!commentId)
       return !1;
-    const o = this.getComment(e, n, s);
-    return !!(o && !o.resolved);
+    const comment = this.getComment(unitId, subUnitId, commentId);
+    return !!(comment && !comment.resolved);
   }
-  getSubUnitAll(e, n) {
-    return this._threadCommentModel.getUnit(e).filter((t) => t.subUnitId === n).map((t) => t.root);
+  getSubUnitAll(unitId, subUnitId) {
+    return this._threadCommentModel.getUnit(unitId).filter((i) => i.subUnitId === subUnitId).map((i) => i.root);
   }
-};
-p = q([
-  w(0, l(S)),
-  w(1, E)
-], p);
-var J = Object.defineProperty, K = Object.getOwnPropertyDescriptor, Q = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? K(e, n) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
-  return t && r && J(e, n, r), r;
-}, _ = (i, e) => (n, t) => e(n, t, i);
-let f = class extends R {
-  constructor(e, n, t, r, s) {
+}, __name(_a, "SheetsThreadCommentModel"), _a);
+SheetsThreadCommentModel = __decorateClass$2([
+  __decorateParam$2(0, Inject(ThreadCommentModel)),
+  __decorateParam$2(1, IUniverInstanceService)
+], SheetsThreadCommentModel);
+var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
+  for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(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 && __defProp$1(target, key, result), result;
+}, "__decorateClass$1"), __decorateParam$1 = /* @__PURE__ */ __name((index, decorator) => (target, key) => decorator(target, key, index), "__decorateParam$1"), _a2;
+let SheetsThreadCommentRefRangeController = (_a2 = class extends Disposable {
+  constructor(_refRangeService, _sheetsThreadCommentModel, _threadCommentModel, _selectionManagerService, _commandService) {
     super();
-    h(this, "_disposableMap", /* @__PURE__ */ new Map());
-    h(this, "_watcherMap", /* @__PURE__ */ new Map());
-    h(this, "_handleRangeChange", (e, n, t, r, s) => {
-      const o = t.id, a = {
-        startColumn: t.column,
-        endColumn: t.column,
-        startRow: t.row,
-        endRow: t.row
+    __publicField(this, "_disposableMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_watcherMap", /* @__PURE__ */ new Map());
+    __publicField(this, "_handleRangeChange", /* @__PURE__ */ __name((unitId, subUnitId, comment, resultRange, silent) => {
+      const commentId = comment.id, oldRange = {
+        startColumn: comment.column,
+        endColumn: comment.column,
+        startRow: comment.row,
+        endRow: comment.row
       };
-      return r ? {
+      return resultRange ? {
         redos: [{
-          id: C.id,
+          id: UpdateCommentRefMutation.id,
           params: {
-            unitId: e,
-            subUnitId: n,
+            unitId,
+            subUnitId,
             payload: {
-              ref: M(r),
-              commentId: o
+              ref: serializeRange(resultRange),
+              commentId
             },
-            silent: s
+            silent
           }
         }],
         undos: [{
-          id: C.id,
+          id: UpdateCommentRefMutation.id,
           params: {
-            unitId: e,
-            subUnitId: n,
+            unitId,
+            subUnitId,
             payload: {
-              ref: M(a),
-              commentId: o
+              ref: serializeRange(oldRange),
+              commentId
             },
-            silent: s
+            silent
           }
         }]
       } : {
         redos: [{
-          id: N.id,
+          id: DeleteCommentMutation.id,
           params: {
-            unitId: e,
-            subUnitId: n,
-            commentId: o
+            unitId,
+            subUnitId,
+            commentId
           }
         }],
         undos: [{
-          id: V.id,
+          id: AddCommentMutation.id,
           params: {
-            unitId: e,
-            subUnitId: n,
-            comment: t,
+            unitId,
+            subUnitId,
+            comment,
             sync: !0
           }
         }]
       };
-    });
-    this._refRangeService = e, this._sheetsThreadCommentModel = n, this._threadCommentModel = t, this._selectionManagerService = r, this._commandService = s, this._initData(), this._initRefRange();
+    }, "_handleRangeChange"));
+    this._refRangeService = _refRangeService, this._sheetsThreadCommentModel = _sheetsThreadCommentModel, this._threadCommentModel = _threadCommentModel, this._selectionManagerService = _selectionManagerService, this._commandService = _commandService, this._initData(), this._initRefRange();
   }
-  _getIdWithUnitId(e, n, t) {
-    return `${e}-${n}-${t}`;
+  _getIdWithUnitId(unitId, subUnitId, id) {
+    return `${unitId}-${subUnitId}-${id}`;
   }
-  _register(e, n, t) {
-    const r = t.id, s = {
-      startColumn: t.column,
-      endColumn: t.column,
-      startRow: t.row,
-      endRow: t.row
+  _register(unitId, subUnitId, comment) {
+    const commentId = comment.id, oldRange = {
+      startColumn: comment.column,
+      endColumn: comment.column,
+      startRow: comment.row,
+      endRow: comment.row
     };
     this._disposableMap.set(
-      this._getIdWithUnitId(e, n, r),
-      this._refRangeService.registerRefRange(s, (o) => {
-        const a = B(s, o, { selectionManagerService: this._selectionManagerService }), c = Array.isArray(a) ? a[0] : a;
-        return c && c.startColumn === s.startColumn && c.startRow === s.startRow ? {
+      this._getIdWithUnitId(unitId, subUnitId, commentId),
+      this._refRangeService.registerRefRange(oldRange, (commandInfo) => {
+        const resultRanges = handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests(oldRange, commandInfo, { selectionManagerService: this._selectionManagerService }), resultRange = Array.isArray(resultRanges) ? resultRanges[0] : resultRanges;
+        return resultRange && resultRange.startColumn === oldRange.startColumn && resultRange.startRow === oldRange.startRow ? {
           undos: [],
           redos: []
-        } : this._handleRangeChange(e, n, t, c, !1);
-      }, e, n)
+        } : this._handleRangeChange(unitId, subUnitId, comment, resultRange, !1);
+      }, unitId, subUnitId)
     );
   }
-  _watch(e, n, t) {
-    const r = t.id, s = {
-      startColumn: t.column,
-      endColumn: t.column,
-      startRow: t.row,
-      endRow: t.row
+  _watch(unitId, subUnitId, comment) {
+    const commentId = comment.id, oldRange = {
+      startColumn: comment.column,
+      endColumn: comment.column,
+      startRow: comment.row,
+      endRow: comment.row
     };
     this._watcherMap.set(
-      this._getIdWithUnitId(e, n, r),
-      this._refRangeService.watchRange(e, n, s, (o, a) => {
-        const { redos: c } = this._handleRangeChange(e, n, t, a, !0);
-        P(c, this._commandService, { onlyLocal: !0 });
+      this._getIdWithUnitId(unitId, subUnitId, commentId),
+      this._refRangeService.watchRange(unitId, subUnitId, oldRange, (before, after) => {
+        const { redos } = this._handleRangeChange(unitId, subUnitId, comment, after, !0);
+        sequenceExecuteAsync(redos, this._commandService, { onlyLocal: !0 });
       }, !0)
     );
   }
-  _unwatch(e, n, t) {
-    var s;
-    const r = this._getIdWithUnitId(e, n, t);
-    (s = this._watcherMap.get(r)) == null || s.dispose(), this._watcherMap.delete(r);
+  _unwatch(unitId, subUnitId, commentId) {
+    var _a4;
+    const id = this._getIdWithUnitId(unitId, subUnitId, commentId);
+    (_a4 = this._watcherMap.get(id)) == null || _a4.dispose(), this._watcherMap.delete(id);
   }
-  _unregister(e, n, t) {
-    var s;
-    const r = this._getIdWithUnitId(e, n, t);
-    (s = this._disposableMap.get(r)) == null || s.dispose(), this._disposableMap.delete(r);
+  _unregister(unitId, subUnitId, commentId) {
+    var _a4;
+    const id = this._getIdWithUnitId(unitId, subUnitId, commentId);
+    (_a4 = this._disposableMap.get(id)) == null || _a4.dispose(), this._disposableMap.delete(id);
   }
   _initData() {
-    const e = this._threadCommentModel.getAll();
-    for (const n of e)
-      for (const t of n.threads) {
-        const { unitId: r, subUnitId: s, root: o } = t, a = u(o.ref), c = {
-          ...o,
-          ...a
+    const datas = this._threadCommentModel.getAll();
+    for (const data of datas)
+      for (const thread of data.threads) {
+        const { unitId, subUnitId, root } = thread, pos = singleReferenceToGrid(root.ref), sheetComment = {
+          ...root,
+          ...pos
         };
-        this._register(r, s, c), this._watch(r, s, c);
+        this._register(unitId, subUnitId, sheetComment), this._watch(unitId, subUnitId, sheetComment);
       }
   }
   _initRefRange() {
     this.disposeWithMe(
-      this._sheetsThreadCommentModel.commentUpdate$.subscribe((e) => {
-        const { unitId: n, subUnitId: t } = e;
-        switch (e.type) {
+      this._sheetsThreadCommentModel.commentUpdate$.subscribe((option) => {
+        const { unitId, subUnitId } = option;
+        switch (option.type) {
           case "add": {
-            if (e.payload.parentId)
+            if (option.payload.parentId)
               return;
-            const r = {
-              ...e.payload,
-              row: e.row,
-              column: e.column
+            const comment = {
+              ...option.payload,
+              row: option.row,
+              column: option.column
             };
-            this._register(e.unitId, e.subUnitId, r), this._watch(e.unitId, e.subUnitId, r);
+            this._register(option.unitId, option.subUnitId, comment), this._watch(option.unitId, option.subUnitId, comment);
             break;
           }
           case "delete": {
-            this._unregister(n, t, e.payload.commentId), this._unwatch(n, t, e.payload.commentId);
+            this._unregister(unitId, subUnitId, option.payload.commentId), this._unwatch(unitId, subUnitId, option.payload.commentId);
             break;
           }
           case "updateRef": {
-            const r = this._sheetsThreadCommentModel.getComment(n, t, e.payload.commentId);
-            if (!r)
+            const comment = this._sheetsThreadCommentModel.getComment(unitId, subUnitId, option.payload.commentId);
+            if (!comment)
               return;
-            this._unregister(n, t, e.payload.commentId);
-            const s = {
-              ...r,
-              row: e.row,
-              column: e.column
+            this._unregister(unitId, subUnitId, option.payload.commentId);
+            const sheetComment = {
+              ...comment,
+              row: option.row,
+              column: option.column
             };
-            e.silent || (this._unwatch(n, t, e.payload.commentId), this._watch(n, t, s)), this._register(e.unitId, e.subUnitId, s);
+            option.silent || (this._unwatch(unitId, subUnitId, option.payload.commentId), this._watch(unitId, subUnitId, sheetComment)), this._register(option.unitId, option.subUnitId, sheetComment);
             break;
           }
         }
       })
-    ), this.disposeWithMe(D(() => {
-      this._disposableMap.forEach((e) => {
-        e.dispose();
+    ), this.disposeWithMe(toDisposable(() => {
+      this._disposableMap.forEach((item) => {
+        item.dispose();
       }), this._disposableMap.clear();
     }));
   }
-};
-f = Q([
-  _(0, l(W)),
-  _(1, l(p)),
-  _(2, l(S)),
-  _(3, l(L)),
-  _(4, b)
-], f);
-const X = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
-var I = Object.defineProperty, Y = Object.getOwnPropertyDescriptor, Z = (i, e, n) => e in i ? I(i, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : i[e] = n, k = (i, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Y(e, n) : e, s = i.length - 1, o; s >= 0; s--)
-    (o = i[s]) && (r = (t ? o(e, n, r) : o(r)) || r);
-  return t && r && I(e, n, r), r;
-}, v = (i, e) => (n, t) => e(n, t, i), U = (i, e, n) => Z(i, typeof e != "symbol" ? e + "" : e, n);
-let g = class extends j {
-  constructor(i, e, n) {
-    super(), this._injector = e, this._commandService = n;
+}, __name(_a2, "SheetsThreadCommentRefRangeController"), _a2);
+SheetsThreadCommentRefRangeController = __decorateClass$1([
+  __decorateParam$1(0, Inject(RefRangeService)),
+  __decorateParam$1(1, Inject(SheetsThreadCommentModel)),
+  __decorateParam$1(2, Inject(ThreadCommentModel)),
+  __decorateParam$1(3, Inject(SheetsSelectionsService)),
+  __decorateParam$1(4, ICommandService)
+], SheetsThreadCommentRefRangeController);
+const SHEET_THREAD_COMMENT_BASE = "SHEET_THREAD_COMMENT_BASE_PLUGIN";
+var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __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"), __publicField2 = /* @__PURE__ */ __name((obj, key, value) => __defNormalProp2(obj, typeof key != "symbol" ? key + "" : key, value), "__publicField"), _a3;
+let UniverSheetsThreadCommentPlugin = (_a3 = class extends Plugin {
+  constructor(config, _injector, _commandService) {
+    super(), this._injector = _injector, this._commandService = _commandService;
   }
   onStarting() {
     [
-      [p],
-      [f]
-    ].forEach((i) => {
-      this._injector.add(i);
-    }), this._injector.get(f);
+      [SheetsThreadCommentModel],
+      [SheetsThreadCommentRefRangeController]
+    ].forEach((dep) => {
+      this._injector.add(dep);
+    }), this._injector.get(SheetsThreadCommentRefRangeController);
   }
-};
-U(g, "pluginName", X);
-U(g, "type", y.UNIVER_SHEET);
-g = k([
-  O(H),
-  v(1, l(A)),
-  v(2, l(b))
-], g);
+}, __name(_a3, "UniverSheetsThreadCommentPlugin"), _a3);
+__publicField2(UniverSheetsThreadCommentPlugin, "pluginName", SHEET_THREAD_COMMENT_BASE);
+__publicField2(UniverSheetsThreadCommentPlugin, "type", UniverInstanceType.UNIVER_SHEET);
+UniverSheetsThreadCommentPlugin = __decorateClass([
+  DependentOn(UniverThreadCommentPlugin),
+  __decorateParam(1, Inject(Injector)),
+  __decorateParam(2, Inject(ICommandService))
+], UniverSheetsThreadCommentPlugin);
 export {
-  p as SheetsThreadCommentModel,
-  f as SheetsThreadCommentRefRangeController,
-  g as UniverSheetsThreadCommentPlugin
+  SheetsThreadCommentModel,
+  SheetsThreadCommentRefRangeController,
+  UniverSheetsThreadCommentPlugin
 };