material-react-table 1.0.0-beta.3 → 1.0.0-beta.4

package/dist/esm/toolbar/MRT_ToolbarAlertBanner.d.ts

@@ -1,7 +1,7 @@
 import { FC } from 'react';
 import { MRT_TableInstance } from '..';
 interface Props {
-    stackAlertBanner?: boolean;
+    stackAlertBanner: boolean;
     table: MRT_TableInstance;
 }
 export declare const MRT_ToolbarAlertBanner: FC<Props>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "1.0.0-beta.3",
+  "version": "1.0.0-beta.4",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI V5 implementation of TanStack React Table V8, written from the ground up in TypeScript.",

package/src/body/MRT_TableBodyCell.tsx

@@ -6,19 +6,13 @@ import React, {
   useEffect,
   useState,
 } from 'react';
-import {
-  alpha,
-  darken,
-  lighten,
-  Skeleton,
-  TableCell,
-  useTheme,
-} from '@mui/material';
+import { darken, lighten, Skeleton, TableCell, useTheme } from '@mui/material';
 import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField';
 import { MRT_CopyButton } from '../buttons/MRT_CopyButton';
-import type { MRT_Cell, MRT_TableInstance } from '..';
 import { MRT_TableBodyRowGrabHandle } from './MRT_TableBodyRowGrabHandle';
 import { MRT_TableBodyCellValue } from './MRT_TableBodyCellValue';
+import { getCommonCellStyles } from '../column.utils';
+import type { MRT_Cell, MRT_TableInstance } from '..';
 
 interface Props {
   cell: MRT_Cell;
@@ -132,23 +126,6 @@ export const MRT_TableBodyCell: FC<Props> = ({
     }
   };
 
-  const getIsLastLeftPinnedColumn = () => {
-    return (
-      column.getIsPinned() === 'left' &&
-      table.getLeftLeafHeaders().length - 1 === column.getPinnedIndex()
-    );
-  };
-
-  const getIsFirstRightPinnedColumn = () => {
-    return column.getIsPinned() === 'right' && column.getPinnedIndex() === 0;
-  };
-
-  const getTotalRight = () => {
-    return (
-      (table.getRightLeafHeaders().length - 1 - column.getPinnedIndex()) * 160
-    );
-  };
-
   const handleDragEnter = (e: DragEvent<HTMLTableCellElement>) => {
     tableCellProps?.onDragEnter?.(e);
     if (enableGrouping && hoveredColumn?.id === 'drop-zone') {
@@ -190,23 +167,7 @@ export const MRT_TableBodyCell: FC<Props> = ({
       onDragEnter={handleDragEnter}
       onDoubleClick={handleDoubleClick}
       sx={(theme) => ({
-        backgroundColor: column.getIsPinned()
-          ? alpha(lighten(theme.palette.background.default, 0.04), 0.95)
-          : undefined,
-        boxShadow: getIsLastLeftPinnedColumn()
-          ? `-4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
-          : getIsFirstRightPinnedColumn()
-          ? `4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
-          : undefined,
         cursor: isEditable && editingMode === 'cell' ? 'pointer' : 'text',
-        left:
-          column.getIsPinned() === 'left'
-            ? `${column.getStart('left')}px`
-            : undefined,
-        opacity:
-          draggingColumn?.id === column.id || hoveredColumn?.id === column.id
-            ? 0.5
-            : 1,
         overflow: 'hidden',
         p:
           density === 'compact'
@@ -231,11 +192,7 @@ export const MRT_TableBodyCell: FC<Props> = ({
                   : 1.25)
               }rem`
             : undefined,
-        position: column.getIsPinned() ? 'sticky' : 'relative',
-        right:
-          column.getIsPinned() === 'right' ? `${getTotalRight()}px` : undefined,
         textOverflow: columnDefType !== 'display' ? 'ellipsis' : undefined,
-        transition: 'all 0.2s ease-in-out',
         whiteSpace: density === 'compact' ? 'nowrap' : 'normal',
         zIndex:
           draggingColumn?.id === column.id ? 2 : column.getIsPinned() ? 1 : 0,
@@ -250,13 +207,8 @@ export const MRT_TableBodyCell: FC<Props> = ({
                 : `${darken(theme.palette.background.default, 0.1)} !important`
               : undefined,
         },
-        ...(tableCellProps?.sx instanceof Function
-          ? tableCellProps.sx(theme)
-          : (tableCellProps?.sx as any)),
+        ...getCommonCellStyles({ column, table, theme, tableCellProps }),
         ...draggingBorders,
-        maxWidth: `min(${column.getSize()}px, fit-content)`,
-        minWidth: `max(${column.getSize()}px, ${columnDef.minSize ?? 30}px)`,
-        width: column.getSize(),
       })}
     >
       <>

package/src/column.utils.ts

@@ -1,4 +1,5 @@
 import { ColumnOrderState, GroupingState } from '@tanstack/react-table';
+import { alpha, lighten, TableCellProps, Theme } from '@mui/material';
 import {
   MaterialReactTableProps,
   MRT_Column,
@@ -6,6 +7,8 @@ import {
   MRT_DefinedColumnDef,
   MRT_DisplayColumnIds,
   MRT_FilterOption,
+  MRT_Header,
+  MRT_TableInstance,
 } from '.';
 import { MRT_FilterFns } from './filterFns';
 import { MRT_SortingFns } from './sortingFns';
@@ -165,3 +168,72 @@ export const getDefaultColumnFilterFn = <
   if (columnDef.filterVariant === 'range') return 'betweenInclusive';
   return 'fuzzy';
 };
+
+export const getIsLastLeftPinnedColumn = (
+  table: MRT_TableInstance,
+  column: MRT_Column,
+) => {
+  return (
+    column.getIsPinned() === 'left' &&
+    table.getLeftLeafHeaders().length - 1 === column.getPinnedIndex()
+  );
+};
+
+export const getIsFirstRightPinnedColumn = (column: MRT_Column) => {
+  return column.getIsPinned() === 'right' && column.getPinnedIndex() === 0;
+};
+
+export const getTotalRight = (table: MRT_TableInstance, column: MRT_Column) => {
+  return (
+    (table.getRightLeafHeaders().length - 1 - column.getPinnedIndex()) * 160
+  );
+};
+
+export const getCommonCellStyles = ({
+  column,
+  header,
+  table,
+  tableCellProps,
+  theme,
+}: {
+  column: MRT_Column;
+  header?: MRT_Header;
+  table: MRT_TableInstance;
+  tableCellProps: TableCellProps;
+  theme: Theme;
+}) => ({
+  backgroundColor:
+    column.getIsPinned() && column.columnDef.columnDefType !== 'group'
+      ? alpha(lighten(theme.palette.background.default, 0.04), 0.95)
+      : 'inherit',
+  backgroundImage: 'inherit',
+  boxShadow: getIsLastLeftPinnedColumn(table, column)
+    ? `-4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
+    : getIsFirstRightPinnedColumn(column)
+    ? `4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
+    : undefined,
+  left:
+    column.getIsPinned() === 'left'
+      ? `${column.getStart('left')}px`
+      : undefined,
+  opacity:
+    table.getState().draggingColumn?.id === column.id ||
+    table.getState().hoveredColumn?.id === column.id
+      ? 0.5
+      : 1,
+  position:
+    column.getIsPinned() && column.columnDef.columnDefType !== 'group'
+      ? 'sticky'
+      : undefined,
+  right:
+    column.getIsPinned() === 'right'
+      ? `${getTotalRight(table, column)}px`
+      : undefined,
+  transition: `all ${column.getIsResizing() ? 0 : '0.2s'} ease-in-out`,
+  ...(tableCellProps?.sx instanceof Function
+    ? tableCellProps.sx(theme)
+    : (tableCellProps?.sx as any)),
+  maxWidth: `min(${column.getSize()}px, fit-content)`,
+  minWidth: `max(${column.getSize()}px, ${column.columnDef.minSize ?? 30}px)`,
+  width: header?.getSize() ?? column.getSize(),
+});

package/src/footer/MRT_TableFooterCell.tsx

@@ -1,5 +1,6 @@
 import React, { FC } from 'react';
-import { alpha, TableCell } from '@mui/material';
+import { TableCell } from '@mui/material';
+import { getCommonCellStyles } from '../column.utils';
 import type { MRT_Header, MRT_TableInstance } from '..';
 
 interface Props {
@@ -10,7 +11,7 @@ interface Props {
 export const MRT_TableFooterCell: FC<Props> = ({ footer, table }) => {
   const {
     getState,
-    options: { muiTableFooterCellProps, enableColumnResizing },
+    options: { muiTableFooterCellProps },
   } = table;
   const { density } = getState();
   const { column } = footer;
@@ -39,26 +40,15 @@ export const MRT_TableFooterCell: FC<Props> = ({ footer, table }) => {
       variant="head"
       {...tableCellProps}
       sx={(theme) => ({
-        backgroundColor: theme.palette.background.default,
-        backgroundImage: `linear-gradient(${alpha(
-          theme.palette.common.white,
-          0.05,
-        )},${alpha(theme.palette.common.white, 0.05)})`,
         fontWeight: 'bold',
-        maxWidth: `${column.getSize()}px`,
-        minWidth: `${column.getSize()}px`,
         p:
           density === 'compact'
             ? '0.5rem'
             : density === 'comfortable'
             ? '1rem'
             : '1.5rem',
-        transition: `all ${enableColumnResizing ? '10ms' : '0.2s'} ease-in-out`,
-        width: column.getSize(),
-        verticalAlign: 'text-top',
-        ...(tableCellProps?.sx instanceof Function
-          ? tableCellProps.sx(theme)
-          : (tableCellProps?.sx as any)),
+        verticalAlign: 'top',
+        ...getCommonCellStyles({ column, table, theme, tableCellProps }),
       })}
     >
       <>

package/src/head/MRT_TableHeadCell.tsx

@@ -1,11 +1,12 @@
 import React, { DragEvent, FC, ReactNode } from 'react';
-import { Box, TableCell, Theme, alpha, lighten, useTheme } from '@mui/material';
+import { Box, TableCell, Theme, useTheme } from '@mui/material';
 import { MRT_TableHeadCellColumnActionsButton } from './MRT_TableHeadCellColumnActionsButton';
 import { MRT_TableHeadCellFilterContainer } from './MRT_TableHeadCellFilterContainer';
 import { MRT_TableHeadCellFilterLabel } from './MRT_TableHeadCellFilterLabel';
 import { MRT_TableHeadCellGrabHandle } from './MRT_TableHeadCellGrabHandle';
 import { MRT_TableHeadCellResizeHandle } from './MRT_TableHeadCellResizeHandle';
 import { MRT_TableHeadCellSortLabel } from './MRT_TableHeadCellSortLabel';
+import { getCommonCellStyles } from '../column.utils';
 import type { MRT_Header, MRT_TableInstance } from '..';
 
 interface Props {
@@ -21,7 +22,6 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
       enableColumnActions,
       enableColumnDragging,
       enableColumnOrdering,
-      enableColumnResizing,
       enableGrouping,
       enableMultiSort,
       muiTableHeadCellProps,
@@ -54,23 +54,6 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
     ...mcTableHeadCellProps,
   };
 
-  const getIsLastLeftPinnedColumn = () => {
-    return (
-      column.getIsPinned() === 'left' &&
-      table.getLeftLeafHeaders().length - 1 === column.getPinnedIndex()
-    );
-  };
-
-  const getIsFirstRightPinnedColumn = () => {
-    return column.getIsPinned() === 'right' && column.getPinnedIndex() === 0;
-  };
-
-  const getTotalRight = () => {
-    return (
-      (table.getRightLeafHeaders().length - 1 - column.getPinnedIndex()) * 160
-    );
-  };
-
   const handleDragEnter = (_e: DragEvent) => {
     if (enableGrouping && hoveredColumn?.id === 'drop-zone') {
       setHoveredColumn(null);
@@ -115,26 +98,8 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
       ref={tableHeadCellRef}
       {...tableCellProps}
       sx={(theme: Theme) => ({
-        backgroundColor:
-          column.getIsPinned() && columnDefType !== 'group'
-            ? alpha(lighten(theme.palette.background.default, 0.04), 0.95)
-            : 'inherit',
-        backgroundImage: 'inherit',
-        boxShadow: getIsLastLeftPinnedColumn()
-          ? `-4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
-          : getIsFirstRightPinnedColumn()
-          ? `4px 0 8px -6px ${alpha(theme.palette.common.black, 0.2)} inset`
-          : undefined,
         fontWeight: 'bold',
-        left:
-          column.getIsPinned() === 'left'
-            ? `${column.getStart('left')}px`
-            : undefined,
         overflow: 'visible',
-        opacity:
-          draggingColumn?.id === column.id || hoveredColumn?.id === column.id
-            ? 0.5
-            : 1,
         p:
           density === 'compact'
             ? '0.5rem'
@@ -151,19 +116,12 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
             : showColumnFilters || density === 'compact'
             ? '0.4rem'
             : '0.6rem',
-        position:
-          column.getIsPinned() && columnDefType !== 'group'
-            ? 'sticky'
-            : undefined,
         pt:
           columnDefType === 'group' || density === 'compact'
             ? '0.25rem'
             : density === 'comfortable'
             ? '.75rem'
             : '1.25rem',
-        right:
-          column.getIsPinned() === 'right' ? `${getTotalRight()}px` : undefined,
-        transition: `all ${enableColumnResizing ? 0 : '0.2s'} ease-in-out`,
         userSelect: enableMultiSort && column.getCanSort() ? 'none' : undefined,
         verticalAlign: 'top',
         zIndex:
@@ -172,13 +130,14 @@ export const MRT_TableHeadCell: FC<Props> = ({ header, table }) => {
             : column.getIsPinned() && columnDefType !== 'group'
             ? 2
             : 1,
-        ...(tableCellProps?.sx instanceof Function
-          ? tableCellProps.sx(theme)
-          : (tableCellProps?.sx as any)),
+        ...getCommonCellStyles({
+          column,
+          header,
+          table,
+          tableCellProps,
+          theme,
+        }),
         ...draggingBorders,
-        maxWidth: `min(${column.getSize()}px, fit-content)`,
-        minWidth: `max(${column.getSize()}px, ${columnDef.minSize ?? 30}px)`,
-        width: header.getSize(),
       })}
     >
       {header.isPlaceholder ? null : (

package/src/toolbar/MRT_BottomToolbar.tsx

@@ -62,14 +62,17 @@ export const MRT_BottomToolbar: FC<Props> = ({ table }) => {
     >
       <MRT_LinearProgressBar isTopToolbar={false} table={table} />
       {positionToolbarAlertBanner === 'bottom' && (
-        <MRT_ToolbarAlertBanner table={table} />
+        <MRT_ToolbarAlertBanner
+          stackAlertBanner={stackAlertBanner}
+          table={table}
+        />
       )}
       {['both', 'bottom'].includes(positionToolbarDropZone ?? '') && (
         <MRT_ToolbarDropZone table={table} />
       )}
       <Box
         sx={{
-          alignItems: 'flex-start',
+          alignItems: 'center',
           boxSizing: 'border-box',
           display: 'flex',
           justifyContent: 'space-between',

package/src/toolbar/MRT_ToolbarAlertBanner.tsx

@@ -3,7 +3,7 @@ import { Alert, AlertTitle, Box, Chip, Collapse } from '@mui/material';
 import { MRT_TableInstance } from '..';
 
 interface Props {
-  stackAlertBanner?: boolean;
+  stackAlertBanner: boolean;
   table: MRT_TableInstance;
 }
 
@@ -19,6 +19,7 @@ export const MRT_ToolbarAlertBanner: FC<Props> = ({
       localization,
       muiToolbarAlertBannerProps,
       muiToolbarAlertBannerChipProps,
+      positionToolbarAlertBanner,
     },
   } = table;
   const { grouping, showAlertBanner } = getState();
@@ -78,6 +79,11 @@ export const MRT_ToolbarAlertBanner: FC<Props> = ({
           left: 0,
           p: 0,
           position: 'relative',
+          mb: stackAlertBanner
+            ? 0
+            : positionToolbarAlertBanner === 'bottom'
+            ? '-1rem'
+            : undefined,
           right: 0,
           top: 0,
           width: '100%',