@univerjs/sheets-thread-comment-ui 0.16.1 → 0.17.0

package/lib/index.js

@@ -1,32 +1,32 @@
-var Re = Object.defineProperty;
-var Ue = (n, e, r) => e in n ? Re(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r;
-var y = (n, e, r) => Ue(n, typeof e != "symbol" ? e + "" : e, r);
-import { Inject as p, Disposable as $, DisposableCollection as $e, CommandType as Oe, IUniverInstanceService as x, InterceptorEffectEnum as ke, UniverInstanceType as M, Range as Ne, ICommandService as ne, RANGE_TYPE as se, Rectangle as De, Tools as xe, DependentOn as Ae, Injector as Ve, IConfigService as Be, Plugin as He, merge as Le } from "@univerjs/core";
-import { SheetsSelectionsService as de, getSheetCommandTarget as je, SheetInterceptorService as Fe, INTERCEPTOR_POINT as We, SheetPermissionCheckController as ue, RangeProtectionPermissionViewPoint as G, WorksheetViewPermission as z, WorkbookCommentPermission as K, SetWorksheetActiveOperation as Ze } from "@univerjs/sheets";
-import { SheetsThreadCommentModel as O, UniverSheetsThreadCommentPlugin as Ge } from "@univerjs/sheets-thread-comment";
-import { ThreadCommentPanelService as re, SetActiveCommentOperation as q, ThreadCommentTree as ze, ThreadCommentPanel as Ke, ToggleSheetCommentPanelOperation as le, THREAD_COMMENT_PANEL as Ye, UniverThreadCommentUIPlugin as qe } from "@univerjs/thread-comment-ui";
-import { UniverThreadCommentUIPlugin as dn } from "@univerjs/thread-comment-ui";
-import { SheetCanvasPopManagerService as Je, CellPopupManagerService as Qe, ISheetClipboardService as Xe, COPY_TYPE as et, HoverManagerService as tt, IMarkSelectionService as pe, IEditorBridgeService as nt, SheetSkeletonManagerService as rt, ScrollToRangeOperation as ot, whenSheetEditorFocused as it, getCurrentRangeDisable$ as Ce } from "@univerjs/sheets-ui";
-import { IZenZoneService as st, useDependency as E, useObservable as N, KeyCode as at, MetaKeys as ae, getMenuHiddenObservable as _e, MenuItemType as ve, ContextMenuPosition as ct, ContextMenuGroup as ht, RibbonInsertGroup as mt, IMenuManagerService as dt, ComponentManager as ut, IShortcutService as lt } from "@univerjs/ui";
-import { BehaviorSubject as pt, debounceTime as oe, map as Ct } from "rxjs";
-import { IRenderManagerService as Se } from "@univerjs/engine-render";
-import { singleReferenceToGrid as D, serializeRange as _t } from "@univerjs/engine-formula";
-import { IThreadCommentDataSourceService as vt, DeleteCommentMutation as te, AddCommentMutation as ce } from "@univerjs/thread-comment";
-import { AddCommentCommand as ln, DeleteCommentCommand as pn, DeleteCommentTreeCommand as Cn, IThreadCommentDataSourceService as _n, ResolveCommentCommand as vn, UpdateCommentCommand as Sn } from "@univerjs/thread-comment";
-import { useRef as fe, createElement as ge, forwardRef as St, useMemo as ft, useCallback as he, useEffect as gt } from "react";
-import { jsx as Ie } from "react/jsx-runtime";
-const Pe = "univer.sheet.thread-comment-modal", Te = "SHEET_THREAD_COMMENT";
-var It = Object.getOwnPropertyDescriptor, Pt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? It(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+var Ue = Object.defineProperty;
+var $e = (n, e, r) => e in n ? Ue(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r;
+var y = (n, e, r) => $e(n, typeof e != "symbol" ? e + "" : e, r);
+import { Inject as p, Disposable as k, DisposableCollection as ke, CommandType as Oe, IUniverInstanceService as A, InterceptorEffectEnum as Ne, UniverInstanceType as M, Range as De, ICommandService as re, RANGE_TYPE as ae, Rectangle as xe, Tools as Ae, DependentOn as Ve, Injector as Be, IConfigService as He, Plugin as Le, merge as je } from "@univerjs/core";
+import { SheetsSelectionsService as ue, getSheetCommandTarget as Fe, SheetInterceptorService as We, INTERCEPTOR_POINT as Ze, SheetPermissionCheckController as le, RangeProtectionPermissionViewPoint as G, WorksheetViewPermission as z, WorkbookCommentPermission as K, SetWorksheetActiveOperation as Ge } from "@univerjs/sheets";
+import { SheetsThreadCommentModel as O, UniverSheetsThreadCommentPlugin as ze } from "@univerjs/sheets-thread-comment";
+import { ThreadCommentPanelService as oe, SetActiveCommentOperation as J, ToggleSheetCommentPanelOperation as pe, ThreadCommentTree as Ke, ThreadCommentPanel as Ye, THREAD_COMMENT_PANEL as qe, UniverThreadCommentUIPlugin as Je } from "@univerjs/thread-comment-ui";
+import { UniverThreadCommentUIPlugin as pn } from "@univerjs/thread-comment-ui";
+import { SheetCanvasPopManagerService as Qe, CellPopupManagerService as Xe, ISheetClipboardService as et, COPY_TYPE as tt, HoverManagerService as nt, IMarkSelectionService as Ce, IEditorBridgeService as rt, SheetSkeletonManagerService as ot, ScrollToRangeOperation as it, whenSheetEditorFocused as st, getCurrentRangeDisable$ as ve } from "@univerjs/sheets-ui";
+import { IZenZoneService as at, KeyCode as ct, MetaKeys as ce, getMenuHiddenObservable as _e, MenuItemType as Se, ContextMenuPosition as ht, ContextMenuGroup as mt, RibbonInsertGroup as dt, useDependency as E, useObservable as D, IMenuManagerService as ut, ComponentManager as lt, IShortcutService as pt } from "@univerjs/ui";
+import { BehaviorSubject as Ct, debounceTime as ie, map as vt } from "rxjs";
+import { IRenderManagerService as fe } from "@univerjs/engine-render";
+import { singleReferenceToGrid as x, serializeRange as _t } from "@univerjs/engine-formula";
+import { IThreadCommentDataSourceService as St, DeleteCommentMutation as ne, AddCommentMutation as he } from "@univerjs/thread-comment";
+import { AddCommentCommand as vn, DeleteCommentCommand as _n, DeleteCommentTreeCommand as Sn, IThreadCommentDataSourceService as fn, ResolveCommentCommand as gn, UpdateCommentCommand as In } from "@univerjs/thread-comment";
+import { useRef as ge, createElement as Ie, forwardRef as ft, useMemo as gt, useCallback as me, useEffect as It } from "react";
+import { jsx as Pe } from "react/jsx-runtime";
+const Te = "univer.sheet.thread-comment-modal", we = "SHEET_THREAD_COMMENT";
+var Pt = Object.getOwnPropertyDescriptor, Tt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Pt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, J = (n, e) => (r, t) => e(r, t, n);
-let R = class extends $ {
+}, Q = (n, e) => (r, t) => e(r, t, n);
+let R = class extends k {
   constructor(e, r, t) {
     super();
     y(this, "_lastPopup", null);
     y(this, "_activePopup");
-    y(this, "_activePopup$", new pt(null));
+    y(this, "_activePopup$", new Ct(null));
     y(this, "activePopup$", this._activePopup$.asObservable());
     this._canvasPopupManagerService = e, this._zenZoneService = r, this._cellPopupManagerService = t, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
@@ -61,7 +61,7 @@ let R = class extends $ {
         subUnitId: s
       },
       {
-        componentKey: Pe,
+        componentKey: Te,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -75,7 +75,7 @@ let R = class extends $ {
     );
     if (!a)
       throw new Error("[SheetsThreadCommentPopupService]: cannot show popup!");
-    const c = new $e();
+    const c = new ke();
     c.add(a), c.add({
       dispose: () => {
         r == null || r();
@@ -92,20 +92,20 @@ let R = class extends $ {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-R = Pt([
-  J(0, p(Je)),
-  J(1, st),
-  J(2, p(Qe))
+R = Tt([
+  Q(0, p(Qe)),
+  Q(1, at),
+  Q(2, p(Xe))
 ], R);
-const A = {
+const V = {
   type: Oe.OPERATION,
   id: "sheets.operation.show-comment-modal",
   handler(n) {
-    var _;
-    const e = n.get(de), r = n.get(x), t = n.get(R), o = n.get(re), i = (_ = e.getCurrentLastSelection()) == null ? void 0 : _.primary, s = n.get(O);
+    var v;
+    const e = n.get(ue), r = n.get(A), t = n.get(R), o = n.get(oe), i = (v = e.getCurrentLastSelection()) == null ? void 0 : v.primary, s = n.get(O);
     if (!i)
       return !1;
-    const a = je(r);
+    const a = Fe(r);
     if (!a)
       return !1;
     const { workbook: c, worksheet: h, unitId: d, subUnitId: m } = a, C = {
@@ -125,22 +125,25 @@ const A = {
       trigger: "context-menu"
     }), !0;
   }
-}, Tt = "sheets-thread-comment.config", me = {};
-var wt = Object.getOwnPropertyDescriptor, Mt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? wt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+}, wt = "@univerjs/sheets-thread-comment-ui", Mt = "0.17.0", Me = {
+  name: wt,
+  version: Mt
+}, bt = "sheets-thread-comment.config", de = {};
+var yt = Object.getOwnPropertyDescriptor, Et = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? yt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, V = (n, e) => (r, t) => e(r, t, n);
-let H = class extends $ {
+}, B = (n, e) => (r, t) => e(r, t, n);
+let L = class extends k {
   constructor(n, e, r, t) {
     super(), this._sheetInterceptorService = n, this._sheetsThreadCommentModel = e, this._univerInstanceService = r, this._renderManagerService = t, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        We.CELL_CONTENT,
+        Ze.CELL_CONTENT,
         {
-          effect: ke.Style,
+          effect: Ne.Style,
           handler: (n, e, r) => {
             const { row: t, col: o, unitId: i, subUnitId: s } = e;
             return this._sheetsThreadCommentModel.showCommentMarker(i, s, t, o) && ((!n || n === e.rawData) && (n = { ...e.rawData }), n.markers = {
@@ -164,24 +167,24 @@ let H = class extends $ {
       const r = e.getUnitId(), t = this._renderManagerService.getRenderById(r);
       (o = t == null ? void 0 : t.mainComponent) == null || o.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(oe(16)).subscribe(() => {
+    this.disposeWithMe(this._sheetsThreadCommentModel.commentUpdate$.pipe(ie(16)).subscribe(() => {
       n();
     }));
   }
 };
-H = Mt([
-  V(0, p(Fe)),
-  V(1, p(O)),
-  V(2, x),
-  V(3, Se)
-], H);
-var bt = Object.getOwnPropertyDescriptor, yt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? bt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+L = Et([
+  B(0, p(We)),
+  B(1, p(O)),
+  B(2, A),
+  B(3, fe)
+], L);
+var Rt = Object.getOwnPropertyDescriptor, Ut = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Rt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, Q = (n, e) => (r, t) => e(r, t, n);
-const Et = (n, e, r) => {
-  const t = D(n), o = r.row - e.row, i = r.column - e.column, s = {
+}, X = (n, e) => (r, t) => e(r, t, n);
+const $t = (n, e, r) => {
+  const t = x(n), o = r.row - e.row, i = r.column - e.column, s = {
     startColumn: t.column + i,
     startRow: t.row + o,
     endColumn: t.column + i,
@@ -189,7 +192,7 @@ const Et = (n, e, r) => {
   };
   return _t(s);
 };
-let L = class extends $ {
+let j = class extends k {
   constructor(e, r, t) {
     super();
     y(this, "_copyInfo");
@@ -199,7 +202,7 @@ let L = class extends $ {
   _initClipboardHook() {
     this.disposeWithMe(
       this._sheetClipboardService.addClipboardHook({
-        id: Te,
+        id: we,
         onBeforeCopy: (e, r, t) => {
           this._copyInfo = {
             unitId: e,
@@ -213,52 +216,52 @@ let L = class extends $ {
             row: a.rows[0],
             column: a.cols[0]
           };
-          if (o.copyType === et.CUT && this._copyInfo) {
+          if (o.copyType === tt.CUT && this._copyInfo) {
             const { range: h, unitId: d, subUnitId: m } = this._copyInfo, C = {
               row: h.startRow,
               column: h.startColumn
             };
             if (!(i === d && s === m)) {
               const l = [];
-              Ne.foreach(h, (g, u) => {
+              De.foreach(h, (g, u) => {
                 const I = this._sheetsThreadCommentModel.getAllByLocation(d, m, g, u);
-                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((v) => {
-                  l.push(v);
-                }) : I.forEach(({ children: v, ...T }) => {
+                this._threadCommentDataSourceService.syncUpdateMutationToColla ? I.forEach((_) => {
+                  l.push(_);
+                }) : I.forEach(({ children: _, ...T }) => {
                   T.parentId || l.push(T);
                 });
               });
-              const _ = [], f = [], U = [], k = [], Y = (g) => {
-                _.unshift({
-                  id: te.id,
+              const v = [], f = [], U = [], N = [], q = (g) => {
+                v.unshift({
+                  id: ne.id,
                   params: {
                     unitId: d,
                     subUnitId: m,
                     commentId: g.id
                   }
                 }), U.push({
-                  id: ce.id,
+                  id: he.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
                     comment: {
                       ...g,
-                      ref: Et(g.ref, C, c),
+                      ref: $t(g.ref, C, c),
                       unitId: i,
                       subUnitId: s
                     },
                     sync: !0
                   }
                 }), f.push({
-                  id: ce.id,
+                  id: he.id,
                   params: {
                     unitId: d,
                     subUnitId: m,
                     comment: g,
                     sync: !0
                   }
-                }), k.unshift({
-                  id: te.id,
+                }), N.unshift({
+                  id: ne.id,
                   params: {
                     unitId: i,
                     subUnitId: s,
@@ -267,10 +270,10 @@ let L = class extends $ {
                 });
               };
               return l.forEach((g) => {
-                Y(g);
+                q(g);
               }), {
-                redos: [..._, ...U],
-                undos: [...k, ...f]
+                redos: [...v, ...U],
+                undos: [...N, ...f]
               };
             }
           }
@@ -283,23 +286,23 @@ let L = class extends $ {
     );
   }
 };
-L = yt([
-  Q(0, p(Xe)),
-  Q(1, p(O)),
-  Q(2, vt)
-], L);
-var Rt = Object.getOwnPropertyDescriptor, Ut = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? Rt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+j = Ut([
+  X(0, p(et)),
+  X(1, p(O)),
+  X(2, St)
+], j);
+var kt = Object.getOwnPropertyDescriptor, Ot = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? kt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, B = (n, e) => (r, t) => e(r, t, n);
-let j = class extends $ {
+}, H = (n, e) => (r, t) => e(r, t, n);
+let F = class extends k {
   constructor(n, e, r, t) {
     super(), this._hoverManagerService = n, this._sheetsThreadCommentPopupService = e, this._sheetsThreadCommentModel = r, this._sheetPermissionCheckController = t, this._initHoverEvent();
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(oe(100)).subscribe((n) => {
+      this._hoverManagerService.currentCell$.pipe(ie(100)).subscribe((n) => {
         const e = this._sheetsThreadCommentPopupService.activePopup;
         if (n && (e && e.temp || !e)) {
           const { location: r } = n, { unitId: t, subUnitId: o, row: i, col: s } = r, a = this._sheetsThreadCommentModel.getByLocation(t, o, i, s);
@@ -326,18 +329,18 @@ let j = class extends $ {
     );
   }
 };
-j = Ut([
-  B(0, p(tt)),
-  B(1, p(R)),
-  B(2, p(O)),
-  B(3, p(ue))
-], j);
-var $t = Object.getOwnPropertyDescriptor, Ot = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? $t(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+F = Ot([
+  H(0, p(nt)),
+  H(1, p(R)),
+  H(2, p(O)),
+  H(3, p(le))
+], F);
+var Nt = Object.getOwnPropertyDescriptor, Dt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Nt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
 }, w = (n, e) => (r, t) => e(r, t, n);
-let F = class extends $ {
+let W = class extends k {
   constructor(e, r, t, o, i, s, a, c, h, d) {
     super();
     y(this, "_isSwitchToCommenting", !1);
@@ -345,22 +348,22 @@ let F = class extends $ {
     this._commandService = e, this._sheetsThreadCommentPopupService = r, this._sheetsThreadCommentModel = t, this._threadCommentPanelService = o, this._univerInstanceService = i, this._sheetPermissionCheckController = s, this._markSelectionService = a, this._sheetSelectionService = c, this._editorBridgeService = h, this._renderManagerService = d, this._initCommandListener(), this._initPanelListener(), this._initMarkSelection(), this._initSelectionUpdateListener(), this._initEditorBridge();
   }
   _handleSelectionChange(e, r, t) {
-    var C, l, _;
-    const o = (C = e[0]) == null ? void 0 : C.range, i = this._renderManagerService.getRenderById(r), s = (l = i == null ? void 0 : i.with(rt).getSkeletonParam(t)) == null ? void 0 : l.skeleton;
+    var C, l, v;
+    const o = (C = e[0]) == null ? void 0 : C.range, i = this._renderManagerService.getRenderById(r), s = (l = i == null ? void 0 : i.with(ot).getSkeletonParam(t)) == null ? void 0 : l.skeleton;
     if (!s || !o)
       return;
     const a = s.getCellWithCoordByIndex(o.startRow, o.startColumn);
-    if ((((_ = o.rangeType) != null ? _ : se.NORMAL) !== se.NORMAL || o.endColumn - o.startColumn > 0 || o.endRow - o.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && De.equals(a.mergeInfo, o))) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(q.id);
+    if ((((v = o.rangeType) != null ? v : ae.NORMAL) !== ae.NORMAL || o.endColumn - o.startColumn > 0 || o.endRow - o.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && xe.equals(a.mergeInfo, o))) {
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(J.id);
       return;
     }
     const h = a.actualRow, d = a.actualColumn;
     if (!this._sheetsThreadCommentModel.showCommentMarker(r, t, h, d)) {
-      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(q.id);
+      this._threadCommentPanelService.activeCommentId && this._commandService.executeCommand(J.id);
       return;
     }
     const m = this._sheetsThreadCommentModel.getByLocation(r, t, h, d);
-    m && this._commandService.executeCommand(q.id, {
+    m && this._commandService.executeCommand(J.id, {
       unitId: r,
       subUnitId: t,
       commentId: m
@@ -385,7 +388,7 @@ let F = class extends $ {
   }
   _initCommandListener() {
     this._commandService.onCommandExecuted((e) => {
-      if (e.id === te.id) {
+      if (e.id === ne.id) {
         const r = e.params, t = this._sheetsThreadCommentPopupService.activePopup;
         if (!t)
           return;
@@ -404,11 +407,11 @@ let F = class extends $ {
         const c = this._univerInstanceService.getCurrentUnitForType(M.UNIVER_SHEET);
         if (!c || c.getUnitId() !== t)
           return;
-        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== o && await this._commandService.executeCommand(Ze.id, {
+        this._isSwitchToCommenting = !0, ((r = c.getActiveSheet()) == null ? void 0 : r.getSheetId()) !== o && await this._commandService.executeCommand(Ge.id, {
           unitId: t,
           subUnitId: o
         }), this._isSwitchToCommenting = !1;
-        const m = D(a.ref), { row: C, column: l } = m;
+        const m = x(a.ref), { row: C, column: l } = m;
         if (!this._sheetPermissionCheckController.permissionCheckWithRanges({
           workbookTypes: [K],
           worksheetTypes: [z],
@@ -416,7 +419,7 @@ let F = class extends $ {
         }, [{ startRow: C, startColumn: l, endRow: C, endColumn: l }], t, o))
           return;
         const f = 1;
-        if (await this._commandService.executeCommand(ot.id, {
+        if (await this._commandService.executeCommand(it.id, {
           range: {
             startRow: Math.max(m.row - f, 0),
             endRow: m.row + f,
@@ -438,7 +441,7 @@ let F = class extends $ {
     }));
   }
   _initMarkSelection() {
-    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(oe(100)).subscribe((e) => {
+    this.disposeWithMe(this._threadCommentPanelService.activeCommentId$.pipe(ie(100)).subscribe((e) => {
       var C, l;
       if (!e) {
         this._selectionShapeInfo && (this._markSelectionService.removeShape(this._selectionShapeInfo.shapeId), this._selectionShapeInfo = null);
@@ -449,7 +452,7 @@ let F = class extends $ {
       const i = this._sheetsThreadCommentModel.getComment(r, t, o);
       if (!i)
         return;
-      const s = D(i.ref), { row: a, column: c } = s;
+      const s = x(i.ref), { row: a, column: c } = s;
       if (Number.isNaN(a) || Number.isNaN(c))
         return null;
       const h = (C = this._univerInstanceService.getCurrentUnitForType(M.UNIVER_SHEET)) == null ? void 0 : C.getSheetBySheetId(t), d = (l = h == null ? void 0 : h.getMergedCell(a, c)) != null ? l : {
@@ -479,21 +482,21 @@ let F = class extends $ {
     }));
   }
 };
-F = Ot([
-  w(0, ne),
+W = Dt([
+  w(0, re),
   w(1, p(R)),
   w(2, p(O)),
-  w(3, p(re)),
-  w(4, x),
-  w(5, p(ue)),
-  w(6, pe),
-  w(7, p(de)),
-  w(8, nt),
-  w(9, Se)
-], F);
-function we({ ref: n, ...e }) {
-  const { icon: r, id: t, className: o, extend: i, ...s } = e, a = `univerjs-icon univerjs-icon-${t} ${o || ""}`.trim(), c = fe(`_${Dt()}`);
-  return Me(r, `${t}`, {
+  w(3, p(oe)),
+  w(4, A),
+  w(5, p(le)),
+  w(6, Ce),
+  w(7, p(ue)),
+  w(8, rt),
+  w(9, fe)
+], W);
+function be({ ref: n, ...e }) {
+  const { icon: r, id: t, className: o, extend: i, ...s } = e, a = `univerjs-icon univerjs-icon-${t} ${o || ""}`.trim(), c = ge(`_${Vt()}`);
+  return ye(r, `${t}`, {
     defIds: r.defIds,
     idSuffix: c.current
   }, {
@@ -502,14 +505,14 @@ function we({ ref: n, ...e }) {
     ...s
   }, i);
 }
-function Me(n, e, r, t, o) {
-  return ge(n.tag, {
+function ye(n, e, r, t, o) {
+  return Ie(n.tag, {
     key: e,
-    ...kt(n, r, o),
+    ...xt(n, r, o),
     ...t
-  }, (Nt(n, r).children || []).map((i, s) => Me(i, `${e}-${n.tag}-${s}`, r, void 0, o)));
+  }, (At(n, r).children || []).map((i, s) => ye(i, `${e}-${n.tag}-${s}`, r, void 0, o)));
 }
-function kt(n, e, r) {
+function xt(n, e, r) {
   const t = { ...n.attrs };
   r != null && r.colorChannel1 && t.fill === "colorChannel1" && (t.fill = r.colorChannel1), n.tag === "mask" && t.id && (t.id = t.id + e.idSuffix), Object.entries(t).forEach(([i, s]) => {
     i === "mask" && typeof s == "string" && (t[i] = s.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
@@ -519,7 +522,7 @@ function kt(n, e, r) {
     typeof s == "string" && (t[i] = s.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
   })), t;
 }
-function Nt(n, e) {
+function At(n, e) {
   var t;
   const { defIds: r } = e;
   return !r || r.length === 0 ? n : n.tag === "defs" && ((t = n.children) != null && t.length) ? {
@@ -533,11 +536,11 @@ function Nt(n, e) {
     } : o)
   } : n;
 }
-function Dt() {
+function Vt() {
   return Math.random().toString(36).substring(2, 8);
 }
-we.displayName = "UniverIcon";
-const xt = {
+be.displayName = "UniverIcon";
+const Bt = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -587,26 +590,67 @@ const xt = {
       }
     }
   ]
-}, be = St(function(e, r) {
-  return ge(we, Object.assign({}, e, {
+}, Ee = ft(function(e, r) {
+  return Ie(be, Object.assign({}, e, {
     id: "comment-icon",
     ref: r,
-    icon: xt
+    icon: Bt
   }));
 });
-be.displayName = "CommentIcon";
-const At = () => {
-  const n = E(x), e = E(R), r = N(e.activePopup$), t = E(O);
-  if (N(t.commentUpdate$), !r)
+Ee.displayName = "CommentIcon";
+const Ht = (n) => ({
+  id: V.id,
+  type: Se.BUTTON,
+  icon: "CommentIcon",
+  title: "sheetThreadComment.menu.addComment",
+  hidden$: _e(n, M.UNIVER_SHEET),
+  disabled$: ve(n, {
+    workbookTypes: [K],
+    worksheetTypes: [z],
+    rangeTypes: [G]
+  })
+}), Lt = (n) => ({
+  id: pe.id,
+  type: Se.BUTTON,
+  icon: "CommentIcon",
+  tooltip: "sheetThreadComment.menu.commentManagement",
+  disabled$: ve(n, {
+    workbookTypes: [K],
+    worksheetTypes: [z],
+    rangeTypes: [G]
+  }),
+  hidden$: _e(n, M.UNIVER_SHEET)
+}), jt = {
+  id: V.id,
+  binding: ct.M | ce.CTRL_COMMAND | ce.ALT,
+  preconditions: st
+}, Ft = {
+  [dt.MEDIA]: {
+    [pe.id]: {
+      order: 2,
+      menuItemFactory: Lt
+    }
+  },
+  [ht.MAIN_AREA]: {
+    [mt.OTHERS]: {
+      [V.id]: {
+        order: 0,
+        menuItemFactory: Ht
+      }
+    }
+  }
+}, Wt = () => {
+  const n = E(A), e = E(R), r = D(e.activePopup$), t = E(O);
+  if (D(t.commentUpdate$), !r)
     return null;
-  const { row: o, col: i, unitId: s, subUnitId: a, trigger: c } = r, h = t.getByLocation(s, a, o, i), d = `${xe.chatAtABC(i)}${o + 1}`, m = () => {
+  const { row: o, col: i, unitId: s, subUnitId: a, trigger: c } = r, h = t.getByLocation(s, a, o, i), d = `${Ae.chatAtABC(i)}${o + 1}`, m = () => {
     e.hidePopup();
   }, C = (l) => {
-    var _, f, U;
-    return (U = (f = (_ = n.getCurrentUnitForType(M.UNIVER_SHEET)) == null ? void 0 : _.getSheetBySheetId(l)) == null ? void 0 : f.getName()) != null ? U : "";
+    var v, f, U;
+    return (U = (f = (v = n.getCurrentUnitForType(M.UNIVER_SHEET)) == null ? void 0 : v.getSheetBySheetId(l)) == null ? void 0 : f.getName()) != null ? U : "";
   };
-  return /* @__PURE__ */ Ie(
-    ze,
+  return /* @__PURE__ */ Pe(
+    Ke,
     {
       onClick: () => {
         e.persistPopup();
@@ -622,32 +666,32 @@ const At = () => {
       autoFocus: c === "context-menu"
     }
   );
-}, Vt = () => {
+}, Zt = () => {
   var g;
-  const n = E(pe), e = E(x), r = E(R), t = e.getCurrentUnitForType(M.UNIVER_SHEET), o = t.getUnitId(), i = E(ne), s = ft(() => t.activeSheet$.pipe(Ct((u) => u == null ? void 0 : u.getSheetId())), [t.activeSheet$]), a = N(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = fe(null), h = E(re), d = N(h.activeCommentId$), m = N(h.panelVisible$, h.panelVisible), C = he((u) => {
-    const I = t.getSheets(), v = {};
+  const n = E(Ce), e = E(A), r = E(R), t = e.getCurrentUnitForType(M.UNIVER_SHEET), o = t.getUnitId(), i = E(re), s = gt(() => t.activeSheet$.pipe(vt((u) => u == null ? void 0 : u.getSheetId())), [t.activeSheet$]), a = D(s, (g = t.getActiveSheet()) == null ? void 0 : g.getSheetId()), c = ge(null), h = E(oe), d = D(h.activeCommentId$), m = D(h.panelVisible$, h.panelVisible), C = me((u) => {
+    const I = t.getSheets(), _ = {};
     I.forEach((P, S) => {
-      v[P.getSheetId()] = S;
+      _[P.getSheetId()] = S;
     });
     const T = (P) => P.map((S) => {
-      var ie;
-      const b = D(S.ref), Ee = [(ie = v[S.subUnitId]) != null ? ie : 0, b.row, b.column];
-      return { ...S, p: Ee };
+      var se;
+      const b = x(S.ref), Re = [(se = _[S.subUnitId]) != null ? se : 0, b.row, b.column];
+      return { ...S, p: Re };
     }).sort((S, b) => S.p[0] === b.p[0] ? S.p[1] === b.p[1] ? S.p[2] - b.p[2] : S.p[1] - b.p[1] : S.p[0] - b.p[0]);
     return [
       ...T(u.filter((P) => !P.resolved)),
       ...T(u.filter((P) => P.resolved))
     ];
-  }, [t]), l = he((u) => {
+  }, [t]), l = me((u) => {
     var I;
     if (u.unitId === o && u.subUnitId === a && !u.resolved) {
-      const { row: v, column: T } = D(u.ref), P = t.getSheetBySheetId(u.subUnitId), S = (I = P == null ? void 0 : P.getMergedCell(v, T)) != null ? I : {
+      const { row: _, column: T } = x(u.ref), P = t.getSheetBySheetId(u.subUnitId), S = (I = P == null ? void 0 : P.getMergedCell(_, T)) != null ? I : {
         startColumn: T,
         endColumn: T,
-        startRow: v,
-        endRow: v
+        startRow: _,
+        endRow: _
       };
-      if (!Number.isNaN(v) && !Number.isNaN(T))
+      if (!Number.isNaN(_) && !Number.isNaN(T))
         return n.addShape({
           range: S,
           style: {
@@ -661,97 +705,56 @@ const At = () => {
         });
     }
     return null;
-  }, [n, a, o]), _ = (u) => {
-    var I, v;
-    return (v = (I = t.getSheetBySheetId(u)) == null ? void 0 : I.getName()) != null ? v : "";
+  }, [n, a, o]), v = (u) => {
+    var I, _;
+    return (_ = (I = t.getSheetBySheetId(u)) == null ? void 0 : I.getName()) != null ? _ : "";
   }, f = () => {
-    i.executeCommand(A.id);
+    i.executeCommand(V.id);
   }, U = (u) => {
     d && d.unitId === u.unitId && d.subUnitId === u.subUnitId && d.commentId === u.id || (c.current && (n.removeShape(c.current), c.current = null), c.current = l(u));
-  }, k = () => {
+  }, N = () => {
     c.current && (n.removeShape(c.current), c.current = null);
-  }, Y = (u, I) => {
+  }, q = (u, I) => {
     I && r.hidePopup();
   };
-  return gt(() => {
+  return It(() => {
     !m && c.current && n.removeShape(c.current);
-  }, [n, m]), /* @__PURE__ */ Ie(
-    Ke,
+  }, [n, m]), /* @__PURE__ */ Pe(
+    Ye,
     {
       unitId: o,
       subUnitId$: s,
       type: M.UNIVER_SHEET,
       onAdd: f,
-      getSubUnitName: _,
-      onResolve: Y,
+      getSubUnitName: v,
+      onResolve: q,
       sortComments: C,
       onItemEnter: U,
-      onItemLeave: k,
-      onDeleteComment: () => (k(), !0)
+      onItemLeave: N,
+      onDeleteComment: () => (N(), !0)
     }
   );
-}, Bt = (n) => ({
-  id: A.id,
-  type: ve.BUTTON,
-  icon: "CommentIcon",
-  title: "sheetThreadComment.menu.addComment",
-  hidden$: _e(n, M.UNIVER_SHEET),
-  disabled$: Ce(n, {
-    workbookTypes: [K],
-    worksheetTypes: [z],
-    rangeTypes: [G]
-  })
-}), Ht = (n) => ({
-  id: le.id,
-  type: ve.BUTTON,
-  icon: "CommentIcon",
-  tooltip: "sheetThreadComment.menu.commentManagement",
-  disabled$: Ce(n, {
-    workbookTypes: [K],
-    worksheetTypes: [z],
-    rangeTypes: [G]
-  }),
-  hidden$: _e(n, M.UNIVER_SHEET)
-}), Lt = {
-  id: A.id,
-  binding: at.M | ae.CTRL_COMMAND | ae.ALT,
-  preconditions: it
-}, jt = {
-  [mt.MEDIA]: {
-    [le.id]: {
-      order: 2,
-      menuItemFactory: Ht
-    }
-  },
-  [ct.MAIN_AREA]: {
-    [ht.OTHERS]: {
-      [A.id]: {
-        order: 0,
-        menuItemFactory: Bt
-      }
-    }
-  }
 };
-var Ft = Object.getOwnPropertyDescriptor, Wt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? Ft(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+var Gt = Object.getOwnPropertyDescriptor, zt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Gt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, X = (n, e) => (r, t) => e(r, t, n);
-let W = class extends $ {
+}, ee = (n, e) => (r, t) => e(r, t, n);
+let Z = class extends k {
   constructor(n, e, r) {
     super(), this._menuManagerService = n, this._componentManager = e, this._shortcutService = r, this._initMenu(), this._initShortcut(), this._initComponent();
   }
   _initShortcut() {
-    this._shortcutService.registerShortcut(Lt);
+    this._shortcutService.registerShortcut(jt);
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu(jt);
+    this._menuManagerService.mergeMenu(Ft);
   }
   _initComponent() {
     [
-      [Pe, At],
-      [Ye, Vt],
-      ["CommentIcon", be]
+      [Te, Wt],
+      [qe, Zt],
+      ["CommentIcon", Ee]
     ].forEach(([n, e]) => {
       this.disposeWithMe(
         this._componentManager.register(n, e)
@@ -759,65 +762,67 @@ let W = class extends $ {
     });
   }
 };
-W = Wt([
-  X(0, dt),
-  X(1, p(ut)),
-  X(2, lt)
-], W);
-var Zt = Object.defineProperty, Gt = Object.getOwnPropertyDescriptor, zt = (n, e, r) => e in n ? Zt(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r, Kt = (n, e, r, t) => {
-  for (var o = t > 1 ? void 0 : t ? Gt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
+Z = zt([
+  ee(0, ut),
+  ee(1, p(lt)),
+  ee(2, pt)
+], Z);
+var Kt = Object.defineProperty, Yt = Object.getOwnPropertyDescriptor, qt = (n, e, r) => e in n ? Kt(n, e, { enumerable: !0, configurable: !0, writable: !0, value: r }) : n[e] = r, Jt = (n, e, r, t) => {
+  for (var o = t > 1 ? void 0 : t ? Yt(e, r) : e, i = n.length - 1, s; i >= 0; i--)
     (s = n[i]) && (o = s(o) || o);
   return o;
-}, ee = (n, e) => (r, t) => e(r, t, n), ye = (n, e, r) => zt(n, typeof e != "symbol" ? e + "" : e, r);
-let Z = class extends He {
-  constructor(n = me, e, r, t) {
+}, te = (n, e) => (r, t) => e(r, t, n), Y = (n, e, r) => qt(n, typeof e != "symbol" ? e + "" : e, r);
+let $ = class extends Le {
+  constructor(n = de, e, r, t) {
     super(), this._config = n, this._injector = e, this._commandService = r, this._configService = t;
-    const { menu: o, ...i } = Le(
+    const { menu: o, ...i } = je(
       {},
-      me,
+      de,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Tt, i);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(bt, i);
   }
   onStarting() {
     [
-      [W],
-      [H],
+      [Z],
       [L],
       [j],
       [F],
+      [W],
       [R]
     ].forEach((n) => {
       this._injector.add(n);
-    }), [A].forEach((n) => {
+    }), [V].forEach((n) => {
       this._commandService.registerCommand(n);
-    }), this._injector.get(W);
+    }), this._injector.get(Z);
   }
   onReady() {
-    this._injector.get(H);
+    this._injector.get(L);
   }
   onRendered() {
-    this._injector.get(L), this._injector.get(j), this._injector.get(F);
+    this._injector.get(j), this._injector.get(F), this._injector.get(W);
   }
 };
-ye(Z, "pluginName", Te);
-ye(Z, "type", M.UNIVER_SHEET);
-Z = Kt([
-  Ae(qe, Ge),
-  ee(1, p(Ve)),
-  ee(2, p(ne)),
-  ee(3, Be)
-], Z);
+Y($, "pluginName", we);
+Y($, "packageName", Me.name);
+Y($, "version", Me.version);
+Y($, "type", M.UNIVER_SHEET);
+$ = Jt([
+  Ve(Je, ze),
+  te(1, p(Be)),
+  te(2, p(re)),
+  te(3, He)
+], $);
 export {
-  ln as AddCommentCommand,
-  pn as DeleteCommentCommand,
-  Cn as DeleteCommentTreeCommand,
-  _n as IThreadCommentDataSourceService,
-  vn as ResolveCommentCommand,
-  Te as SHEETS_THREAD_COMMENT,
+  vn as AddCommentCommand,
+  _n as DeleteCommentCommand,
+  Sn as DeleteCommentTreeCommand,
+  fn as IThreadCommentDataSourceService,
+  gn as ResolveCommentCommand,
+  we as SHEETS_THREAD_COMMENT,
   R as SheetsThreadCommentPopupService,
-  A as ShowAddSheetCommentModalOperation,
-  Z as UniverSheetsThreadCommentUIPlugin,
-  dn as UniverThreadCommentUIPlugin,
-  Sn as UpdateCommentCommand
+  V as ShowAddSheetCommentModalOperation,
+  $ as UniverSheetsThreadCommentUIPlugin,
+  pn as UniverThreadCommentUIPlugin,
+  In as UpdateCommentCommand
 };