material-react-table 0.13.3 → 0.14.0

package/dist/toolbar/MRT_TablePagination.d.ts

@@ -2,6 +2,7 @@ import { FC } from 'react';
 import { MRT_TableInstance } from '..';
 interface Props {
     instance: MRT_TableInstance;
+    position: 'top' | 'bottom';
 }
 export declare const MRT_TablePagination: FC<Props>;
 export {};

package/dist/toolbar/MRT_ToolbarTop.d.ts

@@ -11,7 +11,6 @@ export declare const commonToolbarStyles: ({ theme }: {
     overflow: string;
     p: string;
     transition: string;
-    width: string;
     zIndex: number;
 };
 interface Props {

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.13.3",
+  "version": "0.14.0",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material UI implementation of TanStack React Table, inspired by material-table and the MUI X DataGrid, written from the ground up in TypeScript.",

package/src/MaterialReactTable.tsx

@@ -762,7 +762,6 @@ export type MaterialReactTableProps<D extends Record<string, any> = {}> =
     positionActionsColumn?: 'first' | 'last';
     positionGlobalFilter?: 'left' | 'right';
     positionPagination?: 'bottom' | 'top' | 'both';
-    positionToolbarActions?: 'bottom' | 'top';
     positionToolbarAlertBanner?: 'bottom' | 'top';
     renderDetailPanel?: ({
       row,
@@ -787,7 +786,12 @@ export type MaterialReactTableProps<D extends Record<string, any> = {}> =
       row: MRT_Row<D>;
       instance: MRT_TableInstance<D>;
     }) => ReactNode;
-    renderToolbarCustomActions?: ({
+    renderToolbarBottomCustomActions?: ({
+      instance,
+    }: {
+      instance: MRT_TableInstance<D>;
+    }) => ReactNode;
+    renderToolbarTopCustomActions?: ({
       instance,
     }: {
       instance: MRT_TableInstance<D>;
@@ -857,7 +861,6 @@ export default <D extends Record<string, any> = {}>({
   positionActionsColumn = 'first',
   positionGlobalFilter = 'right',
   positionPagination = 'bottom',
-  positionToolbarActions = 'top',
   positionToolbarAlertBanner = 'top',
   rowNumberMode = 'original',
   selectAllMode = 'all',
@@ -897,7 +900,6 @@ export default <D extends Record<string, any> = {}>({
     positionActionsColumn={positionActionsColumn}
     positionGlobalFilter={positionGlobalFilter}
     positionPagination={positionPagination}
-    positionToolbarActions={positionToolbarActions}
     positionToolbarAlertBanner={positionToolbarAlertBanner}
     rowNumberMode={rowNumberMode}
     selectAllMode={selectAllMode}

package/src/inputs/MRT_SearchTextField.tsx

@@ -79,16 +79,14 @@ export const MRT_SearchTextField: FC<Props> = ({ instance }) => {
           startAdornment: (
             <InputAdornment position="start">
               <Tooltip arrow title={localization.changeSearchMode}>
-                <span>
-                  <IconButton
-                    aria-label={localization.changeSearchMode}
-                    onClick={handleGlobalFilterMenuOpen}
-                    size="small"
-                    sx={{ height: '1.75rem', width: '1.75rem' }}
-                  >
-                    <SearchIcon />
-                  </IconButton>
-                </span>
+                <IconButton
+                  aria-label={localization.changeSearchMode}
+                  onClick={handleGlobalFilterMenuOpen}
+                  size="small"
+                  sx={{ height: '1.75rem', width: '1.75rem' }}
+                >
+                  <SearchIcon />
+                </IconButton>
               </Tooltip>
             </InputAdornment>
           ),
@@ -107,7 +105,6 @@ export const MRT_SearchTextField: FC<Props> = ({ instance }) => {
           ),
         }}
         {...textFieldProps}
-        sx={{ justifySelf: 'end', ...textFieldProps?.sx }}
       />
       <MRT_FilterOptionMenu
         anchorEl={anchorEl}

package/src/toolbar/MRT_TablePagination.tsx

@@ -4,19 +4,21 @@ import { MRT_TableInstance } from '..';
 
 interface Props {
   instance: MRT_TableInstance;
+  position: 'top' | 'bottom';
 }
 
-export const MRT_TablePagination: FC<Props> = ({ instance }) => {
+export const MRT_TablePagination: FC<Props> = ({ instance, position }) => {
   const {
     getPrePaginationRowModel,
     getState,
     setPageIndex,
     setPageSize,
-    options: { muiTablePaginationProps },
+    options: { muiTablePaginationProps, enableToolbarInternalActions },
   } = instance;
 
   const {
     pagination: { pageSize = 10, pageIndex = 0 },
+    showGlobalFilter,
   } = getState();
 
   const tablePaginationProps =
@@ -49,6 +51,12 @@ export const MRT_TablePagination: FC<Props> = ({ instance }) => {
       {...tablePaginationProps}
       sx={{
         m: '0 0.5rem',
+        mt:
+          position === 'top' &&
+          enableToolbarInternalActions &&
+          !showGlobalFilter
+            ? '3.5rem'
+            : undefined,
         position: 'relative',
         zIndex: 2,
         ...tablePaginationProps?.sx,

package/src/toolbar/MRT_ToolbarBottom.tsx

@@ -1,7 +1,6 @@
 import React, { FC } from 'react';
 import { alpha, Box, Toolbar, useMediaQuery } from '@mui/material';
 import { MRT_TablePagination } from './MRT_TablePagination';
-import { MRT_ToolbarInternalButtons } from './MRT_ToolbarInternalButtons';
 import { MRT_ToolbarAlertBanner } from './MRT_ToolbarAlertBanner';
 import { MRT_LinearProgressBar } from './MRT_LinearProgressBar';
 import { commonToolbarStyles } from './MRT_ToolbarTop';
@@ -15,14 +14,12 @@ export const MRT_ToolbarBottom: FC<Props> = ({ instance }) => {
   const {
     getState,
     options: {
-      enableToolbarInternalActions,
-      tableId,
       enablePagination,
       muiTableToolbarBottomProps,
       positionPagination,
-      positionToolbarActions,
       positionToolbarAlertBanner,
-      renderToolbarCustomActions,
+      renderToolbarBottomCustomActions,
+      tableId,
     },
   } = instance;
 
@@ -38,10 +35,7 @@ export const MRT_ToolbarBottom: FC<Props> = ({ instance }) => {
   const stackAlertBanner =
     isMobile ||
     (positionToolbarAlertBanner === 'bottom' &&
-      positionToolbarActions === 'bottom') ||
-    (positionToolbarAlertBanner === 'bottom' &&
-      !!renderToolbarCustomActions &&
-      positionToolbarActions === 'bottom');
+      !!renderToolbarBottomCustomActions);
 
   return (
     <Toolbar
@@ -67,20 +61,29 @@ export const MRT_ToolbarBottom: FC<Props> = ({ instance }) => {
           display: 'flex',
           justifyContent: 'space-between',
           width: '100%',
-          position: stackAlertBanner ? 'relative' : 'absolute',
-          right: 0,
-          top: 0,
         }}
       >
-        {enableToolbarInternalActions && positionToolbarActions === 'bottom' ? (
-          <MRT_ToolbarInternalButtons instance={instance} />
+        {renderToolbarBottomCustomActions ? (
+          <Box sx={{ p: '0.5rem' }}>
+            {renderToolbarBottomCustomActions({ instance })}
+          </Box>
         ) : (
           <span />
         )}
-        {enablePagination &&
-          ['bottom', 'both'].includes(positionPagination ?? '') && (
-            <MRT_TablePagination instance={instance} />
-          )}
+        <Box
+          sx={{
+            display: 'flex',
+            justifyContent: 'flex-end',
+            position: stackAlertBanner ? 'relative' : 'absolute',
+            right: 0,
+            top: 0,
+          }}
+        >
+          {enablePagination &&
+            ['bottom', 'both'].includes(positionPagination ?? '') && (
+              <MRT_TablePagination instance={instance} position="bottom" />
+            )}
+        </Box>
       </Box>
     </Toolbar>
   );

package/src/toolbar/MRT_ToolbarInternalButtons.tsx

@@ -29,8 +29,8 @@ export const MRT_ToolbarInternalButtons: FC<Props> = ({ instance }) => {
   return (
     <Box
       sx={{
-        display: 'flex',
         alignItems: 'center',
+        display: 'flex',
         zIndex: 3,
       }}
     >

package/src/toolbar/MRT_ToolbarTop.tsx

@@ -15,7 +15,6 @@ export const commonToolbarStyles = ({ theme }: { theme: Theme }) => ({
   overflow: 'hidden',
   p: '0 !important',
   transition: 'all 0.2s ease-in-out',
-  width: '100%',
   zIndex: 1,
 });
 
@@ -30,13 +29,12 @@ export const MRT_ToolbarTop: FC<Props> = ({ instance }) => {
       enableGlobalFilter,
       enablePagination,
       enableToolbarInternalActions,
-      tableId,
       muiTableToolbarTopProps,
-      positionPagination,
       positionGlobalFilter,
-      positionToolbarActions,
+      positionPagination,
       positionToolbarAlertBanner,
-      renderToolbarCustomActions,
+      renderToolbarTopCustomActions,
+      tableId,
     },
   } = instance;
 
@@ -52,7 +50,7 @@ export const MRT_ToolbarTop: FC<Props> = ({ instance }) => {
   const stackAlertBanner =
     isMobile ||
     (positionToolbarAlertBanner === 'top' &&
-      (!!renderToolbarCustomActions || showGlobalFilter));
+      (!!renderToolbarTopCustomActions || showGlobalFilter));
 
   return (
     <Toolbar
@@ -77,29 +75,34 @@ export const MRT_ToolbarTop: FC<Props> = ({ instance }) => {
       <Box
         sx={{
           alignItems: 'flex-start',
+          boxSizing: 'border-box',
           display: 'flex',
           justifyContent: 'space-between',
           p: '0.5rem',
           position: stackAlertBanner ? 'relative' : 'absolute',
           right: 0,
           top: 0,
-          width: renderToolbarCustomActions ? '100%' : undefined,
+          width: '100%',
         }}
       >
         {enableGlobalFilter && positionGlobalFilter === 'left' && (
           <MRT_SearchTextField instance={instance} />
         )}
-        {renderToolbarCustomActions?.({ instance }) ?? <span />}
-        {enableToolbarInternalActions && positionToolbarActions === 'top' && (
+
+        {renderToolbarTopCustomActions?.({ instance }) ?? <span />}
+        {enableToolbarInternalActions ? (
           <MRT_ToolbarInternalButtons instance={instance} />
+        ) : (
+          enableGlobalFilter &&
+          positionGlobalFilter === 'right' && (
+            <MRT_SearchTextField instance={instance} />
+          )
         )}
       </Box>
-      <div>
-        {enablePagination &&
-          ['top', 'both'].includes(positionPagination ?? '') && (
-            <MRT_TablePagination instance={instance} />
-          )}
-      </div>
+      {enablePagination &&
+        ['top', 'both'].includes(positionPagination ?? '') && (
+          <MRT_TablePagination instance={instance} position="top" />
+        )}
       <MRT_LinearProgressBar alignTo="bottom" instance={instance} />
     </Toolbar>
   );