@univerjs/sheets-note 0.25.1 → 1.0.0-alpha.1

package/lib/cjs/facade.js

@@ -83,7 +83,10 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 			return injector.get(_univerjs_sheets_note.SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && !change.oldNote && change.newNote) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -101,7 +104,10 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 			return injector.get(_univerjs_sheets_note.SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && !change.newNote) {
 					const { unitId, subUnitId, oldNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -119,7 +125,10 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 			return injector.get(_univerjs_sheets_note.SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote) {
 					const { unitId, subUnitId, oldNote, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -138,7 +147,10 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 			return injector.get(_univerjs_sheets_note.SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && !change.oldNote.show && change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -155,7 +167,10 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 			return injector.get(_univerjs_sheets_note.SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && change.oldNote.show && !change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -170,15 +185,16 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 		}));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteAdd, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets_note.SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				if (injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				if (injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, subUnitId, {
 					noteId: note.id,
 					row,
 					col
 				})) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -191,16 +207,17 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteDelete, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets_note.SheetDeleteNoteCommand.id) {
-				const { unitId, sheetId, row, col } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				if (row === void 0 || col === void 0) return;
-				const oldNote = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, sheetId, {
+				const selection = injector.get(_univerjs_sheets.SheetsSelectionsService).getCurrentLastSelection();
+				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const oldNote = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -213,15 +230,16 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteUpdate, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets_note.SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				const oldNote = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				const oldNote = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -235,54 +253,44 @@ var FUniverSheetsNoteMixin = class extends _univerjs_core_facade.FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteShow, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets_note.SheetToggleNotePopupCommand.id) {
-				const target = (0, _univerjs_sheets.getSheetCommandTarget)(injector.get(_univerjs_core.IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(_univerjs_sheets.SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(_univerjs_sheets_note.SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteShow, eventParams)) throw new _univerjs_core.CanceledError();
 			}
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteHide, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === _univerjs_sheets_note.SheetToggleNotePopupCommand.id) {
-				const target = (0, _univerjs_sheets.getSheetCommandTarget)(injector.get(_univerjs_core.IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(_univerjs_sheets.SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(_univerjs_sheets_note.SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(_univerjs_sheets_note.SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || !note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteHide, eventParams)) throw new _univerjs_core.CanceledError();
 			}

package/lib/cjs/index.js

@@ -3,7 +3,7 @@ let _univerjs_core = require("@univerjs/core");
 let _univerjs_sheets = require("@univerjs/sheets");
 let rxjs = require("rxjs");
 
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -14,7 +14,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -27,14 +27,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -441,7 +441,7 @@ const SheetUpdateNoteCommand = {
 const PLUGIN_NAME = "SHEET_NOTE_PLUGIN";
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -449,7 +449,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -617,7 +617,7 @@ SheetsNoteResourceController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-note";
-var version = "0.25.1";
+var version = "1.0.0-alpha.1";
 
 //#endregion
 //#region src/config/config.ts

package/lib/es/facade.js

@@ -1,8 +1,8 @@
 import { FEventName, FUniver } from "@univerjs/core/facade";
 import { RemoveNoteMutation, SheetDeleteNoteCommand, SheetToggleNotePopupCommand, SheetUpdateNoteCommand, SheetsNoteModel, UpdateNoteMutation } from "@univerjs/sheets-note";
 import { FRange, FWorksheet } from "@univerjs/sheets/facade";
-import { CanceledError, ICommandService, IUniverInstanceService } from "@univerjs/core";
-import { SheetsSelectionsService, getSheetCommandTarget } from "@univerjs/sheets";
+import { CanceledError, ICommandService } from "@univerjs/core";
+import { SheetsSelectionsService } from "@univerjs/sheets";
 
 //#region src/facade/f-event.ts
 /**
@@ -82,7 +82,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && !change.oldNote && change.newNote) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -100,7 +103,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && !change.newNote) {
 					const { unitId, subUnitId, oldNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -118,7 +124,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote) {
 					const { unitId, subUnitId, oldNote, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -137,7 +146,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && !change.oldNote.show && change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -154,7 +166,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && change.oldNote.show && !change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -169,15 +184,16 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		}));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteAdd, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				if (injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				if (injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					noteId: note.id,
 					row,
 					col
 				})) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -190,16 +206,17 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteDelete, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetDeleteNoteCommand.id) {
-				const { unitId, sheetId, row, col } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				if (row === void 0 || col === void 0) return;
-				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
+				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -212,15 +229,16 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteUpdate, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -234,54 +252,44 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteShow, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetToggleNotePopupCommand.id) {
-				const target = getSheetCommandTarget(injector.get(IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteShow, eventParams)) throw new CanceledError();
 			}
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteHide, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetToggleNotePopupCommand.id) {
-				const target = getSheetCommandTarget(injector.get(IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || !note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteHide, eventParams)) throw new CanceledError();
 			}

package/lib/es/index.js

@@ -2,7 +2,7 @@ import { CommandType, DependentOn, Disposable, ICommandService, IConfigService,
 import { CopySheetCommand, RefRangeService, RemoveSheetCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, getSheetCommandTarget, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
 import { Subject, filter, map } from "rxjs";
 
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -13,7 +13,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -26,14 +26,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -440,7 +440,7 @@ const SheetUpdateNoteCommand = {
 const PLUGIN_NAME = "SHEET_NOTE_PLUGIN";
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -448,7 +448,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -616,7 +616,7 @@ SheetsNoteResourceController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-note";
-var version = "0.25.1";
+var version = "1.0.0-alpha.1";
 
 //#endregion
 //#region src/config/config.ts

package/lib/facade.js

@@ -1,8 +1,8 @@
 import { FEventName, FUniver } from "@univerjs/core/facade";
 import { RemoveNoteMutation, SheetDeleteNoteCommand, SheetToggleNotePopupCommand, SheetUpdateNoteCommand, SheetsNoteModel, UpdateNoteMutation } from "@univerjs/sheets-note";
 import { FRange, FWorksheet } from "@univerjs/sheets/facade";
-import { CanceledError, ICommandService, IUniverInstanceService } from "@univerjs/core";
-import { SheetsSelectionsService, getSheetCommandTarget } from "@univerjs/sheets";
+import { CanceledError, ICommandService } from "@univerjs/core";
+import { SheetsSelectionsService } from "@univerjs/sheets";
 
 //#region src/facade/f-event.ts
 /**
@@ -82,7 +82,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && !change.oldNote && change.newNote) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -100,7 +103,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && !change.newNote) {
 					const { unitId, subUnitId, oldNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -118,7 +124,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote) {
 					const { unitId, subUnitId, oldNote, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -137,7 +146,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && !change.oldNote.show && change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -154,7 +166,10 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 			return injector.get(SheetsNoteModel).change$.subscribe((change) => {
 				if (change.type === "update" && change.oldNote && change.newNote && change.oldNote.show && !change.newNote.show) {
 					const { unitId, subUnitId, newNote } = change;
-					const target = this.getSheetTarget(unitId, subUnitId);
+					const target = this.getSheetCommandTarget({
+						unitId,
+						subUnitId
+					});
 					if (!target) return;
 					const { workbook, worksheet } = target;
 					const eventParams = {
@@ -169,15 +184,16 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		}));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteAdd, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				if (injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				if (injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					noteId: note.id,
 					row,
 					col
 				})) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -190,16 +206,17 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteDelete, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetDeleteNoteCommand.id) {
-				const { unitId, sheetId, row, col } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				if (row === void 0 || col === void 0) return;
-				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
+				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -212,15 +229,16 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteUpdate, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetUpdateNoteCommand.id) {
-				const { unitId, sheetId, row, col, note } = command.params;
-				const target = this.getSheetTarget(unitId, sheetId);
+				const params = command.params;
+				const target = this.getSheetCommandTarget(params);
 				if (!target) return;
-				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, sheetId, {
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { row, col, note } = params;
+				const oldNote = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
 					row,
 					col
 				});
 				if (!oldNote) return;
-				const { workbook, worksheet } = target;
 				const eventParams = {
 					workbook,
 					worksheet,
@@ -234,54 +252,44 @@ var FUniverSheetsNoteMixin = class extends FUniver {
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteShow, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetToggleNotePopupCommand.id) {
-				const target = getSheetCommandTarget(injector.get(IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteShow, eventParams)) throw new CanceledError();
 			}
 		})));
 		this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteHide, () => commandService.beforeCommandExecuted((command) => {
 			if (command.id === SheetToggleNotePopupCommand.id) {
-				const target = getSheetCommandTarget(injector.get(IUniverInstanceService));
+				const target = this.getSheetCommandTarget();
 				if (!target) return;
-				const { unitId, subUnitId } = target;
-				const workbook = this.getUniverSheet(unitId);
-				if (!workbook) return;
-				const worksheet = workbook.getSheetBySheetId(subUnitId);
-				if (!worksheet) return;
 				const selection = injector.get(SheetsSelectionsService).getCurrentLastSelection();
 				if (!(selection === null || selection === void 0 ? void 0 : selection.primary)) return;
-				const sheetsNoteModel = injector.get(SheetsNoteModel);
-				const { actualColumn, actualRow } = selection.primary;
-				const note = sheetsNoteModel.getNote(unitId, subUnitId, {
-					row: actualRow,
-					col: actualColumn
+				const { workbook, worksheet, unitId, subUnitId } = target;
+				const { actualRow: row, actualColumn: col } = selection.primary;
+				const note = injector.get(SheetsNoteModel).getNote(unitId, subUnitId, {
+					row,
+					col
 				});
 				if (!note || !note.show) return;
 				const eventParams = {
 					workbook,
 					worksheet,
-					row: actualRow,
-					col: actualColumn
+					row,
+					col
 				};
 				if (this.fireEvent(this.Event.BeforeSheetNoteHide, eventParams)) throw new CanceledError();
 			}

package/lib/index.js

@@ -2,7 +2,7 @@ import { CommandType, DependentOn, Disposable, ICommandService, IConfigService,
 import { CopySheetCommand, RefRangeService, RemoveSheetCommand, SheetInterceptorService, SheetsSelectionsService, UniverSheetsPlugin, getSheetCommandTarget, handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests } from "@univerjs/sheets";
 import { Subject, filter, map } from "rxjs";
 
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -13,7 +13,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -26,14 +26,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -440,7 +440,7 @@ const SheetUpdateNoteCommand = {
 const PLUGIN_NAME = "SHEET_NOTE_PLUGIN";
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -448,7 +448,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.133.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
 function __decorate(decorators, target, key, desc) {
 	var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
 	if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
@@ -616,7 +616,7 @@ SheetsNoteResourceController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-note";
-var version = "0.25.1";
+var version = "1.0.0-alpha.1";
 
 //#endregion
 //#region src/config/config.ts

package/lib/types/facade/f-range.d.ts

@@ -16,6 +16,13 @@
 import type { Nullable } from '@univerjs/core';
 import type { ISheetNote } from '@univerjs/sheets-note';
 import { FRange } from '@univerjs/sheets/facade';
+export interface ICreateOrUpdateNoteOptions {
+    id?: string;
+    width: number;
+    height: number;
+    note: string;
+    show?: boolean;
+}
 /**
  * @ignore
  */
@@ -36,7 +43,7 @@ export interface IFRangeSheetsNoteMixin {
     getNote(): Nullable<ISheetNote>;
     /**
      * Create or update the annotation of the top-left cell in the range
-     * @param {ISheetNote} note The annotation to create or update
+     * @param {ICreateOrUpdateNoteOptions} note The annotation to create or update
      * @returns {FRange} This range for method chaining
      * @example
      * ```ts
@@ -52,7 +59,7 @@ export interface IFRangeSheetsNoteMixin {
      * });
      * ```
      */
-    createOrUpdateNote(note: ISheetNote): FRange;
+    createOrUpdateNote(note: ICreateOrUpdateNoteOptions): FRange;
     /**
      * Delete the annotation of the top-left cell in the range
      * @returns {FRange} This range for method chaining
@@ -74,7 +81,7 @@ export interface IFRangeSheetsNoteMixin {
     deleteNote(): FRange;
 }
 export declare class FRangeSheetsNoteMixin extends FRange implements IFRangeSheetsNoteMixin {
-    createOrUpdateNote(note: ISheetNote): FRange;
+    createOrUpdateNote(note: ICreateOrUpdateNoteOptions): FRange;
     deleteNote(): FRange;
     getNote(): Nullable<ISheetNote>;
 }

package/lib/umd/facade.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core/facade"),require("@univerjs/sheets-note"),require("@univerjs/sheets/facade"),require("@univerjs/core"),require("@univerjs/sheets")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core/facade`,`@univerjs/sheets-note`,`@univerjs/sheets/facade`,`@univerjs/core`,`@univerjs/sheets`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsNoteFacade={},e.UniverCoreFacade,e.UniverSheetsNote,e.UniverSheetsFacade,e.UniverCore,e.UniverSheets))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});var o=class extends t.FEventName{get SheetNoteAdd(){return`SheetNoteAdd`}get SheetNoteDelete(){return`SheetNoteDelete`}get SheetNoteUpdate(){return`SheetNoteUpdate`}get SheetNoteShow(){return`SheetNoteShow`}get SheetNoteHide(){return`SheetNoteHide`}get BeforeSheetNoteAdd(){return`BeforeSheetNoteAdd`}get BeforeSheetNoteDelete(){return`BeforeSheetNoteDelete`}get BeforeSheetNoteUpdate(){return`BeforeSheetNoteUpdate`}get BeforeSheetNoteShow(){return`BeforeSheetNoteShow`}get BeforeSheetNoteHide(){return`BeforeSheetNoteHide`}};t.FEventName.extend(o);var s=class extends r.FRange{createOrUpdateNote(e){return this._commandService.syncExecuteCommand(n.UpdateNoteMutation.id,{unitId:this.getUnitId(),sheetId:this.getSheetId(),row:this.getRow(),col:this.getColumn(),note:e}),this}deleteNote(){return this._commandService.syncExecuteCommand(n.RemoveNoteMutation.id,{unitId:this.getUnitId(),sheetId:this.getSheetId(),row:this.getRow(),col:this.getColumn()}),this}getNote(){return this._injector.get(n.SheetsNoteModel).getNote(this.getUnitId(),this.getSheetId(),{row:this.getRow(),col:this.getColumn()})}};r.FRange.extend(s);var c=class extends t.FUniver{_initialize(e){let t=e.get(i.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteAdd,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&!e.oldNote&&e.newNote){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetTarget(t,n);if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col,note:r};this.fireEvent(this.Event.SheetNoteAdd,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteDelete,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&!e.newNote){let{unitId:t,subUnitId:n,oldNote:r}=e,i=this.getSheetTarget(t,n);if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col,oldNote:r};this.fireEvent(this.Event.SheetNoteDelete,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteUpdate,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote){let{unitId:t,subUnitId:n,oldNote:r,newNote:i}=e,a=this.getSheetTarget(t,n);if(!a)return;let{workbook:o,worksheet:s}=a,c={workbook:o,worksheet:s,row:i.row,col:i.col,note:i,oldNote:r};this.fireEvent(this.Event.SheetNoteUpdate,c)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteShow,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote&&!e.oldNote.show&&e.newNote.show){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetTarget(t,n);if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col};this.fireEvent(this.Event.SheetNoteShow,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteHide,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote&&e.oldNote.show&&!e.newNote.show){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetTarget(t,n);if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col};this.fireEvent(this.Event.SheetNoteHide,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteAdd,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetUpdateNoteCommand.id){let{unitId:r,sheetId:a,row:o,col:s,note:c}=t.params,l=this.getSheetTarget(r,a);if(!l||e.get(n.SheetsNoteModel).getNote(r,a,{noteId:c.id,row:o,col:s}))return;let{workbook:u,worksheet:d}=l,f={workbook:u,worksheet:d,row:o,col:s,note:c};if(this.fireEvent(this.Event.BeforeSheetNoteAdd,f))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteDelete,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetDeleteNoteCommand.id){let{unitId:r,sheetId:a,row:o,col:s}=t.params,c=this.getSheetTarget(r,a);if(!c||o===void 0||s===void 0)return;let l=e.get(n.SheetsNoteModel).getNote(r,a,{row:o,col:s});if(!l)return;let{workbook:u,worksheet:d}=c,f={workbook:u,worksheet:d,row:o,col:s,oldNote:l};if(this.fireEvent(this.Event.BeforeSheetNoteDelete,f))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteUpdate,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetUpdateNoteCommand.id){let{unitId:r,sheetId:a,row:o,col:s,note:c}=t.params,l=this.getSheetTarget(r,a);if(!l)return;let u=e.get(n.SheetsNoteModel).getNote(r,a,{row:o,col:s});if(!u)return;let{workbook:d,worksheet:f}=l,p={workbook:d,worksheet:f,row:o,col:s,note:c,oldNote:u};if(this.fireEvent(this.Event.BeforeSheetNoteUpdate,p))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteShow,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetToggleNotePopupCommand.id){let t=(0,a.getSheetCommandTarget)(e.get(i.IUniverInstanceService));if(!t)return;let{unitId:r,subUnitId:o}=t,s=this.getUniverSheet(r);if(!s)return;let c=s.getSheetBySheetId(o);if(!c)return;let l=e.get(a.SheetsSelectionsService).getCurrentLastSelection();if(!(l!=null&&l.primary))return;let u=e.get(n.SheetsNoteModel),{actualColumn:d,actualRow:f}=l.primary,p=u.getNote(r,o,{row:f,col:d});if(!p||p.show)return;let m={workbook:s,worksheet:c,row:f,col:d};if(this.fireEvent(this.Event.BeforeSheetNoteShow,m))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteHide,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetToggleNotePopupCommand.id){let t=(0,a.getSheetCommandTarget)(e.get(i.IUniverInstanceService));if(!t)return;let{unitId:r,subUnitId:o}=t,s=this.getUniverSheet(r);if(!s)return;let c=s.getSheetBySheetId(o);if(!c)return;let l=e.get(a.SheetsSelectionsService).getCurrentLastSelection();if(!(l!=null&&l.primary))return;let u=e.get(n.SheetsNoteModel),{actualColumn:d,actualRow:f}=l.primary,p=u.getNote(r,o,{row:f,col:d});if(!p||!p.show)return;let m={workbook:s,worksheet:c,row:f,col:d};if(this.fireEvent(this.Event.BeforeSheetNoteHide,m))throw new i.CanceledError}})))}};t.FUniver.extend(c);var l=class extends r.FWorksheet{getNotes(){let e=this._injector.get(n.SheetsNoteModel).getSheetNotes(this.getWorkbook().getUnitId(),this.getSheetId());return e?Array.from(e.values()).map(e=>({...e})):[]}};r.FWorksheet.extend(l),e.FRangeSheetsNoteMixin=s,e.FSheetsNoteEventNameMixin=o,e.FUniverSheetsNoteMixin=c,e.FWorksheetNoteMixin=l});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core/facade"),require("@univerjs/sheets-note"),require("@univerjs/sheets/facade"),require("@univerjs/core"),require("@univerjs/sheets")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core/facade`,`@univerjs/sheets-note`,`@univerjs/sheets/facade`,`@univerjs/core`,`@univerjs/sheets`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsNoteFacade={},e.UniverCoreFacade,e.UniverSheetsNote,e.UniverSheetsFacade,e.UniverCore,e.UniverSheets))})(this,function(e,t,n,r,i,a){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});var o=class extends t.FEventName{get SheetNoteAdd(){return`SheetNoteAdd`}get SheetNoteDelete(){return`SheetNoteDelete`}get SheetNoteUpdate(){return`SheetNoteUpdate`}get SheetNoteShow(){return`SheetNoteShow`}get SheetNoteHide(){return`SheetNoteHide`}get BeforeSheetNoteAdd(){return`BeforeSheetNoteAdd`}get BeforeSheetNoteDelete(){return`BeforeSheetNoteDelete`}get BeforeSheetNoteUpdate(){return`BeforeSheetNoteUpdate`}get BeforeSheetNoteShow(){return`BeforeSheetNoteShow`}get BeforeSheetNoteHide(){return`BeforeSheetNoteHide`}};t.FEventName.extend(o);var s=class extends r.FRange{createOrUpdateNote(e){return this._commandService.syncExecuteCommand(n.UpdateNoteMutation.id,{unitId:this.getUnitId(),sheetId:this.getSheetId(),row:this.getRow(),col:this.getColumn(),note:e}),this}deleteNote(){return this._commandService.syncExecuteCommand(n.RemoveNoteMutation.id,{unitId:this.getUnitId(),sheetId:this.getSheetId(),row:this.getRow(),col:this.getColumn()}),this}getNote(){return this._injector.get(n.SheetsNoteModel).getNote(this.getUnitId(),this.getSheetId(),{row:this.getRow(),col:this.getColumn()})}};r.FRange.extend(s);var c=class extends t.FUniver{_initialize(e){let t=e.get(i.ICommandService);this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteAdd,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&!e.oldNote&&e.newNote){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetCommandTarget({unitId:t,subUnitId:n});if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col,note:r};this.fireEvent(this.Event.SheetNoteAdd,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteDelete,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&!e.newNote){let{unitId:t,subUnitId:n,oldNote:r}=e,i=this.getSheetCommandTarget({unitId:t,subUnitId:n});if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col,oldNote:r};this.fireEvent(this.Event.SheetNoteDelete,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteUpdate,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote){let{unitId:t,subUnitId:n,oldNote:r,newNote:i}=e,a=this.getSheetCommandTarget({unitId:t,subUnitId:n});if(!a)return;let{workbook:o,worksheet:s}=a,c={workbook:o,worksheet:s,row:i.row,col:i.col,note:i,oldNote:r};this.fireEvent(this.Event.SheetNoteUpdate,c)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteShow,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote&&!e.oldNote.show&&e.newNote.show){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetCommandTarget({unitId:t,subUnitId:n});if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col};this.fireEvent(this.Event.SheetNoteShow,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.SheetNoteHide,()=>e.get(n.SheetsNoteModel).change$.subscribe(e=>{if(e.type===`update`&&e.oldNote&&e.newNote&&e.oldNote.show&&!e.newNote.show){let{unitId:t,subUnitId:n,newNote:r}=e,i=this.getSheetCommandTarget({unitId:t,subUnitId:n});if(!i)return;let{workbook:a,worksheet:o}=i,s={workbook:a,worksheet:o,row:r.row,col:r.col};this.fireEvent(this.Event.SheetNoteHide,s)}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteAdd,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetUpdateNoteCommand.id){let r=t.params,a=this.getSheetCommandTarget(r);if(!a)return;let{workbook:o,worksheet:s,unitId:c,subUnitId:l}=a,{row:u,col:d,note:f}=r;if(e.get(n.SheetsNoteModel).getNote(c,l,{noteId:f.id,row:u,col:d}))return;let p={workbook:o,worksheet:s,row:u,col:d,note:f};if(this.fireEvent(this.Event.BeforeSheetNoteAdd,p))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteDelete,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetDeleteNoteCommand.id){let t=this.getSheetCommandTarget();if(!t)return;let r=e.get(a.SheetsSelectionsService).getCurrentLastSelection();if(!(r!=null&&r.primary))return;let{workbook:o,worksheet:s,unitId:c,subUnitId:l}=t,{actualRow:u,actualColumn:d}=r.primary,f=e.get(n.SheetsNoteModel).getNote(c,l,{row:u,col:d});if(!f)return;let p={workbook:o,worksheet:s,row:u,col:d,oldNote:f};if(this.fireEvent(this.Event.BeforeSheetNoteDelete,p))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteUpdate,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetUpdateNoteCommand.id){let r=t.params,a=this.getSheetCommandTarget(r);if(!a)return;let{workbook:o,worksheet:s,unitId:c,subUnitId:l}=a,{row:u,col:d,note:f}=r,p=e.get(n.SheetsNoteModel).getNote(c,l,{row:u,col:d});if(!p)return;let m={workbook:o,worksheet:s,row:u,col:d,note:f,oldNote:p};if(this.fireEvent(this.Event.BeforeSheetNoteUpdate,m))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteShow,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetToggleNotePopupCommand.id){let t=this.getSheetCommandTarget();if(!t)return;let r=e.get(a.SheetsSelectionsService).getCurrentLastSelection();if(!(r!=null&&r.primary))return;let{workbook:o,worksheet:s,unitId:c,subUnitId:l}=t,{actualRow:u,actualColumn:d}=r.primary,f=e.get(n.SheetsNoteModel).getNote(c,l,{row:u,col:d});if(!f||f.show)return;let p={workbook:o,worksheet:s,row:u,col:d};if(this.fireEvent(this.Event.BeforeSheetNoteShow,p))throw new i.CanceledError}}))),this.disposeWithMe(this.registerEventHandler(this.Event.BeforeSheetNoteHide,()=>t.beforeCommandExecuted(t=>{if(t.id===n.SheetToggleNotePopupCommand.id){let t=this.getSheetCommandTarget();if(!t)return;let r=e.get(a.SheetsSelectionsService).getCurrentLastSelection();if(!(r!=null&&r.primary))return;let{workbook:o,worksheet:s,unitId:c,subUnitId:l}=t,{actualRow:u,actualColumn:d}=r.primary,f=e.get(n.SheetsNoteModel).getNote(c,l,{row:u,col:d});if(!f||!f.show)return;let p={workbook:o,worksheet:s,row:u,col:d};if(this.fireEvent(this.Event.BeforeSheetNoteHide,p))throw new i.CanceledError}})))}};t.FUniver.extend(c);var l=class extends r.FWorksheet{getNotes(){let e=this._injector.get(n.SheetsNoteModel).getSheetNotes(this.getWorkbook().getUnitId(),this.getSheetId());return e?Array.from(e.values()).map(e=>({...e})):[]}};r.FWorksheet.extend(l),e.FRangeSheetsNoteMixin=s,e.FSheetsNoteEventNameMixin=o,e.FUniverSheetsNoteMixin=c,e.FWorksheetNoteMixin=l});

package/lib/umd/index.js

@@ -1 +1 @@
-(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsNote={},e.UniverCore,e.UniverSheets,e.rxjs))})(this,function(e,t,n,r){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function i(e){"@babel/helpers - typeof";return i=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},i(e)}function a(e,t){if(i(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(i(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function o(e){var t=a(e,`string`);return i(t)==`symbol`?t:t+``}function s(e,t,n){return(t=o(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var c=class extends t.Disposable{constructor(...e){super(...e),s(this,`_notesMap`,new Map),s(this,`_change$`,new r.Subject),s(this,`change$`,this._change$.asObservable())}_ensureNotesMap(e,t){let n=this._notesMap.get(e);n||(n=new Map,this._notesMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_getNoteByPosition(e,t,n,r){let i=this._ensureNotesMap(e,t);for(let[e,t]of i)if(t.row===n&&t.col===r)return t}_getNoteById(e,t,n){return this._ensureNotesMap(e,t).get(n)}_getNoteByParams(e,t,n){let{noteId:r,row:i,col:a}=n;return r?this._getNoteById(e,t,r):i!==void 0&&a!==void 0?this._getNoteByPosition(e,t,i,a):null}getSheetShowNotes$(e,t){return this._change$.pipe((0,r.filter)(({unitId:n,subUnitId:r})=>n===e&&r===t),(0,r.map)(()=>{let n=this._ensureNotesMap(e,t),r=[];for(let[i,a]of n)a.show&&r.push({loc:{row:a.row,col:a.col,unitId:e,subUnitId:t},note:a});return r}))}getCellNoteChange$(e,t,n,i){return this._change$.pipe((0,r.filter)(({unitId:r,subUnitId:a,oldNote:o})=>r!==e||a!==t||!o?!1:o.row===n&&o.col===i),(0,r.map)(e=>e))}updateNote(e,n,r,i,a,o){let s=this._getNoteByParams(e,n,{noteId:a==null?void 0:a.id,row:r,col:i}),c=this._ensureNotesMap(e,n),l={...a,id:(s==null?void 0:s.id)||a.id||(0,t.generateRandomId)(6),row:r,col:i};c.set(l.id,l),this._change$.next({unitId:e,subUnitId:n,oldNote:s,type:`update`,newNote:l,silent:o})}removeNote(e,t,n){let{noteId:r,row:i,col:a,silent:o}=n,s=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});s&&(this._ensureNotesMap(e,t).delete(s.id),this._change$.next({unitId:e,subUnitId:t,oldNote:s,type:`update`,newNote:null,silent:o}))}toggleNotePopup(e,t,n){let{noteId:r,row:i,col:a,silent:o}=n,s=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});if(!s)return;let c=this._ensureNotesMap(e,t),l={...s,show:!s.show};c.set(l.id,l),this._change$.next({unitId:e,subUnitId:t,oldNote:s,type:`update`,newNote:l,silent:o})}updateNotePosition(e,t,n){let{noteId:r,row:i,col:a,newRow:o,newCol:s,silent:c}=n,l=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});if(!l)return;let u=this._ensureNotesMap(e,t),d={...l,row:o,col:s};u.set(d.id,d),this._change$.next({unitId:e,subUnitId:t,oldNote:l,type:`ref`,newNote:d,silent:c})}getNote(e,t,n){return this._getNoteByParams(e,t,n)}getNotes(){return this._notesMap}getUnitNotes(e){return this._notesMap.get(e)}getSheetNotes(e,t){let n=this._notesMap.get(e);if(n)return n.get(t)}deleteUnitNotes(e){this._notesMap.delete(e)}};let l={id:`sheet.mutation.update-note`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,row:i,col:a,note:o,silent:s}=t;return e.get(c).updateNote(n,r,i,a,o,s),!0}},u={id:`sheet.mutation.remove-note`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,silent:s}=t;return e.get(c).removeNote(n,r,{noteId:i,row:a,col:o,silent:s}),!0}},d={id:`sheet.mutation.toggle-note-popup`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,silent:s}=t;return e.get(c).toggleNotePopup(n,r,{noteId:i,row:a,col:o,silent:s}),!0}},f={id:`sheet.mutation.update-note-position`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,newPosition:s,silent:l}=t;return e.get(c).updateNotePosition(n,r,{noteId:i,row:a,col:o,newRow:s.row,newCol:s.col,silent:l}),!0}},p={id:`sheet.command.delete-note`,type:t.CommandType.COMMAND,handler:e=>{let r=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService));if(!r)return!1;let i=e.get(n.SheetsSelectionsService).getCurrentLastSelection();if(!(i!=null&&i.primary))return!1;let a=e.get(c),{unitId:o,subUnitId:s}=r,{actualColumn:d,actualRow:f}=i.primary,p=a.getNote(o,s,{row:f,col:d});if(!p)return!1;let m=e.get(t.ICommandService),h=e.get(t.IUndoRedoService),g={id:u.id,params:{unitId:o,sheetId:s,noteId:p.id}},_={id:l.id,params:{unitId:o,sheetId:s,row:f,col:d,note:{...p}}};return m.syncExecuteCommand(g.id,g.params)?(h.pushUndoRedo({unitID:o,redoMutations:[g],undoMutations:[_]}),!0):!1}},m={id:`sheet.command.toggle-note-popup`,type:t.CommandType.COMMAND,handler:e=>{let r=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService));if(!r)return!1;let i=e.get(n.SheetsSelectionsService).getCurrentLastSelection();if(!(i!=null&&i.primary))return!1;let a=e.get(c),{unitId:o,subUnitId:s}=r,{actualColumn:l,actualRow:u}=i.primary,f=a.getNote(o,s,{row:u,col:l});if(!f)return!1;let p=e.get(t.ICommandService),m=e.get(t.IUndoRedoService),h={id:d.id,params:{unitId:o,sheetId:s,noteId:f.id}},g={id:d.id,params:{unitId:o,sheetId:s,noteId:f.id}};return p.syncExecuteCommand(h.id,h.params)?(m.pushUndoRedo({unitID:o,redoMutations:[h],undoMutations:[g]}),!0):!1}},h={id:`sheet.command.update-note`,type:t.CommandType.COMMAND,handler:(e,r)=>{let i=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService),r);if(!i)return!1;let a=e.get(t.ICommandService),o=e.get(t.IUndoRedoService),s=e.get(c),{unitId:d,subUnitId:f}=i,{row:p,col:m,note:h}=r,g=s.getNote(d,f,{noteId:h.id,row:p,col:m}),_={id:l.id,params:{unitId:d,sheetId:f,row:p,col:m,note:h}},v=[];if(g){let e={id:l.id,params:{unitId:d,sheetId:f,row:p,col:m,note:{...g}}};v.push(e)}else{let e={id:u.id,params:{unitId:d,sheetId:f,row:p,col:m}};v.push(e)}return a.syncExecuteCommand(_.id,_.params)?(o.pushUndoRedo({unitID:d,redoMutations:[_],undoMutations:v}),!0):!1}},g=`SHEET_NOTE_PLUGIN`;function _(e,t){return function(n,r){t(n,r,e)}}function v(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let y=class extends t.Disposable{constructor(e,t,n,r){super(),this._resourceManagerService=e,this._univerInstanceService=t,this._sheetInterceptorService=n,this._sheetsNoteModel=r,this._initSnapshot(),this._initSheetChange()}_initSnapshot(){let e=e=>{let t=this._sheetsNoteModel.getUnitNotes(e);if(!t)return``;let n={};return t.forEach((e,t)=>{let r={};e.forEach(e=>{let{row:t,col:n}=e;r[t]||(r[t]={}),r[t][n]=e}),Object.keys(r).length>0&&(n[t]=r)}),JSON.stringify(n)},n=e=>{if(!e)return{};try{return JSON.parse(e)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:g,businesses:[t.UniverInstanceType.UNIVER_SHEET],toJson:t=>e(t),parseJson:e=>n(e),onUnLoad:e=>{this._sheetsNoteModel.deleteUnitNotes(e)},onLoad:(e,t)=>{Object.entries(t).forEach(([t,n])=>{Object.entries(n).forEach(([n,r])=>{Object.entries(r).forEach(([r,i])=>{this._sheetsNoteModel.updateNote(e,t,Number(n),Number(r),i)})})})}}))}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===n.RemoveSheetCommand.id){var r;let n=e.params,i=n.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),a=n.subUnitId||((r=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:r.getSheetId());if(!i||!a)return{redos:[],undos:[]};let o=this._sheetsNoteModel.getSheetNotes(i,a);if(!o)return{redos:[],undos:[]};let s=[],c=[];return o.forEach(e=>{s.push({id:u.id,params:{unitId:i,sheetId:a,noteId:e.id,row:e.row,col:e.col}}),c.push({id:l.id,params:{unitId:i,sheetId:a,row:e.row,col:e.col,note:e}})}),{redos:s,undos:c}}else if(e.id===n.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:i}=e.params;if(!n||!r||!i)return{redos:[],undos:[]};let a=this._sheetsNoteModel.getSheetNotes(n,r);if(!a)return{redos:[],undos:[]};let o=[],s=[];return a.forEach(e=>{let r={...e,id:(0,t.generateRandomId)(6)};o.push({id:l.id,params:{unitId:n,sheetId:i,row:r.row,col:r.col,note:r}}),s.push({id:u.id,params:{unitId:n,sheetId:i,noteId:r.id,row:r.row,col:r.col}})}),{redos:o,undos:s}}return{redos:[],undos:[]}}}))}};y=v([_(0,t.IResourceManagerService),_(1,t.IUniverInstanceService),_(2,(0,t.Inject)(n.SheetInterceptorService)),_(3,(0,t.Inject)(c))],y);var b=`@univerjs/sheets-note`,x=`0.25.1`;let S={},C=class extends t.Disposable{constructor(e,t,n,r){super(),this._refRangeService=e,this._sheetsNoteModel=t,this._selectionManagerService=n,this._commandService=r,s(this,`_disposableMap`,new Map),s(this,`_watcherMap`,new Map),s(this,`_handleRangeChange`,(e,t,n,r,i,a,o)=>a?{redos:[{id:f.id,params:{unitId:e,sheetId:t,noteId:n.id,newPosition:{row:a.startRow,col:a.startColumn},silent:o}}],undos:[{id:f.id,params:{unitId:e,sheetId:t,noteId:n.id,newPosition:{row:r,col:i},note:n,silent:o}}]}:{redos:[{id:u.id,params:{unitId:e,sheetId:t,noteId:n.id}}],undos:[{id:l.id,params:{unitId:e,sheetId:t,row:r,col:i,note:n}}]}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n,r){return`${e}-${t}-${n}-${r}`}_register(e,t,r,i,a){let o={startColumn:a,endColumn:a,startRow:i,endRow:i};this._disposableMap.set(this._getIdWithUnitId(e,t,i,a),this._refRangeService.registerRefRange(o,s=>{let c=(0,n.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(o,s,{selectionManagerService:this._selectionManagerService}),l=Array.isArray(c)?c[0]:c;return l&&l.startColumn===o.startColumn&&l.startRow===o.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,r,i,a,l,!1)},e,t))}_watch(e,n,r,i,a){let o={startColumn:a,endColumn:a,startRow:i,endRow:i};this._watcherMap.set(this._getIdWithUnitId(e,n,i,a),this._refRangeService.watchRange(e,n,o,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,i.startRow,i.startColumn,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n,r){var i;let a=this._getIdWithUnitId(e,t,n,r);(i=this._watcherMap.get(a))==null||i.dispose(),this._watcherMap.delete(a)}_unregister(e,t,n,r){var i;let a=this._getIdWithUnitId(e,t,n,r);(i=this._disposableMap.get(a))==null||i.dispose(),this._disposableMap.delete(a)}_initData(){let e=this._sheetsNoteModel.getNotes();for(let[t,n]of e)for(let[e,r]of n)r.forEach(n=>{this._register(t,e,n,n.row,n.col),this._watch(t,e,n,n.row,n.col)})}_initRefRange(){this.disposeWithMe(this._sheetsNoteModel.change$.subscribe(e=>{switch(e.type){case`update`:{let{unitId:t,subUnitId:n,oldNote:r,newNote:i}=e,a=i?i.row:r.row,o=i?i.col:r.col,s=this._getIdWithUnitId(t,n,a,o);i?this._disposableMap.has(s)||(this._register(t,n,i,a,o),this._watch(t,n,i,a,o)):(this._unregister(t,n,a,o),this._unwatch(t,n,a,o));break}case`ref`:{let{unitId:t,subUnitId:n,oldNote:r,newNote:i,silent:a}=e,{row:o,col:s}=r,{row:c,col:l}=i;this._unregister(t,n,o,s),a||(this._unwatch(t,n,o,s),this._watch(t,n,i,c,l)),this._register(t,n,i,c,l);break}}}))}};C=v([_(0,(0,t.Inject)(n.RefRangeService)),_(1,(0,t.Inject)(c)),_(2,(0,t.Inject)(n.SheetsSelectionsService)),_(3,t.ICommandService)],C);let w=class extends t.Disposable{constructor(e){super(),this._commandService=e,this._initialize()}_initialize(){[f,d,l,u,p,m,h].forEach(e=>{this.disposeWithMe(this._commandService.registerCommand(e))})}};w=v([_(0,t.ICommandService)],w);let T=class extends t.Plugin{constructor(e=S,n,r){super(),this._config=e,this._configService=n,this._injector=r;let{...i}=(0,t.merge)({},S,this._config);this._configService.setConfig(`sheets-note.config`,i)}onStarting(){[[c],[w],[y],[C]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[c],[w],[y]])}onReady(){(0,t.touchDependencies)(this._injector,[[C]])}};s(T,`pluginName`,g),s(T,`packageName`,b),s(T,`version`,x),s(T,`type`,t.UniverInstanceType.UNIVER_SHEET),T=v([(0,t.DependentOn)(n.UniverSheetsPlugin),_(1,t.IConfigService),_(2,(0,t.Inject)(t.Injector))],T),e.RemoveNoteMutation=u,e.SheetDeleteNoteCommand=p,e.SheetToggleNotePopupCommand=m,e.SheetUpdateNoteCommand=h,e.SheetsNoteModel=c,Object.defineProperty(e,"SheetsNoteResourceController",{enumerable:!0,get:function(){return y}}),e.ToggleNotePopupMutation=d,Object.defineProperty(e,"UniverSheetsNotePlugin",{enumerable:!0,get:function(){return T}}),e.UpdateNoteMutation=l,e.UpdateNotePositionMutation=f});
+(function(e,t){typeof exports==`object`&&typeof module<`u`?t(exports,require("@univerjs/core"),require("@univerjs/sheets"),require("rxjs")):typeof define==`function`&&define.amd?define([`exports`,`@univerjs/core`,`@univerjs/sheets`,`rxjs`],t):(e=typeof globalThis<`u`?globalThis:e||self,t(e.UniverSheetsNote={},e.UniverCore,e.UniverSheets,e.rxjs))})(this,function(e,t,n,r){Object.defineProperty(e,Symbol.toStringTag,{value:`Module`});function i(e){"@babel/helpers - typeof";return i=typeof Symbol==`function`&&typeof Symbol.iterator==`symbol`?function(e){return typeof e}:function(e){return e&&typeof Symbol==`function`&&e.constructor===Symbol&&e!==Symbol.prototype?`symbol`:typeof e},i(e)}function a(e,t){if(i(e)!=`object`||!e)return e;var n=e[Symbol.toPrimitive];if(n!==void 0){var r=n.call(e,t||`default`);if(i(r)!=`object`)return r;throw TypeError(`@@toPrimitive must return a primitive value.`)}return(t===`string`?String:Number)(e)}function o(e){var t=a(e,`string`);return i(t)==`symbol`?t:t+``}function s(e,t,n){return(t=o(t))in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}var c=class extends t.Disposable{constructor(...e){super(...e),s(this,`_notesMap`,new Map),s(this,`_change$`,new r.Subject),s(this,`change$`,this._change$.asObservable())}_ensureNotesMap(e,t){let n=this._notesMap.get(e);n||(n=new Map,this._notesMap.set(e,n));let r=n.get(t);return r||(r=new Map,n.set(t,r)),r}_getNoteByPosition(e,t,n,r){let i=this._ensureNotesMap(e,t);for(let[e,t]of i)if(t.row===n&&t.col===r)return t}_getNoteById(e,t,n){return this._ensureNotesMap(e,t).get(n)}_getNoteByParams(e,t,n){let{noteId:r,row:i,col:a}=n;return r?this._getNoteById(e,t,r):i!==void 0&&a!==void 0?this._getNoteByPosition(e,t,i,a):null}getSheetShowNotes$(e,t){return this._change$.pipe((0,r.filter)(({unitId:n,subUnitId:r})=>n===e&&r===t),(0,r.map)(()=>{let n=this._ensureNotesMap(e,t),r=[];for(let[i,a]of n)a.show&&r.push({loc:{row:a.row,col:a.col,unitId:e,subUnitId:t},note:a});return r}))}getCellNoteChange$(e,t,n,i){return this._change$.pipe((0,r.filter)(({unitId:r,subUnitId:a,oldNote:o})=>r!==e||a!==t||!o?!1:o.row===n&&o.col===i),(0,r.map)(e=>e))}updateNote(e,n,r,i,a,o){let s=this._getNoteByParams(e,n,{noteId:a==null?void 0:a.id,row:r,col:i}),c=this._ensureNotesMap(e,n),l={...a,id:(s==null?void 0:s.id)||a.id||(0,t.generateRandomId)(6),row:r,col:i};c.set(l.id,l),this._change$.next({unitId:e,subUnitId:n,oldNote:s,type:`update`,newNote:l,silent:o})}removeNote(e,t,n){let{noteId:r,row:i,col:a,silent:o}=n,s=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});s&&(this._ensureNotesMap(e,t).delete(s.id),this._change$.next({unitId:e,subUnitId:t,oldNote:s,type:`update`,newNote:null,silent:o}))}toggleNotePopup(e,t,n){let{noteId:r,row:i,col:a,silent:o}=n,s=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});if(!s)return;let c=this._ensureNotesMap(e,t),l={...s,show:!s.show};c.set(l.id,l),this._change$.next({unitId:e,subUnitId:t,oldNote:s,type:`update`,newNote:l,silent:o})}updateNotePosition(e,t,n){let{noteId:r,row:i,col:a,newRow:o,newCol:s,silent:c}=n,l=this._getNoteByParams(e,t,{noteId:r,row:i,col:a});if(!l)return;let u=this._ensureNotesMap(e,t),d={...l,row:o,col:s};u.set(d.id,d),this._change$.next({unitId:e,subUnitId:t,oldNote:l,type:`ref`,newNote:d,silent:c})}getNote(e,t,n){return this._getNoteByParams(e,t,n)}getNotes(){return this._notesMap}getUnitNotes(e){return this._notesMap.get(e)}getSheetNotes(e,t){let n=this._notesMap.get(e);if(n)return n.get(t)}deleteUnitNotes(e){this._notesMap.delete(e)}};let l={id:`sheet.mutation.update-note`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,row:i,col:a,note:o,silent:s}=t;return e.get(c).updateNote(n,r,i,a,o,s),!0}},u={id:`sheet.mutation.remove-note`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,silent:s}=t;return e.get(c).removeNote(n,r,{noteId:i,row:a,col:o,silent:s}),!0}},d={id:`sheet.mutation.toggle-note-popup`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,silent:s}=t;return e.get(c).toggleNotePopup(n,r,{noteId:i,row:a,col:o,silent:s}),!0}},f={id:`sheet.mutation.update-note-position`,type:t.CommandType.MUTATION,handler:(e,t)=>{let{unitId:n,sheetId:r,noteId:i,row:a,col:o,newPosition:s,silent:l}=t;return e.get(c).updateNotePosition(n,r,{noteId:i,row:a,col:o,newRow:s.row,newCol:s.col,silent:l}),!0}},p={id:`sheet.command.delete-note`,type:t.CommandType.COMMAND,handler:e=>{let r=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService));if(!r)return!1;let i=e.get(n.SheetsSelectionsService).getCurrentLastSelection();if(!(i!=null&&i.primary))return!1;let a=e.get(c),{unitId:o,subUnitId:s}=r,{actualColumn:d,actualRow:f}=i.primary,p=a.getNote(o,s,{row:f,col:d});if(!p)return!1;let m=e.get(t.ICommandService),h=e.get(t.IUndoRedoService),g={id:u.id,params:{unitId:o,sheetId:s,noteId:p.id}},_={id:l.id,params:{unitId:o,sheetId:s,row:f,col:d,note:{...p}}};return m.syncExecuteCommand(g.id,g.params)?(h.pushUndoRedo({unitID:o,redoMutations:[g],undoMutations:[_]}),!0):!1}},m={id:`sheet.command.toggle-note-popup`,type:t.CommandType.COMMAND,handler:e=>{let r=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService));if(!r)return!1;let i=e.get(n.SheetsSelectionsService).getCurrentLastSelection();if(!(i!=null&&i.primary))return!1;let a=e.get(c),{unitId:o,subUnitId:s}=r,{actualColumn:l,actualRow:u}=i.primary,f=a.getNote(o,s,{row:u,col:l});if(!f)return!1;let p=e.get(t.ICommandService),m=e.get(t.IUndoRedoService),h={id:d.id,params:{unitId:o,sheetId:s,noteId:f.id}},g={id:d.id,params:{unitId:o,sheetId:s,noteId:f.id}};return p.syncExecuteCommand(h.id,h.params)?(m.pushUndoRedo({unitID:o,redoMutations:[h],undoMutations:[g]}),!0):!1}},h={id:`sheet.command.update-note`,type:t.CommandType.COMMAND,handler:(e,r)=>{let i=(0,n.getSheetCommandTarget)(e.get(t.IUniverInstanceService),r);if(!i)return!1;let a=e.get(t.ICommandService),o=e.get(t.IUndoRedoService),s=e.get(c),{unitId:d,subUnitId:f}=i,{row:p,col:m,note:h}=r,g=s.getNote(d,f,{noteId:h.id,row:p,col:m}),_={id:l.id,params:{unitId:d,sheetId:f,row:p,col:m,note:h}},v=[];if(g){let e={id:l.id,params:{unitId:d,sheetId:f,row:p,col:m,note:{...g}}};v.push(e)}else{let e={id:u.id,params:{unitId:d,sheetId:f,row:p,col:m}};v.push(e)}return a.syncExecuteCommand(_.id,_.params)?(o.pushUndoRedo({unitID:d,redoMutations:[_],undoMutations:v}),!0):!1}},g=`SHEET_NOTE_PLUGIN`;function _(e,t){return function(n,r){t(n,r,e)}}function v(e,t,n,r){var i=arguments.length,a=i<3?t:r===null?r=Object.getOwnPropertyDescriptor(t,n):r,o;if(typeof Reflect==`object`&&typeof Reflect.decorate==`function`)a=Reflect.decorate(e,t,n,r);else for(var s=e.length-1;s>=0;s--)(o=e[s])&&(a=(i<3?o(a):i>3?o(t,n,a):o(t,n))||a);return i>3&&a&&Object.defineProperty(t,n,a),a}let y=class extends t.Disposable{constructor(e,t,n,r){super(),this._resourceManagerService=e,this._univerInstanceService=t,this._sheetInterceptorService=n,this._sheetsNoteModel=r,this._initSnapshot(),this._initSheetChange()}_initSnapshot(){let e=e=>{let t=this._sheetsNoteModel.getUnitNotes(e);if(!t)return``;let n={};return t.forEach((e,t)=>{let r={};e.forEach(e=>{let{row:t,col:n}=e;r[t]||(r[t]={}),r[t][n]=e}),Object.keys(r).length>0&&(n[t]=r)}),JSON.stringify(n)},n=e=>{if(!e)return{};try{return JSON.parse(e)}catch{return{}}};this.disposeWithMe(this._resourceManagerService.registerPluginResource({pluginName:g,businesses:[t.UniverInstanceType.UNIVER_SHEET],toJson:t=>e(t),parseJson:e=>n(e),onUnLoad:e=>{this._sheetsNoteModel.deleteUnitNotes(e)},onLoad:(e,t)=>{Object.entries(t).forEach(([t,n])=>{Object.entries(n).forEach(([n,r])=>{Object.entries(r).forEach(([r,i])=>{this._sheetsNoteModel.updateNote(e,t,Number(n),Number(r),i)})})})}}))}_initSheetChange(){this.disposeWithMe(this._sheetInterceptorService.interceptCommand({getMutations:e=>{if(e.id===n.RemoveSheetCommand.id){var r;let n=e.params,i=n.unitId||this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getUnitId(),a=n.subUnitId||((r=this._univerInstanceService.getCurrentUnitOfType(t.UniverInstanceType.UNIVER_SHEET).getActiveSheet())==null?void 0:r.getSheetId());if(!i||!a)return{redos:[],undos:[]};let o=this._sheetsNoteModel.getSheetNotes(i,a);if(!o)return{redos:[],undos:[]};let s=[],c=[];return o.forEach(e=>{s.push({id:u.id,params:{unitId:i,sheetId:a,noteId:e.id,row:e.row,col:e.col}}),c.push({id:l.id,params:{unitId:i,sheetId:a,row:e.row,col:e.col,note:e}})}),{redos:s,undos:c}}else if(e.id===n.CopySheetCommand.id){let{unitId:n,subUnitId:r,targetSubUnitId:i}=e.params;if(!n||!r||!i)return{redos:[],undos:[]};let a=this._sheetsNoteModel.getSheetNotes(n,r);if(!a)return{redos:[],undos:[]};let o=[],s=[];return a.forEach(e=>{let r={...e,id:(0,t.generateRandomId)(6)};o.push({id:l.id,params:{unitId:n,sheetId:i,row:r.row,col:r.col,note:r}}),s.push({id:u.id,params:{unitId:n,sheetId:i,noteId:r.id,row:r.row,col:r.col}})}),{redos:o,undos:s}}return{redos:[],undos:[]}}}))}};y=v([_(0,t.IResourceManagerService),_(1,t.IUniverInstanceService),_(2,(0,t.Inject)(n.SheetInterceptorService)),_(3,(0,t.Inject)(c))],y);var b=`@univerjs/sheets-note`,x=`1.0.0-alpha.1`;let S={},C=class extends t.Disposable{constructor(e,t,n,r){super(),this._refRangeService=e,this._sheetsNoteModel=t,this._selectionManagerService=n,this._commandService=r,s(this,`_disposableMap`,new Map),s(this,`_watcherMap`,new Map),s(this,`_handleRangeChange`,(e,t,n,r,i,a,o)=>a?{redos:[{id:f.id,params:{unitId:e,sheetId:t,noteId:n.id,newPosition:{row:a.startRow,col:a.startColumn},silent:o}}],undos:[{id:f.id,params:{unitId:e,sheetId:t,noteId:n.id,newPosition:{row:r,col:i},note:n,silent:o}}]}:{redos:[{id:u.id,params:{unitId:e,sheetId:t,noteId:n.id}}],undos:[{id:l.id,params:{unitId:e,sheetId:t,row:r,col:i,note:n}}]}),this._initData(),this._initRefRange()}_getIdWithUnitId(e,t,n,r){return`${e}-${t}-${n}-${r}`}_register(e,t,r,i,a){let o={startColumn:a,endColumn:a,startRow:i,endRow:i};this._disposableMap.set(this._getIdWithUnitId(e,t,i,a),this._refRangeService.registerRefRange(o,s=>{let c=(0,n.handleCommonRangeChangeWithEffectRefCommandsSkipNoInterests)(o,s,{selectionManagerService:this._selectionManagerService}),l=Array.isArray(c)?c[0]:c;return l&&l.startColumn===o.startColumn&&l.startRow===o.startRow?{undos:[],redos:[]}:this._handleRangeChange(e,t,r,i,a,l,!1)},e,t))}_watch(e,n,r,i,a){let o={startColumn:a,endColumn:a,startRow:i,endRow:i};this._watcherMap.set(this._getIdWithUnitId(e,n,i,a),this._refRangeService.watchRange(e,n,o,(i,a)=>{let{redos:o}=this._handleRangeChange(e,n,r,i.startRow,i.startColumn,a,!0);(0,t.sequenceExecuteAsync)(o,this._commandService,{onlyLocal:!0})},!0))}_unwatch(e,t,n,r){var i;let a=this._getIdWithUnitId(e,t,n,r);(i=this._watcherMap.get(a))==null||i.dispose(),this._watcherMap.delete(a)}_unregister(e,t,n,r){var i;let a=this._getIdWithUnitId(e,t,n,r);(i=this._disposableMap.get(a))==null||i.dispose(),this._disposableMap.delete(a)}_initData(){let e=this._sheetsNoteModel.getNotes();for(let[t,n]of e)for(let[e,r]of n)r.forEach(n=>{this._register(t,e,n,n.row,n.col),this._watch(t,e,n,n.row,n.col)})}_initRefRange(){this.disposeWithMe(this._sheetsNoteModel.change$.subscribe(e=>{switch(e.type){case`update`:{let{unitId:t,subUnitId:n,oldNote:r,newNote:i}=e,a=i?i.row:r.row,o=i?i.col:r.col,s=this._getIdWithUnitId(t,n,a,o);i?this._disposableMap.has(s)||(this._register(t,n,i,a,o),this._watch(t,n,i,a,o)):(this._unregister(t,n,a,o),this._unwatch(t,n,a,o));break}case`ref`:{let{unitId:t,subUnitId:n,oldNote:r,newNote:i,silent:a}=e,{row:o,col:s}=r,{row:c,col:l}=i;this._unregister(t,n,o,s),a||(this._unwatch(t,n,o,s),this._watch(t,n,i,c,l)),this._register(t,n,i,c,l);break}}}))}};C=v([_(0,(0,t.Inject)(n.RefRangeService)),_(1,(0,t.Inject)(c)),_(2,(0,t.Inject)(n.SheetsSelectionsService)),_(3,t.ICommandService)],C);let w=class extends t.Disposable{constructor(e){super(),this._commandService=e,this._initialize()}_initialize(){[f,d,l,u,p,m,h].forEach(e=>{this.disposeWithMe(this._commandService.registerCommand(e))})}};w=v([_(0,t.ICommandService)],w);let T=class extends t.Plugin{constructor(e=S,n,r){super(),this._config=e,this._configService=n,this._injector=r;let{...i}=(0,t.merge)({},S,this._config);this._configService.setConfig(`sheets-note.config`,i)}onStarting(){[[c],[w],[y],[C]].forEach(e=>{this._injector.add(e)}),(0,t.touchDependencies)(this._injector,[[c],[w],[y]])}onReady(){(0,t.touchDependencies)(this._injector,[[C]])}};s(T,`pluginName`,g),s(T,`packageName`,b),s(T,`version`,x),s(T,`type`,t.UniverInstanceType.UNIVER_SHEET),T=v([(0,t.DependentOn)(n.UniverSheetsPlugin),_(1,t.IConfigService),_(2,(0,t.Inject)(t.Injector))],T),e.RemoveNoteMutation=u,e.SheetDeleteNoteCommand=p,e.SheetToggleNotePopupCommand=m,e.SheetUpdateNoteCommand=h,e.SheetsNoteModel=c,Object.defineProperty(e,"SheetsNoteResourceController",{enumerable:!0,get:function(){return y}}),e.ToggleNotePopupMutation=d,Object.defineProperty(e,"UniverSheetsNotePlugin",{enumerable:!0,get:function(){return T}}),e.UpdateNoteMutation=l,e.UpdateNotePositionMutation=f});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@univerjs/sheets-note",
-  "version": "0.25.1",
+  "version": "1.0.0-alpha.1",
   "private": false,
   "description": "Cell note model and commands for Univer Sheets.",
   "author": "DreamNum Co., Ltd. <developer@univer.ai>",
@@ -62,17 +62,17 @@
     "rxjs": ">=7.0.0"
   },
   "dependencies": {
-    "@univerjs/core": "0.25.1",
-    "@univerjs/sheets": "0.25.1"
+    "@univerjs/sheets": "1.0.0-alpha.1",
+    "@univerjs/core": "1.0.0-alpha.1"
   },
   "devDependencies": {
     "rxjs": "^7.8.2",
     "typescript": "^6.0.3",
-    "vitest": "^4.1.7",
-    "@univerjs/engine-formula": "0.25.1",
-    "@univerjs-infra/shared": "0.25.1",
-    "@univerjs/engine-render": "0.25.1",
-    "@univerjs/network": "0.25.1"
+    "vitest": "^4.1.9",
+    "@univerjs-infra/shared": "1.0.0-alpha.1",
+    "@univerjs/engine-formula": "1.0.0-alpha.1",
+    "@univerjs/engine-render": "1.0.0-alpha.1",
+    "@univerjs/network": "1.0.0-alpha.1"
   },
   "scripts": {
     "test": "vitest run",