material-react-table 2.6.1 → 2.8.0

package/src/{footer → components/footer}/MRT_TableFooter.tsx

@@ -1,11 +1,11 @@
 import TableFooter, { type TableFooterProps } from '@mui/material/TableFooter';
 import { MRT_TableFooterRow } from './MRT_TableFooterRow';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_ColumnVirtualizer,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableFooterProps {
   columnVirtualizer?: MRT_ColumnVirtualizer;

package/src/{footer → components/footer}/MRT_TableFooterCell.tsx

@@ -1,12 +1,12 @@
 import TableCell, { type TableCellProps } from '@mui/material/TableCell';
 import { useTheme } from '@mui/material/styles';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getCommonMRTCellStyles } from '../style.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonMRTCellStyles } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableCellProps {
   footer: MRT_Header<TData>;

package/src/{footer → components/footer}/MRT_TableFooterRow.tsx

@@ -1,14 +1,14 @@
 import TableRow, { type TableRowProps } from '@mui/material/TableRow';
 import { MRT_TableFooterCell } from './MRT_TableFooterCell';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_ColumnVirtualizer,
   type MRT_Header,
   type MRT_HeaderGroup,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableRowProps {
   columnVirtualizer?: MRT_ColumnVirtualizer;

package/src/{head → components/head}/MRT_TableHead.tsx

@@ -1,12 +1,12 @@
 import TableHead, { type TableHeadProps } from '@mui/material/TableHead';
 import { MRT_TableHeadRow } from './MRT_TableHeadRow';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { MRT_ToolbarAlertBanner } from '../toolbar';
 import {
   type MRT_ColumnVirtualizer,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_ToolbarAlertBanner } from '../toolbar/MRT_ToolbarAlertBanner';
 
 interface Props<TData extends MRT_RowData> extends TableHeadProps {
   columnVirtualizer?: MRT_ColumnVirtualizer;

package/src/{head → components/head}/MRT_TableHeadCell.tsx

@@ -9,13 +9,13 @@ import { MRT_TableHeadCellFilterLabel } from './MRT_TableHeadCellFilterLabel';
 import { MRT_TableHeadCellGrabHandle } from './MRT_TableHeadCellGrabHandle';
 import { MRT_TableHeadCellResizeHandle } from './MRT_TableHeadCellResizeHandle';
 import { MRT_TableHeadCellSortLabel } from './MRT_TableHeadCellSortLabel';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getCommonMRTCellStyles, getMRTTheme } from '../style.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonMRTCellStyles, getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableCellProps {
   header: MRT_Header<TData>;

package/src/{head → components/head}/MRT_TableHeadCellColumnActionsButton.tsx

@@ -1,13 +1,14 @@
 import { type MouseEvent, useState } from 'react';
 import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { MRT_ColumnActionMenu } from '../menus/MRT_ColumnActionMenu';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_ColumnActionMenu } from '../menus/MRT_ColumnActionMenu';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   header: MRT_Header<TData>;
@@ -54,9 +55,7 @@ export const MRT_TableHeadCellColumnActionsButton = <
   return (
     <>
       <Tooltip
-        enterDelay={1000}
-        enterNextDelay={1000}
-        placement="top"
+        {...getCommonTooltipProps('top')}
         title={iconButtonProps?.title ?? localization.columnActions}
       >
         <IconButton

package/src/{head → components/head}/MRT_TableHeadCellFilterContainer.tsx

@@ -1,13 +1,13 @@
 import Collapse, { type CollapseProps } from '@mui/material/Collapse';
-import { MRT_FilterCheckbox } from '../inputs/MRT_FilterCheckbox';
-import { MRT_FilterRangeFields } from '../inputs/MRT_FilterRangeFields';
-import { MRT_FilterRangeSlider } from '../inputs/MRT_FilterRangeSlider';
-import { MRT_FilterTextField } from '../inputs/MRT_FilterTextField';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { MRT_FilterCheckbox } from '../inputs/MRT_FilterCheckbox';
+import { MRT_FilterRangeFields } from '../inputs/MRT_FilterRangeFields';
+import { MRT_FilterRangeSlider } from '../inputs/MRT_FilterRangeSlider';
+import { MRT_FilterTextField } from '../inputs/MRT_FilterTextField';
 
 interface Props<TData extends MRT_RowData> extends CollapseProps {
   header: MRT_Header<TData>;

package/src/{head → components/head}/MRT_TableHeadCellFilterLabel.tsx

@@ -5,12 +5,12 @@ import IconButton, { type IconButtonProps } from '@mui/material/IconButton';
 import Popover from '@mui/material/Popover';
 import Tooltip from '@mui/material/Tooltip';
 import { MRT_TableHeadCellFilterContainer } from './MRT_TableHeadCellFilterContainer';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends IconButtonProps {
   header: MRT_Header<TData>;

package/src/{head → components/head}/MRT_TableHeadCellGrabHandle.tsx

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

package/src/{head → components/head}/MRT_TableHeadCellResizeHandle.tsx

@@ -1,11 +1,11 @@
 import Box from '@mui/material/Box';
 import Divider, { type DividerProps } from '@mui/material/Divider';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends DividerProps {
   header: MRT_Header<TData>;

package/src/{head → components/head}/MRT_TableHeadCellSortLabel.tsx

@@ -3,12 +3,12 @@ import TableSortLabel, {
   type TableSortLabelProps,
 } from '@mui/material/TableSortLabel';
 import Tooltip from '@mui/material/Tooltip';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableSortLabelProps {
   header: MRT_Header<TData>;

package/src/{head → components/head}/MRT_TableHeadRow.tsx

@@ -1,15 +1,15 @@
 import TableRow, { type TableRowProps } from '@mui/material/TableRow';
 import { alpha } from '@mui/material/styles';
 import { MRT_TableHeadCell } from './MRT_TableHeadCell';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_ColumnVirtualizer,
   type MRT_Header,
   type MRT_HeaderGroup,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TableRowProps {
   columnVirtualizer?: MRT_ColumnVirtualizer;

package/src/{inputs → components/inputs}/MRT_EditCellTextField.tsx

@@ -7,12 +7,12 @@ import {
 import MenuItem from '@mui/material/MenuItem';
 import TextField from '@mui/material/TextField';
 import { type TextFieldProps } from '@mui/material/TextField';
-import { getValueAndLabel, parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Cell,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getValueAndLabel, parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends TextFieldProps<'standard'> {
   cell: MRT_Cell<TData>;
@@ -35,6 +35,7 @@ export const MRT_EditCellTextField = <TData extends MRT_RowData>({
   const { column, row } = cell;
   const { columnDef } = column;
   const { creatingRow, editingRow } = getState();
+  const { editSelectOptions } = columnDef;
 
   const isCreating = creatingRow?.id === row.id;
   const isEditing = editingRow?.id === row.id;
@@ -58,6 +59,13 @@ export const MRT_EditCellTextField = <TData extends MRT_RowData>({
     ...rest,
   };
 
+  const selectOptions = parseFromValuesOrFunc(editSelectOptions, {
+    cell,
+    column,
+    row,
+    table,
+  });
+
   const saveInputValueToRowCache = (newValue: string) => {
     //@ts-ignore
     row._valuesCache[column.id] = newValue;
@@ -123,7 +131,7 @@ export const MRT_EditCellTextField = <TData extends MRT_RowData>({
       }
       select={isSelectEdit}
       size="small"
-      value={value}
+      value={value ?? ''}
       variant="standard"
       {...textFieldProps}
       InputProps={{
@@ -152,7 +160,7 @@ export const MRT_EditCellTextField = <TData extends MRT_RowData>({
       onKeyDown={handleEnterKeyDown}
     >
       {textFieldProps.children ??
-        columnDef?.editSelectOptions?.map((option) => {
+        selectOptions?.map((option) => {
           const { label, value } = getValueAndLabel(option);
           return (
             <MenuItem

package/src/{inputs → components/inputs}/MRT_FilterCheckbox.tsx

@@ -1,12 +1,13 @@
 import Checkbox, { type CheckboxProps } from '@mui/material/Checkbox';
 import FormControlLabel from '@mui/material/FormControlLabel';
 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 { getCommonTooltipProps } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends CheckboxProps {
   column: MRT_Column<TData>;
@@ -44,8 +45,7 @@ export const MRT_FilterCheckbox = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
+      {...getCommonTooltipProps()}
       title={checkboxProps?.title ?? filterLabel}
     >
       <FormControlLabel

package/src/{inputs → components/inputs}/MRT_FilterRangeFields.tsx

@@ -1,11 +1,11 @@
 import Box, { type BoxProps } from '@mui/material/Box';
 import { MRT_FilterTextField } from './MRT_FilterTextField';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends BoxProps {
   header: MRT_Header<TData>;

package/src/{inputs → components/inputs}/MRT_FilterRangeSlider.tsx

@@ -2,12 +2,12 @@ import { useEffect, useRef, useState } from 'react';
 import FormHelperText from '@mui/material/FormHelperText';
 import Slider, { type SliderProps } from '@mui/material/Slider';
 import Stack from '@mui/material/Stack';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends SliderProps {
   header: MRT_Header<TData>;

package/src/{inputs → components/inputs}/MRT_FilterTextField.tsx

@@ -29,13 +29,13 @@ import {
   TimePicker,
   type TimePickerProps,
 } from '@mui/x-date-pickers/TimePicker';
-import { getValueAndLabel, parseFromValuesOrFunc } from '../column.utils';
-import { MRT_FilterOptionMenu } from '../menus/MRT_FilterOptionMenu';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getValueAndLabel, parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_FilterOptionMenu } from '../menus/MRT_FilterOptionMenu';
 
 interface Props<TData extends MRT_RowData> extends TextFieldProps<'standard'> {
   header: MRT_Header<TData>;

package/src/{inputs → components/inputs}/MRT_GlobalFilterTextField.tsx

@@ -12,9 +12,9 @@ import InputAdornment from '@mui/material/InputAdornment';
 import TextField, { type TextFieldProps } from '@mui/material/TextField';
 import Tooltip from '@mui/material/Tooltip';
 import { debounce } from '@mui/material/utils';
-import { parseFromValuesOrFunc } from '../column.utils';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 import { MRT_FilterOptionMenu } from '../menus/MRT_FilterOptionMenu';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
 
 interface Props<TData extends MRT_RowData> extends TextFieldProps<'standard'> {
   table: MRT_TableInstance<TData>;

package/src/{inputs → components/inputs}/MRT_SelectCheckbox.tsx

@@ -3,12 +3,13 @@ import Checkbox, { type CheckboxProps } from '@mui/material/Checkbox';
 import Radio, { type RadioProps } from '@mui/material/Radio';
 import Tooltip from '@mui/material/Tooltip';
 import { type Theme } 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 CheckboxProps {
   row?: MRT_Row<TData>;
@@ -124,8 +125,7 @@ export const MRT_SelectCheckbox = <TData extends MRT_RowData>({
 
   return (
     <Tooltip
-      enterDelay={1000}
-      enterNextDelay={1000}
+      {...getCommonTooltipProps()}
       title={
         checkboxProps?.title ??
         (selectAll

package/src/{menus → components/menus}/MRT_ColumnActionMenu.tsx

@@ -5,12 +5,14 @@ import IconButton from '@mui/material/IconButton';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import Menu, { type MenuProps } from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
+import { useTheme } from '@mui/material/styles';
 import { MRT_FilterOptionMenu } from './MRT_FilterOptionMenu';
 import {
   type MRT_Header,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
 
 export const commonMenuItemStyles = {
   alignItems: 'center',
@@ -396,10 +398,16 @@ export const MRT_ColumnActionMenu = <TData extends MRT_RowData>({
       : []),
   ].filter(Boolean);
 
+  const theme = useTheme();
+  const { menuBackgroundColor } = getMRTTheme(table, theme);
+
   return (
     <Menu
       MenuListProps={{
         dense: density === 'compact',
+        sx: {
+          backgroundColor: menuBackgroundColor,
+        },
       }}
       anchorEl={anchorEl}
       onClose={() => setAnchorEl(null)}

package/src/{menus → components/menus}/MRT_FilterOptionMenu.tsx

@@ -2,6 +2,7 @@ import { useMemo } from 'react';
 import Box from '@mui/material/Box';
 import Menu, { type MenuProps } from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
+import { useTheme } from '@mui/material/styles';
 import {
   type MRT_FilterOption,
   type MRT_Header,
@@ -9,7 +10,8 @@ import {
   type MRT_Localization,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
 
 export const mrtFilterOptions = (
   localization: MRT_Localization,
@@ -237,10 +239,16 @@ export const MRT_FilterOptionMenu = <TData extends MRT_RowData>({
   const filterOption =
     !!header && columnDef ? columnDef._filterFn : globalFilterFn;
 
+  const theme = useTheme();
+  const { menuBackgroundColor } = getMRTTheme(table, theme);
+
   return (
     <Menu
       MenuListProps={{
         dense: density === 'compact',
+        sx: {
+          backgroundColor: menuBackgroundColor,
+        },
       }}
       anchorEl={anchorEl}
       anchorOrigin={{ horizontal: 'right', vertical: 'center' }}

package/src/{menus → components/menus}/MRT_RowActionMenu.tsx

@@ -3,22 +3,25 @@ import Box from '@mui/material/Box';
 import ListItemIcon from '@mui/material/ListItemIcon';
 import Menu, { type MenuProps } from '@mui/material/Menu';
 import MenuItem from '@mui/material/MenuItem';
+import { useTheme } from '@mui/material/styles';
 import {
   commonListItemStyles,
   commonMenuItemStyles,
 } from './MRT_ColumnActionMenu';
-import { parseFromValuesOrFunc } from '../column.utils';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 
 interface Props<TData extends MRT_RowData> extends Partial<MenuProps> {
   anchorEl: HTMLElement | null;
   handleEdit: (event: MouseEvent) => void;
   row: MRT_Row<TData>;
   setAnchorEl: (anchorEl: HTMLElement | null) => void;
+  staticRowIndex?: number;
   table: MRT_TableInstance<TData>;
 }
 
@@ -27,6 +30,7 @@ export const MRT_RowActionMenu = <TData extends MRT_RowData>({
   handleEdit,
   row,
   setAnchorEl,
+  staticRowIndex,
   table,
   ...rest
 }: Props<TData>) => {
@@ -42,10 +46,16 @@ export const MRT_RowActionMenu = <TData extends MRT_RowData>({
   } = table;
   const { density } = getState();
 
+  const theme = useTheme();
+  const { menuBackgroundColor } = getMRTTheme(table, theme);
+
   return (
     <Menu
       MenuListProps={{
         dense: density === 'compact',
+        sx: {
+          backgroundColor: menuBackgroundColor,
+        },
       }}
       anchorEl={anchorEl}
       onClick={(event) => event.stopPropagation()}
@@ -67,6 +77,7 @@ export const MRT_RowActionMenu = <TData extends MRT_RowData>({
       {renderRowActionMenuItems?.({
         closeMenu: () => setAnchorEl(null),
         row,
+        staticRowIndex,
         table,
       })}
     </Menu>

package/src/{menus → components/menus}/MRT_ShowHideColumnsMenu.tsx

@@ -3,13 +3,15 @@ import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import Divider from '@mui/material/Divider';
 import Menu, { type MenuProps } from '@mui/material/Menu';
+import { useTheme } from '@mui/material/styles';
 import { MRT_ShowHideColumnsMenuItems } from './MRT_ShowHideColumnsMenuItems';
-import { getDefaultColumnOrderIds } from '../column.utils';
 import {
   type MRT_Column,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { getDefaultColumnOrderIds } from '../../utils/displayColumn.utils';
+import { getMRTTheme } from '../../utils/style.utils';
 
 interface Props<TData extends MRT_RowData> extends Partial<MenuProps> {
   anchorEl: HTMLElement | null;
@@ -77,10 +79,16 @@ export const MRT_ShowHideColumnsMenu = <TData extends MRT_RowData>({
     null,
   );
 
+  const theme = useTheme();
+  const { menuBackgroundColor } = getMRTTheme(table, theme);
+
   return (
     <Menu
       MenuListProps={{
         dense: density === 'compact',
+        sx: {
+          backgroundColor: menuBackgroundColor,
+        },
       }}
       anchorEl={anchorEl}
       onClose={() => setAnchorEl(null)}
@@ -106,9 +114,7 @@ export const MRT_ShowHideColumnsMenu = <TData extends MRT_RowData>({
         {enableColumnOrdering && (
           <Button
             onClick={() =>
-              table.setColumnOrder(
-                getDefaultColumnOrderIds(table.options as any),
-              )
+              table.setColumnOrder(getDefaultColumnOrderIds(table.options))
             }
           >
             {localization.resetOrder}

package/src/{menus → components/menus}/MRT_ShowHideColumnsMenuItems.tsx

@@ -11,15 +11,16 @@ import MenuItem, { type MenuItemProps } from '@mui/material/MenuItem';
 import Switch from '@mui/material/Switch';
 import Tooltip from '@mui/material/Tooltip';
 import Typography from '@mui/material/Typography';
-import { MRT_ColumnPinningButtons } from '../buttons/MRT_ColumnPinningButtons';
-import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
-import { parseFromValuesOrFunc, reorderColumn } from '../column.utils';
-import { getMRTTheme } from '../style.utils';
 import {
   type MRT_Column,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { reorderColumn } from '../../utils/column.utils';
+import { getCommonTooltipProps, getMRTTheme } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_ColumnPinningButtons } from '../buttons/MRT_ColumnPinningButtons';
+import { MRT_GrabHandleButton } from '../buttons/MRT_GrabHandleButton';
 
 interface Props<TData extends MRT_RowData> extends MenuItemProps {
   allColumns: MRT_Column<TData>[];
@@ -160,8 +161,7 @@ export const MRT_ShowHideColumnsMenuItems = <TData extends MRT_RowData>({
               }}
               control={
                 <Tooltip
-                  enterDelay={1000}
-                  enterNextDelay={1000}
+                  {...getCommonTooltipProps()}
                   title={localization.toggleVisibility}
                 >
                   <Switch />

package/src/{modals → components/modals}/MRT_EditRowModal.tsx

@@ -3,14 +3,14 @@ import DialogActions from '@mui/material/DialogActions';
 import DialogContent from '@mui/material/DialogContent';
 import DialogTitle from '@mui/material/DialogTitle';
 import Stack from '@mui/material/Stack';
-import { MRT_EditActionButtons } from '../buttons/MRT_EditActionButtons';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField';
 import {
   type MRT_Row,
   type MRT_RowData,
   type MRT_TableInstance,
-} from '../types';
+} from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_EditActionButtons } from '../buttons/MRT_EditActionButtons';
+import { MRT_EditCellTextField } from '../inputs/MRT_EditCellTextField';
 
 interface Props<TData extends MRT_RowData> extends Partial<DialogProps> {
   open: boolean;

package/src/{table → components/table}/MRT_Table.tsx

@@ -1,12 +1,12 @@
 import { useMemo } from 'react';
 import Table, { type TableProps } from '@mui/material/Table';
+import { useMRT_ColumnVirtualizer } from '../../hooks/useMRT_ColumnVirtualizer';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
+import { parseCSSVarId } from '../../utils/style.utils';
+import { parseFromValuesOrFunc } from '../../utils/utils';
 import { MRT_TableBody, Memo_MRT_TableBody } from '../body/MRT_TableBody';
-import { parseFromValuesOrFunc } from '../column.utils';
 import { MRT_TableFooter } from '../footer/MRT_TableFooter';
 import { MRT_TableHead } from '../head/MRT_TableHead';
-import { useMRT_ColumnVirtualizer } from '../hooks/useMRT_ColumnVirtualizer';
-import { parseCSSVarId } from '../style.utils';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
 
 interface Props<TData extends MRT_RowData> extends TableProps {
   table: MRT_TableInstance<TData>;

package/src/{table → components/table}/MRT_TableContainer.tsx

@@ -4,9 +4,9 @@ import TableContainer, {
 } from '@mui/material/TableContainer';
 import { MRT_Table } from './MRT_Table';
 import { MRT_TableLoadingOverlay } from './MRT_TableLoadingOverlay';
-import { parseFromValuesOrFunc } from '../column.utils';
-import { MRT_EditRowModal } from '../modals';
-import { type MRT_RowData, type MRT_TableInstance } from '../types';
+import { type MRT_RowData, type MRT_TableInstance } from '../../types';
+import { parseFromValuesOrFunc } from '../../utils/utils';
+import { MRT_EditRowModal } from '../modals/MRT_EditRowModal';
 
 const useIsomorphicLayoutEffect =
   typeof window !== 'undefined' ? useLayoutEffect : useEffect;