material-react-table 0.7.0-alpha.9 → 0.7.2

package/src/table/MRT_TablePaper.tsx

@@ -12,7 +12,7 @@ interface Props {
 export const MRT_TablePaper: FC<Props> = ({ tableInstance }) => {
   const {
     getState,
-    options: { hideToolbarBottom, hideToolbarTop, muiTablePaperProps },
+    options: { enableToolbarBottom, enableToolbarTop, muiTablePaperProps },
   } = tableInstance;
 
   const { isFullScreen } = getState();
@@ -21,8 +21,10 @@ export const MRT_TablePaper: FC<Props> = ({ tableInstance }) => {
     if (typeof window !== 'undefined') {
       if (isFullScreen) {
         document.body.style.overflow = 'hidden';
+        document.body.style.height = '100vh';
       } else {
         document.body.style.overflow = 'auto';
+        document.body.style.height = 'auto';
       }
     }
   }, [isFullScreen]);
@@ -41,23 +43,17 @@ export const MRT_TablePaper: FC<Props> = ({ tableInstance }) => {
         ...tablePaperProps?.sx,
       }}
       style={{
-        height: isFullScreen ? '100%' : undefined,
-        left: isFullScreen ? '0' : undefined,
+        height: isFullScreen ? '100vh' : undefined,
         margin: isFullScreen ? '0' : undefined,
-        maxHeight: isFullScreen ? '100%' : undefined,
-        maxWidth: isFullScreen ? '100%' : undefined,
-        overflowY: !isFullScreen ? 'hidden' : undefined,
-        position: isFullScreen ? 'fixed' : undefined,
-        right: isFullScreen ? '0' : undefined,
-        top: isFullScreen ? '0' : undefined,
+        maxHeight: isFullScreen ? '100vh' : undefined,
+        maxWidth: isFullScreen ? '100vw' : undefined,
+        padding: isFullScreen ? '0' : undefined,
         width: isFullScreen ? '100vw' : undefined,
-        zIndex: isFullScreen ? 1200 : 1,
-        bottom: isFullScreen ? '0' : undefined,
       }}
     >
-      {!hideToolbarTop && <MRT_ToolbarTop tableInstance={tableInstance} />}
+      {enableToolbarTop && <MRT_ToolbarTop tableInstance={tableInstance} />}
       <MRT_TableContainer tableInstance={tableInstance} />
-      {!hideToolbarBottom && (
+      {enableToolbarBottom && (
         <MRT_ToolbarBottom tableInstance={tableInstance} />
       )}
     </Paper>

package/src/table/MRT_TableRoot.tsx

@@ -1,23 +1,20 @@
+import React, { useEffect, useMemo, useState } from 'react';
 import {
-  columnFilterRowsFn,
-  createTable,
-  expandRowsFn,
-  functionalUpdate,
-  globalFilterRowsFn,
-  groupRowsFn,
-  paginateRowsFn,
   PaginationState,
-  sortRowsFn,
   Table,
-  useTable,
+  createTable,
+  functionalUpdate,
+  getColumnFilteredRowModelSync,
+  getExpandedRowModel,
+  getGlobalFilteredRowModelSync,
+  getGroupedRowModelSync,
+  getPaginationRowModel,
+  getSortedRowModelSync,
+  useTableInstance,
+  getCoreRowModelSync,
+  ColumnDef,
 } from '@tanstack/react-table';
-import React, { useMemo, useState } from 'react';
-import {
-  MRT_ColumnInterface,
-  MRT_FilterType,
-  MRT_Row,
-  MRT_TableInstance,
-} from '..';
+import { MRT_ColumnDef, MRT_FilterType, MRT_Row, MRT_TableInstance } from '..';
 import { MRT_ExpandAllButton } from '../buttons/MRT_ExpandAllButton';
 import { MRT_ExpandButton } from '../buttons/MRT_ExpandButton';
 import { MRT_ToggleRowActionMenuButton } from '../buttons/MRT_ToggleRowActionMenuButton';
@@ -32,14 +29,18 @@ import {
 } from '../utils';
 import { defaultFilterFNs } from '../filtersFNs';
 import { MRT_FILTER_TYPE } from '../enums';
+import { Box, Dialog, Grow } from '@mui/material';
 
 export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   props: MaterialReactTableProps<D>,
 ) => {
-  const idPrefix = useMemo(
-    () => props.idPrefix ?? Math.random().toString(36).substring(2, 9),
+  const [idPrefix, setIdPrefix] = useState(props.idPrefix);
+  useEffect(
+    () =>
+      setIdPrefix(props.idPrefix ?? Math.random().toString(36).substring(2, 9)),
     [props.idPrefix],
   );
+
   const [currentEditingRow, setCurrentEditingRow] = useState<MRT_Row | null>(
     null,
   );
@@ -52,10 +53,9 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   const [showFilters, setShowFilters] = useState(
     props.initialState?.showFilters ?? false,
   );
-  const [showSearch, setShowSearch] = useState(
-    props.initialState?.showSearch ?? false,
+  const [showGlobalFilter, setShowGlobalFilter] = useState(
+    props.initialState?.showGlobalFilter ?? false,
   );
-
   const [pagination, setPagination] = useState<PaginationState>({
     pageIndex: props.initialState?.pagination?.pageIndex ?? 0,
     pageSize: props.initialState?.pagination?.pageSize ?? 10,
@@ -67,16 +67,14 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   }>(() =>
     Object.assign(
       {},
-      ...getAllLeafColumnDefs(props.columns as MRT_ColumnInterface[]).map(
-        (c) => ({
-          [c.id as string]:
-            c.filter ??
-            props?.initialState?.columnFilters?.[c.id as any] ??
-            (!!c.filterSelectOptions?.length
-              ? MRT_FILTER_TYPE.EQUALS
-              : MRT_FILTER_TYPE.BEST_MATCH),
-        }),
-      ),
+      ...getAllLeafColumnDefs(props.columns as MRT_ColumnDef[]).map((c) => ({
+        [c.id as string]:
+          c.filter ??
+          props?.initialState?.columnFilters?.find((cf) => cf.id === c.id) ??
+          (!!c.filterSelectOptions?.length
+            ? MRT_FILTER_TYPE.EQUALS
+            : MRT_FILTER_TYPE.BEST_MATCH),
+      })),
     ),
   );
 
@@ -84,10 +82,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
     props.globalFilterType ?? MRT_FILTER_TYPE.BEST_MATCH_FIRST,
   );
 
-  const table = useMemo(
-    () => createTable<{ Row: D }>(),
-    [],
-  ) as unknown as Table<D>;
+  const table = useMemo(() => createTable() as unknown as Table<D>, []);
 
   const displayColumns = useMemo(
     () =>
@@ -96,7 +91,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
           createDisplayColumn(table, {
             Cell: ({ cell }) => (
               <MRT_ToggleRowActionMenuButton
-                row={cell.row as any}
+                row={cell.row as MRT_Row}
                 tableInstance={tableInstance}
               />
             ),
@@ -109,7 +104,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
           createDisplayColumn(table, {
             Cell: ({ cell }) => (
               <MRT_ExpandButton
-                row={cell.row as any}
+                row={cell.row as MRT_Row}
                 tableInstance={tableInstance}
               />
             ),
@@ -126,7 +121,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
           createDisplayColumn(table, {
             Cell: ({ cell }) => (
               <MRT_SelectCheckbox
-                row={cell.row as any}
+                row={cell.row as MRT_Row}
                 tableInstance={tableInstance}
               />
             ),
@@ -151,16 +146,16 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
           }),
       ].filter(Boolean),
     [
-      table,
+      props.enableEditing,
       props.enableExpandAll,
       props.enableExpanded,
-      props.enableRowActions,
       props.enableGrouping,
-      props.enableEditing,
+      props.enableRowActions,
       props.enableRowNumbers,
       props.enableRowSelection,
       props.enableSelectAll,
       props.localization,
+      table,
     ],
   );
 
@@ -173,21 +168,21 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
             ? createGroup(table, column, currentFilterTypes)
             : createDataColumn(table, column, currentFilterTypes),
         ),
-      ] as any),
+      ] as ColumnDef<D>[]),
     [table, props.columns, currentFilterTypes],
   );
 
-  const data = useMemo(
+  const data: D['Row'][] = useMemo(
     () =>
       props.isLoading && !props.data.length
-        ? [...Array(10).fill(null)].map((_) =>
+        ? [...Array(10).fill(null)].map(() =>
             Object.assign(
               {},
-              ...getAllLeafColumnDefs(
-                props.columns as MRT_ColumnInterface[],
-              ).map((c) => ({
-                [c.id]: null,
-              })),
+              ...getAllLeafColumnDefs(props.columns as MRT_ColumnDef[]).map(
+                (c) => ({
+                  [c.id]: null,
+                }),
+              ),
             ),
           )
         : props.data,
@@ -195,45 +190,64 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   );
 
   //@ts-ignore
-  const tableInstance: MRT_TableInstance<{}> = useTable(table, {
-    ...props,
-    columnFilterRowsFn: columnFilterRowsFn,
-    columns,
-    data,
-    debugAll: false,
-    expandRowsFn: expandRowsFn,
-    //@ts-ignore
-    filterTypes: defaultFilterFNs,
-    getSubRows: props.getSubRows ?? ((originalRow: D) => originalRow.subRows),
-    globalFilterRowsFn: globalFilterRowsFn,
-    globalFilterType: currentGlobalFilterType,
-    groupRowsFn: groupRowsFn,
-    idPrefix,
-    onPaginationChange: (updater: any) =>
-      setPagination((old) => functionalUpdate(updater, old)),
-    paginateRowsFn: paginateRowsFn,
+  const tableInstance: MRT_TableInstance<{}> = {
+    ...useTableInstance(table, {
+      //@ts-ignore
+      filterTypes: defaultFilterFNs,
+      getColumnFilteredRowModel: getColumnFilteredRowModelSync(),
+      getCoreRowModel: getCoreRowModelSync(),
+      getExpandedRowModel: getExpandedRowModel(),
+      getGlobalFilteredRowModel: getGlobalFilteredRowModelSync(),
+      getGroupedRowModel: getGroupedRowModelSync(),
+      getPaginationRowModel: getPaginationRowModel(),
+      getSortedRowModel: getSortedRowModelSync(),
+      getSubRows: (originalRow: D) => originalRow.subRows,
+      globalFilterType: currentGlobalFilterType,
+      idPrefix,
+      onPaginationChange: (updater: any) =>
+        setPagination((old) => functionalUpdate(updater, old)),
+      ...props,
+      columns,
+      data,
+      state: {
+        currentEditingRow,
+        currentFilterTypes,
+        currentGlobalFilterType,
+        isDensePadding,
+        isFullScreen,
+        //@ts-ignore
+        pagination,
+        showFilters,
+        showGlobalFilter,
+        ...props.state,
+      },
+    }),
     setCurrentEditingRow,
     setCurrentFilterTypes,
     setCurrentGlobalFilterType,
     setIsDensePadding,
     setIsFullScreen,
     setShowFilters,
-    setShowSearch,
-    sortRowsFn,
-    state: {
-      ...props.initialState,
-      currentEditingRow,
-      currentFilterTypes,
-      currentGlobalFilterType,
-      isDensePadding,
-      isFullScreen,
-      //@ts-ignore
-      pagination,
-      showFilters,
-      showSearch,
-      ...props.state,
-    },
-  });
+    setShowGlobalFilter,
+  };
 
-  return <MRT_TablePaper tableInstance={tableInstance} />;
+  return (
+    <>
+      <Dialog
+        TransitionComponent={Grow}
+        PaperComponent={Box}
+        disablePortal
+        fullScreen
+        keepMounted={false}
+        onClose={() => tableInstance.setIsFullScreen(false)}
+        open={tableInstance.getState().isFullScreen}
+        transitionDuration={400}
+      >
+        <MRT_TablePaper tableInstance={tableInstance} />
+      </Dialog>
+      {!tableInstance.getState().isFullScreen && (
+        <MRT_TablePaper tableInstance={tableInstance} />
+      )}
+    </>
+  );
 };

package/src/toolbar/MRT_ToolbarBottom.tsx

@@ -15,7 +15,7 @@ export const MRT_ToolbarBottom: FC<Props> = ({ tableInstance }) => {
   const {
     getState,
     options: {
-      hideToolbarInternalActions,
+      enableToolbarInternalActions,
       idPrefix,
       enablePagination,
       muiTableToolbarBottomProps,
@@ -51,7 +51,7 @@ export const MRT_ToolbarBottom: FC<Props> = ({ tableInstance }) => {
       <Box
         sx={{ display: 'flex', justifyContent: 'space-between', width: '100%' }}
       >
-        {!hideToolbarInternalActions && positionToolbarActions === 'bottom' ? (
+        {enableToolbarInternalActions && positionToolbarActions === 'bottom' ? (
           <MRT_ToolbarInternalButtons tableInstance={tableInstance} />
         ) : (
           <span />

package/src/toolbar/MRT_ToolbarInternalButtons.tsx

@@ -4,7 +4,7 @@ import { MRT_FullScreenToggleButton } from '../buttons/MRT_FullScreenToggleButto
 import { MRT_ShowHideColumnsButton } from '../buttons/MRT_ShowHideColumnsButton';
 import { MRT_ToggleDensePaddingButton } from '../buttons/MRT_ToggleDensePaddingButton';
 import { MRT_ToggleFiltersButton } from '../buttons/MRT_ToggleFiltersButton';
-import { MRT_ToggleSearchButton } from '../buttons/MRT_ToggleSearchButton';
+import { MRT_ToggleGlobalFilterButton } from '../buttons/MRT_ToggleGlobalFilterButton';
 import { MRT_TableInstance } from '..';
 
 interface Props {
@@ -15,10 +15,11 @@ export const MRT_ToolbarInternalButtons: FC<Props> = ({ tableInstance }) => {
   const {
     options: {
       enableColumnFilters,
-      enableHiding,
       enableDensePaddingToggle,
-      enableGlobalFilter,
+      enableFilters,
       enableFullScreenToggle,
+      enableGlobalFilter,
+      enableHiding,
       renderToolbarInternalActions,
     },
   } = tableInstance;
@@ -31,7 +32,7 @@ export const MRT_ToolbarInternalButtons: FC<Props> = ({ tableInstance }) => {
           MRT_ShowHideColumnsButton,
           MRT_ToggleDensePaddingButton,
           MRT_ToggleFiltersButton,
-          MRT_ToggleSearchButton,
+          MRT_ToggleGlobalFilterButton,
           tableInstance,
         })}
       </>
@@ -42,15 +43,13 @@ export const MRT_ToolbarInternalButtons: FC<Props> = ({ tableInstance }) => {
     <Box
       sx={{
         display: 'flex',
-        gap: '0.5rem',
         alignItems: 'center',
-        p: '0 0.5rem',
       }}
     >
-      {enableGlobalFilter && (
-        <MRT_ToggleSearchButton tableInstance={tableInstance} />
+      {enableFilters && enableGlobalFilter && (
+        <MRT_ToggleGlobalFilterButton tableInstance={tableInstance} />
       )}
-      {enableColumnFilters && (
+      {enableFilters && enableColumnFilters && (
         <MRT_ToggleFiltersButton tableInstance={tableInstance} />
       )}
       {enableHiding && (

package/src/toolbar/MRT_ToolbarTop.tsx

@@ -29,7 +29,7 @@ export const MRT_ToolbarTop: FC<Props> = ({ tableInstance }) => {
     options: {
       enableGlobalFilter,
       enablePagination,
-      hideToolbarInternalActions,
+      enableToolbarInternalActions,
       idPrefix,
       muiTableToolbarTopProps,
       positionPagination,
@@ -82,7 +82,7 @@ export const MRT_ToolbarTop: FC<Props> = ({ tableInstance }) => {
           {enableGlobalFilter && (
             <MRT_SearchTextField tableInstance={tableInstance} />
           )}
-          {!hideToolbarInternalActions && positionToolbarActions === 'top' && (
+          {enableToolbarInternalActions && positionToolbarActions === 'top' && (
             <MRT_ToolbarInternalButtons tableInstance={tableInstance} />
           )}
         </Box>

package/src/utils.ts

@@ -1,17 +1,18 @@
 import { ColumnDef, Table } from '@tanstack/react-table';
-import { MRT_ColumnInterface, MRT_FilterType } from '.';
+import { MRT_ColumnDef, MRT_FilterType } from '.';
 import { MRT_FILTER_TYPE } from './enums';
+import { defaultFilterFNs } from './filtersFNs';
 
 export const getAllLeafColumnDefs = (
-  columns: MRT_ColumnInterface[],
-): MRT_ColumnInterface[] => {
-  let lowestLevelColumns: MRT_ColumnInterface[] = columns;
-  let currentCols: MRT_ColumnInterface[] | undefined = columns;
+  columns: MRT_ColumnDef[],
+): MRT_ColumnDef[] => {
+  let lowestLevelColumns: MRT_ColumnDef[] = columns;
+  let currentCols: MRT_ColumnDef[] | undefined = columns;
   while (!!currentCols?.length && currentCols.some((col) => col.columns)) {
-    const nextCols: MRT_ColumnInterface[] = currentCols
+    const nextCols: MRT_ColumnDef[] = currentCols
       .filter((col) => !!col.columns)
       .map((col) => col.columns)
-      .flat() as MRT_ColumnInterface[];
+      .flat() as MRT_ColumnDef[];
     if (nextCols.every((col) => !col?.columns)) {
       lowestLevelColumns = [...lowestLevelColumns, ...nextCols];
     }
@@ -22,7 +23,7 @@ export const getAllLeafColumnDefs = (
 
 export const createGroup = <D extends Record<string, any> = {}>(
   table: Table<D>,
-  column: MRT_ColumnInterface<D>,
+  column: MRT_ColumnDef<D>,
   currentFilterTypes: { [key: string]: MRT_FilterType },
 ): ColumnDef<D> =>
   table.createGroup({
@@ -36,15 +37,18 @@ export const createGroup = <D extends Record<string, any> = {}>(
 
 export const createDataColumn = <D extends Record<string, any> = {}>(
   table: Table<D>,
-  column: MRT_ColumnInterface<D>,
+  column: MRT_ColumnDef<D>,
   currentFilterTypes: { [key: string]: MRT_FilterType },
 ): ColumnDef<D> => // @ts-ignore
   table.createDataColumn(column.id, {
-    filterType: currentFilterTypes[column.id] || MRT_FILTER_TYPE.BEST_MATCH,
+    filterFn:
+      currentFilterTypes[column.id] instanceof Function
+        ? currentFilterTypes[column.id]
+        : defaultFilterFNs[currentFilterTypes[column.id] as MRT_FILTER_TYPE],
     ...column,
   }) as any;
 
 export const createDisplayColumn = <D extends Record<string, any> = {}>(
   table: Table<D>,
-  column: Omit<MRT_ColumnInterface<D>, 'header'> & { header?: string },
+  column: Omit<MRT_ColumnDef<D>, 'header'> & { header?: string },
 ): ColumnDef<D> => table.createDisplayColumn(column);