@univerjs/sheets-conditional-formatting-ui 1.0.0-alpha.6 → 1.0.0-alpha.8

package/lib/index.js

@@ -1,12 +1,12 @@
 import { BooleanNumber, ColorKit, CommandType, DependentOn, Disposable, DisposableCollection, ICommandService, IConfigService, IUniverInstanceService, Inject, Injector, InterceptorEffectEnum, InterceptorManager, LocaleService, ObjectMatrix, Plugin, Range, Rectangle, Tools, UniverInstanceType, createInterceptorKey, generateRandomId, get, merge, registerDependencies, set, toDisposable, touchDependencies } from "@univerjs/core";
-import { AFTER_CELL_EDIT, AUTO_FILL_APPLY_TYPE, AutoFillTools, ClearSelectionAllCommand, ClearSelectionFormatCommand, IAutoFillService, INTERCEPTOR_POINT, RangeProtectionPermissionEditPoint, RemoveSheetMutation, SetSelectionsOperation, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionCheckController, SheetsSelectionsService, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, checkRangesEditablePermission, getSheetCommandTarget, rangeToDiscreteRange, setEndForRange } from "@univerjs/sheets";
+import { AFTER_CELL_EDIT, AUTO_FILL_APPLY_TYPE, AutoFillTools, ClearSelectionAllCommand, ClearSelectionFormatCommand, IAutoFillService, INTERCEPTOR_POINT, RangeProtectionPermissionEditPoint, RemoveSheetMutation, SetSelectionsOperation, SetWorksheetActiveOperation, SheetInterceptorService, SheetPermissionCheckController, SheetsSelectionsService, UniverSheetsPlugin, WorkbookEditablePermission, WorksheetEditPermission, WorksheetSetCellStylePermission, checkRangesEditablePermission, getSheetCommandTarget, rangeToDiscreteRange, setEndForRange } from "@univerjs/sheets";
 import { AddCfCommand, AddConditionalRuleMutation, AddConditionalRuleMutationUndoFactory, CFNumberOperator, CFRuleType, CFSubRuleType, CFTextOperator, CFTimePeriodOperator, CFValueType, CONDITIONAL_FORMATTING_VIEWPORT_CACHE_LENGTH, ClearRangeCfCommand, ClearWorksheetCfCommand, ConditionalFormattingRangeIndexModel, ConditionalFormattingRangeTransformService, ConditionalFormattingRuleModel, ConditionalFormattingService, ConditionalFormattingViewModel, DEFAULT_BG_COLOR, DEFAULT_FONT_COLOR, DEFAULT_PADDING, DEFAULT_WIDTH, DeleteCfCommand, DeleteConditionalRuleMutation, DeleteConditionalRuleMutationUndoFactory, IIconSetType, MoveCfCommand, MoveConditionalRuleMutation, SHEET_CONDITIONAL_FORMATTING_PLUGIN, SetCfCommand, SetConditionalRuleMutation, UniverSheetsConditionalFormattingPlugin, compareWithNumber, createCfId, createDefaultRule, createDefaultValue, createDefaultValueByValueType, defaultDataBarNativeColor, defaultDataBarPositiveColor, getColorScaleFromValue, getOppositeOperator, iconGroup, iconMap, removeUndefinedAttr, setConditionalRuleMutationUndoFactory } from "@univerjs/sheets-conditional-formatting";
-import { ComponentManager, IMenuManagerService, ISidebarService, IconManager, MenuItemType, RibbonDataGroup, RibbonInsertGroup, getMenuHiddenObservable, useDependency, useObservable, useSidebarClick } from "@univerjs/ui";
-import { COPY_TYPE, FormatPainterStatus, IFormatPainterService, ISheetClipboardService, PREDEFINED_HOOK_NAME_PASTE, SheetSkeletonManagerService, getCurrentRangeDisable$, getRepeatRange, useHighlightRange, virtualizeDiscreteRanges } from "@univerjs/sheets-ui";
+import { ComponentManager, IMenuManagerService, ISidebarService, IconManager, MenuItemType, RibbonDataGroup, RibbonInsertGroup, UniverUIPlugin, getMenuHiddenObservable, useDependency, useObservable, useSidebarClick } from "@univerjs/ui";
+import { COPY_TYPE, FormatPainterStatus, IFormatPainterService, ISheetClipboardService, PREDEFINED_HOOK_NAME_PASTE, SheetSkeletonManagerService, UniverSheetsMobileUIPlugin, UniverSheetsUIPlugin, getCurrentRangeDisable$, getRepeatRange, useHighlightRange, virtualizeDiscreteRanges } from "@univerjs/sheets-ui";
 import { Observable, debounceTime, filter, map, merge as merge$1, share, startWith } from "rxjs";
 import { bufferTime, debounceTime as debounceTime$1, filter as filter$1 } from "rxjs/operators";
+import { IRenderManagerService, UniverRenderEnginePlugin } from "@univerjs/engine-render";
 import { FormulaRefRangeService, UniverSheetsFormulaPlugin } from "@univerjs/sheets-formula";
-import { IRenderManagerService } from "@univerjs/engine-render";
 import { BoldIcon, ConditionsDoubleIcon, DataBarIcon, DeleteIcon, FontColorDoubleIcon, GripVerticalIcon, IncreaseIcon, ItalicIcon, MoreDownIcon, PaintBucketDoubleIcon, RatingIcon, SlashDoubleIcon, StrikethroughIcon, UnderlineIcon } from "@univerjs/icons";
 import { useEffect, useMemo, useRef, useState } from "react";
 import { Button, Checkbox, ColorPicker, DraggableList, Dropdown, Input, InputNumber, Radio, RadioGroup, Select, Tooltip, borderClassName, clsx } from "@univerjs/design";
@@ -365,7 +365,7 @@ const AddUniqueValuesCfCommand = {
 };
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -376,7 +376,7 @@ function _typeof(o) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -389,14 +389,14 @@ function toPrimitive(t, r) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.140.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.137.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -407,7 +407,7 @@ function _defineProperty(e, r, t) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorateParam.js
+//#region \0@oxc-project+runtime@0.140.0/helpers/esm/decorateParam.js
 function __decorateParam(paramIndex, decorator) {
 	return function(target, key) {
 		decorator(target, key, paramIndex);
@@ -415,7 +415,7 @@ function __decorateParam(paramIndex, decorator) {
 }
 
 //#endregion
-//#region \0@oxc-project+runtime@0.137.0/helpers/esm/decorate.js
+//#region \0@oxc-project+runtime@0.140.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);
@@ -798,14 +798,14 @@ function FactoryManageConditionalFormattingRule(accessor) {
 		subscriber.next(hasPermission);
 	}));
 	const selections$ = new Observable((subscriber) => {
-		clearRangeEnable$.subscribe((v) => {
+		const clearRangeSubscription = clearRangeEnable$.subscribe((v) => {
 			const item = commonSelections.find((item) => item.value === 9);
 			if (item) {
 				item.disabled = !v;
 				subscriber.next(commonSelections);
 			}
 		});
-		clearSheetEnable$.subscribe((v) => {
+		const clearSheetSubscription = clearSheetEnable$.subscribe((v) => {
 			const item = commonSelections.find((item) => item.value === 10);
 			if (item) {
 				item.disabled = !v;
@@ -813,6 +813,10 @@ function FactoryManageConditionalFormattingRule(accessor) {
 			}
 		});
 		subscriber.next(commonSelections);
+		return () => {
+			clearRangeSubscription.unsubscribe();
+			clearSheetSubscription.unsubscribe();
+		};
 	});
 	return {
 		id: OpenConditionalFormattingOperator.id,
@@ -970,6 +974,11 @@ const menuSchema = {
 	},
 	[RibbonDataGroup.RULES]: { [OpenConditionalFormattingOperator.id]: {
 		order: 1,
+		gridLayout: {
+			row: 2,
+			column: 1,
+			showLabel: true
+		},
 		menuItemFactory: FactoryManageConditionalFormattingRule
 	} }
 };
@@ -977,7 +986,7 @@ const menuSchema = {
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-conditional-formatting-ui";
-var version = "1.0.0-alpha.6";
+var version = "1.0.0-alpha.8";
 
 //#endregion
 //#region src/config/config.ts
@@ -1534,7 +1543,7 @@ let SheetsCfRenderController = class SheetsCfRenderController extends Disposable
 		if (!workbook || !worksheet) return;
 		const unitId = workbook.getUnitId();
 		const subUnitId = worksheet.getSheetId();
-		const render = this._renderManagerService.getRenderById(unitId);
+		const render = this._renderManagerService.getRenderUnitById(unitId);
 		const skeletonManagerService = render === null || render === void 0 ? void 0 : render.with(SheetSkeletonManagerService);
 		const currentSkeleton = skeletonManagerService === null || skeletonManagerService === void 0 ? void 0 : skeletonManagerService.getCurrentSkeleton();
 		const dirtyRanges = this._intersectDirtyRangesWithRenderedRange(this._collectDirtyRanges(items, unitId, subUnitId), currentSkeleton === null || currentSkeleton === void 0 ? void 0 : currentSkeleton.rowColumnSegment);
@@ -1648,7 +1657,7 @@ _defineProperty(UniverSheetsConditionalFormattingMobileUIPlugin, "packageName",
 _defineProperty(UniverSheetsConditionalFormattingMobileUIPlugin, "version", version);
 _defineProperty(UniverSheetsConditionalFormattingMobileUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsConditionalFormattingMobileUIPlugin = __decorate([
-	DependentOn(UniverSheetsConditionalFormattingPlugin),
+	DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverSheetsFormulaPlugin, UniverSheetsConditionalFormattingPlugin, UniverSheetsMobileUIPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, Inject(ICommandService)),
 	__decorateParam(3, IConfigService)
@@ -2200,7 +2209,7 @@ let ConditionalFormattingViewportController = class ConditionalFormattingViewpor
 			this._unitDisposable.dispose();
 			this._unitDisposable = new DisposableCollection();
 			const unitId = unit.getUnitId();
-			const render = this._renderManagerService.getRenderById(unitId);
+			const render = this._renderManagerService.getRenderUnitById(unitId);
 			if (!render) return;
 			const sheetSkeletonManagerService = render.with(SheetSkeletonManagerService);
 			this._unitDisposable.add(sheetSkeletonManagerService.currentSkeleton$.subscribe((s) => {
@@ -2239,10 +2248,11 @@ const ColorPicker$1 = (props) => {
 	const { color, onChange, disable = false, Icon = PaintBucketDoubleIcon, className } = props;
 	const colorKit = useMemo(() => new ColorKit(color), [color]);
 	const renderIcon = () => {
-		return /* @__PURE__ */ jsx(Icon, {
+		const iconProps = {
 			className: clsx("univer-fill-primary-600", disable && className),
 			extend: { colorChannel1: colorKit.isValid ? color : "" }
-		});
+		};
+		return /* @__PURE__ */ jsx(Icon, { ...iconProps });
 	};
 	return !disable ? /* @__PURE__ */ jsx(Dropdown, {
 		overlay: /* @__PURE__ */ jsx("div", {
@@ -2401,7 +2411,7 @@ const TextInput$1 = (props) => {
 	const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
 	useSidebarClick((e) => {
 		var _formulaEditorRef$cur;
-		!((_formulaEditorRef$cur = formulaEditorRef.current) === null || _formulaEditorRef$cur === void 0) && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
+		(_formulaEditorRef$cur = formulaEditorRef.current) !== null && _formulaEditorRef$cur !== void 0 && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
 	});
 	if (type === CFValueType.formula) return /* @__PURE__ */ jsx("div", {
 		className: "univer-ml-1 univer-w-full",
@@ -2809,7 +2819,7 @@ const InputText = (props) => {
 	const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
 	useSidebarClick((e) => {
 		var _formulaEditorRef$cur;
-		!((_formulaEditorRef$cur = formulaEditorRef.current) === null || _formulaEditorRef$cur === void 0) && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
+		(_formulaEditorRef$cur = formulaEditorRef.current) !== null && _formulaEditorRef$cur !== void 0 && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
 	});
 	const _value = useRef(value);
 	const config = useMemo(() => {
@@ -3335,7 +3345,7 @@ const FormulaStyleEditor = (props) => {
 	};
 	useSidebarClick((e) => {
 		var _formulaEditorRef$cur;
-		!((_formulaEditorRef$cur = formulaEditorRef.current) === null || _formulaEditorRef$cur === void 0) && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
+		(_formulaEditorRef$cur = formulaEditorRef.current) !== null && _formulaEditorRef$cur !== void 0 && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
 	});
 	return /* @__PURE__ */ jsxs("div", {
 		ref: divEleRef,
@@ -3811,7 +3821,7 @@ const TextInput = (props) => {
 	const [isFocusFormulaEditor, setIsFocusFormulaEditor] = useState(false);
 	useSidebarClick((e) => {
 		var _formulaEditorRef$cur;
-		!((_formulaEditorRef$cur = formulaEditorRef.current) === null || _formulaEditorRef$cur === void 0) && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
+		(_formulaEditorRef$cur = formulaEditorRef.current) !== null && _formulaEditorRef$cur !== void 0 && _formulaEditorRef$cur.isClickOutSide(e) && setIsFocusFormulaEditor(false);
 	});
 	return /* @__PURE__ */ jsx("div", {
 		className: "univer-relative",
@@ -3971,7 +3981,8 @@ const IconSetRuleEdit = (props) => {
 	};
 	const handleOperatorChange = (operator, index) => {
 		onChange([String(index), "operator"], operator);
-		handleValueValueChange(createDefaultValue(CFSubRuleType.number, operator), index);
+		const defaultValue = createDefaultValue(CFSubRuleType.number, operator);
+		handleValueValueChange(defaultValue, index);
 	};
 	const handleValueTypeChange = (v, index) => {
 		onChange([
@@ -3980,7 +3991,8 @@ const IconSetRuleEdit = (props) => {
 			"type"
 		], v);
 		const item = configList[index];
-		handleValueValueChange(createDefaultValue(CFSubRuleType.number, item.operator), index);
+		const defaultValue = createDefaultValue(CFSubRuleType.number, item.operator);
+		handleValueValueChange(defaultValue, index);
 	};
 	return useMemo(() => {
 		return configList.map((item, index) => {
@@ -4219,7 +4231,8 @@ const IconSet = (props) => {
 	const reverseIcon = () => {
 		const iconList = configList.map((item) => ({ ...item }));
 		configList.forEach((item, index) => {
-			const newIcon = iconList[configList.length - 1 - index];
+			const mirrorIndex = configList.length - 1 - index;
+			const newIcon = iconList[mirrorIndex];
 			item.iconId = newIcon.iconId;
 			item.iconType = newIcon.iconType;
 		});
@@ -4595,7 +4608,8 @@ const RuleEdit = (props) => {
 	const onRangeSelectorChange = (rangeString) => {
 		if (!rangeSelectorTouched.current && rangeString.length < 1 && rangeResult.current.length > 0) return;
 		rangeSelectorTouched.current = true;
-		rangeResult.current = rangeString.split(",").filter((e) => !!e).map(deserializeRangeWithSheet).map((item) => item.range);
+		const result = rangeString.split(",").filter((e) => !!e).map(deserializeRangeWithSheet).map((item) => item.range);
+		rangeResult.current = result;
 	};
 	const handleSubmit = () => {
 		const getRanges = () => {
@@ -5119,7 +5133,7 @@ _defineProperty(UniverSheetsConditionalFormattingUIPlugin, "packageName", name);
 _defineProperty(UniverSheetsConditionalFormattingUIPlugin, "version", version);
 _defineProperty(UniverSheetsConditionalFormattingUIPlugin, "type", UniverInstanceType.UNIVER_SHEET);
 UniverSheetsConditionalFormattingUIPlugin = __decorate([
-	DependentOn(UniverSheetsConditionalFormattingPlugin, UniverSheetsFormulaPlugin),
+	DependentOn(UniverRenderEnginePlugin, UniverSheetsPlugin, UniverUIPlugin, UniverSheetsFormulaPlugin, UniverSheetsConditionalFormattingPlugin, UniverSheetsUIPlugin),
 	__decorateParam(1, Inject(Injector)),
 	__decorateParam(2, Inject(ICommandService)),
 	__decorateParam(3, IConfigService)

package/lib/locale/es-ES.js

@@ -87,9 +87,9 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lastWeek: "Semana pasada",
 		nextWeek: "Semana siguiente",
 		today: "Hoy",
-		topN: "Top {0}",
+		topN: "Principales {0}",
 		bottomN: "Inferior {0}",
-		topNPercent: "Top {0}%",
+		topNPercent: "Principales {0}%",
 		bottomNPercent: "Inferior {0}%"
 	} },
 	operator: {

package/lib/locale/fa-IR.js

@@ -150,7 +150,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 	errorMessage: {
 		notBlank: "شرط نمی‌تواند خالی باشد",
 		formulaError: "فرمول اشتباه",
-		rangeError: "Bad selection"
+		rangeError: "انتخاب نامعتبر"
 	},
 	permission: { dialog: { setStyleErr: "محدوده محافظت شده است و شما مجوز تنظیم سبک‌ها را ندارید. برای تنظیم سبک‌ها، لطفا با سازنده تماس بگیرید." } }
 } };

package/lib/locale/pl-PL.js

@@ -87,9 +87,9 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lastWeek: "Poprzedni tydzień",
 		nextWeek: "Następny tydzień",
 		today: "Dzisiaj",
-		topN: "Top {0}",
+		topN: "Górne {0}",
 		bottomN: "Ostatnie {0}",
-		topNPercent: "Top {0}%",
+		topNPercent: "Górne {0}%",
 		bottomNPercent: "Ostatnie {0}%"
 	} },
 	operator: {

package/lib/locale/vi-VN.js

@@ -87,9 +87,9 @@ const locale = { "sheets-conditional-formatting-ui": {
 		lastWeek: "Tuần trước",
 		nextWeek: "Tuần sau",
 		today: "Hôm nay",
-		topN: "Top {0}",
+		topN: "Trên cùng {0}",
 		bottomN: "Cuối {0}",
-		topNPercent: "Top {0}%",
+		topNPercent: "Trên cùng {0}%",
 		bottomNPercent: "Cuối {0}%"
 	} },
 	operator: {
@@ -150,7 +150,7 @@ const locale = { "sheets-conditional-formatting-ui": {
 	errorMessage: {
 		notBlank: "Điều kiện không được để trống",
 		formulaError: "Lỗi công thức",
-		rangeError: "Bad selection"
+		rangeError: "Lựa chọn không hợp lệ"
 	},
 	permission: { dialog: { setStyleErr: "Phạm vi này đã được bảo vệ, hiện không có quyền thiết lập kiểu. Nếu cần thiết lập kiểu, vui lòng liên hệ với người tạo." } }
 } };