material-react-table 0.7.4 → 0.7.5

package/dist/MaterialReactTable.d.ts

@@ -1,15 +1,16 @@
 import { ChangeEvent, Dispatch, FC, FocusEvent, MouseEvent, ReactNode, SetStateAction } from 'react';
 import { AlertProps, ButtonProps, CheckboxProps, IconButtonProps, LinearProgressProps, PaperProps, SkeletonProps, TableBodyProps, TableCellProps, TableContainerProps, TableFooterProps, TableHeadProps, TablePaginationProps, TableProps, TableRowProps, TextFieldProps, ToolbarProps } from '@mui/material';
-import { Cell, Column, ColumnDef, DefaultGenerics, FilterType, Header, HeaderGroup, Options, Overwrite, PaginationState, Row, TableInstance, TableState, VisibilityState } from '@tanstack/react-table';
+import { Cell, Column, ColumnDef, DefaultGenerics, FilterFn, FilterFnOption, Header, HeaderGroup, Options, Overwrite, PaginationState, Row, TableInstance, TableState, VisibilityState } from '@tanstack/react-table';
 import { MRT_Localization } from './localization';
 import { MRT_Icons } from './icons';
-import { MRT_FILTER_TYPE } from './enums';
-export declare type MRT_TableOptions<D extends Record<string, any> = {}> = Partial<Omit<Options<D>, 'columns' | 'data' | 'initialState' | 'state' | 'expandRowsFn'>> & {
+import { MRT_FILTER_OPTION } from './enums';
+export declare type MRT_TableOptions<D extends Record<string, any> = {}> = Partial<Omit<Options<D>, '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> = {}> {
     flatRows: MRT_Row<D>[];
@@ -32,17 +33,14 @@ export declare 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<SetStateAction<{
-        [key: string]: MRT_FilterType;
+    setCurrentFilterFns: Dispatch<SetStateAction<{
+        [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>>;
@@ -51,15 +49,15 @@ export declare type MRT_TableInstance<D extends Record<string, any> = {}> = Omit
 export declare type MRT_TableState<D extends Record<string, any> = {}> = Omit<TableState, 'pagination'> & {
     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;
     showGlobalFilter: boolean;
     pagination: Partial<PaginationState>;
 };
-export declare type MRT_ColumnDef<D extends Record<string, any> = {}> = Omit<ColumnDef<D>, 'header' | 'footer' | 'columns'> & {
+export declare type MRT_ColumnDef<D extends Record<string, any> = {}> = Omit<ColumnDef<D>, 'header' | 'footer' | 'columns' | 'filterFn'> & {
     Edit?: ({ cell, tableInstance, }: {
         cell: MRT_Cell<D>;
         tableInstance: MRT_TableInstance<D>;
@@ -85,8 +83,8 @@ export declare type MRT_ColumnDef<D extends Record<string, any> = {}> = Omit<Col
     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;
@@ -159,7 +157,7 @@ export declare type MRT_Cell<D extends Record<string, any> = {}> = Omit<Cell<D>,
     column: MRT_Column<D>;
     row: MRT_Row<D>;
 };
-export declare type MRT_FilterType = MRT_FILTER_TYPE | Function;
+export declare type MRT_FilterFn<D extends Record<string, any> = {}> = FilterFn<D> | FilterFnOption<D> | MRT_FILTER_OPTION | number | string | symbol;
 export declare type MaterialReactTableProps<D extends Record<string, any> = {}> = MRT_TableOptions<D> & {
     editingMode?: 'table' | 'row' | 'cell';
     enableClickToCopy?: boolean;
@@ -179,10 +177,8 @@ export declare 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;
@@ -396,5 +392,5 @@ export declare type MaterialReactTableProps<D extends Record<string, any> = {}>
         }>;
     }) => ReactNode;
 };
-declare const _default: <D extends Record<string, any> = {}>({ autoResetExpanded, columnResizeMode, editingMode, enableColumnActions, enableColumnFilters, enableColumnResizing, enableDensePaddingToggle, enableExpandAll, enableFilters, enableFullScreenToggle, enableGlobalFilter, enableHiding, enableMultiRowSelection, enablePagination, enableSelectAll, enableSorting, enableStickyHeader, enableTableFooter, enableTableHead, enableToolbarBottom, enableToolbarInternalActions, enableToolbarTop, icons, localization, persistentStateMode, positionActionsColumn, positionPagination, positionToolbarActions, positionToolbarAlertBanner, ...rest }: MaterialReactTableProps<D>) => JSX.Element;
+declare const _default: <D extends Record<string, any> = {}>({ autoResetExpanded, autoResetSorting, columnResizeMode, editingMode, enableColumnActions, enableColumnFilters, enableColumnResizing, enableDensePaddingToggle, enableExpandAll, enableFilters, enableFullScreenToggle, enableGlobalFilter, enableHiding, enableMultiRowSelection, enablePagination, enableSelectAll, enableSorting, enableStickyHeader, enableTableFooter, enableTableHead, enableToolbarBottom, enableToolbarInternalActions, enableToolbarTop, icons, localization, persistentStateMode, positionActionsColumn, positionPagination, positionToolbarActions, positionToolbarAlertBanner, ...rest }: MaterialReactTableProps<D>) => JSX.Element;
 export default _default;

package/dist/enums.d.ts

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

package/dist/material-react-table.cjs.development.js

@@ -235,21 +235,21 @@ var MRT_ExpandButton = function MRT_ExpandButton(_ref) {
   }));
 };
 
-var MRT_FILTER_TYPE;
-
-(function (MRT_FILTER_TYPE) {
-  MRT_FILTER_TYPE["BEST_MATCH"] = "bestMatch";
-  MRT_FILTER_TYPE["BEST_MATCH_FIRST"] = "bestMatchFirst";
-  MRT_FILTER_TYPE["CONTAINS"] = "contains";
-  MRT_FILTER_TYPE["EMPTY"] = "empty";
-  MRT_FILTER_TYPE["ENDS_WITH"] = "endsWith";
-  MRT_FILTER_TYPE["EQUALS"] = "equals";
-  MRT_FILTER_TYPE["GREATER_THAN"] = "greaterThan";
-  MRT_FILTER_TYPE["LESS_THAN"] = "lessThan";
-  MRT_FILTER_TYPE["NOT_EMPTY"] = "notEmpty";
-  MRT_FILTER_TYPE["NOT_EQUALS"] = "notEquals";
-  MRT_FILTER_TYPE["STARTS_WITH"] = "startsWith";
-})(MRT_FILTER_TYPE || (MRT_FILTER_TYPE = {}));
+var MRT_FILTER_OPTION;
+
+(function (MRT_FILTER_OPTION) {
+  MRT_FILTER_OPTION["BEST_MATCH"] = "bestMatch";
+  MRT_FILTER_OPTION["BEST_MATCH_FIRST"] = "bestMatchFirst";
+  MRT_FILTER_OPTION["CONTAINS"] = "contains";
+  MRT_FILTER_OPTION["EMPTY"] = "empty";
+  MRT_FILTER_OPTION["ENDS_WITH"] = "endsWith";
+  MRT_FILTER_OPTION["EQUALS"] = "equals";
+  MRT_FILTER_OPTION["GREATER_THAN"] = "greaterThan";
+  MRT_FILTER_OPTION["LESS_THAN"] = "lessThan";
+  MRT_FILTER_OPTION["NOT_EMPTY"] = "notEmpty";
+  MRT_FILTER_OPTION["NOT_EQUALS"] = "notEquals";
+  MRT_FILTER_OPTION["STARTS_WITH"] = "startsWith";
+})(MRT_FILTER_OPTION || (MRT_FILTER_OPTION = {}));
 
 var bestMatchFirst = function bestMatchFirst(rows, columnIds, filterValue) {
   return matchSorter.matchSorter(rows, filterValue.toString().trim(), {
@@ -387,7 +387,7 @@ var commonMenuItemStyles = {
   my: 0,
   alignItems: 'center'
 };
-var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
+var MRT_FilterOptionMenu = function MRT_FilterOptionMenu(_ref) {
   var anchorEl = _ref.anchorEl,
       header = _ref.header,
       onSelect = _ref.onSelect,
@@ -395,97 +395,97 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
       tableInstance = _ref.tableInstance;
   var getState = tableInstance.getState,
       _tableInstance$option = tableInstance.options,
-      enabledGlobalFilterTypes = _tableInstance$option.enabledGlobalFilterTypes,
+      enabledGlobalFilterOptions = _tableInstance$option.enabledGlobalFilterOptions,
       localization = _tableInstance$option.localization,
-      setCurrentFilterTypes = tableInstance.setCurrentFilterTypes,
-      setCurrentGlobalFilterType = tableInstance.setCurrentGlobalFilterType;
+      setCurrentFilterFns = tableInstance.setCurrentFilterFns,
+      setCurrentGlobalFilterFn = tableInstance.setCurrentGlobalFilterFn;
 
   var _getState = getState(),
       isDensePadding = _getState.isDensePadding,
-      currentFilterTypes = _getState.currentFilterTypes,
-      currentGlobalFilterType = _getState.currentGlobalFilterType;
+      currentFilterFns = _getState.currentFilterFns,
+      currentGlobalFilterFn = _getState.currentGlobalFilterFn;
 
-  var filterTypes = React.useMemo(function () {
+  var filterOptions = React.useMemo(function () {
     return [{
-      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(function (filterType) {
-      return header ? !header.column.enabledColumnFilterTypes || header.column.enabledColumnFilterTypes.includes(filterType.type) : (!enabledGlobalFilterTypes || enabledGlobalFilterTypes.includes(filterType.type)) && [MRT_FILTER_TYPE.BEST_MATCH_FIRST, MRT_FILTER_TYPE.BEST_MATCH].includes(filterType.type);
+      return header ? !header.column.enabledColumnFilterOptions || header.column.enabledColumnFilterOptions.includes(filterType.type) : (!enabledGlobalFilterOptions || enabledGlobalFilterOptions.includes(filterType.type)) && [MRT_FILTER_OPTION.BEST_MATCH_FIRST, MRT_FILTER_OPTION.BEST_MATCH].includes(filterType.type);
     });
   }, []);
 
   var handleSelectFilterType = function handleSelectFilterType(value) {
     if (header) {
-      setCurrentFilterTypes(function (prev) {
+      setCurrentFilterFns(function (prev) {
         var _extends2;
 
         return _extends({}, prev, (_extends2 = {}, _extends2[header.id] = value, _extends2));
       });
 
-      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 == null ? void 0 : onSelect();
   };
 
-  var filterType = !!header ? currentFilterTypes[header.id] : currentGlobalFilterType;
+  var filterType = !!header ? currentFilterFns[header.id] : currentGlobalFilterFn;
   return React__default.createElement(material.Menu, {
     anchorEl: anchorEl,
     anchorOrigin: {
@@ -499,7 +499,7 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
     MenuListProps: {
       dense: isDensePadding
     }
-  }, filterTypes.map(function (_ref2, index) {
+  }, filterOptions.map(function (_ref2, index) {
     var type = _ref2.type,
         label = _ref2.label,
         divider = _ref2.divider,
@@ -843,7 +843,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     sx: {
       p: 0
     }
-  }, React__default.createElement(ArrowRightIcon, null))), React__default.createElement(MRT_FilterTypeMenu, {
+  }, React__default.createElement(ArrowRightIcon, null))), React__default.createElement(MRT_FilterOptionMenu, {
     anchorEl: filterMenuAnchorEl,
     header: header,
     key: 2,
@@ -1257,7 +1257,7 @@ var MRT_SearchTextField = function MRT_SearchTextField(_ref) {
     sx: _extends({
       justifySelf: 'end'
     }, textFieldProps == null ? void 0 : textFieldProps.sx)
-  })), React__default.createElement(MRT_FilterTypeMenu, {
+  })), React__default.createElement(MRT_FilterOptionMenu, {
     anchorEl: anchorEl,
     setAnchorEl: setAnchorEl,
     tableInstance: tableInstance
@@ -1755,11 +1755,11 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
       idPrefix = _tableInstance$option.idPrefix,
       localization = _tableInstance$option.localization,
       muiTableHeadCellFilterTextFieldProps = _tableInstance$option.muiTableHeadCellFilterTextFieldProps,
-      setCurrentFilterTypes = tableInstance.setCurrentFilterTypes;
+      setCurrentFilterFns = tableInstance.setCurrentFilterFns;
   var column = header.column;
 
   var _getState = getState(),
-      currentFilterTypes = _getState.currentFilterTypes;
+      currentFilterFns = _getState.currentFilterFns;
 
   var _useState = React.useState(null),
       anchorEl = _useState[0],
@@ -1798,10 +1798,10 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
   var handleClearFilterChip = function handleClearFilterChip() {
     setFilterValue('');
     column.setColumnFilterValue(undefined);
-    setCurrentFilterTypes(function (prev) {
+    setCurrentFilterFns(function (prev) {
       var _extends2;
 
-      return _extends({}, prev, (_extends2 = {}, _extends2[header.id] = MRT_FILTER_TYPE.BEST_MATCH, _extends2));
+      return _extends({}, prev, (_extends2 = {}, _extends2[header.id] = MRT_FILTER_OPTION.BEST_MATCH, _extends2));
     });
   };
 
@@ -1813,10 +1813,10 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
   }
 
   var filterId = "mrt-" + idPrefix + "-" + header.id + "-filter-text-field";
-  var filterType = currentFilterTypes == null ? void 0 : currentFilterTypes[header.id];
+  var filterFn = currentFilterFns == null ? void 0 : currentFilterFns[header.id];
   var isSelectFilter = !!column.filterSelectOptions;
-  var filterChipLabel = !(filterType instanceof Function) && [MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(filterType) ? //@ts-ignore
-  localization["filter" + (filterType.charAt(0).toUpperCase() + filterType.slice(1))] : '';
+  var filterChipLabel = !(filterFn instanceof Function) && [MRT_FILTER_OPTION.EMPTY, MRT_FILTER_OPTION.NOT_EMPTY].includes(filterFn) ? //@ts-ignore
+  localization["filter" + (filterFn.charAt(0).toUpperCase() + filterFn.slice(1))] : '';
   var filterPlaceholder = (_localization$filterB = localization.filterByColumn) == null ? void 0 : _localization$filterB.replace('{column}', String(column.header));
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(material.TextField, Object.assign({
     fullWidth: true,
@@ -1831,9 +1831,9 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     },
     helperText: React__default.createElement("label", {
       htmlFor: filterId
-    }, filterType instanceof Function ? (_localization$filterM = localization.filterMode.replace('{filterType}', // @ts-ignore
-    (_localization$ = localization["filter" + (filterType.name.charAt(0).toUpperCase() + filterType.name.slice(1))]) != null ? _localization$ : '')) != null ? _localization$filterM : '' : localization.filterMode.replace('{filterType}', // @ts-ignore
-    localization["filter" + (filterType.charAt(0).toUpperCase() + filterType.slice(1))])),
+    }, filterFn instanceof Function ? (_localization$filterM = localization.filterMode.replace('{filterType}', // @ts-ignore
+    (_localization$ = localization["filter" + (filterFn.name.charAt(0).toUpperCase() + filterFn.name.slice(1))]) != null ? _localization$ : '')) != null ? _localization$filterM : '' : localization.filterMode.replace('{filterType}', // @ts-ignore
+    localization["filter" + (filterFn.charAt(0).toUpperCase() + filterFn.slice(1))])),
     FormHelperTextProps: {
       sx: {
         fontSize: '0.6rem',
@@ -1920,7 +1920,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
       key: value,
       value: value
     }, text);
-  })), React__default.createElement(MRT_FilterTypeMenu, {
+  })), React__default.createElement(MRT_FilterOptionMenu, {
     anchorEl: anchorEl,
     header: header,
     setAnchorEl: setAnchorEl,
@@ -2022,9 +2022,9 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
   var tableCellProps = _extends({}, header.getHeaderProps(), mTableHeadCellProps, mcTableHeadCellProps);
 
   var sortTooltip = !!column.getIsSorted() ? column.getIsSorted() === 'desc' ? localization.sortedByColumnDesc.replace('{column}', column.header) : localization.sortedByColumnAsc.replace('{column}', column.header) : localization.unsorted;
-  var filterType = (_getState2 = getState()) == null ? void 0 : (_getState2$currentFil = _getState2.currentFilterTypes) == null ? void 0 : _getState2$currentFil[header.id];
-  var filterTooltip = !!column.getColumnFilterValue() ? localization.filteringByColumn.replace('{column}', String(column.header)).replace('{filterType}', filterType instanceof Function ? '' : // @ts-ignore
-  localization["filter" + (filterType.charAt(0).toUpperCase() + filterType.slice(1))]).replace('{filterValue}', column.getColumnFilterValue()).replace('" "', '') : localization.showHideFilters;
+  var filterFn = (_getState2 = getState()) == null ? void 0 : (_getState2$currentFil = _getState2.currentFilterFns) == null ? void 0 : _getState2$currentFil[header.id];
+  var filterTooltip = !!column.getColumnFilterValue() ? localization.filteringByColumn.replace('{column}', String(column.header)).replace('{filterType}', filterFn instanceof Function ? '' : // @ts-ignore
+  localization["filter" + (filterFn.charAt(0).toUpperCase() + filterFn.slice(1))]).replace('{filterValue}', column.getColumnFilterValue()).replace('" "', '') : localization.showHideFilters;
   var headerElement = (_column$Header = column == null ? void 0 : column.Header == null ? void 0 : column.Header({
     header: header,
     tableInstance: tableInstance
@@ -2858,19 +2858,19 @@ var getAllLeafColumnDefs = function getAllLeafColumnDefs(columns) {
     return !col.columns;
   });
 };
-var createGroup = function createGroup(table, column, currentFilterTypes) {
+var createGroup = function createGroup(table, column, currentFilterFns) {
   var _column$columns;
 
   return table.createGroup(_extends({}, column, {
     columns: column == null ? void 0 : (_column$columns = column.columns) == null ? void 0 : _column$columns.map == null ? void 0 : _column$columns.map(function (col) {
-      return col.columns ? createGroup(table, col, currentFilterTypes) : createDataColumn(table, col, currentFilterTypes);
+      return col.columns ? createGroup(table, col, currentFilterFns) : createDataColumn(table, col, currentFilterFns);
     })
   }));
 };
-var createDataColumn = function createDataColumn(table, column, currentFilterTypes) {
+var createDataColumn = function createDataColumn(table, column, currentFilterFns) {
   return (// @ts-ignore
     table.createDataColumn(column.id, _extends({
-      filterFn: currentFilterTypes[column.id] instanceof Function ? currentFilterTypes[column.id] : defaultFilterFNs[currentFilterTypes[column.id]]
+      filterFn: currentFilterFns[column.id] instanceof Function ? currentFilterFns[column.id] : defaultFilterFNs[currentFilterFns[column.id]]
     }, column))
   );
 };
@@ -2879,7 +2879,7 @@ var createDisplayColumn = function createDisplayColumn(table, column) {
 };
 
 var MRT_TableRoot = function MRT_TableRoot(props) {
-  var _initialState$current, _initialState$current2, _initialState$isDense, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _initialState$paginat, _initialState$paginat2, _initialState$paginat3, _initialState$paginat4, _initialState$paginat5, _initialState$paginat6, _props$globalFilterTy;
+  var _initialState$current, _initialState$current2, _initialState$isDense, _initialState$isFullS, _initialState$showFil, _initialState$showGlo, _initialState$paginat, _initialState$paginat2, _initialState$paginat3, _initialState$paginat4, _initialState$paginat5, _initialState$paginat6, _props$globalFilterFn;
 
   var _useState = React.useState(props.idPrefix),
       idPrefix = _useState[0],
@@ -2950,17 +2950,17 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
 
   var _useState9 = React.useState(function () {
     return Object.assign.apply(Object, [{}].concat(getAllLeafColumnDefs(props.columns).map(function (c) {
-      var _ref, _c$filter, _initialState$current3, _c$filterSelectOption, _ref2;
+      var _ref, _c$filterFn, _initialState$current3, _c$filterSelectOption, _ref2;
 
-      return _ref2 = {}, _ref2[c.id] = (_ref = (_c$filter = c.filter) != null ? _c$filter : initialState == null ? void 0 : (_initialState$current3 = initialState.currentFilterTypes) == null ? void 0 : _initialState$current3[c.id]) != null ? _ref : !!((_c$filterSelectOption = c.filterSelectOptions) != null && _c$filterSelectOption.length) ? MRT_FILTER_TYPE.EQUALS : MRT_FILTER_TYPE.BEST_MATCH, _ref2;
+      return _ref2 = {}, _ref2[c.id] = (_ref = (_c$filterFn = c.filterFn) != null ? _c$filterFn : initialState == null ? void 0 : (_initialState$current3 = initialState.currentFilterFns) == null ? void 0 : _initialState$current3[c.id]) != null ? _ref : !!((_c$filterSelectOption = c.filterSelectOptions) != null && _c$filterSelectOption.length) ? MRT_FILTER_OPTION.EQUALS : MRT_FILTER_OPTION.BEST_MATCH, _ref2;
     })));
   }),
-      currentFilterTypes = _useState9[0],
-      setCurrentFilterTypes = _useState9[1];
+      currentFilterFns = _useState9[0],
+      setCurrentFilterFns = _useState9[1];
 
-  var _useState10 = React.useState((_props$globalFilterTy = props.globalFilterType) != null ? _props$globalFilterTy : MRT_FILTER_TYPE.BEST_MATCH_FIRST),
-      currentGlobalFilterType = _useState10[0],
-      setCurrentGlobalFilterType = _useState10[1];
+  var _useState10 = React.useState((_props$globalFilterFn = props.globalFilterFn) != null ? _props$globalFilterFn : MRT_FILTER_OPTION.BEST_MATCH_FIRST),
+      currentGlobalFilterFn = _useState10[0],
+      setCurrentGlobalFilterFn = _useState10[1];
 
   var table = React.useMemo(function () {
     return reactTable.createTable();
@@ -3034,9 +3034,9 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
   }, [props.editingMode, props.enableEditing, props.enableExpandAll, props.enableExpanded, props.enableGrouping, props.enableRowActions, props.enableRowNumbers, props.enableRowSelection, props.enableSelectAll, props.localization, table]);
   var columns = React.useMemo(function () {
     return table.createColumns([].concat(displayColumns, props.columns.map(function (column) {
-      return column.columns ? createGroup(table, column, currentFilterTypes) : createDataColumn(table, column, currentFilterTypes);
+      return column.columns ? createGroup(table, column, currentFilterFns) : createDataColumn(table, column, currentFilterFns);
     })));
-  }, [table, props.columns, currentFilterTypes]);
+  }, [table, props.columns, currentFilterFns]);
   var data = React.useMemo(function () {
     return props.isLoading && !props.data.length ? [].concat(Array(10).fill(null)).map(function () {
       return Object.assign.apply(Object, [{}].concat(getAllLeafColumnDefs(props.columns).map(function (c) {
@@ -3049,7 +3049,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
 
   var tableInstance = _extends({}, reactTable.useTableInstance(table, _extends({
     //@ts-ignore
-    filterTypes: defaultFilterFNs,
+    filterFns: defaultFilterFNs,
     getColumnFilteredRowModel: reactTable.getColumnFilteredRowModelSync(),
     getCoreRowModel: reactTable.getCoreRowModelSync(),
     getExpandedRowModel: reactTable.getExpandedRowModel(),
@@ -3060,7 +3060,7 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     getSubRows: function getSubRows(originalRow) {
       return originalRow.subRows;
     },
-    globalFilterType: currentGlobalFilterType,
+    globalFilterFn: currentGlobalFilterFn,
     onPaginationChange: function onPaginationChange(updater) {
       return setPagination(function (old) {
         return reactTable.functionalUpdate(updater, old);
@@ -3075,8 +3075,8 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     state: _extends({
       currentEditingCell: currentEditingCell,
       currentEditingRow: currentEditingRow,
-      currentFilterTypes: currentFilterTypes,
-      currentGlobalFilterType: currentGlobalFilterType,
+      currentFilterFns: currentFilterFns,
+      currentGlobalFilterFn: currentGlobalFilterFn,
       isDensePadding: isDensePadding,
       isFullScreen: isFullScreen,
       //@ts-ignore
@@ -3089,8 +3089,9 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     setCurrentEditingCell: setCurrentEditingCell,
     //@ts-ignore
     setCurrentEditingRow: setCurrentEditingRow,
-    setCurrentFilterTypes: setCurrentFilterTypes,
-    setCurrentGlobalFilterType: setCurrentGlobalFilterType,
+    setCurrentFilterFns: setCurrentFilterFns,
+    //@ts-ignore
+    setCurrentGlobalFilterFn: setCurrentGlobalFilterFn,
     setIsDensePadding: setIsDensePadding,
     setIsFullScreen: setIsFullScreen,
     setShowFilters: setShowFilters,
@@ -3120,27 +3121,29 @@ var MRT_TableRoot = function MRT_TableRoot(props) {
     }
   }, [props.enablePersistentState, props.idPrefix, props.persistentStateMode, tableInstance]);
   return React__default.createElement(React__default.Fragment, null, React__default.createElement(material.Dialog, {
-    TransitionComponent: material.Grow,
     PaperComponent: material.Box,
+    TransitionComponent: material.Grow,
     disablePortal: true,
     fullScreen: true,
     keepMounted: false,
     onClose: function onClose() {
-      return tableInstance.setIsFullScreen(false);
+      return setIsFullScreen(false);
     },
-    open: tableInstance.getState().isFullScreen,
+    open: isFullScreen,
     transitionDuration: 400
   }, React__default.createElement(MRT_TablePaper, {
     tableInstance: tableInstance
-  })), !tableInstance.getState().isFullScreen && React__default.createElement(MRT_TablePaper, {
+  })), !isFullScreen && React__default.createElement(MRT_TablePaper, {
     tableInstance: tableInstance
   }));
 };
 
-var _excluded$5 = ["autoResetExpanded", "columnResizeMode", "editingMode", "enableColumnActions", "enableColumnFilters", "enableColumnResizing", "enableDensePaddingToggle", "enableExpandAll", "enableFilters", "enableFullScreenToggle", "enableGlobalFilter", "enableHiding", "enableMultiRowSelection", "enablePagination", "enableSelectAll", "enableSorting", "enableStickyHeader", "enableTableFooter", "enableTableHead", "enableToolbarBottom", "enableToolbarInternalActions", "enableToolbarTop", "icons", "localization", "persistentStateMode", "positionActionsColumn", "positionPagination", "positionToolbarActions", "positionToolbarAlertBanner"];
+var _excluded$5 = ["autoResetExpanded", "autoResetSorting", "columnResizeMode", "editingMode", "enableColumnActions", "enableColumnFilters", "enableColumnResizing", "enableDensePaddingToggle", "enableExpandAll", "enableFilters", "enableFullScreenToggle", "enableGlobalFilter", "enableHiding", "enableMultiRowSelection", "enablePagination", "enableSelectAll", "enableSorting", "enableStickyHeader", "enableTableFooter", "enableTableHead", "enableToolbarBottom", "enableToolbarInternalActions", "enableToolbarTop", "icons", "localization", "persistentStateMode", "positionActionsColumn", "positionPagination", "positionToolbarActions", "positionToolbarAlertBanner"];
 var MaterialReactTable = (function (_ref) {
   var _ref$autoResetExpande = _ref.autoResetExpanded,
       autoResetExpanded = _ref$autoResetExpande === void 0 ? false : _ref$autoResetExpande,
+      _ref$autoResetSorting = _ref.autoResetSorting,
+      autoResetSorting = _ref$autoResetSorting === void 0 ? false : _ref$autoResetSorting,
       _ref$columnResizeMode = _ref.columnResizeMode,
       columnResizeMode = _ref$columnResizeMode === void 0 ? 'onEnd' : _ref$columnResizeMode,
       _ref$editingMode = _ref.editingMode,
@@ -3199,6 +3202,7 @@ var MaterialReactTable = (function (_ref) {
 
   return React__default.createElement(MRT_TableRoot, Object.assign({
     autoResetExpanded: autoResetExpanded,
+    autoResetSorting: autoResetSorting,
     columnResizeMode: columnResizeMode,
     editingMode: editingMode,
     enableColumnActions: enableColumnActions,