@univerjs/sheets-thread-comment-ui 0.8.0-nightly.202505261607 → 0.8.0-nightly.202505271607

package/lib/index.js

@@ -1,34 +1,34 @@
 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 je, IUniverInstanceService as N, InterceptorEffectEnum as He, UniverInstanceType as b, Range as Be, ICommandService as se, RANGE_TYPE as me, 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 ae, 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 gn } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as ot, CellPopupManagerService as it, ISheetClipboardService as st, COPY_TYPE as at, HoverManagerService as ct, IMarkSelectionService as fe, 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 U, useObservable as D, KeyCode as pt, MetaKeys as ue, getMenuHiddenObservable as Ie, MenuItemType as Pe, ContextMenuPosition as vt, ContextMenuGroup as _t, RibbonInsertGroup as Ct, IMenuManagerService as St, ComponentManager as ft, IShortcutService as gt } from "@univerjs/ui";
-import { BehaviorSubject as It, debounceTime as ce, map as Pt } 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 L, AddCommentMutation as ie, ThreadCommentModel as bt } from "@univerjs/thread-comment";
-import { AddCommentCommand as Pn, DeleteCommentCommand as Tn, DeleteCommentTreeCommand as bn, IThreadCommentDataSourceService as Mn, ResolveCommentCommand as wn, UpdateCommentCommand as yn } 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 le, useEffect as wt } from "react";
-const Ue = "univer.sheet.thread-comment-modal", de = "comment-single", Re = "SHEET_THREAD_COMMENT";
-var yt = Object.getOwnPropertyDescriptor, Et = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? yt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var xe = (t, e, r) => e in t ? De(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r;
+var E = (t, e, r) => xe(t, typeof e != "symbol" ? e + "" : e, r);
+import { Inject as v, Disposable as k, DisposableCollection as Ae, CommandType as Ve, IUniverInstanceService as N, InterceptorEffectEnum as je, UniverInstanceType as b, Range as He, ICommandService as se, RANGE_TYPE as he, Rectangle as Be, Tools as Le, DependentOn as Fe, Injector as We, IConfigService as Ze, Plugin as Ge, merge as ze } from "@univerjs/core";
+import { SheetsSelectionsService as pe, getSheetCommandTarget as Ke, SheetInterceptorService as ve, INTERCEPTOR_POINT as Ye, SheetPermissionCheckController as Ce, RangeProtectionPermissionViewPoint as q, WorksheetViewPermission as J, WorkbookCommentPermission as Q, SetWorksheetActiveOperation as qe, RemoveSheetCommand as Je } from "@univerjs/sheets";
+import { SheetsThreadCommentModel as $, UniverSheetsThreadCommentPlugin as Qe } from "@univerjs/sheets-thread-comment";
+import { ThreadCommentPanelService as ae, SetActiveCommentOperation as ee, ThreadCommentTree as Xe, ThreadCommentPanel as et, ToggleSheetCommentPanelOperation as _e, THREAD_COMMENT_PANEL as tt, UniverThreadCommentUIPlugin as nt } from "@univerjs/thread-comment-ui";
+import { UniverThreadCommentUIPlugin as Sn } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService as rt, CellPopupManagerService 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 Se } from "@univerjs/sheets-ui";
+import { IZenZoneService as ut, useDependency as U, useObservable as x, KeyCode as lt, MetaKeys as me, getMenuHiddenObservable as ge, MenuItemType as Ie, ContextMenuPosition as pt, ContextMenuGroup as vt, RibbonInsertGroup as Ct, IMenuManagerService as _t, ComponentManager as ft, IShortcutService as St } from "@univerjs/ui";
+import { BehaviorSubject as gt, debounceTime as ce, map as It } from "rxjs";
+import { IRenderManagerService as Pe } from "@univerjs/engine-render";
+import { singleReferenceToGrid as A, serializeRange as Pt } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService as Te, DeleteCommentMutation as L, AddCommentMutation as ie, 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 be } from "react/jsx-runtime";
+import { forwardRef as Me, useRef as we, createElement as ye, useMemo as bt, useCallback as ue, useEffect as Mt } from "react";
+const Ee = "univer.sheet.thread-comment-modal", Ue = "SHEET_THREAD_COMMENT";
+var wt = Object.getOwnPropertyDescriptor, yt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? wt(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, te = (n, e) => (r, t) => e(r, t, n);
+}, te = (t, e) => (r, n) => e(r, n, t);
 let R = class extends k {
-  constructor(e, r, t) {
+  constructor(e, r, n) {
     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 = r, this._cellPopupManagerService = t, this._initZenVisible(), this.disposeWithMe(() => {
+    this._canvasPopupManagerService = e, this._zenZoneService = r, this._cellPopupManagerService = n, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
     });
   }
@@ -42,8 +42,8 @@ let R = class extends k {
   }
   showPopup(e, r) {
     var d;
-    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)) {
+    const { row: n, col: o, unitId: i, subUnitId: s } = e;
+    if (this._activePopup && n === 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,13 +52,13 @@ let R = class extends k {
     this._activePopup = e, this._activePopup$.next(e);
     const a = this._cellPopupManagerService.showPopup(
       {
-        row: t,
+        row: n,
         col: o,
         unitId: i,
         subUnitId: s
       },
       {
-        componentKey: Ue,
+        componentKey: Ee,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -72,7 +72,7 @@ let R = class extends k {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new Ve();
+    const c = new Ae();
     c.add(a), c.add({
       dispose: () => {
         r == null || r();
@@ -89,20 +89,20 @@ let R = class extends k {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-R = Et([
-  te(0, v(ot)),
-  te(1, lt),
-  te(2, v(it))
+R = yt([
+  te(0, v(rt)),
+  te(1, ut),
+  te(2, v(ot))
 ], R);
 const V = {
-  type: je.OPERATION,
+  type: Ve.OPERATION,
   id: "sheets.operation.show-comment-modal",
-  handler(n) {
-    var _;
-    const e = n.get(ve), r = n.get(N), t = n.get(R), o = n.get(ae), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = n.get($);
+  handler(t) {
+    var C;
+    const e = t.get(pe), r = t.get(N), n = t.get(R), o = t.get(ae), i = (C = e.getCurrentLastSelection()) == null ? void 0 : C.primary, s = t.get($);
     if (!i)
       return !1;
-    const a = Ye(r);
+    const a = Ke(r);
     if (!a)
       return !1;
     const { workbook: c, worksheet: d, unitId: m, subUnitId: h } = a, u = {
@@ -113,7 +113,7 @@ const V = {
       row: i.startRow,
       col: i.startColumn
     };
-    t.showPopup(u);
+    n.showPopup(u);
     const p = s.getByLocation(m, h, i.startRow, i.startColumn);
     return p && o.setActiveComment({
       unitId: m,
@@ -122,34 +122,31 @@ const V = {
       trigger: "context-menu"
     }), !0;
   }
-}, Ut = "sheets-thread-comment.config", pe = {};
-var Rt = Object.getOwnPropertyDescriptor, Ot = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? Rt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+}, Et = "sheets-thread-comment.config", le = {};
+var Ut = Object.getOwnPropertyDescriptor, Rt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Ut(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, j = (n, e) => (r, t) => e(r, t, n);
+}, j = (t, e) => (r, n) => e(r, n, t);
 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();
+  constructor(t, e, r, n) {
+    super(), this._sheetInterceptorService = t, this._sheetsThreadCommentModel = e, this._univerInstanceService = r, this._renderManagerService = n, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        qe.CELL_CONTENT,
+        Ye.CELL_CONTENT,
         {
-          effect: He.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: {
-                ...n == null ? void 0 : n.markers,
-                tr: {
-                  color: "#FFBD37",
-                  size: 6
-                }
+          effect: je.Style,
+          handler: (t, e, r) => {
+            const { row: n, col: o, unitId: i, subUnitId: s } = e;
+            return this._sheetsThreadCommentModel.showCommentMarker(i, s, n, o) && ((!t || t === e.rawData) && (t = { ...e.rawData }), t.markers = {
+              ...t == null ? void 0 : t.markers,
+              tr: {
+                color: "#FFBD37",
+                size: 6
               }
-            }) : r(n);
+            }), r(t);
           },
           priority: 100
         }
@@ -157,79 +154,79 @@ let F = class extends k {
     );
   }
   _initSkeletonChange() {
-    const n = () => {
+    const t = () => {
       var o;
       const e = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
       if (!e) return;
-      const r = e.getUnitId(), t = this._renderManagerService.getRenderById(r);
-      (o = t == null ? void 0 : t.mainComponent) == null || o.makeForceDirty();
+      const r = e.getUnitId(), n = this._renderManagerService.getRenderById(r);
+      (o = n == null ? void 0 : n.mainComponent) == null || o.makeForceDirty();
     };
     this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ce(16)).subscribe(() => {
-      n();
+      t();
     }));
   }
 };
-F = Ot([
-  j(0, v(_e)),
+F = Rt([
+  j(0, v(ve)),
   j(1, v($)),
   j(2, N),
-  j(3, Te)
+  j(3, Pe)
 ], F);
-var kt = Object.getOwnPropertyDescriptor, Nt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? kt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var Ot = Object.getOwnPropertyDescriptor, kt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Ot(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, ne = (n, e) => (r, t) => e(r, t, n);
-const $t = (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 + o,
-    endColumn: t.column + i,
-    endRow: t.row + o
+}, ne = (t, e) => (r, n) => e(r, n, t);
+const Nt = (t, e, r) => {
+  const n = A(t), o = r.row - e.row, i = r.column - e.column, s = {
+    startColumn: n.column + i,
+    startRow: n.row + o,
+    endColumn: n.column + i,
+    endRow: n.row + o
   };
-  return Tt(s);
+  return Pt(s);
 };
 let W = class extends k {
-  constructor(e, r, t) {
+  constructor(e, r, n) {
     super();
     E(this, "_copyInfo");
-    this._sheetClipboardService = e, this._sheetsThreadCommentModel = r, this._threadCommentDataSourceService = t, this._initClipboardHook();
+    this._sheetClipboardService = e, this._sheetsThreadCommentModel = r, this._threadCommentDataSourceService = n, this._initClipboardHook();
   }
   // eslint-disable-next-line max-lines-per-function
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Re,
-        onBeforeCopy: (e, r, t) => {
+        id: Ue,
+        onBeforeCopy: (e, r, n) => {
           this._copyInfo = {
             unitId: e,
             subUnitId: r,
-            range: t
+            range: n
           };
         },
         // eslint-disable-next-line max-lines-per-function
-        onPasteCells: (e, r, t, o) => {
+        onPasteCells: (e, r, n, o) => {
           const { unitId: i, subUnitId: s, range: a } = r, c = {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (o.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 = [];
-              Be.foreach(d, (g, l) => {
+              He.foreach(d, (g, l) => {
                 const I = this._sheetsThreadCommentModel.getAllByLocation(m, h, g, l);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((C) => {
-                  p.push(C);
-                }) : I.forEach(({ children: C, ...M }) => {
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((_) => {
+                  p.push(_);
+                }) : I.forEach(({ children: _, ...M }) => {
                   M.parentId || p.push(M);
                 });
               });
-              const _ = [], f = [], O = [], x = [], X = (g) => {
-                _.unshift({
+              const C = [], S = [], O = [], D = [], X = (g) => {
+                C.unshift({
                   id: L.id,
                   params: {
                     unitId: m,
@@ -243,13 +240,13 @@ let W = class extends k {
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: $t(g.ref, u, c),
+                      ref: Nt(g.ref, u, c),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
-                }), f.push({
+                }), S.push({
                   id: ie.id,
                   params: {
                     unitId: m,
@@ -257,7 +254,7 @@ let W = class extends k {
                     comment: g,
                     sync: !0
                   }
-                }), x.unshift({
+                }), D.unshift({
                   id: L.id,
                   params: {
                     unitId: i,
@@ -269,8 +266,8 @@ let W = class extends k {
               return p.forEach((g) => {
                 X(g);
               }), {
-                redos: [..._, ...O],
-                undos: [...x, ...f]
+                redos: [...C, ...O],
+                undos: [...D, ...S]
               };
             }
           }
@@ -283,26 +280,26 @@ let W = class extends k {
     );
   }
 };
-W = Nt([
-  ne(0, v(st)),
+W = kt([
+  ne(0, v(it)),
   ne(1, v($)),
-  ne(2, be)
+  ne(2, Te)
 ], W);
-var xt = Object.getOwnPropertyDescriptor, Dt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? xt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var $t = Object.getOwnPropertyDescriptor, Dt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? $t(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, H = (n, e) => (r, t) => e(r, t, n);
+}, H = (t, e) => (r, n) => e(r, n, t);
 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();
+  constructor(t, e, r, n) {
+    super(), this._hoverManagerService = t, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = r, this._sheetPermissionCheckController = n, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ce(100)).subscribe((n) => {
+      this._hoverManagerService.currentCell$.pipe(ce(100)).subscribe((t) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
-        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 (t && (e && e.temp || !e)) {
+          const { location: r } = t, { unitId: n, subUnitId: o, row: i, col: s } = r, a = this._sheetsThreadCommentModel.getByLocation(n, o, i, s);
           if (a) {
             if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
               workbookTypes: [Q],
@@ -310,9 +307,9 @@ let Z = class extends k {
               rangeTypes: [q]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
-            const d = this._sheetsThreadCommentModel.getComment(t, o, a);
+            const d = this._sheetsThreadCommentModel.getComment(n, o, a);
             d && !d.resolved && this._sheetsThreadCommentPopupService.showPopup({
-              unitId: t,
+              unitId: n,
               subUnitId: o,
               row: i,
               col: s,
@@ -327,42 +324,42 @@ let Z = class extends k {
   }
 };
 Z = Dt([
-  H(0, v(ct)),
+  H(0, v(at)),
   H(1, v(R)),
   H(2, v($)),
   H(3, v(Ce))
 ], Z);
-var At = Object.getOwnPropertyDescriptor, Vt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? At(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var xt = Object.getOwnPropertyDescriptor, At = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? xt(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[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) {
+}, w = (t, e) => (r, n) => e(r, n, t);
+let G = class extends k {
+  constructor(e, r, n, o, i, s, a, c, d, m) {
     super();
     E(this, "_isSwitchToCommenting", !1);
     E(this, "_selectionShapeInfo", null);
-    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();
+    this._commandService = e, this._sheetsThreadCommentPopupService = r, this._sheetsThreadCommentModel = n, 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, 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(ht).getSkeletonParam(t)) == null ? void 0 : p.skeleton;
+  _handleSelectionChange(e, r, n) {
+    var u, p, C;
+    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(n)) == null ? void 0 : p.skeleton;
     if (!s || !o)
       return;
     const a = s.getCellWithCoordByIndex(o.startRow, o.startColumn);
-    if ((((_ = o.rangeType) != null ? _ : me.NORMAL) !== me.NORMAL || o.endColumn - o.startColumn > 0 || o.endRow - o.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && Le.equals(a.mergeInfo, o))) {
+    if ((((C = o.rangeType) != null ? C : he.NORMAL) !== he.NORMAL || o.endColumn - o.startColumn > 0 || o.endRow - o.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && Be.equals(a.mergeInfo, o))) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
     const d = a.actualRow, m = a.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(r, t, d, m)) {
+    if (!this._sheetsThreadCommentModel.showCommentMarker(r, n, d, m)) {
       this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
-    const h = this._sheetsThreadCommentModel.getByLocation(r, t, d, m);
+    const h = this._sheetsThreadCommentModel.getByLocation(r, n, d, m);
     h && this._commandService.executeCommand(ee.id, {
       unitId: r,
-      subUnitId: t,
+      subUnitId: n,
       commentId: h
     });
   }
@@ -386,10 +383,10 @@ let z = class extends k {
   _initCommandListener() {
     this._commandService.onCommandExecuted((e) => {
       if (e.id === L.id) {
-        const r = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
-        if (!t)
+        const r = e.params, n = this._sheetsThreadCommentPopupService.activePopup;
+        if (!n)
           return;
-        const { unitId: o, subUnitId: i, commentId: s } = t;
+        const { unitId: o, subUnitId: i, commentId: s } = n;
         r.unitId === o && r.subUnitId === i && r.commentId === s && this._sheetsThreadCommentPopupService.hidePopup();
       }
     });
@@ -398,14 +395,14 @@ let z = class extends k {
     this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.subscribe(async (e) => {
       var r;
       if (e) {
-        const { unitId: t, subUnitId: o, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(t, o, i);
+        const { unitId: n, subUnitId: o, commentId: i, trigger: s } = e, a = this._sheetsThreadCommentModel.getComment(n, o, i);
         if (!a || a.resolved)
           return;
         const c = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
-        if (!c || c.getUnitId() !== t)
+        if (!c || c.getUnitId() !== n)
           return;
-        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== o && await this._commandService.executeCommand(Je.id, {
-          unitId: t,
+        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== o && await this._commandService.executeCommand(qe.id, {
+          unitId: n,
           subUnitId: o
         }), this._isSwitchToCommenting = !1;
         const h = A(a.ref), { row: u, column: p } = h;
@@ -415,18 +412,18 @@ let z = class extends k {
           rangeTypes: [q]
         }, [{ startRow: u, startColumn: p, endRow: u, endColumn: p }]))
           return;
-        const f = 1;
-        if (await this._commandService.executeCommand(mt.id, {
+        const S = 1;
+        if (await this._commandService.executeCommand(ht.id, {
           range: {
-            startRow: Math.max(h.row - f, 0),
-            endRow: h.row + f,
-            startColumn: Math.max(h.column - f, 0),
-            endColumn: h.column + f
+            startRow: Math.max(h.row - S, 0),
+            endRow: h.row + S,
+            startColumn: Math.max(h.column - S, 0),
+            endColumn: h.column + S
           }
         }), this._editorBridgeService.isVisible().visible)
           return;
         this._sheetsThreadCommentPopupService.showPopup({
-          unitId: t,
+          unitId: n,
           subUnitId: o,
           row: h.row,
           col: h.column,
@@ -444,15 +441,15 @@ let z = class extends k {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
         return;
       }
-      const { unitId: r, subUnitId: t, commentId: o } = e;
+      const { unitId: r, subUnitId: n, commentId: o } = e;
       this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
-      const i = this._sheetsThreadCommentModel.getComment(r, t, o);
+      const i = this._sheetsThreadCommentModel.getComment(r, n, o);
       if (!i)
         return;
       const s = A(i.ref), { row: a, column: c } = s;
       if (Number.isNaN(a) || Number.isNaN(c))
         return null;
-      const d = (u = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : u.getSheetBySheetId(t), m = (p = d == null ? void 0 : d.getMergedCell(a, c)) != null ? p : {
+      const d = (u = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : u.getSheetBySheetId(n), m = (p = d == null ? void 0 : d.getMergedCell(a, c)) != null ? p : {
         startColumn: c,
         endColumn: c,
         startRow: a,
@@ -479,7 +476,7 @@ let z = class extends k {
     }));
   }
 };
-z = Vt([
+G = At([
   w(0, se),
   w(1, v(R)),
   w(2, v($)),
@@ -487,29 +484,29 @@ z = Vt([
   w(4, N),
   w(5, v(Ce)),
   w(6, fe),
-  w(7, v(ve)),
-  w(8, dt),
-  w(9, Te)
-], z);
-var jt = Object.getOwnPropertyDescriptor, Ht = (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);
+  w(7, v(pe)),
+  w(8, ct),
+  w(9, Pe)
+], G);
+var Vt = Object.getOwnPropertyDescriptor, jt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Vt(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[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();
+}, B = (t, e) => (r, n) => e(r, n, t);
+let z = class extends k {
+  constructor(t, e, r, n) {
+    super(), this._sheetInterceptorService = t, this._univerInstanceService = e, this._threadCommentModel = r, this._threadCommentDataSourceService = n, this._initSheetChange();
   }
   _initSheetChange() {
     this.disposeWithMe(
       this._sheetInterceptorService.interceptCommand({
-        getMutations: (n) => {
+        getMutations: (t) => {
           var e;
-          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)
+          if (t.id === Je.id) {
+            const r = t.params, n = r.unitId ? this._univerInstanceService.getUnit(r.unitId) : this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
+            if (!n)
               return { redos: [], undos: [] };
-            const o = t.getUnitId(), i = r.subUnitId || ((e = t.getActiveSheet()) == null ? void 0 : e.getSheetId());
+            const o = n.getUnitId(), i = r.subUnitId || ((e = n.getActiveSheet()) == null ? void 0 : e.getSheetId());
             if (!i)
               return { redos: [], undos: [] };
             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) => ({
@@ -539,78 +536,78 @@ let G = class extends k {
     );
   }
 };
-G = Ht([
-  B(0, v(_e)),
+z = jt([
+  B(0, v(ve)),
   B(1, N),
-  B(2, v(bt)),
-  B(3, be)
-], G);
+  B(2, v(Tt)),
+  B(3, Te)
+], z);
 var P = function() {
-  return P = Object.assign || function(n) {
-    for (var e, r = 1, t = arguments.length; r < t; r++) {
+  return P = Object.assign || function(t) {
+    for (var e, r = 1, n = arguments.length; r < n; r++) {
       e = arguments[r];
-      for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (n[o] = e[o]);
+      for (var o in e) Object.prototype.hasOwnProperty.call(e, o) && (t[o] = e[o]);
     }
-    return n;
+    return t;
   }, P.apply(this, arguments);
-}, Bt = function(n, e) {
+}, Ht = function(t, 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]]);
+  for (var n in t) Object.prototype.hasOwnProperty.call(t, n) && e.indexOf(n) < 0 && (r[n] = t[n]);
+  if (t != null && typeof Object.getOwnPropertySymbols == "function")
+    for (var o = 0, n = Object.getOwnPropertySymbols(t); o < n.length; o++)
+      e.indexOf(n[o]) < 0 && Object.prototype.propertyIsEnumerable.call(t, n[o]) && (r[n[o]] = t[n[o]]);
   return r;
-}, Oe = we(function(n, e) {
-  var r = n.icon, t = n.id, o = n.className, i = n.extend, s = Bt(n, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(t, " ").concat(o || "").trim(), c = ye("_".concat(Wt()));
-  return ke(r, "".concat(t), { defIds: r.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
+}, Re = Me(function(t, e) {
+  var r = t.icon, n = t.id, o = t.className, i = t.extend, s = Ht(t, ["icon", "id", "className", "extend"]), a = "univerjs-icon univerjs-icon-".concat(n, " ").concat(o || "").trim(), c = we("_".concat(Ft()));
+  return Oe(r, "".concat(n), { defIds: r.defIds, idSuffix: c.current }, P({ ref: e, className: a }, s), i);
 });
-function ke(n, e, r, t, o) {
-  return Ee(n.tag, P(P({ key: e }, Lt(n, r, o)), t), (Ft(n, r).children || []).map(function(i, s) {
-    return ke(i, "".concat(e, "-").concat(n.tag, "-").concat(s), r, void 0, o);
+function Oe(t, e, r, n, o) {
+  return ye(t.tag, P(P({ key: e }, Bt(t, r, o)), n), (Lt(t, r).children || []).map(function(i, s) {
+    return Oe(i, "".concat(e, "-").concat(t.tag, "-").concat(s), r, void 0, o);
   }));
 }
-function Lt(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) {
+function Bt(t, e, r) {
+  var n = P({}, t.attrs);
+  r != null && r.colorChannel1 && n.fill === "colorChannel1" && (n.fill = r.colorChannel1), t.tag === "mask" && n.id && (n.id = n.id + e.idSuffix), Object.entries(n).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, ")")));
+    s === "mask" && typeof a == "string" && (n[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) {
+  return !o || o.length === 0 || (t.tag === "use" && n["xlink:href"] && (n["xlink:href"] = n["xlink:href"] + e.idSuffix), Object.entries(n).forEach(function(i) {
     var s = i[0], a = i[1];
-    typeof a == "string" && (t[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
-  })), t;
+    typeof a == "string" && (n[s] = a.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
+  })), n;
 }
-function Ft(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 Lt(t, e) {
+  var r, n = e.defIds;
+  return !n || n.length === 0 ? t : t.tag === "defs" && (!((r = t.children) === null || r === void 0) && r.length) ? P(P({}, t), { children: t.children.map(function(o) {
+    return typeof o.attrs.id == "string" && n && n.indexOf(o.attrs.id) > -1 ? P(P({}, o), { attrs: P(P({}, o.attrs), { id: o.attrs.id + e.idSuffix }) }) : o;
+  }) }) : t;
 }
-function Wt() {
+function Ft() {
   return Math.random().toString(36).substring(2, 8);
 }
-Oe.displayName = "UniverIcon";
-var Zt = { 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",
+Re.displayName = "UniverIcon";
+var Wt = { tag: "svg", attrs: { xmlns: "http://www.w3.org/2000/svg", 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.13521C5.45263 9.13521 5.14082 8.81123 5.14082 8.41159V7.50706C5.14082 7.10742 5.45263 6.78345 5.83725 6.78345Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M8.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.78345Z" } }, { tag: "path", attrs: { fill: "currentColor", d: "M11.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" } }, { 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" } }] }, ke = Me(function(t, e) {
+  return ye(Re, Object.assign({}, t, {
+    id: "comment-icon",
     ref: e,
-    icon: Zt
+    icon: Wt
   }));
 });
-Ne.displayName = "CommentSingle";
-const zt = () => {
-  const n = U(N), e = U(R), r = D(e.activePopup$), t = U($);
-  if (D(t.commentUpdate$), !r)
+ke.displayName = "CommentIcon";
+const Zt = () => {
+  const t = U(N), e = U(R), r = x(e.activePopup$), n = U($);
+  if (x(n.commentUpdate$), !r)
     return null;
-  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 = () => {
+  const { row: o, col: i, unitId: s, subUnitId: a, trigger: c } = r, d = n.getByLocation(s, a, o, i), m = `${Le.chatAtABC(i)}${o + 1}`, h = () => {
     e.hidePopup();
   }, u = (p) => {
-    var _, f, O;
-    return (O = (f = (_ = n.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(p)) == null ? void 0 : f.getName()) != null ? O : "";
+    var C, S, O;
+    return (O = (S = (C = t.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : C.getSheetBySheetId(p)) == null ? void 0 : S.getName()) != null ? O : "";
   };
-  return /* @__PURE__ */ Me(
-    et,
+  return /* @__PURE__ */ be(
+    Xe,
     {
       onClick: () => {
         e.persistPopup();
@@ -628,32 +625,32 @@ const zt = () => {
   );
 }, Gt = () => {
   var g;
-  const n = U(fe), e = U(N), r = U(R), t = e.getCurrentUnitForType(b.UNIVER_SHEET), o = t.getUnitId(), i = U(se), s = Mt(() => t.activeSheet$.pipe(Pt((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(ae), m = D(d.activeCommentId$), h = D(d.panelVisible$, d.panelVisible), u = le((l) => {
-    const I = t.getSheets(), C = {};
-    I.forEach((T, S) => {
-      C[T.getSheetId()] = S;
+  const t = U(fe), e = U(N), r = U(R), n = e.getCurrentUnitForType(b.UNIVER_SHEET), o = n.getUnitId(), i = U(se), s = bt(() => n.activeSheet$.pipe(It((l) => l == null ? void 0 : l.getSheetId())), [n.activeSheet$]), a = x(s, (g = n.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = we(null), d = U(ae), m = x(d.activeCommentId$), h = x(d.panelVisible$, d.panelVisible), u = ue((l) => {
+    const I = n.getSheets(), _ = {};
+    I.forEach((T, f) => {
+      _[T.getSheetId()] = f;
     });
-    const M = (T) => T.map((S) => {
-      var he;
-      const y = A(S.ref), xe = [(he = C[S.subUnitId]) != null ? he : 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]);
+    const M = (T) => T.map((f) => {
+      var de;
+      const y = A(f.ref), $e = [(de = _[f.subUnitId]) != null ? de : 0, y.row, y.column];
+      return { ...f, p: $e };
+    }).sort((f, y) => f.p[0] === y.p[0] ? f.p[1] === y.p[1] ? f.p[2] - y.p[2] : f.p[1] - y.p[1] : f.p[0] - y.p[0]);
     return [
       ...M(l.filter((T) => !T.resolved)),
       ...M(l.filter((T) => T.resolved))
     ];
-  }, [t]), p = le((l) => {
+  }, [n]), p = ue((l) => {
     var 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 : {
+      const { row: _, column: M } = A(l.ref), T = n.getSheetBySheetId(l.subUnitId), f = (I = T == null ? void 0 : T.getMergedCell(_, M)) != null ? I : {
         startColumn: M,
         endColumn: M,
-        startRow: C,
-        endRow: C
+        startRow: _,
+        endRow: _
       };
-      if (!Number.isNaN(C) && !Number.isNaN(M))
-        return n.addShape({
-          range: S,
+      if (!Number.isNaN(_) && !Number.isNaN(M))
+        return t.addShape({
+          range: f,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -665,123 +662,123 @@ const zt = () => {
         });
     }
     return null;
-  }, [n, a, o]), _ = (l) => {
-    var I, C;
-    return (C = (I = t.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? C : "";
-  }, f = () => {
+  }, [t, a, o]), C = (l) => {
+    var I, _;
+    return (_ = (I = n.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? _ : "";
+  }, S = () => {
     i.executeCommand(V.id);
   }, 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 && (n.removeShape(c.current), c.current = null);
+    m && m.unitId === l.unitId && m.subUnitId === l.subUnitId && m.commentId === l.id || (c.current && (t.removeShape(c.current), c.current = null), c.current = p(l));
+  }, D = () => {
+    c.current && (t.removeShape(c.current), c.current = null);
   }, X = (l, I) => {
     I && r.hidePopup();
   };
-  return wt(() => {
-    !h && c.current && n.removeShape(c.current);
-  }, [n, h]), /* @__PURE__ */ Me(
-    tt,
+  return Mt(() => {
+    !h && c.current && t.removeShape(c.current);
+  }, [t, h]), /* @__PURE__ */ be(
+    et,
     {
       unitId: o,
       subUnitId$: s,
       type: b.UNIVER_SHEET,
-      onAdd: f,
-      getSubUnitName: _,
+      onAdd: S,
+      getSubUnitName: C,
       onResolve: X,
       sortComments: u,
       onItemEnter: O,
-      onItemLeave: x,
-      onDeleteComment: () => (x(), !0)
+      onItemLeave: D,
+      onDeleteComment: () => (D(), !0)
     }
   );
-}, Kt = (n) => ({
+}, zt = (t) => ({
   id: V.id,
-  type: Pe.BUTTON,
-  icon: de,
+  type: Ie.BUTTON,
+  icon: "CommentIcon",
   title: "sheetThreadComment.menu.addComment",
-  hidden$: Ie(n, b.UNIVER_SHEET),
-  disabled$: ge(n, {
+  hidden$: ge(t, b.UNIVER_SHEET),
+  disabled$: Se(t, {
     workbookTypes: [Q],
     worksheetTypes: [J],
     rangeTypes: [q]
   })
-}), Yt = (n) => ({
-  id: Se.id,
-  type: Pe.BUTTON,
-  icon: de,
+}), Kt = (t) => ({
+  id: _e.id,
+  type: Ie.BUTTON,
+  icon: "CommentIcon",
   tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: ge(n, {
+  disabled$: Se(t, {
     workbookTypes: [Q],
     worksheetTypes: [J],
     rangeTypes: [q]
   }),
-  hidden$: Ie(n, b.UNIVER_SHEET)
-}), qt = {
+  hidden$: ge(t, b.UNIVER_SHEET)
+}), Yt = {
   id: V.id,
-  binding: pt.M | ue.CTRL_COMMAND | ue.ALT,
-  preconditions: ut
-}, Jt = {
+  binding: lt.M | me.CTRL_COMMAND | me.ALT,
+  preconditions: mt
+}, qt = {
   [Ct.MEDIA]: {
-    [Se.id]: {
+    [_e.id]: {
       order: 2,
-      menuItemFactory: Yt
+      menuItemFactory: Kt
     }
   },
-  [vt.MAIN_AREA]: {
-    [_t.OTHERS]: {
+  [pt.MAIN_AREA]: {
+    [vt.OTHERS]: {
       [V.id]: {
         order: 0,
-        menuItemFactory: Kt
+        menuItemFactory: zt
       }
     }
   }
 };
-var Qt = Object.getOwnPropertyDescriptor, Xt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? Qt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var Jt = Object.getOwnPropertyDescriptor, Qt = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? Jt(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, re = (n, e) => (r, t) => e(r, t, n);
+}, re = (t, e) => (r, n) => e(r, n, t);
 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();
+  constructor(t, e, r) {
+    super(), this._menuManagerService = t, this._componentManager = e, this._shortcutService = r, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(qt);
+    this._shortcutService.registerShortcut(Yt);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(Jt);
+    this._menuManagerService.mergeMenu(qt);
   }
   _initComponent() {
     [
-      [Ue, zt],
-      [nt, Gt],
-      [de, Ne]
-    ].forEach(([n, e]) => {
+      [Ee, Zt],
+      [tt, Gt],
+      ["CommentIcon", ke]
+    ].forEach(([t, e]) => {
       this.disposeWithMe(
-        this._componentManager.register(n, e)
+        this._componentManager.register(t, e)
       );
     });
   }
 };
-K = Xt([
-  re(0, St),
+K = Qt([
+  re(0, _t),
   re(1, v(ft)),
-  re(2, gt)
+  re(2, St)
 ], K);
-var en = Object.defineProperty, tn = Object.getOwnPropertyDescriptor, nn = (n, e, r) => e in n ? en(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r, rn = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? tn(e, r) : e, i = n.length - 1, s; i >= 0; i--)
-    (s = n[i]) && (o = s(o) || o);
+var Xt = Object.defineProperty, en = Object.getOwnPropertyDescriptor, tn = (t, e, r) => e in t ? Xt(t, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : t[e] = r, nn = (t, e, r, n) => {
+  for (var o = n > 1 ? void 0 : n ? en(e, r) : e, i = t.length - 1, s; i >= 0; i--)
+    (s = t[i]) && (o = s(o) || o);
   return o;
-}, oe = (n, e) => (r, t) => e(r, t, n), $e = (n, e, r) => nn(n, typeof e != "symbol" ? e + "" : e, r);
+}, oe = (t, e) => (r, n) => e(r, n, t), Ne = (t, e, r) => tn(t, typeof e != "symbol" ? e + "" : e, r);
 let Y = class extends Ge {
-  constructor(n = pe, e, r, t) {
-    super(), this._config = n, this._injector = e, this._commandService = r, this._configService = t;
-    const { menu: o, ...i } = Ke(
+  constructor(t = le, e, r, n) {
+    super(), this._config = t, this._injector = e, this._commandService = r, this._configService = n;
+    const { menu: o, ...i } = ze(
       {},
-      pe,
+      le,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Ut, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Et, i);
   }
   onStarting() {
     [
@@ -789,40 +786,40 @@ let Y = class extends Ge {
       [F],
       [W],
       [Z],
-      [G],
       [z],
+      [G],
       [R]
-    ].forEach((n) => {
-      this._injector.add(n);
-    }), [V].forEach((n) => {
-      this._commandService.registerCommand(n);
+    ].forEach((t) => {
+      this._injector.add(t);
+    }), [V].forEach((t) => {
+      this._commandService.registerCommand(t);
     }), this._injector.get(K);
   }
   onReady() {
-    this._injector.get(F), this._injector.get(G);
+    this._injector.get(F), this._injector.get(z);
   }
   onRendered() {
-    this._injector.get(W), this._injector.get(Z), this._injector.get(z);
+    this._injector.get(W), this._injector.get(Z), this._injector.get(G);
   }
 };
-$e(Y, "pluginName", Re);
-$e(Y, "type", b.UNIVER_SHEET);
-Y = rn([
-  We(rt, Xe),
-  oe(1, v(Ze)),
+Ne(Y, "pluginName", Ue);
+Ne(Y, "type", b.UNIVER_SHEET);
+Y = nn([
+  Fe(nt, Qe),
+  oe(1, v(We)),
   oe(2, v(se)),
-  oe(3, ze)
+  oe(3, Ze)
 ], Y);
 export {
-  Pn as AddCommentCommand,
-  Tn as DeleteCommentCommand,
-  bn as DeleteCommentTreeCommand,
-  Mn as IThreadCommentDataSourceService,
-  wn as ResolveCommentCommand,
-  Re as SHEETS_THREAD_COMMENT,
+  In as AddCommentCommand,
+  Pn as DeleteCommentCommand,
+  Tn as DeleteCommentTreeCommand,
+  bn as IThreadCommentDataSourceService,
+  Mn as ResolveCommentCommand,
+  Ue as SHEETS_THREAD_COMMENT,
   R as SheetsThreadCommentPopupService,
   V as ShowAddSheetCommentModalOperation,
   Y as UniverSheetsThreadCommentUIPlugin,
-  gn as UniverThreadCommentUIPlugin,
-  yn as UpdateCommentCommand
+  Sn as UniverThreadCommentUIPlugin,
+  wn as UpdateCommentCommand
 };