@univerjs/sheets-thread-comment-ui 0.5.1 → 0.5.2-nightly.202412281605

package/lib/es/index.js

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