material-react-table 0.38.4 → 0.40.1

package/dist/esm/menus/MRT_FilterOptionMenu.d.ts

@@ -1,12 +1,7 @@
 /// <reference types="react" />
-import type { MRT_Header, MRT_TableInstance } from '..';
+import type { MRT_Header, MRT_InternalFilterOption, MRT_TableInstance } from '..';
 import { MRT_Localization } from '../localization';
-export declare const internalFilterOptions: (localization: MRT_Localization) => {
-    option: string;
-    symbol: string;
-    label: string;
-    divider: boolean;
-}[];
+export declare const mrtFilterOptions: (localization: MRT_Localization) => MRT_InternalFilterOption[];
 interface Props<TData extends Record<string, any> = {}> {
     anchorEl: HTMLElement | null;
     header?: MRT_Header;

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 import { MutableRefObject, Dispatch, SetStateAction, ReactNode, DragEvent } from 'react';
 import { ButtonProps, TextFieldProps, TableCellProps, IconButtonProps, ToolbarProps, LinearProgressProps, CheckboxProps, SkeletonProps, TableBodyProps, TableRowProps, TableContainerProps, TableFooterProps, TableHeadProps, TablePaginationProps, PaperProps, TableProps, ChipProps, AlertProps } from '@mui/material';
 import { Row, Table, TableState, ColumnDef, DeepKeys, Column, Header, HeaderGroup, Cell, SortingFn, FilterFn, TableOptions, OnChangeFn } from '@tanstack/react-table';
-import { Options } from 'react-virtual';
+import { Options, VirtualItem } from 'react-virtual';
 import * as _tanstack_table_core from '@tanstack/table-core';
 import { RankingInfo } from '@tanstack/match-sorter-utils';
 
@@ -346,7 +346,7 @@ declare type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<Column
     enableClickToCopy?: boolean;
     enableColumnActions?: boolean;
     enableColumnDragging?: boolean;
-    enableColumnFilterChangeMode?: boolean;
+    enableColumnFilterModes?: boolean;
     enableColumnOrdering?: boolean;
     enableEditing?: boolean;
     filterFn?: MRT_FilterFn<TData>;
@@ -408,6 +408,10 @@ declare type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<Column
         table: MRT_TableInstance<TData>;
         column: MRT_Column<TData>;
     }) => TableCellProps);
+    renderColumnFilterModeMenuItems?: ({ table, column, }: {
+        table: MRT_TableInstance<TData>;
+        column: MRT_Column<TData>;
+    }) => ReactNode[];
     sortingFn?: MRT_SortingFn;
 };
 declare type MRT_DefinedColumnDef<TData extends Record<string, any> = {}> = Omit<MRT_ColumnDef<TData>, 'id'> & {
@@ -441,6 +445,12 @@ declare type MRT_SortingOption = LiteralUnion<string & keyof typeof MRT_SortingF
 declare type MRT_SortingFn<TData extends Record<string, any> = {}> = SortingFn<TData> | MRT_SortingOption;
 declare type MRT_FilterOption = LiteralUnion<string & keyof typeof MRT_FilterFns>;
 declare type MRT_FilterFn<TData extends Record<string, any> = {}> = FilterFn<TData> | MRT_FilterOption;
+declare type MRT_InternalFilterOption = {
+    option: string;
+    symbol: string;
+    label: string;
+    divider: boolean;
+};
 declare type MRT_DisplayColumnIds = 'mrt-row-actions' | 'mrt-row-drag' | 'mrt-row-expand' | 'mrt-row-numbers' | 'mrt-row-select';
 /**
  * `columns` and `data` props are the only required props, but there are over 150 other optional props.
@@ -464,13 +474,13 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     enableClickToCopy?: boolean;
     enableColumnActions?: boolean;
     enableColumnDragging?: boolean;
-    enableColumnFilterChangeMode?: boolean;
+    enableColumnFilterModes?: boolean;
     enableColumnOrdering?: boolean;
     enableDensityToggle?: boolean;
     enableEditing?: boolean;
     enableExpandAll?: boolean;
     enableFullScreenToggle?: boolean;
-    enableGlobalFilterChangeMode?: boolean;
+    enableGlobalFilterModes?: boolean;
     enableGlobalFilterRankedResults?: boolean;
     enablePagination?: boolean;
     enableRowActions?: boolean;
@@ -652,10 +662,21 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     renderBottomToolbarCustomActions?: ({ table, }: {
         table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderColumnFilterModeMenuItems?: ({ column, internalFilterOptions, onSelectFilterMode, table, }: {
+        column: MRT_Column<TData>;
+        internalFilterOptions: MRT_InternalFilterOption[];
+        onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+        table: MRT_TableInstance<TData>;
+    }) => ReactNode;
     renderDetailPanel?: ({ row, table, }: {
         row: MRT_Row<TData>;
         table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderGlobalFilterModeMenuItems?: ({ internalFilterOptions, onSelectFilterMode, table, }: {
+        internalFilterOptions: MRT_InternalFilterOption[];
+        onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+        table: MRT_TableInstance<TData>;
+    }) => ReactNode[];
     renderRowActionMenuItems?: ({ closeMenu, row, table, }: {
         closeMenu: () => void;
         row: MRT_Row<TData>;
@@ -676,11 +697,20 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     rowNumberMode?: 'original' | 'static';
     selectAllMode?: 'all' | 'page';
     state?: Partial<MRT_TableState<TData>>;
+    tableInstanceRef?: MutableRefObject<MRT_TableInstance<TData> | null>;
     virtualizerProps?: Partial<Options<HTMLDivElement>> | (({ table, }: {
         table: MRT_TableInstance<TData>;
     }) => Partial<Options<HTMLDivElement>>);
+    virtualizerInstanceRef?: MutableRefObject<Virtualizer | null>;
+};
+declare type Virtualizer = {
+    virtualItems: VirtualItem[];
+    totalSize: number;
+    scrollToOffset: (index: number, options?: any | undefined) => void;
+    scrollToIndex: (index: number, options?: any | undefined) => void;
+    measure: () => void;
 };
-declare const _default: <TData extends Record<string, any> = {}>({ aggregationFns, autoResetExpanded, columnResizeMode, defaultColumn, editingMode, enableBottomToolbar, enableColumnActions, enableColumnFilterChangeMode, enableColumnFilters, enableColumnOrdering, enableColumnResizing, enableDensityToggle, enableExpandAll, enableFilters, enableFullScreenToggle, enableGlobalFilter, enableGlobalFilterChangeMode, enableGlobalFilterRankedResults, enableGrouping, enableHiding, enableMultiRowSelection, enableMultiSort, enablePagination, enablePinning, enableRowSelection, enableSelectAll, enableSorting, enableStickyHeader, enableTableFooter, enableTableHead, enableToolbarInternalActions, enableTopToolbar, filterFns, icons, localization, positionActionsColumn, positionExpandColumn, positionGlobalFilter, positionPagination, positionToolbarAlertBanner, positionToolbarDropZone, rowNumberMode, selectAllMode, sortingFns, ...rest }: MaterialReactTableProps<TData>) => JSX.Element;
+declare const _default: <TData extends Record<string, any> = {}>({ aggregationFns, autoResetExpanded, columnResizeMode, defaultColumn, editingMode, enableBottomToolbar, enableColumnActions, enableColumnFilters, enableColumnOrdering, enableColumnResizing, enableDensityToggle, enableExpandAll, enableFilters, enableFullScreenToggle, enableGlobalFilter, enableGlobalFilterRankedResults, enableGrouping, enableHiding, enableMultiRowSelection, enableMultiSort, enablePagination, enablePinning, enableRowSelection, enableSelectAll, enableSorting, enableStickyHeader, enableTableFooter, enableTableHead, enableToolbarInternalActions, enableTopToolbar, filterFns, icons, localization, positionActionsColumn, positionExpandColumn, positionGlobalFilter, positionPagination, positionToolbarAlertBanner, positionToolbarDropZone, rowNumberMode, selectAllMode, sortingFns, ...rest }: MaterialReactTableProps<TData>) => JSX.Element;
 
 interface Props$6<TData extends Record<string, any> = {}> {
     cell: MRT_Cell<TData>;
@@ -719,4 +749,4 @@ interface Props<TData extends Record<string, any> = {}> extends IconButtonProps
 }
 declare const MRT_ToggleGlobalFilterButton: <TData extends Record<string, any> = {}>({ table, ...rest }: Props<TData>) => JSX.Element;
 
-export { MRT_Cell, MRT_Column, MRT_ColumnDef, MRT_CopyButton, MRT_DefinedColumnDef, MRT_DisplayColumnIds, MRT_FilterFn, MRT_FilterOption, MRT_FullScreenToggleButton, MRT_GlobalFilterTextField, MRT_Header, MRT_HeaderGroup, MRT_Icons, MRT_Localization, MRT_Row, MRT_RowModel, MRT_ShowHideColumnsButton, MRT_SortingFn, MRT_SortingOption, MRT_TableInstance, MRT_TableState, MRT_ToggleDensePaddingButton, MRT_ToggleFiltersButton, MRT_ToggleGlobalFilterButton, MaterialReactTableProps, _default as default };
+export { MRT_Cell, MRT_Column, MRT_ColumnDef, MRT_CopyButton, MRT_DefinedColumnDef, MRT_DisplayColumnIds, MRT_FilterFn, MRT_FilterOption, MRT_FullScreenToggleButton, MRT_GlobalFilterTextField, MRT_Header, MRT_HeaderGroup, MRT_Icons, MRT_InternalFilterOption, MRT_Localization, MRT_Row, MRT_RowModel, MRT_ShowHideColumnsButton, MRT_SortingFn, MRT_SortingOption, MRT_TableInstance, MRT_TableState, MRT_ToggleDensePaddingButton, MRT_ToggleFiltersButton, MRT_ToggleGlobalFilterButton, MaterialReactTableProps, Virtualizer, _default as default };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.38.4",
+  "version": "0.40.1",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",

package/src/MaterialReactTable.tsx

@@ -40,7 +40,7 @@ import type {
   TableOptions,
   TableState,
 } from '@tanstack/react-table';
-import type { Options as VirtualizerOptions } from 'react-virtual';
+import type { Options as VirtualizerOptions, VirtualItem } from 'react-virtual';
 // import type { VirtualizerOptions } from '@tanstack/react-virtual';
 import { MRT_AggregationFns } from './aggregationFns';
 import { MRT_Default_Icons, MRT_Icons } from './icons';
@@ -260,7 +260,7 @@ export type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<
   enableClickToCopy?: boolean;
   enableColumnActions?: boolean;
   enableColumnDragging?: boolean;
-  enableColumnFilterChangeMode?: boolean;
+  enableColumnFilterModes?: boolean;
   enableColumnOrdering?: boolean;
   enableEditing?: boolean;
   filterFn?: MRT_FilterFn<TData>;
@@ -362,6 +362,13 @@ export type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<
         table: MRT_TableInstance<TData>;
         column: MRT_Column<TData>;
       }) => TableCellProps);
+  renderColumnFilterModeMenuItems?: ({
+    table,
+    column,
+  }: {
+    table: MRT_TableInstance<TData>;
+    column: MRT_Column<TData>;
+  }) => ReactNode[];
   sortingFn?: MRT_SortingFn;
 };
 
@@ -432,6 +439,13 @@ export type MRT_FilterFn<TData extends Record<string, any> = {}> =
   | FilterFn<TData>
   | MRT_FilterOption;
 
+export type MRT_InternalFilterOption = {
+  option: string;
+  symbol: string;
+  label: string;
+  divider: boolean;
+};
+
 export type MRT_DisplayColumnIds =
   | 'mrt-row-actions'
   | 'mrt-row-drag'
@@ -472,13 +486,13 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     enableClickToCopy?: boolean;
     enableColumnActions?: boolean;
     enableColumnDragging?: boolean;
-    enableColumnFilterChangeMode?: boolean;
+    enableColumnFilterModes?: boolean;
     enableColumnOrdering?: boolean;
     enableDensityToggle?: boolean;
     enableEditing?: boolean;
     enableExpandAll?: boolean;
     enableFullScreenToggle?: boolean;
-    enableGlobalFilterChangeMode?: boolean;
+    enableGlobalFilterModes?: boolean;
     enableGlobalFilterRankedResults?: boolean;
     enablePagination?: boolean;
     enableRowActions?: boolean;
@@ -768,6 +782,17 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     }: {
       table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderColumnFilterModeMenuItems?: ({
+      column,
+      internalFilterOptions,
+      onSelectFilterMode,
+      table,
+    }: {
+      column: MRT_Column<TData>;
+      internalFilterOptions: MRT_InternalFilterOption[];
+      onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+      table: MRT_TableInstance<TData>;
+    }) => ReactNode;
     renderDetailPanel?: ({
       row,
       table,
@@ -775,6 +800,15 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
       row: MRT_Row<TData>;
       table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderGlobalFilterModeMenuItems?: ({
+      internalFilterOptions,
+      onSelectFilterMode,
+      table,
+    }: {
+      internalFilterOptions: MRT_InternalFilterOption[];
+      onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+      table: MRT_TableInstance<TData>;
+    }) => ReactNode[];
     renderRowActionMenuItems?: ({
       closeMenu,
       row,
@@ -807,6 +841,7 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     rowNumberMode?: 'original' | 'static';
     selectAllMode?: 'all' | 'page';
     state?: Partial<MRT_TableState<TData>>;
+    tableInstanceRef?: MutableRefObject<MRT_TableInstance<TData> | null>;
     virtualizerProps?:
       | Partial<VirtualizerOptions<HTMLDivElement>>
       | (({
@@ -821,8 +856,17 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     //     }: {
     //       table: MRT_TableInstance<TData>;
     //     }) => Partial<VirtualizerOptions<HTMLDivElement, HTMLTableRowElement>>);
+    virtualizerInstanceRef?: MutableRefObject<Virtualizer | null>;
   };
 
+export type Virtualizer = {
+  virtualItems: VirtualItem[];
+  totalSize: number;
+  scrollToOffset: (index: number, options?: any | undefined) => void;
+  scrollToIndex: (index: number, options?: any | undefined) => void;
+  measure: () => void;
+};
+
 export default <TData extends Record<string, any> = {}>({
   aggregationFns,
   autoResetExpanded = false,
@@ -831,7 +875,6 @@ export default <TData extends Record<string, any> = {}>({
   editingMode = 'modal',
   enableBottomToolbar = true,
   enableColumnActions = true,
-  enableColumnFilterChangeMode = false,
   enableColumnFilters = true,
   enableColumnOrdering = false,
   enableColumnResizing = false,
@@ -840,7 +883,6 @@ export default <TData extends Record<string, any> = {}>({
   enableFilters = true,
   enableFullScreenToggle = true,
   enableGlobalFilter = true,
-  enableGlobalFilterChangeMode = false,
   enableGlobalFilterRankedResults = true,
   enableGrouping = false,
   enableHiding = true,
@@ -878,7 +920,7 @@ export default <TData extends Record<string, any> = {}>({
     editingMode={editingMode}
     enableBottomToolbar={enableBottomToolbar}
     enableColumnActions={enableColumnActions}
-    enableColumnFilterChangeMode={enableColumnFilterChangeMode}
+    enableColumnFilterModes={enableColumnFilterModes}
     enableColumnFilters={enableColumnFilters}
     enableColumnOrdering={enableColumnOrdering}
     enableColumnResizing={enableColumnResizing}
@@ -887,7 +929,7 @@ export default <TData extends Record<string, any> = {}>({
     enableFilters={enableFilters}
     enableFullScreenToggle={enableFullScreenToggle}
     enableGlobalFilter={enableGlobalFilter}
-    enableGlobalFilterChangeMode={enableGlobalFilterChangeMode}
+    enableGlobalFilterModes={enableGlobalFilterModes}
     enableGlobalFilterRankedResults={enableGlobalFilterRankedResults}
     enableGrouping={enableGrouping}
     enableHiding={enableHiding}

package/src/body/MRT_TableBody.tsx

@@ -1,5 +1,5 @@
-import React, { FC, RefObject, useMemo } from 'react';
-import { useVirtual } from 'react-virtual';
+import React, { FC, RefObject, useEffect, useMemo } from 'react';
+import { useVirtual } from 'react-virtual'; //stuck on v2 for now
 // import { useVirtualizer, Virtualizer } from '@tanstack/react-virtual';
 import { TableBody } from '@mui/material';
 import { MRT_TableBodyRow } from './MRT_TableBodyRow';
@@ -22,6 +22,7 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
       enableRowVirtualization,
       muiTableBodyProps,
       virtualizerProps,
+      virtualizerInstanceRef,
     },
   } = table;
   const { globalFilter, pagination, sorting } = getState();
@@ -62,7 +63,7 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
     globalFilter,
   ]);
 
-  const rowVirtualizer = enableRowVirtualization
+  const virtualizer = enableRowVirtualization
     ? useVirtual({
         size: rows.length,
         parentRef: tableContainerRef,
@@ -71,7 +72,13 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
       })
     : ({} as any);
 
-  // const rowVirtualizer: Virtualizer = enableRowVirtualization
+  useEffect(() => {
+    if (virtualizerInstanceRef) {
+      virtualizerInstanceRef.current = virtualizer;
+    }
+  }, [virtualizer]);
+
+  // const virtualizer: Virtualizer = enableRowVirtualization
   //   ? useVirtualizer({
   //       count: rows.length,
   //       estimateSize: () => (density === 'compact' ? 25 : 50),
@@ -81,12 +88,10 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
   //     })
   //   : ({} as any);
 
-  const virtualRows = enableRowVirtualization
-    ? rowVirtualizer.virtualItems
-    : [];
+  const virtualRows = enableRowVirtualization ? virtualizer.virtualItems : [];
 
   // const virtualRows = enableRowVirtualization
-  //   ? rowVirtualizer.getVirtualItems()
+  //   ? virtualizer.getVirtualItems()
   //   : [];
 
   let paddingTop = 0;
@@ -94,13 +99,13 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
   if (enableRowVirtualization) {
     paddingTop = !!virtualRows.length ? virtualRows[0].start : 0;
     paddingBottom = !!virtualRows.length
-      ? rowVirtualizer.totalSize - virtualRows[virtualRows.length - 1].end
+      ? virtualizer.totalSize - virtualRows[virtualRows.length - 1].end
       : 0;
   }
   // if (enableRowVirtualization) {
   //   paddingTop = !!virtualRows.length ? virtualRows[0].start : 0;
   //   paddingBottom = !!virtualRows.length
-  //     ? rowVirtualizer.getTotalSize() - virtualRows[virtualRows.length - 1].end
+  //     ? virtualizer.getTotalSize() - virtualRows[virtualRows.length - 1].end
   //     : 0;
   // }
 

package/src/body/MRT_TableBodyCell.tsx

@@ -109,7 +109,8 @@ export const MRT_TableBodyCell: FC<Props> = ({
     [isLoading, showSkeletons],
   );
 
-  const handleDoubleClick = (_event: MouseEvent<HTMLTableCellElement>) => {
+  const handleDoubleClick = (event: MouseEvent<HTMLTableCellElement>) => {
+    tableCellProps?.onDoubleClick?.(event);
     if (
       (enableEditing || columnDef.enableEditing) &&
       columnDef.enableEditing !== false &&
@@ -143,7 +144,8 @@ export const MRT_TableBodyCell: FC<Props> = ({
     );
   };
 
-  const handleDragEnter = (_e: DragEvent) => {
+  const handleDragEnter = (e: DragEvent<HTMLTableCellElement>) => {
+    tableCellProps?.onDragEnter?.(e);
     if (enableGrouping && hoveredColumn?.id === 'drop-zone') {
       setHoveredColumn(null);
     }
@@ -179,9 +181,9 @@ export const MRT_TableBodyCell: FC<Props> = ({
 
   return (
     <TableCell
-      onDoubleClick={handleDoubleClick}
-      onDragEnter={handleDragEnter}
       {...tableCellProps}
+      onDragEnter={handleDragEnter}
+      onDoubleClick={handleDoubleClick}
       sx={(theme) => ({
         backgroundColor: column.getIsPinned()
           ? alpha(lighten(theme.palette.background.default, 0.04), 0.95)

package/src/column.utils.ts

@@ -25,7 +25,7 @@ export const defaultDisplayColumnDefOptions = {
   enableSorting: false,
 } as Partial<MRT_ColumnDef>;
 
-const getColumnId = <TData extends Record<string, any> = {}>(
+export const getColumnId = <TData extends Record<string, any> = {}>(
   columnDef: MRT_ColumnDef<TData>,
 ): string =>
   columnDef.id ?? columnDef.accessorKey?.toString?.() ?? columnDef.header;

package/src/head/MRT_TableHeadCell.tsx

@@ -28,8 +28,13 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
     },
     setHoveredColumn,
   } = table;
-  const { density, draggingColumn, hoveredColumn, showColumnFilters } =
-    getState();
+  const {
+    density,
+    draggingColumn,
+    grouping,
+    hoveredColumn,
+    showColumnFilters,
+  } = getState();
   const { column } = header;
   const { columnDef } = column;
   const { columnDefType } = columnDef;
@@ -221,17 +226,20 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
           </Box>
           {columnDefType !== 'group' && (
             <Box sx={{ whiteSpace: 'nowrap' }}>
-              {((enableColumnDragging &&
-                columnDef.enableColumnDragging !== false) ||
-                (enableColumnOrdering &&
-                  columnDef.enableColumnOrdering !== false) ||
-                (enableGrouping && columnDef.enableGrouping !== false)) && (
-                <MRT_TableHeadCellGrabHandle
-                  column={column}
-                  table={table}
-                  tableHeadCellRef={tableHeadCellRef}
-                />
-              )}
+              {enableColumnDragging !== false &&
+                columnDef.enableColumnDragging !== false &&
+                (enableColumnDragging ||
+                  (enableColumnOrdering &&
+                    columnDef.enableColumnOrdering !== false) ||
+                  (enableGrouping &&
+                    columnDef.enableGrouping !== false &&
+                    !grouping.includes(column.id))) && (
+                  <MRT_TableHeadCellGrabHandle
+                    column={column}
+                    table={table}
+                    tableHeadCellRef={tableHeadCellRef}
+                  />
+                )}
               {(enableColumnActions || columnDef.enableColumnActions) &&
                 columnDef.enableColumnActions !== false && (
                   <MRT_TableHeadCellColumnActionsButton

package/src/head/MRT_TableHeadCellFilterContainer.tsx

@@ -14,13 +14,14 @@ export const MRT_TableHeadCellFilterContainer: FC<Props> = ({
   table,
 }) => {
   const { getState } = table;
-  const { columnFilterFns, showColumnFilters } = getState();
+  const { showColumnFilters } = getState();
   const { column } = header;
+  const { columnDef } = column;
 
   return (
     <Collapse in={showColumnFilters} mountOnEnter unmountOnExit>
       {['between', 'betweenInclusive', 'inNumberRange'].includes(
-        columnFilterFns[column.id],
+        columnDef._filterFn,
       ) ? (
         <MRT_FilterRangeFields header={header} table={table} />
       ) : (

package/src/inputs/MRT_FilterTextField.tsx

@@ -33,9 +33,8 @@ export const MRT_FilterTextField: FC<Props> = ({
   table,
 }) => {
   const {
-    getState,
     options: {
-      enableColumnFilterChangeMode,
+      enableColumnFilterModes,
       columnFilterModeOptions,
       icons: { FilterListIcon, CloseIcon },
       localization,
@@ -46,7 +45,6 @@ export const MRT_FilterTextField: FC<Props> = ({
   } = table;
   const { column } = header;
   const { columnDef } = column;
-  const { columnFilterFns } = getState();
 
   const mTableHeadCellFilterTextFieldProps =
     muiTableHeadCellFilterTextFieldProps instanceof Function
@@ -78,8 +76,7 @@ export const MRT_FilterTextField: FC<Props> = ({
   const isTextboxFilter =
     columnDef.filterVariant === 'text' ||
     (!isSelectFilter && !isMultiSelectFilter);
-
-  const currentFilterOption = columnFilterFns?.[header.id];
+  const currentFilterOption = columnDef._filterFn;
   const filterChipLabel = ['empty', 'notEmpty'].includes(currentFilterOption)
     ? //@ts-ignore
       localization[
@@ -99,8 +96,8 @@ export const MRT_FilterTextField: FC<Props> = ({
   const allowedColumnFilterOptions =
     columnDef?.columnFilterModeOptions ?? columnFilterModeOptions;
   const showChangeModeButton =
-    enableColumnFilterChangeMode &&
-    columnDef.enableColumnFilterChangeMode !== false &&
+    enableColumnFilterModes &&
+    columnDef.enableColumnFilterModes !== false &&
     !rangeFilterIndex &&
     (allowedColumnFilterOptions === undefined ||
       !!allowedColumnFilterOptions?.length);
@@ -299,7 +296,7 @@ export const MRT_FilterTextField: FC<Props> = ({
         }}
         sx={(theme) => ({
           p: 0,
-          minWidth: !filterChipLabel ? '150px' : 'auto',
+          minWidth: !filterChipLabel ? '120px' : 'auto',
           width: '100%',
           '&	.MuiSelect-icon': {
             mr: '1.5rem',

package/src/inputs/MRT_GlobalFilterTextField.tsx

@@ -23,7 +23,7 @@ export const MRT_GlobalFilterTextField = <
     getState,
     setGlobalFilter,
     options: {
-      enableGlobalFilterChangeMode,
+      enableGlobalFilterModes,
       icons: { SearchIcon, CloseIcon },
       localization,
       muiSearchTextFieldProps,
@@ -69,7 +69,7 @@ export const MRT_GlobalFilterTextField = <
         value={searchValue ?? ''}
         variant="standard"
         InputProps={{
-          startAdornment: enableGlobalFilterChangeMode ? (
+          startAdornment: enableGlobalFilterModes ? (
             <InputAdornment position="start">
               <Tooltip arrow title={localization.changeSearchMode}>
                 <IconButton

package/src/menus/MRT_ColumnActionMenu.tsx

@@ -34,7 +34,7 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
     toggleAllColumnsVisible,
     setColumnOrder,
     options: {
-      enableColumnFilterChangeMode,
+      enableColumnFilterModes,
       enableColumnFilters,
       enableColumnResizing,
       enableGrouping,
@@ -138,8 +138,8 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
     columnDef?.columnFilterModeOptions ?? columnFilterModeOptions;
 
   const showFilterModeSubMenu =
-    enableColumnFilterChangeMode &&
-    columnDef.enableColumnFilterChangeMode !== false &&
+    enableColumnFilterModes &&
+    columnDef.enableColumnFilterModes !== false &&
     !isSelectFilter &&
     (allowedColumnFilterOptions === undefined ||
       !!allowedColumnFilterOptions?.length);