material-react-table 0.7.0-alpha.8 → 0.7.1

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,17 @@
 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';
 
 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 +22,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,7 +36,7 @@ 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, {
@@ -46,5 +46,5 @@ export const createDataColumn = <D extends Record<string, 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);