@univerjs/sheets-thread-comment-ui 0.6.0-nightly.202502191606 → 0.6.0-nightly.202502201606

package/lib/es/index.js

@@ -1,34 +1,34 @@
-var Ae = Object.defineProperty;
-var Ve = (o, e, n) => e in o ? Ae(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var E = (o, e, n) => Ve(o, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as _, Disposable as N, DisposableCollection as He, CommandType as Be, IUniverInstanceService as $, InterceptorEffectEnum as Le, UniverInstanceType as b, Range as ke, ICommandService as ie, RANGE_TYPE as he, Rectangle as Fe, Tools as We, DependentOn as Ze, Injector as ze, Plugin as Ge, merge as Ke, IConfigService as Ye } from "@univerjs/core";
-import { SheetsSelectionsService as _e, getSheetCommandTarget as qe, SheetInterceptorService as ve, INTERCEPTOR_POINT as Je, SheetPermissionCheckController as fe, WorkbookCommentPermission as q, WorksheetViewPermission as J, RangeProtectionPermissionViewPoint as Q, SetWorksheetActiveOperation as Qe, RemoveSheetCommand as Xe } from "@univerjs/sheets";
-import { SheetsThreadCommentModel as D, UniverSheetsThreadCommentPlugin as et } from "@univerjs/sheets-thread-comment";
-import { ThreadCommentPanelService as se, SetActiveCommentOperation as ee, ThreadCommentTree as tt, ThreadCommentPanel as nt, ToggleSheetCommentPanelOperation as Ce, THREAD_COMMENT_PANEL as rt, UniverThreadCommentUIPlugin as ot } from "@univerjs/thread-comment-ui";
-import { UniverThreadCommentUIPlugin as wn } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as it, ISheetClipboardService as st, COPY_TYPE as at, HoverManagerService as ct, IMarkSelectionService as Se, IEditorBridgeService as dt, SheetSkeletonManagerService as ht, ScrollToRangeOperation as mt, whenSheetEditorFocused as ut, getCurrentRangeDisable$ as ge } from "@univerjs/sheets-ui";
-import { IZenZoneService as lt, useDependency as O, useObservable as j, KeyCode as pt, MetaKeys as me, MenuItemType as Ie, getMenuHiddenObservable as Pe, RibbonStartGroup as _t, ContextMenuPosition as vt, ContextMenuGroup as ft, ComponentManager as Ct, IMenuManagerService as St, IShortcutService as gt } from "@univerjs/ui";
-import { BehaviorSubject as It, debounceTime as ae, map as Pt } from "rxjs";
+var De = Object.defineProperty;
+var Ae = (n, e, r) => e in n ? De(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r;
+var E = (n, e, r) => Ae(n, typeof e != "symbol" ? e + "" : e, r);
+import { Inject as v, Disposable as k, DisposableCollection as Ve, CommandType as He, IUniverInstanceService as N, InterceptorEffectEnum as je, UniverInstanceType as b, Range as Be, ICommandService as ie, RANGE_TYPE as he, Rectangle as Le, Tools as Fe, DependentOn as We, Injector as Ze, IConfigService as ze, Plugin as Ge, merge as Ke } from "@univerjs/core";
+import { SheetsSelectionsService as ve, getSheetCommandTarget as Ye, SheetInterceptorService as _e, INTERCEPTOR_POINT as qe, SheetPermissionCheckController as Ce, RangeProtectionPermissionViewPoint as q, WorksheetViewPermission as J, WorkbookCommentPermission as Q, SetWorksheetActiveOperation as Je, RemoveSheetCommand as Qe } from "@univerjs/sheets";
+import { SheetsThreadCommentModel as $, UniverSheetsThreadCommentPlugin as Xe } from "@univerjs/sheets-thread-comment";
+import { ThreadCommentPanelService as se, SetActiveCommentOperation as ee, ThreadCommentTree as et, ThreadCommentPanel as tt, ToggleSheetCommentPanelOperation as Se, THREAD_COMMENT_PANEL as nt, UniverThreadCommentUIPlugin as rt } from "@univerjs/thread-comment-ui";
+import { UniverThreadCommentUIPlugin as fn } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService as ot, ISheetClipboardService as it, COPY_TYPE as st, HoverManagerService as at, IMarkSelectionService as fe, IEditorBridgeService as ct, SheetSkeletonManagerService as dt, ScrollToRangeOperation as ht, whenSheetEditorFocused as mt, getCurrentRangeDisable$ as ge } from "@univerjs/sheets-ui";
+import { IZenZoneService as ut, useDependency as U, useObservable as D, KeyCode as lt, MetaKeys as me, getMenuHiddenObservable as Ie, MenuItemType as Pe, ContextMenuPosition as pt, ContextMenuGroup as vt, RibbonStartGroup as _t, IMenuManagerService as Ct, ComponentManager as St, IShortcutService as ft } from "@univerjs/ui";
+import { BehaviorSubject as gt, debounceTime as ae, map as It } from "rxjs";
 import { IRenderManagerService as Te } from "@univerjs/engine-render";
-import { singleReferenceToGrid as A, serializeRange as Tt } from "@univerjs/engine-formula";
-import { IThreadCommentDataSourceService as be, DeleteCommentMutation as k, AddCommentMutation as oe, ThreadCommentModel as bt } from "@univerjs/thread-comment";
-import { AddCommentCommand as En, DeleteCommentCommand as On, DeleteCommentTreeCommand as Un, IThreadCommentDataSourceService as Rn, ResolveCommentCommand as Nn, UpdateCommentCommand as $n } from "@univerjs/thread-comment";
+import { singleReferenceToGrid as A, serializeRange as Pt } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService as be, DeleteCommentMutation as L, AddCommentMutation as oe, ThreadCommentModel as Tt } from "@univerjs/thread-comment";
+import { AddCommentCommand as In, DeleteCommentCommand as Pn, DeleteCommentTreeCommand as Tn, IThreadCommentDataSourceService as bn, ResolveCommentCommand as Mn, UpdateCommentCommand as wn } from "@univerjs/thread-comment";
 import { jsx as Me } from "react/jsx-runtime";
-import { forwardRef as we, useRef as ye, createElement as Ee, useMemo as Mt, useCallback as ue, useEffect as wt } from "react";
-const Oe = "univer.sheet.thread-comment-modal", ce = "comment-single", Ue = "SHEET_THREAD_COMMENT";
-var yt = Object.defineProperty, Et = Object.getOwnPropertyDescriptor, Ot = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Et(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && yt(e, n, r), r;
-}, le = (o, e) => (n, t) => e(n, t, o);
-let U = class extends N {
-  constructor(e, n) {
+import { forwardRef as we, useRef as ye, createElement as Ee, useMemo as bt, useCallback as ue, useEffect as Mt } from "react";
+const Ue = "univer.sheet.thread-comment-modal", ce = "comment-single", Re = "SHEET_THREAD_COMMENT";
+var wt = Object.getOwnPropertyDescriptor, yt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? wt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, le = (n, e) => (r, t) => e(r, t, n);
+let R = class extends k {
+  constructor(e, r) {
     super();
     E(this, "_lastPopup", null);
     E(this, "_activePopup");
-    E(this, "_activePopup$", new It(null));
+    E(this, "_activePopup$", new gt(null));
     E(this, "activePopup$", this._activePopup$.asObservable());
-    this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = e, this._zenZoneService = r, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
     });
   }
@@ -40,10 +40,10 @@ let U = class extends N {
       e && this.hidePopup();
     }));
   }
-  showPopup(e, n) {
+  showPopup(e, r) {
     var d;
-    const { row: t, col: r, unitId: i, subUnitId: s } = e;
-    if (this._activePopup && t === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
+    const { row: t, col: o, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && t === this._activePopup.row && o === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
@@ -52,9 +52,9 @@ let U = class extends N {
     this._activePopup = e, this._activePopup$.next(e);
     const a = this._canvasPopupManagerService.attachPopupToCell(
       t,
-      r,
+      o,
       {
-        componentKey: Oe,
+        componentKey: Ue,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -67,10 +67,10 @@ let U = class extends N {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new He();
+    const c = new Ve();
     c.add(a), c.add({
       dispose: () => {
-        n == null || n();
+        r == null || r();
       }
     }), this._lastPopup = c;
   }
@@ -84,19 +84,19 @@ let U = class extends N {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-U = Ot([
-  le(0, _(it)),
-  le(1, lt)
-], U);
+R = yt([
+  le(0, v(ot)),
+  le(1, ut)
+], R);
 const V = {
-  type: Be.OPERATION,
+  type: He.OPERATION,
   id: "sheets.operation.show-comment-modal",
-  handler(o) {
-    var v;
-    const e = o.get(_e), n = o.get($), t = o.get(U), r = o.get(se), i = (v = e.getCurrentLastSelection()) == null ? void 0 : v.primary, s = o.get(D);
+  handler(n) {
+    var _;
+    const e = n.get(ve), r = n.get(N), t = n.get(R), o = n.get(se), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = n.get($);
     if (!i)
       return !1;
-    const a = qe(n);
+    const a = Ye(r);
     if (!a)
       return !1;
     const { workbook: c, worksheet: d, unitId: m, subUnitId: h } = a, u = {
@@ -109,41 +109,41 @@ const V = {
     };
     t.showPopup(u);
     const p = s.getByLocation(m, h, i.startRow, i.startColumn);
-    return p && r.setActiveComment({
+    return p && o.setActiveComment({
       unitId: m,
       subUnitId: h,
       commentId: p,
       trigger: "context-menu"
     }), !0;
   }
-}, Ut = "sheets-thread-comment.config", pe = {};
-var Rt = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, $t = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Nt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Rt(e, n, r), r;
-}, H = (o, e) => (n, t) => e(n, t, o);
-let F = class extends N {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._sheetsThreadCommentModel = e, this._univerInstanceService = n, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
+}, Et = "sheets-thread-comment.config", pe = {};
+var Ut = Object.getOwnPropertyDescriptor, Rt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Ut(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, H = (n, e) => (r, t) => e(r, t, n);
+let F = class extends k {
+  constructor(n, e, r, t) {
+    super(), this._sheetInterceptorService = n, this._sheetsThreadCommentModel = e, this._univerInstanceService = r, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        Je.CELL_CONTENT,
+        qe.CELL_CONTENT,
         {
-          effect: Le.Style,
-          handler: (o, e, n) => {
-            const { row: t, col: r, unitId: i, subUnitId: s } = e;
-            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, r) ? n({
-              ...o,
+          effect: je.Style,
+          handler: (n, e, r) => {
+            const { row: t, col: o, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, o) ? r({
+              ...n,
               markers: {
-                ...o == null ? void 0 : o.markers,
+                ...n == null ? void 0 : n.markers,
                 tr: {
                   color: "#FFBD37",
                   size: 6
                 }
               }
-            }) : n(o);
+            }) : r(n);
           },
           priority: 100
         }
@@ -151,99 +151,99 @@ let F = class extends N {
     );
   }
   _initSkeletonChange() {
-    const o = () => {
-      var r;
+    const n = () => {
+      var o;
       const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
       if (!e) return;
-      const n = e.getUnitId(), t = this._renderManagerService.getRenderById(n);
-      (r = t == null ? void 0 : t.mainComponent) == null || r.makeForceDirty();
+      const r = e.getUnitId(), t = this._renderManagerService.getRenderById(r);
+      (o = t == null ? void 0 : t.mainComponent) == null || o.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ae(16)).subscribe(() => {
-      o();
+      n();
     }));
   }
 };
-F = $t([
-  H(0, _(ve)),
-  H(1, _(D)),
-  H(2, $),
+F = Rt([
+  H(0, v(_e)),
+  H(1, v($)),
+  H(2, N),
   H(3, Te)
 ], F);
-var Dt = Object.defineProperty, xt = Object.getOwnPropertyDescriptor, jt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? xt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Dt(e, n, r), r;
-}, te = (o, e) => (n, t) => e(n, t, o);
-const At = (o, e, n) => {
-  const t = A(o), r = n.row - e.row, i = n.column - e.column, s = {
+var Ot = Object.getOwnPropertyDescriptor, kt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Ot(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, te = (n, e) => (r, t) => e(r, t, n);
+const Nt = (n, e, r) => {
+  const t = A(n), o = r.row - e.row, i = r.column - e.column, s = {
     startColumn: t.column + i,
-    startRow: t.row + r,
+    startRow: t.row + o,
     endColumn: t.column + i,
-    endRow: t.row + r
+    endRow: t.row + o
   };
-  return Tt(s);
+  return Pt(s);
 };
-let W = class extends N {
-  constructor(e, n, t) {
+let W = class extends k {
+  constructor(e, r, t) {
     super();
     E(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = n, this._threadCommentDataSourceService = t, this._initClipboardHook();
+    this._sheetClipboardService = e, this._sheetsThreadCommentModel = r, this._threadCommentDataSourceService = t, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Ue,
-        onBeforeCopy: (e, n, t) => {
+        id: Re,
+        onBeforeCopy: (e, r, t) => {
           this._copyInfo = {
             unitId: e,
-            subUnitId: n,
+            subUnitId: r,
             range: t
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, n, t, r) => {
-          const { unitId: i, subUnitId: s, range: a } = n, c = {
+        onPasteCells: (e, r, t, o) => {
+          const { unitId: i, subUnitId: s, range: a } = r, c = {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (r.copyType === at.CUT && this._copyInfo) {
+          if (o.copyType === st.CUT && this._copyInfo) {
             const { range: d, unitId: m, subUnitId: h } = this._copyInfo, u = {
               row: d.startRow,
               column: d.startColumn
             };
             if (!(i === m && s === h)) {
               const p = [];
-              ke.foreach(d, (g, l) => {
+              Be.foreach(d, (g, l) => {
                 const I = this._sheetsThreadCommentModel.getAllByLocation(m, h, g, l);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((f) => {
-                  p.push(f);
-                }) : I.forEach(({ children: f, ...M }) => {
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((C) => {
+                  p.push(C);
+                }) : I.forEach(({ children: C, ...M }) => {
                   M.parentId || p.push(M);
                 });
               });
-              const v = [], S = [], R = [], x = [], X = (g) => {
-                v.unshift({
-                  id: k.id,
+              const _ = [], f = [], O = [], x = [], X = (g) => {
+                _.unshift({
+                  id: L.id,
                   params: {
                     unitId: m,
                     subUnitId: h,
                     commentId: g.id
                   }
-                }), R.push({
+                }), O.push({
                   id: oe.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: At(g.ref, u, c),
+                      ref: Nt(g.ref, u, c),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
-                }), S.push({
+                }), f.push({
                   id: oe.id,
                   params: {
                     unitId: m,
@@ -252,7 +252,7 @@ let W = class extends N {
                     sync: !0
                   }
                 }), x.unshift({
-                  id: k.id,
+                  id: L.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
@@ -263,8 +263,8 @@ let W = class extends N {
               return p.forEach((g) => {
                 X(g);
               }), {
-                redos: [...v, ...R],
-                undos: [...x, ...S]
+                redos: [..._, ...O],
+                undos: [...x, ...f]
               };
             }
           }
@@ -277,37 +277,37 @@ let W = class extends N {
     );
   }
 };
-W = jt([
-  te(0, _(st)),
-  te(1, _(D)),
+W = kt([
+  te(0, v(it)),
+  te(1, v($)),
   te(2, be)
 ], W);
-var Vt = Object.defineProperty, Ht = Object.getOwnPropertyDescriptor, Bt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Ht(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Vt(e, n, r), r;
-}, B = (o, e) => (n, t) => e(n, t, o);
-let Z = class extends N {
-  constructor(o, e, n, t) {
-    super(), this._hoverManagerService = o, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = n, this._sheetPermissionCheckController = t, this._initHoverEvent();
+var $t = Object.getOwnPropertyDescriptor, xt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? $t(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, j = (n, e) => (r, t) => e(r, t, n);
+let Z = class extends k {
+  constructor(n, e, r, t) {
+    super(), this._hoverManagerService = n, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = r, this._sheetPermissionCheckController = t, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ae(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(ae(100)).subscribe((n) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
-        if (o && (e && e.temp || !e)) {
-          const { location: n } = o, { unitId: t, subUnitId: r, row: i, col: s } = n, a = this._sheetsThreadCommentModel.getByLocation(t, r, i, s);
+        if (n && (e && e.temp || !e)) {
+          const { location: r } = n, { unitId: t, subUnitId: o, row: i, col: s } = r, a = this._sheetsThreadCommentModel.getByLocation(t, o, i, s);
           if (a) {
             if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-              workbookTypes: [q],
+              workbookTypes: [Q],
               worksheetTypes: [J],
-              rangeTypes: [Q]
+              rangeTypes: [q]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
-            const d = this._sheetsThreadCommentModel.getComment(t, r, a);
+            const d = this._sheetsThreadCommentModel.getComment(t, o, a);
             d && !d.resolved && this._sheetsThreadCommentPopupService.showPopup({
               unitId: t,
-              subUnitId: r,
+              subUnitId: o,
               row: i,
               col: s,
               commentId: a,
@@ -320,42 +320,42 @@ let Z = class extends N {
     );
   }
 };
-Z = Bt([
-  B(0, _(ct)),
-  B(1, _(U)),
-  B(2, _(D)),
-  B(3, _(fe))
+Z = xt([
+  j(0, v(at)),
+  j(1, v(R)),
+  j(2, v($)),
+  j(3, v(Ce))
 ], Z);
-var Lt = Object.defineProperty, kt = Object.getOwnPropertyDescriptor, Ft = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? kt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Lt(e, n, r), r;
-}, w = (o, e) => (n, t) => e(n, t, o);
-let z = class extends N {
-  constructor(e, n, t, r, i, s, a, c, d, m) {
+var Dt = Object.getOwnPropertyDescriptor, At = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Dt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, w = (n, e) => (r, t) => e(r, t, n);
+let z = class extends k {
+  constructor(e, r, t, o, i, s, a, c, d, m) {
     super();
     E(this, "_isSwitchToCommenting", !1);
     E(this, "_selectionShapeInfo", null);
-    this._commandService = e, this._sheetsThreadCommentPopupService = n, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = r, this._univerInstanceService = i, this._sheetPermissionCheckController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = d, this._renderManagerService = m, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
+    this._commandService = e, this._sheetsThreadCommentPopupService = r, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = o, this._univerInstanceService = i, this._sheetPermissionCheckController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = d, this._renderManagerService = m, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
   }
-  _handleSelectionChange(e, n, t) {
-    var u, p, v;
-    const r = (u = e[0]) == null ? void 0 : u.range, i = this._renderManagerService.getRenderById(n), s = (p = i == null ? void 0 : i.with(ht).getSkeletonParam(t)) == null ? void 0 : p.skeleton;
-    if (!s || !r)
+  _handleSelectionChange(e, r, t) {
+    var u, p, _;
+    const o = (u = e[0]) == null ? void 0 : u.range, i = this._renderManagerService.getRenderById(r), s = (p = i == null ? void 0 : i.with(dt).getSkeletonParam(t)) == null ? void 0 : p.skeleton;
+    if (!s || !o)
       return;
-    const a = s.getCellWithCoordByIndex(r.startRow, r.startColumn);
-    if ((((v = r.rangeType) != null ? v : he.NORMAL) !== he.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && Fe.equals(a.mergeInfo, r))) {
+    const a = s.getCellWithCoordByIndex(o.startRow, o.startColumn);
+    if ((((_ = o.rangeType) != null ? _ : he.NORMAL) !== he.NORMAL || o.endColumn - o.startColumn > 0 || o.endRow - o.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && Le.equals(a.mergeInfo, o))) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
     const d = a.actualRow, m = a.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, d, m)) {
+    if (!this._sheetsThreadCommentModel.showCommentMarker(r, t, d, m)) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
-    const h = this._sheetsThreadCommentModel.getByLocation(n, t, d, m);
+    const h = this._sheetsThreadCommentModel.getByLocation(r, t, d, m);
     h && this._commandService.executeCommand(ee.id, {
-      unitId: n,
+      unitId: r,
       subUnitId: t,
       commentId: h
     });
@@ -365,8 +365,8 @@ let z = class extends N {
       this._sheetSelectionService.selectionMoveEnd$.subscribe((e) => {
         if (this._isSwitchToCommenting)
           return;
-        const n = this._sheetSelectionService.currentSelectionParam;
-        n && this._handleSelectionChange(e, n.unitId, n.sheetId);
+        const r = this._sheetSelectionService.currentSelectionParam;
+        r && this._handleSelectionChange(e, r.unitId, r.sheetId);
       })
     );
   }
@@ -379,49 +379,49 @@ let z = class extends N {
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((e) => {
-      if (e.id === k.id) {
-        const n = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
+      if (e.id === L.id) {
+        const r = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
         if (!t)
           return;
-        const { unitId: r, subUnitId: i, commentId: s } = t;
-        n.unitId === r && n.subUnitId === i && n.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
+        const { unitId: o, subUnitId: i, commentId: s } = t;
+        r.unitId === o && r.subUnitId === i && r.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
   }
   _initPanelListener() {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (e) => {
-      var n;
+      var r;
       if (e) {
-        const { unitId: t, subUnitId: r, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, r, i);
+        const { unitId: t, subUnitId: o, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, o, i);
         if (!a || a.resolved)
           return;
         const c = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
         if (!c || c.getUnitId() !== t)
           return;
-        this._isSwitchToCommenting = !0, ((n = c.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(Qe.id, {
+        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== o && await this._commandService.executeCommand(Je.id, {
           unitId: t,
-          subUnitId: r
+          subUnitId: o
         }), this._isSwitchToCommenting = !1;
         const h = A(a.ref), { row: u, column: p } = h;
         if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [q],
+          workbookTypes: [Q],
           worksheetTypes: [J],
-          rangeTypes: [Q]
+          rangeTypes: [q]
         }, [{ startRow: u, startColumn: p, endRow: u, endColumn: p }]))
           return;
-        const S = 1;
-        if (await this._commandService.executeCommand(mt.id, {
+        const f = 1;
+        if (await this._commandService.executeCommand(ht.id, {
           range: {
-            startRow: Math.max(h.row - S, 0),
-            endRow: h.row + S,
-            startColumn: Math.max(h.column - S, 0),
-            endColumn: h.column + S
+            startRow: Math.max(h.row - f, 0),
+            endRow: h.row + f,
+            startColumn: Math.max(h.column - f, 0),
+            endColumn: h.column + f
           }
         }), this._editorBridgeService.isVisible().visible)
           return;
         this._sheetsThreadCommentPopupService.showPopup({
           unitId: t,
-          subUnitId: r,
+          subUnitId: o,
           row: h.row,
           col: h.column,
           commentId: a.id,
@@ -438,9 +438,9 @@ let z = class extends N {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
         return;
       }
-      const { unitId: n, subUnitId: t, commentId: r } = e;
+      const { unitId: r, subUnitId: t, commentId: o } = e;
       this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-      const i = this._sheetsThreadCommentModel.getComment(n, t, r);
+      const i = this._sheetsThreadCommentModel.getComment(r, t, o);
       if (!i)
         return;
       const s = A(i.ref), { row: a, column: c } = s;
@@ -473,50 +473,50 @@ let z = class extends N {
     }));
   }
 };
-z = Ft([
+z = At([
   w(0, ie),
-  w(1, _(U)),
-  w(2, _(D)),
-  w(3, _(se)),
-  w(4, $),
-  w(5, _(fe)),
-  w(6, Se),
-  w(7, _(_e)),
-  w(8, dt),
+  w(1, v(R)),
+  w(2, v($)),
+  w(3, v(se)),
+  w(4, N),
+  w(5, v(Ce)),
+  w(6, fe),
+  w(7, v(ve)),
+  w(8, ct),
   w(9, Te)
 ], z);
-var Wt = Object.defineProperty, Zt = Object.getOwnPropertyDescriptor, zt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Zt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && Wt(e, n, r), r;
-}, L = (o, e) => (n, t) => e(n, t, o);
-let G = class extends N {
-  constructor(o, e, n, t) {
-    super(), this._sheetInterceptorService = o, this._univerInstanceService = e, this._threadCommentModel = n, this._threadCommentDataSourceService = t, this._initSheetChange();
+var Vt = Object.getOwnPropertyDescriptor, Ht = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Vt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, B = (n, e) => (r, t) => e(r, t, n);
+let G = class extends k {
+  constructor(n, e, r, t) {
+    super(), this._sheetInterceptorService = n, this._univerInstanceService = e, this._threadCommentModel = r, this._threadCommentDataSourceService = t, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (o) => {
+        getMutations: (n) => {
           var e;
-          if (o.id === Xe.id) {
-            const n = o.params, t = n.unitId ? this._univerInstanceService.getUnit(n.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+          if (n.id === Qe.id) {
+            const r = n.params, t = r.unitId ? this._univerInstanceService.getUnit(r.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
             if (!t)
               return { redos: [], undos: [] };
-            const r = t.getUnitId(), i = n.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
+            const o = t.getUnitId(), i = r.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._threadCommentModel.ensureMap(r, i), a = Array.from(s.values()).filter((u) => !u.parentId), c = a.map((u) => u.id), d = this._threadCommentDataSourceService.syncUpdateMutationToColla, m = c.map((u) => ({
-              id: k.id,
+            const s = this._threadCommentModel.ensureMap(o, i), a = Array.from(s.values()).filter((u) => !u.parentId), c = a.map((u) => u.id), d = this._threadCommentDataSourceService.syncUpdateMutationToColla, m = c.map((u) => ({
+              id: L.id,
               params: {
-                unitId: r,
+                unitId: o,
                 subUnitId: i,
                 commentId: u
               }
             })), h = a.map(({ children: u, ...p }) => ({
               id: oe.id,
               params: {
-                unitId: r,
+                unitId: o,
                 subUnitId: i,
                 comment: {
                   ...p,
@@ -533,75 +533,78 @@ let G = class extends N {
     );
   }
 };
-G = zt([
-  L(0, _(ve)),
-  L(1, $),
-  L(2, _(bt)),
-  L(3, be)
+G = Ht([
+  B(0, v(_e)),
+  B(1, N),
+  B(2, v(Tt)),
+  B(3, be)
 ], G);
 var P = function() {
-  return P = Object.assign || function(o) {
-    for (var e, n = 1, t = arguments.length; n < t; n++) {
-      e = arguments[n];
-      for (var r in e) Object.prototype.hasOwnProperty.call(e, r) && (o[r] = e[r]);
+  return P = Object.assign || function(n) {
+    for (var e, r = 1, t = arguments.length; r < t; r++) {
+      e = arguments[r];
+      for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (n[o] = e[o]);
     }
-    return o;
+    return n;
   }, P.apply(this, arguments);
-}, Gt = function(o, e) {
-  var n = {};
-  for (var t in o) Object.prototype.hasOwnProperty.call(o, t) && e.indexOf(t) < 0 && (n[t] = o[t]);
-  if (o != null && typeof Object.getOwnPropertySymbols == "function")
-    for (var r = 0, t = Object.getOwnPropertySymbols(o); r < t.length; r++)
-      e.indexOf(t[r]) < 0 && Object.prototype.propertyIsEnumerable.call(o, t[r]) && (n[t[r]] = o[t[r]]);
-  return n;
-}, Re = we(function(o, e) {
-  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = Gt(o, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), c = ye("_".concat(qt()));
-  return Ne(n, "".concat(t), { defIds: n.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
+}, jt = function(n, e) {
+  var r = {};
+  for (var t in n) Object.prototype.hasOwnProperty.call(n, t) && e.indexOf(t) < 0 && (r[t] = n[t]);
+  if (n != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var o = 0, t = Object.getOwnPropertySymbols(n); o < t.length; o++)
+      e.indexOf(t[o]) < 0 && Object.prototype.propertyIsEnumerable.call(n, t[o]) && (r[t[o]] = n[t[o]]);
+  return r;
+}, Oe = we(function(n, e) {
+  var r = n.icon, t = n.id, o = n.className, i = n.extend, s = jt(n, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(o || "").trim(), c = ye("_".concat(Ft()));
+  return ke(r, "".concat(t), { defIds: r.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
 });
-function Ne(o, e, n, t, r) {
-  return Ee(o.tag, P(P({ key: e }, Kt(o, n, r)), t), (Yt(o, n).children || []).map(function(i, s) {
-    return Ne(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, r);
+function ke(n, e, r, t, o) {
+  return Ee(n.tag, P(P({ key: e }, Bt(n, r, o)), t), (Lt(n, r).children || []).map(function(i, s) {
+    return ke(i, "".concat(e, "-").concat(n.tag, "-").concat(s), r, void 0, o);
   }));
 }
-function Kt(o, e, n) {
-  var t = P({}, o.attrs);
-  n != null && n.colorChannel1 && t.fill === "colorChannel1" && (t.fill = n.colorChannel1);
-  var r = e.defIds;
-  return !r || r.length === 0 || (o.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(i) {
+function Bt(n, e, r) {
+  var t = P({}, n.attrs);
+  r != null && r.colorChannel1 && t.fill === "colorChannel1" && (t.fill = r.colorChannel1), n.tag === "mask" && t.id && (t.id = t.id + e.idSuffix), Object.entries(t).forEach(function(i) {
+    var s = i[0], a = i[1];
+    s === "mask" && typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  });
+  var o = e.defIds;
+  return !o || o.length === 0 || (n.tag === "use" && t["xlink:href"] && (t["xlink:href"] = t["xlink:href"] + e.idSuffix), Object.entries(t).forEach(function(i) {
     var s = i[0], a = i[1];
     typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
-function Yt(o, e) {
-  var n, t = e.defIds;
-  return !t || t.length === 0 ? o : o.tag === "defs" && (!((n = o.children) === null || n === void 0) && n.length) ? P(P({}, o), { children: o.children.map(function(r) {
-    return typeof r.attrs.id == "string" && t && t.indexOf(r.attrs.id) > -1 ? P(P({}, r), { attrs: P(P({}, r.attrs), { id: r.attrs.id + e.idSuffix }) }) : r;
-  }) }) : o;
+function Lt(n, e) {
+  var r, t = e.defIds;
+  return !t || t.length === 0 ? n : n.tag === "defs" && (!((r = n.children) === null || r === void 0) && r.length) ? P(P({}, n), { children: n.children.map(function(o) {
+    return typeof o.attrs.id == "string" && t && t.indexOf(o.attrs.id) > -1 ? P(P({}, o), { attrs: P(P({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
+  }) }) : n;
 }
-function qt() {
+function Ft() {
   return Math.random().toString(36).substring(2, 8);
 }
-Re.displayName = "UniverIcon";
-var Jt = { 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" } }] }, $e = we(function(o, e) {
-  return Ee(Re, Object.assign({}, o, {
+Oe.displayName = "UniverIcon";
+var Wt = { 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" } }] }, Ne = we(function(n, e) {
+  return Ee(Oe, Object.assign({}, n, {
     id: "comment-single",
     ref: e,
-    icon: Jt
+    icon: Wt
   }));
 });
-$e.displayName = "CommentSingle";
-const Qt = () => {
-  const o = O($), e = O(U), n = j(e.activePopup$), t = O(D);
-  if (j(t.commentUpdate$), !n)
+Ne.displayName = "CommentSingle";
+const Zt = () => {
+  const n = U(N), e = U(R), r = D(e.activePopup$), t = U($);
+  if (D(t.commentUpdate$), !r)
     return null;
-  const { row: r, col: i, unitId: s, subUnitId: a, trigger: c } = n, d = t.getByLocation(s, a, r, i), m = `${We.chatAtABC(i)}${r + 1}`, h = () => {
+  const { row: o, col: i, unitId: s, subUnitId: a, trigger: c } = r, d = t.getByLocation(s, a, o, i), m = `${Fe.chatAtABC(i)}${o + 1}`, h = () => {
     e.hidePopup();
   }, u = (p) => {
-    var v, S, R;
-    return (R = (S = (v = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : v.getSheetBySheetId(p)) == null ? void 0 : S.getName()) != null ? R : "";
+    var _, f, O;
+    return (O = (f = (_ = n.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(p)) == null ? void 0 : f.getName()) != null ? O : "";
   };
   return /* @__PURE__ */ Me(
-    tt,
+    et,
     {
       onClick: () => {
         e.persistPopup();
@@ -617,34 +620,34 @@ const Qt = () => {
       autoFocus: c === "context-menu"
     }
   );
-}, Xt = () => {
+}, zt = () => {
   var g;
-  const o = O(Se), e = O($), n = O(U), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = O(ie), s = Mt(() => t.activeSheet$.pipe(Pt((l) => l == null ? void 0 : l.getSheetId())), [t.activeSheet$]), a = j(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = ye(null), d = O(se), m = j(d.activeCommentId$), h = j(d.panelVisible$, d.panelVisible), u = ue((l) => {
-    const I = t.getSheets(), f = {};
-    I.forEach((T, C) => {
-      f[T.getSheetId()] = C;
+  const n = U(fe), e = U(N), r = U(R), t = e.getCurrentUnitForType(b.UNIVER_SHEET), o = t.getUnitId(), i = U(ie), s = bt(() => t.activeSheet$.pipe(It((l) => l == null ? void 0 : l.getSheetId())), [t.activeSheet$]), a = D(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = ye(null), d = U(se), m = D(d.activeCommentId$), h = D(d.panelVisible$, d.panelVisible), u = ue((l) => {
+    const I = t.getSheets(), C = {};
+    I.forEach((T, S) => {
+      C[T.getSheetId()] = S;
     });
-    const M = (T) => T.map((C) => {
+    const M = (T) => T.map((S) => {
       var de;
-      const y = A(C.ref), je = [(de = f[C.subUnitId]) != null ? de : 0, y.row, y.column];
-      return { ...C, p: je };
-    }).sort((C, y) => C.p[0] === y.p[0] ? C.p[1] === y.p[1] ? C.p[2] - y.p[2] : C.p[1] - y.p[1] : C.p[0] - y.p[0]);
+      const y = A(S.ref), xe = [(de = C[S.subUnitId]) != null ? de : 0, y.row, y.column];
+      return { ...S, p: xe };
+    }).sort((S, y) => S.p[0] === y.p[0] ? S.p[1] === y.p[1] ? S.p[2] - y.p[2] : S.p[1] - y.p[1] : S.p[0] - y.p[0]);
     return [
       ...M(l.filter((T) => !T.resolved)),
       ...M(l.filter((T) => T.resolved))
     ];
   }, [t]), p = ue((l) => {
     var I;
-    if (l.unitId === r && l.subUnitId === a && !l.resolved) {
-      const { row: f, column: M } = A(l.ref), T = t.getSheetBySheetId(l.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(f, M)) != null ? I : {
+    if (l.unitId === o && l.subUnitId === a && !l.resolved) {
+      const { row: C, column: M } = A(l.ref), T = t.getSheetBySheetId(l.subUnitId), S = (I = T == null ? void 0 : T.getMergedCell(C, M)) != null ? I : {
         startColumn: M,
         endColumn: M,
-        startRow: f,
-        endRow: f
+        startRow: C,
+        endRow: C
       };
-      if (!Number.isNaN(f) && !Number.isNaN(M))
-        return o.addShape({
-          range: C,
+      if (!Number.isNaN(C) && !Number.isNaN(M))
+        return n.addShape({
+          range: S,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -656,121 +659,121 @@ const Qt = () => {
         });
     }
     return null;
-  }, [o, a, r]), v = (l) => {
-    var I, f;
-    return (f = (I = t.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? f : "";
-  }, S = () => {
+  }, [n, a, o]), _ = (l) => {
+    var I, C;
+    return (C = (I = t.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? C : "";
+  }, f = () => {
     i.executeCommand(V.id);
-  }, R = (l) => {
-    m && m.unitId === l.unitId && m.subUnitId === l.subUnitId && m.commentId === l.id || (c.current && (o.removeShape(c.current), c.current = null), c.current = p(l));
+  }, O = (l) => {
+    m && m.unitId === l.unitId && m.subUnitId === l.subUnitId && m.commentId === l.id || (c.current && (n.removeShape(c.current), c.current = null), c.current = p(l));
   }, x = () => {
-    c.current && (o.removeShape(c.current), c.current = null);
+    c.current && (n.removeShape(c.current), c.current = null);
   }, X = (l, I) => {
-    I && n.hidePopup();
+    I && r.hidePopup();
   };
-  return wt(() => {
-    !h && c.current && o.removeShape(c.current);
-  }, [o, h]), /* @__PURE__ */ Me(
-    nt,
+  return Mt(() => {
+    !h && c.current && n.removeShape(c.current);
+  }, [n, h]), /* @__PURE__ */ Me(
+    tt,
     {
-      unitId: r,
+      unitId: o,
       subUnitId$: s,
       type: b.UNIVER_SHEET,
-      onAdd: S,
-      getSubUnitName: v,
+      onAdd: f,
+      getSubUnitName: _,
       onResolve: X,
       sortComments: u,
-      onItemEnter: R,
+      onItemEnter: O,
       onItemLeave: x,
       onDeleteComment: () => (x(), !0)
     }
   );
-}, en = (o) => ({
+}, Gt = (n) => ({
   id: V.id,
-  type: Ie.BUTTON,
+  type: Pe.BUTTON,
   icon: ce,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Pe(o, b.UNIVER_SHEET),
-  disabled$: ge(o, {
-    workbookTypes: [q],
+  hidden$: Ie(n, b.UNIVER_SHEET),
+  disabled$: ge(n, {
+    workbookTypes: [Q],
     worksheetTypes: [J],
-    rangeTypes: [Q]
+    rangeTypes: [q]
   })
-}), tn = (o) => ({
-  id: Ce.id,
-  type: Ie.BUTTON,
+}), Kt = (n) => ({
+  id: Se.id,
+  type: Pe.BUTTON,
   icon: ce,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: ge(o, {
-    workbookTypes: [q],
+  disabled$: ge(n, {
+    workbookTypes: [Q],
     worksheetTypes: [J],
-    rangeTypes: [Q]
+    rangeTypes: [q]
   }),
-  hidden$: Pe(o, b.UNIVER_SHEET)
-}), nn = {
+  hidden$: Ie(n, b.UNIVER_SHEET)
+}), Yt = {
   id: V.id,
-  binding: pt.M | me.CTRL_COMMAND | me.ALT,
-  preconditions: ut
-}, rn = {
+  binding: lt.M | me.CTRL_COMMAND | me.ALT,
+  preconditions: mt
+}, qt = {
   [_t.OTHERS]: {
-    [Ce.id]: {
+    [Se.id]: {
       order: 1,
-      menuItemFactory: tn
+      menuItemFactory: Kt
     }
   },
-  [vt.MAIN_AREA]: {
-    [ft.OTHERS]: {
+  [pt.MAIN_AREA]: {
+    [vt.OTHERS]: {
       [V.id]: {
         order: 0,
-        menuItemFactory: en
+        menuItemFactory: Gt
       }
     }
   }
 };
-var on = Object.defineProperty, sn = Object.getOwnPropertyDescriptor, an = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? sn(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && on(e, n, r), r;
-}, ne = (o, e) => (n, t) => e(n, t, o);
-let K = class extends N {
-  constructor(o, e, n) {
-    super(), this._menuManagerService = o, this._componentManager = e, this._shortcutService = n, this._initMenu(), this._initShortcut(), this._initComponent();
+var Jt = Object.getOwnPropertyDescriptor, Qt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Jt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, ne = (n, e) => (r, t) => e(r, t, n);
+let K = class extends k {
+  constructor(n, e, r) {
+    super(), this._menuManagerService = n, this._componentManager = e, this._shortcutService = r, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(nn);
+    this._shortcutService.registerShortcut(Yt);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(rn);
+    this._menuManagerService.mergeMenu(qt);
   }
   _initComponent() {
     [
-      [Oe, Qt],
-      [rt, Xt],
-      [ce, $e]
-    ].forEach(([o, e]) => {
-      this._componentManager.register(o, e);
+      [Ue, Zt],
+      [nt, zt],
+      [ce, Ne]
+    ].forEach(([n, e]) => {
+      this._componentManager.register(n, e);
     });
   }
 };
-K = an([
-  ne(0, St),
-  ne(1, _(Ct)),
-  ne(2, gt)
+K = Qt([
+  ne(0, Ct),
+  ne(1, v(St)),
+  ne(2, ft)
 ], K);
-var De = Object.defineProperty, cn = Object.getOwnPropertyDescriptor, dn = (o, e, n) => e in o ? De(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, hn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? cn(e, n) : e, i = o.length - 1, s; i >= 0; i--)
-    (s = o[i]) && (r = (t ? s(e, n, r) : s(r)) || r);
-  return t && r && De(e, n, r), r;
-}, re = (o, e) => (n, t) => e(n, t, o), xe = (o, e, n) => dn(o, typeof e != "symbol" ? e + "" : e, n);
+var Xt = Object.defineProperty, en = Object.getOwnPropertyDescriptor, tn = (n, e, r) => e in n ? Xt(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r, nn = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? en(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+    (s = n[i]) && (o = s(o) || o);
+  return o;
+}, re = (n, e) => (r, t) => e(r, t, n), $e = (n, e, r) => tn(n, typeof e != "symbol" ? e + "" : e, r);
 let Y = class extends Ge {
-  constructor(o = pe, e, n, t) {
-    super(), this._config = o, this._injector = e, this._commandService = n, this._configService = t;
-    const { menu: r, ...i } = Ke(
+  constructor(n = pe, e, r, t) {
+    super(), this._config = n, this._injector = e, this._commandService = r, this._configService = t;
+    const { menu: o, ...i } = Ke(
       {},
       pe,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Ut, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
   }
   onStarting() {
     [
@@ -780,11 +783,11 @@ let Y = class extends Ge {
       [Z],
       [G],
       [z],
-      [U]
-    ].forEach((o) => {
-      this._injector.add(o);
-    }), [V].forEach((o) => {
-      this._commandService.registerCommand(o);
+      [R]
+    ].forEach((n) => {
+      this._injector.add(n);
+    }), [V].forEach((n) => {
+      this._commandService.registerCommand(n);
     }), this._injector.get(K);
   }
   onReady() {
@@ -794,24 +797,24 @@ let Y = class extends Ge {
     this._injector.get(W), this._injector.get(Z), this._injector.get(z);
   }
 };
-xe(Y, "pluginName", Ue);
-xe(Y, "type", b.UNIVER_SHEET);
-Y = hn([
-  Ze(ot, et),
-  re(1, _(ze)),
-  re(2, _(ie)),
-  re(3, Ye)
+$e(Y, "pluginName", Re);
+$e(Y, "type", b.UNIVER_SHEET);
+Y = nn([
+  We(rt, Xe),
+  re(1, v(Ze)),
+  re(2, v(ie)),
+  re(3, ze)
 ], Y);
 export {
-  En as AddCommentCommand,
-  On as DeleteCommentCommand,
-  Un as DeleteCommentTreeCommand,
-  Rn as IThreadCommentDataSourceService,
-  Nn as ResolveCommentCommand,
-  Ue as SHEETS_THREAD_COMMENT,
-  U as SheetsThreadCommentPopupService,
+  In as AddCommentCommand,
+  Pn as DeleteCommentCommand,
+  Tn as DeleteCommentTreeCommand,
+  bn as IThreadCommentDataSourceService,
+  Mn as ResolveCommentCommand,
+  Re as SHEETS_THREAD_COMMENT,
+  R as SheetsThreadCommentPopupService,
   V as ShowAddSheetCommentModalOperation,
   Y as UniverSheetsThreadCommentUIPlugin,
-  wn as UniverThreadCommentUIPlugin,
-  $n as UpdateCommentCommand
+  fn as UniverThreadCommentUIPlugin,
+  wn as UpdateCommentCommand
 };