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

package/lib/cjs/index.js

@@ -1479,7 +1479,7 @@ const OpenFilterPanelOperation = {
 	handler: (accessor, params) => {
 		const contextService = accessor.get(_univerjs_core.IContextService);
 		const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
-		const sheetsFilterPanelService = accessor.get(SheetsFilterPanelService);
+		const sheetsFilterPanelService = accessor.get(ISheetsFilterPanelService);
 		const commandService = accessor.get(_univerjs_core.ICommandService);
 		const editorBridgeService = accessor.has(_univerjs_sheets_ui.IEditorBridgeService) ? accessor.get(_univerjs_sheets_ui.IEditorBridgeService) : null;
 		if (editorBridgeService === null || editorBridgeService === void 0 ? void 0 : editorBridgeService.isVisible().visible) commandService.syncExecuteCommand(_univerjs_sheets_ui.SetCellEditVisibleOperation.id, { visible: false });
@@ -1496,7 +1496,7 @@ const CloseFilterPanelOperation = {
 	type: _univerjs_core.CommandType.OPERATION,
 	handler: (accessor) => {
 		const contextService = accessor.get(_univerjs_core.IContextService);
-		const sheetsFilterPanelService = accessor.get(SheetsFilterPanelService);
+		const sheetsFilterPanelService = accessor.get(ISheetsFilterPanelService);
 		const layoutService = accessor.get(_univerjs_ui.ILayoutService, _univerjs_core.Quantity.OPTIONAL);
 		if (contextService.getContextValue("FILTER_PANEL_OPENED")) {
 			contextService.setContextValue(FILTER_PANEL_OPENED_KEY, false);
@@ -1511,14 +1511,73 @@ const ChangeFilterByOperation = {
 	type: _univerjs_core.CommandType.OPERATION,
 	handler: (accessor, params) => {
 		const { filterBy } = params;
-		return accessor.get(SheetsFilterPanelService).changeFilterBy(filterBy);
+		return accessor.get(ISheetsFilterPanelService).changeFilterBy(filterBy);
 	}
 };
 
+//#endregion
+//#region src/menu/sheets-filter.menu.ts
+function SmartToggleFilterMenuItemFactory(accessor) {
+	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
+	return {
+		id: _univerjs_sheets_filter.SmartToggleSheetsFilterCommand.id,
+		type: _univerjs_ui.MenuItemType.BUTTON_SELECTOR,
+		icon: "FilterIcon",
+		tooltip: "sheets-filter-ui.toolbar.smart-toggle-filter-tooltip",
+		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
+		activated$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.map)((model) => !!model)),
+		disabled$: (0, _univerjs_sheets_ui.getObservableWithExclusiveRange$)(accessor, (0, _univerjs_sheets_ui.getCurrentRangeDisable$)(accessor, {
+			worksheetTypes: [_univerjs_sheets.WorksheetFilterPermission, _univerjs_sheets.WorksheetViewPermission],
+			rangeTypes: [_univerjs_sheets.RangeProtectionPermissionViewPoint]
+		}))
+	};
+}
+function ClearFilterCriteriaMenuItemFactory(accessor) {
+	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
+	return {
+		id: _univerjs_sheets_filter.ClearSheetsFilterCriteriaCommand.id,
+		type: _univerjs_ui.MenuItemType.BUTTON,
+		title: "sheets-filter-ui.toolbar.clear-filter-criteria",
+		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
+		disabled$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.switchMap)((model) => {
+			var _model$hasCriteria$$p;
+			return (_model$hasCriteria$$p = model === null || model === void 0 ? void 0 : model.hasCriteria$.pipe((0, rxjs.map)((m) => !m))) !== null && _model$hasCriteria$$p !== void 0 ? _model$hasCriteria$$p : (0, rxjs.of)(true);
+		}))
+	};
+}
+function ReCalcFilterMenuItemFactory(accessor) {
+	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
+	return {
+		id: _univerjs_sheets_filter.ReCalcSheetsFilterCommand.id,
+		type: _univerjs_ui.MenuItemType.BUTTON,
+		title: "sheets-filter-ui.toolbar.re-calc-filter-conditions",
+		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
+		disabled$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.switchMap)((model) => {
+			var _model$hasCriteria$$p2;
+			return (_model$hasCriteria$$p2 = model === null || model === void 0 ? void 0 : model.hasCriteria$.pipe((0, rxjs.map)((m) => !m))) !== null && _model$hasCriteria$$p2 !== void 0 ? _model$hasCriteria$$p2 : (0, rxjs.of)(true);
+		}))
+	};
+}
+
+//#endregion
+//#region src/menu/schema.ts
+const menuSchema = { [_univerjs_ui.RibbonDataGroup.ORGANIZATION]: { [_univerjs_sheets_filter.SmartToggleSheetsFilterCommand.id]: {
+	order: 2,
+	menuItemFactory: SmartToggleFilterMenuItemFactory,
+	[_univerjs_sheets_filter.ClearSheetsFilterCriteriaCommand.id]: {
+		order: 0,
+		menuItemFactory: ClearFilterCriteriaMenuItemFactory
+	},
+	[_univerjs_sheets_filter.ReCalcSheetsFilterCommand.id]: {
+		order: 1,
+		menuItemFactory: ReCalcFilterMenuItemFactory
+	}
+} } };
+
 //#endregion
 //#region package.json
 var name = "@univerjs/sheets-filter-ui";
-var version = "1.0.0-alpha.2";
+var version = "1.0.0-alpha.4";
 
 //#endregion
 //#region src/config/config.ts
@@ -1595,6 +1654,28 @@ function CheckedIcon() {
 
 //#endregion
 //#region src/views/components/SheetsFilterByConditionsPanel.tsx
+const PRIMARY_CONDITION_GROUPS = [
+	[FilterConditionItems.NONE],
+	[FilterConditionItems.EMPTY, FilterConditionItems.NOT_EMPTY],
+	[
+		FilterConditionItems.TEXT_CONTAINS,
+		FilterConditionItems.DOES_NOT_CONTAIN,
+		FilterConditionItems.STARTS_WITH,
+		FilterConditionItems.ENDS_WITH,
+		FilterConditionItems.EQUALS
+	],
+	[
+		FilterConditionItems.GREATER_THAN,
+		FilterConditionItems.GREATER_THAN_OR_EQUAL,
+		FilterConditionItems.LESS_THAN,
+		FilterConditionItems.LESS_THAN_OR_EQUAL,
+		FilterConditionItems.EQUAL,
+		FilterConditionItems.NOT_EQUAL,
+		FilterConditionItems.BETWEEN,
+		FilterConditionItems.NOT_BETWEEN
+	],
+	[FilterConditionItems.CUSTOM]
+];
 /**
 * Filter by conditions.
 */
@@ -1608,11 +1689,17 @@ function FilterByCondition(props) {
 	const onRadioChange = (0, react.useCallback)((key) => {
 		model.onConditionFormChange({ and: key === "AND" });
 	}, [model]);
-	const primaryOptions = usePrimaryOptions(localeService);
+	const primaryOptions = PRIMARY_CONDITION_GROUPS.map((group) => ({ options: group.map((conditionItem) => ({
+		label: localeService.t(conditionItem.label),
+		value: conditionItem.operator
+	})) }));
 	const onPrimaryConditionChange = (0, react.useCallback)((value) => {
 		model.onPrimaryConditionChange(value);
 	}, [model]);
-	const secondaryOptions = useSecondaryOptions(localeService);
+	const secondaryOptions = FilterConditionItems.ALL_CONDITIONS.filter((conditionItem) => conditionItem.numOfParameters !== 2).map((conditionItem) => ({
+		label: localeService.t(conditionItem.label),
+		value: conditionItem.operator
+	}));
 	const onFormParamsChange = (0, react.useCallback)((diffParams) => {
 		model.onConditionFormChange(diffParams);
 	}, [model]);
@@ -1670,87 +1757,6 @@ function FilterByCondition(props) {
 		}) : null] })
 	});
 }
-function usePrimaryOptions(localeService) {
-	return (0, react.useMemo)(() => [
-		{ options: [{
-			label: localeService.t(FilterConditionItems.NONE.label),
-			value: FilterConditionItems.NONE.operator
-		}] },
-		{ options: [{
-			label: localeService.t(FilterConditionItems.EMPTY.label),
-			value: FilterConditionItems.EMPTY.operator
-		}, {
-			label: localeService.t(FilterConditionItems.NOT_EMPTY.label),
-			value: FilterConditionItems.NOT_EMPTY.operator
-		}] },
-		{ options: [
-			{
-				label: localeService.t(FilterConditionItems.TEXT_CONTAINS.label),
-				value: FilterConditionItems.TEXT_CONTAINS.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.DOES_NOT_CONTAIN.label),
-				value: FilterConditionItems.DOES_NOT_CONTAIN.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.STARTS_WITH.label),
-				value: FilterConditionItems.STARTS_WITH.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.ENDS_WITH.label),
-				value: FilterConditionItems.ENDS_WITH.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.EQUALS.label),
-				value: FilterConditionItems.EQUALS.operator
-			}
-		] },
-		{ options: [
-			{
-				label: localeService.t(FilterConditionItems.GREATER_THAN.label),
-				value: FilterConditionItems.GREATER_THAN.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.GREATER_THAN_OR_EQUAL.label),
-				value: FilterConditionItems.GREATER_THAN_OR_EQUAL.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.LESS_THAN.label),
-				value: FilterConditionItems.LESS_THAN.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.LESS_THAN_OR_EQUAL.label),
-				value: FilterConditionItems.LESS_THAN_OR_EQUAL.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.EQUAL.label),
-				value: FilterConditionItems.EQUAL.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.NOT_EQUAL.label),
-				value: FilterConditionItems.NOT_EQUAL.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.BETWEEN.label),
-				value: FilterConditionItems.BETWEEN.operator
-			},
-			{
-				label: localeService.t(FilterConditionItems.NOT_BETWEEN.label),
-				value: FilterConditionItems.NOT_BETWEEN.operator
-			}
-		] },
-		{ options: [{
-			label: localeService.t(FilterConditionItems.CUSTOM.label),
-			value: FilterConditionItems.CUSTOM.operator
-		}] }
-	], [localeService.getCurrentLocale(), localeService]);
-}
-function useSecondaryOptions(localeService) {
-	return (0, react.useMemo)(() => FilterConditionItems.ALL_CONDITIONS.filter((c) => c.numOfParameters !== 2).map((c) => ({
-		label: localeService.t(c.label),
-		value: c.operator
-	})), [localeService.getCurrentLocale(), localeService]);
-}
 
 //#endregion
 //#region src/views/components/SheetsFilterByValuesPanel.tsx
@@ -1868,10 +1874,11 @@ function FilterByValue(props) {
 //#region src/views/components/SheetsFilterSyncSwitch.tsx
 function FilterSyncSwitch() {
 	const sheetsFilterSyncController = (0, _univerjs_ui.useDependency)(_univerjs_sheets_filter.SheetsFilterSyncController);
-	if (!(0, _univerjs_ui.useObservable)(sheetsFilterSyncController.visible$, void 0, true)) return null;
+	const visible = (0, _univerjs_ui.useObservable)(sheetsFilterSyncController.visible$, void 0, true);
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const messageService = (0, _univerjs_ui.useDependency)(_univerjs_ui.IMessageService);
 	const enabled = (0, _univerjs_ui.useObservable)(sheetsFilterSyncController.enabled$, void 0, true);
+	if (!visible) return null;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
 		className: "univer-mt-2 univer-flex univer-items-center univer-justify-between univer-text-sm univer-text-gray-900 dark:!univer-text-gray-200",
 		children: [/* @__PURE__ */ (0, react_jsx_runtime.jsxs)("div", {
@@ -1898,6 +1905,20 @@ function FilterSyncSwitch() {
 
 //#endregion
 //#region src/views/components/SheetsFilterPanel.tsx
+const FILTER_BY_OPTIONS = [
+	{
+		label: "sheets-filter-ui.panel.by-values",
+		value: _univerjs_sheets_filter.FilterBy.VALUES
+	},
+	{
+		label: "sheets-filter-ui.panel.by-colors",
+		value: _univerjs_sheets_filter.FilterBy.COLORS
+	},
+	{
+		label: "sheets-filter-ui.panel.by-conditions",
+		value: _univerjs_sheets_filter.FilterBy.CONDITIONS
+	}
+];
 /**
 * This Filter Panel component is used to filter the data in the sheet.
 *
@@ -1905,13 +1926,16 @@ function FilterSyncSwitch() {
 */
 function FilterPanel() {
 	var _filterService$active;
-	const sheetsFilterPanelService = (0, _univerjs_ui.useDependency)(SheetsFilterPanelService);
+	const sheetsFilterPanelService = (0, _univerjs_ui.useDependency)(ISheetsFilterPanelService);
 	const localeService = (0, _univerjs_ui.useDependency)(_univerjs_core.LocaleService);
 	const commandService = (0, _univerjs_ui.useDependency)(_univerjs_core.ICommandService);
 	const filterBy = (0, _univerjs_ui.useObservable)(sheetsFilterPanelService.filterBy$, void 0, true);
 	const filterByModel = (0, _univerjs_ui.useObservable)(sheetsFilterPanelService.filterByModel$, void 0, false);
 	const canApply = (0, _univerjs_ui.useObservable)(() => (filterByModel === null || filterByModel === void 0 ? void 0 : filterByModel.canApply$) || (0, rxjs.of)(false), void 0, false, [filterByModel]);
-	const items = useFilterByOptions(localeService);
+	const items = FILTER_BY_OPTIONS.map((option) => ({
+		...option,
+		label: localeService.t(option.label)
+	}));
 	const clearFilterDisabled = !(0, _univerjs_ui.useObservable)(sheetsFilterPanelService.hasCriteria$);
 	const onFilterByTypeChange = (0, react.useCallback)((value) => {
 		commandService.executeCommand(ChangeFilterByOperation.id, { filterBy: value });
@@ -1981,22 +2005,6 @@ function FilterPanel() {
 	});
 }
 const FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
-function useFilterByOptions(localeService) {
-	return (0, react.useMemo)(() => [
-		{
-			label: localeService.t("sheets-filter-ui.panel.by-values"),
-			value: _univerjs_sheets_filter.FilterBy.VALUES
-		},
-		{
-			label: localeService.t("sheets-filter-ui.panel.by-colors"),
-			value: _univerjs_sheets_filter.FilterBy.COLORS
-		},
-		{
-			label: localeService.t("sheets-filter-ui.panel.by-conditions"),
-			value: _univerjs_sheets_filter.FilterBy.CONDITIONS
-		}
-	], [localeService.getCurrentLocale(), localeService]);
-}
 
 //#endregion
 //#region src/controllers/components.controller.ts
@@ -2435,65 +2443,6 @@ UniverSheetsFilterMobileUIPlugin = __decorate([
 	__decorateParam(2, _univerjs_core.IConfigService)
 ], UniverSheetsFilterMobileUIPlugin);
 
-//#endregion
-//#region src/menu/sheets-filter.menu.ts
-function SmartToggleFilterMenuItemFactory(accessor) {
-	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
-	return {
-		id: _univerjs_sheets_filter.SmartToggleSheetsFilterCommand.id,
-		type: _univerjs_ui.MenuItemType.BUTTON_SELECTOR,
-		icon: "FilterIcon",
-		tooltip: "sheets-filter-ui.toolbar.smart-toggle-filter-tooltip",
-		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
-		activated$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.map)((model) => !!model)),
-		disabled$: (0, _univerjs_sheets_ui.getObservableWithExclusiveRange$)(accessor, (0, _univerjs_sheets_ui.getCurrentRangeDisable$)(accessor, {
-			worksheetTypes: [_univerjs_sheets.WorksheetFilterPermission, _univerjs_sheets.WorksheetViewPermission],
-			rangeTypes: [_univerjs_sheets.RangeProtectionPermissionViewPoint]
-		}))
-	};
-}
-function ClearFilterCriteriaMenuItemFactory(accessor) {
-	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
-	return {
-		id: _univerjs_sheets_filter.ClearSheetsFilterCriteriaCommand.id,
-		type: _univerjs_ui.MenuItemType.BUTTON,
-		title: "sheets-filter-ui.toolbar.clear-filter-criteria",
-		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
-		disabled$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.switchMap)((model) => {
-			var _model$hasCriteria$$p;
-			return (_model$hasCriteria$$p = model === null || model === void 0 ? void 0 : model.hasCriteria$.pipe((0, rxjs.map)((m) => !m))) !== null && _model$hasCriteria$$p !== void 0 ? _model$hasCriteria$$p : (0, rxjs.of)(true);
-		}))
-	};
-}
-function ReCalcFilterMenuItemFactory(accessor) {
-	const sheetsFilterService = accessor.get(_univerjs_sheets_filter.SheetsFilterService);
-	return {
-		id: _univerjs_sheets_filter.ReCalcSheetsFilterCommand.id,
-		type: _univerjs_ui.MenuItemType.BUTTON,
-		title: "sheets-filter-ui.toolbar.re-calc-filter-conditions",
-		hidden$: (0, _univerjs_ui.getMenuHiddenObservable)(accessor, _univerjs_core.UniverInstanceType.UNIVER_SHEET),
-		disabled$: sheetsFilterService.activeFilterModel$.pipe((0, rxjs.switchMap)((model) => {
-			var _model$hasCriteria$$p2;
-			return (_model$hasCriteria$$p2 = model === null || model === void 0 ? void 0 : model.hasCriteria$.pipe((0, rxjs.map)((m) => !m))) !== null && _model$hasCriteria$$p2 !== void 0 ? _model$hasCriteria$$p2 : (0, rxjs.of)(true);
-		}))
-	};
-}
-
-//#endregion
-//#region src/menu/schema.ts
-const menuSchema = { [_univerjs_ui.RibbonDataGroup.ORGANIZATION]: { [_univerjs_sheets_filter.SmartToggleSheetsFilterCommand.id]: {
-	order: 2,
-	menuItemFactory: SmartToggleFilterMenuItemFactory,
-	[_univerjs_sheets_filter.ClearSheetsFilterCriteriaCommand.id]: {
-		order: 0,
-		menuItemFactory: ClearFilterCriteriaMenuItemFactory
-	},
-	[_univerjs_sheets_filter.ReCalcSheetsFilterCommand.id]: {
-		order: 1,
-		menuItemFactory: ReCalcFilterMenuItemFactory
-	}
-} } };
-
 //#endregion
 //#region src/controllers/sheets-filter.shortcut.ts
 const SmartToggleFilterShortcut = {
@@ -2581,7 +2530,7 @@ let SheetsFilterUIDesktopController = class SheetsFilterUIDesktopController exte
 };
 SheetsFilterUIDesktopController = __decorate([
 	__decorateParam(0, (0, _univerjs_core.Inject)(_univerjs_core.Injector)),
-	__decorateParam(1, (0, _univerjs_core.Inject)(SheetsFilterPanelService)),
+	__decorateParam(1, ISheetsFilterPanelService),
 	__decorateParam(2, (0, _univerjs_core.Inject)(_univerjs_sheets_ui.SheetCanvasPopManagerService)),
 	__decorateParam(3, (0, _univerjs_core.Inject)(_univerjs_sheets_filter.SheetsFilterService)),
 	__decorateParam(4, (0, _univerjs_core.Inject)(_univerjs_core.LocaleService)),
@@ -2611,7 +2560,7 @@ let UniverSheetsFilterUIPlugin = class UniverSheetsFilterUIPlugin extends _unive
 		this._injector.add([ComponentsController]);
 		this._injector.get(ComponentsController);
 		(0, _univerjs_core.registerDependencies)(this._injector, [
-			[SheetsFilterPanelService],
+			[ISheetsFilterPanelService, { useClass: SheetsFilterPanelService }],
 			[SheetsFilterPermissionController],
 			[SheetsFilterUIDesktopController]
 		]);
@@ -2668,6 +2617,7 @@ UniverSheetsFilterUIWorkerPlugin = __decorate([
 exports.ChangeFilterByOperation = ChangeFilterByOperation;
 exports.CloseFilterPanelOperation = CloseFilterPanelOperation;
 exports.OpenFilterPanelOperation = OpenFilterPanelOperation;
+exports.SheetsFilterUIMenuSchema = menuSchema;
 Object.defineProperty(exports, 'UniverSheetsFilterMobileUIPlugin', {
   enumerable: true,
   get: function () {