material-react-table 2.6.1 → 2.8.0

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "2.6.1",
+  "version": "2.8.0",
   "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.",
@@ -66,25 +66,25 @@
     "@emotion/react": "^11.11.3",
     "@emotion/styled": "^11.11.0",
     "@faker-js/faker": "^8.3.1",
-    "@mui/icons-material": "^5.15.4",
-    "@mui/material": "^5.15.4",
+    "@mui/icons-material": "^5.15.5",
+    "@mui/material": "^5.15.5",
     "@mui/x-date-pickers": "^6.19.0",
     "@rollup/plugin-typescript": "^11.1.6",
-    "@size-limit/preset-small-lib": "^11.0.1",
-    "@storybook/addon-a11y": "^7.6.7",
-    "@storybook/addon-essentials": "^7.6.7",
-    "@storybook/addon-interactions": "^7.6.7",
-    "@storybook/addon-links": "^7.6.7",
-    "@storybook/addon-storysource": "^7.6.7",
-    "@storybook/blocks": "^7.6.7",
-    "@storybook/react": "^7.6.7",
-    "@storybook/react-vite": "^7.6.7",
+    "@size-limit/preset-small-lib": "^11.0.2",
+    "@storybook/addon-a11y": "^7.6.10",
+    "@storybook/addon-essentials": "^7.6.10",
+    "@storybook/addon-interactions": "^7.6.10",
+    "@storybook/addon-links": "^7.6.10",
+    "@storybook/addon-storysource": "^7.6.10",
+    "@storybook/blocks": "^7.6.10",
+    "@storybook/react": "^7.6.10",
+    "@storybook/react-vite": "^7.6.10",
     "@storybook/testing-library": "^0.2.2",
-    "@types/node": "^20.11.0",
-    "@types/react": "^18.2.47",
+    "@types/node": "^20.11.5",
+    "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.18.1",
-    "@typescript-eslint/parser": "^6.18.1",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
     "@vitejs/plugin-react": "^4.2.1",
     "eslint": "^8.56.0",
     "eslint-plugin-mui-path-imports": "^0.0.15",
@@ -96,12 +96,12 @@
     "rollup": "^2.79.1",
     "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-peer-deps-external": "^2.2.4",
-    "size-limit": "^11.0.1",
-    "storybook": "^7.6.7",
+    "size-limit": "^11.0.2",
+    "storybook": "^7.6.10",
     "storybook-dark-mode": "^3.0.3",
     "tslib": "^2.6.2",
     "typescript": "^5.3.3",
-    "vite": "^5.0.11"
+    "vite": "^5.0.12"
   },
   "peerDependencies": {
     "@emotion/react": ">=11.11",
@@ -115,7 +115,7 @@
   "dependencies": {
     "@tanstack/match-sorter-utils": "8.11.3",
     "@tanstack/react-table": "8.11.6",
-    "@tanstack/react-virtual": "3.0.1",
+    "@tanstack/react-virtual": "3.0.2",
     "highlight-words": "1.2.2"
   }
 } 

package/src/{MaterialReactTable.tsx → components/MaterialReactTable.tsx}

@@ -1,11 +1,11 @@
-import { MRT_TablePaper } from './table/MRT_TablePaper';
+import { useMaterialReactTable } from '../hooks/useMaterialReactTable';
 import {
   type MRT_RowData,
   type MRT_TableInstance,
   type MRT_TableOptions,
   type Xor,
-} from './types';
-import { useMaterialReactTable } from './useMaterialReactTable';
+} from '../types';
+import { MRT_TablePaper } from './table/MRT_TablePaper';
 
 type TableInstanceProp<TData extends MRT_RowData> = {
   table: MRT_TableInstance<TData>;

package/src/{body → components/body}/MRT_TableBody.tsx

@@ -3,15 +3,15 @@ import { type VirtualItem } from '@tanstack/react-virtual';
 import TableBody, { type TableBodyProps } from '@mui/material/TableBody';
 import Typography from '@mui/material/Typography';
 import { MRT_TableBodyRow, Memo_MRT_TableBodyRow } from './MRT_TableBodyRow';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { useMRT_RowVirtualizer } from '../hooks';
-import { useMRT_Rows } from '../hooks/useMRT_Rows';
+import { useMRT_RowVirtualizer } from '../../hooks/useMRT_RowVirtualizer';
+import { useMRT_Rows } from '../../hooks/useMRT_Rows';
 import {
   type MRT_ColumnVirtualizer,
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableBodyProps {
   columnVirtualizer?: MRT_ColumnVirtualizer;
@@ -30,7 +30,6 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
     getState,
     getTopRows,
     options: {
-      createDisplayMode,
       enableStickyFooter,
       enableStickyHeader,
       layoutMode,
@@ -43,8 +42,7 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
     },
     refs: { tableFooterRef, tableHeadRef, tablePaperRef },
   } = table;
-  const { columnFilters, creatingRow, globalFilter, isFullScreen, rowPinning } =
-    getState();
+  const { columnFilters, globalFilter, isFullScreen, rowPinning } = getState();
 
   const tableBodyProps = {
     ...parseFromValuesOrFunc(muiTableBodyProps, { table }),
@@ -77,14 +75,6 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
     table,
   };
 
-  const CreatingRow = creatingRow && createDisplayMode === 'row' && (
-    <MRT_TableBodyRow
-      {...commonRowProps}
-      row={creatingRow}
-      staticRowIndex={-1}
-    />
-  );
-
   return (
     <>
       {!rowPinningDisplayMode?.includes('sticky') &&
@@ -113,17 +103,6 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
             })}
           </TableBody>
         )}
-      {rowVirtualizer && CreatingRow && (
-        <TableBody
-          {...tableBodyProps}
-          sx={(theme) => ({
-            display: layoutMode?.startsWith('grid') ? 'grid' : undefined,
-            ...(parseFromValuesOrFunc(tableBodyProps?.sx, theme) as any),
-          })}
-        >
-          {CreatingRow}
-        </TableBody>
-      )}
       <TableBody
         {...tableBodyProps}
         sx={(theme) => ({
@@ -136,9 +115,8 @@ export const MRT_TableBody = <TData extends MRT_RowData>({
           ...(parseFromValuesOrFunc(tableBodyProps?.sx, theme) as any),
         })}
       >
-        {!rowVirtualizer && CreatingRow}
         {tableBodyProps?.children ??
-          (!rows.length && !CreatingRow ? (
+          (!rows.length ? (
             <tr
               style={{
                 display: layoutMode?.startsWith('grid') ? 'grid' : undefined,

package/src/{body → components/body}/MRT_TableBodyCell.tsx

@@ -11,19 +11,16 @@ import Skeleton from '@mui/material/Skeleton';
 import TableCell, { type TableCellProps } from '@mui/material/TableCell';
 import { useTheme } from '@mui/material/styles';
 import { MRT_TableBodyCellValue } from './MRT_TableBodyCellValue';
-import { MRT_CopyButton } from '../buttons/MRT_CopyButton';
-import {
-  getIsFirstColumn,
-  getIsLastColumn,
-  parseFromValuesOrFunc,
-} from '../column.utils';
-import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField';
-import { getCommonMRTCellStyles, getMRTTheme } from '../style.utils';
 import {
   type MRT_Cell,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getIsFirstColumn, getIsLastColumn } from '../../utils/column.utils';
+import { getCommonMRTCellStyles, getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_CopyButton } from '../buttons/MRT_CopyButton';
+import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField';
 
 interface Props<TData extends MRT_RowData> extends TableCellProps {
   cell: MRT_Cell<TData>;
@@ -60,7 +57,6 @@ export const MRT_TableBodyCell = <TData extends MRT_RowData>({
       layoutMode,
       muiSkeletonProps,
       muiTableBodyCellProps,
-      positionExpandColumn,
     },
     refs: { editInputRefs },
     setEditingCell,
@@ -255,19 +251,6 @@ export const MRT_TableBodyCell = <TData extends MRT_RowData>({
                 ? '1rem 1.25rem'
                 : '1.5rem',
         textOverflow: columnDefType !== 'display' ? 'ellipsis' : undefined,
-        [theme.direction === 'rtl' || positionExpandColumn === 'last'
-          ? 'pr'
-          : 'pl']:
-          column.id === 'mrt-row-expand'
-            ? `${
-                row.depth +
-                (density === 'compact'
-                  ? 0.5
-                  : density === 'comfortable'
-                    ? 0.75
-                    : 1.25)
-              }rem`
-            : undefined,
         whiteSpace:
           row.getIsPinned() || density === 'compact' ? 'nowrap' : 'normal',
         zIndex:

package/src/{body → components/body}/MRT_TableBodyCellValue.tsx

@@ -1,11 +1,11 @@
 import { type ReactNode, type RefObject } from 'react';
 import Box from '@mui/material/Box';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_Cell,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
 import highlightWords from 'highlight-words';
 
 const allowedTypes = ['string', 'number'];

package/src/{body → components/body}/MRT_TableBodyRow.tsx

@@ -10,8 +10,6 @@ import {
 } from '@mui/material/styles';
 import { MRT_TableBodyCell, Memo_MRT_TableBodyCell } from './MRT_TableBodyCell';
 import { MRT_TableDetailPanel } from './MRT_TableDetailPanel';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_Cell,
   type MRT_ColumnVirtualizer,
@@ -19,7 +17,9 @@ import {
   type MRT_RowData,
   type MRT_RowVirtualizer,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> {
   columnVirtualizer?: MRT_ColumnVirtualizer;
@@ -136,13 +136,15 @@ export const MRT_TableBodyRow = <TData extends MRT_RowData>({
         data-index={renderDetailPanel ? staticRowIndex * 2 : staticRowIndex}
         data-pinned={!!isPinned || undefined}
         data-selected={
-          row.getIsSelected() || row.getIsAllSubRowsSelected() || undefined
+          row?.getIsSelected() ||
+          (row?.getIsAllSubRowsSelected() && row.getCanSelectSubRows()) ||
+          undefined
         }
         onDragEnter={handleDragEnter}
         ref={(node: HTMLTableRowElement) => {
           if (node) {
             rowRef.current = node;
-            rowVirtualizer?.measureElement?.(node);
+            rowVirtualizer?.measureElement(node);
           }
         }}
         selected={row.getIsSelected()}

package/src/{body → components/body}/MRT_TableBodyRowGrabHandle.tsx

@@ -1,12 +1,12 @@
 import { type DragEvent, type RefObject } from 'react';
 import { type IconButtonProps } from '@mui/material/IconButton';
-import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   row: MRT_Row<TData>;

package/src/{body → components/body}/MRT_TableBodyRowPinButton.tsx

@@ -1,12 +1,12 @@
 import Box from '@mui/material/Box';
 import { type IconButtonProps } from '@mui/material/IconButton';
-import { MRT_RowPinButton } from '../buttons/MRT_RowPinButton';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_RowPinButton } from '../buttons/MRT_RowPinButton';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   row: MRT_Row<TData>;

package/src/{body → components/body}/MRT_TableDetailPanel.tsx

@@ -1,16 +1,16 @@
 import { type RefObject } from 'react';
-import { type VirtualItem } from '@tanstack/react-virtual';
 import Collapse from '@mui/material/Collapse';
 import TableCell, { type TableCellProps } from '@mui/material/TableCell';
 import TableRow from '@mui/material/TableRow';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_RowVirtualizer,
   type MRT_TableInstance,
-} from '../types';
+  type MRT_VirtualItem,
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableCellProps {
   parentRowRef: RefObject<HTMLTableRowElement>;
@@ -18,7 +18,7 @@ interface Props<TData extends MRT_RowData> extends TableCellProps {
   rowVirtualizer?: MRT_RowVirtualizer;
   staticRowIndex: number;
   table: MRT_TableInstance<TData>;
-  virtualRow?: VirtualItem;
+  virtualRow?: MRT_VirtualItem;
 }
 
 export const MRT_TableDetailPanel = <TData extends MRT_RowData>({
@@ -104,7 +104,7 @@ export const MRT_TableDetailPanel = <TData extends MRT_RowData>({
         {enableRowVirtualization ? (
           row.getIsExpanded() && DetailPanel
         ) : (
-          <Collapse in={!!row.getIsExpanded()} mountOnEnter unmountOnExit>
+          <Collapse in={row.getIsExpanded()} mountOnEnter unmountOnExit>
             {DetailPanel}
           </Collapse>
         )}

package/src/{buttons → components/buttons}/MRT_ColumnPinningButtons.tsx

@@ -1,12 +1,12 @@
 import Box, { type BoxProps } from '@mui/material/Box';
 import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Column,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends BoxProps {
   column: MRT_Column<TData>;

package/src/{buttons → components/buttons}/MRT_CopyButton.tsx

@@ -1,12 +1,13 @@
 import { type MouseEvent, useState } from 'react';
 import Button, { type ButtonProps } from '@mui/material/Button';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Cell,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends ButtonProps {
   cell: MRT_Cell<TData>;
@@ -51,9 +52,7 @@ export const MRT_CopyButton = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
-      placement="top"
+      {...getCommonTooltipProps('top')}
       title={
         buttonProps?.title ??
         (copied ? localization.copiedToClipboard : localization.clickToCopy)

package/src/{buttons → components/buttons}/MRT_EditActionButtons.tsx

@@ -3,12 +3,12 @@ import Button from '@mui/material/Button';
 import CircularProgress from '@mui/material/CircularProgress';
 import IconButton from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends BoxProps {
   row: MRT_Row<TData>;

package/src/{buttons → components/buttons}/MRT_ExpandAllButton.tsx

@@ -1,7 +1,8 @@
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;
@@ -37,8 +38,7 @@ export const MRT_ExpandAllButton = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
+      {...getCommonTooltipProps()}
       title={
         iconButtonProps?.title ??
         (isAllRowsExpanded ? localization.collapseAll : localization.expandAll)

package/src/{buttons → components/buttons}/MRT_ExpandButton.tsx

@@ -2,20 +2,23 @@ import { type MouseEvent } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
 import { useTheme } from '@mui/material/styles';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   row: MRT_Row<TData>;
+  staticRowIndex?: number;
   table: MRT_TableInstance<TData>;
 }
 
 export const MRT_ExpandButton = <TData extends MRT_RowData>({
   row,
+  staticRowIndex,
   table,
 }: Props<TData>) => {
   const theme = useTheme();
@@ -33,6 +36,7 @@ export const MRT_ExpandButton = <TData extends MRT_RowData>({
 
   const iconButtonProps = parseFromValuesOrFunc(muiExpandButtonProps, {
     row,
+    staticRowIndex,
     table,
   });
 
@@ -50,8 +54,7 @@ export const MRT_ExpandButton = <TData extends MRT_RowData>({
   return (
     <Tooltip
       disableHoverListener={!canExpand && !detailPanel}
-      enterDelay={1000}
-      enterNextDelay={1000}
+      {...getCommonTooltipProps()}
       title={
         iconButtonProps?.title ??
         (isExpanded ? localization.collapse : localization.expand)
@@ -66,6 +69,9 @@ export const MRT_ExpandButton = <TData extends MRT_RowData>({
           sx={(theme) => ({
             height: density === 'compact' ? '1.75rem' : '2.25rem',
             opacity: !canExpand && !detailPanel ? 0.3 : 1,
+            [theme.direction === 'rtl' || positionExpandColumn === 'last'
+              ? 'mr'
+              : 'ml']: `${row.depth * 16}px`,
             width: density === 'compact' ? '1.75rem' : '2.25rem',
             ...(parseFromValuesOrFunc(iconButtonProps?.sx, theme) as any),
           })}

package/src/{buttons → components/buttons}/MRT_GrabHandleButton.tsx

@@ -1,8 +1,9 @@
 import { type DragEventHandler } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   iconButtonProps?: IconButtonProps;
@@ -31,9 +32,7 @@ export const MRT_GrabHandleButton = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
-      placement="top"
+      {...getCommonTooltipProps('top')}
       title={_iconButtonProps?.title ?? localization.move}
     >
       <IconButton

package/src/{buttons → components/buttons}/MRT_RowPinButton.tsx

@@ -2,12 +2,13 @@ import { type MouseEvent, useState } from 'react';
 import { type RowPinningPosition } from '@tanstack/react-table';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   pinningPosition: RowPinningPosition;
@@ -41,8 +42,7 @@ export const MRT_RowPinButton = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
+      {...getCommonTooltipProps()}
       open={tooltipOpened}
       title={isPinned ? localization.unpin : localization.pin}
     >

package/src/{buttons → components/buttons}/MRT_ShowHideColumnsButton.tsx

@@ -1,8 +1,8 @@
 import { type MouseEvent, useState } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
 import { MRT_ShowHideColumnsMenu } from '../menus/MRT_ShowHideColumnsMenu';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;

package/src/{buttons → components/buttons}/MRT_ToggleDensePaddingButton.tsx

@@ -1,6 +1,6 @@
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;

package/src/{buttons → components/buttons}/MRT_ToggleFiltersButton.tsx

@@ -1,6 +1,6 @@
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;

package/src/{buttons → components/buttons}/MRT_ToggleFullScreenButton.tsx

@@ -1,7 +1,7 @@
 import { useState } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;

package/src/{buttons → components/buttons}/MRT_ToggleGlobalFilterButton.tsx

@@ -1,6 +1,6 @@
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   table: MRT_TableInstance<TData>;

package/src/{buttons → components/buttons}/MRT_ToggleRowActionMenuButton.tsx

@@ -2,14 +2,15 @@ import { type MouseEvent, useState } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
 import { MRT_EditActionButtons } from './MRT_EditActionButtons';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { MRT_RowActionMenu } from '../menus/MRT_RowActionMenu';
 import {
   type MRT_Cell,
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_RowActionMenu } from '../menus/MRT_RowActionMenu';
 
 const commonIconButtonStyles = {
   '&:hover': {
@@ -25,12 +26,14 @@ const commonIconButtonStyles = {
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   cell: MRT_Cell<TData>;
   row: MRT_Row<TData>;
+  staticRowIndex?: number;
   table: MRT_TableInstance<TData>;
 }
 
 export const MRT_ToggleRowActionMenuButton = <TData extends MRT_RowData>({
   cell,
   row,
+  staticRowIndex,
   table,
   ...rest
 }: Props<TData>) => {
@@ -74,7 +77,7 @@ export const MRT_ToggleRowActionMenuButton = <TData extends MRT_RowData>({
   return (
     <>
       {renderRowActions && !showEditActionButtons ? (
-        renderRowActions({ cell, row, table })
+        renderRowActions({ cell, row, staticRowIndex, table })
       ) : showEditActionButtons ? (
         <MRT_EditActionButtons row={row} table={table} />
       ) : !renderRowActionMenuItems &&
@@ -92,11 +95,7 @@ export const MRT_ToggleRowActionMenuButton = <TData extends MRT_RowData>({
         </Tooltip>
       ) : renderRowActionMenuItems ? (
         <>
-          <Tooltip
-            enterDelay={1000}
-            enterNextDelay={1000}
-            title={localization.rowActions}
-          >
+          <Tooltip {...getCommonTooltipProps()} title={localization.rowActions}>
             <IconButton
               aria-label={localization.rowActions}
               onClick={handleOpenRowActionMenu}
@@ -112,6 +111,7 @@ export const MRT_ToggleRowActionMenuButton = <TData extends MRT_RowData>({
             handleEdit={handleStartEditMode}
             row={row}
             setAnchorEl={setAnchorEl}
+            staticRowIndex={staticRowIndex}
             table={table}
           />
         </>