@univerjs/sheets-note 0.15.4 → 0.15.5

package/lib/facade.js

@@ -1,8 +1,9 @@
-import { FEventName as k, FUniver as m } from "@univerjs/core/facade";
-import { UpdateNoteMutation as I, RemoveNoteMutation as b, SheetsNoteModel as g, SheetUpdateNoteCommand as f, SheetDeleteNoteCommand as B, SheetToggleNotePopupCommand as w } from "@univerjs/sheets-note";
-import { FRange as E, FWorksheet as v } from "@univerjs/sheets/facade";
-import { ICommandService as H, CanceledError as N } from "@univerjs/core";
-class x {
+import { FEventName as B, FUniver as I } from "@univerjs/core/facade";
+import { UpdateNoteMutation as C, RemoveNoteMutation as H, SheetsNoteModel as c, SheetUpdateNoteCommand as f, SheetDeleteNoteCommand as x, SheetToggleNotePopupCommand as m } from "@univerjs/sheets-note";
+import { FRange as k, FWorksheet as b } from "@univerjs/sheets/facade";
+import { ICommandService as M, CanceledError as g, IUniverInstanceService as v } from "@univerjs/core";
+import { getSheetCommandTarget as E, SheetsSelectionsService as p } from "@univerjs/sheets";
+class y {
   get SheetNoteAdd() {
     return "SheetNoteAdd";
   }
@@ -34,23 +35,23 @@ class x {
     return "BeforeSheetNoteHide";
   }
 }
-k.extend(x);
-class U extends E {
-  createOrUpdateNote(c) {
+B.extend(y);
+class W extends k {
+  createOrUpdateNote(n) {
     return this._commandService.syncExecuteCommand(
-      I.id,
+      C.id,
       {
         unitId: this.getUnitId(),
         sheetId: this.getSheetId(),
         row: this.getRow(),
         col: this.getColumn(),
-        note: c
+        note: n
       }
     ), this;
   }
   deleteNote() {
     return this._commandService.syncExecuteCommand(
-      b.id,
+      H.id,
       {
         unitId: this.getUnitId(),
         sheetId: this.getSheetId(),
@@ -60,29 +61,29 @@ class U extends E {
     ), this;
   }
   getNote() {
-    return this._injector.get(g).getNote(this.getUnitId(), this.getSheetId(), this.getRow(), this.getColumn());
+    return this._injector.get(c).getNote(this.getUnitId(), this.getSheetId(), { row: this.getRow(), col: this.getColumn() });
   }
 }
-E.extend(U);
-class C extends m {
+k.extend(W);
+class T extends I {
   // eslint-disable-next-line max-lines-per-function
-  _initialize(c) {
-    const a = c.get(H);
+  _initialize(n) {
+    const a = n.get(M);
     this.disposeWithMe(
       this.registerEventHandler(
         this.Event.SheetNoteAdd,
-        () => c.get(g).change$.subscribe((e) => {
-          if (e.type === "update" && !e.oldNote && e.note) {
-            const { unitId: t, sheetId: o, row: r, col: i, note: s } = e, n = this.getSheetTarget(t, o);
-            if (!n)
+        () => n.get(c).change$.subscribe((e) => {
+          if (e.type === "update" && !e.oldNote && e.newNote) {
+            const { unitId: s, subUnitId: r, newNote: t } = e, o = this.getSheetTarget(s, r);
+            if (!o)
               return;
-            const { workbook: d, worksheet: l } = n;
+            const { workbook: d, worksheet: i } = o;
             this.fireEvent(this.Event.SheetNoteAdd, {
               workbook: d,
-              worksheet: l,
-              row: r,
-              col: i,
-              note: s
+              worksheet: i,
+              row: t.row,
+              col: t.col,
+              note: t
             });
           }
         })
@@ -90,18 +91,18 @@ class C extends m {
     ), this.disposeWithMe(
       this.registerEventHandler(
         this.Event.SheetNoteDelete,
-        () => c.get(g).change$.subscribe((e) => {
-          if (e.type === "update" && e.oldNote && !e.note) {
-            const { unitId: t, sheetId: o, row: r, col: i, oldNote: s } = e, n = this.getSheetTarget(t, o);
-            if (!n)
+        () => n.get(c).change$.subscribe((e) => {
+          if (e.type === "update" && e.oldNote && !e.newNote) {
+            const { unitId: s, subUnitId: r, oldNote: t } = e, o = this.getSheetTarget(s, r);
+            if (!o)
               return;
-            const { workbook: d, worksheet: l } = n;
+            const { workbook: d, worksheet: i } = o;
             this.fireEvent(this.Event.SheetNoteDelete, {
               workbook: d,
-              worksheet: l,
-              row: r,
-              col: i,
-              oldNote: s
+              worksheet: i,
+              row: t.row,
+              col: t.col,
+              oldNote: t
             });
           }
         })
@@ -109,19 +110,19 @@ class C extends m {
     ), this.disposeWithMe(
       this.registerEventHandler(
         this.Event.SheetNoteUpdate,
-        () => c.get(g).change$.subscribe((e) => {
-          if (e.type === "update" && e.oldNote && e.note) {
-            const { unitId: t, sheetId: o, row: r, col: i, note: s, oldNote: n } = e, d = this.getSheetTarget(t, o);
+        () => n.get(c).change$.subscribe((e) => {
+          if (e.type === "update" && e.oldNote && e.newNote) {
+            const { unitId: s, subUnitId: r, oldNote: t, newNote: o } = e, d = this.getSheetTarget(s, r);
             if (!d)
               return;
-            const { workbook: l, worksheet: S } = d;
+            const { workbook: i, worksheet: l } = d;
             this.fireEvent(this.Event.SheetNoteUpdate, {
-              workbook: l,
-              worksheet: S,
-              row: r,
-              col: i,
-              note: s,
-              oldNote: n
+              workbook: i,
+              worksheet: l,
+              row: o.row,
+              col: o.col,
+              note: o,
+              oldNote: t
             });
           }
         })
@@ -129,17 +130,17 @@ class C extends m {
     ), this.disposeWithMe(
       this.registerEventHandler(
         this.Event.SheetNoteShow,
-        () => c.get(g).change$.subscribe((e) => {
-          if (e.type === "update" && e.oldNote && e.note && !e.oldNote.show && e.note.show) {
-            const { unitId: t, sheetId: o, row: r, col: i } = e, s = this.getSheetTarget(t, o);
-            if (!s)
+        () => n.get(c).change$.subscribe((e) => {
+          if (e.type === "update" && e.oldNote && e.newNote && !e.oldNote.show && e.newNote.show) {
+            const { unitId: s, subUnitId: r, newNote: t } = e, o = this.getSheetTarget(s, r);
+            if (!o)
               return;
-            const { workbook: n, worksheet: d } = s;
+            const { workbook: d, worksheet: i } = o;
             this.fireEvent(this.Event.SheetNoteShow, {
-              workbook: n,
-              worksheet: d,
-              row: r,
-              col: i
+              workbook: d,
+              worksheet: i,
+              row: t.row,
+              col: t.col
             });
           }
         })
@@ -147,17 +148,17 @@ class C extends m {
     ), this.disposeWithMe(
       this.registerEventHandler(
         this.Event.SheetNoteHide,
-        () => c.get(g).change$.subscribe((e) => {
-          if (e.type === "update" && e.oldNote && e.note && e.oldNote.show && !e.note.show) {
-            const { unitId: t, sheetId: o, row: r, col: i } = e, s = this.getSheetTarget(t, o);
-            if (!s)
+        () => n.get(c).change$.subscribe((e) => {
+          if (e.type === "update" && e.oldNote && e.newNote && e.oldNote.show && !e.newNote.show) {
+            const { unitId: s, subUnitId: r, newNote: t } = e, o = this.getSheetTarget(s, r);
+            if (!o)
               return;
-            const { workbook: n, worksheet: d } = s;
+            const { workbook: d, worksheet: i } = o;
             this.fireEvent(this.Event.SheetNoteHide, {
-              workbook: n,
-              worksheet: d,
-              row: r,
-              col: i
+              workbook: d,
+              worksheet: i,
+              row: t.row,
+              col: t.col
             });
           }
         })
@@ -167,20 +168,17 @@ class C extends m {
         this.Event.BeforeSheetNoteAdd,
         () => a.beforeCommandExecuted((h) => {
           if (h.id === f.id) {
-            const e = c.get(g), { unitId: t, sheetId: o, row: r, col: i, note: s } = h.params;
-            if (e.getNote(t, o, r, i)) return;
-            const d = this.getSheetTarget(t, o);
-            if (!d)
-              return;
-            const { workbook: l, worksheet: S } = d;
+            const { unitId: e, sheetId: s, row: r, col: t, note: o } = h.params, d = this.getSheetTarget(e, s);
+            if (!d || n.get(c).getNote(e, s, { noteId: o.id, row: r, col: t })) return;
+            const { workbook: S, worksheet: u } = d;
             if (this.fireEvent(this.Event.BeforeSheetNoteAdd, {
-              workbook: l,
-              worksheet: S,
+              workbook: S,
+              worksheet: u,
               row: r,
-              col: i,
-              note: s
+              col: t,
+              note: o
             }))
-              throw new N();
+              throw new g();
           }
         })
       )
@@ -188,21 +186,20 @@ class C extends m {
       this.registerEventHandler(
         this.Event.BeforeSheetNoteDelete,
         () => a.beforeCommandExecuted((h) => {
-          if (h.id === B.id) {
-            const e = c.get(g), { unitId: t, sheetId: o, row: r, col: i } = h.params, s = e.getNote(t, o, r, i);
-            if (!s) return;
-            const n = this.getSheetTarget(t, o);
-            if (!n)
-              return;
-            const { workbook: d, worksheet: l } = n;
+          if (h.id === x.id) {
+            const { unitId: e, sheetId: s, row: r, col: t } = h.params, o = this.getSheetTarget(e, s);
+            if (!o || r === void 0 || t === void 0) return;
+            const i = n.get(c).getNote(e, s, { row: r, col: t });
+            if (!i) return;
+            const { workbook: l, worksheet: S } = o;
             if (this.fireEvent(this.Event.BeforeSheetNoteDelete, {
-              workbook: d,
-              worksheet: l,
+              workbook: l,
+              worksheet: S,
               row: r,
-              col: i,
-              oldNote: s
+              col: t,
+              oldNote: i
             }))
-              throw new N();
+              throw new g();
           }
         })
       )
@@ -211,21 +208,20 @@ class C extends m {
         this.Event.BeforeSheetNoteUpdate,
         () => a.beforeCommandExecuted((h) => {
           if (h.id === f.id) {
-            const e = c.get(g), { unitId: t, sheetId: o, row: r, col: i, note: s } = h.params, n = e.getNote(t, o, r, i);
-            if (!n) return;
-            const d = this.getSheetTarget(t, o);
-            if (!d)
-              return;
-            const { workbook: l, worksheet: S } = d;
+            const { unitId: e, sheetId: s, row: r, col: t, note: o } = h.params, d = this.getSheetTarget(e, s);
+            if (!d) return;
+            const l = n.get(c).getNote(e, s, { row: r, col: t });
+            if (!l) return;
+            const { workbook: S, worksheet: u } = d;
             if (this.fireEvent(this.Event.BeforeSheetNoteUpdate, {
-              workbook: l,
-              worksheet: S,
+              workbook: S,
+              worksheet: u,
               row: r,
-              col: i,
-              note: s,
-              oldNote: n
+              col: t,
+              note: o,
+              oldNote: l
             }))
-              throw new N();
+              throw new g();
           }
         })
       )
@@ -233,20 +229,24 @@ class C extends m {
       this.registerEventHandler(
         this.Event.BeforeSheetNoteShow,
         () => a.beforeCommandExecuted((h) => {
-          if (h.id === w.id) {
-            const e = c.get(g), { unitId: t, sheetId: o, row: r, col: i } = h.params, s = e.getNote(t, o, r, i);
-            if (s != null && s.show) return;
-            const n = this.getSheetTarget(t, o);
-            if (!n)
-              return;
-            const { workbook: d, worksheet: l } = n;
+          if (h.id === m.id) {
+            const e = E(n.get(v));
+            if (!e) return;
+            const { unitId: s, subUnitId: r } = e, t = this.getUniverSheet(s);
+            if (!t) return;
+            const o = t.getSheetBySheetId(r);
+            if (!o) return;
+            const i = n.get(p).getCurrentLastSelection();
+            if (!(i != null && i.primary)) return;
+            const l = n.get(c), { actualColumn: S, actualRow: u } = i.primary, N = l.getNote(s, r, { row: u, col: S });
+            if (!N || N.show) return;
             if (this.fireEvent(this.Event.BeforeSheetNoteShow, {
-              workbook: d,
-              worksheet: l,
-              row: r,
-              col: i
+              workbook: t,
+              worksheet: o,
+              row: u,
+              col: S
             }))
-              throw new N();
+              throw new g();
           }
         })
       )
@@ -254,43 +254,41 @@ class C extends m {
       this.registerEventHandler(
         this.Event.BeforeSheetNoteHide,
         () => a.beforeCommandExecuted((h) => {
-          if (h.id === w.id) {
-            const e = c.get(g), { unitId: t, sheetId: o, row: r, col: i } = h.params, s = e.getNote(t, o, r, i);
-            if (!(s != null && s.show)) return;
-            const n = this.getSheetTarget(t, o);
-            if (!n)
-              return;
-            const { workbook: d, worksheet: l } = n;
+          if (h.id === m.id) {
+            const e = E(n.get(v));
+            if (!e) return;
+            const { unitId: s, subUnitId: r } = e, t = this.getUniverSheet(s);
+            if (!t) return;
+            const o = t.getSheetBySheetId(r);
+            if (!o) return;
+            const i = n.get(p).getCurrentLastSelection();
+            if (!(i != null && i.primary)) return;
+            const l = n.get(c), { actualColumn: S, actualRow: u } = i.primary, N = l.getNote(s, r, { row: u, col: S });
+            if (!N || !N.show) return;
             if (this.fireEvent(this.Event.BeforeSheetNoteHide, {
-              workbook: d,
-              worksheet: l,
-              row: r,
-              col: i
+              workbook: t,
+              worksheet: o,
+              row: u,
+              col: S
             }))
-              throw new N();
+              throw new g();
           }
         })
       )
     );
   }
 }
-m.extend(C);
-class M extends v {
+I.extend(T);
+class A extends b {
   getNotes() {
-    const a = this._injector.get(g).getSheetNotes(this.getWorkbook().getUnitId(), this.getSheetId()), h = [];
-    return a == null || a.forValue((e, t, o) => {
-      h.push({
-        ...o,
-        row: e,
-        col: t
-      });
-    }), h;
+    const a = this._injector.get(c).getSheetNotes(this.getWorkbook().getUnitId(), this.getSheetId());
+    return a ? Array.from(a.values()).map((h) => ({ ...h })) : [];
   }
 }
-v.extend(M);
+b.extend(A);
 export {
-  x as FSheetNoteEvent,
-  U as FSheetsNoteRangeMixin,
-  M as FSheetsNoteWorksheet,
-  C as FUniverSheetNoteMixin
+  y as FSheetNoteEvent,
+  W as FSheetsNoteRangeMixin,
+  A as FSheetsNoteWorksheet,
+  T as FUniverSheetNoteMixin
 };