material-react-table 0.7.0-alpha.1 → 0.7.0-alpha.10

package/src/table/MRT_TableContainer.tsx

@@ -1,7 +1,8 @@
 import React, { FC, useLayoutEffect, useState } from 'react';
-import { alpha, Box, SxProps, TableContainer, Theme } from '@mui/material';
-import { MRT_Table } from './MRT_Table';
+import { alpha, Box, TableContainer, Theme } from '@mui/material';
+import { SystemStyleObject } from '@mui/material/node_modules/@mui/system';
 import { MRT_TableInstance } from '..';
+import { MRT_Table } from './MRT_Table';
 
 const commonBoxStyles = ({
   pinned,
@@ -11,18 +12,17 @@ const commonBoxStyles = ({
   pinned?: 'left' | 'right';
   theme: Theme;
   visible?: boolean;
-}) =>
-  ({
-    display: 'grid',
-    minWidth: visible ? '200px' : 0,
-    overflowX: 'auto',
-    boxShadow:
-      pinned === 'left'
-        ? `0 1px 12px ${alpha(theme.palette.common.black, 0.5)}`
-        : pinned === 'right'
-        ? `0 -1px 12px ${alpha(theme.palette.common.black, 0.5)}`
-        : 'none',
-  } as SxProps<Theme>);
+}): SystemStyleObject<Theme> => ({
+  display: 'grid',
+  minWidth: visible ? '200px' : 0,
+  overflowX: 'auto',
+  boxShadow:
+    pinned === 'left'
+      ? `0 1px 12px ${alpha(theme.palette.common.black, 0.5)}`
+      : pinned === 'right'
+      ? `0 -1px 12px ${alpha(theme.palette.common.black, 0.5)}`
+      : 'none',
+});
 
 interface Props {
   tableInstance: MRT_TableInstance;
@@ -49,7 +49,7 @@ export const MRT_TableContainer: FC<Props> = ({ tableInstance }) => {
 
   const tableContainerProps =
     muiTableContainerProps instanceof Function
-      ? muiTableContainerProps(tableInstance)
+      ? muiTableContainerProps({ tableInstance })
       : muiTableContainerProps;
 
   useLayoutEffect(() => {
@@ -93,7 +93,6 @@ export const MRT_TableContainer: FC<Props> = ({ tableInstance }) => {
           }}
         >
           <Box
-            // @ts-ignore
             sx={(theme: Theme) =>
               commonBoxStyles({
                 pinned: 'left',
@@ -104,13 +103,10 @@ export const MRT_TableContainer: FC<Props> = ({ tableInstance }) => {
           >
             <MRT_Table pinned="left" tableInstance={tableInstance} />
           </Box>
-          <Box // @ts-ignore
-            sx={(theme: Theme) => commonBoxStyles({ theme })}
-          >
+          <Box sx={(theme: Theme) => commonBoxStyles({ theme })}>
             <MRT_Table pinned="center" tableInstance={tableInstance} />
           </Box>
           <Box
-            // @ts-ignore
             sx={(theme: Theme) =>
               commonBoxStyles({
                 pinned: 'right',

package/src/table/MRT_TablePaper.tsx

@@ -29,7 +29,7 @@ export const MRT_TablePaper: FC<Props> = ({ tableInstance }) => {
 
   const tablePaperProps =
     muiTablePaperProps instanceof Function
-      ? muiTablePaperProps(tableInstance)
+      ? muiTablePaperProps({ tableInstance })
       : muiTablePaperProps;
 
   return (
@@ -37,18 +37,22 @@ export const MRT_TablePaper: FC<Props> = ({ tableInstance }) => {
       elevation={2}
       {...tablePaperProps}
       sx={{
-        bottom: isFullScreen ? '0' : undefined,
+        transition: 'all 0.2s ease-in-out',
+        ...tablePaperProps?.sx,
+      }}
+      style={{
         height: isFullScreen ? '100%' : undefined,
         left: isFullScreen ? '0' : undefined,
-        m: isFullScreen ? '0' : 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,
-        transition: 'all 0.2s ease-in-out',
         width: isFullScreen ? '100vw' : undefined,
         zIndex: isFullScreen ? 1200 : 1,
-        ...tablePaperProps?.sx,
+        bottom: isFullScreen ? '0' : undefined,
       }}
     >
       {!hideToolbarTop && <MRT_ToolbarTop tableInstance={tableInstance} />}

package/src/table/MRT_TableRoot.tsx

@@ -55,7 +55,6 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   const [showSearch, setShowSearch] = useState(
     props.initialState?.showSearch ?? false,
   );
-
   const [pagination, setPagination] = useState<PaginationState>({
     pageIndex: props.initialState?.pagination?.pageIndex ?? 0,
     pageSize: props.initialState?.pagination?.pageSize ?? 10,
@@ -92,7 +91,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   const displayColumns = useMemo(
     () =>
       [
-        (props.enableRowActions || props.enableRowEditing) &&
+        (props.enableRowActions || props.enableEditing) &&
           createDisplayColumn(table, {
             Cell: ({ cell }) => (
               <MRT_ToggleRowActionMenuButton
@@ -142,7 +141,7 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
         props.enableRowNumbers &&
           createDisplayColumn(table, {
             Cell: ({ cell }) => cell.row.index + 1,
-            Header: () => '#',
+            Header: () => props.localization?.rowNumber,
             header: props.localization?.rowNumbers,
             id: 'mrt-row-numbers',
             maxWidth: 40,
@@ -151,10 +150,12 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
           }),
       ].filter(Boolean),
     [
+      table,
       props.enableExpandAll,
       props.enableExpanded,
       props.enableRowActions,
-      props.enableRowEditing,
+      props.enableGrouping,
+      props.enableEditing,
       props.enableRowNumbers,
       props.enableRowSelection,
       props.enableSelectAll,
@@ -195,17 +196,20 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
   //@ts-ignore
   const tableInstance: MRT_TableInstance<{}> = useTable(table, {
     ...props,
-    //@ts-ignore
-    filterTypes: defaultFilterFNs,
-    globalFilterType: currentGlobalFilterType,
     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,
+    //@ts-ignore
+    initialState: props.initialState,
     onPaginationChange: (updater: any) =>
       setPagination((old) => functionalUpdate(updater, old)),
     paginateRowsFn: paginateRowsFn,
@@ -218,7 +222,6 @@ export const MRT_TableRoot = <D extends Record<string, any> = {}>(
     setShowSearch,
     sortRowsFn,
     state: {
-      ...props.initialState,
       currentEditingRow,
       currentFilterTypes,
       currentGlobalFilterType,

package/src/toolbar/MRT_LinearProgressBar.tsx

@@ -13,7 +13,7 @@ export const MRT_LinearProgressBar: FC<Props> = ({ tableInstance }) => {
 
   const linearProgressProps =
     muiLinearProgressProps instanceof Function
-      ? muiLinearProgressProps(tableInstance)
+      ? muiLinearProgressProps({ tableInstance })
       : muiLinearProgressProps;
 
   return (

package/src/toolbar/MRT_TablePagination.tsx

@@ -21,7 +21,7 @@ export const MRT_TablePagination: FC<Props> = ({ tableInstance }) => {
 
   const tablePaginationProps =
     muiTablePaginationProps instanceof Function
-      ? muiTablePaginationProps(tableInstance)
+      ? muiTablePaginationProps({ tableInstance })
       : muiTablePaginationProps;
 
   const handleChangeRowsPerPage = (event: ChangeEvent<HTMLInputElement>) => {
@@ -33,13 +33,17 @@ export const MRT_TablePagination: FC<Props> = ({ tableInstance }) => {
 
   return (
     <TablePagination
+      SelectProps={{
+        sx: { m: '0 1rem 0 1ch' },
+        MenuProps: { MenuListProps: { disablePadding: true } },
+      }}
       component="div"
       count={getPrePaginationRowModel().rows.length}
       onPageChange={(_: any, newPage: number) => setPageIndex(newPage)}
       onRowsPerPageChange={handleChangeRowsPerPage}
       page={pageIndex}
       rowsPerPage={pageSize}
-      SelectProps={{ sx: { m: '0 1rem 0 1ch' } }}
+      rowsPerPageOptions={[5, 10, 15, 20, 25, 30, 50, 100]}
       showFirstButton={showFirstLastPageButtons}
       showLastButton={showFirstLastPageButtons}
       {...tablePaginationProps}

package/src/toolbar/MRT_ToolbarAlertBanner.tsx

@@ -27,7 +27,7 @@ export const MRT_ToolbarAlertBanner: FC<Props> = ({ tableInstance }) => {
 
   const alertProps =
     muiTableToolbarAlertBannerProps instanceof Function
-      ? muiTableToolbarAlertBannerProps(tableInstance)
+      ? muiTableToolbarAlertBannerProps({ tableInstance })
       : muiTableToolbarAlertBannerProps;
 
   const selectMessage =
@@ -96,6 +96,7 @@ export const MRT_ToolbarAlertBanner: FC<Props> = ({ tableInstance }) => {
       >
         <Box sx={{ p: '0.5rem 1rem' }}>
           {selectMessage}
+          <br />
           {groupedByMessage}
         </Box>
       </Alert>

package/src/toolbar/MRT_ToolbarBottom.tsx

@@ -29,7 +29,7 @@ export const MRT_ToolbarBottom: FC<Props> = ({ tableInstance }) => {
 
   const toolbarProps =
     muiTableToolbarBottomProps instanceof Function
-      ? muiTableToolbarBottomProps(tableInstance)
+      ? muiTableToolbarBottomProps({ tableInstance })
       : muiTableToolbarBottomProps;
 
   return (

package/src/toolbar/MRT_ToolbarInternalButtons.tsx

@@ -26,12 +26,13 @@ export const MRT_ToolbarInternalButtons: FC<Props> = ({ tableInstance }) => {
   if (renderToolbarInternalActions) {
     return (
       <>
-        {renderToolbarInternalActions(tableInstance, {
-          MRT_ToggleSearchButton,
-          MRT_ToggleFiltersButton,
+        {renderToolbarInternalActions({
+          MRT_FullScreenToggleButton,
           MRT_ShowHideColumnsButton,
           MRT_ToggleDensePaddingButton,
-          MRT_FullScreenToggleButton,
+          MRT_ToggleFiltersButton,
+          MRT_ToggleSearchButton,
+          tableInstance,
         })}
       </>
     );

package/src/toolbar/MRT_ToolbarTop.tsx

@@ -43,7 +43,7 @@ export const MRT_ToolbarTop: FC<Props> = ({ tableInstance }) => {
 
   const toolbarProps =
     muiTableToolbarTopProps instanceof Function
-      ? muiTableToolbarTopProps(tableInstance)
+      ? muiTableToolbarTopProps({ tableInstance })
       : muiTableToolbarTopProps;
 
   return (
@@ -70,7 +70,7 @@ export const MRT_ToolbarTop: FC<Props> = ({ tableInstance }) => {
           justifyContent: 'space-between',
         }}
       >
-        {renderToolbarCustomActions?.(tableInstance) ?? <span />}
+        {renderToolbarCustomActions?.({ tableInstance }) ?? <span />}
         <Box
           sx={{
             display: 'flex',