material-react-table 0.2.0 → 0.3.3

package/dist/menus/MRT_RowActionMenu.d.ts

@@ -0,0 +1,9 @@
+import { FC } from 'react';
+import { Row } from 'react-table';
+interface Props {
+    anchorEl: HTMLElement | null;
+    row: Row;
+    setAnchorEl: (anchorEl: HTMLElement | null) => void;
+}
+export declare const MRT_RowActionMenu: FC<Props>;
+export {};

package/dist/toolbar/MRT_ToolbarBottom.d.ts

@@ -0,0 +1,5 @@
+import { FC } from 'react';
+interface Props {
+}
+export declare const MRT_ToolbarBottom: FC<Props>;
+export {};

package/dist/toolbar/MRT_ToolbarButtons.d.ts

@@ -0,0 +1,5 @@
+import { FC } from 'react';
+interface Props {
+}
+export declare const MRT_ToolbarButtons: FC<Props>;
+export {};

package/dist/toolbar/{MRT_Toolbar.d.ts → MRT_ToolbarTop.d.ts}

@@ -1,5 +1,5 @@
 import { FC } from 'react';
 interface Props {
 }
-export declare const MRT_Toolbar: FC<Props>;
+export declare const MRT_ToolbarTop: FC<Props>;
 export {};

package/dist/useMaterialReactTable.d.ts

@@ -1,10 +1,15 @@
 import React, { PropsWithChildren } from 'react';
-import { TableInstance } from 'react-table';
-import { MaterialReactTableProps } from '.';
+import { Row, TableInstance } from 'react-table';
+import { MaterialReactTableProps } from './MaterialReactTable';
 import { UseMRTCalcs } from './utils/useMRTCalcs';
-interface UseMaterialReactTable<D extends {}> extends MaterialReactTableProps<D>, UseMRTCalcs {
+export interface UseMaterialReactTable<D extends {}> extends MaterialReactTableProps<D>, UseMRTCalcs {
+    currentEditingRow: Row<D> | null;
+    densePadding: boolean;
+    setCurrentEditingRow: (currentRowEditingId: Row<D> | null) => void;
+    setDensePadding: (densePadding: boolean) => void;
+    setShowFilters: (showFilters: boolean) => void;
+    showFilters: boolean;
     tableInstance: TableInstance<D>;
 }
-export declare const MaterialReactTableProvider: <D extends {}>({ children, columns, data, surpressOverrideWarnings, ...rest }: React.PropsWithChildren<MaterialReactTableProps<D>>) => JSX.Element;
+export declare const MaterialReactTableProvider: <D extends {}>(props: React.PropsWithChildren<MaterialReactTableProps<D>>) => JSX.Element;
 export declare const useMaterialReactTable: <D extends {}>() => UseMaterialReactTable<D>;
-export {};

package/dist/utils/localization.d.ts

@@ -1,15 +1,26 @@
 export interface MRT_Localization {
-    columnActionMenuButtonTitle?: string;
-    columnActionMenuItemHideColumn?: string;
-    columnActionMenuItemSortAsc?: string;
-    columnActionMenuItemClearSort?: string;
-    columnActionMenuItemSortDesc?: string;
-    expandAllButtonTitle?: string;
-    expandButtonTitle?: string;
-    filterTextFieldClearButtonTitle?: string;
-    filterTextFieldPlaceholder?: string;
-    searchTextFieldClearButtonTitle?: string;
-    searchTextFieldPlaceholder?: string;
-    showHideColumnsButtonTitle?: string;
+    actionsHeadColumnTitle: string;
+    columnActionMenuButtonTitle: string;
+    columnActionMenuItemClearSort: string;
+    columnActionMenuItemGroupBy: string;
+    columnActionMenuItemHideColumn: string;
+    columnActionMenuItemSortAsc: string;
+    columnActionMenuItemSortDesc: string;
+    columnActionMenuItemUnGroupBy: string;
+    expandAllButtonTitle: string;
+    expandButtonTitle: string;
+    filterTextFieldClearButtonTitle: string;
+    filterTextFieldPlaceholder: string;
+    rowActionButtonCancel: string;
+    rowActionButtonSave: string;
+    rowActionMenuButtonTitle: string;
+    rowActionMenuItemEdit: string;
+    rowActionsColumnTitle: string;
+    searchTextFieldClearButtonTitle: string;
+    searchTextFieldPlaceholder: string;
+    selectAllCheckboxTitle: string;
+    showHideColumnsButtonTitle: string;
+    toggleDensePaddingSwitchTitle: string;
+    toggleFilterButtonTitle: string;
 }
 export declare const defaultLocalization: MRT_Localization;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.2.0",
+  "version": "0.3.3",
   "license": "MIT",
   "name": "material-react-table",
   "description": "A fully featured Material-UI implementation of react-table, inspired by material-table and the mui DataGrid, written from the ground up in TypeScript.",
@@ -13,7 +13,7 @@
     "type": "git",
     "url": "https://github.com/KevinVandy/material-react-table"
   },
-  "homepage": "https://github.com/KevinVandy/material-react-table#readme",
+  "homepage": "https://www.material-react-table.com/",
   "bugs": {
     "url": "https://github.com/KevinVandy/material-react-table/issues"
   },
@@ -24,7 +24,7 @@
     "src"
   ],
   "engines": {
-    "node": ">=14"
+    "node": ">=12"
   },
   "scripts": {
     "start": "tsdx watch",
@@ -35,7 +35,8 @@
     "size": "size-limit",
     "analyze": "size-limit --why",
     "storybook": "start-storybook -p 6006",
-    "build-storybook": "build-storybook"
+    "build-storybook": "build-storybook",
+    "upgrade": "ncu -u && npm i"
   },
   "husky": {
     "hooks": {
@@ -54,24 +55,25 @@
     }
   ],
   "devDependencies": {
-    "@babel/core": "^7.16.10",
+    "@babel/core": "^7.17.0",
     "@emotion/react": "^11.7.1",
     "@emotion/styled": "^11.6.0",
-    "@faker-js/faker": "^6.0.0-alpha.3",
-    "@mui/icons-material": "^5.3.0",
-    "@mui/material": "^5.3.0",
+    "@etchteam/storybook-addon-status": "^4.2.0",
+    "@faker-js/faker": "^6.0.0-alpha.5",
+    "@mui/icons-material": "^5.3.1",
+    "@mui/material": "^5.4.0",
     "@size-limit/preset-small-lib": "^7.0.5",
-    "@storybook/addon-a11y": "^6.4.13",
-    "@storybook/addon-actions": "^6.4.13",
+    "@storybook/addon-a11y": "^6.4.18",
+    "@storybook/addon-actions": "^6.4.18",
     "@storybook/addon-console": "^1.2.3",
-    "@storybook/addon-essentials": "^6.4.13",
+    "@storybook/addon-essentials": "^6.4.18",
     "@storybook/addon-info": "^5.3.21",
-    "@storybook/addon-links": "^6.4.13",
-    "@storybook/addon-storysource": "^6.4.13",
-    "@storybook/addons": "^6.4.13",
-    "@storybook/react": "^6.4.13",
+    "@storybook/addon-links": "^6.4.18",
+    "@storybook/addon-storysource": "^6.4.18",
+    "@storybook/addons": "^6.4.18",
+    "@storybook/react": "^6.4.18",
     "@types/faker": "^6.6.8",
-    "@types/react": "^17.0.38",
+    "@types/react": "^17.0.39",
     "@types/react-dom": "^17.0.11",
     "@types/react-table": "^7.7.9",
     "babel-loader": "^8.2.3",
@@ -83,6 +85,7 @@
     "react-table": "^7.7.0",
     "size-limit": "^7.0.5",
     "storybook-addon-performance": "^0.16.1",
+    "storybook-dark-mode": "^1.0.8",
     "tsdx": "^0.14.1",
     "tslib": "^2.3.1",
     "typescript": "^4.5.5"
@@ -91,7 +94,7 @@
     "@emotion/react": ">=11",
     "@mui/icons-material": ">=5",
     "@mui/material": ">=5",
-    "react": ">=17",
+    "react": ">=16.8",
     "react-table": ">=7"
   }
 }

package/src/@types/faker.d.ts

@@ -0,0 +1,4 @@
+declare module '@faker-js/faker' {
+  import faker from 'faker';
+  export default faker;
+}

package/src/@types/react-table-config.d.ts

@@ -0,0 +1,153 @@
+import { TableCellProps, TextFieldProps } from '@mui/material';
+import { ReactNode } from 'react';
+import {
+  UseColumnOrderInstanceProps,
+  UseColumnOrderState,
+  UseExpandedHooks,
+  UseExpandedInstanceProps,
+  UseExpandedOptions,
+  UseExpandedRowProps,
+  UseExpandedState,
+  UseFiltersColumnOptions,
+  UseFiltersColumnProps,
+  UseFiltersInstanceProps,
+  UseFiltersOptions,
+  UseFiltersState,
+  UseGlobalFiltersColumnOptions,
+  UseGlobalFiltersInstanceProps,
+  UseGlobalFiltersOptions,
+  UseGlobalFiltersState,
+  UseGroupByCellProps,
+  UseGroupByColumnOptions,
+  UseGroupByColumnProps,
+  UseGroupByHooks,
+  UseGroupByInstanceProps,
+  UseGroupByOptions,
+  UseGroupByRowProps,
+  UseGroupByState,
+  UsePaginationInstanceProps,
+  UsePaginationOptions,
+  UsePaginationState,
+  UseResizeColumnsColumnOptions,
+  UseResizeColumnsColumnProps,
+  UseResizeColumnsOptions,
+  UseResizeColumnsState,
+  UseRowSelectHooks,
+  UseRowSelectInstanceProps,
+  UseRowSelectOptions,
+  UseRowSelectRowProps,
+  UseRowSelectState,
+  UseRowStateCellProps,
+  UseRowStateInstanceProps,
+  UseRowStateOptions,
+  UseRowStateRowProps,
+  UseRowStateState,
+  UseSortByColumnOptions,
+  UseSortByColumnProps,
+  UseSortByHooks,
+  UseSortByInstanceProps,
+  UseSortByOptions,
+  UseSortByState,
+} from 'react-table';
+
+declare module 'react-table' {
+  export interface TableOptions<D extends Record<string, unknown>>
+    extends UseExpandedOptions<D>,
+      UseFiltersOptions<D>,
+      UseGlobalFiltersOptions<D>,
+      UseGroupByOptions<D>,
+      UsePaginationOptions<D>,
+      UseResizeColumnsOptions<D>,
+      UseRowSelectOptions<D>,
+      UseRowStateOptions<D>,
+      UseSortByOptions<D>,
+      Record<string, any> {}
+
+  export interface Hooks<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseExpandedHooks<D>,
+      UseGroupByHooks<D>,
+      UseRowSelectHooks<D>,
+      UseSortByHooks<D> {}
+
+  export interface TableInstance<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseColumnOrderInstanceProps<D>,
+      UseExpandedInstanceProps<D>,
+      UseFiltersInstanceProps<D>,
+      UseGlobalFiltersInstanceProps<D>,
+      UseGroupByInstanceProps<D>,
+      UsePaginationInstanceProps<D>,
+      UseRowSelectInstanceProps<D>,
+      UseRowStateInstanceProps<D>,
+      UseSortByInstanceProps<D> {}
+
+  export interface TableState<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseColumnOrderState<D>,
+      UseExpandedState<D>,
+      UseFiltersState<D>,
+      UseGlobalFiltersState<D>,
+      UseGroupByState<D>,
+      UsePaginationState<D>,
+      UseResizeColumnsState<D>,
+      UseRowSelectState<D>,
+      UseRowStateState<D>,
+      UseSortByState<D> {}
+
+  export interface ColumnInterface<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseFiltersColumnOptions<D>,
+      UseGlobalFiltersColumnOptions<D>,
+      UseGroupByColumnOptions<D>,
+      UseResizeColumnsColumnOptions<D>,
+      UseSortByColumnOptions<D> {
+    disableFilters?: boolean;
+    Filter?: ({ column }: { column: HeaderGroup<D> }) => ReactNode;
+    editable?: boolean;
+    Edit?: ({
+      cell,
+      onChange,
+    }: {
+      cell: Cell<D>;
+      onChange: (event: ChangeEvent<HTMLInputElement>) => void;
+    }) => ReactNode;
+    muiTableBodyCellProps?:
+      | TableCellProps
+      | ((cell?: Cell<D>) => TableCellProps);
+    muiTableHeadCellProps?:
+      | TableCellProps
+      | ((column: Column<D>) => TableCellProps);
+    muiTableFooterCellProps?:
+      | TableCellProps
+      | ((column: Column<D>) => TableCellProps);
+    muiTableBodyCellEditTextFieldProps?:
+      | TextFieldProps
+      | ((cell?: Cell<D>) => TextFieldProps);
+    muiTableHeadCellFilterTextFieldProps?:
+      | TextFieldProps
+      | ((column: Column<D>) => TextFieldProps);
+  }
+
+  export interface ColumnInstance<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseFiltersColumnProps<D>,
+      UseGroupByColumnProps<D>,
+      UseResizeColumnsColumnProps<D>,
+      UseSortByColumnProps<D> {}
+
+  export interface Cell<
+    D extends Record<string, unknown> = Record<string, unknown>,
+    V = any,
+  > extends UseGroupByCellProps<D>,
+      UseRowStateCellProps<D> {}
+
+  export interface Row<
+    D extends Record<string, unknown> = Record<string, unknown>,
+  > extends UseExpandedRowProps<D>,
+      UseGroupByRowProps<D>,
+      UseRowSelectRowProps<D>,
+      UseRowStateRowProps<D> {}
+}
+
+export module 'react-table';

package/src/MaterialReactTable.tsx

@@ -7,8 +7,8 @@ import {
   TableHeadProps,
   TablePaginationProps,
   TableProps,
+  TableRowProps,
   TextFieldProps,
-  Theme,
   ToolbarProps,
   TypographyProps,
 } from '@mui/material';
@@ -18,115 +18,143 @@ import {
   HeaderGroup,
   Row,
   TableInstance,
-  UseRowStateLocalState,
+  TableOptions,
+  UseExpandedOptions,
+  UseFiltersOptions,
+  UseGlobalFiltersOptions,
+  UseGroupByOptions,
+  UsePaginationOptions,
+  UseResizeColumnsOptions,
+  UseRowSelectOptions,
+  UseRowStateOptions,
+  UseSortByOptions,
 } from 'react-table';
 import { MaterialReactTableProvider } from './useMaterialReactTable';
 import { MRT_TableContainer } from './table/MRT_TableContainer';
 import { defaultLocalization, MRT_Localization } from './utils/localization';
 
-export interface MaterialReactTableProps<D extends {} = {}> {
-  columns: Column<D | {}>[];
-  data: D[];
-  enableColumnActions?: boolean;
-  enableColumnHiding?: boolean;
-  enableColumnReordering?: boolean;
-  enableColumnResizing?: boolean;
-  enableExpandAll?: boolean;
-  enableFiltering?: boolean;
-  enablePagination?: boolean;
-  enableSearch?: boolean;
-  enableSelectAll?: boolean;
-  enableSelection?: boolean;
-  enableSorting?: boolean;
-  enableSubRowTree?: boolean;
-  isLoading?: boolean;
-  isReloading?: boolean;
-  localization?: MRT_Localization;
-  onRowClick?: (
-    event: MouseEvent<HTMLTableRowElement>,
-    rowData: Row<D>,
-  ) => void;
-  onRowSelectChange?: (
-    event: ChangeEvent,
-    rowState: UseRowStateLocalState<D, unknown>,
-    selectedRows: Row<D>[],
-  ) => void;
-  positionPagination?: 'bottom' | 'top' | 'both';
-  renderDetailPanel?: (rowData: Row<D>) => ReactNode;
-  showFiltersInColumnHead?: boolean;
-  showFooter?: boolean;
-  showHead?: boolean;
-  showToolbar?: boolean;
-  surpressOverrideWarnings?: boolean;
-  tableBodyProps?: TableBodyProps;
-  tableContainerProps?: TableContainerProps;
-  tableDetailPanelProps?: TableCellProps;
-  tableFooterProps?: TableFooterProps;
-  tableToolbarProps?: ToolbarProps;
-  tableHeadProps?: TableHeadProps;
-  tablePaginationProps?: TablePaginationProps;
-  tableProps?: TableProps;
-  tableSearchTextfieldProps?: TextFieldProps;
-  tableTitleProps?: TypographyProps;
-  theme?: Theme;
-  title?: string | ReactNode;
-  OverrideTableBodyCellComponent?(
-    cell: Cell<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableBodyComponent?(tableInstance: TableInstance<D>): ReactNode;
-  OverrideTableBodyRowComponent?(
-    row: Row<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableDetailPanelComponent?(
-    row: Row<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableFooterComponent?(tableInstance: TableInstance<D>): ReactNode;
-  OverrideTableFooterCellComponent?(
-    column: HeaderGroup<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableFooterRowComponent?(
-    footerGroup: HeaderGroup<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableHeadCellComponent?(
-    column: HeaderGroup<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTableHeadComponent?(tableInstance: TableInstance<D>): ReactNode;
-  OverrideTableHeadRowComponent?(
-    headerGroup: HeaderGroup<D>,
-    tableInstance: TableInstance<D>,
-  ): ReactNode;
-  OverrideTablePaginationComponent?(tableInstance: TableInstance<D>): ReactNode;
-  OverrideTableToolbarComponent?(tableInstance: TableInstance<D>): ReactNode;
-}
+export type MaterialReactTableProps<D extends {} = {}> = TableOptions<D> &
+  UseExpandedOptions<D> &
+  UseFiltersOptions<D> &
+  UseGlobalFiltersOptions<D> &
+  UseGroupByOptions<D> &
+  UsePaginationOptions<D> &
+  UseResizeColumnsOptions<D> &
+  UseRowSelectOptions<D> &
+  UseRowStateOptions<D> &
+  UseSortByOptions<D> & {
+    defaultDensePadding?: boolean;
+    defaultShowFilters?: boolean;
+    disableColumnActions?: boolean;
+    disableColumnHiding?: boolean;
+    disableDensePaddingToggle?: boolean;
+    disableExpandAll?: boolean;
+    disableSelectAll?: boolean;
+    disableSubRowTree?: boolean;
+    enableColumnGrouping?: boolean;
+    enableColumnResizing?: boolean;
+    enableRowActions?: boolean;
+    enableRowEditing?: boolean;
+    enableSelection?: boolean;
+    hideTableFooter?: boolean;
+    hideTableHead?: boolean;
+    hideToolbarActions?: boolean;
+    hideToolbarBottom?: boolean;
+    hideToolbarTop?: boolean;
+    isFetching?: boolean;
+    isLoading?: boolean;
+    localization?: Partial<MRT_Localization>;
+    muiSearchTextFieldProps?: TextFieldProps;
+    muiTableBodyCellEditTextFieldProps?:
+      | TextFieldProps
+      | ((cell?: Cell<D>) => TextFieldProps);
+    muiTableBodyCellProps?:
+      | TableCellProps
+      | ((cell?: Cell<D>) => TableCellProps);
+    muiTableBodyProps?: TableBodyProps;
+    muiTableBodyRowProps?: TableRowProps | ((row: Row<D>) => TableRowProps);
+    muiTableContainerProps?: TableContainerProps;
+    muiTableDetailPanelProps?:
+      | TableCellProps
+      | ((row: Row<D>) => TableCellProps);
+    muiTableFooterCellProps?:
+      | TableCellProps
+      | ((column: Column<D>) => TableCellProps);
+    muiTableFooterProps?: TableFooterProps;
+    muiTableFooterRowProps?:
+      | TableRowProps
+      | ((footerGroup: HeaderGroup<D>) => TableRowProps);
+    muiTableHeadCellFilterTextFieldProps?:
+      | TextFieldProps
+      | ((column: Column<D>) => TextFieldProps);
+    muiTableHeadCellProps?:
+      | TableCellProps
+      | ((column: Column<D>) => TableCellProps);
+    muiTableHeadProps?: TableHeadProps;
+    muiTableHeadRowProps?:
+      | TableRowProps
+      | ((row: HeaderGroup<D>) => TableRowProps);
+    muiTablePaginationProps?:
+      | Partial<TablePaginationProps>
+      | ((tableInstance: TableInstance<D>) => Partial<TablePaginationProps>);
+    muiTableProps?: TableProps;
+    muiTableTitleProps?: TypographyProps;
+    muiTableToolbarBottomProps?:
+      | ToolbarProps
+      | ((tableInstance: TableInstance<D>) => ToolbarProps);
+    muiTableToolbarTopProps?:
+      | ToolbarProps
+      | ((tableInstance: TableInstance<D>) => ToolbarProps);
+    onCellClick?: (
+      event: MouseEvent<HTMLTableCellElement>,
+      cell: Cell<D>,
+    ) => void;
+    onDetailPanelClick?: (
+      event: MouseEvent<HTMLTableCellElement>,
+      row: Row<D>,
+    ) => void;
+    onGlobalFilterChange?: (event: ChangeEvent<HTMLInputElement>) => void;
+    onRowClick?: (event: MouseEvent<HTMLTableRowElement>, row: Row<D>) => void;
+    onRowEditSubmit?: (row: Row<D>) => Promise<void> | void;
+    onRowExpandChange?: (
+      event: MouseEvent<HTMLButtonElement>,
+      row: Row<D>,
+    ) => void;
+    onRowSelectChange?: (
+      event: ChangeEvent,
+      row: Row<D>,
+      selectedRows: Row<D>[],
+    ) => void;
+    positionActionsColumn?: 'first' | 'last';
+    positionPagination?: 'bottom' | 'top' | 'both';
+    positionToolbarActions?: 'bottom' | 'top';
+    renderDetailPanel?: (row: Row<D>) => ReactNode;
+    renderRowActionMenuItems?: (
+      rowData: Row<D>,
+      tableInstance: TableInstance<D>,
+      closeMenu: () => void,
+    ) => ReactNode[];
+    renderRowActions?: (
+      row: Row<D>,
+      tableInstance: TableInstance<D>,
+    ) => ReactNode;
+    title?: string | ReactNode;
+  };
 
-export const MaterialReactTable = <D extends {}>({
-  enablePagination = true,
-  enableSorting = true,
-  enableSubRowTree = true,
+export default <D extends {}>({
+  defaultColumn = { minWidth: 50, maxWidth: 1000 },
   localization = defaultLocalization,
+  positionActionsColumn = 'first',
   positionPagination = 'bottom',
-  showFiltersInColumnHead = true,
-  showFooter = true,
-  showHead = true,
-  showToolbar = true,
+  positionToolbarActions = 'top',
   ...rest
 }: MaterialReactTableProps<D>) => (
   <MaterialReactTableProvider
-    enablePagination={enablePagination}
-    enableSorting={enableSorting}
-    enableSubRowTree={enableSubRowTree}
+    defaultColumn={defaultColumn}
     localization={{ ...defaultLocalization, ...localization }}
     positionPagination={positionPagination}
-    showFiltersInColumnHead={showFiltersInColumnHead}
-    showFooter={showFooter}
-    showHead={showHead}
-    showToolbar={showToolbar}
+    positionActionsColumn={positionActionsColumn}
+    positionToolbarActions={positionToolbarActions}
     {...rest}
   >
     <MRT_TableContainer />

package/src/body/MRT_TableBody.tsx

@@ -1,9 +1,5 @@
 import React, { FC } from 'react';
-import {
-  CircularProgress,
-  styled,
-  TableBody as MuiTableBody,
-} from '@mui/material';
+import { styled, TableBody as MuiTableBody } from '@mui/material';
 import { MRT_TableBodyRow } from './MRT_TableBodyRow';
 import { useMaterialReactTable } from '../useMaterialReactTable';
 
@@ -11,47 +7,29 @@ const TableBody = styled(MuiTableBody)({
   overflowY: 'hidden',
 });
 
-const CircularProgressWrapper = styled('div')({
-  backgroundColor: 'rgba(255, 255, 255, 0.5)',
-  display: 'grid',
-  height: '100%',
-  justifyContent: 'center',
-  margin: 'auto',
-  paddingTop: '5rem',
-  position: 'fixed',
-  width: 'calc(100% - 2rem)',
-});
-
 interface Props {}
 
 export const MRT_TableBody: FC<Props> = () => {
-  const {
-    tableInstance,
-    tableBodyProps,
-    isLoading,
-    enablePagination,
-    OverrideTableBodyComponent,
-  } = useMaterialReactTable();
+  const { tableInstance, muiTableBodyProps, manualPagination } =
+    useMaterialReactTable();
 
-  if (OverrideTableBodyComponent) {
-    return <>{OverrideTableBodyComponent(tableInstance)}</>;
-  }
+  const rows = manualPagination ? tableInstance.rows : tableInstance.page;
 
-  const rows = enablePagination ? tableInstance.page : tableInstance.rows;
+  const tableBodyProps = {
+    ...muiTableBodyProps,
+    ...tableInstance.getTableBodyProps(),
+    style: {
+      ...tableInstance.getTableBodyProps().style,
+      ...(muiTableBodyProps?.style ?? {}),
+    },
+  };
 
   return (
-    <>
-      <TableBody {...tableBodyProps} {...tableInstance.getTableBodyProps()}>
-        {isLoading && (
-          <CircularProgressWrapper>
-            <CircularProgress />
-          </CircularProgressWrapper>
-        )}
-        {rows.map((row, index) => {
-          tableInstance.prepareRow(row);
-          return <MRT_TableBodyRow key={`${index}-${row.id}`} row={row} />;
-        })}
-      </TableBody>
-    </>
+    <TableBody {...tableBodyProps}>
+      {rows.map((row) => {
+        tableInstance.prepareRow(row);
+        return <MRT_TableBodyRow key={row.getRowProps().key} row={row} />;
+      })}
+    </TableBody>
   );
 };