material-react-table 0.7.4 → 0.7.5

package/dist/menus/{MRT_FilterTypeMenu.d.ts → MRT_FilterOptionMenu.d.ts}

@@ -7,5 +7,5 @@ interface Props {
     setAnchorEl: (anchorEl: HTMLElement | null) => void;
     tableInstance: MRT_TableInstance;
 }
-export declare const MRT_FilterTypeMenu: FC<Props>;
+export declare const MRT_FilterOptionMenu: FC<Props>;
 export {};

package/dist/utils.d.ts

@@ -1,12 +1,12 @@
 import { ColumnDef, Table } from '@tanstack/react-table';
-import { MRT_ColumnDef, MRT_FilterType } from '.';
+import { MRT_ColumnDef, MRT_FilterFn } from '.';
 export declare const getAllLeafColumnDefs: (columns: MRT_ColumnDef[]) => MRT_ColumnDef[];
-export declare const createGroup: <D extends Record<string, any> = {}>(table: Table<D>, column: MRT_ColumnDef<D>, currentFilterTypes: {
-    [key: string]: MRT_FilterType;
+export declare const createGroup: <D extends Record<string, any> = {}>(table: Table<D>, column: MRT_ColumnDef<D>, currentFilterFns: {
+    [key: string]: MRT_FilterFn<{}>;
 }) => ColumnDef<D>;
-export declare const createDataColumn: <D extends Record<string, any> = {}>(table: Table<D>, column: MRT_ColumnDef<D>, currentFilterTypes: {
-    [key: string]: MRT_FilterType;
+export declare const createDataColumn: <D extends Record<string, any> = {}>(table: Table<D>, column: MRT_ColumnDef<D>, currentFilterFns: {
+    [key: string]: MRT_FilterFn<{}>;
 }) => ColumnDef<D>;
-export declare const createDisplayColumn: <D extends Record<string, any> = {}>(table: Table<D>, column: Pick<MRT_ColumnDef<D>, "footer" | "columns" | "id" | "accessorKey" | "accessorFn" | "cell" | "meta" | "enableHiding" | "defaultCanHide" | "defaultIsVisible" | "enablePinning" | "defaultCanPin" | "filterFn" | "enableAllFilters" | "enableColumnFilter" | "enableGlobalFilter" | "defaultCanFilter" | "defaultCanColumnFilter" | "defaultCanGlobalFilter" | "sortingFn" | "sortDescFirst" | "enableSorting" | "enableMultiSort" | "defaultCanSort" | "invertSorting" | "sortUndefined" | "aggregationFn" | "aggregateValue" | "aggregatedCell" | "enableGrouping" | "defaultCanGroup" | "enableResizing" | "defaultCanResize" | "width" | "minWidth" | "maxWidth" | "Edit" | "Filter" | "Footer" | "Header" | "Cell" | "enableClickToCopy" | "enableColumnActions" | "enableEditing" | "enabledColumnFilterTypes" | "filter" | "filterSelectOptions" | "muiTableBodyCellCopyButtonProps" | "muiTableBodyCellEditTextFieldProps" | "muiTableBodyCellProps" | "muiTableFooterCellProps" | "muiTableHeadCellColumnActionsButtonProps" | "muiTableHeadCellFilterTextFieldProps" | "muiTableHeadCellProps" | "onCellEditBlur" | "onCellEditChange" | "onColumnFilterValueChange"> & {
+export declare const createDisplayColumn: <D extends Record<string, any> = {}>(table: Table<D>, column: Pick<MRT_ColumnDef<D>, "footer" | "columns" | "filterFn" | "id" | "accessorKey" | "accessorFn" | "cell" | "meta" | "enableHiding" | "defaultCanHide" | "defaultIsVisible" | "enablePinning" | "defaultCanPin" | "enableAllFilters" | "enableColumnFilter" | "enableGlobalFilter" | "defaultCanFilter" | "defaultCanColumnFilter" | "defaultCanGlobalFilter" | "sortingFn" | "sortDescFirst" | "enableSorting" | "enableMultiSort" | "defaultCanSort" | "invertSorting" | "sortUndefined" | "aggregationFn" | "aggregateValue" | "aggregatedCell" | "enableGrouping" | "defaultCanGroup" | "enableResizing" | "defaultCanResize" | "width" | "minWidth" | "maxWidth" | "Edit" | "Filter" | "Footer" | "Header" | "Cell" | "enableClickToCopy" | "enableColumnActions" | "enableEditing" | "enabledColumnFilterOptions" | "filterSelectOptions" | "muiTableBodyCellCopyButtonProps" | "muiTableBodyCellEditTextFieldProps" | "muiTableBodyCellProps" | "muiTableFooterCellProps" | "muiTableHeadCellColumnActionsButtonProps" | "muiTableHeadCellFilterTextFieldProps" | "muiTableHeadCellProps" | "onCellEditBlur" | "onCellEditChange" | "onColumnFilterValueChange"> & {
     header?: string | undefined;
 }) => ColumnDef<D>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.7.4",
+  "version": "0.7.5",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI implementation of react-table, inspired by material-table and the MUI X DataGrid, written from the ground up in TypeScript.",
@@ -97,7 +97,7 @@
     "react": ">=16.8"
   },
   "dependencies": {
-    "@tanstack/react-table": "^8.0.0-alpha.45",
+    "@tanstack/react-table": "^8.0.0-alpha.47",
     "match-sorter": "^6.3.1"
   }
 }

package/src/MaterialReactTable.tsx

@@ -31,7 +31,8 @@ import {
   Column,
   ColumnDef,
   DefaultGenerics,
-  FilterType,
+  FilterFn,
+  FilterFnOption,
   Header,
   HeaderGroup,
   Options,
@@ -44,20 +45,21 @@ import {
 } from '@tanstack/react-table';
 import { MRT_Localization, MRT_DefaultLocalization_EN } from './localization';
 import { MRT_Default_Icons, MRT_Icons } from './icons';
-import { MRT_FILTER_TYPE } from './enums';
+import { MRT_FILTER_OPTION } from './enums';
 import { MRT_TableRoot } from './table/MRT_TableRoot';
 
 export type MRT_TableOptions<D extends Record<string, any> = {}> = Partial<
   Omit<
     Options<D>,
-    'columns' | 'data' | 'initialState' | 'state' | 'expandRowsFn'
+    'columns' | 'data' | 'initialState' | 'state' | 'expandRowsFn' | 'filterFns'
   >
 > & {
   columns: MRT_ColumnDef<D>[];
   data: D[];
+  expandRowsFn?: (dataRow: D) => D[];
+  filterFns?: MRT_FILTER_OPTION | FilterFn<D> | string | number | symbol;
   initialState?: Partial<MRT_TableState<D>>;
   state?: Partial<MRT_TableState<D>>;
-  expandRowsFn?: (dataRow: D) => D[];
 };
 
 export interface MRT_RowModel<D extends Record<string, any> = {}> {
@@ -96,17 +98,16 @@ export type MRT_TableInstance<D extends Record<string, any> = {}> = Omit<
   options: MaterialReactTableProps<D> & {
     icons: MRT_Icons;
     idPrefix: string;
-    filterTypes: { [key in MRT_FILTER_TYPE]: any };
     localization: MRT_Localization;
   };
   setCurrentEditingCell: Dispatch<SetStateAction<MRT_Cell<D> | null>>;
   setCurrentEditingRow: Dispatch<SetStateAction<MRT_Row<D> | null>>;
-  setCurrentFilterTypes: Dispatch<
+  setCurrentFilterFns: Dispatch<
     SetStateAction<{
-      [key: string]: MRT_FilterType;
+      [key: string]: MRT_FilterFn<D>;
     }>
   >;
-  setCurrentGlobalFilterType: Dispatch<SetStateAction<MRT_FILTER_TYPE>>;
+  setCurrentGlobalFilterFn: Dispatch<SetStateAction<MRT_FilterFn<D>>>;
   setIsDensePadding: Dispatch<SetStateAction<boolean>>;
   setIsFullScreen: Dispatch<SetStateAction<boolean>>;
   setShowFilters: Dispatch<SetStateAction<boolean>>;
@@ -119,8 +120,8 @@ export type MRT_TableState<D extends Record<string, any> = {}> = Omit<
 > & {
   currentEditingCell: MRT_Cell<D> | null;
   currentEditingRow: MRT_Row<D> | null;
-  currentFilterTypes: Record<string, string | Function>;
-  currentGlobalFilterType: Record<string, string | Function>;
+  currentFilterFns: Record<string, string | Function>;
+  currentGlobalFilterFn: Record<string, string | Function>;
   isDensePadding: boolean;
   isFullScreen: boolean;
   showFilters: boolean;
@@ -130,23 +131,19 @@ export type MRT_TableState<D extends Record<string, any> = {}> = Omit<
 
 export type MRT_ColumnDef<D extends Record<string, any> = {}> = Omit<
   ColumnDef<D>,
-  'header' | 'footer' | 'columns'
+  'header' | 'footer' | 'columns' | 'filterFn'
 > & {
   Edit?: ({
     cell,
     tableInstance,
-  }: // onChange,
-  {
+  }: {
     cell: MRT_Cell<D>;
     tableInstance: MRT_TableInstance<D>;
-    // onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
   }) => ReactNode;
   Filter?: ({
-    // onChange,
     header,
     tableInstance,
   }: {
-    // onChange?: (event: ChangeEvent<HTMLInputElement>) => void;
     header: MRT_Header<D>;
     tableInstance: MRT_TableInstance<D>;
   }) => ReactNode;
@@ -176,8 +173,8 @@ export type MRT_ColumnDef<D extends Record<string, any> = {}> = Omit<
   enableClickToCopy?: boolean;
   enableColumnActions?: boolean;
   enableEditing?: boolean;
-  enabledColumnFilterTypes?: (MRT_FILTER_TYPE | string)[];
-  filter?: MRT_FilterType | string | FilterType<D>;
+  enabledColumnFilterOptions?: (MRT_FILTER_OPTION | string)[];
+  filterFn?: MRT_FilterFn;
   filterSelectOptions?: (string | { text: string; value: string })[];
   footer?: string;
   header: string;
@@ -322,7 +319,13 @@ export type MRT_Cell<D extends Record<string, any> = {}> = Omit<
   row: MRT_Row<D>;
 };
 
-export type MRT_FilterType = MRT_FILTER_TYPE | Function;
+export type MRT_FilterFn<D extends Record<string, any> = {}> =
+  | FilterFn<D>
+  | FilterFnOption<D>
+  | MRT_FILTER_OPTION
+  | number
+  | string
+  | symbol;
 
 export type MaterialReactTableProps<D extends Record<string, any> = {}> =
   MRT_TableOptions<D> & {
@@ -344,8 +347,8 @@ export type MaterialReactTableProps<D extends Record<string, any> = {}> =
     enableToolbarBottom?: boolean;
     enableToolbarInternalActions?: boolean;
     enableToolbarTop?: boolean;
-    enabledGlobalFilterTypes?: (MRT_FILTER_TYPE | string)[];
-    filterTypes?: { [key in MRT_FILTER_TYPE]: any };
+    enabledColumnFilterOptions?: (MRT_FILTER_OPTION | string)[];
+    enabledGlobalFilterOptions?: (MRT_FILTER_OPTION | string)[];
     icons?: Partial<MRT_Icons>;
     idPrefix?: string;
     isLoading?: boolean;
@@ -757,6 +760,7 @@ export type MaterialReactTableProps<D extends Record<string, any> = {}> =
 
 export default <D extends Record<string, any> = {}>({
   autoResetExpanded = false,
+  autoResetSorting = false,
   columnResizeMode = 'onEnd',
   editingMode = 'row',
   enableColumnActions = true,
@@ -789,6 +793,7 @@ export default <D extends Record<string, any> = {}>({
 }: MaterialReactTableProps<D>) => (
   <MRT_TableRoot
     autoResetExpanded={autoResetExpanded}
+    autoResetSorting={autoResetSorting}
     columnResizeMode={columnResizeMode}
     editingMode={editingMode}
     enableColumnActions={enableColumnActions}

package/src/enums.ts

@@ -1,4 +1,4 @@
-export enum MRT_FILTER_TYPE {
+export enum MRT_FILTER_OPTION {
   BEST_MATCH = 'bestMatch',
   BEST_MATCH_FIRST = 'bestMatchFirst',
   CONTAINS = 'contains',

package/src/head/MRT_TableHeadCell.tsx

@@ -60,20 +60,18 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, tableInstance }) => {
       : localization.sortedByColumnAsc.replace('{column}', column.header)
     : localization.unsorted;
 
-  const filterType = getState()?.currentFilterTypes?.[header.id];
+  const filterFn = getState()?.currentFilterFns?.[header.id];
 
   const filterTooltip = !!column.getColumnFilterValue()
     ? localization.filteringByColumn
         .replace('{column}', String(column.header))
         .replace(
           '{filterType}',
-          filterType instanceof Function
+          filterFn instanceof Function
             ? ''
             : // @ts-ignore
               localization[
-                `filter${
-                  filterType.charAt(0).toUpperCase() + filterType.slice(1)
-                }`
+                `filter${filterFn.charAt(0).toUpperCase() + filterFn.slice(1)}`
               ],
         )
         .replace('{filterValue}', column.getColumnFilterValue() as string)

package/src/inputs/MRT_FilterTextField.tsx

@@ -16,8 +16,8 @@ import {
   Tooltip,
 } from '@mui/material';
 import type { MRT_Header, MRT_TableInstance } from '..';
-import { MRT_FilterTypeMenu } from '../menus/MRT_FilterTypeMenu';
-import { MRT_FILTER_TYPE } from '../enums';
+import { MRT_FilterOptionMenu } from '../menus/MRT_FilterOptionMenu';
+import { MRT_FILTER_OPTION } from '../enums';
 
 interface Props {
   header: MRT_Header;
@@ -33,12 +33,12 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
       localization,
       muiTableHeadCellFilterTextFieldProps,
     },
-    setCurrentFilterTypes,
+    setCurrentFilterFns,
   } = tableInstance;
 
   const { column } = header;
 
-  const { currentFilterTypes } = getState();
+  const { currentFilterFns } = getState();
 
   const [anchorEl, setAnchorEl] = useState<null | HTMLElement>(null);
 
@@ -82,9 +82,9 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
   const handleClearFilterChip = () => {
     setFilterValue('');
     column.setColumnFilterValue(undefined);
-    setCurrentFilterTypes((prev) => ({
+    setCurrentFilterFns((prev) => ({
       ...prev,
-      [header.id]: MRT_FILTER_TYPE.BEST_MATCH,
+      [header.id]: MRT_FILTER_OPTION.BEST_MATCH,
     }));
   };
 
@@ -93,16 +93,16 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
   }
 
   const filterId = `mrt-${idPrefix}-${header.id}-filter-text-field`;
-  const filterType = currentFilterTypes?.[header.id];
+  const filterFn = currentFilterFns?.[header.id];
   const isSelectFilter = !!column.filterSelectOptions;
   const filterChipLabel =
-    !(filterType instanceof Function) &&
-    [MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(
-      filterType as MRT_FILTER_TYPE,
+    !(filterFn instanceof Function) &&
+    [MRT_FILTER_OPTION.EMPTY, MRT_FILTER_OPTION.NOT_EMPTY].includes(
+      filterFn as MRT_FILTER_OPTION,
     )
       ? //@ts-ignore
         localization[
-          `filter${filterType.charAt(0).toUpperCase() + filterType.slice(1)}`
+          `filter${filterFn.charAt(0).toUpperCase() + filterFn.slice(1)}`
         ]
       : '';
   const filterPlaceholder = localization.filterByColumn?.replace(
@@ -125,14 +125,14 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
         }}
         helperText={
           <label htmlFor={filterId}>
-            {filterType instanceof Function
+            {filterFn instanceof Function
               ? localization.filterMode.replace(
                   '{filterType}',
                   // @ts-ignore
                   localization[
                     `filter${
-                      filterType.name.charAt(0).toUpperCase() +
-                      filterType.name.slice(1)
+                      filterFn.name.charAt(0).toUpperCase() +
+                      filterFn.name.slice(1)
                     }`
                   ] ?? '',
                 ) ?? ''
@@ -141,7 +141,7 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
                   // @ts-ignore
                   localization[
                     `filter${
-                      filterType.charAt(0).toUpperCase() + filterType.slice(1)
+                      filterFn.charAt(0).toUpperCase() + filterFn.slice(1)
                     }`
                   ],
                 )}
@@ -248,7 +248,7 @@ export const MRT_FilterTextField: FC<Props> = ({ header, tableInstance }) => {
           );
         })}
       </TextField>
-      <MRT_FilterTypeMenu
+      <MRT_FilterOptionMenu
         anchorEl={anchorEl}
         header={header}
         setAnchorEl={setAnchorEl}

package/src/inputs/MRT_SearchTextField.tsx

@@ -13,7 +13,7 @@ import {
   TextField,
   Tooltip,
 } from '@mui/material';
-import { MRT_FilterTypeMenu } from '../menus/MRT_FilterTypeMenu';
+import { MRT_FilterOptionMenu } from '../menus/MRT_FilterOptionMenu';
 import { MRT_TableInstance } from '..';
 
 interface Props {
@@ -105,7 +105,7 @@ export const MRT_SearchTextField: FC<Props> = ({ tableInstance }) => {
         {...textFieldProps}
         sx={{ justifySelf: 'end', ...textFieldProps?.sx }}
       />
-      <MRT_FilterTypeMenu
+      <MRT_FilterOptionMenu
         anchorEl={anchorEl}
         setAnchorEl={setAnchorEl}
         tableInstance={tableInstance}

package/src/menus/MRT_ColumnActionMenu.tsx

@@ -1,7 +1,7 @@
 import React, { FC, useState } from 'react';
 import { Box, IconButton, ListItemIcon, Menu, MenuItem } from '@mui/material';
 import type { MRT_Header, MRT_TableInstance } from '..';
-import { MRT_FilterTypeMenu } from './MRT_FilterTypeMenu';
+import { MRT_FilterOptionMenu } from './MRT_FilterOptionMenu';
 import { MRT_ShowHideColumnsMenu } from './MRT_ShowHideColumnsMenu';
 
 export const commonMenuItemStyles = {
@@ -240,7 +240,7 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
               </IconButton>
             )}
           </MenuItem>,
-          <MRT_FilterTypeMenu
+          <MRT_FilterOptionMenu
             anchorEl={filterMenuAnchorEl}
             header={header}
             key={2}

package/src/menus/{MRT_FilterTypeMenu.tsx → MRT_FilterOptionMenu.tsx}

@@ -1,7 +1,7 @@
 import React, { FC, useMemo } from 'react';
 import { Menu, MenuItem } from '@mui/material';
-import type { MRT_FilterType, MRT_Header, MRT_TableInstance } from '..';
-import { MRT_FILTER_TYPE } from '../enums';
+import type { MRT_FilterFn, MRT_Header, MRT_TableInstance } from '..';
+import { MRT_FILTER_OPTION } from '../enums';
 import {
   bestMatch,
   bestMatchFirst,
@@ -30,7 +30,7 @@ interface Props {
   tableInstance: MRT_TableInstance;
 }
 
-export const MRT_FilterTypeMenu: FC<Props> = ({
+export const MRT_FilterOptionMenu: FC<Props> = ({
   anchorEl,
   header,
   onSelect,
@@ -39,16 +39,16 @@ export const MRT_FilterTypeMenu: FC<Props> = ({
 }) => {
   const {
     getState,
-    options: { enabledGlobalFilterTypes, localization },
-    setCurrentFilterTypes,
-    setCurrentGlobalFilterType,
+    options: { enabledGlobalFilterOptions, localization },
+    setCurrentFilterFns,
+    setCurrentGlobalFilterFn,
   } = tableInstance;
 
-  const { isDensePadding, currentFilterTypes, currentGlobalFilterType } =
+  const { isDensePadding, currentFilterFns, currentGlobalFilterFn } =
     getState();
 
-  const filterTypes: {
-    type: MRT_FILTER_TYPE;
+  const filterOptions: {
+    type: MRT_FILTER_OPTION;
     label: string;
     divider: boolean;
     fn: Function;
@@ -56,104 +56,106 @@ export const MRT_FilterTypeMenu: FC<Props> = ({
     () =>
       [
         {
-          type: MRT_FILTER_TYPE.BEST_MATCH_FIRST,
+          type: MRT_FILTER_OPTION.BEST_MATCH_FIRST,
           label: localization.filterBestMatchFirst,
           divider: false,
           fn: bestMatchFirst,
         },
         {
-          type: MRT_FILTER_TYPE.BEST_MATCH,
+          type: MRT_FILTER_OPTION.BEST_MATCH,
           label: localization.filterBestMatch,
           divider: !!header,
           fn: bestMatch,
         },
         {
-          type: MRT_FILTER_TYPE.CONTAINS,
+          type: MRT_FILTER_OPTION.CONTAINS,
           label: localization.filterContains,
           divider: false,
           fn: contains,
         },
         {
-          type: MRT_FILTER_TYPE.STARTS_WITH,
+          type: MRT_FILTER_OPTION.STARTS_WITH,
           label: localization.filterStartsWith,
           divider: false,
           fn: startsWith,
         },
         {
-          type: MRT_FILTER_TYPE.ENDS_WITH,
+          type: MRT_FILTER_OPTION.ENDS_WITH,
           label: localization.filterEndsWith,
           divider: true,
           fn: endsWith,
         },
         {
-          type: MRT_FILTER_TYPE.EQUALS,
+          type: MRT_FILTER_OPTION.EQUALS,
           label: localization.filterEquals,
           divider: false,
           fn: equals,
         },
         {
-          type: MRT_FILTER_TYPE.NOT_EQUALS,
+          type: MRT_FILTER_OPTION.NOT_EQUALS,
           label: localization.filterNotEquals,
           divider: true,
           fn: notEquals,
         },
         {
-          type: MRT_FILTER_TYPE.GREATER_THAN,
+          type: MRT_FILTER_OPTION.GREATER_THAN,
           label: localization.filterGreaterThan,
           divider: false,
           fn: greaterThan,
         },
         {
-          type: MRT_FILTER_TYPE.LESS_THAN,
+          type: MRT_FILTER_OPTION.LESS_THAN,
           label: localization.filterLessThan,
           divider: true,
           fn: lessThan,
         },
         {
-          type: MRT_FILTER_TYPE.EMPTY,
+          type: MRT_FILTER_OPTION.EMPTY,
           label: localization.filterEmpty,
           divider: false,
           fn: empty,
         },
         {
-          type: MRT_FILTER_TYPE.NOT_EMPTY,
+          type: MRT_FILTER_OPTION.NOT_EMPTY,
           label: localization.filterNotEmpty,
           divider: false,
           fn: notEmpty,
         },
       ].filter((filterType) =>
         header
-          ? !header.column.enabledColumnFilterTypes ||
-            header.column.enabledColumnFilterTypes.includes(filterType.type)
-          : (!enabledGlobalFilterTypes ||
-              enabledGlobalFilterTypes.includes(filterType.type)) &&
+          ? !header.column.enabledColumnFilterOptions ||
+            header.column.enabledColumnFilterOptions.includes(filterType.type)
+          : (!enabledGlobalFilterOptions ||
+              enabledGlobalFilterOptions.includes(filterType.type)) &&
             [
-              MRT_FILTER_TYPE.BEST_MATCH_FIRST,
-              MRT_FILTER_TYPE.BEST_MATCH,
+              MRT_FILTER_OPTION.BEST_MATCH_FIRST,
+              MRT_FILTER_OPTION.BEST_MATCH,
             ].includes(filterType.type),
       ),
     [],
   );
 
-  const handleSelectFilterType = (value: MRT_FILTER_TYPE) => {
+  const handleSelectFilterType = (value: MRT_FILTER_OPTION) => {
     if (header) {
-      setCurrentFilterTypes((prev: { [key: string]: MRT_FilterType }) => ({
+      setCurrentFilterFns((prev: { [key: string]: MRT_FilterFn }) => ({
         ...prev,
         [header.id]: value,
       }));
-      if ([MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(value)) {
+      if (
+        [MRT_FILTER_OPTION.EMPTY, MRT_FILTER_OPTION.NOT_EMPTY].includes(value)
+      ) {
         header.column.setColumnFilterValue(' ');
       }
     } else {
-      setCurrentGlobalFilterType(value);
+      setCurrentGlobalFilterFn(value);
     }
     setAnchorEl(null);
     onSelect?.();
   };
 
   const filterType = !!header
-    ? currentFilterTypes[header.id]
-    : currentGlobalFilterType;
+    ? currentFilterFns[header.id]
+    : currentGlobalFilterFn;
 
   return (
     <Menu
@@ -165,7 +167,7 @@ export const MRT_FilterTypeMenu: FC<Props> = ({
         dense: isDensePadding,
       }}
     >
-      {filterTypes.map(({ type, label, divider, fn }, index) => (
+      {filterOptions.map(({ type, label, divider, fn }, index) => (
         <MenuItem
           divider={divider}
           key={index}