material-react-table 0.40.5 → 0.40.8

package/dist/index.d.ts

@@ -322,7 +322,7 @@ declare type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<Column
      *
      * @example accessorFn: (row) => row.username
      */
-    accessorFn?: (row: TData) => any;
+    accessorFn?: (originalRow: TData) => any;
     /**
      * Either an `accessorKey` or a combination of an `accessorFn` and `id` are required for a data column definition.
      * Specify which key in the row this column should use to access the correct data.
@@ -503,7 +503,7 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     enableTableHead?: boolean;
     enableToolbarInternalActions?: boolean;
     enableTopToolbar?: boolean;
-    enabledGlobalFilterOptions?: (MRT_FilterOption | string)[] | null;
+    globalFilterModeOptions?: (MRT_FilterOption | string)[] | null;
     expandRowsFn?: (dataRow: TData) => TData[];
     icons?: Partial<MRT_Icons>;
     initialState?: Partial<MRT_TableState<TData>>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.40.5",
+  "version": "0.40.8",
   "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.",
@@ -58,7 +58,7 @@
     "@mui/material": "^5.10.2",
     "@rollup/plugin-babel": "^5.3.1",
     "@rollup/plugin-node-resolve": "^13.3.0",
-    "@rollup/plugin-typescript": "^8.3.4",
+    "@rollup/plugin-typescript": "^8.4.0",
     "@size-limit/preset-small-lib": "^8.0.1",
     "@storybook/addon-a11y": "^6.5.10",
     "@storybook/addon-actions": "^6.5.10",
@@ -71,7 +71,7 @@
     "@types/react": "^18.0.17",
     "@types/react-dom": "^18.0.6",
     "babel-loader": "^8.2.5",
-    "eslint": "^8.22.0",
+    "eslint": "^8.23.0",
     "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.1",
     "prettier": "^2.7.1",
@@ -84,7 +84,7 @@
     "size-limit": "^8.0.1",
     "storybook-dark-mode": "^1.1.0",
     "tslib": "^2.4.0",
-    "typescript": "^4.7.4"
+    "typescript": "^4.8.2"
   },
   "peerDependencies": {
     "@emotion/react": ">=11",

package/src/MaterialReactTable.tsx

@@ -236,7 +236,7 @@ export type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<
    *
    * @example accessorFn: (row) => row.username
    */
-  accessorFn?: (row: TData) => any;
+  accessorFn?: (originalRow: TData) => any;
   /**
    * Either an `accessorKey` or a combination of an `accessorFn` and `id` are required for a data column definition.
    * Specify which key in the row this column should use to access the correct data.
@@ -521,7 +521,7 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     enableTableHead?: boolean;
     enableToolbarInternalActions?: boolean;
     enableTopToolbar?: boolean;
-    enabledGlobalFilterOptions?: (MRT_FilterOption | string)[] | null;
+    globalFilterModeOptions?: (MRT_FilterOption | string)[] | null;
     expandRowsFn?: (dataRow: TData) => TData[];
     icons?: Partial<MRT_Icons>;
     initialState?: Partial<MRT_TableState<TData>>;

package/src/body/MRT_TableBody.tsx

@@ -51,7 +51,8 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
         rankGlobalFuzzy(a, b),
       );
       if (enablePagination) {
-        return rankedRows.slice(pagination.pageIndex, pagination.pageSize);
+        const start = pagination.pageIndex * pagination.pageSize;
+        return rankedRows.slice(start, start + pagination.pageSize);
       }
       return rankedRows;
     }
@@ -65,6 +66,8 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
       ? getPrePaginationRowModel().rows
       : getRowModel().rows,
     globalFilter,
+    pagination.pageIndex,
+    pagination.pageSize,
   ]);
 
   const virtualizer = enableRowVirtualization

package/src/head/MRT_TableHeadCellFilterLabel.tsx

@@ -9,13 +9,11 @@ interface Props {
 
 export const MRT_TableHeadCellFilterLabel: FC<Props> = ({ header, table }) => {
   const {
-    getState,
     options: {
       icons: { FilterAltIcon },
       localization,
     },
   } = table;
-  const { columnFilterFns } = getState();
   const { column } = header;
   const { columnDef } = column;
 
@@ -24,7 +22,7 @@ export const MRT_TableHeadCellFilterLabel: FC<Props> = ({ header, table }) => {
     'betweenInclusive',
     'inNumberRange',
   ].includes(columnDef._filterFn);
-  const currentFilterOption = columnFilterFns?.[header.id];
+  const currentFilterOption = columnDef._filterFn;
   const filterTooltip = localization.filteringByColumn
     .replace('{column}', String(columnDef.header))
     .replace(

package/src/inputs/MRT_EditCellTextField.tsx

@@ -1,9 +1,4 @@
-import React, {
-  ChangeEvent,
-  FocusEvent,
-  KeyboardEvent,
-  useState,
-} from 'react';
+import React, { ChangeEvent, FocusEvent, KeyboardEvent, useState } from 'react';
 import { TextField, TextFieldProps } from '@mui/material';
 import type { MRT_Cell, MRT_TableInstance } from '..';
 

package/src/inputs/MRT_FilterTextField.tsx

@@ -12,7 +12,6 @@ import {
   debounce,
   IconButton,
   InputAdornment,
-  ListItemText,
   MenuItem,
   TextField,
   TextFieldProps,
@@ -323,7 +322,16 @@ export const MRT_FilterTextField: FC<Props> = ({
               text = option.text;
             }
             return (
-              <MenuItem key={value} value={value}>
+              <MenuItem
+                key={value}
+                sx={{
+                  display: 'flex',
+                  m: 0,
+                  alignItems: 'center',
+                  gap: '0.5rem',
+                }}
+                value={value}
+              >
                 {isMultiSelectFilter && (
                   <Checkbox
                     checked={(
@@ -332,7 +340,7 @@ export const MRT_FilterTextField: FC<Props> = ({
                     sx={{ mr: '0.5rem' }}
                   />
                 )}
-                <ListItemText>{text}</ListItemText>
+                {text}
               </MenuItem>
             );
           },

package/src/menus/MRT_FilterOptionMenu.tsx

@@ -115,8 +115,8 @@ export const MRT_FilterOptionMenu = <TData extends Record<string, any> = {}>({
   const {
     getState,
     options: {
-      enabledGlobalFilterOptions,
       columnFilterModeOptions,
+      globalFilterModeOptions,
       localization,
       renderColumnFilterModeMenuItems,
       renderGlobalFilterModeMenuItems,
@@ -137,8 +137,8 @@ export const MRT_FilterOptionMenu = <TData extends Record<string, any> = {}>({
         columnDef
           ? allowedColumnFilterOptions === undefined ||
             allowedColumnFilterOptions?.includes(filterOption.option)
-          : (!enabledGlobalFilterOptions ||
-              enabledGlobalFilterOptions.includes(filterOption.option)) &&
+          : (!globalFilterModeOptions ||
+              globalFilterModeOptions.includes(filterOption.option)) &&
             ['fuzzy', 'contains', 'startsWith'].includes(filterOption.option),
       ),
     [],

package/src/table/MRT_TableRoot.tsx

@@ -189,6 +189,7 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
       props.displayColumnDefOptions,
       props.editingMode,
       props.enableColumnDragging,
+      props.enableColumnFilterModes,
       props.enableColumnOrdering,
       props.enableEditing,
       props.enableExpandAll,