@univerjs/sheets-note-ui 0.15.4 → 0.15.5

package/lib/index.js

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