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

package/lib/es/index.js

@@ -1,28 +1,17 @@
-import { CellValueType, CommandType, DEFAULT_TEXT_FORMAT_EXCEL, DependentOn, Disposable, DisposableCollection, ICommandService, IConfigService, ILocalStorageService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Optional, Plugin, Range, ThemeService, Tools, UniverInstanceType, currencySymbols, fromCallback, getNumfmtParseValueFilter, isDefaultFormat, isPatternEqualWithoutDecimal, isRealNum, isTextFormat, merge, numfmt, registerDependencies, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
-import { IRenderManagerService } from "@univerjs/engine-render";
 import { AddDecimalCommand, CURRENCYFORMAT, DATEFMTLISG, NUMBERFORMAT, SHEETS_NUMFMT_PLUGIN_CONFIG_KEY, SetCurrencyCommand, SetNumfmtCommand, SetPercentCommand, SheetsNumfmtCellContentController, SubtractDecimalCommand, UniverSheetsNumfmtPlugin, getCurrencyFormatOptions, getCurrencySymbolByLocale, getCurrencySymbolIconByLocale, getCurrencyType, getDateFormatOptions, getDecimalFromPattern, getNumberFormatOptions, getPatternPreview, getPatternPreviewIgnoreGeneral, getPatternType, isPatternHasDecimal, localeCurrencySymbolMap, setPatternDecimal } from "@univerjs/sheets-numfmt";
-import { CellAlertManagerService, CellAlertType, HoverManagerService, IEditorBridgeService, IRepeatLastActionService, RepeatLastActionPermission, SheetSkeletonManagerService, UniverSheetsUIPlugin, deriveStateFromActiveSheet$, getCurrentRangeDisable$ } from "@univerjs/sheets-ui";
-import { AddDigitsIcon, CheckMarkIcon, DollarIcon, EuroIcon, PercentIcon, ReduceDigitsIcon, RmbIcon, RoubleIcon } from "@univerjs/icons";
 import { ComponentManager, ILayoutService, IMenuManagerService, ISidebarService, IconManager, MenuItemType, RibbonStartGroup, getMenuHiddenObservable, useDependency, useObservable } from "@univerjs/ui";
-import { Button, Input, InputNumber, Select, SelectList, Separator, borderClassName, clsx, scrollbarClassName } from "@univerjs/design";
+import { CellValueType, CommandType, DEFAULT_TEXT_FORMAT_EXCEL, DependentOn, Disposable, DisposableCollection, ICommandService, IConfigService, ILocalStorageService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, LocaleService, Optional, Plugin, Range, ThemeService, Tools, UniverInstanceType, currencySymbols, fromCallback, getNumfmtParseValueFilter, isDefaultFormat, isPatternEqualWithoutDecimal, isRealNum, isTextFormat, merge, numfmt, registerDependencies, toDisposable, touchDependencies, willLoseNumericPrecision } from "@univerjs/core";
+import { IRenderManagerService } from "@univerjs/engine-render";
 import { AFTER_CELL_EDIT, BEFORE_CELL_EDIT, INTERCEPTOR_POINT, INumfmtService, RangeProtectionPermissionEditPoint, RemoveNumfmtMutation, SetNumfmtMutation, SetRangeValuesCommand, SheetInterceptorService, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, factoryRemoveNumfmtUndoMutation, factorySetNumfmtUndoMutation, transformCellsToRange } from "@univerjs/sheets";
-import { createContext, createElement, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
+import { CellAlertManagerService, CellAlertType, HoverManagerService, IEditorBridgeService, IRepeatLastActionService, RepeatLastActionPermission, SheetSkeletonManagerService, UniverSheetsUIPlugin, deriveStateFromActiveSheet$, getCurrentRangeDisable$ } from "@univerjs/sheets-ui";
 import { Observable, combineLatest, debounceTime, filter, merge as merge$1 } from "rxjs";
 import { debounceTime as debounceTime$1, map, switchMap, tap } from "rxjs/operators";
+import { Button, Input, InputNumber, Select, SelectList, Separator, borderClassName, clsx, scrollbarClassName } from "@univerjs/design";
+import { createContext, createElement, useCallback, useContext, useEffect, useLayoutEffect, useMemo, useRef, useState } from "react";
 import { jsx, jsxs } from "react/jsx-runtime";
+import { AddDigitsIcon, CheckMarkIcon, DollarIcon, EuroIcon, PercentIcon, ReduceDigitsIcon, RmbIcon, RoubleIcon } from "@univerjs/icons";
 import { stripErrorMargin } from "@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",
@@ -93,7 +82,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 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;
@@ -102,7 +91,6 @@ let SheetNumfmtUIController = class SheetNumfmtUIController extends Disposable {
 		this._selectionManagerService = _selectionManagerService;
 		this._renderManagerService = _renderManagerService;
 		this._numfmtService = _numfmtService;
-		this._componentManager = _componentManager;
 		this._sidebarService = _sidebarService;
 		this._localeService = _localeService;
 		this._sheetsNumfmtCellContentController = _sheetsNumfmtCellContentController;
@@ -182,8 +170,10 @@ let SheetNumfmtUIController = class SheetNumfmtUIController extends Disposable {
 		return true;
 	}
 	_forceUpdate(unitId) {
-		var _renderUnit$mainCompo;
-		const renderUnit = this._renderManagerService.getRenderById(unitId !== null && unitId !== void 0 ? unitId : this._univerInstanceService.getCurrentUnitOfType(UniverInstanceType.UNIVER_SHEET).getUnitId());
+		var _this$_univerInstance, _renderUnit$mainCompo;
+		const resolvedUnitId = unitId !== null && unitId !== void 0 ? unitId : (_this$_univerInstance = this._univerInstanceService.getCurrentUnitOfType(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(SheetSkeletonManagerService).reCalculate();
 		renderUnit === null || renderUnit === void 0 || (_renderUnit$mainCompo = renderUnit.mainComponent) === null || _renderUnit$mainCompo === void 0 || _renderUnit$mainCompo.makeDirty();
 	}
@@ -281,10 +271,9 @@ SheetNumfmtUIController = __decorate([
 	__decorateParam(4, Inject(SheetsSelectionsService)),
 	__decorateParam(5, IRenderManagerService),
 	__decorateParam(6, INumfmtService),
-	__decorateParam(7, Inject(ComponentManager)),
-	__decorateParam(8, ISidebarService),
-	__decorateParam(9, Inject(LocaleService)),
-	__decorateParam(10, Inject(SheetsNumfmtCellContentController))
+	__decorateParam(7, ISidebarService),
+	__decorateParam(8, Inject(LocaleService)),
+	__decorateParam(9, Inject(SheetsNumfmtCellContentController))
 ], SheetNumfmtUIController);
 
 //#endregion
@@ -298,6 +287,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 = useDependency(LocaleService);
+	return /* @__PURE__ */ jsx("span", {
+		className: "univer-text-sm",
+		children: value !== null && value !== void 0 ? value : localeService.t("sheets-numfmt-ui.general")
+	});
+}
+function Options() {
+	const commandService = useDependency(ICommandService);
+	const localeService = useDependency(LocaleService);
+	const layoutService = useDependency(ILayoutService);
+	const sheetsNumfmtCellContentController = useDependency(SheetsNumfmtCellContentController);
+	const direction = useObservable(localeService.direction$, localeService.getDirection());
+	const selectionManagerService = useDependency(SheetsSelectionsService);
+	const setNumfmt = (pattern) => {
+		const selection = selectionManagerService.getCurrentLastSelection();
+		if (!selection) return;
+		const range = selection.range;
+		const values = [];
+		Range.foreach(range, (row, col) => {
+			if (pattern) values.push({
+				row,
+				col,
+				pattern,
+				type: getPatternType(pattern)
+			});
+			else values.push({
+				row,
+				col
+			});
+		});
+		commandService.executeCommand(SetNumfmtCommand.id, { values });
+		layoutService.focus();
+	};
+	const menuOptions = useMemo(() => {
+		return MENU_OPTIONS(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__ */ jsx("div", {
+		dir: direction,
+		className: "univer-grid univer-gap-1 univer-p-1.5",
+		children: menuOptions.map((item, index) => {
+			if (item === "|") return /* @__PURE__ */ jsx(Separator, {}, index);
+			return /* @__PURE__ */ 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__ */ jsx("span", { children: localeService.t(item.label) }), /* @__PURE__ */ jsx("span", {
+					className: "univer-text-xs univer-text-gray-500 dark:!univer-text-gray-400",
+					children: item.pattern ? getPatternPreview(item.pattern || "", defaultValue, sheetsNumfmtCellContentController.locale).result.trim() : ""
+				})]
+			}, index);
+		})
+	});
+}
+
 //#endregion
 //#region src/menu/menu.ts
 const MENU_OPTIONS = (currencySymbol) => {
@@ -481,74 +540,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 = useDependency(LocaleService);
-	return /* @__PURE__ */ jsx("span", {
-		className: "univer-text-sm",
-		children: value !== null && value !== void 0 ? value : localeService.t("sheets-numfmt-ui.general")
-	});
-}
-function Options() {
-	const commandService = useDependency(ICommandService);
-	const localeService = useDependency(LocaleService);
-	const layoutService = useDependency(ILayoutService);
-	const sheetsNumfmtCellContentController = useDependency(SheetsNumfmtCellContentController);
-	const direction = useObservable(localeService.direction$, localeService.getDirection());
-	const selectionManagerService = useDependency(SheetsSelectionsService);
-	const setNumfmt = (pattern) => {
-		const selection = selectionManagerService.getCurrentLastSelection();
-		if (!selection) return;
-		const range = selection.range;
-		const values = [];
-		Range.foreach(range, (row, col) => {
-			if (pattern) values.push({
-				row,
-				col,
-				pattern,
-				type: getPatternType(pattern)
-			});
-			else values.push({
-				row,
-				col
-			});
-		});
-		commandService.executeCommand(SetNumfmtCommand.id, { values });
-		layoutService.focus();
-	};
-	const menuOptions = useMemo(() => {
-		return MENU_OPTIONS(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__ */ jsx("div", {
-		dir: direction,
-		className: "univer-grid univer-gap-1 univer-p-1.5",
-		children: menuOptions.map((item, index) => {
-			if (item === "|") return /* @__PURE__ */ jsx(Separator, {}, index);
-			return /* @__PURE__ */ 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__ */ jsx("span", { children: localeService.t(item.label) }), /* @__PURE__ */ jsx("span", {
-					className: "univer-text-xs univer-text-gray-500 dark:!univer-text-gray-400",
-					children: item.pattern ? getPatternPreview(item.pattern || "", defaultValue, sheetsNumfmtCellContentController.locale).result.trim() : ""
-				})]
-			}, index);
-		})
-	});
-}
+//#region src/menu/schema.ts
+const menuSchema = { [RibbonStartGroup.LAYOUT]: {
+	[OpenNumfmtPanelOperator.id]: {
+		order: 9,
+		menuItemFactory: FactoryOtherMenuItem
+	},
+	[SetPercentCommand.id]: {
+		order: 9.1,
+		menuItemFactory: PercentMenuItem
+	},
+	[SetCurrencyCommand.id]: {
+		order: 9.2,
+		menuItemFactory: CurrencySymbolIconMenuItem
+	},
+	[AddDecimalCommand.id]: {
+		order: 9.3,
+		menuItemFactory: AddDecimalMenuItem
+	},
+	[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
@@ -807,20 +832,22 @@ function CustomFormat(props) {
 	]);
 	const [options, setOptions] = useState([]);
 	useEffect(() => {
+		let cancelled = false;
 		localStorageService.getItem(historyPatternKey).then((historyList) => {
 			const list = [
 				...CURRENCYFORMAT.map((item) => item.suffix("$")),
 				...DATEFMTLISG.map((item) => item.suffix),
-				...NUMBERFORMAT.map((item) => item.suffix)
+				...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);
@@ -935,7 +962,7 @@ function ThousandthPercentilePanel(props) {
 		return (item === null || item === void 0 ? void 0 : item.value) || options[0].value;
 	});
 	const pattern = useMemo(() => setPatternDecimal(suffix, Number(decimal || 0)), [suffix, decimal]);
-	const isInputDisable = useMemo(() => !isPatternHasDecimal(suffix), [suffix]);
+	const isInputDisable = !isPatternHasDecimal(suffix);
 	const handleDecimalChange = (decimal) => {
 		setDecimal(decimal || 0);
 		onChange(setPatternDecimal(suffix, Number(decimal || 0)));
@@ -1057,6 +1084,7 @@ const useNextTick = () => {
 //#endregion
 //#region src/views/SheetNumfmtPanel.tsx
 function SheetNumfmtPanel(props) {
+	var _typeOptions$find;
 	const { defaultValue, defaultPattern, row, col } = props.value;
 	const localeService = useDependency(LocaleService);
 	const currentPatternRef = useRef(() => "");
@@ -1095,10 +1123,7 @@ function SheetNumfmtPanel(props) {
 	const [type, setType] = useState(findDefaultType);
 	const [key, setKey] = useState(() => `${row}_${col}_${defaultPattern}`);
 	const { mark, userHabitCurrency } = useCurrencyOptions(() => setKey(`${row}_${col}_${defaultPattern}_userCurrency`));
-	const BusinessComponent = 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,
@@ -1564,31 +1589,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 = { [RibbonStartGroup.LAYOUT]: {
-	[OpenNumfmtPanelOperator.id]: {
-		order: 9,
-		menuItemFactory: FactoryOtherMenuItem
-	},
-	[SetPercentCommand.id]: {
-		order: 9.1,
-		menuItemFactory: PercentMenuItem
-	},
-	[SetCurrencyCommand.id]: {
-		order: 9.2,
-		menuItemFactory: CurrencySymbolIconMenuItem
-	},
-	[AddDecimalCommand.id]: {
-		order: 9.3,
-		menuItemFactory: AddDecimalMenuItem
-	},
-	[SubtractDecimalCommand.id]: {
-		order: 9.4,
-		menuItemFactory: SubtractDecimalMenuItem
-	}
-} };
-
 //#endregion
 //#region src/menu/numfmt.menu.controller.ts
 /**
@@ -1607,9 +1607,8 @@ const menuSchema = { [RibbonStartGroup.LAYOUT]: {
 * limitations under the License.
 */
 let NumfmtMenuController = class NumfmtMenuController extends Disposable {
-	constructor(_componentManager, _menuManagerService) {
+	constructor(_menuManagerService) {
 		super();
-		this._componentManager = _componentManager;
 		this._menuManagerService = _menuManagerService;
 		this._initMenu();
 	}
@@ -1617,7 +1616,7 @@ let NumfmtMenuController = class NumfmtMenuController extends Disposable {
 		this._menuManagerService.mergeMenu(menuSchema);
 	}
 };
-NumfmtMenuController = __decorate([__decorateParam(0, Inject(ComponentManager)), __decorateParam(1, IMenuManagerService)], NumfmtMenuController);
+NumfmtMenuController = __decorate([__decorateParam(0, IMenuManagerService)], NumfmtMenuController);
 
 //#endregion
 //#region src/plugin.ts
@@ -1670,4 +1669,4 @@ UniverSheetsNumfmtUIPlugin = __decorate([
 ], UniverSheetsNumfmtUIPlugin);
 
 //#endregion
-export { UniverSheetsNumfmtUIPlugin };
+export { menuSchema as SheetsNumfmtUIMenuSchema, UniverSheetsNumfmtUIPlugin };