@univerjs/sheets-note-ui 0.16.1 → 0.17.0

package/lib/index.js

@@ -1,32 +1,32 @@
-var Ee = Object.defineProperty;
-var ye = (i, e, t) => e in i ? Ee(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t;
-var P = (i, e, t) => ye(i, typeof e != "symbol" ? e + "" : e, t);
-import { Inject as g, IUniverInstanceService as Z, Disposable as E, InterceptorEffectEnum as $e, UniverInstanceType as y, DisposableCollection as xe, RANGE_TYPE as ne, Rectangle as He, ObjectMatrix as F, CommandType as Oe, LocaleService as Te, generateRandomId as Le, ICommandService as de, DependentOn as Re, Injector as Ue, IConfigService as De, Plugin as Ve, merge as Ze, touchDependencies as se } from "@univerjs/core";
-import { IRenderManagerService as z } from "@univerjs/engine-render";
-import { SheetInterceptorService as ke, INTERCEPTOR_POINT as je, SheetsSelectionsService as G, WorksheetEditPermission as _e, WorkbookEditablePermission as fe, getSheetCommandTarget as Be } from "@univerjs/sheets";
-import { SheetsNoteModel as $, SheetUpdateNoteCommand as Ae, SheetToggleNotePopupCommand as Ce, SheetDeleteNoteCommand as ge, UniverSheetsNotePlugin as Fe } from "@univerjs/sheets-note";
-import { debounceTime as We, BehaviorSubject as ze, switchMap as Ge, of as Ke, map as k, combineLatest as qe } from "rxjs";
-import { CellPopupManagerService as ve, IEditorBridgeService as Ye, HoverManagerService as Je, SheetSkeletonManagerService as ce, getCurrentRangeDisable$ as me } from "@univerjs/sheets-ui";
-import { debounceTime as Qe } from "rxjs/operators";
-import { IZenZoneService as Xe, useDependency as b, useConfigValue as et, useDebounceFn as tt, MenuItemType as K, getMenuHiddenObservable as it, ContextMenuPosition as ot, ContextMenuGroup as rt, ComponentManager as nt, IMenuManagerService as st } from "@univerjs/ui";
-import { useRef as Se, createElement as j, forwardRef as q, useState as ct, useEffect as ae, useCallback as ue } from "react";
-import { jsx as at } from "react/jsx-runtime";
-import { Textarea as ut, clsx as lt } from "@univerjs/design";
-var pt = Object.getOwnPropertyDescriptor, ht = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? pt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+var ye = Object.defineProperty;
+var $e = (i, e, t) => e in i ? ye(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t;
+var P = (i, e, t) => $e(i, typeof e != "symbol" ? e + "" : e, t);
+import { Inject as g, IUniverInstanceService as k, Disposable as y, InterceptorEffectEnum as xe, UniverInstanceType as $, DisposableCollection as He, RANGE_TYPE as se, Rectangle as Oe, ObjectMatrix as W, CommandType as Te, LocaleService as Re, generateRandomId as Le, ICommandService as _e, DependentOn as Ue, Injector as De, IConfigService as Ve, Plugin as ke, merge as Ze, touchDependencies as ae } from "@univerjs/core";
+import { IRenderManagerService as G } from "@univerjs/engine-render";
+import { SheetInterceptorService as je, INTERCEPTOR_POINT as Be, SheetsSelectionsService as K, WorksheetEditPermission as fe, WorkbookEditablePermission as Ce, getSheetCommandTarget as Ae } from "@univerjs/sheets";
+import { SheetsNoteModel as x, SheetToggleNotePopupCommand as ge, SheetDeleteNoteCommand as ve, SheetUpdateNoteCommand as Fe, UniverSheetsNotePlugin as We } from "@univerjs/sheets-note";
+import { debounceTime as ze, BehaviorSubject as Ge, switchMap as Ke, of as qe, map as Z, combineLatest as Ye } from "rxjs";
+import { CellPopupManagerService as me, IEditorBridgeService as Je, HoverManagerService as Qe, SheetSkeletonManagerService as ce, getCurrentRangeDisable$ as Se } from "@univerjs/sheets-ui";
+import { debounceTime as Xe } from "rxjs/operators";
+import { IZenZoneService as et, MenuItemType as q, getMenuHiddenObservable as tt, ContextMenuPosition as it, ContextMenuGroup as ot, useDependency as E, useConfigValue as rt, useDebounceFn as nt, ComponentManager as st, IMenuManagerService as at } from "@univerjs/ui";
+import { useRef as Ne, createElement as j, forwardRef as Y, useState as ct, useEffect as ue, useCallback as le } from "react";
+import { jsx as ut } from "react/jsx-runtime";
+import { Textarea as lt, clsx as pt } from "@univerjs/design";
+var ht = Object.getOwnPropertyDescriptor, dt = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? ht(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
-}, H = (i, e) => (t, o) => e(t, o, i);
-let T = class extends E {
+}, O = (i, e) => (t, o) => e(t, o, i);
+let R = class extends y {
   constructor(i, e, t, o) {
     super(), this._sheetInterceptorService = i, this._sheetsNoteModel = e, this._renderManagerService = t, this._univerInstanceService = o, this._initViewModelIntercept(), this._initSkeletonChange();
   }
   _initViewModelIntercept() {
     this.disposeWithMe(
       this._sheetInterceptorService.intercept(
-        je.CELL_CONTENT,
+        Be.CELL_CONTENT,
         {
-          effect: $e.Style,
+          effect: xe.Style,
           handler: (i, e, t) => {
             const { row: o, col: r, unitId: s, subUnitId: n } = e;
             return this._sheetsNoteModel.getNote(s, n, { row: o, col: r }) && ((!i || i === e.rawData) && (i = { ...e.rawData }), i.markers = {
@@ -45,34 +45,34 @@ let T = class extends E {
   _initSkeletonChange() {
     const i = () => {
       var r;
-      const e = this._univerInstanceService.getCurrentUnitForType(y.UNIVER_SHEET);
+      const e = this._univerInstanceService.getCurrentUnitForType($.UNIVER_SHEET);
       if (!e) return;
       const t = e.getUnitId(), o = this._renderManagerService.getRenderById(t);
       (r = o == null ? void 0 : o.mainComponent) == null || r.makeForceDirty();
     };
-    this.disposeWithMe(this._sheetsNoteModel.change$.pipe(We(16)).subscribe(() => {
+    this.disposeWithMe(this._sheetsNoteModel.change$.pipe(ze(16)).subscribe(() => {
       i();
     }));
   }
 };
-T = ht([
-  H(0, g(ke)),
-  H(1, g($)),
-  H(2, z),
-  H(3, Z)
-], T);
-const Y = "SHEET_NOTE_COMPONENT";
-var dt = Object.getOwnPropertyDescriptor, _t = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? dt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+R = dt([
+  O(0, g(je)),
+  O(1, g(x)),
+  O(2, G),
+  O(3, k)
+], R);
+const J = "SHEET_NOTE_COMPONENT";
+var _t = Object.getOwnPropertyDescriptor, ft = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? _t(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
-}, le = (i, e) => (t, o) => e(t, o, i);
-let I = class extends E {
+}, pe = (i, e) => (t, o) => e(t, o, i);
+let I = class extends y {
   constructor(e, t) {
     super();
     P(this, "_lastPopup", null);
     P(this, "_activePopup");
-    P(this, "_activePopup$", new ze(null));
+    P(this, "_activePopup$", new Ge(null));
     P(this, "activePopup$", this._activePopup$.asObservable());
     this._zenZoneService = e, this._cellPopupManagerService = t, this._initZenVisible(), this.disposeWithMe(() => {
       this._activePopup$.complete();
@@ -99,7 +99,7 @@ let I = class extends E {
     if (this._lastPopup && this._lastPopup.dispose(), this._zenZoneService.visible)
       return;
     this._activePopup = e, this._activePopup$.next(e);
-    const c = this._cellPopupManagerService.showPopup(
+    const a = this._cellPopupManagerService.showPopup(
       {
         unitId: s,
         subUnitId: n,
@@ -107,7 +107,7 @@ let I = class extends E {
         col: r
       },
       {
-        componentKey: Y,
+        componentKey: J,
         onClickOutside: () => {
           this.hidePopup();
         },
@@ -118,10 +118,10 @@ let I = class extends E {
         priority: 3
       }
     );
-    if (!c)
+    if (!a)
       throw new Error("[SheetsNotePopupService]: cannot show popup!");
-    const u = new xe();
-    u.add(c), u.add({
+    const u = new He();
+    u.add(a), u.add({
       dispose: () => {
         t == null || t();
       }
@@ -137,16 +137,16 @@ let I = class extends E {
     }, this._activePopup$.next(this._activePopup));
   }
 };
-I = _t([
-  le(0, Xe),
-  le(1, g(ve))
+I = ft([
+  pe(0, et),
+  pe(1, g(me))
 ], I);
-var ft = Object.getOwnPropertyDescriptor, Ct = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? ft(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+var Ct = Object.getOwnPropertyDescriptor, gt = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? Ct(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
 }, w = (i, e) => (t, o) => e(t, o, i);
-let L = class extends E {
+let L = class extends y {
   constructor(e, t, o, r, s, n) {
     super();
     P(this, "_isSwitchingSheet", !1);
@@ -157,18 +157,18 @@ let L = class extends E {
     const r = (d = e[0]) == null ? void 0 : d.range, s = this._renderManagerService.getRenderById(t), n = (_ = s == null ? void 0 : s.with(ce).getSkeletonParam(o)) == null ? void 0 : _.skeleton;
     if (!n || !r)
       return;
-    const c = n.getCellWithCoordByIndex(r.startRow, r.startColumn);
-    if ((((m = r.rangeType) != null ? m : ne.NORMAL) !== ne.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((c.isMerged || c.isMergedMainCell) && He.equals(c.mergeInfo, r))) {
+    const a = n.getCellWithCoordByIndex(r.startRow, r.startColumn);
+    if ((((m = r.rangeType) != null ? m : se.NORMAL) !== se.NORMAL || r.endColumn - r.startColumn > 0 || r.endRow - r.startRow > 0) && !((a.isMerged || a.isMergedMainCell) && Oe.equals(a.mergeInfo, r))) {
       this._sheetsNotePopupService.hidePopup();
       return;
     }
-    const l = c.actualRow, a = c.actualColumn, p = this._sheetsNoteModel.getNote(t, o, { row: l, col: a });
+    const l = a.actualRow, c = a.actualColumn, p = this._sheetsNoteModel.getNote(t, o, { row: l, col: c });
     p != null && p.show || (p ? this._sheetsNotePopupService.showPopup({
       unitId: t,
       subUnitId: o,
       noteId: p.id,
       row: l,
-      col: a
+      col: c
     }) : this._sheetsNotePopupService.hidePopup(!0));
   }
   _initSelectionUpdateListener() {
@@ -190,28 +190,28 @@ let L = class extends E {
   }
   _initHoverEvent() {
     this.disposeWithMe(
-      this._hoverManagerService.currentCell$.pipe(Qe(100)).subscribe((e) => {
+      this._hoverManagerService.currentCell$.pipe(Xe(100)).subscribe((e) => {
         var p;
         if (!(e != null && e.location)) return;
-        const { unitId: t, subUnitId: o, row: r, col: s } = e.location, n = this._renderManagerService.getRenderById(t), c = (p = n == null ? void 0 : n.with(ce).getSkeletonParam(o)) == null ? void 0 : p.skeleton;
-        let u = r, l = s, a = this._sheetsNoteModel.getNote(t, o, { row: u, col: l });
-        if (!a && c) {
-          const d = c.getCellWithCoordByIndex(r, s), { startRow: _, endRow: m, startColumn: N, endColumn: S } = d.mergeInfo;
+        const { unitId: t, subUnitId: o, row: r, col: s } = e.location, n = this._renderManagerService.getRenderById(t), a = (p = n == null ? void 0 : n.with(ce).getSkeletonParam(o)) == null ? void 0 : p.skeleton;
+        let u = r, l = s, c = this._sheetsNoteModel.getNote(t, o, { row: u, col: l });
+        if (!c && a) {
+          const d = a.getCellWithCoordByIndex(r, s), { startRow: _, endRow: m, startColumn: N, endColumn: S } = d.mergeInfo;
           if (_ !== m || N !== S) {
             const h = this._sheetsNoteModel.getSheetNotes(t, o);
             if (h) {
               for (const [C, f] of h)
                 if (f.row >= _ && f.row <= m && f.col >= N && f.col <= S) {
-                  a = f, u = f.row, l = f.col;
+                  c = f, u = f.row, l = f.col;
                   break;
                 }
             }
           }
         }
-        a != null && a.show || (a ? this._sheetsNotePopupService.showPopup({
+        c != null && c.show || (c ? this._sheetsNotePopupService.showPopup({
           unitId: t,
           subUnitId: o,
-          noteId: a.id,
+          noteId: c.id,
           row: u,
           col: l,
           temp: !0
@@ -223,30 +223,33 @@ let L = class extends E {
     this.disposeWithMe(
       this._sheetsNoteModel.change$.subscribe((e) => {
         if (!this._sheetsNotePopupService.activePopup) return;
-        const { unitId: t, subUnitId: o, noteId: r, row: s, col: n } = this._sheetsNotePopupService.activePopup, { oldNote: c, newNote: u } = e;
-        u === null && e.unitId === t && e.subUnitId === o && (c != null && c.id && c.id === r || (c == null ? void 0 : c.row) === s && c.col === n) && this._sheetsNotePopupService.hidePopup(!0);
+        const { unitId: t, subUnitId: o, noteId: r, row: s, col: n } = this._sheetsNotePopupService.activePopup, { oldNote: a, newNote: u } = e;
+        u === null && e.unitId === t && e.subUnitId === o && (a != null && a.id && a.id === r || (a == null ? void 0 : a.row) === s && a.col === n) && this._sheetsNotePopupService.hidePopup(!0);
       })
     );
   }
 };
-L = Ct([
+L = gt([
   w(0, g(I)),
-  w(1, g($)),
-  w(2, g(G)),
-  w(3, Ye),
-  w(4, z),
-  w(5, g(Je))
+  w(1, g(x)),
+  w(2, g(K)),
+  w(3, Je),
+  w(4, G),
+  w(5, g(Qe))
 ], L);
-const Ne = "sheets-note-ui.config", pe = {};
-var gt = Object.getOwnPropertyDescriptor, vt = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? gt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+const vt = "@univerjs/sheets-note-ui", mt = "0.17.0", Pe = {
+  name: vt,
+  version: mt
+}, Ie = "sheets-note-ui.config", he = {};
+var St = Object.getOwnPropertyDescriptor, Nt = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? St(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
-}, O = (i, e) => (t, o) => e(t, o, i);
-let R = class extends E {
+}, T = (i, e) => (t, o) => e(t, o, i);
+let U = class extends y {
   constructor(e, t, o, r) {
     super();
-    P(this, "_noteMatrix", new F());
+    P(this, "_noteMatrix", new W());
     this._sheetsNoteModel = e, this._univerInstanceService = t, this._cellPopupManagerService = o, this._sheetsNotePopupService = r, this._initNoteChangeListener();
   }
   _showPopup(e, t, o, r) {
@@ -258,7 +261,7 @@ let R = class extends E {
         col: r
       },
       {
-        componentKey: Y,
+        componentKey: J,
         direction: "horizontal",
         extraProps: {
           location: {
@@ -279,14 +282,14 @@ let R = class extends E {
   }
   _initSheet(e, t) {
     var s;
-    this._noteMatrix.forValue((n, c, u) => {
+    this._noteMatrix.forValue((n, a, u) => {
       u.dispose();
-    }), this._noteMatrix = new F();
-    const r = (n, c, u, l, a) => {
+    }), this._noteMatrix = new W();
+    const r = (n, a, u, l, c) => {
       const p = this._noteMatrix, d = p.getValue(u, l);
-      if (a != null && a.show) {
+      if (c != null && c.show) {
         if (!d) {
-          const _ = this._showPopup(n, c, u, l);
+          const _ = this._showPopup(n, a, u, l);
           _ && p.setValue(u, l, _);
         }
       } else
@@ -298,17 +301,17 @@ let R = class extends E {
       if (!(n.unitId !== e || n.subUnitId !== t))
         switch (n.type) {
           case "ref": {
-            const { unitId: c, subUnitId: u, oldNote: l, newNote: a } = n;
-            if (!a.show) return;
-            const p = this._noteMatrix, { row: d, col: _ } = l, { row: m, col: N } = a, S = p.getValue(d, _);
+            const { unitId: a, subUnitId: u, oldNote: l, newNote: c } = n;
+            if (!c.show) return;
+            const p = this._noteMatrix, { row: d, col: _ } = l, { row: m, col: N } = c, S = p.getValue(d, _);
             S && (S.dispose(), p.realDeleteValue(d, _));
-            const h = this._showPopup(c, u, m, N);
+            const h = this._showPopup(a, u, m, N);
             h && p.setValue(m, N, h);
             break;
           }
           case "update": {
-            const { unitId: c, subUnitId: u, oldNote: l, newNote: a } = n, p = a ? a.row : l.row, d = a ? a.col : l.col;
-            r(c, u, p, d, a);
+            const { unitId: a, subUnitId: u, oldNote: l, newNote: c } = n, p = c ? c.row : l.row, d = c ? c.col : l.col;
+            r(a, u, p, d, c);
             break;
           }
         }
@@ -316,10 +319,10 @@ let R = class extends E {
   }
   _initNoteChangeListener() {
     this.disposeWithMe(
-      this._univerInstanceService.getCurrentTypeOfUnit$(y.UNIVER_SHEET).pipe(
-        Ge((e) => {
+      this._univerInstanceService.getCurrentTypeOfUnit$($.UNIVER_SHEET).pipe(
+        Ke((e) => {
           var t;
-          return (t = e == null ? void 0 : e.activeSheet$) != null ? t : Ke(null);
+          return (t = e == null ? void 0 : e.activeSheet$) != null ? t : qe(null);
         })
       ).subscribe((e) => {
         if (e) {
@@ -330,36 +333,36 @@ let R = class extends E {
         } else
           this._noteMatrix.forValue((t, o, r) => {
             r.dispose();
-          }), this._noteMatrix = new F();
+          }), this._noteMatrix = new W();
       })
     );
   }
 };
-R = vt([
-  O(0, g($)),
-  O(1, g(Z)),
-  O(2, g(ve)),
-  O(3, g(I))
-], R);
+U = Nt([
+  T(0, g(x)),
+  T(1, g(k)),
+  T(2, g(me)),
+  T(3, g(I))
+], U);
 function B({ ref: i, ...e }) {
-  const { icon: t, id: o, className: r, extend: s, ...n } = e, c = `univerjs-icon univerjs-icon-${o} ${r || ""}`.trim(), u = Se(`_${Nt()}`);
-  return Pe(t, `${o}`, {
+  const { icon: t, id: o, className: r, extend: s, ...n } = e, a = `univerjs-icon univerjs-icon-${o} ${r || ""}`.trim(), u = Ne(`_${wt()}`);
+  return we(t, `${o}`, {
     defIds: t.defIds,
     idSuffix: u.current
   }, {
     ref: i,
-    className: c,
+    className: a,
     ...n
   }, s);
 }
-function Pe(i, e, t, o, r) {
+function we(i, e, t, o, r) {
   return j(i.tag, {
     key: e,
-    ...mt(i, t, r),
+    ...Pt(i, t, r),
     ...o
-  }, (St(i, t).children || []).map((s, n) => Pe(s, `${e}-${i.tag}-${n}`, t, void 0, r)));
+  }, (It(i, t).children || []).map((s, n) => we(s, `${e}-${i.tag}-${n}`, t, void 0, r)));
 }
-function mt(i, e, t) {
+function Pt(i, e, t) {
   const o = { ...i.attrs };
   t != null && t.colorChannel1 && o.fill === "colorChannel1" && (o.fill = t.colorChannel1), i.tag === "mask" && o.id && (o.id = o.id + e.idSuffix), Object.entries(o).forEach(([s, n]) => {
     s === "mask" && typeof n == "string" && (o[s] = n.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
@@ -369,7 +372,7 @@ function mt(i, e, t) {
     typeof n == "string" && (o[s] = n.replace(/url\(#(.*)\)/, `url(#$1${e.idSuffix})`));
   })), o;
 }
-function St(i, e) {
+function It(i, e) {
   var o;
   const { defIds: t } = e;
   return !t || t.length === 0 ? i : i.tag === "defs" && ((o = i.children) != null && o.length) ? {
@@ -383,11 +386,11 @@ function St(i, e) {
     } : r)
   } : i;
 }
-function Nt() {
+function wt() {
   return Math.random().toString(36).substring(2, 8);
 }
 B.displayName = "UniverIcon";
-const Pt = {
+const Mt = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -440,15 +443,15 @@ const Pt = {
       }
     }
   ]
-}, Ie = q(function(e, t) {
+}, Me = Y(function(e, t) {
   return j(B, Object.assign({}, e, {
     id: "add-note-icon",
     ref: t,
-    icon: Pt
+    icon: Mt
   }));
 });
-Ie.displayName = "AddNoteIcon";
-const It = {
+Me.displayName = "AddNoteIcon";
+const bt = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -494,15 +497,15 @@ const It = {
       }
     }
   ]
-}, we = q(function(e, t) {
+}, be = Y(function(e, t) {
   return j(B, Object.assign({}, e, {
     id: "delete-note-icon",
     ref: t,
-    icon: It
+    icon: bt
   }));
 });
-we.displayName = "DeleteNoteIcon";
-const wt = {
+be.displayName = "DeleteNoteIcon";
+const Et = {
   tag: "svg",
   attrs: {
     xmlns: "http://www.w3.org/2000/svg",
@@ -555,26 +558,26 @@ const wt = {
       }
     }
   ]
-}, Me = q(function(e, t) {
+}, Ee = Y(function(e, t) {
   return j(B, Object.assign({}, e, {
     id: "hide-note-icon",
     ref: t,
-    icon: wt
+    icon: Et
   }));
 });
-Me.displayName = "HideNoteIcon";
-const U = {
+Ee.displayName = "HideNoteIcon";
+const D = {
   id: "sheet.operation.add-note-popup",
-  type: Oe.OPERATION,
+  type: Te.OPERATION,
   handler: async (i, e) => {
     var l;
-    const t = i.get(G), o = i.get(I), s = i.get(Z).getCurrentUnitForType(y.UNIVER_SHEET);
+    const t = i.get(K), o = i.get(I), s = i.get(k).getCurrentUnitForType($.UNIVER_SHEET);
     if (!s)
       return !1;
-    const n = s.getActiveSheet(), c = t.getCurrentLastSelection();
-    if (!(c != null && c.primary))
+    const n = s.getActiveSheet(), a = t.getCurrentLastSelection();
+    if (!(a != null && a.primary))
       return !1;
-    const { primary: u } = c;
+    const { primary: u } = a;
     return o.showPopup({
       unitId: s.getUnitId(),
       subUnitId: n.getSheetId(),
@@ -584,64 +587,124 @@ const U = {
       trigger: (l = e == null ? void 0 : e.trigger) != null ? l : "add-note"
     }), !0;
   }
-}, Mt = (i) => {
+};
+function Q(i) {
+  const e = i.get(K), t = i.get(k);
+  return e.selectionMoveEnd$.pipe(Z(() => {
+    const o = e.getCurrentLastSelection();
+    if (!(o != null && o.primary)) return !1;
+    const r = Ae(t);
+    if (!r) return !1;
+    const { actualColumn: s, actualRow: n } = o.primary;
+    return !!i.get(x).getNote(r.unitId, r.subUnitId, { row: n, col: s });
+  }));
+}
+function yt(i) {
+  return {
+    id: D.id,
+    type: q.BUTTON,
+    title: "rightClick.addNote",
+    icon: "AddNoteIcon",
+    hidden$: Ye([tt(i, $.UNIVER_SHEET), Q(i)]).pipe(Z(([e, t]) => e || t)),
+    disabled$: Se(i, { workbookTypes: [Ce], worksheetTypes: [fe] }),
+    commandId: D.id
+  };
+}
+function $t(i) {
+  return {
+    id: ve.id,
+    type: q.BUTTON,
+    title: "rightClick.deleteNote",
+    icon: "DeleteNoteIcon",
+    hidden$: Q(i).pipe(Z((e) => !e)),
+    disabled$: Se(i, { workbookTypes: [Ce], worksheetTypes: [fe] })
+  };
+}
+function xt(i) {
+  return {
+    id: ge.id,
+    type: q.BUTTON,
+    title: "rightClick.toggleNote",
+    icon: "HideNoteIcon",
+    hidden$: Q(i).pipe(Z((e) => !e))
+  };
+}
+const Ht = {
+  [it.MAIN_AREA]: {
+    [ot.OTHERS]: {
+      order: 0,
+      [D.id]: {
+        order: 0,
+        menuItemFactory: yt
+      },
+      [ve.id]: {
+        order: 0,
+        menuItemFactory: $t
+      },
+      [ge.id]: {
+        order: 0,
+        menuItemFactory: xt
+      }
+    }
+  }
+}, Ot = (i) => {
   var S;
-  const { popup: e } = i, t = b($), o = b(Te), r = b(z), s = b(I), n = et(Ne), c = (S = e.extraProps) == null ? void 0 : S.location;
-  if (!c)
+  const { popup: e } = i, t = E(x), o = E(Re), r = E(G), s = E(I), n = rt(Ie), a = (S = e.extraProps) == null ? void 0 : S.location;
+  if (!a)
     return console.error("Popup extraProps or location is undefined."), null;
-  const u = Se(null), l = r.getRenderById(c.unitId), [a, p] = ct(null);
-  ae(() => {
-    var Q, X, ee, te, ie, oe;
-    const { unitId: h, subUnitId: C, row: f, col: x } = c, v = t.getNote(h, C, { row: f, col: x }), A = (ee = (X = v == null ? void 0 : v.width) != null ? X : (Q = n == null ? void 0 : n.defaultNoteSize) == null ? void 0 : Q.width) != null ? ee : 160, M = (oe = (ie = v == null ? void 0 : v.height) != null ? ie : (te = n == null ? void 0 : n.defaultNoteSize) == null ? void 0 : te.height) != null ? oe : 72;
+  const u = Ne(null), l = r.getRenderById(a.unitId), [c, p] = ct(null);
+  ue(() => {
+    var X, ee, te, ie, oe, re;
+    const { unitId: h, subUnitId: C, row: f, col: H } = a, v = t.getNote(h, C, { row: f, col: H }), F = (te = (ee = v == null ? void 0 : v.width) != null ? ee : (X = n == null ? void 0 : n.defaultNoteSize) == null ? void 0 : X.width) != null ? te : 160, b = (re = (oe = v == null ? void 0 : v.height) != null ? oe : (ie = n == null ? void 0 : n.defaultNoteSize) == null ? void 0 : ie.height) != null ? re : 72;
     if (v)
       p(v);
     else {
-      const re = {
+      const ne = {
         id: Le(6),
-        width: A,
-        height: M,
+        width: F,
+        height: b,
         note: ""
       };
-      p(re), _(re);
+      p(ne), _(ne);
     }
-    u.current && (u.current.style.width = `${A}px`, u.current.style.height = `${M}px`);
-  }, [c, u]), ae(() => {
-    if (!c || c.temp || !c.trigger || !u.current) return;
+    u.current && (u.current.style.width = `${F}px`, u.current.style.height = `${b}px`);
+  }, [a, u]), ue(() => {
+    if (!a || a.temp || !a.trigger || !u.current) return;
     const h = requestAnimationFrame(() => {
       var C;
       (C = u.current) == null || C.focus();
     });
     return () => cancelAnimationFrame(h);
-  }, [c]);
-  const d = b(de), _ = tt((h) => {
-    if (!c) return;
-    const { unitId: C, subUnitId: f, row: x, col: v } = c;
-    if (!d.syncExecuteCommand(Ae.id, {
+  }, [a]);
+  const d = E(_e), _ = nt((h) => {
+    if (!a) return;
+    const { unitId: C, subUnitId: f, row: H, col: v } = a;
+    if (!d.syncExecuteCommand(Fe.id, {
       unitId: C,
       sheetId: f,
-      row: x,
+      row: H,
       col: v,
       note: h
     })) {
-      const M = t.getNote(C, f, { noteId: h.id, row: x, col: v });
-      M ? p(M) : s.hidePopup(!0);
+      const b = t.getNote(C, f, { noteId: h.id, row: H, col: v });
+      b ? p(b) : s.hidePopup(!0);
     }
-  }), m = ue((h) => {
-    if (!a || h === a.note) return;
-    const C = { ...a, note: h };
+  }), m = le((h) => {
+    if (!c || h === c.note) return;
+    const C = { ...c, note: h };
     p(C), _(C);
-  }, [a]), N = ue((h, C) => {
-    if (!a || h === a.width && C === a.height) return;
-    const f = { ...a, width: h, height: C };
+  }, [c]), N = le((h, C) => {
+    if (!c || h === c.width && C === c.height) return;
+    const f = { ...c, width: h, height: C };
     p(f), _(f);
-  }, [a]);
-  return /* @__PURE__ */ at(
-    ut,
+  }, [c]);
+  return /* @__PURE__ */ ut(
+    lt,
     {
       ref: u,
       "data-u-comp": "note-textarea",
-      className: lt("univer-ml-px univer-min-h-1 univer-min-w-1 univer-bg-white !univer-text-sm univer-shadow dark:!univer-bg-gray-800"),
-      value: a == null ? void 0 : a.note,
+      className: pt("univer-ml-px univer-min-h-1 univer-min-w-1 univer-bg-white !univer-text-sm univer-shadow dark:!univer-bg-gray-800"),
+      value: c == null ? void 0 : c.note,
       placeholder: o.t("note.placeholder"),
       onResize: N,
       onValueChange: m,
@@ -651,81 +714,21 @@ const U = {
     }
   );
 };
-function J(i) {
-  const e = i.get(G), t = i.get(Z);
-  return e.selectionMoveEnd$.pipe(k(() => {
-    const o = e.getCurrentLastSelection();
-    if (!(o != null && o.primary)) return !1;
-    const r = Be(t);
-    if (!r) return !1;
-    const { actualColumn: s, actualRow: n } = o.primary;
-    return !!i.get($).getNote(r.unitId, r.subUnitId, { row: n, col: s });
-  }));
-}
-function bt(i) {
-  return {
-    id: U.id,
-    type: K.BUTTON,
-    title: "rightClick.addNote",
-    icon: "AddNoteIcon",
-    hidden$: qe([it(i, y.UNIVER_SHEET), J(i)]).pipe(k(([e, t]) => e || t)),
-    disabled$: me(i, { workbookTypes: [fe], worksheetTypes: [_e] }),
-    commandId: U.id
-  };
-}
-function Et(i) {
-  return {
-    id: ge.id,
-    type: K.BUTTON,
-    title: "rightClick.deleteNote",
-    icon: "DeleteNoteIcon",
-    hidden$: J(i).pipe(k((e) => !e)),
-    disabled$: me(i, { workbookTypes: [fe], worksheetTypes: [_e] })
-  };
-}
-function yt(i) {
-  return {
-    id: Ce.id,
-    type: K.BUTTON,
-    title: "rightClick.toggleNote",
-    icon: "HideNoteIcon",
-    hidden$: J(i).pipe(k((e) => !e))
-  };
-}
-const $t = {
-  [ot.MAIN_AREA]: {
-    [rt.OTHERS]: {
-      order: 0,
-      [U.id]: {
-        order: 0,
-        menuItemFactory: bt
-      },
-      [ge.id]: {
-        order: 0,
-        menuItemFactory: Et
-      },
-      [Ce.id]: {
-        order: 0,
-        menuItemFactory: yt
-      }
-    }
-  }
-};
-var xt = Object.getOwnPropertyDescriptor, Ht = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? xt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+var Tt = Object.getOwnPropertyDescriptor, Rt = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? Tt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
-}, W = (i, e) => (t, o) => e(t, o, i);
-let D = class extends E {
+}, z = (i, e) => (t, o) => e(t, o, i);
+let V = class extends y {
   constructor(i, e, t) {
     super(), this._componentManager = i, this._menuManagerService = e, this._commandService = t, this._initComponents(), this._initMenu(), this._initCommands();
   }
   _initComponents() {
     [
-      [Y, Mt],
-      ["AddNoteIcon", Ie],
-      ["DeleteNoteIcon", we],
-      ["HideNoteIcon", Me]
+      [J, Ot],
+      ["AddNoteIcon", Me],
+      ["DeleteNoteIcon", be],
+      ["HideNoteIcon", Ee]
     ].forEach(([i, e]) => {
       this.disposeWithMe(
         this._componentManager.register(i, e)
@@ -733,68 +736,69 @@ let D = class extends E {
     });
   }
   _initMenu() {
-    this._menuManagerService.mergeMenu($t);
+    this._menuManagerService.mergeMenu(Ht);
   }
   _initCommands() {
-    this._commandService.registerCommand(U);
+    this._commandService.registerCommand(D);
   }
 };
-D = Ht([
-  W(0, g(nt)),
-  W(1, g(st)),
-  W(2, de)
-], D);
-var Ot = Object.defineProperty, Tt = Object.getOwnPropertyDescriptor, Lt = (i, e, t) => e in i ? Ot(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, Rt = (i, e, t, o) => {
-  for (var r = o > 1 ? void 0 : o ? Tt(e, t) : e, s = i.length - 1, n; s >= 0; s--)
+V = Rt([
+  z(0, g(st)),
+  z(1, g(at)),
+  z(2, _e)
+], V);
+var Lt = Object.defineProperty, Ut = Object.getOwnPropertyDescriptor, Dt = (i, e, t) => e in i ? Lt(i, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : i[e] = t, Vt = (i, e, t, o) => {
+  for (var r = o > 1 ? void 0 : o ? Ut(e, t) : e, s = i.length - 1, n; s >= 0; s--)
     (n = i[s]) && (r = n(r) || r);
   return r;
-}, he = (i, e) => (t, o) => e(t, o, i), be = (i, e, t) => Lt(i, typeof e != "symbol" ? e + "" : e, t);
-const Ut = "SHEET_NOTE_UI_PLUGIN";
-let V = class extends Ve {
-  constructor(i = pe, e, t) {
+}, de = (i, e) => (t, o) => e(t, o, i), A = (i, e, t) => Dt(i, typeof e != "symbol" ? e + "" : e, t);
+let M = class extends ke {
+  constructor(i = he, e, t) {
     super(), this._config = i, this._injector = e, this._configService = t;
     const { menu: o, ...r } = Ze(
       {},
-      pe,
+      he,
       this._config
     );
-    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Ne, r);
+    o && this._configService.setConfig("menu", o, { merge: !0 }), this._configService.setConfig(Ie, r);
   }
   onStarting() {
     [
       [I],
-      [T],
+      [R],
       [L],
-      [D],
-      [R]
+      [V],
+      [U]
     ].forEach((i) => {
       this._injector.add(i);
     });
   }
   onReady() {
-    se(this._injector, [
-      [D],
-      [T]
+    ae(this._injector, [
+      [V],
+      [R]
     ]);
   }
   onRendered() {
-    se(this._injector, [
+    ae(this._injector, [
       [L],
-      [R]
+      [U]
     ]);
   }
 };
-be(V, "pluginName", Ut);
-be(V, "type", y.UNIVER_SHEET);
-V = Rt([
-  Re(Fe),
-  he(1, g(Ue)),
-  he(2, De)
-], V);
+A(M, "pluginName", "SHEET_NOTE_UI_PLUGIN");
+A(M, "packageName", Pe.name);
+A(M, "version", Pe.version);
+A(M, "type", $.UNIVER_SHEET);
+M = Vt([
+  Ue(We),
+  de(1, g(De)),
+  de(2, Ve)
+], M);
 export {
-  T as SheetsCellContentController,
-  Mt as SheetsNote,
+  R as SheetsCellContentController,
+  Ot as SheetsNote,
   L as SheetsNotePopupController,
   I as SheetsNotePopupService,
-  V as UniverSheetsNoteUIPlugin
+  M as UniverSheetsNoteUIPlugin
 };