material-react-table 0.6.1 → 0.6.4

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

@@ -7,8 +7,8 @@ function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'defau
 var React = require('react');
 var React__default = _interopDefault(React);
 var reactTable = require('react-table');
-var matchSorter = require('match-sorter');
 var material = require('@mui/material');
+var matchSorter = require('match-sorter');
 var ArrowRightIcon = _interopDefault(require('@mui/icons-material/ArrowRight'));
 var CancelIcon = _interopDefault(require('@mui/icons-material/Cancel'));
 var ClearAllIcon = _interopDefault(require('@mui/icons-material/ClearAll'));
@@ -104,144 +104,41 @@ function _objectWithoutPropertiesLoose(source, excluded) {
   return target;
 }
 
-var fuzzySearchFN = function fuzzySearchFN(rows, columnIds, filterValue) {
-  return matchSorter.matchSorter(rows, filterValue.toString().trim(), {
-    keys: columnIds.map(function (c) {
-      return "values." + c;
-    }),
-    sorter: function sorter(rankedItems) {
-      return rankedItems;
-    }
-  });
-};
-
-fuzzySearchFN.autoRemove = function (val) {
-  return !val;
-};
+var findLowestLevelCols = function findLowestLevelCols(columns) {
+  var lowestLevelColumns = columns;
+  var currentCols = columns;
 
-var fuzzyFilterFN = function fuzzyFilterFN(rows, id, filterValue) {
-  return matchSorter.matchSorter(rows, filterValue.toString().trim(), {
-    keys: ["values." + id],
-    sorter: function sorter(rankedItems) {
-      return rankedItems;
-    }
-  });
-};
-
-fuzzyFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var containsFilterFN = function containsFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return row.values[id].toString().toLowerCase().trim().includes(filterValue.toString().toLowerCase().trim());
-  });
-};
-
-containsFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var startsWithFilterFN = function startsWithFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return row.values[id].toString().toLowerCase().trim().startsWith(filterValue.toString().toLowerCase().trim());
-  });
-};
-
-startsWithFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var endsWithFilterFN = function endsWithFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return row.values[id].toString().toLowerCase().trim().endsWith(filterValue.toString().toLowerCase().trim());
-  });
-};
-
-endsWithFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var equalsFilterFN = function equalsFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return row.values[id].toString().toLowerCase().trim() === filterValue.toString().toLowerCase().trim();
-  });
-};
-
-equalsFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var notEqualsFilterFN = function notEqualsFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return row.values[id].toString().toLowerCase().trim() !== filterValue.toString().toLowerCase().trim();
-  });
-};
-
-notEqualsFilterFN.autoRemove = function (val) {
-  return !val;
-};
+  while (!!((_currentCols = currentCols) != null && _currentCols.length) && currentCols.some(function (col) {
+    return col.columns;
+  })) {
+    var _currentCols;
 
-var greaterThanFilterFN = function greaterThanFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return !isNaN(+filterValue) && !isNaN(+row.values[id]) ? +row.values[id] > +filterValue : row.values[id].toString().toLowerCase().trim() > filterValue.toString().toLowerCase().trim();
-  });
-};
-
-greaterThanFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var lessThanFilterFN = function lessThanFilterFN(rows, id, filterValue) {
-  return rows.filter(function (row) {
-    return !isNaN(+filterValue) && !isNaN(+row.values[id]) ? +row.values[id] < +filterValue : row.values[id].toString().toLowerCase().trim() < filterValue.toString().toLowerCase().trim();
-  });
-};
-
-lessThanFilterFN.autoRemove = function (val) {
-  return !val;
-};
+    var nextCols = currentCols.filter(function (col) {
+      return !!col.columns;
+    }).map(function (col) {
+      return col.columns;
+    }).flat();
 
-var emptyFilterFN = function emptyFilterFN(rows, id, _filterValue) {
-  return rows.filter(function (row) {
-    return !row.values[id].toString().toLowerCase().trim();
-  });
-};
+    if (nextCols.every(function (col) {
+      return !(col != null && col.columns);
+    })) {
+      lowestLevelColumns = [].concat(lowestLevelColumns, nextCols);
+    }
 
-emptyFilterFN.autoRemove = function (val) {
-  return !val;
-};
+    currentCols = nextCols;
+  }
 
-var notEmptyFilterFN = function notEmptyFilterFN(rows, id, _filterValue) {
-  return rows.filter(function (row) {
-    return !!row.values[id].toString().toLowerCase().trim();
+  return lowestLevelColumns.filter(function (col) {
+    return !col.columns;
   });
 };
 
-notEmptyFilterFN.autoRemove = function (val) {
-  return !val;
-};
-
-var defaultFilterFNs = {
-  contains: containsFilterFN,
-  empty: emptyFilterFN,
-  endsWith: endsWithFilterFN,
-  equals: equalsFilterFN,
-  fuzzy: fuzzyFilterFN,
-  globalFuzzy: fuzzySearchFN,
-  greaterThan: greaterThanFilterFN,
-  lessThan: lessThanFilterFN,
-  notEmpty: notEmptyFilterFN,
-  notEquals: notEqualsFilterFN,
-  startsWith: startsWithFilterFN
-};
-
 var MaterialReactTableContext = /*#__PURE__*/function () {
   return React.createContext({});
 }();
 
 var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
-  var _props$initialState$d, _props$initialState, _props$initialState$f, _props$initialState2, _props$initialState$s, _props$initialState3, _props$initialState$s2, _props$initialState4, _props$globalFilter;
+  var _props$initialState$d, _props$initialState, _props$initialState$f, _props$initialState2, _props$initialState$s, _props$initialState3, _props$initialState$s2, _props$initialState4;
 
   var hooks = [reactTable.useFilters, reactTable.useGlobalFilter, reactTable.useGroupBy, reactTable.useSortBy, reactTable.useExpanded, reactTable.usePagination, reactTable.useRowSelect];
   if (props.enableColumnResizing) hooks.unshift(reactTable.useResizeColumns, reactTable.useFlexLayout);
@@ -266,38 +163,8 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
       showSearch = _useState5[0],
       setShowSearch = _useState5[1];
 
-  var filterTypes = React.useMemo(function () {
-    return _extends({}, defaultFilterFNs, props.filterTypes);
-  }, [props.filterTypes]);
-  var findLowestLevelCols = React.useCallback(function () {
-    var lowestLevelColumns = props.columns;
-    var currentCols = props.columns;
-
-    while (!!currentCols.length && currentCols.some(function (col) {
-      return col.columns;
-    })) {
-      var nextCols = currentCols.filter(function (col) {
-        return !!col.columns;
-      }).map(function (col) {
-        return col.columns;
-      }).flat();
-
-      if (nextCols.every(function (col) {
-        return !col.columns;
-      })) {
-        lowestLevelColumns = [].concat(lowestLevelColumns, nextCols);
-      }
-
-      currentCols = nextCols;
-    }
-
-    return lowestLevelColumns.filter(function (col) {
-      return !col.columns;
-    });
-  }, [props.columns]);
-
   var _useState6 = React.useState(function () {
-    return Object.assign.apply(Object, [{}].concat(findLowestLevelCols().map(function (c) {
+    return Object.assign.apply(Object, [{}].concat(findLowestLevelCols(props.columns).map(function (c) {
       var _ref, _c$filter, _props$initialState5, _props$initialState5$, _ref2;
 
       return _ref2 = {}, _ref2[c.accessor] = (_ref = (_c$filter = c.filter) != null ? _c$filter : props == null ? void 0 : (_props$initialState5 = props.initialState) == null ? void 0 : (_props$initialState5$ = _props$initialState5.filters) == null ? void 0 : _props$initialState5$[c.accessor]) != null ? _ref : !!c.filterSelectOptions ? 'equals' : 'fuzzy', _ref2;
@@ -306,17 +173,36 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
       currentFilterTypes = _useState6[0],
       setCurrentFilterTypes = _useState6[1];
 
-  var columns = React.useMemo(function () {
-    return findLowestLevelCols().map(function (column) {
-      column.filter = filterTypes[currentFilterTypes[column.accessor]];
+  var applyFiltersToColumns = React.useCallback(function (cols) {
+    return cols.map(function (column) {
+      if (column.columns) {
+        applyFiltersToColumns(column.columns);
+      } else {
+        var _props$filterTypes;
+
+        column.filter = props == null ? void 0 : (_props$filterTypes = props.filterTypes) == null ? void 0 : _props$filterTypes[currentFilterTypes[column.accessor]];
+      }
+
       return column;
     });
-  }, [props.columns, filterTypes, currentFilterTypes]);
-  var tableInstance = reactTable.useTable.apply(void 0, [_extends({}, props, {
-    columns: columns,
+  }, [currentFilterTypes, props.filterTypes]);
+  var columns = React.useMemo(function () {
+    return applyFiltersToColumns(props.columns);
+  }, [props.columns, applyFiltersToColumns]);
+  var data = React.useMemo(function () {
+    return !props.isLoading || !!props.data.length ? props.data : [].concat(Array(10).fill(null)).map(function (_) {
+      return Object.assign.apply(Object, [{}].concat(findLowestLevelCols(props.columns).map(function (c) {
+        var _ref3;
+
+        return _ref3 = {}, _ref3[c.accessor] = null, _ref3;
+      })));
+    });
+  }, [props.data, props.isLoading]);
+  var tableInstance = reactTable.useTable.apply(void 0, [// @ts-ignore
+  _extends({}, props, {
     // @ts-ignore
-    filterTypes: filterTypes,
-    globalFilter: (_props$globalFilter = props.globalFilter) != null ? _props$globalFilter : 'globalFuzzy',
+    columns: columns,
+    data: data,
     useControlledState: function useControlledState(state) {
       return React.useMemo(function () {
         return _extends({}, state, {
@@ -381,6 +267,124 @@ var MRT_FILTER_TYPE;
   MRT_FILTER_TYPE["STARTS_WITH"] = "startsWith";
 })(MRT_FILTER_TYPE || (MRT_FILTER_TYPE = {}));
 
+var fuzzy = function fuzzy(rows, columnIds, filterValue) {
+  return matchSorter.matchSorter(rows, filterValue.toString().trim(), {
+    keys: Array.isArray(columnIds) ? columnIds.map(function (c) {
+      return "values." + c;
+    }) : ["values." + columnIds],
+    sorter: function sorter(rankedItems) {
+      return rankedItems;
+    }
+  });
+};
+
+fuzzy.autoRemove = function (val) {
+  return !val;
+};
+
+var contains = function contains(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return row.values[id].toString().toLowerCase().trim().includes(filterValue.toString().toLowerCase().trim());
+  });
+};
+
+contains.autoRemove = function (val) {
+  return !val;
+};
+
+var startsWith = function startsWith(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return row.values[id].toString().toLowerCase().trim().startsWith(filterValue.toString().toLowerCase().trim());
+  });
+};
+
+startsWith.autoRemove = function (val) {
+  return !val;
+};
+
+var endsWith = function endsWith(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return row.values[id].toString().toLowerCase().trim().endsWith(filterValue.toString().toLowerCase().trim());
+  });
+};
+
+endsWith.autoRemove = function (val) {
+  return !val;
+};
+
+var equals = function equals(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return row.values[id].toString().toLowerCase().trim() === filterValue.toString().toLowerCase().trim();
+  });
+};
+
+equals.autoRemove = function (val) {
+  return !val;
+};
+
+var notEquals = function notEquals(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return row.values[id].toString().toLowerCase().trim() !== filterValue.toString().toLowerCase().trim();
+  });
+};
+
+notEquals.autoRemove = function (val) {
+  return !val;
+};
+
+var greaterThan = function greaterThan(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return !isNaN(+filterValue) && !isNaN(+row.values[id]) ? +row.values[id] > +filterValue : row.values[id].toString().toLowerCase().trim() > filterValue.toString().toLowerCase().trim();
+  });
+};
+
+greaterThan.autoRemove = function (val) {
+  return !val;
+};
+
+var lessThan = function lessThan(rows, id, filterValue) {
+  return rows.filter(function (row) {
+    return !isNaN(+filterValue) && !isNaN(+row.values[id]) ? +row.values[id] < +filterValue : row.values[id].toString().toLowerCase().trim() < filterValue.toString().toLowerCase().trim();
+  });
+};
+
+lessThan.autoRemove = function (val) {
+  return !val;
+};
+
+var empty = function empty(rows, id, _filterValue) {
+  return rows.filter(function (row) {
+    return !row.values[id].toString().toLowerCase().trim();
+  });
+};
+
+empty.autoRemove = function (val) {
+  return !val;
+};
+
+var notEmpty = function notEmpty(rows, id, _filterValue) {
+  return rows.filter(function (row) {
+    return !!row.values[id].toString().toLowerCase().trim();
+  });
+};
+
+notEmpty.autoRemove = function (val) {
+  return !val;
+};
+
+var defaultFilterFNs = {
+  contains: contains,
+  empty: empty,
+  endsWith: endsWith,
+  equals: equals,
+  fuzzy: fuzzy,
+  greaterThan: greaterThan,
+  lessThan: lessThan,
+  notEmpty: notEmpty,
+  notEquals: notEquals,
+  startsWith: startsWith
+};
+
 var commonMenuItemStyles = {
   py: '6px',
   my: 0,
@@ -402,52 +406,52 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
       type: MRT_FILTER_TYPE.FUZZY,
       label: localization.filterFuzzy,
       divider: false,
-      fn: fuzzyFilterFN
+      fn: fuzzy
     }, {
       type: MRT_FILTER_TYPE.CONTAINS,
       label: localization.filterContains,
       divider: true,
-      fn: containsFilterFN
+      fn: contains
     }, {
       type: MRT_FILTER_TYPE.STARTS_WITH,
       label: localization.filterStartsWith,
       divider: false,
-      fn: startsWithFilterFN
+      fn: startsWith
     }, {
       type: MRT_FILTER_TYPE.ENDS_WITH,
       label: localization.filterEndsWith,
       divider: true,
-      fn: endsWithFilterFN
+      fn: endsWith
     }, {
       type: MRT_FILTER_TYPE.EQUALS,
       label: localization.filterEquals,
       divider: false,
-      fn: equalsFilterFN
+      fn: equals
     }, {
       type: MRT_FILTER_TYPE.NOT_EQUALS,
       label: localization.filterNotEquals,
       divider: true,
-      fn: notEqualsFilterFN
+      fn: notEquals
     }, {
       type: MRT_FILTER_TYPE.GREATER_THAN,
       label: localization.filterGreaterThan,
       divider: false,
-      fn: greaterThanFilterFN
+      fn: greaterThan
     }, {
       type: MRT_FILTER_TYPE.LESS_THAN,
       label: localization.filterLessThan,
       divider: true,
-      fn: lessThanFilterFN
+      fn: lessThan
     }, {
       type: MRT_FILTER_TYPE.EMPTY,
       label: localization.filterEmpty,
       divider: false,
-      fn: emptyFilterFN
+      fn: empty
     }, {
       type: MRT_FILTER_TYPE.NOT_EMPTY,
       label: localization.filterNotEmpty,
       divider: false,
-      fn: notEmptyFilterFN
+      fn: notEmpty
     }];
   }, []);
 
@@ -499,7 +503,7 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
 };
 
 var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
-  var _localization$filterB, _localization$clearFi, _column$filterSelectO;
+  var _localization$filterB, _localization$filterM, _localization$, _localization$clearFi, _column$filterSelectO;
 
   var column = _ref.column;
 
@@ -557,6 +561,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     }));
   }
 
+  var filterId = "mrt-" + idPrefix + "-" + column.id + "-filter-text-field";
   var filterType = tableInstance.state.currentFilterTypes[column.id];
   var isSelectFilter = !!column.filterSelectOptions;
   var filterChipLabel = !(filterType instanceof Function) && [MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(filterType) ? //@ts-ignore
@@ -564,7 +569,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
   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,
-    id: "mrt-" + idPrefix + "-" + column.id + "-filter-text-field",
+    id: filterId,
     inputProps: {
       disabled: !!filterChipLabel,
       sx: {
@@ -573,8 +578,11 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
       },
       title: filterPlaceholder
     },
-    helperText: filterType instanceof Function ? '' : localization.filterMode.replace('{filterType}', // @ts-ignore
-    localization["filter" + (filterType.charAt(0).toUpperCase() + filterType.slice(1))]),
+    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))])),
     FormHelperTextProps: {
       sx: {
         fontSize: '0.6rem',
@@ -608,6 +616,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
         arrow: true,
         title: localization.changeFilterMode
       }, React__default.createElement("span", null, React__default.createElement(material.IconButton, {
+        "aria-label": localization.changeFilterMode,
         onClick: handleFilterMenuOpen,
         size: "small",
         sx: {
@@ -857,15 +866,16 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     setAnchorEl(null);
   };
 
+  var handleShowAllColumns = function handleShowAllColumns() {
+    tableInstance.toggleHideAllColumns(false);
+    setAnchorEl(null);
+  };
+
   var handleOpenFilterModeMenu = function handleOpenFilterModeMenu(event) {
     event.stopPropagation();
     setFilterMenuAnchorEl(event.currentTarget);
   };
 
-  var handleShowAllColumns = function handleShowAllColumns() {
-    tableInstance.toggleHideAllColumns(false);
-  };
-
   var handleOpenShowHideColumnsMenu = function handleOpenShowHideColumnsMenu(event) {
     event.stopPropagation();
     setShowHideColumnsMenuAnchorEl(event.currentTarget);
@@ -2427,9 +2437,7 @@ var MRT_TableBody = function MRT_TableBody() {
   });
 
   return React__default.createElement(material.TableBody, Object.assign({}, tableBodyProps, {
-    sx: _extends({
-      overflowY: 'hidden'
-    }, tableBodyProps == null ? void 0 : tableBodyProps.sx)
+    sx: _extends({}, tableBodyProps == null ? void 0 : tableBodyProps.sx)
   }), rows.map(function (row) {
     tableInstance.prepareRow(row);
     return React__default.createElement(MRT_TableBodyRow, {
@@ -2789,7 +2797,7 @@ var MRT_TablePagination = function MRT_TablePagination() {
     showLastButton: tableInstance.rows.length / tableInstance.state.pageSize > 2
   }, tablePaginationProps, {
     sx: _extends({
-      p: 0,
+      m: '0 0.5rem',
       position: 'relative',
       zIndex: 2
     }, tablePaginationProps == null ? void 0 : tablePaginationProps.sx)
@@ -2851,6 +2859,34 @@ var MRT_ToolbarAlertBanner = function MRT_ToolbarAlertBanner() {
   }, selectMessage, groupedByMessage)));
 };
 
+var MRT_LinearProgressBar = function MRT_LinearProgressBar() {
+  var _useMRT = useMRT(),
+      muiLinearProgressProps = _useMRT.muiLinearProgressProps,
+      isFetching = _useMRT.isFetching,
+      isLoading = _useMRT.isLoading,
+      tableInstance = _useMRT.tableInstance;
+
+  var linearProgressProps = muiLinearProgressProps instanceof Function ? muiLinearProgressProps(tableInstance) : muiLinearProgressProps;
+  return React__default.createElement(material.Collapse, {
+    "in": isFetching || isLoading,
+    unmountOnExit: true
+  }, React__default.createElement(material.LinearProgress, Object.assign({
+    "aria-label": "Loading",
+    "aria-busy": "true"
+  }, linearProgressProps)));
+};
+
+var commonToolbarStyles = function commonToolbarStyles(theme, tableInstance) {
+  return {
+    backgroundColor: theme.palette.background["default"],
+    backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
+    display: 'grid',
+    opacity: tableInstance.state.fullScreen ? 0.95 : 1,
+    p: '0 !important',
+    width: '100%',
+    zIndex: 1
+  };
+};
 var MRT_ToolbarTop = function MRT_ToolbarTop() {
   var _renderToolbarCustomA;
 
@@ -2871,15 +2907,9 @@ var MRT_ToolbarTop = function MRT_ToolbarTop() {
   }, toolbarProps, {
     sx: function sx(theme) {
       return _extends({
-        backgroundColor: theme.palette.background["default"],
-        backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
-        display: 'grid',
-        p: '0 !important',
         position: tableInstance.state.fullScreen ? 'sticky' : undefined,
-        top: tableInstance.state.fullScreen ? '0' : undefined,
-        width: '100%',
-        zIndex: 1
-      }, toolbarProps == null ? void 0 : toolbarProps.sx);
+        top: tableInstance.state.fullScreen ? '0' : undefined
+      }, commonToolbarStyles(theme, tableInstance), toolbarProps == null ? void 0 : toolbarProps.sx);
     }
   }), positionToolbarAlertBanner === 'top' && React__default.createElement(MRT_ToolbarAlertBanner, null), React__default.createElement(material.Box, {
     sx: {
@@ -2894,7 +2924,7 @@ var MRT_ToolbarTop = function MRT_ToolbarTop() {
       position: 'relative',
       zIndex: 3
     }
-  }, !disableGlobalFilter && React__default.createElement(MRT_SearchTextField, null), !hideToolbarInternalActions && positionToolbarActions === 'top' && React__default.createElement(MRT_ToolbarInternalButtons, null))), React__default.createElement("div", null, !manualPagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)));
+  }, !disableGlobalFilter && React__default.createElement(MRT_SearchTextField, null), !hideToolbarInternalActions && positionToolbarActions === 'top' && React__default.createElement(MRT_ToolbarInternalButtons, null))), React__default.createElement("div", null, !manualPagination && ['top', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)), React__default.createElement(MRT_LinearProgressBar, null));
 };
 
 var MRT_ToolbarBottom = function MRT_ToolbarBottom() {
@@ -2913,53 +2943,37 @@ var MRT_ToolbarBottom = function MRT_ToolbarBottom() {
   }, toolbarProps, {
     sx: function sx(theme) {
       return _extends({
-        backgroundColor: theme.palette.background["default"],
-        backgroundImage: "linear-gradient(" + material.alpha(theme.palette.common.white, 0.05) + "," + material.alpha(theme.palette.common.white, 0.05) + ")",
         bottom: tableInstance.state.fullScreen ? '0' : undefined,
-        display: 'flex',
-        justifyContent: 'space-between',
-        overflowY: 'hidden',
-        p: '0 0.5rem !important',
-        position: tableInstance.state.fullScreen ? 'fixed' : undefined,
-        width: 'calc(100% - 1rem)',
-        zIndex: 1
-      }, toolbarProps == null ? void 0 : toolbarProps.sx);
+        position: tableInstance.state.fullScreen ? 'fixed' : undefined
+      }, commonToolbarStyles(theme, tableInstance), toolbarProps == null ? void 0 : toolbarProps.sx);
+    }
+  }), React__default.createElement(MRT_LinearProgressBar, null), React__default.createElement(material.Box, {
+    sx: {
+      display: 'flex',
+      justifyContent: 'space-between',
+      width: '100%'
     }
-  }), !hideToolbarInternalActions && positionToolbarActions === 'bottom' ? React__default.createElement(MRT_ToolbarInternalButtons, null) : React__default.createElement("span", null), positionToolbarAlertBanner === 'bottom' && React__default.createElement(MRT_ToolbarAlertBanner, null), !manualPagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null));
+  }, !hideToolbarInternalActions && positionToolbarActions === 'bottom' ? React__default.createElement(MRT_ToolbarInternalButtons, null) : React__default.createElement("span", null), positionToolbarAlertBanner === 'bottom' && React__default.createElement(MRT_ToolbarAlertBanner, null), !manualPagination && ['bottom', 'both'].includes(positionPagination != null ? positionPagination : '') && React__default.createElement(MRT_TablePagination, null)));
 };
 
 var MRT_TableContainer = function MRT_TableContainer() {
   var _useMRT = useMRT(),
       hideToolbarBottom = _useMRT.hideToolbarBottom,
       hideToolbarTop = _useMRT.hideToolbarTop,
-      isFetching = _useMRT.isFetching,
-      isLoading = _useMRT.isLoading,
-      muiLinearProgressProps = _useMRT.muiLinearProgressProps,
       muiTableContainerProps = _useMRT.muiTableContainerProps,
       tableInstance = _useMRT.tableInstance;
 
   var fullScreen = tableInstance.state.fullScreen;
-  var originalBodyOverflowStyle = React.useRef();
-  React.useEffect(function () {
-    if (typeof window !== 'undefined') {
-      var _document, _document$body, _document$body$style;
-
-      originalBodyOverflowStyle.current = (_document = document) == null ? void 0 : (_document$body = _document.body) == null ? void 0 : (_document$body$style = _document$body.style) == null ? void 0 : _document$body$style.overflow;
-    }
-  }, []);
   React.useEffect(function () {
     if (typeof window !== 'undefined') {
       if (fullScreen) {
         document.body.style.overflow = 'hidden';
       } else {
-        var _originalBodyOverflow;
-
-        document.body.style.overflow = (_originalBodyOverflow = originalBodyOverflowStyle.current) != null ? _originalBodyOverflow : 'auto';
+        document.body.style.overflow = 'auto';
       }
     }
   }, [fullScreen]);
   var tableContainerProps = muiTableContainerProps instanceof Function ? muiTableContainerProps(tableInstance) : muiTableContainerProps;
-  var linearProgressProps = muiLinearProgressProps instanceof Function ? muiLinearProgressProps(tableInstance) : muiLinearProgressProps;
   return React__default.createElement(material.TableContainer, Object.assign({
     component: material.Paper
   }, tableContainerProps, {
@@ -2968,6 +2982,7 @@ var MRT_TableContainer = function MRT_TableContainer() {
       height: fullScreen ? '100%' : undefined,
       left: fullScreen ? '0' : undefined,
       m: fullScreen ? '0' : undefined,
+      overflowY: !fullScreen ? 'hidden' : undefined,
       position: fullScreen ? 'fixed' : undefined,
       right: fullScreen ? '0' : undefined,
       top: fullScreen ? '0' : undefined,
@@ -2975,10 +2990,7 @@ var MRT_TableContainer = function MRT_TableContainer() {
       width: fullScreen ? '100vw' : undefined,
       zIndex: fullScreen ? 1200 : 1
     }, tableContainerProps == null ? void 0 : tableContainerProps.sx)
-  }), !hideToolbarTop && React__default.createElement(MRT_ToolbarTop, null), React__default.createElement(material.Collapse, {
-    "in": isFetching || isLoading,
-    unmountOnExit: true
-  }, React__default.createElement(material.LinearProgress, Object.assign({}, linearProgressProps))), React__default.createElement(material.Box, {
+  }), !hideToolbarTop && React__default.createElement(MRT_ToolbarTop, null), React__default.createElement(material.Box, {
     sx: {
       maxWidth: '100%',
       overflowX: 'auto'
@@ -3061,13 +3073,16 @@ var MRT_Default_Icons = {
   VisibilityOffIcon: VisibilityOffIcon
 };
 
-var _excluded = ["defaultColumn", "icons", "localization", "positionActionsColumn", "positionPagination", "positionToolbarActions", "positionToolbarAlertBanner"];
+var _excluded = ["defaultColumn", "filterTypes", "globalFilter", "icons", "localization", "positionActionsColumn", "positionPagination", "positionToolbarActions", "positionToolbarAlertBanner"];
 var MaterialReactTable = (function (_ref) {
   var _ref$defaultColumn = _ref.defaultColumn,
       defaultColumn = _ref$defaultColumn === void 0 ? {
     minWidth: 50,
     maxWidth: 1000
   } : _ref$defaultColumn,
+      filterTypes = _ref.filterTypes,
+      _ref$globalFilter = _ref.globalFilter,
+      globalFilter = _ref$globalFilter === void 0 ? 'fuzzy' : _ref$globalFilter,
       icons = _ref.icons,
       localization = _ref.localization,
       _ref$positionActionsC = _ref.positionActionsColumn,
@@ -3080,8 +3095,14 @@ var MaterialReactTable = (function (_ref) {
       positionToolbarAlertBanner = _ref$positionToolbarA2 === void 0 ? 'top' : _ref$positionToolbarA2,
       rest = _objectWithoutPropertiesLoose(_ref, _excluded);
 
-  return React__default.createElement(MaterialReactTableProvider, Object.assign({
+  return React__default.createElement(MaterialReactTableProvider //@ts-ignore
+  , Object.assign({
+    //@ts-ignore
     defaultColumn: defaultColumn,
+    //@ts-ignore
+    filterTypes: _extends({}, defaultFilterFNs, filterTypes),
+    //@ts-ignore
+    globalFilter: globalFilter,
     icons: _extends({}, MRT_Default_Icons, icons),
     localization: _extends({}, MRT_DefaultLocalization_EN, localization),
     positionActionsColumn: positionActionsColumn,