material-react-table 0.6.0 → 0.6.1

package/dist/filtersFNs.d.ts

@@ -56,19 +56,23 @@ export declare const defaultFilterFNs: {
         (rows: MRT_Row[], id: string, filterValue: string | number): MRT_Row<{}>[];
         autoRemove(val: any): boolean;
     };
-    greaterThan: {
+    equals: {
         (rows: MRT_Row[], id: string, filterValue: string | number): MRT_Row<{}>[];
         autoRemove(val: any): boolean;
     };
-    lessThan: {
+    fuzzy: {
         (rows: MRT_Row[], id: string, filterValue: string | number): MRT_Row<{}>[];
         autoRemove(val: any): boolean;
     };
-    equals: {
+    globalFuzzy: {
+        (rows: MRT_Row[], columnIds: string[], filterValue: string | number): MRT_Row<{}>[];
+        autoRemove(val: any): boolean;
+    };
+    greaterThan: {
         (rows: MRT_Row[], id: string, filterValue: string | number): MRT_Row<{}>[];
         autoRemove(val: any): boolean;
     };
-    fuzzy: {
+    lessThan: {
         (rows: MRT_Row[], id: string, filterValue: string | number): MRT_Row<{}>[];
         autoRemove(val: any): boolean;
     };

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

@@ -104,6 +104,21 @@ 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 fuzzyFilterFN = function fuzzyFilterFN(rows, id, filterValue) {
   return matchSorter.matchSorter(rows, filterValue.toString().trim(), {
     keys: ["values." + id],
@@ -211,10 +226,11 @@ var defaultFilterFNs = {
   contains: containsFilterFN,
   empty: emptyFilterFN,
   endsWith: endsWithFilterFN,
-  greaterThan: greaterThanFilterFN,
-  lessThan: lessThanFilterFN,
   equals: equalsFilterFN,
   fuzzy: fuzzyFilterFN,
+  globalFuzzy: fuzzySearchFN,
+  greaterThan: greaterThanFilterFN,
+  lessThan: lessThanFilterFN,
   notEmpty: notEmptyFilterFN,
   notEquals: notEqualsFilterFN,
   startsWith: startsWithFilterFN
@@ -225,7 +241,7 @@ var MaterialReactTableContext = /*#__PURE__*/function () {
 }();
 
 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;
+  var _props$initialState$d, _props$initialState, _props$initialState$f, _props$initialState2, _props$initialState$s, _props$initialState3, _props$initialState$s2, _props$initialState4, _props$globalFilter;
 
   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);
@@ -253,8 +269,7 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
   var filterTypes = React.useMemo(function () {
     return _extends({}, defaultFilterFNs, props.filterTypes);
   }, [props.filterTypes]);
-
-  var getInitialFilterTypeState = function getInitialFilterTypeState() {
+  var findLowestLevelCols = React.useCallback(function () {
     var lowestLevelColumns = props.columns;
     var currentCols = props.columns;
 
@@ -276,24 +291,23 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
       currentCols = nextCols;
     }
 
-    lowestLevelColumns = lowestLevelColumns.filter(function (col) {
+    return lowestLevelColumns.filter(function (col) {
       return !col.columns;
     });
-    return Object.assign.apply(Object, [{}].concat(lowestLevelColumns.map(function (c) {
+  }, [props.columns]);
+
+  var _useState6 = React.useState(function () {
+    return Object.assign.apply(Object, [{}].concat(findLowestLevelCols().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 = React.useState(function () {
-    return getInitialFilterTypeState();
   }),
       currentFilterTypes = _useState6[0],
       setCurrentFilterTypes = _useState6[1];
 
   var columns = React.useMemo(function () {
-    return props.columns.map(function (column) {
+    return findLowestLevelCols().map(function (column) {
       column.filter = filterTypes[currentFilterTypes[column.accessor]];
       return column;
     });
@@ -302,7 +316,7 @@ var MaterialReactTableProvider = function MaterialReactTableProvider(props) {
     columns: columns,
     // @ts-ignore
     filterTypes: filterTypes,
-    globalFilterValue: 'fuzzy',
+    globalFilter: (_props$globalFilter = props.globalFilter) != null ? _props$globalFilter : 'globalFuzzy',
     useControlledState: function useControlledState(state) {
       return React.useMemo(function () {
         return _extends({}, state, {