material-react-table 0.38.2 → 0.39.0

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

@@ -1,11 +1,7 @@
-import type { MRT_Header, MRT_TableInstance } from '..';
+/// <reference types="react" />
+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/esm/menus/MRT_ShowHideColumnsMenu.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import type { MRT_TableInstance } from '..';
 interface Props<TData extends Record<string, any> = {}> {
     anchorEl: HTMLElement | null;

package/dist/esm/table/MRT_TableRoot.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import type { MaterialReactTableProps } from '..';
 export declare const MRT_TableRoot: <TData extends Record<string, any> = {}>(props: MaterialReactTableProps<TData>) => JSX.Element;

package/dist/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 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';
@@ -345,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>;
@@ -407,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'> & {
@@ -440,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.
@@ -463,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;
@@ -479,6 +490,7 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     enableRowSelection?: boolean | ((row: MRT_Row<TData>) => boolean);
     enableRowVirtualization?: boolean;
     enableSelectAll?: boolean;
+    enableStickyFooter?: boolean;
     enableStickyHeader?: boolean;
     enableTableFooter?: boolean;
     enableTableHead?: boolean;
@@ -650,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>;
@@ -678,7 +701,7 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
         table: MRT_TableInstance<TData>;
     }) => Partial<Options<HTMLDivElement>>);
 };
-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, enableColumnFilterModes, enableColumnFilters, enableColumnOrdering, enableColumnResizing, enableDensityToggle, enableExpandAll, enableFilters, enableFullScreenToggle, enableGlobalFilter, enableGlobalFilterModes, 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>;
@@ -717,4 +740,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, _default as default };

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.38.2",
+  "version": "0.39.0",
   "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.",
@@ -78,7 +78,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",
-    "rollup": "^2.78.0",
+    "rollup": "^2.78.1",
     "rollup-plugin-dts": "^4.2.2",
     "rollup-plugin-peer-deps-external": "^2.2.4",
     "size-limit": "^8.0.1",

package/src/MaterialReactTable.tsx

@@ -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;
@@ -488,6 +502,7 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     enableRowSelection?: boolean | ((row: MRT_Row<TData>) => boolean);
     enableRowVirtualization?: boolean;
     enableSelectAll?: boolean;
+    enableStickyFooter?: boolean;
     enableStickyHeader?: boolean;
     enableTableFooter?: boolean;
     enableTableHead?: boolean;
@@ -767,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,
@@ -774,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,
@@ -830,7 +865,7 @@ export default <TData extends Record<string, any> = {}>({
   editingMode = 'modal',
   enableBottomToolbar = true,
   enableColumnActions = true,
-  enableColumnFilterChangeMode = false,
+  enableColumnFilterModes = false,
   enableColumnFilters = true,
   enableColumnOrdering = false,
   enableColumnResizing = false,
@@ -839,7 +874,7 @@ export default <TData extends Record<string, any> = {}>({
   enableFilters = true,
   enableFullScreenToggle = true,
   enableGlobalFilter = true,
-  enableGlobalFilterChangeMode = false,
+  enableGlobalFilterModes = false,
   enableGlobalFilterRankedResults = true,
   enableGrouping = false,
   enableHiding = true,
@@ -877,7 +912,7 @@ export default <TData extends Record<string, any> = {}>({
     editingMode={editingMode}
     enableBottomToolbar={enableBottomToolbar}
     enableColumnActions={enableColumnActions}
-    enableColumnFilterChangeMode={enableColumnFilterChangeMode}
+    enableColumnFilterModes={enableColumnFilterModes}
     enableColumnFilters={enableColumnFilters}
     enableColumnOrdering={enableColumnOrdering}
     enableColumnResizing={enableColumnResizing}
@@ -886,7 +921,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

@@ -124,6 +124,7 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
                 enableRowVirtualization ? rowOrVirtualRow.index : rowIndex
               }
               table={table}
+              virtualRow={enableRowVirtualization ? rowOrVirtualRow : null}
             />
           );
         },

package/src/body/MRT_TableBodyCellValue.tsx

@@ -12,8 +12,8 @@ export const MRT_TableBodyCellValue: FC<Props> = ({ cell, table }) => {
 
   return (
     <>
-      {cell.getIsAggregated() && column.columnDef.aggregationFn
-        ? columnDef.AggregatedCell?.({
+      {cell.getIsAggregated() && columnDef.AggregatedCell
+        ? columnDef.AggregatedCell({
             cell,
             column,
             row,
@@ -21,15 +21,14 @@ export const MRT_TableBodyCellValue: FC<Props> = ({ cell, table }) => {
           })
         : row.getIsGrouped() && !cell.getIsGrouped()
         ? null
-        : (cell.getIsGrouped() &&
-            columnDef.GroupedCell?.({
-              cell,
-              column,
-              row,
-              table,
-            })) ||
-          (columnDef?.Cell?.({ cell, column, row, table }) ??
-            cell.renderValue())}
+        : cell.getIsGrouped() && columnDef.GroupedCell
+        ? columnDef.GroupedCell({
+            cell,
+            column,
+            row,
+            table,
+          })
+        : columnDef?.Cell?.({ cell, column, row, table }) ?? cell.renderValue()}
     </>
   );
 };

package/src/body/MRT_TableBodyRow.tsx

@@ -8,9 +8,15 @@ interface Props {
   row: MRT_Row;
   rowIndex: number;
   table: MRT_TableInstance;
+  virtualRow?: any;
 }
 
-export const MRT_TableBodyRow: FC<Props> = ({ row, rowIndex, table }) => {
+export const MRT_TableBodyRow: FC<Props> = ({
+  row,
+  rowIndex,
+  table,
+  virtualRow,
+}) => {
   const theme = useTheme();
   const {
     getIsSomeColumnsPinned,
@@ -31,7 +37,7 @@ export const MRT_TableBodyRow: FC<Props> = ({ row, rowIndex, table }) => {
     }
   };
 
-  const rowRef = useRef<HTMLTableRowElement>(null);
+  const rowRef = useRef<HTMLTableRowElement | null>(null);
 
   const draggingBorder =
     draggingRow?.id === row.id
@@ -52,7 +58,12 @@ export const MRT_TableBodyRow: FC<Props> = ({ row, rowIndex, table }) => {
         onDragEnter={handleDragEnter}
         hover
         selected={row.getIsSelected()}
-        ref={rowRef}
+        ref={(node) => {
+          rowRef.current = node;
+          if (virtualRow?.measureRef) {
+            virtualRow.measureRef = node;
+          }
+        }}
         {...tableRowProps}
         sx={(theme) => ({
           backgroundColor: lighten(theme.palette.background.default, 0.06),

package/src/buttons/MRT_ExpandAllButton.tsx

@@ -40,12 +40,14 @@ export const MRT_ExpandAllButton: FC<Props> = ({ table }) => {
           disabled={!getCanSomeRowsExpand() && !renderDetailPanel}
           onClick={() => toggleAllRowsExpanded(!getIsAllRowsExpanded())}
           {...iconButtonProps}
-          sx={{
+          sx={(theme) => ({
             height: density === 'compact' ? '1.75rem' : '2.25rem',
             width: density === 'compact' ? '1.75rem' : '2.25rem',
             mt: density !== 'compact' ? '-0.25rem' : undefined,
-            ...iconButtonProps?.sx,
-          }}
+            ...(iconButtonProps?.sx instanceof Function
+              ? iconButtonProps?.sx(theme)
+              : (iconButtonProps?.sx as any)),
+          })}
         >
           <KeyboardDoubleArrowDownIcon
             style={{

package/src/buttons/MRT_GrabHandleButton.tsx

@@ -37,7 +37,7 @@ export const MRT_GrabHandleButton = <TData extends Record<string, any> = {}>({
         onDragEnd={onDragEnd}
         size="small"
         {...iconButtonProps}
-        sx={{
+        sx={(theme) => ({
           cursor: 'grab',
           m: 0,
           opacity: 0.5,
@@ -50,8 +50,10 @@ export const MRT_GrabHandleButton = <TData extends Record<string, any> = {}>({
           '&:active': {
             cursor: 'grabbing',
           },
-          ...iconButtonProps?.sx,
-        }}
+          ...(iconButtonProps?.sx instanceof Function
+            ? iconButtonProps?.sx(theme)
+            : (iconButtonProps?.sx as any)),
+        })}
       >
         <DragHandleIcon />
       </IconButton>

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/footer/MRT_TableFooter.tsx

@@ -10,16 +10,36 @@ interface Props {
 export const MRT_TableFooter: FC<Props> = ({ table }) => {
   const {
     getFooterGroups,
-    options: { muiTableFooterProps },
+    getState,
+    options: { enableStickyFooter, muiTableFooterProps },
   } = table;
+  const { isFullScreen } = getState();
 
   const tableFooterProps =
     muiTableFooterProps instanceof Function
       ? muiTableFooterProps({ table })
       : muiTableFooterProps;
 
+  const stickFooter =
+    (isFullScreen || enableStickyFooter) && enableStickyFooter !== false;
+
   return (
-    <TableFooter {...tableFooterProps}>
+    <TableFooter
+      {...tableFooterProps}
+      sx={(theme) => ({
+        position: stickFooter ? 'sticky' : undefined,
+        bottom: stickFooter ? 0 : undefined,
+        opacity: stickFooter ? 0.95 : undefined,
+        outline: stickFooter
+          ? theme.palette.mode === 'light'
+            ? `1px solid ${theme.palette.grey[300]}`
+            : `1px solid ${theme.palette.grey[700]}`
+          : undefined,
+        ...(tableFooterProps?.sx instanceof Function
+          ? tableFooterProps?.sx(theme)
+          : (tableFooterProps?.sx as any)),
+      })}
+    >
       {getFooterGroups().map((footerGroup) => (
         <MRT_TableFooterRow
           footerGroup={footerGroup as any}

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/head/MRT_TableHeadRow.tsx

@@ -24,7 +24,9 @@ export const MRT_TableHeadRow: FC<Props> = ({ headerGroup, table }) => {
       sx={(theme) => ({
         boxShadow: `4px 0 8px ${alpha(theme.palette.common.black, 0.1)}`,
         backgroundColor: lighten(theme.palette.background.default, 0.04),
-        ...(tableRowProps?.sx as any),
+        ...(tableRowProps?.sx instanceof Function
+          ? tableRowProps?.sx(theme)
+          : (tableRowProps?.sx as any)),
       })}
     >
       {headerGroup.headers.map((header: MRT_Header, index) => (

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);