material-react-table 0.5.7 → 0.6.0

package/src/useMRT.tsx

@@ -21,7 +21,8 @@ import {
   useSortBy,
   useTable,
 } from 'react-table';
-import { MRT_FilterType, MRT_Row, MRT_TableInstance } from '.';
+import type { MRT_FilterType, MRT_Row, MRT_TableInstance } from '.';
+import { MRT_FILTER_TYPE } from './enums';
 import { defaultFilterFNs } from './filtersFNs';
 import { MRT_Icons } from './icons';
 import { MRT_Localization } from './localization';
@@ -81,7 +82,9 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
     props.initialState?.showSearch ?? false,
   );
 
-  const filterTypes = useMemo<Partial<{ [key in MRT_FilterType]: any }>>(
+  const filterTypes = useMemo<{
+    [key in MRT_FILTER_TYPE]: any;
+  }>(
     () => ({
       ...defaultFilterFNs,
       ...props.filterTypes,
@@ -89,25 +92,43 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
     [props.filterTypes],
   );
 
+  const getInitialFilterTypeState = () => {
+    let lowestLevelColumns: any[] = props.columns;
+    let currentCols: any[] = props.columns;
+    while (!!currentCols.length && currentCols.some((col) => col.columns)) {
+      const nextCols = currentCols
+        .filter((col) => !!col.columns)
+        .map((col) => col.columns)
+        .flat();
+      if (nextCols.every((col) => !col.columns)) {
+        lowestLevelColumns = [...lowestLevelColumns, ...nextCols];
+      }
+      currentCols = nextCols;
+    }
+    lowestLevelColumns = lowestLevelColumns.filter((col) => !col.columns);
+
+    return Object.assign(
+      {},
+      ...lowestLevelColumns.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;
-  }>(() =>
-    Object.assign(
-      {},
-      ...props.columns
-        .map((c) => c.accessor?.toString() as string)
-        .map((accessor) => ({
-          [accessor]:
-            props?.initialState?.filters?.[accessor as any] ?? 'fuzzy',
-        })),
-    ),
-  );
+  }>(() => getInitialFilterTypeState());
 
   const columns = useMemo(
     () =>
       props.columns.map((column) => {
         column.filter =
-          filterTypes[currentFilterTypes[column.accessor as string]];
+          filterTypes[
+            currentFilterTypes[column.accessor as string] as MRT_FILTER_TYPE
+          ];
         return column;
       }),
     [props.columns, filterTypes, currentFilterTypes],
@@ -119,6 +140,7 @@ export const MaterialReactTableProvider = <D extends {} = {}>(
       columns,
       // @ts-ignore
       filterTypes,
+      globalFilterValue: 'fuzzy',
       useControlledState: (state) =>
         useMemo(
           () => ({