@univerjs/sheets-note 0.15.4 → 0.15.5

package/lib/es/index.js

@@ -1,181 +1,260 @@
-var W = Object.defineProperty;
-var L = (i, r, e) => r in i ? W(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
-var l = (i, r, e) => L(i, typeof r != "symbol" ? r + "" : r, e);
-import { Disposable as x, ObjectMatrix as H, CommandType as p, IUniverInstanceService as P, ICommandService as N, IResourceManagerService as J, Inject as g, UniverInstanceType as v, sequenceExecuteAsync as G, DependentOn as z, IConfigService as F, Injector as q, Plugin as K, merge as Y, touchDependencies as O } from "@univerjs/core";
-import { getSheetCommandTarget as T, SheetsSelectionsService as y, SheetInterceptorService as B, RemoveSheetCommand as Q, CopySheetCommand as X, RefRangeService as Z, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests as k, UniverSheetsPlugin as ee } from "@univerjs/sheets";
-import { Subject as te, filter as U, map as E } from "rxjs";
-class u extends x {
+var z = Object.defineProperty;
+var F = (i, r, e) => r in i ? z(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e;
+var _ = (i, r, e) => F(i, typeof r != "symbol" ? r + "" : r, e);
+import { Disposable as U, generateRandomId as J, CommandType as m, IUniverInstanceService as E, ICommandService as w, IUndoRedoService as T, IResourceManagerService as q, Inject as f, UniverInstanceType as I, sequenceExecuteAsync as K, DependentOn as Y, IConfigService as Q, Injector as X, Plugin as Z, merge as k, touchDependencies as A } from "@univerjs/core";
+import { getSheetCommandTarget as D, SheetsSelectionsService as x, SheetInterceptorService as ee, RemoveSheetCommand as te, CopySheetCommand as se, RefRangeService as oe, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests as ne, UniverSheetsPlugin as re } from "@univerjs/sheets";
+import { Subject as ie, filter as W, map as B } from "rxjs";
+class g extends U {
   constructor() {
     super(...arguments);
-    l(this, "_noteMatrix", /* @__PURE__ */ new Map());
-    l(this, "_change$", new te());
-    l(this, "change$", this._change$.asObservable());
-  }
-  _ensureNoteMatrix(e, s) {
-    let t = this._noteMatrix.get(e);
-    t || (t = /* @__PURE__ */ new Map(), this._noteMatrix.set(e, t));
-    let n = t.get(s);
-    return n || (n = new H(), t.set(s, n)), n;
-  }
-  getSheetShowNotes$(e, s) {
+    _(this, "_notesMap", /* @__PURE__ */ new Map());
+    _(this, "_change$", new ie());
+    _(this, "change$", this._change$.asObservable());
+  }
+  _ensureNotesMap(e, t) {
+    let s = this._notesMap.get(e);
+    s || (s = /* @__PURE__ */ new Map(), this._notesMap.set(e, s));
+    let o = s.get(t);
+    return o || (o = /* @__PURE__ */ new Map(), s.set(t, o)), o;
+  }
+  _getNoteByPosition(e, t, s, o) {
+    const n = this._ensureNotesMap(e, t);
+    for (const [a, c] of n)
+      if (c.row === s && c.col === o)
+        return c;
+  }
+  _getNoteById(e, t, s) {
+    return this._ensureNotesMap(e, t).get(s);
+  }
+  _getNoteByParams(e, t, s) {
+    const { noteId: o, row: n, col: a } = s;
+    return o ? this._getNoteById(e, t, o) : n !== void 0 && a !== void 0 ? this._getNoteByPosition(e, t, n, a) : null;
+  }
+  getSheetShowNotes$(e, t) {
     return this._change$.pipe(
-      U(({ unitId: t, sheetId: n }) => t === e && n === s),
-      E(() => {
-        const t = this._ensureNoteMatrix(e, s), n = [];
-        return t.forValue((o, a, c) => {
-          c.show && n.push({ loc: { row: o, col: a, unitId: e, subUnitId: s }, note: c });
-        }), n;
+      W(({ unitId: s, subUnitId: o }) => s === e && o === t),
+      B(() => {
+        const s = this._ensureNotesMap(e, t), o = [];
+        for (const [n, a] of s)
+          a.show && o.push({ loc: { row: a.row, col: a.col, unitId: e, subUnitId: t }, note: a });
+        return o;
       })
     );
   }
-  getCellNoteChange$(e, s, t, n) {
+  getCellNoteChange$(e, t, s, o) {
     return this._change$.pipe(
-      U(({ unitId: o, sheetId: a, row: c, col: h }) => o === e && a === s && c === t && h === n),
-      E(({ note: o }) => o)
+      W(({ unitId: n, subUnitId: a, oldNote: c }) => n !== e || a !== t || !c ? !1 : c.row === s && c.col === o),
+      B((n) => n)
     );
   }
-  updateNote(e, s, t, n, o, a) {
-    const c = this._ensureNoteMatrix(e, s), h = c.getValue(t, n);
-    c.setValue(t, n, o), this._change$.next({ unitId: e, sheetId: s, row: t, col: n, type: "update", note: o, oldNote: h, silent: a });
-  }
-  removeNote(e, s, t, n, o) {
-    const a = this._ensureNoteMatrix(e, s), c = a.getValue(t, n);
-    a.realDeleteValue(t, n), this._change$.next({ unitId: e, sheetId: s, row: t, col: n, type: "update", note: null, oldNote: c, silent: o });
-  }
-  toggleNotePopup(e, s, t, n, o) {
-    const a = this._ensureNoteMatrix(e, s), c = a.getValue(t, n);
-    if (c) {
-      c.show = !c.show;
-      const h = { ...c, show: c.show };
-      a.setValue(t, n, h), this._change$.next({
-        unitId: e,
-        sheetId: s,
-        row: t,
-        col: n,
-        type: "update",
-        note: h,
-        oldNote: c,
-        silent: o
-      });
-    }
+  updateNote(e, t, s, o, n, a) {
+    const c = this._getNoteByParams(e, t, { noteId: n == null ? void 0 : n.id, row: s, col: o }), d = this._ensureNotesMap(e, t), h = {
+      ...n,
+      id: (c == null ? void 0 : c.id) || n.id || J(6),
+      row: s,
+      col: o
+    };
+    d.set(h.id, h), this._change$.next({ unitId: e, subUnitId: t, oldNote: c, type: "update", newNote: h, silent: a });
+  }
+  removeNote(e, t, s) {
+    const { noteId: o, row: n, col: a, silent: c } = s, d = this._getNoteByParams(e, t, { noteId: o, row: n, col: a });
+    if (!d)
+      return;
+    this._ensureNotesMap(e, t).delete(d.id), this._change$.next({ unitId: e, subUnitId: t, oldNote: d, type: "update", newNote: null, silent: c });
+  }
+  toggleNotePopup(e, t, s) {
+    const { noteId: o, row: n, col: a, silent: c } = s, d = this._getNoteByParams(e, t, { noteId: o, row: n, col: a });
+    if (!d)
+      return;
+    const h = this._ensureNotesMap(e, t), u = { ...d, show: !d.show };
+    h.set(u.id, u), this._change$.next({ unitId: e, subUnitId: t, oldNote: d, type: "update", newNote: u, silent: c });
+  }
+  updateNotePosition(e, t, s) {
+    const { noteId: o, row: n, col: a, newRow: c, newCol: d, silent: h } = s, u = this._getNoteByParams(e, t, { noteId: o, row: n, col: a });
+    if (!u)
+      return;
+    const l = this._ensureNotesMap(e, t), p = { ...u, row: c, col: d };
+    l.set(p.id, p), this._change$.next({ unitId: e, subUnitId: t, oldNote: u, type: "ref", newNote: p, silent: h });
+  }
+  getNote(e, t, s) {
+    return this._getNoteByParams(e, t, s);
   }
-  updateNotePosition(e, s, t, n, o, a, c) {
-    const h = this._ensureNoteMatrix(e, s), d = h.getValue(t, n);
-    d && (h.realDeleteValue(t, n), h.setValue(o, a, d), this._change$.next({
-      unitId: e,
-      sheetId: s,
-      row: t,
-      col: n,
-      type: "ref",
-      newPosition: { row: o, col: a },
-      note: d,
-      silent: c
-    }));
-  }
-  getNote(e, s, t, n) {
-    return this._ensureNoteMatrix(e, s).getValue(t, n);
+  getNotes() {
+    return this._notesMap;
   }
   getUnitNotes(e) {
-    return this._noteMatrix.get(e);
-  }
-  getSheetNotes(e, s) {
-    const t = this._noteMatrix.get(e);
-    if (t)
-      return t.get(s);
+    return this._notesMap.get(e);
   }
-  getNotes() {
-    return this._noteMatrix;
+  getSheetNotes(e, t) {
+    const s = this._notesMap.get(e);
+    if (s)
+      return s.get(t);
   }
   deleteUnitNotes(e) {
-    this._noteMatrix.delete(e);
+    this._notesMap.delete(e);
   }
 }
-const _ = {
+const N = {
   id: "sheet.mutation.update-note",
-  type: p.MUTATION,
+  type: m.MUTATION,
   handler: (i, r) => {
-    const { unitId: e, sheetId: s, row: t, col: n, note: o, silent: a } = r;
-    return i.get(u).updateNote(e, s, t, n, o, a), !0;
+    const { unitId: e, sheetId: t, row: s, col: o, note: n, silent: a } = r;
+    return i.get(g).updateNote(e, t, s, o, n, a), !0;
   }
-}, m = {
+}, M = {
   id: "sheet.mutation.remove-note",
-  type: p.MUTATION,
+  type: m.MUTATION,
   handler: (i, r) => {
-    const { unitId: e, sheetId: s, row: t, col: n, silent: o } = r;
-    return i.get(u).removeNote(e, s, t, n, o), !0;
+    const { unitId: e, sheetId: t, noteId: s, row: o, col: n, silent: a } = r;
+    return i.get(g).removeNote(e, t, { noteId: s, row: o, col: n, silent: a }), !0;
   }
-}, D = {
+}, b = {
   id: "sheet.mutation.toggle-note-popup",
-  type: p.MUTATION,
+  type: m.MUTATION,
   handler: (i, r) => {
-    const { unitId: e, sheetId: s, row: t, col: n, silent: o } = r;
-    return i.get(u).toggleNotePopup(e, s, t, n, o), !0;
+    const { unitId: e, sheetId: t, noteId: s, row: o, col: n, silent: a } = r;
+    return i.get(g).toggleNotePopup(e, t, { noteId: s, row: o, col: n, silent: a }), !0;
   }
-}, R = {
+}, $ = {
   id: "sheet.mutation.update-note-position",
-  type: p.MUTATION,
+  type: m.MUTATION,
   handler: (i, r) => {
-    const { unitId: e, sheetId: s, row: t, col: n, newPosition: o, silent: a } = r;
-    return i.get(u).updateNotePosition(e, s, t, n, o.row, o.col, a), !0;
+    const { unitId: e, sheetId: t, noteId: s, row: o, col: n, newPosition: a, silent: c } = r;
+    return i.get(g).updateNotePosition(e, t, { noteId: s, row: o, col: n, newRow: a.row, newCol: a.col, silent: c }), !0;
   }
-}, se = {
+}, ae = {
   id: "sheet.command.delete-note",
-  type: p.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(P), s = T(e);
-    if (!s) return !1;
-    const n = i.get(y).getCurrentLastSelection();
-    if (!(n != null && n.primary)) return !1;
-    const { actualColumn: o, actualRow: a } = n.primary;
-    return i.get(N).executeCommand(m.id, {
-      unitId: s.unitId,
-      sheetId: s.subUnitId,
-      row: a,
-      col: o
-    });
+  type: m.COMMAND,
+  handler: (i) => {
+    const r = D(i.get(E));
+    if (!r) return !1;
+    const t = i.get(x).getCurrentLastSelection();
+    if (!(t != null && t.primary)) return !1;
+    const s = i.get(g), { unitId: o, subUnitId: n } = r, { actualColumn: a, actualRow: c } = t.primary, d = s.getNote(o, n, { row: c, col: a });
+    if (!d) return !1;
+    const h = i.get(w), u = i.get(T), l = {
+      id: M.id,
+      params: {
+        unitId: o,
+        sheetId: n,
+        noteId: d.id
+      }
+    }, p = {
+      id: N.id,
+      params: {
+        unitId: o,
+        sheetId: n,
+        row: c,
+        col: a,
+        note: { ...d }
+      }
+    };
+    return h.syncExecuteCommand(l.id, l.params) ? (u.pushUndoRedo({
+      unitID: o,
+      redoMutations: [l],
+      undoMutations: [p]
+    }), !0) : !1;
   }
-}, ne = {
+}, ce = {
   id: "sheet.command.toggle-note-popup",
-  type: p.COMMAND,
-  handler: (i, r) => {
-    const e = i.get(P), s = T(e);
-    if (!s) return !1;
-    const n = i.get(y).getCurrentLastSelection();
-    if (!(n != null && n.primary)) return !1;
-    const { actualColumn: o, actualRow: a } = n.primary;
-    return i.get(N).executeCommand(D.id, {
-      unitId: s.unitId,
-      sheetId: s.subUnitId,
-      row: a,
-      col: o
-    });
+  type: m.COMMAND,
+  handler: (i) => {
+    const r = D(i.get(E));
+    if (!r) return !1;
+    const t = i.get(x).getCurrentLastSelection();
+    if (!(t != null && t.primary)) return !1;
+    const s = i.get(g), { unitId: o, subUnitId: n } = r, { actualColumn: a, actualRow: c } = t.primary, d = s.getNote(o, n, { row: c, col: a });
+    if (!d) return !1;
+    const h = i.get(w), u = i.get(T), l = {
+      id: b.id,
+      params: {
+        unitId: o,
+        sheetId: n,
+        noteId: d.id
+      }
+    }, p = {
+      id: b.id,
+      params: {
+        unitId: o,
+        sheetId: n,
+        noteId: d.id
+      }
+    };
+    return h.syncExecuteCommand(l.id, l.params) ? (u.pushUndoRedo({
+      unitID: o,
+      redoMutations: [l],
+      undoMutations: [p]
+    }), !0) : !1;
   }
-}, re = {
+}, de = {
   id: "sheet.command.update-note",
-  type: p.COMMAND,
-  handler: (i, r) => i.get(N).syncExecuteCommand(_.id, r)
-}, V = "SHEET_NOTE_PLUGIN";
-var oe = Object.getOwnPropertyDescriptor, ie = (i, r, e, s) => {
-  for (var t = s > 1 ? void 0 : s ? oe(r, e) : r, n = i.length - 1, o; n >= 0; n--)
-    (o = i[n]) && (t = o(t) || t);
-  return t;
-}, f = (i, r) => (e, s) => r(e, s, i);
-let M = class extends x {
-  constructor(i, r, e, s) {
-    super(), this._resourceManagerService = i, this._univerInstanceService = r, this._sheetInterceptorService = e, this._sheetsNoteModel = s, this._initSnapshot(), this._initSheetChange();
+  type: m.COMMAND,
+  handler: (i, r) => {
+    const e = D(i.get(E), r);
+    if (!e) return !1;
+    const t = i.get(w), s = i.get(T), o = i.get(g), { unitId: n, subUnitId: a } = e, { row: c, col: d, note: h } = r, u = o.getNote(n, a, { noteId: h.id, row: c, col: d }), l = {
+      id: N.id,
+      params: {
+        unitId: n,
+        sheetId: a,
+        row: c,
+        col: d,
+        note: h
+      }
+    }, p = [];
+    if (u) {
+      const O = {
+        id: N.id,
+        params: {
+          unitId: n,
+          sheetId: a,
+          row: c,
+          col: d,
+          note: { ...u }
+        }
+      };
+      p.push(O);
+    } else {
+      const O = {
+        id: M.id,
+        params: {
+          unitId: n,
+          sheetId: a,
+          row: c,
+          col: d
+        }
+      };
+      p.push(O);
+    }
+    return t.syncExecuteCommand(l.id, l.params) ? (s.pushUndoRedo({
+      unitID: n,
+      redoMutations: [l],
+      undoMutations: p
+    }), !0) : !1;
+  }
+}, G = "SHEET_NOTE_PLUGIN";
+var he = Object.getOwnPropertyDescriptor, ue = (i, r, e, t) => {
+  for (var s = t > 1 ? void 0 : t ? he(r, e) : r, o = i.length - 1, n; o >= 0; o--)
+    (n = i[o]) && (s = n(s) || s);
+  return s;
+}, S = (i, r) => (e, t) => r(e, t, i);
+let C = class extends U {
+  constructor(i, r, e, t) {
+    super(), this._resourceManagerService = i, this._univerInstanceService = r, this._sheetInterceptorService = e, this._sheetsNoteModel = t, this._initSnapshot(), this._initSheetChange();
   }
   _initSnapshot() {
     const i = (e) => {
-      const s = this._sheetsNoteModel.getUnitNotes(e);
-      if (!s)
+      const t = this._sheetsNoteModel.getUnitNotes(e);
+      if (!t)
         return "";
-      const t = {};
-      return s.forEach((n, o) => {
+      const s = {};
+      return t.forEach((o, n) => {
         const a = {};
-        n.forValue((c, h, d) => {
-          a[c] || (a[c] = {}), a[c][h] = d;
-        }), Object.keys(a).length > 0 && (t[o] = a);
-      }), JSON.stringify(t);
+        o.forEach((c) => {
+          const { row: d, col: h } = c;
+          a[d] || (a[d] = {}), a[d][h] = c;
+        }), Object.keys(a).length > 0 && (s[n] = a);
+      }), JSON.stringify(s);
     }, r = (e) => {
       if (!e)
         return {};
@@ -187,23 +266,23 @@ let M = class extends x {
     };
     this.disposeWithMe(
       this._resourceManagerService.registerPluginResource({
-        pluginName: V,
-        businesses: [v.UNIVER_SHEET],
+        pluginName: G,
+        businesses: [I.UNIVER_SHEET],
         toJson: (e) => i(e),
         parseJson: (e) => r(e),
         onUnLoad: (e) => {
           this._sheetsNoteModel.deleteUnitNotes(e);
         },
-        onLoad: (e, s) => {
-          Object.entries(s).forEach(([t, n]) => {
-            Object.entries(n).forEach(([o, a]) => {
-              Object.entries(a).forEach(([c, h]) => {
+        onLoad: (e, t) => {
+          Object.entries(t).forEach(([s, o]) => {
+            Object.entries(o).forEach(([n, a]) => {
+              Object.entries(a).forEach(([c, d]) => {
                 this._sheetsNoteModel.updateNote(
                   e,
-                  t,
-                  Number(o),
+                  s,
+                  Number(n),
                   Number(c),
-                  h
+                  d
                 );
               });
             });
@@ -219,59 +298,62 @@ let M = class extends x {
         // eslint-disable-next-line max-lines-per-function
         getMutations: (i) => {
           var r;
-          if (i.id === Q.id) {
-            const e = i.params, s = e.unitId || this._univerInstanceService.getCurrentUnitOfType(v.UNIVER_SHEET).getUnitId(), t = e.subUnitId || ((r = this._univerInstanceService.getCurrentUnitOfType(v.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : r.getSheetId());
-            if (!s || !t)
+          if (i.id === te.id) {
+            const e = i.params, t = e.unitId || this._univerInstanceService.getCurrentUnitOfType(I.UNIVER_SHEET).getUnitId(), s = e.subUnitId || ((r = this._univerInstanceService.getCurrentUnitOfType(I.UNIVER_SHEET).getActiveSheet()) == null ? void 0 : r.getSheetId());
+            if (!t || !s)
               return { redos: [], undos: [] };
-            const n = this._sheetsNoteModel.getSheetNotes(s, t);
-            if (!n)
+            const o = this._sheetsNoteModel.getSheetNotes(t, s);
+            if (!o)
               return { redos: [], undos: [] };
-            const o = [], a = [];
-            return n.forValue((c, h, d) => {
-              o.push({
-                id: m.id,
+            const n = [], a = [];
+            return o.forEach((c) => {
+              n.push({
+                id: M.id,
                 params: {
-                  unitId: s,
-                  sheetId: t,
-                  row: c,
-                  col: h
+                  unitId: t,
+                  sheetId: s,
+                  noteId: c.id,
+                  row: c.row,
+                  col: c.col
                 }
               }), a.push({
-                id: _.id,
+                id: N.id,
                 params: {
-                  unitId: s,
-                  sheetId: t,
-                  row: c,
-                  col: h,
-                  note: d
+                  unitId: t,
+                  sheetId: s,
+                  row: c.row,
+                  col: c.col,
+                  note: c
                 }
               });
-            }), { redos: o, undos: a };
-          } else if (i.id === X.id) {
-            const e = i.params, { unitId: s, subUnitId: t, targetSubUnitId: n } = e;
-            if (!s || !t || !n)
+            }), { redos: n, undos: a };
+          } else if (i.id === se.id) {
+            const e = i.params, { unitId: t, subUnitId: s, targetSubUnitId: o } = e;
+            if (!t || !s || !o)
               return { redos: [], undos: [] };
-            const o = this._sheetsNoteModel.getSheetNotes(s, t);
-            if (!o)
+            const n = this._sheetsNoteModel.getSheetNotes(t, s);
+            if (!n)
               return { redos: [], undos: [] };
             const a = [], c = [];
-            return o.forValue((h, d, A) => {
+            return n.forEach((d) => {
+              const h = { ...d, id: J(6) };
               a.push({
-                id: _.id,
+                id: N.id,
                 params: {
-                  unitId: s,
-                  sheetId: n,
-                  row: h,
-                  col: d,
-                  note: A
+                  unitId: t,
+                  sheetId: o,
+                  row: h.row,
+                  col: h.col,
+                  note: h
                 }
               }), c.push({
-                id: m.id,
+                id: M.id,
                 params: {
-                  unitId: s,
-                  sheetId: n,
-                  row: h,
-                  col: d
+                  unitId: t,
+                  sheetId: o,
+                  noteId: h.id,
+                  row: h.row,
+                  col: h.col
                 }
               });
             }), { redos: a, undos: c };
@@ -282,140 +364,139 @@ let M = class extends x {
     );
   }
 };
-M = ie([
-  f(0, J),
-  f(1, P),
-  f(2, g(B)),
-  f(3, g(u))
-], M);
-const ae = "sheets-note.config", b = {};
-var ce = Object.getOwnPropertyDescriptor, he = (i, r, e, s) => {
-  for (var t = s > 1 ? void 0 : s ? ce(r, e) : r, n = i.length - 1, o; n >= 0; n--)
-    (o = i[n]) && (t = o(t) || t);
-  return t;
-}, S = (i, r) => (e, s) => r(e, s, i);
-let I = class extends x {
-  constructor(r, e, s, t) {
+C = ue([
+  S(0, q),
+  S(1, E),
+  S(2, f(ee)),
+  S(3, f(g))
+], C);
+const le = "sheets-note.config", L = {};
+var pe = Object.getOwnPropertyDescriptor, ge = (i, r, e, t) => {
+  for (var s = t > 1 ? void 0 : t ? pe(r, e) : r, o = i.length - 1, n; o >= 0; o--)
+    (n = i[o]) && (s = n(s) || s);
+  return s;
+}, v = (i, r) => (e, t) => r(e, t, i);
+let R = class extends U {
+  constructor(r, e, t, s) {
     super();
-    l(this, "_disposableMap", /* @__PURE__ */ new Map());
-    l(this, "_watcherMap", /* @__PURE__ */ new Map());
-    l(this, "_handleRangeChange", (r, e, s, t, n, o, a) => o ? {
+    _(this, "_disposableMap", /* @__PURE__ */ new Map());
+    _(this, "_watcherMap", /* @__PURE__ */ new Map());
+    _(this, "_handleRangeChange", (r, e, t, s, o, n, a) => n ? {
       redos: [{
-        id: R.id,
+        id: $.id,
         params: {
           unitId: r,
           sheetId: e,
-          row: t,
-          col: n,
+          noteId: t.id,
           newPosition: {
-            row: o.startRow,
-            col: o.startColumn
+            row: n.startRow,
+            col: n.startColumn
           },
           silent: a
         }
       }],
       undos: [{
-        id: R.id,
+        id: $.id,
         params: {
           unitId: r,
           sheetId: e,
-          row: o.startRow,
-          col: o.startColumn,
+          noteId: t.id,
           newPosition: {
-            row: t,
-            col: n
+            row: s,
+            col: o
           },
-          note: s,
+          note: t,
           silent: a
         }
       }]
     } : {
       redos: [{
-        id: m.id,
+        id: M.id,
         params: {
           unitId: r,
           sheetId: e,
-          row: t,
-          col: n
+          noteId: t.id
         }
       }],
       undos: [{
-        id: _.id,
+        id: N.id,
         params: {
           unitId: r,
           sheetId: e,
-          row: t,
-          col: n,
-          note: s
+          row: s,
+          col: o,
+          note: t
         }
       }]
     });
-    this._refRangeService = r, this._sheetsNoteModel = e, this._selectionManagerService = s, this._commandService = t, this._initData(), this._initRefRange();
+    this._refRangeService = r, this._sheetsNoteModel = e, this._selectionManagerService = t, this._commandService = s, this._initData(), this._initRefRange();
   }
-  _getIdWithUnitId(r, e, s, t) {
-    return `${r}-${e}-${s}-${t}`;
+  _getIdWithUnitId(r, e, t, s) {
+    return `${r}-${e}-${t}-${s}`;
   }
-  _register(r, e, s, t, n) {
-    const o = {
-      startColumn: n,
-      endColumn: n,
-      startRow: t,
-      endRow: t
+  _register(r, e, t, s, o) {
+    const n = {
+      startColumn: o,
+      endColumn: o,
+      startRow: s,
+      endRow: s
     };
     this._disposableMap.set(
-      this._getIdWithUnitId(r, e, t, n),
-      this._refRangeService.registerRefRange(o, (a) => {
-        const c = k(o, a, { selectionManagerService: this._selectionManagerService }), h = Array.isArray(c) ? c[0] : c;
-        return h && h.startColumn === o.startColumn && h.startRow === o.startRow ? {
+      this._getIdWithUnitId(r, e, s, o),
+      this._refRangeService.registerRefRange(n, (a) => {
+        const c = ne(n, a, { selectionManagerService: this._selectionManagerService }), d = Array.isArray(c) ? c[0] : c;
+        return d && d.startColumn === n.startColumn && d.startRow === n.startRow ? {
           undos: [],
           redos: []
-        } : this._handleRangeChange(r, e, s, t, n, h, !1);
+        } : this._handleRangeChange(r, e, t, s, o, d, !1);
       }, r, e)
     );
   }
-  _watch(r, e, s, t, n) {
-    const o = {
-      startColumn: n,
-      endColumn: n,
-      startRow: t,
-      endRow: t
+  _watch(r, e, t, s, o) {
+    const n = {
+      startColumn: o,
+      endColumn: o,
+      startRow: s,
+      endRow: s
     };
     this._watcherMap.set(
-      this._getIdWithUnitId(r, e, t, n),
-      this._refRangeService.watchRange(r, e, o, (a, c) => {
-        const { redos: h } = this._handleRangeChange(r, e, s, a.startRow, a.startColumn, c, !0);
-        G(h, this._commandService, { onlyLocal: !0 });
+      this._getIdWithUnitId(r, e, s, o),
+      this._refRangeService.watchRange(r, e, n, (a, c) => {
+        const { redos: d } = this._handleRangeChange(r, e, t, a.startRow, a.startColumn, c, !0);
+        K(d, this._commandService, { onlyLocal: !0 });
       }, !0)
     );
   }
-  _unwatch(r, e, s, t) {
-    var o;
-    const n = this._getIdWithUnitId(r, e, s, t);
-    (o = this._watcherMap.get(n)) == null || o.dispose(), this._watcherMap.delete(n);
+  _unwatch(r, e, t, s) {
+    var n;
+    const o = this._getIdWithUnitId(r, e, t, s);
+    (n = this._watcherMap.get(o)) == null || n.dispose(), this._watcherMap.delete(o);
   }
-  _unregister(r, e, s, t) {
-    var o;
-    const n = this._getIdWithUnitId(r, e, s, t);
-    (o = this._disposableMap.get(n)) == null || o.dispose(), this._disposableMap.delete(n);
+  _unregister(r, e, t, s) {
+    var n;
+    const o = this._getIdWithUnitId(r, e, t, s);
+    (n = this._disposableMap.get(o)) == null || n.dispose(), this._disposableMap.delete(o);
   }
   _initData() {
     const r = this._sheetsNoteModel.getNotes();
-    for (const [e, s] of r)
-      for (const [t, n] of s)
-        n.forValue((o, a, c) => (c && (this._register(e, t, c, o, a), this._watch(e, t, c, o, a)), !0));
+    for (const [e, t] of r)
+      for (const [s, o] of t)
+        o.forEach((n) => {
+          this._register(e, s, n, n.row, n.col), this._watch(e, s, n, n.row, n.col);
+        });
   }
   _initRefRange() {
     this.disposeWithMe(
       this._sheetsNoteModel.change$.subscribe((r) => {
         switch (r.type) {
           case "update": {
-            const { unitId: e, sheetId: s, row: t, col: n, note: o } = r, a = this._getIdWithUnitId(e, s, t, n);
-            o ? this._disposableMap.has(a) || (this._register(e, s, o, t, n), this._watch(e, s, o, t, n)) : (this._unregister(e, s, t, n), this._unwatch(e, s, t, n));
+            const { unitId: e, subUnitId: t, oldNote: s, newNote: o } = r, n = o ? o.row : s.row, a = o ? o.col : s.col, c = this._getIdWithUnitId(e, t, n, a);
+            o ? this._disposableMap.has(c) || (this._register(e, t, o, n, a), this._watch(e, t, o, n, a)) : (this._unregister(e, t, n, a), this._unwatch(e, t, n, a));
             break;
           }
           case "ref": {
-            const { unitId: e, sheetId: s, row: t, col: n, newPosition: o, note: a, silent: c } = r;
-            this._unregister(e, s, t, n), c || (this._unwatch(e, s, t, n), this._watch(e, s, a, o.row, o.col)), this._register(e, s, a, o.row, o.col);
+            const { unitId: e, subUnitId: t, oldNote: s, newNote: o, silent: n } = r, { row: a, col: c } = s, { row: d, col: h } = o;
+            this._unregister(e, t, a, c), n || (this._unwatch(e, t, a, c), this._watch(e, t, o, d, h)), this._register(e, t, o, d, h);
             break;
           }
         }
@@ -423,30 +504,30 @@ let I = class extends x {
     );
   }
 };
-I = he([
-  S(0, g(Z)),
-  S(1, g(u)),
-  S(2, g(y)),
-  S(3, N)
-], I);
-var de = Object.getOwnPropertyDescriptor, ue = (i, r, e, s) => {
-  for (var t = s > 1 ? void 0 : s ? de(r, e) : r, n = i.length - 1, o; n >= 0; n--)
-    (o = i[n]) && (t = o(t) || t);
-  return t;
-}, le = (i, r) => (e, s) => r(e, s, i);
-let C = class extends x {
+R = ge([
+  v(0, f(oe)),
+  v(1, f(g)),
+  v(2, f(x)),
+  v(3, w)
+], R);
+var _e = Object.getOwnPropertyDescriptor, Ne = (i, r, e, t) => {
+  for (var s = t > 1 ? void 0 : t ? _e(r, e) : r, o = i.length - 1, n; o >= 0; o--)
+    (n = i[o]) && (s = n(s) || s);
+  return s;
+}, me = (i, r) => (e, t) => r(e, t, i);
+let y = class extends U {
   constructor(i) {
     super(), this._commandService = i, this._initialize();
   }
   _initialize() {
     [
-      R,
-      D,
-      _,
-      m,
-      se,
-      ne,
-      re
+      $,
+      b,
+      N,
+      M,
+      ae,
+      ce,
+      de
     ].forEach((i) => {
       this.disposeWithMe(
         this._commandService.registerCommand(i)
@@ -454,60 +535,60 @@ let C = class extends x {
     });
   }
 };
-C = ue([
-  le(0, N)
-], C);
-var pe = Object.defineProperty, ge = Object.getOwnPropertyDescriptor, _e = (i, r, e) => r in i ? pe(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e, me = (i, r, e, s) => {
-  for (var t = s > 1 ? void 0 : s ? ge(r, e) : r, n = i.length - 1, o; n >= 0; n--)
-    (o = i[n]) && (t = o(t) || t);
-  return t;
-}, $ = (i, r) => (e, s) => r(e, s, i), j = (i, r, e) => _e(i, typeof r != "symbol" ? r + "" : r, e);
-let w = class extends K {
-  constructor(i = b, r, e) {
+y = Ne([
+  me(0, w)
+], y);
+var fe = Object.defineProperty, Me = Object.getOwnPropertyDescriptor, we = (i, r, e) => r in i ? fe(i, r, { enumerable: !0, configurable: !0, writable: !0, value: e }) : i[r] = e, Se = (i, r, e, t) => {
+  for (var s = t > 1 ? void 0 : t ? Me(r, e) : r, o = i.length - 1, n; o >= 0; o--)
+    (n = i[o]) && (s = n(s) || s);
+  return s;
+}, H = (i, r) => (e, t) => r(e, t, i), V = (i, r, e) => we(i, typeof r != "symbol" ? r + "" : r, e);
+let P = class extends Z {
+  constructor(i = L, r, e) {
     super(), this._config = i, this._configService = r, this._injector = e;
-    const { ...s } = Y(
+    const { ...t } = k(
       {},
-      b,
+      L,
       this._config
     );
-    this._configService.setConfig(ae, s);
+    this._configService.setConfig(le, t);
   }
   onStarting() {
     [
-      [u],
+      [g],
+      [y],
       [C],
-      [M],
-      [I]
+      [R]
     ].forEach((i) => {
       this._injector.add(i);
-    }), O(this._injector, [
-      [u],
-      [C],
-      [M]
+    }), A(this._injector, [
+      [g],
+      [y],
+      [C]
     ]);
   }
   onReady() {
-    O(this._injector, [
-      [I]
+    A(this._injector, [
+      [R]
     ]);
   }
 };
-j(w, "pluginName", V);
-j(w, "type", v.UNIVER_SHEET);
-w = me([
-  z(ee),
-  $(1, F),
-  $(2, g(q))
-], w);
+V(P, "pluginName", G);
+V(P, "type", I.UNIVER_SHEET);
+P = Se([
+  Y(re),
+  H(1, Q),
+  H(2, f(X))
+], P);
 export {
-  m as RemoveNoteMutation,
-  se as SheetDeleteNoteCommand,
-  ne as SheetToggleNotePopupCommand,
-  re as SheetUpdateNoteCommand,
-  u as SheetsNoteModel,
-  M as SheetsNoteResourceController,
-  D as ToggleNotePopupMutation,
-  w as UniverSheetsNotePlugin,
-  _ as UpdateNoteMutation,
-  R as UpdateNotePositionMutation
+  M as RemoveNoteMutation,
+  ae as SheetDeleteNoteCommand,
+  ce as SheetToggleNotePopupCommand,
+  de as SheetUpdateNoteCommand,
+  g as SheetsNoteModel,
+  C as SheetsNoteResourceController,
+  b as ToggleNotePopupMutation,
+  P as UniverSheetsNotePlugin,
+  N as UpdateNoteMutation,
+  $ as UpdateNotePositionMutation
 };