material-react-table 0.40.2 → 0.40.5

package/dist/esm/menus/MRT_FilterOptionMenu.d.ts

@@ -4,7 +4,7 @@ import { MRT_Localization } from '../localization';
 export declare const mrtFilterOptions: (localization: MRT_Localization) => MRT_InternalFilterOption[];
 interface Props<TData extends Record<string, any> = {}> {
     anchorEl: HTMLElement | null;
-    header?: MRT_Header;
+    header?: MRT_Header<TData>;
     onSelect?: () => void;
     setAnchorEl: (anchorEl: HTMLElement | null) => void;
     table: MRT_TableInstance<TData>;

package/dist/esm/menus/MRT_RowActionMenu.d.ts

@@ -1,8 +1,8 @@
-import { FC } from 'react';
+import { FC, MouseEvent } from 'react';
 import type { MRT_Row, MRT_TableInstance } from '..';
 interface Props {
     anchorEl: HTMLElement | null;
-    handleEdit: () => void;
+    handleEdit: (event: MouseEvent) => void;
     row: MRT_Row;
     setAnchorEl: (anchorEl: HTMLElement | null) => void;
     table: MRT_TableInstance;

package/dist/index.d.ts

@@ -408,9 +408,16 @@ declare type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<Column
         table: MRT_TableInstance<TData>;
         column: MRT_Column<TData>;
     }) => TableCellProps);
-    renderColumnFilterModeMenuItems?: ({ table, column, }: {
+    renderColumnActionsMenuItems?: ({ closeMenu, column, table, }: {
+        closeMenu: () => void;
+        column: MRT_Column<TData>;
         table: MRT_TableInstance<TData>;
+    }) => ReactNode[];
+    renderColumnFilterModeMenuItems?: ({ column, internalFilterOptions, onSelectFilterMode, table, }: {
         column: MRT_Column<TData>;
+        internalFilterOptions: MRT_InternalFilterOption[];
+        onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+        table: MRT_TableInstance<TData>;
     }) => ReactNode[];
     sortingFn?: MRT_SortingFn;
 };
@@ -662,12 +669,17 @@ declare type MaterialReactTableProps<TData extends Record<string, any> = {}> = O
     renderBottomToolbarCustomActions?: ({ table, }: {
         table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderColumnActionsMenuItems?: ({ column, closeMenu, table, }: {
+        column: MRT_Column<TData>;
+        closeMenu: () => void;
+        table: MRT_TableInstance<TData>;
+    }) => ReactNode[];
     renderColumnFilterModeMenuItems?: ({ column, internalFilterOptions, onSelectFilterMode, table, }: {
         column: MRT_Column<TData>;
         internalFilterOptions: MRT_InternalFilterOption[];
         onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
         table: MRT_TableInstance<TData>;
-    }) => ReactNode;
+    }) => ReactNode[];
     renderDetailPanel?: ({ row, table, }: {
         row: MRT_Row<TData>;
         table: MRT_TableInstance<TData>;

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.40.2",
+  "version": "0.40.5",
   "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/MaterialReactTable.tsx

@@ -362,12 +362,25 @@ export type MRT_ColumnDef<TData extends Record<string, any> = {}> = Omit<
         table: MRT_TableInstance<TData>;
         column: MRT_Column<TData>;
       }) => TableCellProps);
-  renderColumnFilterModeMenuItems?: ({
-    table,
+  renderColumnActionsMenuItems?: ({
+    closeMenu,
     column,
+    table,
   }: {
+    closeMenu: () => void;
+    column: MRT_Column<TData>;
     table: MRT_TableInstance<TData>;
+  }) => ReactNode[];
+  renderColumnFilterModeMenuItems?: ({
+    column,
+    internalFilterOptions,
+    onSelectFilterMode,
+    table,
+  }: {
     column: MRT_Column<TData>;
+    internalFilterOptions: MRT_InternalFilterOption[];
+    onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
+    table: MRT_TableInstance<TData>;
   }) => ReactNode[];
   sortingFn?: MRT_SortingFn;
 };
@@ -782,6 +795,15 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
     }: {
       table: MRT_TableInstance<TData>;
     }) => ReactNode;
+    renderColumnActionsMenuItems?: ({
+      column,
+      closeMenu,
+      table,
+    }: {
+      column: MRT_Column<TData>;
+      closeMenu: () => void;
+      table: MRT_TableInstance<TData>;
+    }) => ReactNode[];
     renderColumnFilterModeMenuItems?: ({
       column,
       internalFilterOptions,
@@ -792,7 +814,7 @@ export type MaterialReactTableProps<TData extends Record<string, any> = {}> =
       internalFilterOptions: MRT_InternalFilterOption[];
       onSelectFilterMode: (filterMode: MRT_FilterOption) => void;
       table: MRT_TableInstance<TData>;
-    }) => ReactNode;
+    }) => ReactNode[];
     renderDetailPanel?: ({
       row,
       table,

package/src/body/MRT_TableBody.tsx

@@ -1,4 +1,4 @@
-import React, { FC, RefObject, useEffect, useMemo } from 'react';
+import React, { FC, RefObject, useMemo } from 'react';
 import { useVirtual } from 'react-virtual'; //stuck on v2 for now
 // import { useVirtualizer, Virtualizer } from '@tanstack/react-virtual';
 import { TableBody } from '@mui/material';
@@ -20,9 +20,11 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
       enableGlobalFilterRankedResults,
       enablePagination,
       enableRowVirtualization,
+      manualFiltering,
+      manualSorting,
       muiTableBodyProps,
-      virtualizerProps,
       virtualizerInstanceRef,
+      virtualizerProps,
     },
   } = table;
   const { globalFilter, pagination, sorting } = getState();
@@ -41,6 +43,8 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
     if (
       enableGlobalFilterRankedResults &&
       globalFilter &&
+      !manualFiltering &&
+      !manualSorting &&
       !Object.values(sorting).some(Boolean)
     ) {
       const rankedRows = getPrePaginationRowModel().rows.sort((a, b) =>
@@ -72,11 +76,9 @@ export const MRT_TableBody: FC<Props> = ({ table, tableContainerRef }) => {
       })
     : ({} as any);
 
-  useEffect(() => {
-    if (virtualizerInstanceRef) {
-      virtualizerInstanceRef.current = virtualizer;
-    }
-  }, [virtualizer]);
+  if (virtualizerInstanceRef) {
+    virtualizerInstanceRef.current = virtualizer;
+  }
 
   // const virtualizer: Virtualizer = enableRowVirtualization
   //   ? useVirtualizer({

package/src/buttons/MRT_CopyButton.tsx

@@ -1,4 +1,4 @@
-import React, { ReactNode, useState } from 'react';
+import React, { MouseEvent, ReactNode, useState } from 'react';
 import { Button, Tooltip } from '@mui/material';
 import { MRT_Cell, MRT_TableInstance } from '..';
 
@@ -21,7 +21,8 @@ export const MRT_CopyButton = <TData extends Record<string, any> = {}>({
 
   const [copied, setCopied] = useState(false);
 
-  const handleCopy = (text: unknown) => {
+  const handleCopy = (event: MouseEvent, text: unknown) => {
+    event.stopPropagation();
     navigator.clipboard.writeText(text as string);
     setCopied(true);
     setTimeout(() => setCopied(false), 4000);
@@ -54,7 +55,7 @@ export const MRT_CopyButton = <TData extends Record<string, any> = {}>({
       title={copied ? localization.copiedToClipboard : localization.clickToCopy}
     >
       <Button
-        onClick={() => handleCopy(cell.getValue())}
+        onClick={(e) => handleCopy(e, cell.getValue())}
         size="small"
         type="button"
         variant="text"

package/src/buttons/MRT_EditActionButtons.tsx

@@ -47,7 +47,10 @@ export const MRT_EditActionButtons = <TData extends Record<string, any> = {}>({
   };
 
   return (
-    <Box sx={{ display: 'flex', gap: '0.75rem' }}>
+    <Box
+      onClick={(e) => e.stopPropagation()}
+      sx={{ display: 'flex', gap: '0.75rem' }}
+    >
       {variant === 'icon' ? (
         <>
           <Tooltip arrow title={localization.cancel}>

package/src/buttons/MRT_ExpandButton.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC, MouseEvent } from 'react';
 import { IconButton, Tooltip } from '@mui/material';
 import type { MRT_Row, MRT_TableInstance } from '..';
 
@@ -24,8 +24,10 @@ export const MRT_ExpandButton: FC<Props> = ({ row, table }) => {
       ? muiExpandButtonProps({ table, row })
       : muiExpandButtonProps;
 
-  const handleToggleExpand = () => {
+  const handleToggleExpand = (event: MouseEvent<HTMLButtonElement>) => {
+    event.stopPropagation();
     row.toggleExpanded();
+    iconButtonProps?.onClick?.(event);
   };
 
   return (
@@ -39,8 +41,8 @@ export const MRT_ExpandButton: FC<Props> = ({ row, table }) => {
         <IconButton
           aria-label={localization.expand}
           disabled={!row.getCanExpand() && !renderDetailPanel}
-          onClick={handleToggleExpand}
           {...iconButtonProps}
+          onClick={handleToggleExpand}
           sx={(theme) => ({
             height: density === 'compact' ? '1.75rem' : '2.25rem',
             width: density === 'compact' ? '1.75rem' : '2.25rem',

package/src/buttons/MRT_GrabHandleButton.tsx

@@ -37,6 +37,10 @@ export const MRT_GrabHandleButton = <TData extends Record<string, any> = {}>({
         onDragEnd={onDragEnd}
         size="small"
         {...iconButtonProps}
+        onClick={(e) => {
+          e.stopPropagation();
+          iconButtonProps?.onClick?.(e);
+        }}
         sx={(theme) => ({
           cursor: 'grab',
           m: 0,

package/src/buttons/MRT_ToggleRowActionMenuButton.tsx

@@ -16,12 +16,16 @@ const commonIconButtonStyles = {
 };
 
 interface Props {
-  cell: MRT_Cell
+  cell: MRT_Cell;
   row: MRT_Row;
   table: MRT_TableInstance;
 }
 
-export const MRT_ToggleRowActionMenuButton: FC<Props> = ({ cell, row, table }) => {
+export const MRT_ToggleRowActionMenuButton: FC<Props> = ({
+  cell,
+  row,
+  table,
+}) => {
   const {
     getState,
     options: {
@@ -45,7 +49,8 @@ export const MRT_ToggleRowActionMenuButton: FC<Props> = ({ cell, row, table }) =
     setAnchorEl(event.currentTarget);
   };
 
-  const handleStartEditMode = () => {
+  const handleStartEditMode = (event: MouseEvent) => {
+    event.stopPropagation();
     setEditingRow({ ...row });
     setAnchorEl(null);
   };

package/src/inputs/MRT_EditCellTextField.tsx

@@ -2,7 +2,6 @@ import React, {
   ChangeEvent,
   FocusEvent,
   KeyboardEvent,
-  MouseEvent,
   useState,
 } from 'react';
 import { TextField, TextFieldProps } from '@mui/material';
@@ -101,11 +100,14 @@ export const MRT_EditCellTextField = <TData extends Record<string, any> = {}>({
       label={showLabel ? column.columnDef.header : undefined}
       margin="none"
       name={column.id}
-      onClick={(e: MouseEvent<HTMLInputElement>) => e.stopPropagation()}
       placeholder={columnDef.header}
       value={value}
       variant="standard"
       {...textFieldProps}
+      onClick={(e) => {
+        e.stopPropagation();
+        textFieldProps?.onClick?.(e);
+      }}
       onBlur={handleBlur}
       onChange={handleChange}
       onKeyDown={handleEnterKeyDown}

package/src/inputs/MRT_SelectCheckbox.tsx

@@ -58,6 +58,10 @@ export const MRT_SelectCheckbox: FC<Props> = ({ row, selectAll, table }) => {
         }
         size={density === 'compact' ? 'small' : 'medium'}
         {...checkboxProps}
+        onClick={(e) => {
+          e.stopPropagation();
+          checkboxProps?.onClick?.(e);
+        }}
         sx={(theme) => ({
           height: density === 'compact' ? '1.75rem' : '2.5rem',
           width: density === 'compact' ? '1.75rem' : '2.5rem',

package/src/menus/MRT_ColumnActionMenu.tsx

@@ -34,6 +34,7 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
     toggleAllColumnsVisible,
     setColumnOrder,
     options: {
+      columnFilterModeOptions,
       enableColumnFilterModes,
       enableColumnFilters,
       enableColumnResizing,
@@ -41,7 +42,6 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
       enableHiding,
       enablePinning,
       enableSorting,
-      columnFilterModeOptions,
       icons: {
         ArrowRightIcon,
         ClearAllIcon,
@@ -55,6 +55,7 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
         VisibilityOffIcon,
       },
       localization,
+      renderColumnActionsMenuItems,
     },
     refs: { filterInputRefs },
     setShowFilters,
@@ -153,55 +154,67 @@ export const MRT_ColumnActionMenu: FC<Props> = ({
         dense: density === 'compact',
       }}
     >
-      {enableSorting &&
-        column.getCanSort() && [
-          <MenuItem
-            disabled={!column.getIsSorted()}
-            key={0}
-            onClick={handleClearSort}
-            sx={commonMenuItemStyles}
-          >
-            <Box sx={commonListItemStyles}>
-              <ListItemIcon>
-                <ClearAllIcon />
-              </ListItemIcon>
-              {localization.clearSort}
-            </Box>
-          </MenuItem>,
-          <MenuItem
-            disabled={column.getIsSorted() === 'asc'}
-            key={1}
-            onClick={handleSortAsc}
-            sx={commonMenuItemStyles}
-          >
-            <Box sx={commonListItemStyles}>
-              <ListItemIcon>
-                <SortIcon style={{ transform: 'rotate(180deg) scaleX(-1)' }} />
-              </ListItemIcon>
-              {localization.sortByColumnAsc?.replace(
-                '{column}',
-                String(columnDef.header),
-              )}
-            </Box>
-          </MenuItem>,
-          <MenuItem
-            divider={enableColumnFilters || enableGrouping || enableHiding}
-            key={2}
-            disabled={column.getIsSorted() === 'desc'}
-            onClick={handleSortDesc}
-            sx={commonMenuItemStyles}
-          >
-            <Box sx={commonListItemStyles}>
-              <ListItemIcon>
-                <SortIcon />
-              </ListItemIcon>
-              {localization.sortByColumnDesc?.replace(
-                '{column}',
-                String(columnDef.header),
-              )}
-            </Box>
-          </MenuItem>,
-        ]}
+      {columnDef.renderColumnActionsMenuItems?.({
+        closeMenu: () => setAnchorEl(null),
+        column,
+        table,
+      }) ??
+        renderColumnActionsMenuItems?.({
+          closeMenu: () => setAnchorEl(null),
+          column,
+          table,
+        }) ??
+        (enableSorting &&
+          column.getCanSort() && [
+            <MenuItem
+              disabled={!column.getIsSorted()}
+              key={0}
+              onClick={handleClearSort}
+              sx={commonMenuItemStyles}
+            >
+              <Box sx={commonListItemStyles}>
+                <ListItemIcon>
+                  <ClearAllIcon />
+                </ListItemIcon>
+                {localization.clearSort}
+              </Box>
+            </MenuItem>,
+            <MenuItem
+              disabled={column.getIsSorted() === 'asc'}
+              key={1}
+              onClick={handleSortAsc}
+              sx={commonMenuItemStyles}
+            >
+              <Box sx={commonListItemStyles}>
+                <ListItemIcon>
+                  <SortIcon
+                    style={{ transform: 'rotate(180deg) scaleX(-1)' }}
+                  />
+                </ListItemIcon>
+                {localization.sortByColumnAsc?.replace(
+                  '{column}',
+                  String(columnDef.header),
+                )}
+              </Box>
+            </MenuItem>,
+            <MenuItem
+              divider={enableColumnFilters || enableGrouping || enableHiding}
+              key={2}
+              disabled={column.getIsSorted() === 'desc'}
+              onClick={handleSortDesc}
+              sx={commonMenuItemStyles}
+            >
+              <Box sx={commonListItemStyles}>
+                <ListItemIcon>
+                  <SortIcon />
+                </ListItemIcon>
+                {localization.sortByColumnDesc?.replace(
+                  '{column}',
+                  String(columnDef.header),
+                )}
+              </Box>
+            </MenuItem>,
+          ])}
       {enableColumnFilters &&
         column.getCanFilter() &&
         [

package/src/menus/MRT_FilterOptionMenu.tsx

@@ -99,7 +99,7 @@ export const mrtFilterOptions = (
 
 interface Props<TData extends Record<string, any> = {}> {
   anchorEl: HTMLElement | null;
-  header?: MRT_Header;
+  header?: MRT_Header<TData>;
   onSelect?: () => void;
   setAnchorEl: (anchorEl: HTMLElement | null) => void;
   table: MRT_TableInstance<TData>;
@@ -177,8 +177,14 @@ export const MRT_FilterOptionMenu = <TData extends Record<string, any> = {}>({
         dense: density === 'compact',
       }}
     >
-      {(header && column
-        ? renderColumnFilterModeMenuItems?.({
+      {(header && column && columnDef
+        ? columnDef.renderColumnFilterModeMenuItems?.({
+            column: column as any,
+            internalFilterOptions,
+            onSelectFilterMode: handleSelectFilterMode,
+            table,
+          }) ??
+          renderColumnFilterModeMenuItems?.({
             column: column as any,
             internalFilterOptions,
             onSelectFilterMode: handleSelectFilterMode,

package/src/menus/MRT_RowActionMenu.tsx

@@ -1,4 +1,4 @@
-import React, { FC } from 'react';
+import React, { FC, MouseEvent } from 'react';
 import { Box, ListItemIcon, Menu, MenuItem } from '@mui/material';
 import type { MRT_Row, MRT_TableInstance } from '..';
 import {
@@ -8,7 +8,7 @@ import {
 
 interface Props {
   anchorEl: HTMLElement | null;
-  handleEdit: () => void;
+  handleEdit: (event: MouseEvent) => void;
   row: MRT_Row;
   setAnchorEl: (anchorEl: HTMLElement | null) => void;
   table: MRT_TableInstance;

package/src/table/MRT_TableRoot.tsx

@@ -1,4 +1,4 @@
-import React, { useEffect, useMemo, useRef, useState } from 'react';
+import React, { useMemo, useRef, useState } from 'react';
 import {
   TableState,
   getCoreRowModel,
@@ -303,11 +303,9 @@ export const MRT_TableRoot = <TData extends Record<string, any> = {}>(
     setShowGlobalFilter: props.onShowGlobalFilterChange ?? setShowGlobalFilter,
   } as MRT_TableInstance<TData>;
 
-  useEffect(() => {
-    if (props.tableInstanceRef) {
-      props.tableInstanceRef.current = table;
-    }
-  }, [table]);
+  if (props.tableInstanceRef) {
+    props.tableInstanceRef.current = table;
+  }
 
   return (
     <>