@univerjs/sheets-filter-ui 0.2.11 → 0.2.13

package/lib/es/index.js

@@ -2,15 +2,15 @@ var __defProp = Object.defineProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: !0 });
 var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key != "symbol" ? key + "" : key, value);
-import { CommandType, ICommandService, IUndoRedoService, IUniverInstanceService, Quantity, LocaleService, UniverInstanceType, sequenceExecute, BooleanNumber, createIdentifier, Disposable, Inject, extractPureTextFromCell, ILogService, Injector, IContextService, useDependency, ThemeService, RxDisposable, fromCallback, Tools, Plugin, DependentOn, Optional } from "@univerjs/core";
+import { CommandType, ICommandService, IUndoRedoService, IUniverInstanceService, Quantity, LocaleService, UniverInstanceType, sequenceExecute, BooleanNumber, createIdentifier, Disposable, Inject, extractPureTextFromCell, ILogService, Injector, IContextService, useDependency, ThemeService, RxDisposable, fromCallback, Tools, Plugin, DependentOn, Optional, IConfigService } from "@univerjs/core";
 import { SheetsFilterService, SetSheetsFilterRangeMutation, RemoveSheetsFilterMutation, SetSheetsFilterCriteriaMutation, ReCalcSheetsFilterMutation, CustomFilterOperator, FILTER_MUTATIONS, UniverSheetsFilterPlugin } from "@univerjs/sheets-filter";
 import { toModule, IRPCChannelService, fromModule } from "@univerjs/rpc";
-import { IMessageService, ILayoutService, useObservable, useComponentsOfPart, ComponentContainer, KeyCode, MetaKeys, MenuGroup, MenuItemType, MenuPosition, getMenuHiddenObservable, ComponentManager, IShortcutService, IMenuService } from "@univerjs/ui";
+import { IMessageService, ILayoutService, useObservable, useComponentsOfPart, ComponentContainer, KeyCode, MetaKeys, MenuItemType, getMenuHiddenObservable, RibbonStartGroup, ComponentManager, IShortcutService, IMenuManagerService } from "@univerjs/ui";
 import { BehaviorSubject, ReplaySubject, of, Subject, merge, combineLatest, throttleTime, startWith, map, shareReplay, switchMap, filter, takeUntil, distinctUntilChanged } from "rxjs";
-import { SetCellEditVisibleOperation, SheetsUIPart, whenSheetEditorFocused, getCurrentRangeDisable$, SelectionShape, getCoordByCell, SheetSkeletonManagerService, ISheetSelectionRenderService, SheetsRenderService, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController } from "@univerjs/sheets-ui";
+import { SetCellEditVisibleOperation, SheetsUIPart, whenSheetEditorFocused, SelectionShape, getCoordByCell, SheetSkeletonManagerService, ISheetSelectionRenderService, SheetsRenderService, getObservableWithExclusiveRange$, getCurrentRangeDisable$, SheetCanvasPopManagerService, SheetPermissionInterceptorBaseController } from "@univerjs/sheets-ui";
 import { Rect, Shape, IRenderManagerService } from "@univerjs/engine-render";
 import { MessageType, Select, RadioGroup, Radio, Input, Checkbox, Tooltip, Button, Segmented } from "@univerjs/design";
-import { getSheetCommandTarget, SheetsSelectionsService, isSingleCellSelection, expandToContinuousRange, RefRangeService, WorksheetFilterPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint, INTERCEPTOR_POINT, SheetInterceptorService } from "@univerjs/sheets";
+import { getSheetCommandTarget, SheetsSelectionsService, isSingleCellSelection, expandToContinuousRange, RefRangeService, INTERCEPTOR_POINT, SheetInterceptorService, WorksheetFilterPermission, WorksheetViewPermission, RangeProtectionPermissionViewPoint } from "@univerjs/sheets";
 import * as React from "react";
 import React__default, { forwardRef, useRef, createElement, useCallback, useMemo as useMemo$1, version, isValidElement, useEffect, useState } from "react";
 import ReactDOM, { flushSync } from "react-dom";
@@ -2907,55 +2907,7 @@ const SmartToggleFilterShortcut = {
   description: "sheets-filter.shortcut.smart-toggle-filter",
   preconditions: whenSheetEditorFocused,
   group: "4_sheet-edit"
-};
-function SmartToggleFilterMenuItemFactory(accessor) {
-  const sheetsFilterService = accessor.get(SheetsFilterService);
-  return {
-    id: SmartToggleSheetsFilterCommand.id,
-    group: MenuGroup.TOOLBAR_FORMULAS_INSERT,
-    type: MenuItemType.BUTTON_SELECTOR,
-    icon: "FilterSingle",
-    tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
-    positions: [MenuPosition.TOOLBAR_START],
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-    activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
-    disabled$: getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] })
-  };
-}
-__name(SmartToggleFilterMenuItemFactory, "SmartToggleFilterMenuItemFactory");
-function ClearFilterCriteriaMenuItemFactory(accessor) {
-  const sheetsFilterService = accessor.get(SheetsFilterService);
-  return {
-    id: ClearSheetsFilterCriteriaCommand.id,
-    group: MenuGroup.TOOLBAR_OTHERS,
-    type: MenuItemType.BUTTON,
-    title: "sheets-filter.toolbar.clear-filter-criteria",
-    positions: [SmartToggleSheetsFilterCommand.id],
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
-      var _a13;
-      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m2) => !m2))) != null ? _a13 : of(!0);
-    }))
-  };
-}
-__name(ClearFilterCriteriaMenuItemFactory, "ClearFilterCriteriaMenuItemFactory");
-function ReCalcFilterMenuItemFactory(accessor) {
-  const sheetsFilterService = accessor.get(SheetsFilterService);
-  return {
-    id: ReCalcSheetsFilterCommand.id,
-    group: MenuGroup.TOOLBAR_OTHERS,
-    type: MenuItemType.BUTTON,
-    title: "sheets-filter.toolbar.re-calc-filter-conditions",
-    positions: [SmartToggleSheetsFilterCommand.id],
-    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
-    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
-      var _a13;
-      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m2) => !m2))) != null ? _a13 : of(!0);
-    }))
-  };
-}
-__name(ReCalcFilterMenuItemFactory, "ReCalcFilterMenuItemFactory");
-const BUTTON_VIEWPORT = 16, FILTER_BUTTON_EMPTY = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z"), _FilterButton = class _FilterButton {
+}, BUTTON_VIEWPORT = 16, FILTER_BUTTON_EMPTY = new Path2D("M3.30363 3C2.79117 3 2.51457 3.60097 2.84788 3.99024L6.8 8.60593V12.5662C6.8 12.7184 6.8864 12.8575 7.02289 12.9249L8.76717 13.7863C8.96655 13.8847 9.2 13.7396 9.2 13.5173V8.60593L13.1521 3.99024C13.4854 3.60097 13.2088 3 12.6964 3H3.30363Z"), _FilterButton = class _FilterButton {
   static drawNoCriteria(ctx, size, fgColor, bgColor) {
     ctx.save(), Rect.drawWith(ctx, {
       radius: 2,
@@ -3044,6 +2996,9 @@ let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
     __publicField(this, "_filterButtonShapes", []);
     this._context = _context, this._injector = _injector, this._sheetSkeletonManagerService = _sheetSkeletonManagerService, this._sheetsFilterService = _sheetsFilterService, this._themeService = _themeService, this._sheetInterceptorService = _sheetInterceptorService, this._commandService = _commandService, this._selectionRenderService = _selectionRenderService, this._initRenderer();
   }
+  dispose() {
+    super.dispose(), this._disposeRendering();
+  }
   _initRenderer() {
     this._sheetSkeletonManagerService.currentSkeleton$.pipe(
       switchMap((skeletonParams) => {
@@ -3112,9 +3067,7 @@ let SheetsFilterRenderController = (_a6 = class extends RxDisposable {
         const { row, col, unitId, subUnitId } = pos;
         return unitId !== workbookId || subUnitId !== worksheetId || row !== startRow || col < startColumn || col > endColumn ? next(cell) : next({
           ...cell,
-          // @ts-ignore
           fontRenderExtension: {
-            // @ts-ignore
             ...cell == null ? void 0 : cell.fontRenderExtension,
             rightOffset: FILTER_ICON_SIZE
           }
@@ -3159,18 +3112,75 @@ SheetsFilterUIMobileController = __decorateClass$5([
   __decorateParam$5(0, IRenderManagerService),
   __decorateParam$5(1, Inject(SheetsRenderService))
 ], SheetsFilterUIMobileController);
+function SmartToggleFilterMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
+  return {
+    id: SmartToggleSheetsFilterCommand.id,
+    type: MenuItemType.BUTTON_SELECTOR,
+    icon: "FilterSingle",
+    tooltip: "sheets-filter.toolbar.smart-toggle-filter-tooltip",
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    activated$: sheetsFilterService.activeFilterModel$.pipe(map((model) => !!model)),
+    disabled$: getObservableWithExclusiveRange$(accessor, getCurrentRangeDisable$(accessor, { worksheetTypes: [WorksheetFilterPermission, WorksheetViewPermission], rangeTypes: [RangeProtectionPermissionViewPoint] }))
+  };
+}
+__name(SmartToggleFilterMenuItemFactory, "SmartToggleFilterMenuItemFactory");
+function ClearFilterCriteriaMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
+  return {
+    id: ClearSheetsFilterCriteriaCommand.id,
+    type: MenuItemType.BUTTON,
+    title: "sheets-filter.toolbar.clear-filter-criteria",
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
+      var _a13;
+      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m2) => !m2))) != null ? _a13 : of(!0);
+    }))
+  };
+}
+__name(ClearFilterCriteriaMenuItemFactory, "ClearFilterCriteriaMenuItemFactory");
+function ReCalcFilterMenuItemFactory(accessor) {
+  const sheetsFilterService = accessor.get(SheetsFilterService);
+  return {
+    id: ReCalcSheetsFilterCommand.id,
+    type: MenuItemType.BUTTON,
+    title: "sheets-filter.toolbar.re-calc-filter-conditions",
+    hidden$: getMenuHiddenObservable(accessor, UniverInstanceType.UNIVER_SHEET),
+    disabled$: sheetsFilterService.activeFilterModel$.pipe(switchMap((model) => {
+      var _a13;
+      return (_a13 = model == null ? void 0 : model.hasCriteria$.pipe(map((m2) => !m2))) != null ? _a13 : of(!0);
+    }))
+  };
+}
+__name(ReCalcFilterMenuItemFactory, "ReCalcFilterMenuItemFactory");
+const menuSchema = {
+  [RibbonStartGroup.FORMULAS_INSERT]: {
+    [SmartToggleSheetsFilterCommand.id]: {
+      order: 10,
+      menuItemFactory: SmartToggleFilterMenuItemFactory,
+      [ClearSheetsFilterCriteriaCommand.id]: {
+        order: 0,
+        menuItemFactory: ClearFilterCriteriaMenuItemFactory
+      },
+      [ReCalcSheetsFilterCommand.id]: {
+        order: 1,
+        menuItemFactory: ReCalcFilterMenuItemFactory
+      }
+    }
+  }
+};
 var __defProp$4 = Object.defineProperty, __getOwnPropDesc$4 = Object.getOwnPropertyDescriptor, __decorateClass$4 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$4(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
   return kind && result && __defProp$4(target, key, result), result;
 }, "__decorateClass$4"), __decorateParam$4 = /* @__PURE__ */ __name((index2, decorator) => (target, key) => decorator(target, key, index2), "__decorateParam$4");
-const DefaultSheetFilterUiConfig = {}, FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
+const FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
 var _a8;
 let SheetsFilterUIDesktopController = (_a8 = class extends SheetsFilterUIMobileController {
-  constructor(_config, _injector, _componentManager, _sheetsFilterPanelService, _sheetCanvasPopupService, _sheetsFilterService, _localeService, _shortcutService, _commandService, _menuService, _contextService, _messageService, sheetsRenderService, renderManagerService) {
+  constructor(_injector, _componentManager, _sheetsFilterPanelService, _sheetCanvasPopupService, _sheetsFilterService, _localeService, _shortcutService, _commandService, _menuManagerService, _contextService, _messageService, sheetsRenderService, renderManagerService) {
     super(renderManagerService, sheetsRenderService);
     __publicField(this, "_popupDisposable");
-    this._config = _config, this._injector = _injector, this._componentManager = _componentManager, this._sheetsFilterPanelService = _sheetsFilterPanelService, this._sheetCanvasPopupService = _sheetCanvasPopupService, this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._shortcutService = _shortcutService, this._commandService = _commandService, this._menuService = _menuService, this._contextService = _contextService, this._messageService = _messageService, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
+    this._injector = _injector, this._componentManager = _componentManager, this._sheetsFilterPanelService = _sheetsFilterPanelService, this._sheetCanvasPopupService = _sheetCanvasPopupService, this._sheetsFilterService = _sheetsFilterService, this._localeService = _localeService, this._shortcutService = _shortcutService, this._commandService = _commandService, this._menuManagerService = _menuManagerService, this._contextService = _contextService, this._messageService = _messageService, this._initCommands(), this._initShortcuts(), this._initMenuItems(), this._initUI();
   }
   dispose() {
     super.dispose(), this._closeFilterPopup();
@@ -3198,14 +3208,7 @@ let SheetsFilterUIDesktopController = (_a8 = class extends SheetsFilterUIMobileC
     });
   }
   _initMenuItems() {
-    const { menu = {} } = this._config;
-    [
-      SmartToggleFilterMenuItemFactory,
-      ClearFilterCriteriaMenuItemFactory,
-      ReCalcFilterMenuItemFactory
-    ].forEach((factory) => {
-      this.disposeWithMe(this._menuService.addMenuItem(this._injector.invoke(factory), menu));
-    });
+    this._menuManagerService.mergeMenu(menuSchema);
   }
   _initUI() {
     this.disposeWithMe(this._componentManager.register(FILTER_PANEL_POPUP_KEY, FilterPanel)), this.disposeWithMe(this._componentManager.register("FilterSingle", FilterSingle)), this.disposeWithMe(this._contextService.subscribeContextValue$(FILTER_PANEL_OPENED_KEY).pipe(distinctUntilChanged()).subscribe((open) => {
@@ -3225,7 +3228,6 @@ let SheetsFilterUIDesktopController = (_a8 = class extends SheetsFilterUIMobileC
     this._popupDisposable = this._sheetCanvasPopupService.attachPopupToCell(startRow, col, {
       componentKey: FILTER_PANEL_POPUP_KEY,
       direction: "horizontal",
-      closeOnSelfTarget: !0,
       onClickOutside: /* @__PURE__ */ __name(() => this._commandService.syncExecuteCommand(CloseFilterPanelOperation.id), "onClickOutside"),
       offset: [5, 0]
     });
@@ -3236,19 +3238,19 @@ let SheetsFilterUIDesktopController = (_a8 = class extends SheetsFilterUIMobileC
   }
 }, __name(_a8, "SheetsFilterUIDesktopController"), _a8);
 SheetsFilterUIDesktopController = __decorateClass$4([
-  __decorateParam$4(1, Inject(Injector)),
-  __decorateParam$4(2, Inject(ComponentManager)),
-  __decorateParam$4(3, Inject(SheetsFilterPanelService)),
-  __decorateParam$4(4, Inject(SheetCanvasPopManagerService)),
-  __decorateParam$4(5, Inject(SheetsFilterService)),
-  __decorateParam$4(6, Inject(LocaleService)),
-  __decorateParam$4(7, IShortcutService),
-  __decorateParam$4(8, ICommandService),
-  __decorateParam$4(9, IMenuService),
-  __decorateParam$4(10, IContextService),
-  __decorateParam$4(11, IMessageService),
-  __decorateParam$4(12, Inject(SheetsRenderService)),
-  __decorateParam$4(13, IRenderManagerService)
+  __decorateParam$4(0, Inject(Injector)),
+  __decorateParam$4(1, Inject(ComponentManager)),
+  __decorateParam$4(2, Inject(SheetsFilterPanelService)),
+  __decorateParam$4(3, Inject(SheetCanvasPopManagerService)),
+  __decorateParam$4(4, Inject(SheetsFilterService)),
+  __decorateParam$4(5, Inject(LocaleService)),
+  __decorateParam$4(6, IShortcutService),
+  __decorateParam$4(7, ICommandService),
+  __decorateParam$4(8, IMenuManagerService),
+  __decorateParam$4(9, IContextService),
+  __decorateParam$4(10, IMessageService),
+  __decorateParam$4(11, Inject(SheetsRenderService)),
+  __decorateParam$4(12, IRenderManagerService)
 ], SheetsFilterUIDesktopController);
 var __defProp$3 = Object.defineProperty, __getOwnPropDesc$3 = Object.getOwnPropertyDescriptor, __decorateClass$3 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$3(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -3294,6 +3296,7 @@ SheetsFilterPermissionController = __decorateClass$3([
   __decorateParam$3(3, Inject(SheetPermissionInterceptorBaseController)),
   __decorateParam$3(4, Inject(Injector))
 ], SheetsFilterPermissionController);
+const PLUGIN_CONFIG_KEY = "sheets-filter-ui.config", defaultPluginConfig = {};
 var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPropertyDescriptor, __defNormalProp$1 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$2(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp$1"), __decorateClass$2 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$2(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
     (decorator = decorators[i]) && (result = (kind ? decorator(target, key, result) : decorator(result)) || result);
@@ -3302,16 +3305,16 @@ var __defProp$2 = Object.defineProperty, __getOwnPropDesc$2 = Object.getOwnPrope
 const NAME$1 = "SHEET_FILTER_UI_PLUGIN";
 var _a10;
 let UniverSheetsFilterUIPlugin = (_a10 = class extends Plugin {
-  constructor(_config = {}, _injector, _rpcChannelService) {
-    super(), this._config = _config, this._injector = _injector, this._rpcChannelService = _rpcChannelService, this._config = Tools.deepMerge({}, DefaultSheetFilterUiConfig, this._config);
+  constructor(_config = defaultPluginConfig, _injector, _configService, _rpcChannelService) {
+    super(), this._config = _config, this._injector = _injector, this._configService = _configService, this._rpcChannelService = _rpcChannelService;
+    const { menu, ...rest } = this._config;
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
       [SheetsFilterPanelService],
       [SheetsFilterPermissionController],
-      [SheetsFilterUIDesktopController, {
-        useFactory: /* @__PURE__ */ __name(() => this._injector.createInstance(SheetsFilterUIDesktopController, this._config), "useFactory")
-      }]
+      [SheetsFilterUIDesktopController]
     ].forEach((d2) => this._injector.add(d2)), this._config.useRemoteFilterValuesGenerator && this._rpcChannelService && this._injector.add([ISheetsGenerateFilterValuesService, {
       useFactory: /* @__PURE__ */ __name(() => toModule(
         this._rpcChannelService.requestChannel(SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME)
@@ -3330,7 +3333,8 @@ __publicField$1(UniverSheetsFilterUIPlugin, "pluginName", NAME$1);
 UniverSheetsFilterUIPlugin = __decorateClass$2([
   DependentOn(UniverSheetsFilterPlugin),
   __decorateParam$2(1, Inject(Injector)),
-  __decorateParam$2(2, Optional(IRPCChannelService))
+  __decorateParam$2(2, IConfigService),
+  __decorateParam$2(3, Optional(IRPCChannelService))
 ], UniverSheetsFilterUIPlugin);
 var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPropertyDescriptor, __defNormalProp2 = /* @__PURE__ */ __name((obj, key, value) => key in obj ? __defProp$1(obj, key, { enumerable: !0, configurable: !0, writable: !0, value }) : obj[key] = value, "__defNormalProp"), __decorateClass$1 = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc$1(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)
@@ -3340,8 +3344,10 @@ var __defProp$1 = Object.defineProperty, __getOwnPropDesc$1 = Object.getOwnPrope
 const NAME = "SHEET_FILTER_UI_PLUGIN";
 var _a11;
 let UniverSheetsFilterMobileUIPlugin = (_a11 = class extends Plugin {
-  constructor(_config = {}, _injector) {
-    super(), this._config = _config, this._injector = _injector, this._config = Tools.deepMerge({}, DefaultSheetFilterUiConfig, this._config);
+  constructor(_config = defaultPluginConfig, _injector, _configService) {
+    super(), this._config = _config, this._injector = _injector, this._configService = _configService;
+    const { menu, ...rest } = this._config;
+    menu && this._configService.setConfig("menu", menu, { merge: !0 }), this._configService.setConfig(PLUGIN_CONFIG_KEY, rest);
   }
   onStarting() {
     [
@@ -3360,7 +3366,8 @@ __publicField2(UniverSheetsFilterMobileUIPlugin, "type", UniverInstanceType.UNIV
 __publicField2(UniverSheetsFilterMobileUIPlugin, "pluginName", NAME);
 UniverSheetsFilterMobileUIPlugin = __decorateClass$1([
   DependentOn(UniverSheetsFilterPlugin),
-  __decorateParam$1(1, Inject(Injector))
+  __decorateParam$1(1, Inject(Injector)),
+  __decorateParam$1(2, IConfigService)
 ], UniverSheetsFilterMobileUIPlugin);
 var __defProp2 = Object.defineProperty, __getOwnPropDesc = Object.getOwnPropertyDescriptor, __decorateClass = /* @__PURE__ */ __name((decorators, target, key, kind) => {
   for (var result = kind > 1 ? void 0 : kind ? __getOwnPropDesc(target, key) : target, i = decorators.length - 1, decorator; i >= 0; i--)

package/lib/types/controllers/config.schema.d.ts

@@ -0,0 +1,8 @@
+import { MenuConfig } from '@univerjs/ui';
+export declare const PLUGIN_CONFIG_KEY = "sheets-filter-ui.config";
+export declare const configSymbol: unique symbol;
+export interface IUniverSheetsFilterUIConfig {
+    menu?: MenuConfig;
+    useRemoteFilterValuesGenerator?: boolean;
+}
+export declare const defaultPluginConfig: IUniverSheetsFilterUIConfig;

package/lib/types/controllers/menu.schema.d.ts

@@ -0,0 +1,2 @@
+import { MenuSchemaType } from '@univerjs/ui';
+export declare const menuSchema: MenuSchemaType;

package/lib/types/controllers/sheets-filter-ui-desktop.controller.d.ts

@@ -1,21 +1,15 @@
 import { ICommandService, IContextService, Injector, LocaleService } from '@univerjs/core';
-import { ComponentManager, IMenuService, IMessageService, IShortcutService, MenuConfig } from '@univerjs/ui';
+import { ComponentManager, IMenuManagerService, IMessageService, IShortcutService } from '@univerjs/ui';
 import { SheetCanvasPopManagerService, SheetsRenderService } from '@univerjs/sheets-ui';
 import { IRenderManagerService } from '@univerjs/engine-render';
 import { SheetsFilterService } from '@univerjs/sheets-filter';
 import { SheetsFilterPanelService } from '../services/sheets-filter-panel.service';
 import { SheetsFilterUIMobileController } from './sheets-filter-ui-mobile.controller';
-export interface IUniverSheetsFilterUIConfig {
-    menu: MenuConfig;
-    useRemoteFilterValuesGenerator?: boolean;
-}
-export declare const DefaultSheetFilterUiConfig: {};
 export declare const FILTER_PANEL_POPUP_KEY = "FILTER_PANEL_POPUP";
 /**
  * This controller controls the UI of "filter" features. Menus, commands and filter panel etc. Except for the rendering.
  */
 export declare class SheetsFilterUIDesktopController extends SheetsFilterUIMobileController {
-    private readonly _config;
     private readonly _injector;
     private readonly _componentManager;
     private readonly _sheetsFilterPanelService;
@@ -24,10 +18,10 @@ export declare class SheetsFilterUIDesktopController extends SheetsFilterUIMobil
     private _localeService;
     private readonly _shortcutService;
     private readonly _commandService;
-    private readonly _menuService;
+    private readonly _menuManagerService;
     private readonly _contextService;
     private readonly _messageService;
-    constructor(_config: Partial<IUniverSheetsFilterUIConfig>, _injector: Injector, _componentManager: ComponentManager, _sheetsFilterPanelService: SheetsFilterPanelService, _sheetCanvasPopupService: SheetCanvasPopManagerService, _sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _shortcutService: IShortcutService, _commandService: ICommandService, _menuService: IMenuService, _contextService: IContextService, _messageService: IMessageService, sheetsRenderService: SheetsRenderService, renderManagerService: IRenderManagerService);
+    constructor(_injector: Injector, _componentManager: ComponentManager, _sheetsFilterPanelService: SheetsFilterPanelService, _sheetCanvasPopupService: SheetCanvasPopManagerService, _sheetsFilterService: SheetsFilterService, _localeService: LocaleService, _shortcutService: IShortcutService, _commandService: ICommandService, _menuManagerService: IMenuManagerService, _contextService: IContextService, _messageService: IMessageService, sheetsRenderService: SheetsRenderService, renderManagerService: IRenderManagerService);
     dispose(): void;
     private _initShortcuts;
     private _initCommands;

package/lib/types/filter-ui-desktop.plugin.d.ts

@@ -1,16 +1,17 @@
-import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+import { IConfigService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
 import { IRPCChannelService } from '@univerjs/rpc';
-import { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui-desktop.controller';
+import { IUniverSheetsFilterUIConfig } from './controllers/config.schema';
 /**
  * The plugin for the desktop version of the sheets filter UI. Its type is {@link UniverInstanceType.UNIVER_SHEET}.
  */
 export declare class UniverSheetsFilterUIPlugin extends Plugin {
     private readonly _config;
     protected readonly _injector: Injector;
+    private readonly _configService;
     private readonly _rpcChannelService?;
     static type: UniverInstanceType;
     static pluginName: string;
-    constructor(_config: Partial<IUniverSheetsFilterUIConfig>, _injector: Injector, _rpcChannelService?: IRPCChannelService | undefined);
+    constructor(_config: Partial<IUniverSheetsFilterUIConfig> | undefined, _injector: Injector, _configService: IConfigService, _rpcChannelService?: IRPCChannelService | undefined);
     onStarting(): void;
     onReady(): void;
     onRendered(): void;

package/lib/types/filter-ui-mobile.plugin.d.ts

@@ -1,11 +1,12 @@
-import { Injector, Plugin, UniverInstanceType } from '@univerjs/core';
-import { IUniverSheetsFilterUIConfig } from './controllers/sheets-filter-ui-desktop.controller';
+import { IConfigService, Injector, Plugin, UniverInstanceType } from '@univerjs/core';
+import { IUniverSheetsFilterUIConfig } from './controllers/config.schema';
 export declare class UniverSheetsFilterMobileUIPlugin extends Plugin {
     private readonly _config;
     protected readonly _injector: Injector;
+    private readonly _configService;
     static type: UniverInstanceType;
     static pluginName: string;
-    constructor(_config: Partial<IUniverSheetsFilterUIConfig>, _injector: Injector);
+    constructor(_config: Partial<IUniverSheetsFilterUIConfig> | undefined, _injector: Injector, _configService: IConfigService);
     onStarting(): void;
     onReady(): void;
     onRendered(): void;

package/lib/types/services/sheets-filter-panel.service.d.ts

@@ -30,7 +30,7 @@ export interface ISheetsFilterPanelService {
      */
     terminate(): boolean;
 }
-export declare const ISheetsFilterPanelService: import('@univerjs/core').IdentifierDecorator<ISheetsFilterPanelService>;
+export declare const ISheetsFilterPanelService: import('@wendellhu/redi').IdentifierDecorator<ISheetsFilterPanelService>;
 export interface IFilterByModel extends IDisposable {
     canApply$: Observable<boolean>;
     deltaCol(offset: number): void;

package/lib/types/views/render-modules/sheets-filter.render-controller.d.ts

@@ -16,6 +16,7 @@ export declare class SheetsFilterRenderController extends RxDisposable implement
     private _buttonRenderDisposable;
     private _filterButtonShapes;
     constructor(_context: IRenderContext<Workbook>, _injector: Injector, _sheetSkeletonManagerService: SheetSkeletonManagerService, _sheetsFilterService: SheetsFilterService, _themeService: ThemeService, _sheetInterceptorService: SheetInterceptorService, _commandService: ICommandService, _selectionRenderService: ISheetSelectionRenderService);
+    dispose(): void;
     private _initRenderer;
     private _renderRange;
     private _renderButtons;

package/lib/types/worker/generate-filter-values.service.d.ts

@@ -12,7 +12,7 @@ export interface ISheetsGenerateFilterValuesService {
     }): Promise<IFilterByValueItem[]>;
 }
 export declare const SHEETS_GENERATE_FILTER_VALUES_SERVICE_NAME = "sheets-filter.generate-filter-values.service";
-export declare const ISheetsGenerateFilterValuesService: import('@univerjs/core').IdentifierDecorator<ISheetsGenerateFilterValuesService>;
+export declare const ISheetsGenerateFilterValuesService: import('@wendellhu/redi').IdentifierDecorator<ISheetsGenerateFilterValuesService>;
 export declare class SheetsGenerateFilterValuesService extends Disposable {
     private readonly _localeService;
     private readonly _univerInstanceService;