material-react-table 0.5.6 → 0.5.9

package/dist/material-react-table.esm.js

@@ -1,7 +1,7 @@
 import React, { useState, useMemo, useContext, createContext, Fragment, useRef, useEffect } from 'react';
 import { useTable, useFilters, useGlobalFilter, useGroupBy, useSortBy, useExpanded, usePagination, useRowSelect, useResizeColumns, useFlexLayout, useAsyncDebounce } from 'react-table';
 import { matchSorter } from 'match-sorter';
-import { Menu, MenuItem, TextField, InputAdornment, Tooltip, IconButton, Chip, ListItemIcon, ListItemText, TableCell, Box, TableSortLabel, Divider, Collapse, Skeleton, Checkbox, TableRow, TableHead, alpha, TableBody, TableFooter, Table, FormControlLabel, Switch, Button, TablePagination, useMediaQuery, Alert, Toolbar, TableContainer, Paper, LinearProgress } from '@mui/material';
+import { Menu, MenuItem, TextField, InputAdornment, Tooltip, IconButton, Chip, Box, TableCell, TableSortLabel, Divider, Collapse, Skeleton, Checkbox, TableRow, TableHead, alpha, TableBody, TableFooter, Table, FormControlLabel, Switch, Button, TablePagination, useMediaQuery, Alert, Toolbar, TableContainer, Paper, LinearProgress } from '@mui/material';
 import ArrowRightIcon from '@mui/icons-material/ArrowRight';
 import CancelIcon from '@mui/icons-material/Cancel';
 import ClearAllIcon from '@mui/icons-material/ClearAll';
@@ -160,6 +160,26 @@ notEqualsFilterFN.autoRemove = function (val) {
   return !val;
 };
 
+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 emptyFilterFN = function emptyFilterFN(rows, id, _filterValue) {
   return rows.filter(function (row) {
     return !row.values[id].toString().toLowerCase().trim();
@@ -184,6 +204,8 @@ var defaultFilterFNs = {
   contains: containsFilterFN,
   empty: emptyFilterFN,
   endsWith: endsWithFilterFN,
+  greaterThan: greaterThanFilterFN,
+  lessThan: lessThanFilterFN,
   equals: equalsFilterFN,
   fuzzy: fuzzyFilterFN,
   notEmpty: notEmptyFilterFN,
@@ -225,16 +247,40 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
     return _extends({}, defaultFilterFNs, props.filterTypes);
   }, [props.filterTypes]);
 
-  var _useState6 = useState(function () {
-    return Object.assign.apply(Object, [{}].concat(props.columns.map(function (c) {
-      var _c$accessor;
+  var getInitialFilterTypeState = function getInitialFilterTypeState() {
+    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);
+      }
 
-      return (_c$accessor = c.accessor) == null ? void 0 : _c$accessor.toString();
-    }).map(function (accessor) {
-      var _props$initialState$f2, _props$initialState5, _props$initialState5$, _ref;
+      currentCols = nextCols;
+    }
 
-      return _ref = {}, _ref[accessor] = (_props$initialState$f2 = props == null ? void 0 : (_props$initialState5 = props.initialState) == null ? void 0 : (_props$initialState5$ = _props$initialState5.filters) == null ? void 0 : _props$initialState5$[accessor]) != null ? _props$initialState$f2 : 'fuzzy', _ref;
+    lowestLevelColumns = lowestLevelColumns.filter(function (col) {
+      return !col.columns;
+    });
+    return Object.assign.apply(Object, [{}].concat(lowestLevelColumns.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;
     })));
+  };
+
+  var _useState6 = useState(function () {
+    return getInitialFilterTypeState();
   }),
       currentFilterTypes = _useState6[0],
       setCurrentFilterTypes = _useState6[1];
@@ -249,6 +295,7 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
     columns: columns,
     // @ts-ignore
     filterTypes: filterTypes,
+    globalFilterValue: 'fuzzy',
     useControlledState: function useControlledState(state) {
       return useMemo(function () {
         return _extends({}, state, {
@@ -298,6 +345,26 @@ var useMRT = function useMRT() {
   return useContext(MaterialReactTableContext);
 };
 
+var MRT_FILTER_TYPE;
+
+(function (MRT_FILTER_TYPE) {
+  MRT_FILTER_TYPE["CONTAINS"] = "contains";
+  MRT_FILTER_TYPE["EMPTY"] = "empty";
+  MRT_FILTER_TYPE["ENDS_WITH"] = "endsWith";
+  MRT_FILTER_TYPE["EQUALS"] = "equals";
+  MRT_FILTER_TYPE["FUZZY"] = "fuzzy";
+  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 commonMenuItemStyles = {
+  py: '6px',
+  my: 0,
+  alignItems: 'center'
+};
 var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
   var anchorEl = _ref.anchorEl,
       column = _ref.column,
@@ -311,37 +378,55 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
 
   var filterTypes = useMemo(function () {
     return [{
-      type: 'fuzzy',
+      type: MRT_FILTER_TYPE.FUZZY,
       label: localization.filterMenuItemFuzzy,
-      divider: false
+      divider: false,
+      fn: fuzzyFilterFN
     }, {
-      type: 'contains',
+      type: MRT_FILTER_TYPE.CONTAINS,
       label: localization.filterMenuItemContains,
-      divider: true
+      divider: true,
+      fn: containsFilterFN
     }, {
-      type: 'startsWith',
+      type: MRT_FILTER_TYPE.STARTS_WITH,
       label: localization.filterMenuItemStartsWith,
-      divider: false
+      divider: false,
+      fn: startsWithFilterFN
     }, {
-      type: 'endsWith',
+      type: MRT_FILTER_TYPE.ENDS_WITH,
       label: localization.filterMenuItemEndsWith,
-      divider: true
+      divider: true,
+      fn: endsWithFilterFN
     }, {
-      type: 'equals',
+      type: MRT_FILTER_TYPE.EQUALS,
       label: localization.filterMenuItemEquals,
-      divider: false
+      divider: false,
+      fn: equalsFilterFN
     }, {
-      type: 'notEquals',
+      type: MRT_FILTER_TYPE.NOT_EQUALS,
       label: localization.filterMenuItemNotEquals,
-      divider: true
+      divider: true,
+      fn: notEqualsFilterFN
+    }, {
+      type: MRT_FILTER_TYPE.GREATER_THAN,
+      label: localization.filterMenuItemGreaterThan,
+      divider: false,
+      fn: greaterThanFilterFN
     }, {
-      type: 'empty',
+      type: MRT_FILTER_TYPE.LESS_THAN,
+      label: localization.filterMenuItemLessThan,
+      divider: true,
+      fn: lessThanFilterFN
+    }, {
+      type: MRT_FILTER_TYPE.EMPTY,
       label: localization.filterMenuItemEmpty,
-      divider: false
+      divider: false,
+      fn: emptyFilterFN
     }, {
-      type: 'notEmpty',
+      type: MRT_FILTER_TYPE.NOT_EMPTY,
       label: localization.filterMenuItemNotEmpty,
-      divider: false
+      divider: false,
+      fn: notEmptyFilterFN
     }];
   }, []);
 
@@ -353,7 +438,7 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
       return _extends({}, prev, (_extends2 = {}, _extends2[column.id] = value, _extends2));
     });
 
-    if (['empty', 'notEmpty'].includes(value)) {
+    if ([MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(value)) {
       column.setFilter(' ');
     }
 
@@ -372,27 +457,28 @@ var MRT_FilterTypeMenu = function MRT_FilterTypeMenu(_ref) {
     },
     open: !!anchorEl,
     MenuListProps: {
-      dense: tableInstance.state.densePadding,
-      disablePadding: true
+      dense: tableInstance.state.densePadding
     }
-  }, filterTypes.map(function (_ref2) {
+  }, filterTypes.map(function (_ref2, index) {
     var type = _ref2.type,
         label = _ref2.label,
-        divider = _ref2.divider;
+        divider = _ref2.divider,
+        fn = _ref2.fn;
     return React.createElement(MenuItem, {
       divider: divider,
-      key: type,
+      key: index,
       onClick: function onClick() {
         return handleSelectFilterType(type);
       },
-      selected: type === filterType,
+      selected: type === filterType || fn === filterType,
+      sx: commonMenuItemStyles,
       value: type
     }, label);
   }));
 };
 
 var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
-  var _localization$filterT, _localization$filterT2;
+  var _localization$filterT, _localization$filterT2, _column$filterSelectO;
 
   var column = _ref.column;
 
@@ -440,7 +526,7 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     setCurrentFilterTypes(function (prev) {
       var _extends2;
 
-      return _extends({}, prev, (_extends2 = {}, _extends2[column.id] = 'fuzzy', _extends2));
+      return _extends({}, prev, (_extends2 = {}, _extends2[column.id] = MRT_FILTER_TYPE.FUZZY, _extends2));
     });
   };
 
@@ -451,7 +537,9 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
   }
 
   var filterType = tableInstance.state.currentFilterTypes[column.id];
-  var filterChipLabel = ['empty', 'notEmpty'].includes(filterType);
+  var isCustomFilterType = filterType instanceof Function;
+  var isSelectFilter = !!column.filterSelectOptions;
+  var filterChipLabel = !isCustomFilterType && [MRT_FILTER_TYPE.EMPTY, MRT_FILTER_TYPE.NOT_EMPTY].includes(filterType);
   var filterPlaceholder = (_localization$filterT = localization.filterTextFieldPlaceholder) == null ? void 0 : _localization$filterT.replace('{column}', String(column.Header));
   return React.createElement(React.Fragment, null, React.createElement(TextField, Object.assign({
     fullWidth: true,
@@ -464,8 +552,16 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
       },
       title: filterPlaceholder
     },
+    label: isSelectFilter && !filterValue ? filterPlaceholder : undefined,
+    InputLabelProps: {
+      shrink: false,
+      sx: {
+        maxWidth: 'calc(100% - 2.5rem)'
+      },
+      title: filterPlaceholder
+    },
     margin: "none",
-    placeholder: filterChipLabel ? '' : filterPlaceholder,
+    placeholder: filterChipLabel || isSelectFilter ? undefined : filterPlaceholder,
     onChange: function onChange(e) {
       setFilterValue(e.target.value);
       handleChange(e.target.value);
@@ -473,22 +569,23 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     onClick: function onClick(e) {
       return e.stopPropagation();
     },
+    select: isSelectFilter,
     value: filterValue != null ? filterValue : '',
     variant: "standard",
     InputProps: {
-      startAdornment: React.createElement(InputAdornment, {
+      startAdornment: !isSelectFilter && React.createElement(InputAdornment, {
         position: "start"
       }, React.createElement(Tooltip, {
         arrow: true,
-        title: "Change Filter Mode"
-      }, React.createElement(IconButton, {
+        title: localization.changeFilterMode
+      }, React.createElement("span", null, React.createElement(IconButton, {
         onClick: handleFilterMenuOpen,
         size: "small",
         sx: {
           height: '1.75rem',
           width: '1.75rem'
         }
-      }, React.createElement(FilterListIcon, null))), filterChipLabel && React.createElement(Chip, {
+      }, React.createElement(FilterListIcon, null)))), filterChipLabel && React.createElement(Chip, {
         onDelete: handleClearFilterChip,
         label: filterType
       })),
@@ -496,11 +593,12 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
         position: "end"
       }, React.createElement(Tooltip, {
         arrow: true,
+        disableHoverListener: isSelectFilter,
         placement: "right",
         title: (_localization$filterT2 = localization.filterTextFieldClearButtonTitle) != null ? _localization$filterT2 : ''
       }, React.createElement("span", null, React.createElement(IconButton, {
         "aria-label": localization.filterTextFieldClearButtonTitle,
-        disabled: (filterValue == null ? void 0 : filterValue.length) === 0,
+        disabled: !(filterValue != null && filterValue.length),
         onClick: handleClear,
         size: "small",
         sx: {
@@ -515,8 +613,32 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
     sx: _extends({
       m: '0 -0.25rem',
       minWidth: !filterChipLabel ? '5rem' : 'auto',
-      width: 'calc(100% + 0.5rem)'
+      width: 'calc(100% + 0.5rem)',
+      mt: isSelectFilter && !filterValue ? '-1rem' : undefined,
+      '&	.MuiSelect-icon': {
+        mr: '1.5rem'
+      }
     }, textFieldProps == null ? void 0 : textFieldProps.sx)
+  }), isSelectFilter && React.createElement(MenuItem, {
+    divider: true,
+    disabled: !filterValue,
+    value: ""
+  }, localization.filterTextFieldClearButtonTitle), column == null ? void 0 : (_column$filterSelectO = column.filterSelectOptions) == null ? void 0 : _column$filterSelectO.map(function (option) {
+    var value;
+    var text;
+
+    if (typeof option === 'string') {
+      value = option;
+      text = option;
+    } else if (typeof option === 'object') {
+      value = option.value;
+      text = option.text;
+    }
+
+    return React.createElement(MenuItem, {
+      key: value,
+      value: value
+    }, text);
   })), React.createElement(MRT_FilterTypeMenu, {
     anchorEl: anchorEl,
     column: column,
@@ -524,8 +646,15 @@ var MRT_FilterTextField = function MRT_FilterTextField(_ref) {
   }));
 };
 
-var commonMenuItemStyles = {
+var commonMenuItemStyles$1 = {
+  py: '6px',
+  my: 0,
+  justifyContent: 'space-between',
+  alignItems: 'center'
+};
+var commonListItemStyles = {
   display: 'flex',
+  gap: '0.75rem',
   alignItems: 'center'
 };
 var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
@@ -545,6 +674,7 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
       ClearAllIcon = _useMRT$icons.ClearAllIcon,
       DynamicFeedIcon = _useMRT$icons.DynamicFeedIcon,
       FilterListIcon = _useMRT$icons.FilterListIcon,
+      FilterListOffIcon = _useMRT$icons.FilterListOffIcon,
       SortIcon = _useMRT$icons.SortIcon,
       VisibilityOffIcon = _useMRT$icons.VisibilityOffIcon,
       idPrefix = _useMRT.idPrefix,
@@ -581,6 +711,11 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     setAnchorEl(null);
   };
 
+  var handleClearFilter = function handleClearFilter() {
+    column.setFilter('');
+    setAnchorEl(null);
+  };
+
   var handleFilterByColumn = function handleFilterByColumn() {
     setShowFilters(true);
     setTimeout(function () {
@@ -604,35 +739,49 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
       return setAnchorEl(null);
     },
     MenuListProps: {
-      dense: tableInstance.state.densePadding,
-      disablePadding: true
+      dense: tableInstance.state.densePadding
     }
   }, !disableSortBy && column.canSort && [React.createElement(MenuItem, {
-    key: 1,
     disabled: !column.isSorted,
+    key: 1,
     onClick: handleClearSort,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(ClearAllIcon, null)), React.createElement(ListItemText, null, localization.columnActionMenuItemClearSort)), React.createElement(MenuItem, {
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(ClearAllIcon, null), localization.columnActionMenuItemClearSort)), React.createElement(MenuItem, {
     disabled: column.isSorted && !column.isSortedDesc,
     key: 2,
     onClick: handleSortAsc,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(SortIcon, null)), React.createElement(ListItemText, null, (_localization$columnA = localization.columnActionMenuItemSortAsc) == null ? void 0 : _localization$columnA.replace('{column}', String(column.Header)))), React.createElement(MenuItem, {
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(SortIcon, null), (_localization$columnA = localization.columnActionMenuItemSortAsc) == null ? void 0 : _localization$columnA.replace('{column}', String(column.Header)))), React.createElement(MenuItem, {
     divider: !disableFilters || enableColumnGrouping || !disableColumnHiding,
     key: 3,
     disabled: column.isSorted && column.isSortedDesc,
     onClick: handleSortDesc,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(SortIcon, {
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(SortIcon, {
     style: {
       transform: 'rotate(180deg) scaleX(-1)'
     }
-  })), React.createElement(ListItemText, null, (_localization$columnA2 = localization.columnActionMenuItemSortDesc) == null ? void 0 : _localization$columnA2.replace('{column}', String(column.Header))))], !disableFilters && column.canFilter && [React.createElement(MenuItem, {
+  }), (_localization$columnA2 = localization.columnActionMenuItemSortDesc) == null ? void 0 : _localization$columnA2.replace('{column}', String(column.Header))))], !disableFilters && column.canFilter && [React.createElement(MenuItem, {
+    disabled: !column.filterValue,
+    key: 0,
+    onClick: handleClearFilter,
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(FilterListOffIcon, null), localization.filterTextFieldClearButtonTitle)), React.createElement(MenuItem, {
     divider: enableColumnGrouping || !disableColumnHiding,
     key: 1,
     onClick: handleFilterByColumn,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(FilterListIcon, null)), React.createElement(ListItemText, null, (_localization$filterT = localization.filterTextFieldPlaceholder) == null ? void 0 : _localization$filterT.replace('{column}', String(column.Header))), React.createElement(IconButton, {
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(FilterListIcon, null), (_localization$filterT = localization.filterTextFieldPlaceholder) == null ? void 0 : _localization$filterT.replace('{column}', String(column.Header))), !column.filterSelectOptions && React.createElement(IconButton, {
     onClick: handleOpenFilterModeMenu,
     onMouseEnter: handleOpenFilterModeMenu,
     size: "small",
@@ -649,12 +798,16 @@ var MRT_ColumnActionMenu = function MRT_ColumnActionMenu(_ref) {
     divider: !disableColumnHiding,
     key: 2,
     onClick: handleGroupByColumn,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(DynamicFeedIcon, null)), React.createElement(ListItemText, null, (_localization = localization[column.isGrouped ? 'columnActionMenuItemUnGroupBy' : 'columnActionMenuItemGroupBy']) == null ? void 0 : _localization.replace('{column}', String(column.Header))))], !disableColumnHiding && [React.createElement(MenuItem, {
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(DynamicFeedIcon, null), (_localization = localization[column.isGrouped ? 'columnActionMenuItemUnGroupBy' : 'columnActionMenuItemGroupBy']) == null ? void 0 : _localization.replace('{column}', String(column.Header))))], !disableColumnHiding && [React.createElement(MenuItem, {
     key: 1,
     onClick: handleHideColumn,
-    sx: commonMenuItemStyles
-  }, React.createElement(ListItemIcon, null, React.createElement(VisibilityOffIcon, null)), React.createElement(ListItemText, null, (_localization$columnA3 = localization.columnActionMenuItemHideColumn) == null ? void 0 : _localization$columnA3.replace('{column}', String(column.Header))))]);
+    sx: commonMenuItemStyles$1
+  }, React.createElement(Box, {
+    sx: commonListItemStyles
+  }, React.createElement(VisibilityOffIcon, null), (_localization$columnA3 = localization.columnActionMenuItemHideColumn) == null ? void 0 : _localization$columnA3.replace('{column}', String(column.Header))))]);
 };
 
 var MRT_ToggleColumnActionMenuButton = function MRT_ToggleColumnActionMenuButton(_ref) {
@@ -678,6 +831,7 @@ var MRT_ToggleColumnActionMenuButton = function MRT_ToggleColumnActionMenuButton
     arrow: true,
     enterDelay: 1000,
     enterNextDelay: 1000,
+    placement: "top",
     title: localization.columnActionMenuButtonTitle
   }, React.createElement(IconButton, {
     "aria-label": localization.columnActionMenuButtonTitle,
@@ -737,8 +891,7 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
   });
 
   var sortTooltip = column.isSorted ? column.isSortedDesc ? localization.columnActionMenuItemClearSort : (_localization$columnA = localization.columnActionMenuItemSortDesc) == null ? void 0 : _localization$columnA.replace('{column}', column.Header) : (_localization$columnA2 = localization.columnActionMenuItemSortAsc) == null ? void 0 : _localization$columnA2.replace('{column}', column.Header);
-  var filterTooltip = !!column.filterValue ? localization.filterApplied.replace('{column}', String(column.Header)).replace('{filterType}', // @ts-ignore
-  localization["filterMenuItem" + (tableInstance.state.currentFilterTypes[column.id].charAt(0).toUpperCase() + tableInstance.state.currentFilterTypes[column.id].slice(1))]) : localization.toggleFilterButtonTitle;
+  var filterTooltip = !!column.filterValue ? localization.filterApplied.replace('{column}', String(column.Header)).replace('{filterType}', column.filterValue) : localization.toggleFilterButtonTitle;
   var columnHeader = column.render('Header');
   return React.createElement(TableCell, Object.assign({
     align: isParentHeader ? 'center' : 'left'
@@ -761,6 +914,7 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
     title: undefined
   }), column.render('Header'), !isParentHeader && column.canSort && React.createElement(Tooltip, {
     arrow: true,
+    placement: "top",
     title: sortTooltip
   }, React.createElement(TableSortLabel, {
     "aria-label": sortTooltip,
@@ -768,19 +922,22 @@ var MRT_TableHeadCell = function MRT_TableHeadCell(_ref) {
     direction: column.isSortedDesc ? 'desc' : 'asc'
   })), !isParentHeader && !!column.canFilter && React.createElement(Tooltip, {
     arrow: true,
+    placement: "top",
     title: filterTooltip
   }, React.createElement(IconButton, {
+    disableRipple: true,
     onClick: function onClick(event) {
       event.stopPropagation();
       setShowFilters(!tableInstance.state.showFilters);
     },
     size: "small",
     sx: {
+      m: 0,
       opacity: !!column.filterValue ? 0.8 : 0,
       p: '2px',
-      m: 0,
       transition: 'all 0.2s ease-in-out',
       '&:hover': {
+        backgroundColor: 'transparent',
         opacity: 0.8
       }
     }
@@ -1141,12 +1298,12 @@ var MRT_RowActionMenu = function MRT_RowActionMenu(_ref) {
       return setAnchorEl(null);
     },
     MenuListProps: {
-      dense: tableInstance.state.densePadding,
-      disablePadding: true
+      dense: tableInstance.state.densePadding
     }
   }, enableRowEditing && React.createElement(MenuItem, {
-    onClick: handleEdit
-  }, React.createElement(ListItemIcon, null, React.createElement(EditIcon, null)), React.createElement(ListItemText, null, localization.rowActionMenuItemEdit)), (_renderRowActionMenuI = renderRowActionMenuItems == null ? void 0 : renderRowActionMenuItems(row, tableInstance, function () {
+    onClick: handleEdit,
+    sx: commonMenuItemStyles$1
+  }, React.createElement(EditIcon, null), localization.rowActionMenuItemEdit), (_renderRowActionMenuI = renderRowActionMenuItems == null ? void 0 : renderRowActionMenuItems(row, tableInstance, function () {
     return setAnchorEl(null);
   })) != null ? _renderRowActionMenuI : null);
 };
@@ -2330,10 +2487,17 @@ var MRT_ShowHideColumnsMenu = function MRT_ShowHideColumnsMenu(_ref) {
   };
 
   return React.createElement(React.Fragment, null, React.createElement(MenuItem, {
-    sx: {
+    sx: _extends({}, commonMenuItemStyles$1, {
       pl: (column.depth + 0.5) * 2 + "rem"
-    }
+    })
   }, React.createElement(FormControlLabel, {
+    componentsProps: {
+      typography: {
+        sx: {
+          marginBottom: 0
+        }
+      }
+    },
     checked: switchChecked,
     control: React.createElement(Switch, null),
     label: column.Header,
@@ -2378,8 +2542,7 @@ var MRT_ShowHideColumnsButton = function MRT_ShowHideColumnsButton(_ref) {
       return setAnchorEl(null);
     },
     MenuListProps: {
-      dense: tableInstance.state.densePadding,
-      disablePadding: true
+      dense: tableInstance.state.densePadding
     }
   }, React.createElement(Box, {
     sx: {
@@ -2741,6 +2904,7 @@ var MRT_TableContainer = function MRT_TableContainer() {
 
 var MRT_DefaultLocalization_EN = {
   actionsHeadColumnTitle: 'Actions',
+  changeFilterMode: 'Change filter mode',
   columnActionMenuButtonTitle: 'Column Actions',
   columnActionMenuItemClearSort: 'Clear sort',
   columnActionMenuItemGroupBy: 'Group by {column}',
@@ -2758,6 +2922,8 @@ var MRT_DefaultLocalization_EN = {
   filterMenuItemEndsWith: 'Ends With',
   filterMenuItemEquals: 'Equals',
   filterMenuItemFuzzy: 'Fuzzy Match (Default)',
+  filterMenuItemGreaterThan: 'Greater Than',
+  filterMenuItemLessThan: 'Less Than',
   filterMenuItemNotEmpty: 'Not Empty',
   filterMenuItemNotEquals: 'Not Equals',
   filterMenuItemStartsWith: 'Starts With',