@univerjs/sheets-numfmt-ui 1.0.0-alpha.2 → 1.0.0-alpha.4

package/lib/cjs/index.js

@@ -1,29 +1,18 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
-let _univerjs_core = require("@univerjs/core");
-let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_sheets_numfmt = require("@univerjs/sheets-numfmt");
-let _univerjs_sheets_ui = require("@univerjs/sheets-ui");
-let _univerjs_icons = require("@univerjs/icons");
 let _univerjs_ui = require("@univerjs/ui");
-let _univerjs_design = require("@univerjs/design");
+let _univerjs_core = require("@univerjs/core");
+let _univerjs_engine_render = require("@univerjs/engine-render");
 let _univerjs_sheets = require("@univerjs/sheets");
-let react = require("react");
+let _univerjs_sheets_ui = require("@univerjs/sheets-ui");
 let rxjs = require("rxjs");
 let rxjs_operators = require("rxjs/operators");
+let _univerjs_design = require("@univerjs/design");
+let react = require("react");
 let react_jsx_runtime = require("react/jsx-runtime");
+let _univerjs_icons = require("@univerjs/icons");
 let _univerjs_engine_formula = require("@univerjs/engine-formula");
 
-//#region package.json
-var name = "@univerjs/sheets-numfmt-ui";
-var version = "1.0.0-alpha.2";
-
-//#endregion
-//#region src/config/config.ts
-const SHEETS_NUMFMT_UI_PLUGIN_CONFIG_KEY = "sheets-numfmt-ui.config";
-const configSymbol = Symbol(SHEETS_NUMFMT_UI_PLUGIN_CONFIG_KEY);
-const defaultPluginConfig = {};
-
-//#endregion
 //#region src/commands/operations/close.numfmt.panel.operation.ts
 const CloseNumfmtPanelOperator = {
 	id: "sheet.operation.close.numfmt.panel",
@@ -94,7 +83,7 @@ function __decorate(decorators, target, key, desc) {
 //#region src/controllers/ui.controller.ts
 const SHEET_NUMFMT_PANEL$1 = "SHEET_NUMFMT_PANEL";
 let SheetNumfmtUIController = class SheetNumfmtUIController extends _univerjs_core.Disposable {
-	constructor(_sheetInterceptorService, _themeService, _univerInstanceService, _commandService, _selectionManagerService, _renderManagerService, _numfmtService, _componentManager, _sidebarService, _localeService, _sheetsNumfmtCellContentController) {
+	constructor(_sheetInterceptorService, _themeService, _univerInstanceService, _commandService, _selectionManagerService, _renderManagerService, _numfmtService, _sidebarService, _localeService, _sheetsNumfmtCellContentController) {
 		super();
 		this._sheetInterceptorService = _sheetInterceptorService;
 		this._themeService = _themeService;
@@ -103,7 +92,6 @@ let SheetNumfmtUIController = class SheetNumfmtUIController extends _univerjs_co
 		this._selectionManagerService = _selectionManagerService;
 		this._renderManagerService = _renderManagerService;
 		this._numfmtService = _numfmtService;
-		this._componentManager = _componentManager;
 		this._sidebarService = _sidebarService;
 		this._localeService = _localeService;
 		this._sheetsNumfmtCellContentController = _sheetsNumfmtCellContentController;
@@ -183,8 +171,10 @@ let SheetNumfmtUIController = class SheetNumfmtUIController extends _univerjs_co
 		return true;
 	}
 	_forceUpdate(unitId) {
-		var _renderUnit$mainCompo;
-		const renderUnit = this._renderManagerService.getRenderById(unitId !== null && unitId !== void 0 ? unitId : this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET).getUnitId());
+		var _this$_univerInstance, _renderUnit$mainCompo;
+		const resolvedUnitId = unitId !== null && unitId !== void 0 ? unitId : (_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(_univerjs_core.UniverInstanceType.UNIVER_SHEET)) === null || _this$_univerInstance === void 0 ? void 0 : _this$_univerInstance.getUnitId();
+		if (!resolvedUnitId) return;
+		const renderUnit = this._renderManagerService.getRenderById(resolvedUnitId);
 		renderUnit === null || renderUnit === void 0 || renderUnit.with(_univerjs_sheets_ui.SheetSkeletonManagerService).reCalculate();
 		renderUnit === null || renderUnit === void 0 || (_renderUnit$mainCompo = renderUnit.mainComponent) === null || _renderUnit$mainCompo === void 0 || _renderUnit$mainCompo.makeDirty();
 	}
@@ -282,10 +272,9 @@ SheetNumfmtUIController = __decorate([
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_sheets.SheetsSelectionsService)),
 	__decorateParam(5, _univerjs_engine_render.IRenderManagerService),
 	__decorateParam(6, _univerjs_sheets.INumfmtService),
-	__decorateParam(7, (0, _univerjs_core.Inject)(_univerjs_ui.ComponentManager)),
-	__decorateParam(8, _univerjs_ui.ISidebarService),
-	__decorateParam(9, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
-	__decorateParam(10, (0, _univerjs_core.Inject)(_univerjs_sheets_numfmt.SheetsNumfmtCellContentController))
+	__decorateParam(7, _univerjs_ui.ISidebarService),
+	__decorateParam(8, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
+	__decorateParam(9, (0, _univerjs_core.Inject)(_univerjs_sheets_numfmt.SheetsNumfmtCellContentController))
 ], SheetNumfmtUIController);
 
 //#endregion
@@ -299,6 +288,76 @@ const OpenNumfmtPanelOperator = {
 	}
 };
 
+//#endregion
+//#region src/views/components/MoreNumfmtType.tsx
+const MORE_NUMFMT_TYPE_KEY = "sheets-numfmt-ui.moreNumfmtType";
+const OPTIONS_KEY = "sheets-numfmt-ui.moreNumfmtType.options";
+function MoreNumfmtType(props) {
+	const { value } = props;
+	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+		className: "univer-text-sm",
+		children: value !== null && value !== void 0 ? value : localeService.t("sheets-numfmt-ui.general")
+	});
+}
+function Options() {
+	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
+	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
+	const layoutService = (0, _univerjs_ui.useDependency)(_univerjs_ui.ILayoutService);
+	const sheetsNumfmtCellContentController = (0, _univerjs_ui.useDependency)(_univerjs_sheets_numfmt.SheetsNumfmtCellContentController);
+	const direction = (0, _univerjs_ui.useObservable)(localeService.direction$, localeService.getDirection());
+	const selectionManagerService = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetsSelectionsService);
+	const setNumfmt = (pattern) => {
+		const selection = selectionManagerService.getCurrentLastSelection();
+		if (!selection) return;
+		const range = selection.range;
+		const values = [];
+		_univerjs_core.Range.foreach(range, (row, col) => {
+			if (pattern) values.push({
+				row,
+				col,
+				pattern,
+				type: (0, _univerjs_sheets_numfmt.getPatternType)(pattern)
+			});
+			else values.push({
+				row,
+				col
+			});
+		});
+		commandService.executeCommand(_univerjs_sheets_numfmt.SetNumfmtCommand.id, { values });
+		layoutService.focus();
+	};
+	const menuOptions = (0, react.useMemo)(() => {
+		return MENU_OPTIONS(_univerjs_sheets_numfmt.localeCurrencySymbolMap.get(localeService.getCurrentLocale()));
+	}, [localeService]);
+	const handleClick = (index) => {
+		if (index === 0) setNumfmt(null);
+		else if (index === menuOptions.length - 1) {
+			commandService.executeCommand(OpenNumfmtPanelOperator.id);
+			layoutService.focus();
+		} else {
+			const item = menuOptions[index];
+			item.pattern && setNumfmt(item.pattern);
+		}
+	};
+	const defaultValue = 1220;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
+		dir: direction,
+		className: "univer-grid univer-gap-1 univer-p-1.5",
+		children: menuOptions.map((item, index) => {
+			if (item === "|") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Separator, {}, index);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
+				className: "univer-flex univer-h-7 univer-cursor-default univer-items-center univer-justify-between univer-gap-6 univer-rounded univer-px-2 univer-text-sm hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
+				onClick: () => handleClick(index),
+				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: localeService.t(item.label) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
+					className: "univer-text-xs univer-text-gray-500 dark:!univer-text-gray-400",
+					children: item.pattern ? (0, _univerjs_sheets_numfmt.getPatternPreview)(item.pattern || "", defaultValue, sheetsNumfmtCellContentController.locale).result.trim() : ""
+				})]
+			}, index);
+		})
+	});
+}
+
 //#endregion
 //#region src/menu/menu.ts
 const MENU_OPTIONS = (currencySymbol) => {
@@ -482,74 +541,40 @@ function FactoryOtherMenuItem(accessor) {
 }
 
 //#endregion
-//#region src/views/components/MoreNumfmtType.tsx
-const MORE_NUMFMT_TYPE_KEY = "sheets-numfmt-ui.moreNumfmtType";
-const OPTIONS_KEY = "sheets-numfmt-ui.moreNumfmtType.options";
-function MoreNumfmtType(props) {
-	const { value } = props;
-	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-		className: "univer-text-sm",
-		children: value !== null && value !== void 0 ? value : localeService.t("sheets-numfmt-ui.general")
-	});
-}
-function Options() {
-	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
-	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
-	const layoutService = (0, _univerjs_ui.useDependency)(_univerjs_ui.ILayoutService);
-	const sheetsNumfmtCellContentController = (0, _univerjs_ui.useDependency)(_univerjs_sheets_numfmt.SheetsNumfmtCellContentController);
-	const direction = (0, _univerjs_ui.useObservable)(localeService.direction$, localeService.getDirection());
-	const selectionManagerService = (0, _univerjs_ui.useDependency)(_univerjs_sheets.SheetsSelectionsService);
-	const setNumfmt = (pattern) => {
-		const selection = selectionManagerService.getCurrentLastSelection();
-		if (!selection) return;
-		const range = selection.range;
-		const values = [];
-		_univerjs_core.Range.foreach(range, (row, col) => {
-			if (pattern) values.push({
-				row,
-				col,
-				pattern,
-				type: (0, _univerjs_sheets_numfmt.getPatternType)(pattern)
-			});
-			else values.push({
-				row,
-				col
-			});
-		});
-		commandService.executeCommand(_univerjs_sheets_numfmt.SetNumfmtCommand.id, { values });
-		layoutService.focus();
-	};
-	const menuOptions = (0, react.useMemo)(() => {
-		return MENU_OPTIONS(_univerjs_sheets_numfmt.localeCurrencySymbolMap.get(localeService.getCurrentLocale()));
-	}, [localeService]);
-	const handleClick = (index) => {
-		if (index === 0) setNumfmt(null);
-		else if (index === menuOptions.length - 1) {
-			commandService.executeCommand(OpenNumfmtPanelOperator.id);
-			layoutService.focus();
-		} else {
-			const item = menuOptions[index];
-			item.pattern && setNumfmt(item.pattern);
-		}
-	};
-	const defaultValue = 1220;
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("div", {
-		dir: direction,
-		className: "univer-grid univer-gap-1 univer-p-1.5",
-		children: menuOptions.map((item, index) => {
-			if (item === "|") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(_univerjs_design.Separator, {}, index);
-			return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
-				className: "univer-flex univer-h-7 univer-cursor-default univer-items-center univer-justify-between univer-gap-6 univer-rounded univer-px-2 univer-text-sm hover:univer-bg-gray-100 dark:hover:!univer-bg-gray-700",
-				onClick: () => handleClick(index),
-				children: [/* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", { children: localeService.t(item.label) }), /* @__PURE__ */ (0, react_jsx_runtime.jsx)("span", {
-					className: "univer-text-xs univer-text-gray-500 dark:!univer-text-gray-400",
-					children: item.pattern ? (0, _univerjs_sheets_numfmt.getPatternPreview)(item.pattern || "", defaultValue, sheetsNumfmtCellContentController.locale).result.trim() : ""
-				})]
-			}, index);
-		})
-	});
-}
+//#region src/menu/schema.ts
+const menuSchema = { [_univerjs_ui.RibbonStartGroup.LAYOUT]: {
+	[OpenNumfmtPanelOperator.id]: {
+		order: 9,
+		menuItemFactory: FactoryOtherMenuItem
+	},
+	[_univerjs_sheets_numfmt.SetPercentCommand.id]: {
+		order: 9.1,
+		menuItemFactory: PercentMenuItem
+	},
+	[_univerjs_sheets_numfmt.SetCurrencyCommand.id]: {
+		order: 9.2,
+		menuItemFactory: CurrencySymbolIconMenuItem
+	},
+	[_univerjs_sheets_numfmt.AddDecimalCommand.id]: {
+		order: 9.3,
+		menuItemFactory: AddDecimalMenuItem
+	},
+	[_univerjs_sheets_numfmt.SubtractDecimalCommand.id]: {
+		order: 9.4,
+		menuItemFactory: SubtractDecimalMenuItem
+	}
+} };
+
+//#endregion
+//#region package.json
+var name = "@univerjs/sheets-numfmt-ui";
+var version = "1.0.0-alpha.4";
+
+//#endregion
+//#region src/config/config.ts
+const SHEETS_NUMFMT_UI_PLUGIN_CONFIG_KEY = "sheets-numfmt-ui.config";
+const configSymbol = Symbol(SHEETS_NUMFMT_UI_PLUGIN_CONFIG_KEY);
+const defaultPluginConfig = {};
 
 //#endregion
 //#region src/controllers/user-habit.controller.ts
@@ -808,20 +833,22 @@ function CustomFormat(props) {
 	]);
 	const [options, setOptions] = (0, react.useState)([]);
 	(0, react.useEffect)(() => {
+		let cancelled = false;
 		localStorageService.getItem(historyPatternKey).then((historyList) => {
 			const list = [
 				..._univerjs_sheets_numfmt.CURRENCYFORMAT.map((item) => item.suffix("$")),
 				..._univerjs_sheets_numfmt.DATEFMTLISG.map((item) => item.suffix),
-				..._univerjs_sheets_numfmt.NUMBERFORMAT.map((item) => item.suffix)
+				..._univerjs_sheets_numfmt.NUMBERFORMAT.map((item) => item.suffix),
+				...historyList !== null && historyList !== void 0 ? historyList : []
 			];
-			list.push(...historyList || []);
-			userHabitController.addHabit(key$1, []).finally(() => {
-				userHabitController.getHabit(key$1, list).then((list) => {
-					setOptions([...new Set(list)]);
-				});
-			});
+			return userHabitController.addHabit(key$1, []).then(() => userHabitController.getHabit(key$1, list));
+		}).then((list) => {
+			if (!cancelled) setOptions([...new Set(list)]);
 		});
-	}, []);
+		return () => {
+			cancelled = true;
+		};
+	}, [localStorageService, userHabitController]);
 	const handleClick = (p) => {
 		setPattern(p);
 		onChange(p);
@@ -936,7 +963,7 @@ function ThousandthPercentilePanel(props) {
 		return (item === null || item === void 0 ? void 0 : item.value) || options[0].value;
 	});
 	const pattern = (0, react.useMemo)(() => (0, _univerjs_sheets_numfmt.setPatternDecimal)(suffix, Number(decimal || 0)), [suffix, decimal]);
-	const isInputDisable = (0, react.useMemo)(() => !(0, _univerjs_sheets_numfmt.isPatternHasDecimal)(suffix), [suffix]);
+	const isInputDisable = !(0, _univerjs_sheets_numfmt.isPatternHasDecimal)(suffix);
 	const handleDecimalChange = (decimal) => {
 		setDecimal(decimal || 0);
 		onChange((0, _univerjs_sheets_numfmt.setPatternDecimal)(suffix, Number(decimal || 0)));
@@ -1058,6 +1085,7 @@ const useNextTick = () => {
 //#endregion
 //#region src/views/SheetNumfmtPanel.tsx
 function SheetNumfmtPanel(props) {
+	var _typeOptions$find;
 	const { defaultValue, defaultPattern, row, col } = props.value;
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const currentPatternRef = (0, react.useRef)(() => "");
@@ -1096,10 +1124,7 @@ function SheetNumfmtPanel(props) {
 	const [type, setType] = (0, react.useState)(findDefaultType);
 	const [key, setKey] = (0, react.useState)(() => `${row}_${col}_${defaultPattern}`);
 	const { mark, userHabitCurrency } = useCurrencyOptions(() => setKey(`${row}_${col}_${defaultPattern}_userCurrency`));
-	const BusinessComponent = (0, react.useMemo)(() => {
-		var _typeOptions$find;
-		return (_typeOptions$find = typeOptions.find((item) => item.label === type)) === null || _typeOptions$find === void 0 ? void 0 : _typeOptions$find.component;
-	}, [type]);
+	const BusinessComponent = (_typeOptions$find = typeOptions.find((item) => item.label === type)) === null || _typeOptions$find === void 0 ? void 0 : _typeOptions$find.component;
 	function findDefaultType() {
 		return [
 			isGeneralPanel,
@@ -1565,31 +1590,6 @@ function canConvertRichTextToNumfmt(body) {
 	}) || paragraphs.some((paragraph) => paragraph.bullet) || paragraphs.length >= 2 || Boolean(customRanges === null || customRanges === void 0 ? void 0 : customRanges.length) || customBlocks.length > 0);
 }
 
-//#endregion
-//#region src/menu/schema.ts
-const menuSchema = { [_univerjs_ui.RibbonStartGroup.LAYOUT]: {
-	[OpenNumfmtPanelOperator.id]: {
-		order: 9,
-		menuItemFactory: FactoryOtherMenuItem
-	},
-	[_univerjs_sheets_numfmt.SetPercentCommand.id]: {
-		order: 9.1,
-		menuItemFactory: PercentMenuItem
-	},
-	[_univerjs_sheets_numfmt.SetCurrencyCommand.id]: {
-		order: 9.2,
-		menuItemFactory: CurrencySymbolIconMenuItem
-	},
-	[_univerjs_sheets_numfmt.AddDecimalCommand.id]: {
-		order: 9.3,
-		menuItemFactory: AddDecimalMenuItem
-	},
-	[_univerjs_sheets_numfmt.SubtractDecimalCommand.id]: {
-		order: 9.4,
-		menuItemFactory: SubtractDecimalMenuItem
-	}
-} };
-
 //#endregion
 //#region src/menu/numfmt.menu.controller.ts
 /**
@@ -1608,9 +1608,8 @@ const menuSchema = { [_univerjs_ui.RibbonStartGroup.LAYOUT]: {
 * limitations under the License.
 */
 let NumfmtMenuController = class NumfmtMenuController extends _univerjs_core.Disposable {
-	constructor(_componentManager, _menuManagerService) {
+	constructor(_menuManagerService) {
 		super();
-		this._componentManager = _componentManager;
 		this._menuManagerService = _menuManagerService;
 		this._initMenu();
 	}
@@ -1618,7 +1617,7 @@ let NumfmtMenuController = class NumfmtMenuController extends _univerjs_core.Dis
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
 };
-NumfmtMenuController = __decorate([__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_ui.ComponentManager)), __decorateParam(1, _univerjs_ui.IMenuManagerService)], NumfmtMenuController);
+NumfmtMenuController = __decorate([__decorateParam(0, _univerjs_ui.IMenuManagerService)], NumfmtMenuController);
 
 //#endregion
 //#region src/plugin.ts
@@ -1671,6 +1670,7 @@ UniverSheetsNumfmtUIPlugin = __decorate([
 ], UniverSheetsNumfmtUIPlugin);
 
 //#endregion
+exports.SheetsNumfmtUIMenuSchema = menuSchema;
 Object.defineProperty(exports, 'UniverSheetsNumfmtUIPlugin', {
   enumerable: true,
   get: function () {