@univerjs/sheets-thread-comment 0.1.12 → 0.1.13-nightly.202406041140

package/lib/es/index.js

@@ -1,150 +1,150 @@
-var Re = Object.defineProperty;
-var Ee = (o, e, n) => e in o ? Re(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var _ = (o, e, n) => (Ee(o, typeof e != "symbol" ? e + "" : e, n), n);
-import { Inject as h, Injector as pe } from "@wendellhu/redi";
-import { Inject as Sn, Injector as gn } from "@wendellhu/redi";
-import { Disposable as O, ObjectMatrix as $e, UniverInstanceType as S, IUniverInstanceService as $, DisposableCollection as xe, Tools as _e, CommandType as Ne, ICommandService as Q, OnLifecycle as x, LifecycleStages as N, LocaleService as De, toDisposable as je, Range as Ve } from "@univerjs/core";
-import { ICommandService as Mn, Plugin as Pn, UniverInstanceType as bn } from "@univerjs/core";
-import { ThreadCommentTree as Ae, ThreadCommentPanelService as ee, ThreadCommentPanel as Le, ToggleSheetCommentPanelOperation as He, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as Be, UniverThreadCommentUIPlugin as We } from "@univerjs/thread-comment-ui";
-import { IThreadCommentMentionDataService as wn, UniverThreadCommentUIPlugin as yn } from "@univerjs/thread-comment-ui";
-import { IZenZoneService as Fe, useObservable as oe, KeyCode as Ze, MetaKeys as ie, MenuItemType as ve, MenuPosition as fe, getMenuHiddenObservable as Ce, ComponentManager as ze, IMenuService as Ke, IShortcutService as Ge } from "@univerjs/ui";
-import { SelectionManagerService as Ye, getSheetCommandTarget as ke, SetSelectionsOperation as qe, SelectionMoveType as Xe, SetWorksheetActiveOperation as Je, RefRangeService as Qe, handleDefaultRangeChangeWithEffectRefCommands as et, SheetInterceptorService as Se, INTERCEPTOR_POINT as tt, RemoveSheetCommand as nt } from "@univerjs/sheets";
-import { singleReferenceToGrid as y, serializeRange as J } from "@univerjs/engine-formula";
-import { SheetCanvasPopManagerService as rt, IMarkSelectionService as ot, whenSheetEditorFocused as it, ScrollToCellCommand as st, SheetSkeletonManagerService as at, ISheetClipboardService as ct, COPY_TYPE as mt, HoverManagerService as dt } from "@univerjs/sheets-ui";
-import { ThreadCommentModel as G, DeleteCommentMutation as V, AddCommentMutation as K, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
-import { IThreadCommentDataSourceService as On } from "@univerjs/thread-comment";
-import { useDependency as w, useObservable as ae } from "@wendellhu/redi/react-bindings";
-import ge, { forwardRef as Ie, useRef as Me, createElement as Pe, useMemo as ut, useCallback as ce, useEffect as ht } from "react";
-import { Subject as lt, BehaviorSubject as pt, map as _t } from "rxjs";
-import { IRenderManagerService as vt } 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]);
+var $e = Object.defineProperty;
+var Ne = (o, e, t) => e in o ? $e(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t;
+var v = (o, e, t) => (Ne(o, typeof e != "symbol" ? e + "" : e, t), t);
+import { Inject as h, Injector as le } from "@wendellhu/redi";
+import { Inject as mn, Injector as un } from "@wendellhu/redi";
+import { Disposable as R, ObjectMatrix as Ve, UniverInstanceType as g, IUniverInstanceService as x, DisposableCollection as Ae, Tools as pe, CommandType as Le, ICommandService as Q, OnLifecycle as O, LifecycleStages as $, LocaleService as De, toDisposable as He, Range as je, DependentOn as Be, Plugin as We } from "@univerjs/core";
+import { ICommandService as ln, Plugin as pn, UniverInstanceType as _n } from "@univerjs/core";
+import { ThreadCommentTree as Fe, ThreadCommentPanelService as ee, ThreadCommentPanel as Ze, ToggleSheetCommentPanelOperation as ze, SetActiveCommentOperation as re, THREAD_COMMENT_PANEL as Ge, UniverThreadCommentUIPlugin as Ke } from "@univerjs/thread-comment-ui";
+import { IThreadCommentMentionDataService as Cn, UniverThreadCommentUIPlugin as fn } from "@univerjs/thread-comment-ui";
+import { IZenZoneService as Ye, useObservable as oe, KeyCode as qe, MetaKeys as ie, MenuItemType as _e, MenuPosition as ve, getMenuHiddenObservable as Ce, MenuGroup as Xe, ComponentManager as Je, IMenuService as Qe, IShortcutService as et } from "@univerjs/ui";
+import { SelectionManagerService as tt, getSheetCommandTarget as nt, WorkbookCommentPermission as fe, WorksheetViewPermission as ge, RangeProtectionPermissionEditPoint as Se, SetSelectionsOperation as rt, SelectionMoveType as ot, SetWorksheetActiveOperation as it, RefRangeService as st, handleDefaultRangeChangeWithEffectRefCommands as at, SheetInterceptorService as Ie, INTERCEPTOR_POINT as ct, RemoveSheetCommand as dt } from "@univerjs/sheets";
+import { singleReferenceToGrid as w, serializeRange as J } from "@univerjs/engine-formula";
+import { SheetCanvasPopManagerService as mt, IMarkSelectionService as ut, whenSheetEditorFocused as ht, getCommentDisable$ as Me, ScrollToCellCommand as lt, SheetSkeletonManagerService as pt, ISheetClipboardService as _t, COPY_TYPE as vt, HoverManagerService as Ct } from "@univerjs/sheets-ui";
+import { ThreadCommentModel as G, DeleteCommentMutation as A, AddCommentMutation as Z, UpdateCommentRefMutation as se } from "@univerjs/thread-comment";
+import { IThreadCommentDataSourceService as Sn } from "@univerjs/thread-comment";
+import { useDependency as P, useObservable as ae } from "@wendellhu/redi/react-bindings";
+import be, { forwardRef as Te, useRef as ye, createElement as Pe, useMemo as ft, useCallback as ce, useEffect as gt } from "react";
+import { Subject as St, BehaviorSubject as It, map as Mt, debounceTime as bt } from "rxjs";
+import { IRenderManagerService as Tt } from "@univerjs/engine-render";
+var C = function() {
+  return C = Object.assign || function(o) {
+    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);
-}, ft = function(o, e) {
-  var n = {};
+  }, C.apply(this, arguments);
+}, yt = 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;
-}, be = Ie(function(o, e) {
-  var n = o.icon, r = o.id, t = o.className, i = o.extend, s = ft(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(t || "").trim(), c = Me("_".concat(gt()));
-  return Te(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;
+}, we = Te(function(o, e) {
+  var t = o.icon, r = o.id, n = o.className, i = o.extend, s = yt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(r, " ").concat(n || "").trim(), c = ye("_".concat(Ut()));
+  return Ue(t, "".concat(r), { defIds: t.defIds, idSuffix: c.current }, C({ ref: e, className: a }, s), i);
 });
-function Te(o, e, n, r, t) {
-  return Pe(o.tag, f(f({ key: e }, Ct(o, n, t)), r), (St(o, n).children || []).map(function(i, s) {
-    return Te(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, t);
+function Ue(o, e, t, r, n) {
+  return Pe(o.tag, C(C({ key: e }, Pt(o, t, n)), r), (wt(o, t).children || []).map(function(i, s) {
+    return Ue(i, "".concat(e, "-").concat(o.tag, "-").concat(s), t, void 0, n);
   }));
 }
-function Ct(o, e, n) {
-  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) {
+function Pt(o, e, t) {
+  var r = C({}, o.attrs);
+  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 St(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 wt(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) ? C(C({}, o), { children: o.children.map(function(n) {
+    return typeof n.attrs.id == "string" && r && r.indexOf(n.attrs.id) > -1 ? C(C({}, n), { attrs: C(C({}, n.attrs), { id: n.attrs.id + e.idSuffix }) }) : n;
   }) }) : o;
 }
-function gt() {
+function Ut() {
   return Math.random().toString(36).substring(2, 8);
 }
-be.displayName = "UniverIcon";
-var It = { 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" } }] }, we = Ie(function(o, e) {
-  return Pe(be, Object.assign({}, o, {
+we.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" } }] }, Re = Te(function(o, e) {
+  return Pe(we, Object.assign({}, o, {
     id: "comment-single",
     ref: e,
-    icon: It
+    icon: Rt
   }));
 });
-we.displayName = "CommentSingle";
-var Mt = Object.defineProperty, Pt = Object.getOwnPropertyDescriptor, bt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Pt(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 && Mt(e, n, t), t;
-}, me = (o, e) => (n, r) => e(n, r, o);
-let T = class extends O {
-  constructor(e, n) {
+Re.displayName = "CommentSingle";
+var Et = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, de = (o, e) => (t, r) => e(t, r, o);
+let y = class extends R {
+  constructor(e, t) {
     super();
-    _(this, "_matrixMap", /* @__PURE__ */ new Map());
-    _(this, "_locationMap", /* @__PURE__ */ new Map());
-    _(this, "_commentUpdate$", new lt());
-    _(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 St());
+    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 $e(), 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: m, locationMap: u } = this._ensure(e, n);
-    !i && s >= 0 && a >= 0 && (m.setValue(s, a, c), u.set(c, { row: s, column: a })), this._commentUpdate$.next({
+  _addComment(e, t, r) {
+    const n = w(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) !== S.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);
           break;
         }
         case "delete": {
-          const { isRoot: s, comment: a } = e.payload, c = y(a.ref);
+          const { isRoot: s, comment: a } = e.payload, c = w(a.ref);
           if (s) {
-            const { row: m, column: u } = c;
-            m >= 0 && u >= 0 && t.realDeleteValue(m, u);
+            const { row: d, column: u } = c;
+            d >= 0 && u >= 0 && n.realDeleteValue(d, u);
           }
           this._commentUpdate$.next({
             ...e,
@@ -153,10 +153,10 @@ 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);
+          const c = w(a.ref);
           this._commentUpdate$.next({
             ...e,
             ...c
@@ -164,11 +164,11 @@ let T = class extends O {
           break;
         }
         case "updateRef": {
-          const s = y(e.payload.ref), { commentId: a } = e.payload, c = i.get(a);
+          const s = w(e.payload.ref), { commentId: a } = e.payload, c = i.get(a);
           if (!c)
             return;
-          const { row: m, column: u } = c;
-          t.getValue(m, u) === a && (t.realDeleteValue(m, 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({
+          const { row: d, column: u } = c;
+          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 = bt([
-  me(0, h(G)),
-  me(1, $)
-], T);
-const ye = "univer.sheet.thread-comment-modal", te = "comment-single", Ue = "univer.sheet.thread-comment";
-var Tt = Object.defineProperty, wt = Object.getOwnPropertyDescriptor, yt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? wt(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 && Tt(e, n, t), t;
-}, de = (o, e) => (n, r) => e(n, r, o);
-let U = class extends O {
-  constructor(e, n) {
+y = Et([
+  de(0, h(G)),
+  de(1, x)
+], y);
+const Ee = "univer.sheet.thread-comment-modal", te = "comment-single", ke = "univer.sheet.thread-comment";
+var kt = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, me = (o, e) => (t, r) => e(t, r, o);
+let U = class extends R {
+  constructor(e, t) {
     super();
-    _(this, "_lastPopup", null);
-    _(this, "_activePopup");
-    _(this, "_activePopup$", new pt(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 It(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) {
-    var m;
-    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 === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
+  showPopup(e, t) {
+    var d;
+    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: ye,
+        componentKey: Ee,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -250,10 +250,10 @@ let U = class extends O {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new xe();
+    const c = new Ae();
     c.add(a), c.add({
       dispose: () => {
-        n == null || n();
+        t == null || t();
       }
     }), this._lastPopup = c;
   }
@@ -267,86 +267,86 @@ let U = class extends O {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = yt([
-  de(0, h(rt)),
-  de(1, Fe)
+U = kt([
+  me(0, h(mt)),
+  me(1, Ye)
 ], U);
-const Ut = () => {
-  const o = w($), e = w(U), n = oe(e.activePopup$), r = w(T);
-  if (oe(r.commentUpdate$), !n)
+const xt = () => {
+  const o = P(x), e = P(U), t = oe(e.activePopup$), r = P(y);
+  if (oe(r.commentUpdate$), !t)
     return null;
-  const { row: t, col: i, unitId: s, subUnitId: a, trigger: c } = n, m = r.getByLocation(s, a, t, i), u = `${_e.chatAtABC(i)}${t + 1}`, l = () => {
+  const { row: n, col: i, unitId: s, subUnitId: a, trigger: c } = t, d = r.getByLocation(s, a, n, i), u = `${pe.chatAtABC(i)}${n + 1}`, l = () => {
     e.hidePopup();
-  }, R = (g) => {
-    var I, M, E;
-    return (E = (M = (I = o.getCurrentUnitForType(S.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(g)) == null ? void 0 : M.getName()) != null ? E : "";
+  }, E = (S) => {
+    var I, M, k;
+    return (k = (M = (I = o.getCurrentUnitForType(g.UNIVER_SHEET)) == null ? void 0 : I.getSheetBySheetId(S)) == null ? void 0 : M.getName()) != null ? k : "";
   };
-  return /* @__PURE__ */ ge.createElement(
-    Ae,
+  return /* @__PURE__ */ be.createElement(
+    Fe,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: m,
+      id: d,
       unitId: s,
       subUnitId: a,
-      type: S.UNIVER_SHEET,
+      type: g.UNIVER_SHEET,
       refStr: u,
       onClose: l,
-      getSubUnitName: R,
+      getSubUnitName: E,
       autoFocus: c === "context-menu"
     }
   );
-}, Y = {
-  type: Ne.OPERATION,
+}, K = {
+  type: Le.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
     var M;
-    const e = o.get(Ye), 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);
+    const e = o.get(tt), t = o.get(x), r = o.get(U), n = o.get(ee), i = (M = e.getFirst()) == null ? void 0 : M.primary, s = e.getCurrent(), a = o.get(y);
     if (!s || !i)
       return !1;
-    const { unitId: c, sheetId: m } = s, u = ke(n, { unitId: c, subUnitId: m });
+    const { unitId: c, sheetId: d } = s, u = nt(t, { unitId: c, subUnitId: d });
     if (!u)
       return !1;
-    const { workbook: l, worksheet: R } = u, g = {
+    const { workbook: l, worksheet: E } = u, S = {
       workbook: l,
-      worksheet: R,
+      worksheet: E,
       unitId: c,
-      subUnitId: m,
+      subUnitId: d,
       row: i.actualRow,
       col: i.startColumn
     };
-    r.showPopup(g);
-    const I = a.getByLocation(c, m, i.actualRow, i.startColumn);
-    return I && t.setActiveComment({
+    r.showPopup(S);
+    const I = a.getByLocation(c, d, i.actualRow, i.startColumn);
+    return I && n.setActiveComment({
       unitId: c,
-      subUnitId: m,
+      subUnitId: d,
       commentId: I,
       trigger: "context-menu"
     }), !0;
   }
 }, Ot = () => {
-  const o = w(ot), e = w($), n = w(G), r = w(U), t = e.getCurrentUnitForType(S.UNIVER_SHEET);
-  if (!t)
+  const o = P(ut), e = P(x), t = P(G), r = P(U), n = e.getCurrentUnitForType(g.UNIVER_SHEET);
+  if (!n)
     return null;
-  const i = t.getUnitId(), s = w(Q), a = ut(() => t.activeSheet$.pipe(_t((d) => d == null ? void 0 : d.getSheetId())), [t.activeSheet$]), c = ae(a, t.getActiveSheet().getSheetId()), m = Me(), u = w(ee), l = ae(u.activeCommentId$), R = ce((d) => {
-    const p = t.getSheets(), v = {};
-    return p.forEach((C, P) => {
-      v[C.getSheetId()] = P;
-    }), d.map((C) => {
+  const i = n.getUnitId(), s = P(Q), a = ft(() => n.activeSheet$.pipe(Mt((m) => m == null ? void 0 : m.getSheetId())), [n.activeSheet$]), c = ae(a, n.getActiveSheet().getSheetId()), d = ye(), u = P(ee), l = ae(u.activeCommentId$), E = ce((m) => {
+    const p = n.getSheets(), _ = {};
+    return p.forEach((f, b) => {
+      _[f.getSheetId()] = b;
+    }), m.map((f) => {
       var ne;
-      const P = y(C.ref), Oe = [(ne = v[C.subUnitId]) != null ? ne : 0, P.row, P.column];
-      return { ...C, p: Oe };
-    }).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]), g = ce((d) => {
-    if (d.unitId === i && d.subUnitId === c && !d.resolved) {
-      const { row: p, column: v } = y(d.ref);
-      if (!Number.isNaN(p) && !Number.isNaN(v))
+      const b = w(f.ref), Oe = [(ne = _[f.subUnitId]) != null ? ne : 0, b.row, b.column];
+      return { ...f, p: Oe };
+    }).sort((f, b) => f.p[0] === b.p[0] ? f.p[1] === b.p[1] ? f.p[2] - b.p[2] : f.p[1] - b.p[1] : f.p[0] - b.p[0]);
+  }, [n]), S = ce((m) => {
+    if (m.unitId === i && m.subUnitId === c && !m.resolved) {
+      const { row: p, column: _ } = w(m.ref);
+      if (!Number.isNaN(p) && !Number.isNaN(_))
         return o.addShape({
           range: {
-            startColumn: v,
-            endColumn: v,
+            startColumn: _,
+            endColumn: _,
             startRow: p,
             endRow: p
           },
@@ -360,198 +360,199 @@ const Ut = () => {
           primary: null
         });
     }
-  }, [o, c, i]), I = (d) => {
-    var p, v;
-    return (v = (p = t.getSheetBySheetId(d)) == null ? void 0 : p.getName()) != null ? v : "";
+  }, [o, c, i]), I = (m) => {
+    var p, _;
+    return (_ = (p = n.getSheetBySheetId(m)) == null ? void 0 : p.getName()) != null ? _ : "";
   }, M = () => {
-    s.executeCommand(Y.id);
-  }, E = () => {
+    s.executeCommand(K.id);
+  }, k = () => {
     r.hidePopup();
-  }, A = (d) => {
-    l && l.unitId === d.unitId && l.subUnitId === d.subUnitId && l.commentId === d.id || (m.current && (o.removeShape(m.current), m.current = null), m.current = g(d));
-  }, L = () => {
-    m.current && (o.removeShape(m.current), m.current = null);
+  }, L = (m) => {
+    l && l.unitId === m.unitId && l.subUnitId === m.subUnitId && l.commentId === m.id || (d.current && (o.removeShape(d.current), d.current = null), d.current = S(m));
+  }, D = () => {
+    d.current && (o.removeShape(d.current), d.current = null);
   };
-  return ht(() => {
+  return gt(() => {
     if (!l)
       return;
-    const d = n.getComment(l.unitId, l.subUnitId, l.commentId);
-    if (!d)
+    const m = t.getComment(l.unitId, l.subUnitId, l.commentId);
+    if (!m)
       return;
-    const p = g(d);
+    const p = S(m);
     return () => {
       p && o.removeShape(p);
     };
-  }, [g, l, n, o]), /* @__PURE__ */ ge.createElement(
-    Le,
+  }, [S, l, t, o]), /* @__PURE__ */ be.createElement(
+    Ze,
     {
       unitId: i,
       subUnitId$: a,
-      type: S.UNIVER_SHEET,
+      type: g.UNIVER_SHEET,
       onAdd: M,
       getSubUnitName: I,
-      onResolve: E,
-      sortComments: R,
-      onItemEnter: A,
-      onItemLeave: L
+      onResolve: k,
+      sortComments: E,
+      onItemEnter: L,
+      onItemLeave: D
     }
   );
-}, Rt = {
-  sheetThreadComment: {
-    menu: {
-      addComment: "添加评论",
-      commentManagement: "评论管理"
-    }
-  }
-}, Et = (o) => ({
-  id: Y.id,
-  type: ve.BUTTON,
-  positions: [fe.CONTEXT_MENU],
+}, $t = (o) => ({
+  id: K.id,
+  type: _e.BUTTON,
+  positions: [ve.CONTEXT_MENU],
   icon: te,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ce(o, S.UNIVER_SHEET)
-}), $t = (o) => ({
-  id: He.id,
-  type: ve.BUTTON,
+  hidden$: Ce(o, g.UNIVER_SHEET),
+  disabled$: Me(o, {
+    workbookTypes: [fe],
+    worksheetTypes: [ge],
+    rangeTypes: [Se]
+  })
+}), Nt = (o) => ({
+  id: ze.id,
+  type: _e.BUTTON,
   icon: te,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  positions: fe.TOOLBAR_START,
-  hidden$: Ce(o, S.UNIVER_SHEET)
-}), xt = {
-  id: Y.id,
-  binding: Ze.M | ie.CTRL_COMMAND | ie.ALT,
-  preconditions: it
+  positions: ve.TOOLBAR_START,
+  group: Xe.TOOLBAR_OTHERS,
+  disabled$: Me(o, {
+    workbookTypes: [fe],
+    worksheetTypes: [ge],
+    rangeTypes: [Se]
+  }),
+  hidden$: Ce(o, g.UNIVER_SHEET)
+}), Vt = {
+  id: K.id,
+  binding: qe.M | ie.CTRL_COMMAND | ie.ALT,
+  preconditions: ht
 };
-var Nt = Object.defineProperty, Dt = Object.getOwnPropertyDescriptor, jt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Dt(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 && Nt(e, n, t), t;
-}, b = (o, e) => (n, r) => e(n, r, o);
-const Vt = {};
-let j = class extends O {
-  constructor(o, e, n, r, t, i, s, a, c, m, 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 = m, this._univerInstanceService = u, this._initMenu(), this._initShortcut(), this._initComponent(), this._initLocale(), this._initCommandListener(), this._initPanelListener();
+var At = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, T = (o, e) => (t, r) => e(t, r, o);
+const Lt = {};
+let V = class extends R {
+  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(xt);
+    this._shortcutService.registerShortcut(Vt);
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((o) => {
-      if (o.id === qe.id) {
-        const e = o.params, { unitId: n, subUnitId: r, selections: t, type: i } = e;
-        if ((i === Xe.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 === rt.id) {
+        const e = o.params, { unitId: t, subUnitId: r, selections: n, type: i } = e;
+        if ((i === ot.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 === A.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;
     [
-      Et,
-      $t
+      $t,
+      Nt
     ].forEach((e) => {
       this._menuService.addMenuItem(e(this._injector), o);
     });
   }
   _initComponent() {
     [
-      [ye, Ut],
-      [Be, Ot],
-      [te, we]
+      [Ee, xt],
+      [Ge, Ot],
+      [te, Re]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
   }
-  _initLocale() {
-    this._localeService.load({ zhCN: Rt });
-  }
   _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(S.UNIVER_SHEET);
+        const s = this._univerInstanceService.getCurrentUnitForType(g.UNIVER_SHEET);
         if (!s || s.getUnitId() !== e)
           return;
-        s.getActiveSheet().getSheetId() !== n && await this._commandService.executeCommand(Je.id, {
+        s.getActiveSheet().getSheetId() !== t && await this._commandService.executeCommand(it.id, {
           unitId: e,
-          subUnitId: n
+          subUnitId: t
         });
-        const m = y(i.ref);
-        await this._commandService.executeCommand(st.id, {
+        const d = w(i.ref);
+        await this._commandService.executeCommand(lt.id, {
           range: {
-            startColumn: m.column,
-            endColumn: m.column,
-            startRow: m.row,
-            endRow: m.row
+            startColumn: d.column,
+            endColumn: d.column,
+            startRow: d.row,
+            endRow: d.row
           }
         }), this._sheetsThreadCommentPopupService.showPopup({
           unitId: e,
-          subUnitId: n,
-          row: m.row,
-          col: m.column,
+          subUnitId: t,
+          row: d.row,
+          col: d.column,
           commentId: i.id,
-          trigger: t
+          trigger: n
         });
       } else
         this._sheetsThreadCommentPopupService.hidePopup();
     }));
   }
 };
-j = jt([
-  x(N.Starting, j),
-  b(1, Ke),
-  b(2, h(pe)),
-  b(3, h(ze)),
-  b(4, h(De)),
-  b(5, Q),
-  b(6, h(U)),
-  b(7, h(T)),
-  b(8, h(ee)),
-  b(9, Ge),
-  b(10, $)
-], j);
-var At = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Ht = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Lt(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 && At(e, n, t), t;
-}, k = (o, e) => (n, r) => e(n, r, o);
-let B = class extends O {
-  constructor(e, n, r) {
+V = At([
+  O($.Starting, V),
+  T(1, Qe),
+  T(2, h(le)),
+  T(3, h(Je)),
+  T(4, h(De)),
+  T(5, Q),
+  T(6, h(U)),
+  T(7, h(y)),
+  T(8, h(ee)),
+  T(9, et),
+  T(10, x)
+], V);
+var Dt = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, Y = (o, e) => (t, r) => e(t, r, o);
+let H = class extends R {
+  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 = et(i, a);
+      const c = at(i, a);
       return c && c.startColumn === i.startColumn && c.startRow === i.startRow ? {
         undos: [],
         redos: []
@@ -560,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
             }
           }
         }],
@@ -571,48 +572,48 @@ 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: A.id,
           params: {
             unitId: e,
-            subUnitId: n,
-            commentId: t
+            subUnitId: t,
+            commentId: n
           }
         }],
         undos: [{
-          id: K.id,
+          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, m = y(c);
-          this._register(n, t, {
+          const a = i[s], c = a.ref, d = w(c);
+          this._register(t, n, {
             ...a,
-            ...m
+            ...d
           });
         }
       }
@@ -621,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
             });
@@ -651,36 +652,36 @@ let B = class extends O {
           }
         }
       })
-    ), this.disposeWithMe(je(() => {
+    ), this.disposeWithMe(He(() => {
       this._disposableMap.forEach((e) => {
         e.dispose();
       }), this._disposableMap.clear();
     }));
   }
 };
-B = Ht([
-  x(N.Starting, B),
-  k(0, h(Qe)),
-  k(1, h(T)),
-  k(2, h(G))
-], B);
-var Bt = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Ft = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Wt(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 && Bt(e, n, t), t;
-}, D = (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 = Dt([
+  O($.Starting, H),
+  Y(0, h(st)),
+  Y(1, h(y)),
+  Y(2, h(G))
+], H);
+var Ht = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, N = (o, e) => (t, r) => e(t, r, o);
+let j = class extends R {
+  constructor(o, e, t, r, n) {
+    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = t, this._sheetSkeletonManagerService = r, this._renderManagerService = n, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        tt.CELL_CONTENT,
+        ct.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,
@@ -689,7 +690,7 @@ let W = class extends O {
                   size: 6
                 }
               }
-            }) : n(o);
+            }) : t(o);
           },
           priority: 100
         }
@@ -698,117 +699,117 @@ let W = class extends O {
   }
   _initSkeletonChange() {
     const o = () => {
-      const e = this._univerInstanceService.getCurrentUnitForType(S.UNIVER_SHEET);
+      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._sheetSkeletonManagerService.getOrCreateSkeleton({ unitId: t, sheetId: r }), i = this._renderManagerService.getRenderById(t);
+      n == null || n.makeDirty(!0), n == null || n.calculate(), i && i.mainComponent.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.subscribe(() => {
       o();
     }));
   }
 };
-W = Ft([
-  x(N.Ready, W),
-  D(0, h(Se)),
-  D(1, h(T)),
-  D(2, $),
-  D(3, h(at)),
-  D(4, vt)
-], W);
-var Zt = 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 && Zt(e, n, t), t;
-}, ue = (o, e) => (n, r) => e(n, r, o);
-const Gt = (o, e, n) => {
-  const r = y(o), t = n.row - e.row, i = n.column - e.column, s = {
+j = Ht([
+  O($.Ready, j),
+  N(0, h(Ie)),
+  N(1, h(y)),
+  N(2, x),
+  N(3, h(pt)),
+  N(4, Tt)
+], j);
+var jt = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, ue = (o, e) => (t, r) => e(t, r, o);
+const Bt = (o, e, t) => {
+  const r = w(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 B = class extends R {
+  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: Ue,
-        onBeforeCopy: (e, n, r) => {
+        id: ke,
+        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 === mt.CUT && this._copyInfo) {
-            const { range: m, unitId: u, subUnitId: l } = this._copyInfo, R = {
-              row: m.startRow,
-              column: m.startColumn
+          if (n.copyType === vt.CUT && this._copyInfo) {
+            const { range: d, unitId: u, subUnitId: l } = this._copyInfo, E = {
+              row: d.startRow,
+              column: d.startColumn
             };
             if (!(i === u && s === l)) {
-              const g = [];
-              Ve.foreach(m, (d, p) => {
-                const v = this._sheetsThreadCommentModel.getCommentWithChildren(u, l, d, p);
-                v && g.push(v);
+              const S = [];
+              je.foreach(d, (m, p) => {
+                const _ = this._sheetsThreadCommentModel.getCommentWithChildren(u, l, m, p);
+                _ && S.push(_);
               });
-              const I = [], M = [], E = [], A = [], L = (d) => {
+              const I = [], M = [], k = [], L = [], D = (m) => {
                 I.unshift({
-                  id: V.id,
+                  id: A.id,
                   params: {
                     unitId: u,
                     subUnitId: l,
-                    commentId: d.id
+                    commentId: m.id
                   }
-                }), E.push({
-                  id: K.id,
+                }), k.push({
+                  id: Z.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
-                      ...d,
-                      ref: Gt(d.ref, R, c),
+                      ...m,
+                      ref: Bt(m.ref, E, c),
                       unitId: i,
                       subUnitId: s
                     }
                   }
                 }), M.push({
-                  id: K.id,
+                  id: Z.id,
                   params: {
                     unitId: u,
                     subUnitId: l,
-                    comment: d
+                    comment: m
                   }
-                }), A.unshift({
-                  id: V.id,
+                }), L.unshift({
+                  id: A.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
-                    commentId: d.id
+                    commentId: m.id
                   }
                 });
               };
-              return g.forEach((d) => {
-                L(d.root), d.children.forEach((p) => {
-                  L(p);
+              return S.forEach((m) => {
+                D(m.root), m.children.forEach((p) => {
+                  D(p);
                 });
               }), {
-                redos: [...I, ...E],
-                undos: [...A, ...M]
+                redos: [...I, ...k],
+                undos: [...L, ...M]
               };
             }
           }
@@ -821,80 +822,82 @@ let F = class extends O {
     );
   }
 };
-F = Kt([
-  x(N.Rendered, F),
-  ue(0, h(ct)),
-  ue(1, h(T))
-], F);
-var Yt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, qt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? kt(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;
-}, 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();
+B = jt([
+  O($.Rendered, B),
+  ue(0, h(_t)),
+  ue(1, h(y))
+], B);
+var Wt = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, q = (o, e) => (t, r) => e(t, r, o);
+let W = class extends R {
+  constructor(o, e, t) {
+    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = t, this._initHoverEvent();
   }
   _initHoverEvent() {
-    this._hoverManagerService.currentCell$.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);
-        if (a) {
-          const c = this._sheetsThreadCommentModel.getComment(r, t, a);
-          c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
-            unitId: r,
-            subUnitId: t,
-            row: i,
-            col: s,
-            commentId: a,
-            temp: !0
-          });
-        } else
-          e && this._sheetsThreadCommentPopupService.hidePopup();
-      }
-    });
+    this.disposeWithMe(
+      this._hoverManagerService.currentCell$.pipe(bt(100)).subscribe((o) => {
+        const e = this._sheetsThreadCommentPopupService.activePopup;
+        if (o && (e && e.temp || !e)) {
+          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, n, a);
+            c && !c.resolved && this._sheetsThreadCommentPopupService.showPopup({
+              unitId: r,
+              subUnitId: n,
+              row: i,
+              col: s,
+              commentId: a,
+              temp: !0
+            });
+          } else
+            e && this._sheetsThreadCommentPopupService.hidePopup();
+        }
+      })
+    );
   }
 };
-Z = qt([
-  x(N.Rendered, Z),
-  q(0, h(dt)),
+W = Wt([
+  O($.Rendered, W),
+  q(0, h(Ct)),
   q(1, h(U)),
-  q(2, h(T))
-], Z);
-var Xt = Object.defineProperty, Jt = Object.getOwnPropertyDescriptor, Qt = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? Jt(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 && Xt(e, n, t), t;
-}, X = (o, e) => (n, r) => e(n, r, o);
-let z = class extends O {
-  constructor(o, e, n) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._initSheetChange();
+  q(2, h(y))
+], W);
+var Ft = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, X = (o, e) => (t, r) => e(t, r, o);
+let F = class extends R {
+  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 === nt.id) {
-            const e = o.params, n = e.unitId ? this._univerInstanceService.getUnit(e.unitId) : this._univerInstanceService.getCurrentUnitForType(S.UNIVER_SHEET);
-            if (!n)
+          if (o.id === dt.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: A.id,
               params: {
                 unitId: r,
-                subUnitId: t,
+                subUnitId: n,
                 commentId: u
               }
-            })), m = a.map((u) => ({
-              id: K.id,
+            })), d = a.map((u) => ({
+              id: Z.id,
               params: {
                 unitId: r,
-                subUnitId: t,
+                subUnitId: n,
                 comment: u
               }
             }));
-            return { redos: c, undos: m };
+            return { redos: c, undos: d };
           }
           return { redos: [], undos: [] };
         }
@@ -902,65 +905,68 @@ let z = class extends O {
     );
   }
 };
-z = Qt([
-  x(N.Ready, z),
-  X(0, h(Se)),
-  X(1, $),
+F = Ft([
+  O($.Ready, F),
+  X(0, h(Ie)),
+  X(1, x),
   X(2, h(G))
-], z);
-var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (o, e, n, r) => {
-  for (var t = r > 1 ? void 0 : r ? tn(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 && en(e, n, t), t;
-}, he = (o, e) => (n, r) => e(n, r, o), H;
-let le = (H = class extends We {
-  constructor(e = {}, n, r) {
-    super(e, n, r);
-    _(this, "_pluginConfig");
-    this._injector = n, this._commandService = r, this._pluginConfig = _e.deepMerge({}, Vt, e);
+], F);
+var Zt = Object.defineProperty, zt = (o, e, t) => e in o ? Zt(o, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : o[e] = t, Gt = (o, e, t, r) => {
+  for (var n = e, i = o.length - 1, s; i >= 0; i--)
+    (s = o[i]) && (n = s(n) || n);
+  return n;
+}, he = (o, e) => (t, r) => e(t, r, o), xe = (o, e, t) => (zt(o, typeof e != "symbol" ? e + "" : e, t), t);
+let z = class extends We {
+  constructor(e = {}, t, r) {
+    super();
+    v(this, "_pluginConfig");
+    this._injector = t, this._commandService = r, this._pluginConfig = pe.deepMerge({}, Lt, e);
   }
   onStarting(e) {
-    super.onStarting(e), [
-      [T],
+    [
+      [y],
       [
-        j,
+        V,
         {
-          useFactory: () => this._injector.createInstance(j, this._pluginConfig)
+          useFactory: () => this._injector.createInstance(V, this._pluginConfig)
         }
       ],
+      [H],
+      [j],
       [B],
       [W],
       [F],
-      [Z],
-      [z],
       [U]
-    ].forEach((n) => {
-      this._injector.add(n);
-    }), [Y].forEach((n) => {
-      this._commandService.registerCommand(n);
+    ].forEach((t) => {
+      e.add(t);
+    }), [K].forEach((t) => {
+      this._commandService.registerCommand(t);
     });
   }
-}, _(H, "pluginName", Ue), _(H, "type", S.UNIVER_SHEET), H);
-le = nn([
-  he(1, h(pe)),
+};
+xe(z, "pluginName", ke);
+xe(z, "type", g.UNIVER_SHEET);
+z = Gt([
+  Be(Ke),
+  he(1, h(le)),
   he(2, h(Q))
-], le);
+], z);
 export {
-  Mn as ICommandService,
-  On as IThreadCommentDataSourceService,
-  wn as IThreadCommentMentionDataService,
-  Sn as Inject,
-  gn as Injector,
-  Pn as Plugin,
-  Ue as SHEETS_THREAD_COMMENT,
-  j as SheetsThreadCommentController,
-  F as SheetsThreadCommentCopyPasteController,
-  Z as SheetsThreadCommentHoverController,
-  T as SheetsThreadCommentModel,
+  ln as ICommandService,
+  Sn as IThreadCommentDataSourceService,
+  Cn as IThreadCommentMentionDataService,
+  mn as Inject,
+  un as Injector,
+  pn as Plugin,
+  ke as SHEETS_THREAD_COMMENT,
+  V as SheetsThreadCommentController,
+  B as SheetsThreadCommentCopyPasteController,
+  W as SheetsThreadCommentHoverController,
+  y as SheetsThreadCommentModel,
   U as SheetsThreadCommentPopupService,
-  B as SheetsThreadCommentRefRangeController,
-  z as ThreadCommentRemoveSheetsController,
-  bn as UniverInstanceType,
-  le as UniverSheetsThreadCommentPlugin,
-  yn as UniverThreadCommentUIPlugin
+  H as SheetsThreadCommentRefRangeController,
+  F as ThreadCommentRemoveSheetsController,
+  _n as UniverInstanceType,
+  z as UniverSheetsThreadCommentPlugin,
+  fn as UniverThreadCommentUIPlugin
 };