material-react-table 0.38.3 → 0.40.0

package/src/table/MRT_TableRoot.tsx

@@ -1,4 +1,4 @@
-import React, { useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import {
   TableState,
   getCoreRowModel,
@@ -24,6 +24,7 @@ import {
   getDefaultColumnFilterFn,
   defaultDisplayColumnDefOptions,
   showExpandColumn,
+  getColumnId,
 } from '../column.utils';
 import type {
   MRT_Cell,
@@ -65,13 +66,11 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
       {},
       ...getAllLeafColumnDefs(props.columns as MRT_ColumnDef<TData>[]).map(
         (col) => ({
-          [col.id?.toString() ?? col.accessorKey?.toString() ?? '']:
+          [getColumnId(col)]:
             col.filterFn instanceof Function
               ? col.filterFn.name ?? 'custom'
               : col.filterFn ??
-                initialState?.columnFilterFns?.[
-                  col.id?.toString() ?? col.accessorKey?.toString() ?? ''
-                ] ??
+                initialState?.columnFilterFns?.[getColumnId(col)] ??
                 getDefaultColumnFilterFn(col),
         }),
       ),
@@ -135,7 +134,7 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
               <MRT_ToggleRowActionMenuButton
                 cell={cell as any}
                 row={row as any}
-                table={table}
+                table={table as any}
               />
             ),
             header: props.localization?.actions,
@@ -147,11 +146,11 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
           columnOrder.includes('mrt-row-expand') &&
             showExpandColumn(props, grouping) && {
               Cell: ({ row }) => (
-                <MRT_ExpandButton row={row as any} table={table} />
+                <MRT_ExpandButton row={row as any} table={table as any} />
               ),
               Header: () =>
                 props.enableExpandAll ? (
-                  <MRT_ExpandAllButton table={table} />
+                  <MRT_ExpandAllButton table={table as any} />
                 ) : null,
               header: props.localization?.expand,
               size: 60,
@@ -161,11 +160,11 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
             },
           columnOrder.includes('mrt-row-select') && {
             Cell: ({ row }) => (
-              <MRT_SelectCheckbox row={row as any} table={table} />
+              <MRT_SelectCheckbox row={row as any} table={table as any} />
             ),
             Header: () =>
               props.enableSelectAll ? (
-                <MRT_SelectCheckbox selectAll table={table} />
+                <MRT_SelectCheckbox selectAll table={table as any} />
               ) : null,
             header: props.localization?.select,
             size: 60,
@@ -302,7 +301,13 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
     setShowAlertBanner: props.onShowAlertBannerChange ?? setShowAlertBanner,
     setShowFilters: props.onShowFiltersChange ?? setShowFilters,
     setShowGlobalFilter: props.onShowGlobalFilterChange ?? setShowGlobalFilter,
-  } as MRT_TableInstance;
+  } as MRT_TableInstance<TData>;
+
+  useEffect(() => {
+    if (props.tableInstanceRef) {
+      props.tableInstanceRef.current = table;
+    }
+  }, []);
 
   return (
     <>
@@ -316,9 +321,9 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
         open={isFullScreen}
         transitionDuration={400}
       >
-        <MRT_TablePaper table={table} />
+        <MRT_TablePaper table={table as any} />
       </Dialog>
-      {!isFullScreen && <MRT_TablePaper table={table} />}
+      {!isFullScreen && <MRT_TablePaper table={table as any} />}
       {editingRow && props.editingMode === 'modal' && (
         <MRT_EditRowModal row={editingRow as any} table={table} open />
       )}