@univerjs/sheets-note-ui 0.25.0 → 1.0.0-alpha.0

package/lib/cjs/index.js

@@ -6,13 +6,13 @@ let _univerjs_sheets_note = require("@univerjs/sheets-note");
 let rxjs = require("rxjs");
 let _univerjs_sheets_ui = require("@univerjs/sheets-ui");
 let rxjs_operators = require("rxjs/operators");
-let _univerjs_ui = require("@univerjs/ui");
 let _univerjs_icons = require("@univerjs/icons");
+let _univerjs_ui = require("@univerjs/ui");
 let _univerjs_design = require("@univerjs/design");
 let react = require("react");
 let react_jsx_runtime = require("react/jsx-runtime");
 
-//#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);
@@ -20,7 +20,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);
@@ -105,7 +105,7 @@ SheetsCellContentController = __decorate([
 const SHEET_NOTE_COMPONENT = "SHEET_NOTE_COMPONENT";
 
 //#endregion
-//#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) {
@@ -116,7 +116,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];
@@ -129,14 +129,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,
@@ -152,24 +152,17 @@ let SheetsNotePopupService = class SheetsNotePopupService extends _univerjs_core
 	get activePopup() {
 		return this._activePopup;
 	}
-	constructor(_zenZoneService, _cellPopupManagerService) {
+	constructor(_cellPopupManagerService) {
 		super();
-		this._zenZoneService = _zenZoneService;
 		this._cellPopupManagerService = _cellPopupManagerService;
 		_defineProperty(this, "_lastPopup", null);
 		_defineProperty(this, "_activePopup", void 0);
 		_defineProperty(this, "_activePopup$", new rxjs.BehaviorSubject(null));
 		_defineProperty(this, "activePopup$", this._activePopup$.asObservable());
-		this._initZenVisible();
 		this.disposeWithMe(() => {
 			this._activePopup$.complete();
 		});
 	}
-	_initZenVisible() {
-		this.disposeWithMe(this._zenZoneService.visible$.subscribe((visible) => {
-			if (visible) this.hidePopup();
-		}));
-	}
 	dispose() {
 		super.dispose();
 		this.hidePopup();
@@ -183,7 +176,6 @@ let SheetsNotePopupService = class SheetsNotePopupService extends _univerjs_core
 			return;
 		}
 		if (this._lastPopup) this._lastPopup.dispose();
-		if (this._zenZoneService.visible) return;
 		this._activePopup = location;
 		this._activePopup$.next(location);
 		const popupDisposable = this._cellPopupManagerService.showPopup({
@@ -225,7 +217,7 @@ let SheetsNotePopupService = class SheetsNotePopupService extends _univerjs_core
 		this._activePopup$.next(this._activePopup);
 	}
 };
-SheetsNotePopupService = __decorate([__decorateParam(0, _univerjs_ui.IZenZoneService), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_sheets_ui.CellPopupManagerService))], SheetsNotePopupService);
+SheetsNotePopupService = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_sheets_ui.CellPopupManagerService))], SheetsNotePopupService);
 
 //#endregion
 //#region src/controllers/sheets-note-popup.controller.ts
@@ -345,7 +337,7 @@ SheetsNotePopupController = __decorate([
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-note-ui";
-var version = "0.25.0";
+var version = "1.0.0-alpha.0";
 
 //#endregion
 //#region src/config/config.ts
@@ -353,6 +345,152 @@ const SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY = "sheets-note-ui.config";
 const configSymbol = Symbol(SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY);
 const defaultPluginConfig = {};
 
+//#endregion
+//#region src/views/Note.tsx
+const SheetsNote = (props) => {
+	var _popup$extraProps;
+	const { popup } = props;
+	const noteModel = (0, _univerjs_ui.useDependency)(_univerjs_sheets_note.SheetsNoteModel);
+	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
+	const renderManagerService = (0, _univerjs_ui.useDependency)(_univerjs_engine_render.IRenderManagerService);
+	const notePopupService = (0, _univerjs_ui.useDependency)(SheetsNotePopupService);
+	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY);
+	const activePopup = (_popup$extraProps = popup.extraProps) === null || _popup$extraProps === void 0 ? void 0 : _popup$extraProps.location;
+	if (!activePopup) {
+		console.error("Popup extraProps or location is undefined.");
+		return null;
+	}
+	const textareaRef = (0, react.useRef)(null);
+	const currentRender = renderManagerService.getRenderById(activePopup.unitId);
+	const [note, setNote] = (0, react.useState)(null);
+	(0, react.useEffect)(() => {
+		var _ref, _note$width, _config$defaultNoteSi, _ref2, _note$height, _config$defaultNoteSi2;
+		const { unitId, subUnitId, row, col } = activePopup;
+		const note = noteModel.getNote(unitId, subUnitId, {
+			row,
+			col
+		});
+		const width = (_ref = (_note$width = note === null || note === void 0 ? void 0 : note.width) !== null && _note$width !== void 0 ? _note$width : config === null || config === void 0 || (_config$defaultNoteSi = config.defaultNoteSize) === null || _config$defaultNoteSi === void 0 ? void 0 : _config$defaultNoteSi.width) !== null && _ref !== void 0 ? _ref : 160;
+		const height = (_ref2 = (_note$height = note === null || note === void 0 ? void 0 : note.height) !== null && _note$height !== void 0 ? _note$height : config === null || config === void 0 || (_config$defaultNoteSi2 = config.defaultNoteSize) === null || _config$defaultNoteSi2 === void 0 ? void 0 : _config$defaultNoteSi2.height) !== null && _ref2 !== void 0 ? _ref2 : 72;
+		if (!note) {
+			const initNote = {
+				id: (0, _univerjs_core.generateRandomId)(6),
+				width,
+				height,
+				note: ""
+			};
+			setNote(initNote);
+			updateNote(initNote);
+		} else setNote(note);
+		if (textareaRef.current) {
+			textareaRef.current.style.width = `${width}px`;
+			textareaRef.current.style.height = `${height}px`;
+		}
+	}, [activePopup, textareaRef]);
+	(0, react.useEffect)(() => {
+		if (!activePopup || activePopup.temp || !activePopup.trigger) return;
+		if (!textareaRef.current) return;
+		const focusId = requestAnimationFrame(() => {
+			var _textareaRef$current;
+			(_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 || _textareaRef$current.focus();
+		});
+		return () => cancelAnimationFrame(focusId);
+	}, [activePopup]);
+	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
+	const updateNote = (0, _univerjs_ui.useDebounceFn)((newNote) => {
+		if (!activePopup) return;
+		const { unitId, subUnitId, row, col } = activePopup;
+		if (!commandService.syncExecuteCommand(_univerjs_sheets_note.SheetUpdateNoteCommand.id, {
+			unitId,
+			sheetId: subUnitId,
+			row,
+			col,
+			note: newNote
+		})) {
+			const oldNote = noteModel.getNote(unitId, subUnitId, {
+				noteId: newNote.id,
+				row,
+				col
+			});
+			if (oldNote) setNote(oldNote);
+			else notePopupService.hidePopup(true);
+		}
+	});
+	const handleNoteChange = (0, react.useCallback)((value) => {
+		if (!note) return;
+		if (value === note.note) return;
+		const newNote = {
+			...note,
+			note: value
+		};
+		setNote(newNote);
+		updateNote(newNote);
+	}, [note]);
+	const handleResize = (0, react.useCallback)((width, height) => {
+		if (!note) return;
+		if (width === note.width && height === note.height) return;
+		const newNote = {
+			...note,
+			width,
+			height
+		};
+		setNote(newNote);
+		updateNote(newNote);
+	}, [note]);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Textarea, {
+		ref: textareaRef,
+		"data-u-comp": "note-textarea",
+		className: (0, _univerjs_design.clsx)("univer-ml-px univer-min-h-1 univer-min-w-1 univer-bg-white !univer-text-sm univer-shadow dark:!univer-bg-gray-800"),
+		value: note === null || note === void 0 ? void 0 : note.note,
+		placeholder: localeService.t("sheets-note-ui.note.placeholder"),
+		onResize: handleResize,
+		onValueChange: handleNoteChange,
+		onWheel: (e) => {
+			if (document.activeElement !== textareaRef.current) currentRender.engine.getCanvasElement().dispatchEvent(new WheelEvent(e.type, e.nativeEvent));
+		}
+	});
+};
+
+//#endregion
+//#region src/controllers/components.controller.ts
+/**
+* Copyright 2023-present DreamNum Co., Ltd.
+*
+* Licensed under the Apache License, Version 2.0 (the "License");
+* you may not use this file except in compliance with the License.
+* You may obtain a copy of the License at
+*
+*     http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+let ComponentsController = class ComponentsController extends _univerjs_core.Disposable {
+	constructor(_componentManager, _iconManager) {
+		super();
+		this._componentManager = _componentManager;
+		this._iconManager = _iconManager;
+		this._registerComponents();
+		this._registerIcons();
+	}
+	_registerComponents() {
+		[[SHEET_NOTE_COMPONENT, SheetsNote]].forEach(([key, comp]) => {
+			this.disposeWithMe(this._componentManager.register(key, comp));
+		});
+	}
+	_registerIcons() {
+		this.disposeWithMe(this._iconManager.register({
+			AddNoteIcon: _univerjs_icons.AddNoteIcon,
+			DeleteNoteIcon: _univerjs_icons.DeleteNoteIcon,
+			HideNoteIcon: _univerjs_icons.HideNoteIcon
+		}));
+	}
+};
+ComponentsController = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_ui.ComponentManager)), __decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_ui.IconManager))], ComponentsController);
+
 //#endregion
 //#region src/controllers/sheets-note-attachment.controller.ts
 let SheetsNoteAttachmentController = class SheetsNoteAttachmentController extends _univerjs_core.Disposable {
@@ -566,113 +704,7 @@ const menuSchema = { [_univerjs_ui.ContextMenuPosition.MAIN_AREA]: { [_univerjs_
 } } };
 
 //#endregion
-//#region src/views/Note.tsx
-const SheetsNote = (props) => {
-	var _popup$extraProps;
-	const { popup } = props;
-	const noteModel = (0, _univerjs_ui.useDependency)(_univerjs_sheets_note.SheetsNoteModel);
-	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
-	const renderManagerService = (0, _univerjs_ui.useDependency)(_univerjs_engine_render.IRenderManagerService);
-	const notePopupService = (0, _univerjs_ui.useDependency)(SheetsNotePopupService);
-	const config = (0, _univerjs_ui.useConfigValue)(SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY);
-	const activePopup = (_popup$extraProps = popup.extraProps) === null || _popup$extraProps === void 0 ? void 0 : _popup$extraProps.location;
-	if (!activePopup) {
-		console.error("Popup extraProps or location is undefined.");
-		return null;
-	}
-	const textareaRef = (0, react.useRef)(null);
-	const currentRender = renderManagerService.getRenderById(activePopup.unitId);
-	const [note, setNote] = (0, react.useState)(null);
-	(0, react.useEffect)(() => {
-		var _ref, _note$width, _config$defaultNoteSi, _ref2, _note$height, _config$defaultNoteSi2;
-		const { unitId, subUnitId, row, col } = activePopup;
-		const note = noteModel.getNote(unitId, subUnitId, {
-			row,
-			col
-		});
-		const width = (_ref = (_note$width = note === null || note === void 0 ? void 0 : note.width) !== null && _note$width !== void 0 ? _note$width : config === null || config === void 0 || (_config$defaultNoteSi = config.defaultNoteSize) === null || _config$defaultNoteSi === void 0 ? void 0 : _config$defaultNoteSi.width) !== null && _ref !== void 0 ? _ref : 160;
-		const height = (_ref2 = (_note$height = note === null || note === void 0 ? void 0 : note.height) !== null && _note$height !== void 0 ? _note$height : config === null || config === void 0 || (_config$defaultNoteSi2 = config.defaultNoteSize) === null || _config$defaultNoteSi2 === void 0 ? void 0 : _config$defaultNoteSi2.height) !== null && _ref2 !== void 0 ? _ref2 : 72;
-		if (!note) {
-			const initNote = {
-				id: (0, _univerjs_core.generateRandomId)(6),
-				width,
-				height,
-				note: ""
-			};
-			setNote(initNote);
-			updateNote(initNote);
-		} else setNote(note);
-		if (textareaRef.current) {
-			textareaRef.current.style.width = `${width}px`;
-			textareaRef.current.style.height = `${height}px`;
-		}
-	}, [activePopup, textareaRef]);
-	(0, react.useEffect)(() => {
-		if (!activePopup || activePopup.temp || !activePopup.trigger) return;
-		if (!textareaRef.current) return;
-		const focusId = requestAnimationFrame(() => {
-			var _textareaRef$current;
-			(_textareaRef$current = textareaRef.current) === null || _textareaRef$current === void 0 || _textareaRef$current.focus();
-		});
-		return () => cancelAnimationFrame(focusId);
-	}, [activePopup]);
-	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
-	const updateNote = (0, _univerjs_ui.useDebounceFn)((newNote) => {
-		if (!activePopup) return;
-		const { unitId, subUnitId, row, col } = activePopup;
-		if (!commandService.syncExecuteCommand(_univerjs_sheets_note.SheetUpdateNoteCommand.id, {
-			unitId,
-			sheetId: subUnitId,
-			row,
-			col,
-			note: newNote
-		})) {
-			const oldNote = noteModel.getNote(unitId, subUnitId, {
-				noteId: newNote.id,
-				row,
-				col
-			});
-			if (oldNote) setNote(oldNote);
-			else notePopupService.hidePopup(true);
-		}
-	});
-	const handleNoteChange = (0, react.useCallback)((value) => {
-		if (!note) return;
-		if (value === note.note) return;
-		const newNote = {
-			...note,
-			note: value
-		};
-		setNote(newNote);
-		updateNote(newNote);
-	}, [note]);
-	const handleResize = (0, react.useCallback)((width, height) => {
-		if (!note) return;
-		if (width === note.width && height === note.height) return;
-		const newNote = {
-			...note,
-			width,
-			height
-		};
-		setNote(newNote);
-		updateNote(newNote);
-	}, [note]);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Textarea, {
-		ref: textareaRef,
-		"data-u-comp": "note-textarea",
-		className: (0, _univerjs_design.clsx)("univer-ml-px univer-min-h-1 univer-min-w-1 univer-bg-white !univer-text-sm univer-shadow dark:!univer-bg-gray-800"),
-		value: note === null || note === void 0 ? void 0 : note.note,
-		placeholder: localeService.t("sheets-note-ui.note.placeholder"),
-		onResize: handleResize,
-		onValueChange: handleNoteChange,
-		onWheel: (e) => {
-			if (document.activeElement !== textareaRef.current) currentRender.engine.getCanvasElement().dispatchEvent(new WheelEvent(e.type, e.nativeEvent));
-		}
-	});
-};
-
-//#endregion
-//#region src/controllers/sheets-note-ui.controller.ts
+//#region src/controllers/ui.controller.ts
 /**
 * Copyright 2023-present DreamNum Co., Ltd.
 *
@@ -689,25 +721,13 @@ const SheetsNote = (props) => {
 * limitations under the License.
 */
 let SheetsNoteUIController = class SheetsNoteUIController extends _univerjs_core.Disposable {
-	constructor(_componentManager, _menuManagerService, _commandService) {
+	constructor(_menuManagerService, _commandService) {
 		super();
-		this._componentManager = _componentManager;
 		this._menuManagerService = _menuManagerService;
 		this._commandService = _commandService;
-		this._initComponents();
 		this._initMenu();
 		this._initCommands();
 	}
-	_initComponents() {
-		[
-			[SHEET_NOTE_COMPONENT, SheetsNote],
-			["AddNoteIcon", _univerjs_icons.AddNoteIcon],
-			["DeleteNoteIcon", _univerjs_icons.DeleteNoteIcon],
-			["HideNoteIcon", _univerjs_icons.HideNoteIcon]
-		].forEach(([key, comp]) => {
-			this.disposeWithMe(this._componentManager.register(key, comp));
-		});
-	}
 	_initMenu() {
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
@@ -715,11 +735,7 @@ let SheetsNoteUIController = class SheetsNoteUIController extends _univerjs_core
 		this._commandService.registerCommand(AddNotePopupOperation);
 	}
 };
-SheetsNoteUIController = __decorate([
-	__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_ui.ComponentManager)),
-	__decorateParam(1, (0, _univerjs_core.Inject)(_univerjs_ui.IMenuManagerService)),
-	__decorateParam(2, _univerjs_core.ICommandService)
-], SheetsNoteUIController);
+SheetsNoteUIController = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_ui.IMenuManagerService)), __decorateParam(1, _univerjs_core.ICommandService)], SheetsNoteUIController);
 
 //#endregion
 //#region src/plugin.ts
@@ -734,6 +750,8 @@ let UniverSheetsNoteUIPlugin = class UniverSheetsNoteUIPlugin extends _univerjs_
 		this._configService.setConfig(SHEETS_NOTE_UI_PLUGIN_CONFIG_KEY, rest);
 	}
 	onStarting() {
+		this._injector.add([ComponentsController]);
+		this._injector.get(ComponentsController);
 		[
 			[SheetsNotePopupService],
 			[SheetsCellContentController],
@@ -768,7 +786,6 @@ Object.defineProperty(exports, 'SheetsCellContentController', {
     return SheetsCellContentController;
   }
 });
-exports.SheetsNote = SheetsNote;
 Object.defineProperty(exports, 'SheetsNotePopupController', {
   enumerable: true,
   get: function () {