@univerjs/sheets-thread-comment 0.1.13 → 0.1.14

package/lib/es/index.js

@@ -1,140 +1,140 @@
-var De = Object.defineProperty;
-var Ne = (o, e, n) => e in o ? De(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var _ = (o, e, n) => (Ne(o, typeof e != "symbol" ? e + "" : e, n), n);
-import { Inject as h, Injector as le } from "@wendellhu/redi";
-import { Inject as bn, Injector as Tn } from "@wendellhu/redi";
-import { Disposable as O, ObjectMatrix as je, UniverInstanceType as g, IUniverInstanceService as $, DisposableCollection as Ve, Tools as _e, CommandType as Ae, ICommandService as Q, OnLifecycle as x, LifecycleStages as D, LocaleService as Le, toDisposable as He, Range as Be } from "@univerjs/core";
-import { ICommandService as yn, Plugin as Un, UniverInstanceType as On } from "@univerjs/core";
-import { ThreadCommentTree as We, ThreadCommentPanelService as ee, ThreadCommentPanel as Fe, ToggleSheetCommentPanelOperation as Ze, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as ke, UniverThreadCommentUIPlugin as ze } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as En, UniverThreadCommentUIPlugin as $n } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as Ge, useObservable as oe, KeyCode as Ke, MetaKeys as ie, MenuItemType as ve, MenuPosition as fe, getMenuHiddenObservable as Ce, MenuGroup as Ye, ComponentManager as qe, IMenuService as Xe, IShortcutService as Je } from "@univerjs/ui";
-import { SelectionManagerService as Qe, getSheetCommandTarget as et, WorkbookCommentPermission as ge, WorksheetViewPermission as Se, RangeProtectionPermissionEditPoint as Ie, SetSelectionsOperation as tt, SelectionMoveType as nt, SetWorksheetActiveOperation as rt, RefRangeService as ot, handleDefaultRangeChangeWithEffectRefCommands as it, SheetInterceptorService as Me, INTERCEPTOR_POINT as st, RemoveSheetCommand as at } from "@univerjs/sheets";
+var Ne = Object.defineProperty;
+var je = (o, e, t) => e in o ? Ne(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var v = (o, e, t) => (je(o, typeof e != "symbol" ? e + "" : e, t), t);
+import { Inject as h, Injector as pe } from "@wendellhu/redi";
+import { Inject as yn, Injector as Un } from "@wendellhu/redi";
+import { Disposable as O, ObjectMatrix as Ve, UniverInstanceType as g, IUniverInstanceService as $, DisposableCollection as Ae, Tools as le, CommandType as Le, ICommandService as Q, OnLifecycle as x, LifecycleStages as D, LocaleService as He, toDisposable as Be, Range as We, DependentOn as Fe, Plugin as Ze } from "@univerjs/core";
+import { ICommandService as Rn, Plugin as En, UniverInstanceType as $n } from "@univerjs/core";
+import { ThreadCommentTree as ze, ThreadCommentPanelService as ee, ThreadCommentPanel as ke, ToggleSheetCommentPanelOperation as Ge, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as Ke, UniverThreadCommentUIPlugin as Ye } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as Dn, UniverThreadCommentUIPlugin as Nn } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as qe, useObservable as oe, KeyCode as Xe, MetaKeys as ie, MenuItemType as _e, MenuPosition as ve, getMenuHiddenObservable as fe, MenuGroup as Je, ComponentManager as Qe, IMenuService as et, IShortcutService as tt } from "@univerjs/ui";
+import { SelectionManagerService as nt, getSheetCommandTarget as rt, WorkbookCommentPermission as Ce, WorksheetViewPermission as ge, RangeProtectionPermissionEditPoint as Se, SetSelectionsOperation as ot, SelectionMoveType as it, SetWorksheetActiveOperation as st, RefRangeService as at, handleDefaultRangeChangeWithEffectRefCommands as ct, SheetInterceptorService as Ie, INTERCEPTOR_POINT as dt, RemoveSheetCommand as mt } from "@univerjs/sheets";
 import { singleReferenceToGrid as y, serializeRange as J } from "@univerjs/engine-formula";
-import { SheetCanvasPopManagerService as ct, IMarkSelectionService as dt, whenSheetEditorFocused as mt, getCommentDisable$ as Pe, ScrollToCellCommand as ut, SheetSkeletonManagerService as ht, ISheetClipboardService as pt, COPY_TYPE as lt, HoverManagerService as _t } from "@univerjs/sheets-ui";
-import { ThreadCommentModel as G, DeleteCommentMutation as V, AddCommentMutation as z, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as Dn } from "@univerjs/thread-comment";
+import { SheetCanvasPopManagerService as ut, IMarkSelectionService as ht, whenSheetEditorFocused as pt, getCurrentRangeDisable$ as Pe, ScrollToCellCommand as lt, SheetSkeletonManagerService as _t, ISheetClipboardService as vt, COPY_TYPE as ft, HoverManagerService as Ct } from "@univerjs/sheets-ui";
+import { ThreadCommentModel as G, DeleteCommentMutation as j, AddCommentMutation as z, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as Vn } from "@univerjs/thread-comment";
 import { useDependency as w, useObservable as ae } from "@wendellhu/redi/react-bindings";
-import be, { forwardRef as Te, useRef as we, createElement as ye, useMemo as vt, useCallback as ce, useEffect as ft } from "react";
-import { Subject as Ct, BehaviorSubject as gt, map as St, debounceTime as It } from "rxjs";
-import { IRenderManagerService as Mt } from "@univerjs/engine-render";
+import Me, { forwardRef as be, useRef as Te, createElement as we, useMemo as gt, useCallback as ce, useEffect as St } from "react";
+import { Subject as It, BehaviorSubject as Pt, map as Mt, debounceTime as bt } from "rxjs";
+import { IRenderManagerService as Tt } from "@univerjs/engine-render";
 var f = function() {
   return f = Object.assign || function(o) {
-    for (var e, n = 1, r = arguments.length; n < r; n++) {
-      e = arguments[n];
-      for (var t in e)
-        Object.prototype.hasOwnProperty.call(e, t) && (o[t] = e[t]);
+    for (var e, t = 1, r = arguments.length; t < r; t++) {
+      e = arguments[t];
+      for (var n in e)
+        Object.prototype.hasOwnProperty.call(e, n) && (o[n] = e[n]);
     }
     return o;
   }, f.apply(this, arguments);
-}, Pt = function(o, e) {
-  var n = {};
+}, wt = function(o, e) {
+  var t = {};
   for (var r in o)
-    Object.prototype.hasOwnProperty.call(o, r) && e.indexOf(r) < 0 && (n[r] = o[r]);
+    Object.prototype.hasOwnProperty.call(o, r) && e.indexOf(r) < 0 && (t[r] = o[r]);
   if (o != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var t = 0, r = Object.getOwnPropertySymbols(o); t < r.length; t++)
-      e.indexOf(r[t]) < 0 && Object.prototype.propertyIsEnumerable.call(o, r[t]) && (n[r[t]] = o[r[t]]);
-  return n;
-}, Ue = Te(function(o, e) {
-  var n = o.icon, r = o.id, t = o.className, i = o.extend, s = Pt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(t || "").trim(), c = we("_".concat(wt()));
-  return Oe(n, "".concat(r), { defIds: n.defIds, idSuffix: c.current }, f({ ref: e, className: a }, s), i);
+    for (var n = 0, r = Object.getOwnPropertySymbols(o); n < r.length; n++)
+      e.indexOf(r[n]) < 0 && Object.prototype.propertyIsEnumerable.call(o, r[n]) && (t[r[n]] = o[r[n]]);
+  return t;
+}, ye = be(function(o, e) {
+  var t = o.icon, r = o.id, n = o.className, i = o.extend, s = wt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(n || "").trim(), c = Te("_".concat(Ot()));
+  return Ue(t, "".concat(r), { defIds: t.defIds, idSuffix: c.current }, f({ ref: e, className: a }, s), i);
 });
-function Oe(o, e, n, r, t) {
-  return ye(o.tag, f(f({ key: e }, bt(o, n, t)), r), (Tt(o, n).children || []).map(function(i, s) {
-    return Oe(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, t);
+function Ue(o, e, t, r, n) {
+  return we(o.tag, f(f({ key: e }, yt(o, t, n)), r), (Ut(o, t).children || []).map(function(i, s) {
+    return Ue(i, "".concat(e, "-").concat(o.tag, "-").concat(s), t, void 0, n);
   }));
 }
-function bt(o, e, n) {
+function yt(o, e, t) {
   var r = f({}, o.attrs);
-  n != null && n.colorChannel1 && r.fill === "colorChannel1" && (r.fill = n.colorChannel1);
-  var t = e.defIds;
-  return !t || t.length === 0 || (o.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + e.idSuffix), Object.entries(r).forEach(function(i) {
+  t != null && t.colorChannel1 && r.fill === "colorChannel1" && (r.fill = t.colorChannel1);
+  var n = e.defIds;
+  return !n || n.length === 0 || (o.tag === "use" && r["xlink:href"] && (r["xlink:href"] = r["xlink:href"] + e.idSuffix), Object.entries(r).forEach(function(i) {
     var s = i[0], a = i[1];
     typeof a == "string" && (r[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), r;
 }
-function Tt(o, e) {
-  var n, r = e.defIds;
-  return !r || r.length === 0 ? o : o.tag === "defs" && (!((n = o.children) === null || n === void 0) && n.length) ? f(f({}, o), { children: o.children.map(function(t) {
-    return typeof t.attrs.id == "string" && r && r.indexOf(t.attrs.id) > -1 ? f(f({}, t), { attrs: f(f({}, t.attrs), { id: t.attrs.id + e.idSuffix }) }) : t;
+function Ut(o, e) {
+  var t, r = e.defIds;
+  return !r || r.length === 0 ? o : o.tag === "defs" && (!((t = o.children) === null || t === void 0) && t.length) ? f(f({}, o), { children: o.children.map(function(n) {
+    return typeof n.attrs.id == "string" && r && r.indexOf(n.attrs.id) > -1 ? f(f({}, n), { attrs: f(f({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : o;
 }
-function wt() {
+function Ot() {
   return Math.random().toString(36).substring(2, 8);
 }
-Ue.displayName = "UniverIcon";
-var yt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Re = Te(function(o, e) {
-  return ye(Ue, Object.assign({}, o, {
+ye.displayName = "UniverIcon";
+var Rt = { tag: "svg", attrs: { fill: "none", viewBox: "0 0 17 17", width: "1em", height: "1em" }, children: [{ tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345ZM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521C8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345ZM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521C11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345Z", fillRule: "evenodd", clipRule: "evenodd" } }, { tag: "path", attrs: { fill: "currentColor", d: "M5.83725 6.78345C6.22188 6.78345 6.53368 7.10742 6.53368 7.50706V8.41159C6.53368 8.81123 6.22188 9.13521 5.83725 9.13521 5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345zM8.73904 6.78345C9.12366 6.78345 9.43546 7.10742 9.43546 7.50706V8.41159C9.43546 8.81123 9.12366 9.13521 8.73904 9.13521 8.35441 9.13521 8.04261 8.81123 8.04261 8.41159V7.50706C8.04261 7.10742 8.35441 6.78345 8.73904 6.78345zM11.6408 6.78345C12.0254 6.78345 12.3372 7.10742 12.3372 7.50706V8.41159C12.3372 8.81123 12.0254 9.13521 11.6408 9.13521 11.2562 9.13521 10.9444 8.81123 10.9444 8.41159V7.50706C10.9444 7.10742 11.2562 6.78345 11.6408 6.78345z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M1.84351 3.41861C1.84351 3.01861 2.15531 2.69434 2.53993 2.69434H14.9381C15.3228 2.69434 15.6346 3.01861 15.6346 3.41861V12.4611C15.6346 12.8612 15.3228 13.1854 14.9381 13.1854H8.82117L6.06643 14.6179C5.85054 14.7301 5.59416 14.7181 5.38884 14.5862C5.18352 14.4542 5.05855 14.2211 5.05855 13.9701V13.1854H2.53993C2.15531 13.1854 1.84351 12.8612 1.84351 12.4611L1.84351 3.41861ZM6.45141 12.7982L8.34531 12.0135C8.44201 11.9632 8.54864 11.9371 8.65676 11.9371H14.2417C14.3522 11.9371 14.4417 11.8475 14.4417 11.7371V4.14271C14.4417 4.03225 14.3522 3.94271 14.2417 3.94271H3.23636C3.12591 3.94271 3.03636 4.03225 3.03636 4.14271L3.03636 11.7371C3.03636 11.8475 3.12591 11.9371 3.23636 11.9371L5.75498 11.9371C6.1396 11.9371 6.45141 12.0611 6.45141 12.4611V12.7982Z", fillRule: "evenodd", clipRule: "evenodd" } }] }, Oe = be(function(o, e) {
+  return we(ye, Object.assign({}, o, {
     id: "comment-single",
     ref: e,
-    icon: yt
+    icon: Rt
   }));
 });
-Re.displayName = "CommentSingle";
-var Ut = Object.defineProperty, Ot = Object.getOwnPropertyDescriptor, Rt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Ot(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Ut(e, n, t), t;
-}, de = (o, e) => (n, r) => e(n, r, o);
+Oe.displayName = "CommentSingle";
+var Et = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, xt = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? $t(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && Et(e, t, n), n;
+}, de = (o, e) => (t, r) => e(t, r, o);
 let T = class extends O {
-  constructor(e, n) {
+  constructor(e, t) {
     super();
-    _(this, "_matrixMap", /* @__PURE__ */ new Map());
-    _(this, "_locationMap", /* @__PURE__ */ new Map());
-    _(this, "_commentUpdate$", new Ct());
-    _(this, "commentUpdate$", this._commentUpdate$.asObservable());
-    this._threadCommentModel = e, this._univerInstanceService = n, this._init();
+    v(this, "_matrixMap", /* @__PURE__ */ new Map());
+    v(this, "_locationMap", /* @__PURE__ */ new Map());
+    v(this, "_commentUpdate$", new It());
+    v(this, "commentUpdate$", this._commentUpdate$.asObservable());
+    this._threadCommentModel = e, this._univerInstanceService = t, this._init();
   }
   _init() {
     this._initData(), this._initUpdateTransform();
   }
-  _ensureCommentMatrix(e, n) {
+  _ensureCommentMatrix(e, t) {
     let r = this._matrixMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this._matrixMap.set(e, r));
-    let t = r.get(n);
-    return t || (t = new je(), r.set(n, t)), t;
+    let n = r.get(t);
+    return n || (n = new Ve(), r.set(t, n)), n;
   }
-  _ensureCommentLocationMap(e, n) {
+  _ensureCommentLocationMap(e, t) {
     let r = this._locationMap.get(e);
     r || (r = /* @__PURE__ */ new Map(), this._locationMap.set(e, r));
-    let t = r.get(n);
-    return t || (t = /* @__PURE__ */ new Map(), r.set(n, t)), t;
+    let n = r.get(t);
+    return n || (n = /* @__PURE__ */ new Map(), r.set(t, n)), n;
   }
-  _ensure(e, n) {
-    const r = this._ensureCommentMatrix(e, n), t = this._ensureCommentLocationMap(e, n);
-    return { matrix: r, locationMap: t };
+  _ensure(e, t) {
+    const r = this._ensureCommentMatrix(e, t), n = this._ensureCommentLocationMap(e, t);
+    return { matrix: r, locationMap: n };
   }
   _initData() {
     const e = this._threadCommentModel.getAll();
-    for (const n in e) {
-      const r = e[n];
-      for (const t in r) {
-        const i = r[t];
+    for (const t in e) {
+      const r = e[t];
+      for (const n in r) {
+        const i = r[n];
         for (const s in i) {
           const a = i[s];
-          this._addComment(n, t, a);
+          this._addComment(t, n, a);
         }
       }
     }
   }
-  _addComment(e, n, r) {
-    const t = y(r.ref), i = r.parentId, { row: s, column: a } = t, c = r.id, { matrix: d, locationMap: u } = this._ensure(e, n);
+  _addComment(e, t, r) {
+    const n = y(r.ref), i = r.parentId, { row: s, column: a } = n, c = r.id, { matrix: d, locationMap: u } = this._ensure(e, t);
     !i && s >= 0 && a >= 0 && (d.setValue(s, a, c), u.set(c, { row: s, column: a })), this._commentUpdate$.next({
       unitId: e,
-      subUnitId: n,
+      subUnitId: t,
       payload: r,
       type: "add",
-      ...t
+      ...n
     });
   }
   _initUpdateTransform() {
     this.disposeWithMe(this._threadCommentModel.commentUpdate$.subscribe((e) => {
-      const { unitId: n, subUnitId: r } = e;
+      const { unitId: t, subUnitId: r } = e;
       try {
-        if (this._univerInstanceService.getUnitType(n) !== g.UNIVER_SHEET)
+        if (this._univerInstanceService.getUnitType(t) !== g.UNIVER_SHEET)
           return;
       } catch {
       }
-      const { matrix: t, locationMap: i } = this._ensure(n, r);
+      const { matrix: n, locationMap: i } = this._ensure(t, r);
       switch (e.type) {
         case "add": {
           this._addComment(e.unitId, e.subUnitId, e.payload);
@@ -144,7 +144,7 @@ let T = class extends O {
           const { isRoot: s, comment: a } = e.payload, c = y(a.ref);
           if (s) {
             const { row: d, column: u } = c;
-            d >= 0 && u >= 0 && t.realDeleteValue(d, u);
+            d >= 0 && u >= 0 && n.realDeleteValue(d, u);
           }
           this._commentUpdate$.next({
             ...e,
@@ -153,7 +153,7 @@ let T = class extends O {
           break;
         }
         case "update": {
-          const { commentId: s } = e.payload, a = this._threadCommentModel.getComment(n, r, s);
+          const { commentId: s } = e.payload, a = this._threadCommentModel.getComment(t, r, s);
           if (!a)
             return;
           const c = y(a.ref);
@@ -168,7 +168,7 @@ let T = class extends O {
           if (!c)
             return;
           const { row: d, column: u } = c;
-          t.getValue(d, u) === a && (t.realDeleteValue(d, u), i.delete(a)), s.row >= 0 && s.column >= 0 && (t.setValue(s.row, s.column, a), i.set(a, { row: s.row, column: s.column })), this._commentUpdate$.next({
+          n.getValue(d, u) === a && (n.realDeleteValue(d, u), i.delete(a)), s.row >= 0 && s.column >= 0 && (n.setValue(s.row, s.column, a), i.set(a, { row: s.row, column: s.column })), this._commentUpdate$.next({
             ...e,
             ...s
           });
@@ -177,43 +177,43 @@ let T = class extends O {
       }
     }));
   }
-  getByLocation(e, n, r, t) {
-    return this._ensureCommentMatrix(e, n).getValue(r, t);
+  getByLocation(e, t, r, n) {
+    return this._ensureCommentMatrix(e, t).getValue(r, n);
   }
-  getComment(e, n, r) {
-    return this._threadCommentModel.getComment(e, n, r);
+  getComment(e, t, r) {
+    return this._threadCommentModel.getComment(e, t, r);
   }
-  getCommentWithChildren(e, n, r, t) {
-    const s = this._ensureCommentMatrix(e, n).getValue(r, t);
+  getCommentWithChildren(e, t, r, n) {
+    const s = this._ensureCommentMatrix(e, t).getValue(r, n);
     if (s)
-      return this._threadCommentModel.getCommentWithChildren(e, n, s);
+      return this._threadCommentModel.getCommentWithChildren(e, t, s);
   }
-  showCommentMarker(e, n, r, t) {
-    const i = this.getByLocation(e, n, r, t);
+  showCommentMarker(e, t, r, n) {
+    const i = this.getByLocation(e, t, r, n);
     if (!i)
       return !1;
-    const s = this.getComment(e, n, i);
+    const s = this.getComment(e, t, i);
     return !!(s && !s.resolved);
   }
 };
-T = Rt([
+T = xt([
   de(0, h(G)),
   de(1, $)
 ], T);
-const Ee = "univer.sheet.thread-comment-modal", te = "comment-single", $e = "univer.sheet.thread-comment";
-var Et = Object.defineProperty, $t = Object.getOwnPropertyDescriptor, xt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? $t(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Et(e, n, t), t;
-}, me = (o, e) => (n, r) => e(n, r, o);
+const Re = "univer.sheet.thread-comment-modal", te = "comment-single", Ee = "univer.sheet.thread-comment";
+var Dt = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, jt = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? Nt(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && Dt(e, t, n), n;
+}, me = (o, e) => (t, r) => e(t, r, o);
 let U = class extends O {
-  constructor(e, n) {
+  constructor(e, t) {
     super();
-    _(this, "_lastPopup", null);
-    _(this, "_activePopup");
-    _(this, "_activePopup$", new gt(null));
-    _(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible();
+    v(this, "_lastPopup", null);
+    v(this, "_activePopup");
+    v(this, "_activePopup$", new Pt(null));
+    v(this, "activePopup$", this._activePopup$.asObservable());
+    this._canvasPopupManagerService = e, this._zenZoneService = t, this._initZenVisible();
   }
   get activePopup() {
     return this._activePopup;
@@ -223,10 +223,10 @@ let U = class extends O {
       e && this.hidePopup();
     }));
   }
-  showPopup(e, n) {
+  showPopup(e, t) {
     var d;
-    const { row: r, col: t, unitId: i, subUnitId: s } = e;
-    if (this._activePopup && r === this._activePopup.row && t === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
+    const { row: r, col: n, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && r === this._activePopup.row && n === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
@@ -235,9 +235,9 @@ let U = class extends O {
     this._activePopup = e, this._activePopup$.next(e);
     const a = this._canvasPopupManagerService.attachPopupToCell(
       r,
-      t,
+      n,
       {
-        componentKey: Ee,
+        componentKey: Re,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -250,10 +250,10 @@ let U = class extends O {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Ve();
+    const c = new Ae();
     c.add(a), c.add({
       dispose: () => {
-        n == null || n();
+        t == null || t();
       }
     }), this._lastPopup = c;
   }
@@ -267,22 +267,22 @@ let U = class extends O {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = xt([
-  me(0, h(ct)),
-  me(1, Ge)
+U = jt([
+  me(0, h(ut)),
+  me(1, qe)
 ], U);
-const Dt = () => {
-  const o = w($), e = w(U), n = oe(e.activePopup$), r = w(T);
-  if (oe(r.commentUpdate$), !n)
+const Vt = () => {
+  const o = w($), e = w(U), t = oe(e.activePopup$), r = w(T);
+  if (oe(r.commentUpdate$), !t)
     return null;
-  const { row: t, col: i, unitId: s, subUnitId: a, trigger: c } = n, d = r.getByLocation(s, a, t, i), u = `${_e.chatAtABC(i)}${t + 1}`, p = () => {
+  const { row: n, col: i, unitId: s, subUnitId: a, trigger: c } = t, d = r.getByLocation(s, a, n, i), u = `${le.chatAtABC(i)}${n + 1}`, p = () => {
     e.hidePopup();
   }, R = (S) => {
-    var I, M, E;
-    return (E = (M = (I = o.getCurrentUnitForType(g.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(S)) == null ? void 0 : M.getName()) != null ? E : "";
+    var I, P, E;
+    return (E = (P = (I = o.getCurrentUnitForType(g.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(S)) == null ? void 0 : P.getName()) != null ? E : "";
   };
-  return /* @__PURE__ */ be.createElement(
-    We,
+  return /* @__PURE__ */ Me.createElement(
+    ze,
     {
       onClick: () => {
         e.persistPopup();
@@ -299,14 +299,14 @@ const Dt = () => {
     }
   );
 }, K = {
-  type: Ae.OPERATION,
+  type: Le.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
-    var M;
-    const e = o.get(Qe), n = o.get($), r = o.get(U), t = o.get(ee), i = (M = e.getFirst()) == null ? void 0 : M.primary, s = e.getCurrent(), a = o.get(T);
+    var P;
+    const e = o.get(nt), t = o.get($), r = o.get(U), n = o.get(ee), i = (P = e.getFirst()) == null ? void 0 : P.primary, s = e.getCurrent(), a = o.get(T);
     if (!s || !i)
       return !1;
-    const { unitId: c, sheetId: d } = s, u = et(n, { unitId: c, subUnitId: d });
+    const { unitId: c, sheetId: d } = s, u = rt(t, { unitId: c, subUnitId: d });
     if (!u)
       return !1;
     const { workbook: p, worksheet: R } = u, S = {
@@ -319,34 +319,34 @@ const Dt = () => {
     };
     r.showPopup(S);
     const I = a.getByLocation(c, d, i.actualRow, i.startColumn);
-    return I && t.setActiveComment({
+    return I && n.setActiveComment({
       unitId: c,
       subUnitId: d,
       commentId: I,
       trigger: "context-menu"
     }), !0;
   }
-}, Nt = () => {
-  const o = w(dt), e = w($), n = w(G), r = w(U), t = e.getCurrentUnitForType(g.UNIVER_SHEET);
-  if (!t)
+}, At = () => {
+  const o = w(ht), e = w($), t = w(G), r = w(U), n = e.getCurrentUnitForType(g.UNIVER_SHEET);
+  if (!n)
     return null;
-  const i = t.getUnitId(), s = w(Q), a = vt(() => t.activeSheet$.pipe(St((m) => m == null ? void 0 : m.getSheetId())), [t.activeSheet$]), c = ae(a, t.getActiveSheet().getSheetId()), d = we(), u = w(ee), p = ae(u.activeCommentId$), R = ce((m) => {
-    const l = t.getSheets(), v = {};
-    return l.forEach((C, P) => {
-      v[C.getSheetId()] = P;
+  const i = n.getUnitId(), s = w(Q), a = gt(() => n.activeSheet$.pipe(Mt((m) => m == null ? void 0 : m.getSheetId())), [n.activeSheet$]), c = ae(a, n.getActiveSheet().getSheetId()), d = Te(), u = w(ee), p = ae(u.activeCommentId$), R = ce((m) => {
+    const l = n.getSheets(), _ = {};
+    return l.forEach((C, M) => {
+      _[C.getSheetId()] = M;
     }), m.map((C) => {
       var ne;
-      const P = y(C.ref), xe = [(ne = v[C.subUnitId]) != null ? ne : 0, P.row, P.column];
-      return { ...C, p: xe };
-    }).sort((C, P) => C.p[0] === P.p[0] ? C.p[1] === P.p[1] ? C.p[2] - P.p[2] : C.p[1] - P.p[1] : C.p[0] - P.p[0]);
-  }, [t]), S = ce((m) => {
+      const M = y(C.ref), De = [(ne = _[C.subUnitId]) != null ? ne : 0, M.row, M.column];
+      return { ...C, p: De };
+    }).sort((C, M) => C.p[0] === M.p[0] ? C.p[1] === M.p[1] ? C.p[2] - M.p[2] : C.p[1] - M.p[1] : C.p[0] - M.p[0]);
+  }, [n]), S = ce((m) => {
     if (m.unitId === i && m.subUnitId === c && !m.resolved) {
-      const { row: l, column: v } = y(m.ref);
-      if (!Number.isNaN(l) && !Number.isNaN(v))
+      const { row: l, column: _ } = y(m.ref);
+      if (!Number.isNaN(l) && !Number.isNaN(_))
         return o.addShape({
           range: {
-            startColumn: v,
-            endColumn: v,
+            startColumn: _,
+            endColumn: _,
             startRow: l,
             endRow: l
           },
@@ -361,125 +361,125 @@ const Dt = () => {
         });
     }
   }, [o, c, i]), I = (m) => {
-    var l, v;
-    return (v = (l = t.getSheetBySheetId(m)) == null ? void 0 : l.getName()) != null ? v : "";
-  }, M = () => {
+    var l, _;
+    return (_ = (l = n.getSheetBySheetId(m)) == null ? void 0 : l.getName()) != null ? _ : "";
+  }, P = () => {
     s.executeCommand(K.id);
   }, E = () => {
     r.hidePopup();
-  }, A = (m) => {
+  }, V = (m) => {
     p && p.unitId === m.unitId && p.subUnitId === m.subUnitId && p.commentId === m.id || (d.current && (o.removeShape(d.current), d.current = null), d.current = S(m));
-  }, L = () => {
+  }, A = () => {
     d.current && (o.removeShape(d.current), d.current = null);
   };
-  return ft(() => {
+  return St(() => {
     if (!p)
       return;
-    const m = n.getComment(p.unitId, p.subUnitId, p.commentId);
+    const m = t.getComment(p.unitId, p.subUnitId, p.commentId);
     if (!m)
       return;
     const l = S(m);
     return () => {
       l && o.removeShape(l);
     };
-  }, [S, p, n, o]), /* @__PURE__ */ be.createElement(
-    Fe,
+  }, [S, p, t, o]), /* @__PURE__ */ Me.createElement(
+    ke,
     {
       unitId: i,
       subUnitId$: a,
       type: g.UNIVER_SHEET,
-      onAdd: M,
+      onAdd: P,
       getSubUnitName: I,
       onResolve: E,
       sortComments: R,
-      onItemEnter: A,
-      onItemLeave: L
+      onItemEnter: V,
+      onItemLeave: A
     }
   );
-}, jt = (o) => ({
+}, Lt = (o) => ({
   id: K.id,
-  type: ve.BUTTON,
-  positions: [fe.CONTEXT_MENU],
+  type: _e.BUTTON,
+  positions: [ve.CONTEXT_MENU],
   icon: te,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ce(o, g.UNIVER_SHEET),
+  hidden$: fe(o, g.UNIVER_SHEET),
   disabled$: Pe(o, {
-    workbookTypes: [ge],
-    worksheetTypes: [Se],
-    rangeTypes: [Ie]
+    workbookTypes: [Ce],
+    worksheetTypes: [ge],
+    rangeTypes: [Se]
   })
-}), Vt = (o) => ({
-  id: Ze.id,
-  type: ve.BUTTON,
+}), Ht = (o) => ({
+  id: Ge.id,
+  type: _e.BUTTON,
   icon: te,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: fe.TOOLBAR_START,
-  group: Ye.TOOLBAR_OTHERS,
+  positions: ve.TOOLBAR_START,
+  group: Je.TOOLBAR_OTHERS,
   disabled$: Pe(o, {
-    workbookTypes: [ge],
-    worksheetTypes: [Se],
-    rangeTypes: [Ie]
+    workbookTypes: [Ce],
+    worksheetTypes: [ge],
+    rangeTypes: [Se]
   }),
-  hidden$: Ce(o, g.UNIVER_SHEET)
-}), At = {
+  hidden$: fe(o, g.UNIVER_SHEET)
+}), Bt = {
   id: K.id,
-  binding: Ke.M | ie.CTRL_COMMAND | ie.ALT,
-  preconditions: mt
+  binding: Xe.M | ie.CTRL_COMMAND | ie.ALT,
+  preconditions: pt
 };
-var Lt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Bt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Ht(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Lt(e, n, t), t;
-}, b = (o, e) => (n, r) => e(n, r, o);
-const Wt = {};
-let j = class extends O {
-  constructor(o, e, n, r, t, i, s, a, c, d, u) {
-    super(), this._config = o, this._menuService = e, this._injector = n, this._componentManager = r, this._localeService = t, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = c, this._shortcutService = d, this._univerInstanceService = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
+var Wt = Object.defineProperty, Ft = Object.getOwnPropertyDescriptor, Zt = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? Ft(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && Wt(e, t, n), n;
+}, b = (o, e) => (t, r) => e(t, r, o);
+const zt = {};
+let N = class extends O {
+  constructor(o, e, t, r, n, i, s, a, c, d, u) {
+    super(), this._config = o, this._menuService = e, this._injector = t, this._componentManager = r, this._localeService = n, this._commandService = i, this._sheetsThreadCommentPopupService = s, this._sheetsThreadCommentModel = a, this._threadCommentPanelService = c, this._shortcutService = d, this._univerInstanceService = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initCommandListener(), this._initPanelListener();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(At);
+    this._shortcutService.registerShortcut(Bt);
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((o) => {
-      if (o.id === tt.id) {
-        const e = o.params, { unitId: n, subUnitId: r, selections: t, type: i } = e;
-        if ((i === nt.MOVE_END || i === void 0) && t[0].primary) {
-          const s = t[0].primary.actualRow, a = t[0].primary.actualColumn;
-          if (!this._sheetsThreadCommentModel.showCommentMarker(n, r, s, a)) {
+      if (o.id === ot.id) {
+        const e = o.params, { unitId: t, subUnitId: r, selections: n, type: i } = e;
+        if ((i === it.MOVE_END || i === void 0) && n[0].primary) {
+          const s = n[0].primary.actualRow, a = n[0].primary.actualColumn;
+          if (!this._sheetsThreadCommentModel.showCommentMarker(t, r, s, a)) {
             this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(re.id);
             return;
           }
-          const c = this._sheetsThreadCommentModel.getByLocation(n, r, s, a);
+          const c = this._sheetsThreadCommentModel.getByLocation(t, r, s, a);
           c && this._commandService.executeCommand(re.id, {
-            unitId: n,
+            unitId: t,
             subUnitId: r,
             commentId: c
           });
         }
       }
-      if (o.id === V.id) {
-        const e = o.params, n = this._sheetsThreadCommentPopupService.activePopup;
-        if (!n)
+      if (o.id === j.id) {
+        const e = o.params, t = this._sheetsThreadCommentPopupService.activePopup;
+        if (!t)
           return;
-        const { unitId: r, subUnitId: t, commentId: i } = n;
-        e.unitId === r && e.subUnitId === t && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId: r, subUnitId: n, commentId: i } = t;
+        e.unitId === r && e.subUnitId === n && e.commentId === i && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initMenu() {
     const { menu: o = {} } = this._config;
     [
-      jt,
-      Vt
+      Lt,
+      Ht
     ].forEach((e) => {
       this._menuService.addMenuItem(e(this._injector), o);
     });
   }
   _initComponent() {
     [
-      [Ee, Dt],
-      [ke, Nt],
-      [te, Re]
+      [Re, Vt],
+      [Ke, At],
+      [te, Oe]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
@@ -487,18 +487,18 @@ let j = class extends O {
   _initPanelListener() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (o) => {
       if (o) {
-        const { unitId: e, subUnitId: n, commentId: r, trigger: t } = o, i = this._sheetsThreadCommentModel.getComment(e, n, r);
+        const { unitId: e, subUnitId: t, commentId: r, trigger: n } = o, i = this._sheetsThreadCommentModel.getComment(e, t, r);
         if (!i || i.resolved)
           return;
         const s = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
         if (!s || s.getUnitId() !== e)
           return;
-        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(rt.id, {
+        s.getActiveSheet().getSheetId() !== t && await this._commandService.executeCommand(st.id, {
           unitId: e,
-          subUnitId: n
+          subUnitId: t
         });
         const d = y(i.ref);
-        await this._commandService.executeCommand(ut.id, {
+        await this._commandService.executeCommand(lt.id, {
           range: {
             startColumn: d.column,
             endColumn: d.column,
@@ -507,52 +507,52 @@ let j = class extends O {
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
           unitId: e,
-          subUnitId: n,
+          subUnitId: t,
           row: d.row,
           col: d.column,
           commentId: i.id,
-          trigger: t
+          trigger: n
         });
       } else
         this._sheetsThreadCommentPopupService.hidePopup();
     }));
   }
 };
-j = Bt([
-  x(D.Starting, j),
-  b(1, Xe),
-  b(2, h(le)),
-  b(3, h(qe)),
-  b(4, h(Le)),
+N = Zt([
+  x(D.Starting, N),
+  b(1, et),
+  b(2, h(pe)),
+  b(3, h(Qe)),
+  b(4, h(He)),
   b(5, Q),
   b(6, h(U)),
   b(7, h(T)),
   b(8, h(ee)),
-  b(9, Je),
+  b(9, tt),
   b(10, $)
-], j);
-var Ft = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, kt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Zt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Ft(e, n, t), t;
-}, Y = (o, e) => (n, r) => e(n, r, o);
-let B = class extends O {
-  constructor(e, n, r) {
+], N);
+var kt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, Kt = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? Gt(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && kt(e, t, n), n;
+}, Y = (o, e) => (t, r) => e(t, r, o);
+let H = class extends O {
+  constructor(e, t, r) {
     super();
-    _(this, "_disposableMap", /* @__PURE__ */ new Map());
-    this._refRangeService = e, this._sheetsThreadCommentModel = n, this._threadCommentModel = r, this._initData(), this._initRefRange();
+    v(this, "_disposableMap", /* @__PURE__ */ new Map());
+    this._refRangeService = e, this._sheetsThreadCommentModel = t, this._threadCommentModel = r, this._initData(), this._initRefRange();
   }
-  _getIdWithUnitId(e, n, r) {
-    return `${e}-${n}-${r}`;
+  _getIdWithUnitId(e, t, r) {
+    return `${e}-${t}-${r}`;
   }
-  _register(e, n, r) {
-    const t = r.id, i = {
+  _register(e, t, r) {
+    const n = r.id, i = {
       startColumn: r.column,
       endColumn: r.column,
       startRow: r.row,
       endRow: r.row
     }, s = (a) => {
-      const c = it(i, a);
+      const c = ct(i, a);
       return c && c.startColumn === i.startColumn && c.startRow === i.startRow ? {
         undos: [],
         redos: []
@@ -561,10 +561,10 @@ let B = class extends O {
           id: se.id,
           params: {
             unitId: e,
-            subUnitId: n,
+            subUnitId: t,
             payload: {
               ref: J(c),
-              commentId: t
+              commentId: n
             }
           }
         }],
@@ -572,46 +572,46 @@ let B = class extends O {
           id: se.id,
           params: {
             unitId: e,
-            subUnitId: n,
+            subUnitId: t,
             payload: {
               ref: J(i),
-              commentId: t
+              commentId: n
             }
           }
         }]
       } : {
         redos: [{
-          id: V.id,
+          id: j.id,
           params: {
             unitId: e,
-            subUnitId: n,
-            commentId: t
+            subUnitId: t,
+            commentId: n
           }
         }],
         undos: [{
           id: z.id,
           params: {
             unitId: e,
-            subUnitId: n,
+            subUnitId: t,
             comment: r
           }
         }]
       };
     };
     this._disposableMap.set(
-      this._getIdWithUnitId(e, n, t),
-      this._refRangeService.registerRefRange(i, s, e, n)
+      this._getIdWithUnitId(e, t, n),
+      this._refRangeService.registerRefRange(i, s, e, t)
     );
   }
   _initData() {
     const e = this._threadCommentModel.getAll();
-    for (const n in e) {
-      const r = e[n];
-      for (const t in r) {
-        const i = r[t];
+    for (const t in e) {
+      const r = e[t];
+      for (const n in r) {
+        const i = r[n];
         for (const s in i) {
           const a = i[s], c = a.ref, d = y(c);
-          this._register(n, t, {
+          this._register(t, n, {
             ...a,
             ...d
           });
@@ -622,29 +622,29 @@ let B = class extends O {
   _initRefRange() {
     this.disposeWithMe(
       this._sheetsThreadCommentModel.commentUpdate$.subscribe((e) => {
-        const { unitId: n, subUnitId: r } = e;
+        const { unitId: t, subUnitId: r } = e;
         switch (e.type) {
           case "add": {
-            const t = e.payload;
+            const n = e.payload;
             this._register(e.unitId, e.subUnitId, {
-              ...t,
+              ...n,
               row: e.row,
               column: e.column
             });
             break;
           }
           case "delete": {
-            const t = this._disposableMap.get(this._getIdWithUnitId(n, r, e.payload.commentId));
-            t == null || t.dispose();
+            const n = this._disposableMap.get(this._getIdWithUnitId(t, r, e.payload.commentId));
+            n == null || n.dispose();
             break;
           }
           case "updateRef": {
-            const t = this._sheetsThreadCommentModel.getComment(n, r, e.payload.commentId);
-            if (!t)
+            const n = this._sheetsThreadCommentModel.getComment(t, r, e.payload.commentId);
+            if (!n)
               return;
-            const i = this._disposableMap.get(this._getIdWithUnitId(n, r, t.id));
+            const i = this._disposableMap.get(this._getIdWithUnitId(t, r, n.id));
             i == null || i.dispose(), this._register(e.unitId, e.subUnitId, {
-              ...t,
+              ...n,
               row: e.row,
               column: e.column
             });
@@ -652,36 +652,36 @@ let B = class extends O {
           }
         }
       })
-    ), this.disposeWithMe(He(() => {
+    ), this.disposeWithMe(Be(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-B = kt([
-  x(D.Starting, B),
-  Y(0, h(ot)),
+H = Kt([
+  x(D.Starting, H),
+  Y(0, h(at)),
   Y(1, h(T)),
   Y(2, h(G))
-], B);
-var zt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, Kt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Gt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && zt(e, n, t), t;
-}, N = (o, e) => (n, r) => e(n, r, o);
-let W = class extends O {
-  constructor(o, e, n, r, t) {
-    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._sheetSkeletonManagerService = r, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
+], H);
+var Yt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Xt = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? qt(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && Yt(e, t, n), n;
+}, L = (o, e) => (t, r) => e(t, r, o);
+let B = class extends O {
+  constructor(o, e, t, r) {
+    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = t, this._renderManagerService = r, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        st.CELL_CONTENT,
+        dt.CELL_CONTENT,
         {
-          handler: (o, e, n) => {
-            const { row: r, col: t, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, r, t) ? n({
+          handler: (o, e, t) => {
+            const { row: r, col: n, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, r, n) ? t({
               ...o,
               markers: {
                 ...o == null ? void 0 : o.markers,
@@ -690,7 +690,7 @@ let W = class extends O {
                   size: 6
                 }
               }
-            }) : n(o);
+            }) : t(o);
           },
           priority: 100
         }
@@ -702,74 +702,73 @@ let W = class extends O {
       const e = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
       if (!e)
         return;
-      const n = e.getUnitId(), r = e.getActiveSheet().getSheetId(), t = this._sheetSkeletonManagerService.getOrCreateSkeleton({ unitId: n, sheetId: r }), i = this._renderManagerService.getRenderById(n);
-      t == null || t.makeDirty(!0), t == null || t.calculate(), i && i.mainComponent.makeForceDirty();
+      const t = e.getUnitId(), r = e.getActiveSheet().getSheetId(), n = this._renderManagerService.getRenderById(t), i = n == null ? void 0 : n.with(_t).getOrCreateSkeleton({ sheetId: r });
+      i == null || i.makeDirty(!0), i == null || i.calculate(), n && n.mainComponent.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(() => {
       o();
     }));
   }
 };
-W = Kt([
-  x(D.Ready, W),
-  N(0, h(Me)),
-  N(1, h(T)),
-  N(2, $),
-  N(3, h(ht)),
-  N(4, Mt)
-], W);
-var Yt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Xt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? qt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Yt(e, n, t), t;
-}, ue = (o, e) => (n, r) => e(n, r, o);
-const Jt = (o, e, n) => {
-  const r = y(o), t = n.row - e.row, i = n.column - e.column, s = {
+B = Xt([
+  x(D.Ready, B),
+  L(0, h(Ie)),
+  L(1, h(T)),
+  L(2, $),
+  L(3, Tt)
+], B);
+var Jt = Object.defineProperty, Qt = Object.getOwnPropertyDescriptor, en = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? Qt(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && Jt(e, t, n), n;
+}, ue = (o, e) => (t, r) => e(t, r, o);
+const tn = (o, e, t) => {
+  const r = y(o), n = t.row - e.row, i = t.column - e.column, s = {
     startColumn: r.column + i,
-    startRow: r.row + t,
+    startRow: r.row + n,
     endColumn: r.column + i,
-    endRow: r.row + t
+    endRow: r.row + n
   };
   return J(s);
 };
-let F = class extends O {
-  constructor(e, n) {
+let W = class extends O {
+  constructor(e, t) {
     super();
-    _(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._initClipboardHook();
+    v(this, "_copyInfo");
+    this._sheetClipboardService = e, this._sheetsThreadCommentModel = t, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: $e,
-        onBeforeCopy: (e, n, r) => {
+        id: Ee,
+        onBeforeCopy: (e, t, r) => {
           this._copyInfo = {
             unitId: e,
-            subUnitId: n,
+            subUnitId: t,
             range: r
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, r, t) => {
-          const { unitId: i, subUnitId: s, range: a } = n, c = {
+        onPasteCells: (e, t, r, n) => {
+          const { unitId: i, subUnitId: s, range: a } = t, c = {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (t.copyType === lt.CUT && this._copyInfo) {
+          if (n.copyType === ft.CUT && this._copyInfo) {
             const { range: d, unitId: u, subUnitId: p } = this._copyInfo, R = {
               row: d.startRow,
               column: d.startColumn
             };
             if (!(i === u && s === p)) {
               const S = [];
-              Be.foreach(d, (m, l) => {
-                const v = this._sheetsThreadCommentModel.getCommentWithChildren(u, p, m, l);
-                v && S.push(v);
+              We.foreach(d, (m, l) => {
+                const _ = this._sheetsThreadCommentModel.getCommentWithChildren(u, p, m, l);
+                _ && S.push(_);
               });
-              const I = [], M = [], E = [], A = [], L = (m) => {
+              const I = [], P = [], E = [], V = [], A = (m) => {
                 I.unshift({
-                  id: V.id,
+                  id: j.id,
                   params: {
                     unitId: u,
                     subUnitId: p,
@@ -782,20 +781,20 @@ let F = class extends O {
                     subUnitId: s,
                     comment: {
                       ...m,
-                      ref: Jt(m.ref, R, c),
+                      ref: tn(m.ref, R, c),
                       unitId: i,
                       subUnitId: s
                     }
                   }
-                }), M.push({
+                }), P.push({
                   id: z.id,
                   params: {
                     unitId: u,
                     subUnitId: p,
                     comment: m
                   }
-                }), A.unshift({
-                  id: V.id,
+                }), V.unshift({
+                  id: j.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
@@ -804,12 +803,12 @@ let F = class extends O {
                 });
               };
               return S.forEach((m) => {
-                L(m.root), m.children.forEach((l) => {
-                  L(l);
+                A(m.root), m.children.forEach((l) => {
+                  A(l);
                 });
               }), {
                 redos: [...I, ...E],
-                undos: [...A, ...M]
+                undos: [...V, ...P]
               };
             }
           }
@@ -822,31 +821,31 @@ let F = class extends O {
     );
   }
 };
-F = Xt([
-  x(D.Rendered, F),
-  ue(0, h(pt)),
+W = en([
+  x(D.Rendered, W),
+  ue(0, h(vt)),
   ue(1, h(T))
-], F);
-var Qt = Object.defineProperty, en = Object.getOwnPropertyDescriptor, tn = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? en(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && Qt(e, n, t), t;
-}, q = (o, e) => (n, r) => e(n, r, o);
-let Z = class extends O {
-  constructor(o, e, n) {
-    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._initHoverEvent();
+], W);
+var nn = Object.defineProperty, rn = Object.getOwnPropertyDescriptor, on = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? rn(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && nn(e, t, n), n;
+}, q = (o, e) => (t, r) => e(t, r, o);
+let F = class extends O {
+  constructor(o, e, t) {
+    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = t, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(It(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(bt(100)).subscribe((o) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (o && (e && e.temp || !e)) {
-          const { location: n } = o, { unitId: r, subUnitId: t, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(r, t, i, s);
+          const { location: t } = o, { unitId: r, subUnitId: n, row: i, col: s } = t, a = this._sheetsThreadCommentModel.getByLocation(r, n, i, s);
           if (a) {
-            const c = this._sheetsThreadCommentModel.getComment(r, t, a);
+            const c = this._sheetsThreadCommentModel.getComment(r, n, a);
             c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
               unitId: r,
-              subUnitId: t,
+              subUnitId: n,
               row: i,
               col: s,
               commentId: a,
@@ -859,41 +858,41 @@ let Z = class extends O {
     );
   }
 };
-Z = tn([
-  x(D.Rendered, Z),
-  q(0, h(_t)),
+F = on([
+  x(D.Rendered, F),
+  q(0, h(Ct)),
   q(1, h(U)),
   q(2, h(T))
-], Z);
-var nn = Object.defineProperty, rn = Object.getOwnPropertyDescriptor, on = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? rn(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && nn(e, n, t), t;
-}, X = (o, e) => (n, r) => e(n, r, o);
-let k = class extends O {
-  constructor(o, e, n) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
+], F);
+var sn = Object.defineProperty, an = Object.getOwnPropertyDescriptor, cn = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? an(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && sn(e, t, n), n;
+}, X = (o, e) => (t, r) => e(t, r, o);
+let Z = class extends O {
+  constructor(o, e, t) {
+    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = t, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
-          if (o.id === at.id) {
-            const e = o.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
-            if (!n)
+          if (o.id === mt.id) {
+            const e = o.params, t = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
+            if (!t)
               return { redos: [], undos: [] };
-            const r = n.getUnitId(), t = e.subUnitId || n.getActiveSheet().getSheetId(), { commentMap: i } = this._threadCommentModel.ensureMap(r, t), s = Array.from(Object.keys(i)), a = Array.from(Object.values(i)), c = s.map((u) => ({
-              id: V.id,
+            const r = t.getUnitId(), n = e.subUnitId || t.getActiveSheet().getSheetId(), { commentMap: i } = this._threadCommentModel.ensureMap(r, n), s = Array.from(Object.keys(i)), a = Array.from(Object.values(i)), c = s.map((u) => ({
+              id: j.id,
               params: {
                 unitId: r,
-                subUnitId: t,
+                subUnitId: n,
                 commentId: u
               }
             })), d = a.map((u) => ({
               id: z.id,
               params: {
                 unitId: r,
-                subUnitId: t,
+                subUnitId: n,
                 comment: u
               }
             }));
@@ -905,65 +904,68 @@ let k = class extends O {
     );
   }
 };
-k = on([
-  x(D.Ready, k),
-  X(0, h(Me)),
+Z = cn([
+  x(D.Ready, Z),
+  X(0, h(Ie)),
   X(1, $),
   X(2, h(G))
-], k);
-var sn = Object.defineProperty, an = Object.getOwnPropertyDescriptor, cn = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? an(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (t = (r ? s(e, n, t) : s(t)) || t);
-  return r && t && sn(e, n, t), t;
-}, he = (o, e) => (n, r) => e(n, r, o), H;
-let pe = (H = class extends ze {
-  constructor(e = {}, n, r) {
-    super(e, n, r);
-    _(this, "_pluginConfig");
-    this._injector = n, this._commandService = r, this._pluginConfig = _e.deepMerge({}, Wt, e);
+], Z);
+var $e = Object.defineProperty, dn = Object.getOwnPropertyDescriptor, mn = (o, e, t) => e in o ? $e(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, un = (o, e, t, r) => {
+  for (var n = r > 1 ? void 0 : r ? dn(e, t) : e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = (r ? s(e, t, n) : s(n)) || n);
+  return r && n && $e(e, t, n), n;
+}, he = (o, e) => (t, r) => e(t, r, o), xe = (o, e, t) => (mn(o, typeof e != "symbol" ? e + "" : e, t), t);
+let k = class extends Ze {
+  constructor(e = {}, t, r) {
+    super();
+    v(this, "_pluginConfig");
+    this._injector = t, this._commandService = r, this._pluginConfig = le.deepMerge({}, zt, e);
   }
   onStarting(e) {
-    super.onStarting(e), [
+    [
       [T],
       [
-        j,
+        N,
         {
-          useFactory: () => this._injector.createInstance(j, this._pluginConfig)
+          useFactory: () => this._injector.createInstance(N, this._pluginConfig)
         }
       ],
+      [H],
       [B],
       [W],
       [F],
       [Z],
-      [k],
       [U]
-    ].forEach((n) => {
-      this._injector.add(n);
-    }), [K].forEach((n) => {
-      this._commandService.registerCommand(n);
+    ].forEach((t) => {
+      e.add(t);
+    }), [K].forEach((t) => {
+      this._commandService.registerCommand(t);
     });
   }
-}, _(H, "pluginName", $e), _(H, "type", g.UNIVER_SHEET), H);
-pe = cn([
-  he(1, h(le)),
+};
+xe(k, "pluginName", Ee);
+xe(k, "type", g.UNIVER_SHEET);
+k = un([
+  Fe(Ye),
+  he(1, h(pe)),
   he(2, h(Q))
-], pe);
+], k);
 export {
-  yn as ICommandService,
-  Dn as IThreadCommentDataSourceService,
-  En as IThreadCommentMentionDataService,
-  bn as Inject,
-  Tn as Injector,
-  Un as Plugin,
-  $e as SHEETS_THREAD_COMMENT,
-  j as SheetsThreadCommentController,
-  F as SheetsThreadCommentCopyPasteController,
-  Z as SheetsThreadCommentHoverController,
+  Rn as ICommandService,
+  Vn as IThreadCommentDataSourceService,
+  Dn as IThreadCommentMentionDataService,
+  yn as Inject,
+  Un as Injector,
+  En as Plugin,
+  Ee as SHEETS_THREAD_COMMENT,
+  N as SheetsThreadCommentController,
+  W as SheetsThreadCommentCopyPasteController,
+  F as SheetsThreadCommentHoverController,
   T as SheetsThreadCommentModel,
   U as SheetsThreadCommentPopupService,
-  B as SheetsThreadCommentRefRangeController,
-  k as ThreadCommentRemoveSheetsController,
-  On as UniverInstanceType,
-  pe as UniverSheetsThreadCommentPlugin,
-  $n as UniverThreadCommentUIPlugin
+  H as SheetsThreadCommentRefRangeController,
+  Z as ThreadCommentRemoveSheetsController,
+  $n as UniverInstanceType,
+  k as UniverSheetsThreadCommentPlugin,
+  Nn as UniverThreadCommentUIPlugin
 };