@univerjs/sheets-thread-comment-ui 0.5.5 → 0.6.0-alpha.0

package/lib/es/index.js

@@ -1,31 +1,32 @@
-var Be = Object.defineProperty;
-var ke = (o, e, n) => e in o ? Be(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n;
-var E = (o, e, n) => ke(o, typeof e != "symbol" ? e + "" : e, n);
-import { Inject as _, Disposable as $, DisposableCollection as Fe, CommandType as We, IUniverInstanceService as N, InterceptorEffectEnum as Ze, UniverInstanceType as b, Range as ze, ICommandService as ce, RANGE_TYPE as he, Rectangle as qe, useDependency as R, Tools as Ge, DependentOn as Je, Injector as Ye, Plugin as Ke, merge as Qe, IConfigService as Xe } from "@univerjs/core";
-import { SheetsSelectionsService as Se, getSheetCommandTarget as et, SheetInterceptorService as ge, INTERCEPTOR_POINT as tt, SheetPermissionCheckController as Ie, WorkbookCommentPermission as K, WorksheetViewPermission as Q, RangeProtectionPermissionViewPoint as X, SetWorksheetActiveOperation as nt, RemoveSheetCommand as rt } from "@univerjs/sheets";
-import { SheetsThreadCommentModel as x, UniverSheetsThreadCommentPlugin as ot } from "@univerjs/sheets-thread-comment";
-import { ThreadCommentPanelService as ae, SetActiveCommentOperation as te, ThreadCommentTree as it, ThreadCommentPanel as st, ToggleSheetCommentPanelOperation as Pe, THREAD_COMMENT_PANEL as ct, UniverThreadCommentUIPlugin as at } from "@univerjs/thread-comment-ui";
-import { UniverThreadCommentUIPlugin as $n } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as ut, ISheetClipboardService as dt, COPY_TYPE as mt, HoverManagerService as ht, IMarkSelectionService as Te, IEditorBridgeService as lt, SheetSkeletonManagerService as pt, ScrollToRangeOperation as _t, whenSheetEditorFocused as ft, getCurrentRangeDisable$ as be } from "@univerjs/sheets-ui";
-import { IZenZoneService as vt, useObservable as A, KeyCode as Ct, MetaKeys as le, MenuItemType as Me, getMenuHiddenObservable as we, RibbonStartGroup as St, ContextMenuPosition as gt, ContextMenuGroup as It, ComponentManager as Pt, IMenuManagerService as Tt, IShortcutService as bt } from "@univerjs/ui";
-import { BehaviorSubject as Mt, debounceTime as ue, map as wt } from "rxjs";
-import { IRenderManagerService as ye } from "@univerjs/engine-render";
-import { singleReferenceToGrid as V, serializeRange as yt } from "@univerjs/engine-formula";
-import { IThreadCommentDataSourceService as Ee, DeleteCommentMutation as F, AddCommentMutation as se, ThreadCommentModel as Et } from "@univerjs/thread-comment";
-import { AddCommentCommand as xn, DeleteCommentCommand as Dn, DeleteCommentTreeCommand as jn, IThreadCommentDataSourceService as An, ResolveCommentCommand as Vn, UpdateCommentCommand as Hn } from "@univerjs/thread-comment";
-import Rt, { forwardRef as Re, useRef as Oe, createElement as Ue, useMemo as Ot, useCallback as pe, useEffect as Ut } from "react";
-const $e = "univer.sheet.thread-comment-modal", de = "comment-single", Ne = "SHEET_THREAD_COMMENT";
-var $t = Object.defineProperty, Nt = Object.getOwnPropertyDescriptor, xt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Nt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+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, useDependency as O, 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 ct, HoverManagerService as at, 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, 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 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 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 { 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", ae = "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 && $t(e, n, r), r;
-}, _e = (o, e) => (n, t) => e(n, t, o);
-let O = class extends $ {
+  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) {
     super();
     E(this, "_lastPopup", null);
     E(this, "_activePopup");
-    E(this, "_activePopup$", new Mt(null));
+    E(this, "_activePopup$", new It(null));
     E(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = n, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
@@ -40,9 +41,9 @@ let O = class extends $ {
     }));
   }
   showPopup(e, n) {
-    var m;
+    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 === ((m = this.activePopup) == null ? void 0 : m.subUnitId)) {
+    if (this._activePopup && t === this._activePopup.row && r === this._activePopup.col && i === this._activePopup.unitId && s === ((d = this.activePopup) == null ? void 0 : d.subUnitId)) {
       this._activePopup = e, this._activePopup$.next(e);
       return;
     }
@@ -53,7 +54,7 @@ let O = class extends $ {
       t,
       r,
       {
-        componentKey: $e,
+        componentKey: Oe,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -66,7 +67,7 @@ let O = class extends $ {
     );
     if (!c)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const a = new Fe();
+    const a = new He();
     a.add(c), a.add({
       dispose: () => {
         n == null || n();
@@ -83,54 +84,54 @@ let O = class extends $ {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-O = xt([
-  _e(0, _(ut)),
-  _e(1, vt)
-], O);
-const H = {
-  type: We.OPERATION,
+U = Ot([
+  le(0, _(it)),
+  le(1, lt)
+], U);
+const V = {
+  type: Be.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(o) {
-    var f;
-    const e = o.get(Se), n = o.get(N), t = o.get(O), r = o.get(ae), i = (f = e.getCurrentLastSelection()) == null ? void 0 : f.primary, s = o.get(x);
+    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);
     if (!i)
       return !1;
-    const c = et(n);
+    const c = qe(n);
     if (!c)
       return !1;
-    const { workbook: a, worksheet: m, unitId: u, subUnitId: d } = c, h = {
+    const { workbook: a, worksheet: d, unitId: m, subUnitId: h } = c, u = {
       workbook: a,
-      worksheet: m,
-      unitId: u,
-      subUnitId: d,
+      worksheet: d,
+      unitId: m,
+      subUnitId: h,
       row: i.startRow,
       col: i.startColumn
     };
-    t.showPopup(h);
-    const l = s.getByLocation(u, d, i.startRow, i.startColumn);
-    return l && r.setActiveComment({
-      unitId: u,
-      subUnitId: d,
-      commentId: l,
+    t.showPopup(u);
+    const p = s.getByLocation(m, h, i.startRow, i.startColumn);
+    return p && r.setActiveComment({
+      unitId: m,
+      subUnitId: h,
+      commentId: p,
       trigger: "context-menu"
     }), !0;
   }
-}, Dt = "sheets-thread-comment.config", fe = {};
-var jt = Object.defineProperty, At = Object.getOwnPropertyDescriptor, Vt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? At(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+}, 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 && jt(e, n, r), r;
-}, L = (o, e) => (n, t) => e(n, t, o);
-let W = class extends $ {
+  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();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        tt.CELL_CONTENT,
+        Je.CELL_CONTENT,
         {
-          effect: Ze.Style,
+          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({
@@ -157,32 +158,32 @@ let W = class extends $ {
       const n = e.getUnitId(), t = this._renderManagerService.getRenderById(n);
       (r = t == null ? void 0 : t.mainComponent) == null || r.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ue(16)).subscribe(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ce(16)).subscribe(() => {
       o();
     }));
   }
 };
-W = Vt([
-  L(0, _(ge)),
-  L(1, _(x)),
-  L(2, N),
-  L(3, ye)
-], W);
-var Ht = Object.defineProperty, Lt = Object.getOwnPropertyDescriptor, Bt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Lt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+F = $t([
+  H(0, _(ve)),
+  H(1, _(D)),
+  H(2, $),
+  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 && Ht(e, n, r), r;
-}, ne = (o, e) => (n, t) => e(n, t, o);
-const kt = (o, e, n) => {
-  const t = V(o), r = n.row - e.row, i = n.column - e.column, s = {
+  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 = {
     startColumn: t.column + i,
     startRow: t.row + r,
     endColumn: t.column + i,
     endRow: t.row + r
   };
-  return yt(s);
+  return Tt(s);
 };
-let Z = class extends $ {
+let W = class extends N {
   constructor(e, n, t) {
     super();
     E(this, "_copyInfo");
@@ -192,7 +193,7 @@ let Z = class extends $ {
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Ne,
+        id: Ue,
         onBeforeCopy: (e, n, t) => {
           this._copyInfo = {
             unitId: e,
@@ -206,52 +207,52 @@ let Z = class extends $ {
             row: c.rows[0],
             column: c.cols[0]
           };
-          if (r.copyType === mt.CUT && this._copyInfo) {
-            const { range: m, unitId: u, subUnitId: d } = this._copyInfo, h = {
-              row: m.startRow,
-              column: m.startColumn
+          if (r.copyType === ct.CUT && this._copyInfo) {
+            const { range: d, unitId: m, subUnitId: h } = this._copyInfo, u = {
+              row: d.startRow,
+              column: d.startColumn
             };
-            if (!(i === u && s === d)) {
-              const l = [];
-              ze.foreach(m, (g, p) => {
-                const I = this._sheetsThreadCommentModel.getAllByLocation(u, d, g, p);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((v) => {
-                  l.push(v);
-                }) : I.forEach(({ children: v, ...M }) => {
-                  M.parentId || l.push(M);
+            if (!(i === m && s === h)) {
+              const p = [];
+              ke.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 }) => {
+                  M.parentId || p.push(M);
                 });
               });
-              const f = [], S = [], U = [], D = [], ee = (g) => {
-                f.unshift({
-                  id: F.id,
+              const v = [], S = [], R = [], x = [], X = (g) => {
+                v.unshift({
+                  id: k.id,
                   params: {
-                    unitId: u,
-                    subUnitId: d,
+                    unitId: m,
+                    subUnitId: h,
                     commentId: g.id
                   }
-                }), U.push({
-                  id: se.id,
+                }), R.push({
+                  id: oe.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: kt(g.ref, h, a),
+                      ref: At(g.ref, u, a),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
                 }), S.push({
-                  id: se.id,
+                  id: oe.id,
                   params: {
-                    unitId: u,
-                    subUnitId: d,
+                    unitId: m,
+                    subUnitId: h,
                     comment: g,
                     sync: !0
                   }
-                }), D.unshift({
-                  id: F.id,
+                }), x.unshift({
+                  id: k.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
@@ -259,11 +260,11 @@ let Z = class extends $ {
                   }
                 });
               };
-              return l.forEach((g) => {
-                ee(g);
+              return p.forEach((g) => {
+                X(g);
               }), {
-                redos: [...f, ...U],
-                undos: [...D, ...S]
+                redos: [...v, ...R],
+                undos: [...x, ...S]
               };
             }
           }
@@ -276,35 +277,35 @@ let Z = class extends $ {
     );
   }
 };
-Z = Bt([
-  ne(0, _(dt)),
-  ne(1, _(x)),
-  ne(2, Ee)
-], Z);
-var Ft = Object.defineProperty, Wt = Object.getOwnPropertyDescriptor, Zt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Wt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+W = jt([
+  te(0, _(st)),
+  te(1, _(D)),
+  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 && Ft(e, n, r), r;
+  return t && r && Vt(e, n, r), r;
 }, B = (o, e) => (n, t) => e(n, t, o);
-let z = class extends $ {
+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();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(ue(100)).subscribe((o) => {
+      this._hoverManagerService.currentCell$.pipe(ce(100)).subscribe((o) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (o && (e && e.temp || !e)) {
           const { location: n } = o, { unitId: t, subUnitId: r, row: i, col: s } = n, c = this._sheetsThreadCommentModel.getByLocation(t, r, i, s);
           if (c) {
             if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-              workbookTypes: [K],
-              worksheetTypes: [Q],
-              rangeTypes: [X]
+              workbookTypes: [q],
+              worksheetTypes: [J],
+              rangeTypes: [Q]
             }, [{ startRow: i, startColumn: s, endRow: i, endColumn: s }]))
               return;
-            const m = this._sheetsThreadCommentModel.getComment(t, r, c);
-            m && !m.resolved && this._sheetsThreadCommentPopupService.showPopup({
+            const d = this._sheetsThreadCommentModel.getComment(t, r, c);
+            d && !d.resolved && this._sheetsThreadCommentPopupService.showPopup({
               unitId: t,
               subUnitId: r,
               row: i,
@@ -319,44 +320,44 @@ let z = class extends $ {
     );
   }
 };
-z = Zt([
-  B(0, _(ht)),
-  B(1, _(O)),
-  B(2, _(x)),
-  B(3, _(Ie))
-], z);
-var zt = Object.defineProperty, qt = Object.getOwnPropertyDescriptor, Gt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? qt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+Z = Bt([
+  B(0, _(at)),
+  B(1, _(U)),
+  B(2, _(D)),
+  B(3, _(fe))
+], 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 && zt(e, n, r), r;
+  return t && r && Lt(e, n, r), r;
 }, w = (o, e) => (n, t) => e(n, t, o);
-let q = class extends $ {
-  constructor(e, n, t, r, i, s, c, a, m, u) {
+let z = class extends N {
+  constructor(e, n, t, r, i, s, c, a, 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 = c, this._sheetSelectionService = a, this._editorBridgeService = m, this._renderManagerService = u, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
+    this._commandService = e, this._sheetsThreadCommentPopupService = n, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = r, this._univerInstanceService = i, this._sheetPermissionCheckController = s, this._markSelectionService = c, this._sheetSelectionService = a, this._editorBridgeService = d, this._renderManagerService = m, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
   }
   _handleSelectionChange(e, n, t) {
-    var h, l, f;
-    const r = (h = e[0]) == null ? void 0 : h.range, i = this._renderManagerService.getRenderById(n), s = (l = i == null ? void 0 : i.with(pt).getWorksheetSkeleton(t)) == null ? void 0 : l.skeleton;
+    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).getWorksheetSkeleton(t)) == null ? void 0 : p.skeleton;
     if (!s || !r)
       return;
     const c = s.getCellWithCoordByIndex(r.startRow, r.startColumn);
-    if ((((f = r.rangeType) != null ? f : he.NORMAL) !== he.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((c.isMerged || c.isMergedMainCell) && qe.equals(c.mergeInfo, r))) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
+    if ((((v = r.rangeType) != null ? v : he.NORMAL) !== he.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((c.isMerged || c.isMergedMainCell) && Fe.equals(c.mergeInfo, r))) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
-    const m = c.actualRow, u = c.actualColumn;
-    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, m, u)) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(te.id);
+    const d = c.actualRow, m = c.actualColumn;
+    if (!this._sheetsThreadCommentModel.showCommentMarker(n, t, d, m)) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(ee.id);
       return;
     }
-    const d = this._sheetsThreadCommentModel.getByLocation(n, t, m, u);
-    d && this._commandService.executeCommand(te.id, {
+    const h = this._sheetsThreadCommentModel.getByLocation(n, t, d, m);
+    h && this._commandService.executeCommand(ee.id, {
       unitId: n,
       subUnitId: t,
-      commentId: d
+      commentId: h
     });
   }
   _initSelectionUpdateListener() {
@@ -378,7 +379,7 @@ let q = class extends $ {
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((e) => {
-      if (e.id === F.id) {
+      if (e.id === k.id) {
         const n = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
         if (!t)
           return;
@@ -397,32 +398,32 @@ let q = class extends $ {
         const a = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET);
         if (!a || a.getUnitId() !== t)
           return;
-        this._isSwitchToCommenting = !0, ((n = a.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(nt.id, {
+        this._isSwitchToCommenting = !0, ((n = a.getActiveSheet()) == null ? void 0 : n.getSheetId()) !== r && await this._commandService.executeCommand(Qe.id, {
           unitId: t,
           subUnitId: r
         }), this._isSwitchToCommenting = !1;
-        const d = V(c.ref), { row: h, column: l } = d;
+        const h = A(c.ref), { row: u, column: p } = h;
         if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
-          workbookTypes: [K],
-          worksheetTypes: [Q],
-          rangeTypes: [X]
-        }, [{ startRow: h, startColumn: l, endRow: h, endColumn: l }]))
+          workbookTypes: [q],
+          worksheetTypes: [J],
+          rangeTypes: [Q]
+        }, [{ startRow: u, startColumn: p, endRow: u, endColumn: p }]))
           return;
         const S = 1;
-        if (await this._commandService.executeCommand(_t.id, {
+        if (await this._commandService.executeCommand(mt.id, {
           range: {
-            startRow: Math.max(d.row - S, 0),
-            endRow: d.row + S,
-            startColumn: Math.max(d.column - S, 0),
-            endColumn: d.column + S
+            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,
           subUnitId: r,
-          row: d.row,
-          col: d.column,
+          row: h.row,
+          col: h.column,
           commentId: c.id,
           trigger: s
         });
@@ -431,8 +432,8 @@ let q = class extends $ {
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ue(100)).subscribe((e) => {
-      var h, l;
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ce(100)).subscribe((e) => {
+      var u, p;
       if (!e) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
         return;
@@ -442,17 +443,17 @@ let q = class extends $ {
       const i = this._sheetsThreadCommentModel.getComment(n, t, r);
       if (!i)
         return;
-      const s = V(i.ref), { row: c, column: a } = s;
+      const s = A(i.ref), { row: c, column: a } = s;
       if (Number.isNaN(c) || Number.isNaN(a))
         return null;
-      const m = (h = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : h.getSheetBySheetId(t), u = (l = m == null ? void 0 : m.getMergedCell(c, a)) != null ? l : {
+      const d = (u = this._univerInstanceService.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : u.getSheetBySheetId(t), m = (p = d == null ? void 0 : d.getMergedCell(c, a)) != null ? p : {
         startColumn: a,
         endColumn: a,
         startRow: c,
         endRow: c
-      }, d = this._markSelectionService.addShape(
+      }, h = this._markSelectionService.addShape(
         {
-          range: u,
+          range: m,
           style: {
             // hasAutoFill: false,
             fill: "rgb(255, 189, 55, 0.35)",
@@ -465,31 +466,31 @@ let q = class extends $ {
         [],
         -1
       );
-      d && (this._selectionShapeInfo = {
+      h && (this._selectionShapeInfo = {
         ...e,
-        shapeId: d
+        shapeId: h
       });
     }));
   }
 };
-q = Gt([
-  w(0, ce),
-  w(1, _(O)),
-  w(2, _(x)),
-  w(3, _(ae)),
-  w(4, N),
-  w(5, _(Ie)),
-  w(6, Te),
-  w(7, _(Se)),
-  w(8, lt),
-  w(9, ye)
-], q);
-var Jt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, Kt = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? Yt(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+z = Ft([
+  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(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 && Jt(e, n, r), r;
-}, k = (o, e) => (n, t) => e(n, t, o);
-let G = class extends $ {
+  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();
   }
@@ -498,33 +499,33 @@ let G = class extends $ {
       this._sheetInterceptorService.interceptCommand({
         getMutations: (o) => {
           var e;
-          if (o.id === rt.id) {
+          if (o.id === Xe.id) {
             const n = o.params, t = n.unitId ? this._univerInstanceService.getUnit(n.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());
             if (!i)
               return { redos: [], undos: [] };
-            const s = this._threadCommentModel.ensureMap(r, i), c = Array.from(s.values()).filter((h) => !h.parentId), a = c.map((h) => h.id), m = this._threadCommentDataSourceService.syncUpdateMutationToColla, u = a.map((h) => ({
-              id: F.id,
+            const s = this._threadCommentModel.ensureMap(r, i), c = Array.from(s.values()).filter((u) => !u.parentId), a = c.map((u) => u.id), d = this._threadCommentDataSourceService.syncUpdateMutationToColla, m = a.map((u) => ({
+              id: k.id,
               params: {
                 unitId: r,
                 subUnitId: i,
-                commentId: h
+                commentId: u
               }
-            })), d = c.map(({ children: h, ...l }) => ({
-              id: se.id,
+            })), h = c.map(({ children: u, ...p }) => ({
+              id: oe.id,
               params: {
                 unitId: r,
                 subUnitId: i,
                 comment: {
-                  ...l,
-                  children: m ? h : void 0
+                  ...p,
+                  children: d ? u : void 0
                 },
-                sync: !m
+                sync: !d
               }
             }));
-            return { redos: u, undos: d };
+            return { redos: m, undos: h };
           }
           return { redos: [], undos: [] };
         }
@@ -532,11 +533,11 @@ let G = class extends $ {
     );
   }
 };
-G = Kt([
-  k(0, _(ge)),
-  k(1, N),
-  k(2, _(Et)),
-  k(3, Ee)
+G = zt([
+  L(0, _(ve)),
+  L(1, $),
+  L(2, _(bt)),
+  L(3, be)
 ], G);
 var P = function() {
   return P = Object.assign || function(o) {
@@ -546,23 +547,23 @@ var P = function() {
     }
     return o;
   }, P.apply(this, arguments);
-}, Qt = function(o, e) {
+}, 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;
-}, xe = Re(function(o, e) {
-  var n = o.icon, t = o.id, r = o.className, i = o.extend, s = Qt(o, ["icon", "id", "className", "extend"]), c = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), a = Oe("_".concat(tn()));
-  return De(n, "".concat(t), { defIds: n.defIds, idSuffix: a.current }, P({ ref: e, className: c }, s), i);
+}, 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"]), c = "univerjs-icon univerjs-icon-".concat(t, " ").concat(r || "").trim(), a = ye("_".concat(qt()));
+  return Ne(n, "".concat(t), { defIds: n.defIds, idSuffix: a.current }, P({ ref: e, className: c }, s), i);
 });
-function De(o, e, n, t, r) {
-  return Ue(o.tag, P(P({ key: e }, Xt(o, n, r)), t), (en(o, n).children || []).map(function(i, s) {
-    return De(i, "".concat(e, "-").concat(o.tag, "-").concat(s), n, void 0, r);
+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 Xt(o, e, n) {
+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;
@@ -571,106 +572,77 @@ function Xt(o, e, n) {
     typeof c == "string" && (t[s] = c.replace(/url\(#(.*)\)/, "url(#$1".concat(e.idSuffix, ")")));
   })), t;
 }
-function en(o, e) {
+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 tn() {
+function qt() {
   return Math.random().toString(36).substring(2, 8);
 }
-xe.displayName = "UniverIcon";
-var nn = { 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" } }] }, je = Re(function(o, e) {
-  return Ue(xe, Object.assign({}, o, {
+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, {
     id: "comment-single",
     ref: e,
-    icon: nn
+    icon: Jt
   }));
 });
-je.displayName = "CommentSingle";
-var re = { exports: {} }, j = {};
-/**
- * @license React
- * react-jsx-runtime.production.min.js
- *
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-var ve;
-function rn() {
-  if (ve) return j;
-  ve = 1;
-  var o = Rt, e = Symbol.for("react.element"), n = Symbol.for("react.fragment"), t = Object.prototype.hasOwnProperty, r = o.__SECRET_INTERNALS_DO_NOT_USE_OR_YOU_WILL_BE_FIRED.ReactCurrentOwner, i = { key: !0, ref: !0, __self: !0, __source: !0 };
-  function s(c, a, m) {
-    var u, d = {}, h = null, l = null;
-    m !== void 0 && (h = "" + m), a.key !== void 0 && (h = "" + a.key), a.ref !== void 0 && (l = a.ref);
-    for (u in a) t.call(a, u) && !i.hasOwnProperty(u) && (d[u] = a[u]);
-    if (c && c.defaultProps) for (u in a = c.defaultProps, a) d[u] === void 0 && (d[u] = a[u]);
-    return { $$typeof: e, type: c, key: h, ref: l, props: d, _owner: r.current };
-  }
-  return j.Fragment = n, j.jsx = s, j.jsxs = s, j;
-}
-var Ce;
-function on() {
-  return Ce || (Ce = 1, re.exports = rn()), re.exports;
-}
-var Ae = on();
-const sn = () => {
-  const o = R(N), e = R(O), n = A(e.activePopup$), t = R(x);
-  if (A(t.commentUpdate$), !n)
+$e.displayName = "CommentSingle";
+const Qt = () => {
+  const o = O($), e = O(U), n = j(e.activePopup$), t = O(D);
+  if (j(t.commentUpdate$), !n)
     return null;
-  const { row: r, col: i, unitId: s, subUnitId: c, trigger: a } = n, m = t.getByLocation(s, c, r, i), u = `${Ge.chatAtABC(i)}${r + 1}`, d = () => {
+  const { row: r, col: i, unitId: s, subUnitId: c, trigger: a } = n, d = t.getByLocation(s, c, r, i), m = `${We.chatAtABC(i)}${r + 1}`, h = () => {
     e.hidePopup();
-  }, h = (l) => {
-    var f, S, U;
-    return (U = (S = (f = o.getCurrentUnitForType(b.UNIVER_SHEET)) == null ? void 0 : f.getSheetBySheetId(l)) == null ? void 0 : S.getName()) != null ? U : "";
+  }, 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 : "";
   };
-  return /* @__PURE__ */ Ae.jsx(
-    it,
+  return /* @__PURE__ */ Me(
+    tt,
     {
       onClick: () => {
         e.persistPopup();
       },
       prefix: "cell",
-      id: m,
+      id: d,
       unitId: s,
       subUnitId: c,
       type: b.UNIVER_SHEET,
-      refStr: u,
-      onClose: d,
-      getSubUnitName: h,
+      refStr: m,
+      onClose: h,
+      getSubUnitName: u,
       autoFocus: a === "context-menu"
     }
   );
-}, cn = () => {
+}, Xt = () => {
   var g;
-  const o = R(Te), e = R(N), n = R(O), t = e.getCurrentUnitForType(b.UNIVER_SHEET), r = t.getUnitId(), i = R(ce), s = Ot(() => t.activeSheet$.pipe(wt((p) => p == null ? void 0 : p.getSheetId())), [t.activeSheet$]), c = A(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), a = Oe(), m = R(ae), u = A(m.activeCommentId$), d = A(m.panelVisible$, m.panelVisible), h = pe((p) => {
-    const I = t.getSheets(), v = {};
+  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$]), c = j(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), a = 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) => {
-      v[T.getSheetId()] = C;
+      f[T.getSheetId()] = C;
     });
     const M = (T) => T.map((C) => {
-      var me;
-      const y = V(C.ref), Le = [(me = v[C.subUnitId]) != null ? me : 0, y.row, y.column];
-      return { ...C, p: Le };
+      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]);
     return [
-      ...M(p.filter((T) => !T.resolved)),
-      ...M(p.filter((T) => T.resolved))
+      ...M(l.filter((T) => !T.resolved)),
+      ...M(l.filter((T) => T.resolved))
     ];
-  }, [t]), l = pe((p) => {
+  }, [t]), p = ue((l) => {
     var I;
-    if (p.unitId === r && p.subUnitId === c && !p.resolved) {
-      const { row: v, column: M } = V(p.ref), T = t.getSheetBySheetId(p.subUnitId), C = (I = T == null ? void 0 : T.getMergedCell(v, M)) != null ? I : {
+    if (l.unitId === r && l.subUnitId === c && !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 : {
         startColumn: M,
         endColumn: M,
-        startRow: v,
-        endRow: v
+        startRow: f,
+        endRow: f
       };
-      if (!Number.isNaN(v) && !Number.isNaN(M))
+      if (!Number.isNaN(f) && !Number.isNaN(M))
         return o.addShape({
           range: C,
           style: {
@@ -683,162 +655,163 @@ const sn = () => {
           primary: null
         });
     }
-  }, [o, c, r]), f = (p) => {
-    var I, v;
-    return (v = (I = t.getSheetBySheetId(p)) == null ? void 0 : I.getName()) != null ? v : "";
+    return null;
+  }, [o, c, r]), v = (l) => {
+    var I, f;
+    return (f = (I = t.getSheetBySheetId(l)) == null ? void 0 : I.getName()) != null ? f : "";
   }, S = () => {
-    i.executeCommand(H.id);
-  }, U = (p) => {
-    u && u.unitId === p.unitId && u.subUnitId === p.subUnitId && u.commentId === p.id || (a.current && (o.removeShape(a.current), a.current = null), a.current = l(p));
-  }, D = () => {
+    i.executeCommand(V.id);
+  }, R = (l) => {
+    m && m.unitId === l.unitId && m.subUnitId === l.subUnitId && m.commentId === l.id || (a.current && (o.removeShape(a.current), a.current = null), a.current = p(l));
+  }, x = () => {
     a.current && (o.removeShape(a.current), a.current = null);
-  }, ee = (p, I) => {
+  }, X = (l, I) => {
     I && n.hidePopup();
   };
-  return Ut(() => {
-    !d && a.current && o.removeShape(a.current);
-  }, [o, d]), /* @__PURE__ */ Ae.jsx(
-    st,
+  return wt(() => {
+    !h && a.current && o.removeShape(a.current);
+  }, [o, h]), /* @__PURE__ */ Me(
+    nt,
     {
       unitId: r,
       subUnitId$: s,
       type: b.UNIVER_SHEET,
       onAdd: S,
-      getSubUnitName: f,
-      onResolve: ee,
-      sortComments: h,
-      onItemEnter: U,
-      onItemLeave: D,
-      onDeleteComment: () => (D(), !0)
+      getSubUnitName: v,
+      onResolve: X,
+      sortComments: u,
+      onItemEnter: R,
+      onItemLeave: x,
+      onDeleteComment: () => (x(), !0)
     }
   );
-}, an = (o) => ({
-  id: H.id,
-  type: Me.BUTTON,
-  icon: de,
+}, en = (o) => ({
+  id: V.id,
+  type: Ie.BUTTON,
+  icon: ae,
   title: "sheetThreadComment.menu.addComment",
-  hidden$: we(o, b.UNIVER_SHEET),
-  disabled$: be(o, {
-    workbookTypes: [K],
-    worksheetTypes: [Q],
-    rangeTypes: [X]
+  hidden$: Pe(o, b.UNIVER_SHEET),
+  disabled$: ge(o, {
+    workbookTypes: [q],
+    worksheetTypes: [J],
+    rangeTypes: [Q]
   })
-}), un = (o) => ({
-  id: Pe.id,
-  type: Me.BUTTON,
-  icon: de,
+}), tn = (o) => ({
+  id: Ce.id,
+  type: Ie.BUTTON,
+  icon: ae,
   tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: be(o, {
-    workbookTypes: [K],
-    worksheetTypes: [Q],
-    rangeTypes: [X]
+  disabled$: ge(o, {
+    workbookTypes: [q],
+    worksheetTypes: [J],
+    rangeTypes: [Q]
   }),
-  hidden$: we(o, b.UNIVER_SHEET)
-}), dn = {
-  id: H.id,
-  binding: Ct.M | le.CTRL_COMMAND | le.ALT,
-  preconditions: ft
-}, mn = {
-  [St.OTHERS]: {
-    [Pe.id]: {
+  hidden$: Pe(o, b.UNIVER_SHEET)
+}), nn = {
+  id: V.id,
+  binding: pt.M | me.CTRL_COMMAND | me.ALT,
+  preconditions: ut
+}, rn = {
+  [_t.OTHERS]: {
+    [Ce.id]: {
       order: 1,
-      menuItemFactory: un
+      menuItemFactory: tn
     }
   },
-  [gt.MAIN_AREA]: {
-    [It.OTHERS]: {
-      [H.id]: {
+  [vt.MAIN_AREA]: {
+    [ft.OTHERS]: {
+      [V.id]: {
         order: 0,
-        menuItemFactory: an
+        menuItemFactory: en
       }
     }
   }
 };
-var hn = Object.defineProperty, ln = Object.getOwnPropertyDescriptor, pn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? ln(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+var on = Object.defineProperty, sn = Object.getOwnPropertyDescriptor, cn = (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 && hn(e, n, r), r;
-}, oe = (o, e) => (n, t) => e(n, t, o);
-let J = class extends $ {
+  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();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(dn);
+    this._shortcutService.registerShortcut(nn);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(mn);
+    this._menuManagerService.mergeMenu(rn);
   }
   _initComponent() {
     [
-      [$e, sn],
-      [ct, cn],
-      [de, je]
+      [Oe, Qt],
+      [rt, Xt],
+      [ae, $e]
     ].forEach(([o, e]) => {
       this._componentManager.register(o, e);
     });
   }
 };
-J = pn([
-  oe(0, Tt),
-  oe(1, _(Pt)),
-  oe(2, bt)
-], J);
-var Ve = Object.defineProperty, _n = Object.getOwnPropertyDescriptor, fn = (o, e, n) => e in o ? Ve(o, e, { enumerable: !0, configurable: !0, writable: !0, value: n }) : o[e] = n, vn = (o, e, n, t) => {
-  for (var r = t > 1 ? void 0 : t ? _n(e, n) : e, i = o.length - 1, s; i >= 0; i--)
+K = cn([
+  ne(0, St),
+  ne(1, _(Ct)),
+  ne(2, gt)
+], K);
+var De = Object.defineProperty, an = 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 ? an(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 && Ve(e, n, r), r;
-}, ie = (o, e) => (n, t) => e(n, t, o), He = (o, e, n) => fn(o, typeof e != "symbol" ? e + "" : e, n);
-let Y = class extends Ke {
-  constructor(o = fe, e, n, t) {
+  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);
+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 } = Qe(
+    const { menu: r, ...i } = Ke(
       {},
-      fe,
+      pe,
       this._config
     );
-    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Dt, i);
+    r && this._configService.setConfig("menu", r, { merge: !0 }), this._configService.setConfig(Ut, i);
   }
   onStarting() {
     [
-      [J],
+      [K],
+      [F],
       [W],
       [Z],
-      [z],
       [G],
-      [q],
-      [O]
+      [z],
+      [U]
     ].forEach((o) => {
       this._injector.add(o);
-    }), [H].forEach((o) => {
+    }), [V].forEach((o) => {
       this._commandService.registerCommand(o);
-    }), this._injector.get(J);
+    }), this._injector.get(K);
   }
   onReady() {
-    this._injector.get(W), this._injector.get(G);
+    this._injector.get(F), this._injector.get(G);
   }
   onRendered() {
-    this._injector.get(Z), this._injector.get(z), this._injector.get(q);
+    this._injector.get(W), this._injector.get(Z), this._injector.get(z);
   }
 };
-He(Y, "pluginName", Ne);
-He(Y, "type", b.UNIVER_SHEET);
-Y = vn([
-  Je(at, ot),
-  ie(1, _(Ye)),
-  ie(2, _(ce)),
-  ie(3, Xe)
+xe(Y, "pluginName", Ue);
+xe(Y, "type", b.UNIVER_SHEET);
+Y = hn([
+  Ze(ot, et),
+  re(1, _(ze)),
+  re(2, _(ie)),
+  re(3, Ye)
 ], Y);
 export {
-  xn as AddCommentCommand,
-  Dn as DeleteCommentCommand,
-  jn as DeleteCommentTreeCommand,
-  An as IThreadCommentDataSourceService,
-  Vn as ResolveCommentCommand,
-  Ne as SHEETS_THREAD_COMMENT,
-  O as SheetsThreadCommentPopupService,
-  H as ShowAddSheetCommentModalOperation,
+  En as AddCommentCommand,
+  On as DeleteCommentCommand,
+  Un as DeleteCommentTreeCommand,
+  Rn as IThreadCommentDataSourceService,
+  Nn as ResolveCommentCommand,
+  Ue as SHEETS_THREAD_COMMENT,
+  U as SheetsThreadCommentPopupService,
+  V as ShowAddSheetCommentModalOperation,
   Y as UniverSheetsThreadCommentUIPlugin,
-  $n as UniverThreadCommentUIPlugin,
-  Hn as UpdateCommentCommand
+  wn as UniverThreadCommentUIPlugin,
+  $n as UpdateCommentCommand
 };