Reuse definitions

mui · Feb 16, 2023 · 97dfb27 · 97dfb27
1 parent ea6384b
commit 97dfb27
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/packages/grid/x-data-grid/src/components/panel/filterPanel/GridFilterInputSingleSelect.tsx b/packages/grid/x-data-grid/src/components/panel/filterPanel/GridFilterInputSingleSelect.tsx
@@ -4,15 +4,15 @@ import { TextFieldProps } from '@mui/material/TextField';
 import { unstable_useId as useId } from '@mui/utils';
 import MenuItem from '@mui/material/MenuItem';
 import { GridFilterInputValueProps } from './GridFilterInputValueProps';
-import { GridSingleSelectColDef, ValueOptions } from '../../../models/colDef/gridColDef';
+import { GridSingleSelectColDef } from '../../../models/colDef/gridColDef';
 import { useGridRootProps } from '../../../hooks/utils/useGridRootProps';
 import { getValueFromValueOptions, isSingleSelectColDef } from './filterPanelUtils';
 
 const renderSingleSelectOptions = (
   { valueOptions, field }: GridSingleSelectColDef,
   OptionComponent: React.ElementType,
-  getOptionLabel: (value: ValueOptions) => string,
-  getOptionValue: (value: ValueOptions) => any,
+  getOptionLabel: NonNullable<GridSingleSelectColDef['getOptionLabel']>,
+  getOptionValue: NonNullable<GridSingleSelectColDef['getOptionValue']>,
 ) => {
   const iterableColumnValues =
     typeof valueOptions === 'function'

diff --git a/packages/grid/x-data-grid/src/components/panel/filterPanel/filterPanelUtils.ts b/packages/grid/x-data-grid/src/components/panel/filterPanel/filterPanelUtils.ts
@@ -11,7 +11,7 @@ export function isSingleSelectColDef(colDef: GridColDef | null): colDef is GridS
 export function getValueFromValueOptions(
   value: string,
   valueOptions: any[] | undefined,
-  getOptionValue: (value: ValueOptions) => any,
+  getOptionValue: NonNullable<GridSingleSelectColDef['getOptionValue']>,
 ) {
   if (valueOptions === undefined) {
     return undefined;