material-react-table 0.6.0 → 0.6.1

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.6.0",
+  "version": "0.6.1",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material-UI implementation of react-table, inspired by material-table and the mui DataGrid, written from the ground up in TypeScript.",
@@ -56,7 +56,7 @@
   ],
   "devDependencies": {
     "@babel/core": "^7.17.5",
-    "@emotion/react": "^11.8.1",
+    "@emotion/react": "^11.8.2",
     "@emotion/styled": "^11.8.1",
     "@etchteam/storybook-addon-status": "^4.2.0",
     "@faker-js/faker": "^6.0.0-beta.0",
@@ -73,7 +73,7 @@
     "@storybook/addons": "^6.4.19",
     "@storybook/react": "^6.4.19",
     "@types/faker": "^6.6.8",
-    "@types/react": "^17.0.39",
+    "@types/react": "^17.0.40",
     "@types/react-dom": "^17.0.13",
     "@types/react-table": "^7.7.9",
     "babel-loader": "^8.2.3",

package/src/filtersFNs.ts

@@ -144,10 +144,11 @@ export const 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,

package/src/useMRT.tsx

@@ -7,6 +7,7 @@ import React, {
   useState,
   Dispatch,
   SetStateAction,
+  useCallback,
 } from 'react';
 import {
   PluginHook,
@@ -92,7 +93,7 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
     [props.filterTypes],
   );
 
-  const getInitialFilterTypeState = () => {
+  const findLowestLevelCols = useCallback(() => {
     let lowestLevelColumns: any[] = props.columns;
     let currentCols: any[] = props.columns;
     while (!!currentCols.length && currentCols.some((col) => col.columns)) {
@@ -105,26 +106,26 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
       }
       currentCols = nextCols;
     }
-    lowestLevelColumns = lowestLevelColumns.filter((col) => !col.columns);
+    return lowestLevelColumns.filter((col) => !col.columns);
+  }, [props.columns]);
 
-    return Object.assign(
+  const [currentFilterTypes, setCurrentFilterTypes] = useState<{
+    [key: string]: MRT_FilterType;
+  }>(() =>
+    Object.assign(
       {},
-      ...lowestLevelColumns.map((c) => ({
+      ...findLowestLevelCols().map((c) => ({
         [c.accessor as string]:
           c.filter ??
           props?.initialState?.filters?.[c.accessor as any] ??
           (!!c.filterSelectOptions ? 'equals' : 'fuzzy'),
       })),
-    );
-  };
-
-  const [currentFilterTypes, setCurrentFilterTypes] = useState<{
-    [key: string]: MRT_FilterType;
-  }>(() => getInitialFilterTypeState());
+    ),
+  );
 
   const columns = useMemo(
     () =>
-      props.columns.map((column) => {
+      findLowestLevelCols().map((column) => {
         column.filter =
           filterTypes[
             currentFilterTypes[column.accessor as string] as MRT_FILTER_TYPE
@@ -140,7 +141,7 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
       columns,
       // @ts-ignore
       filterTypes,
-      globalFilterValue: 'fuzzy',
+      globalFilter: props.globalFilter ?? 'globalFuzzy',
       useControlledState: (state) =>
         useMemo(
           () => ({