[core] Remove material-ui-utils.ts

packages/grid/_modules_/grid/components/GridAutoSizer.tsx

@@ -1,7 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { useForkRef, ownerWindow } from '@mui/material/utils';
-import { useEventCallback, useEnhancedEffect } from '../utils/material-ui-utils';
+import {
+  useForkRef,
+  ownerWindow,
+  useEventCallback,
+  unstable_useEnhancedEffect as useEnhancedEffect,
+} from '@mui/material/utils';
 import createDetectElementResize from '../lib/createDetectElementResize';
 // TODO replace with https://caniuse.com/resizeobserver.
 

packages/grid/_modules_/grid/components/GridRenderingZone.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { ElementSize } from '../models';
 import { getDataGridUtilityClass } from '../gridClasses';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
-import { composeClasses } from '../utils/material-ui-utils';
 import { GridComponentProps } from '../GridComponentProps';
 
 type WithChildren = { children?: React.ReactNode };

packages/grid/_modules_/grid/components/GridRow.tsx

@@ -3,11 +3,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { GridEvents } from '../constants/eventsConstants';
 import { GridRowId, GridRowData } from '../models/gridRows';
 import { GridEditModes, GridRowModes, GridEditRowsModel } from '../models/gridEditRowModel';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
-import { composeClasses } from '../utils/material-ui-utils';
 import { getDataGridUtilityClass, gridClasses } from '../gridClasses';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../GridComponentProps';

packages/grid/_modules_/grid/components/GridRowCount.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../gridClasses';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../GridComponentProps';
-import { composeClasses } from '../utils/material-ui-utils';
 
 interface RowCountProps {
   rowCount: number;

packages/grid/_modules_/grid/components/GridScrollArea.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { GridEvents } from '../constants/eventsConstants';
 import { useGridApiEventHandler } from '../hooks/utils/useGridApiEventHandler';
 import { GridScrollParams } from '../models/params/gridScrollParams';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../gridClasses';
-import { composeClasses } from '../utils/material-ui-utils';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../GridComponentProps';
 

packages/grid/_modules_/grid/components/GridSelectedRowCount.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridApiContext } from '../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../gridClasses';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../GridComponentProps';
-import { composeClasses } from '../utils/material-ui-utils';
 
 interface SelectedRowCountProps {
   selectedRowCount: number;

packages/grid/_modules_/grid/components/GridStickyContainer.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../gridClasses';
 import { ElementSize } from '../models';
 import { useGridRootProps } from '../hooks/utils/useGridRootProps';
-import { composeClasses } from '../utils/material-ui-utils';
 import { GridComponentProps } from '../GridComponentProps';
 
 interface GridStickyContainerProps extends ElementSize {

packages/grid/_modules_/grid/components/cell/GridBooleanCell.tsx

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { SvgIconProps } from '@mui/material/SvgIcon';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { GridRenderCellParams } from '../../models/params/gridCellParams';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 
 type OwnerState = { classes: GridComponentProps['classes'] };
 

packages/grid/_modules_/grid/components/cell/GridCell.tsx

@@ -1,8 +1,9 @@
 /* eslint-disable jsx-a11y/no-noninteractive-element-interactions */
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import { ownerDocument, capitalize } from '@mui/material/utils';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
+import { ownerDocument, capitalize } from '@mui/material/utils';
 import { GridEvents } from '../../constants/eventsConstants';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import {
@@ -13,7 +14,6 @@ import {
   GridRowId,
 } from '../../models/index';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';
 

packages/grid/_modules_/grid/components/cell/GridEditBooleanCell.tsx

@@ -1,8 +1,11 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
+import {
+  unstable_useId as useId,
+  unstable_useEnhancedEffect as useEnhancedEffect,
+} from '@mui/material/utils';
 import Checkbox from '@mui/material/Checkbox';
-import { unstable_useId as useId } from '@mui/material/utils';
-import { composeClasses, useEnhancedEffect } from '../../utils/material-ui-utils';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { GridRenderEditCellParams } from '../../models/params/gridCellParams';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';

packages/grid/_modules_/grid/components/cell/GridEditDateCell.tsx

@@ -1,7 +1,8 @@
 import * as React from 'react';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
+import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import InputBase, { InputBaseProps } from '@mui/material/InputBase';
 import { GridRenderEditCellParams } from '../../models/params/gridCellParams';
-import { composeClasses, useEnhancedEffect } from '../../utils/material-ui-utils';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';

packages/grid/_modules_/grid/components/cell/GridEditInputCell.tsx

@@ -1,8 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
+import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import InputBase, { InputBaseProps } from '@mui/material/InputBase';
 import { GridRenderEditCellParams } from '../../models/params/gridCellParams';
-import { composeClasses, useEnhancedEffect } from '../../utils/material-ui-utils';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';

packages/grid/_modules_/grid/components/cell/GridEditSingleSelectCell.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/material/utils';
 import Select, { SelectProps } from '@mui/material/Select';
 import MenuItem from '@mui/material/MenuItem';
 import {
   GridRenderEditCellParams,
   GridValueFormatterParams,
 } from '../../models/params/gridCellParams';
 import { isEscapeKey } from '../../utils/keyboardUtils';
-import { useEnhancedEffect } from '../../utils/material-ui-utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridEditModes } from '../../models/gridEditRowModel';
 

packages/grid/_modules_/grid/components/cell/GridEmptyCell.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { GridComponentProps } from '../../GridComponentProps';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 
 export interface GridEmptyCellProps {
   width?: number;

packages/grid/_modules_/grid/components/columnHeaders/ColumnHeaderFilterIcon.tsx

@@ -1,4 +1,5 @@
 import * as React from 'react';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import IconButton from '@mui/material/IconButton';
 import Badge from '@mui/material/Badge';
 import Tooltip from '@mui/material/Tooltip';
@@ -7,7 +8,6 @@ import { GridPreferencePanelsValue } from '../../hooks/features/preferencesPanel
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export interface ColumnHeaderFilterIconProps {

packages/grid/_modules_/grid/components/columnHeaders/ColumnHeaderMenuIcon.tsx

@@ -1,9 +1,9 @@
 import * as React from 'react';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import IconButton from '@mui/material/IconButton';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { GridStateColDef } from '../../models/colDef/gridColDef';
 import { getDataGridUtilityClass } from '../../gridClasses';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';
 

packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderItem.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { unstable_useId as useId } from '@mui/material/utils';
 import { GridEvents } from '../../constants/eventsConstants';
 import { GridStateColDef } from '../../models/colDef/index';
@@ -13,7 +14,6 @@ import { ColumnHeaderMenuIcon } from './ColumnHeaderMenuIcon';
 import { ColumnHeaderFilterIcon } from './ColumnHeaderFilterIcon';
 import { GridColumnHeaderMenu } from '../menu/columnMenu/GridColumnHeaderMenu';
 import { getDataGridUtilityClass } from '../../gridClasses';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';
 

packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderSeparator.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export interface GridColumnHeaderSeparatorProps extends React.HTMLAttributes<HTMLDivElement> {

packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderSortIcon.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import Badge from '@mui/material/Badge';
 import IconButton from '@mui/material/IconButton';
 import { GridIconSlotsComponent } from '../../models/gridIconSlotsComponent';
 import { GridSortDirection } from '../../models/gridSortModel';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export interface GridColumnHeaderSortIconProps {

packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaderTitle.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import Tooltip from '@mui/material/Tooltip';
 import { isOverflown } from '../../utils/domUtils';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 type OwnerState = { classes: GridComponentProps['classes'] };

packages/grid/_modules_/grid/components/columnHeaders/GridColumnHeaders.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { visibleGridColumnsSelector } from '../../hooks/features/columns/gridColumnsSelector';
 import { GridState } from '../../models/gridState';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
@@ -11,7 +12,6 @@ import { GridColumnHeadersItemCollection } from './GridColumnHeadersItemCollecti
 import { gridDensityHeaderHeightSelector } from '../../hooks/features/density/densitySelector';
 import { gridContainerSizesSelector } from '../../hooks/features/container/gridContainerSizesSelector';
 import { getDataGridUtilityClass } from '../../gridClasses';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { GridComponentProps } from '../../GridComponentProps';
 import { useGridApiEventHandler } from '../../hooks/utils/useGridApiEventHandler';

packages/grid/_modules_/grid/components/columnSelection/GridCellCheckboxRenderer.tsx

@@ -1,13 +1,13 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useForkRef } from '@mui/material/utils';
 import { GridEvents } from '../../constants/eventsConstants';
 import { GridCellParams } from '../../models/params/gridCellParams';
 import { isNavigationKey, isSpaceKey } from '../../utils/keyboardUtils';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { getDataGridUtilityClass } from '../../gridClasses';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 import { GridRowSelectionCheckboxParams } from '../../models/params/gridRowSelectionCheckboxParams';
 

packages/grid/_modules_/grid/components/columnSelection/GridHeaderCheckbox.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { GridEvents } from '../../constants/eventsConstants';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridTabIndexColumnHeaderSelector } from '../../hooks/features/focus/gridFocusStateSelector';
@@ -9,7 +10,6 @@ import { isNavigationKey, isSpaceKey } from '../../utils/keyboardUtils';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 import { GridHeaderSelectionCheckboxParams } from '../../models/params/gridHeaderSelectionCheckboxParams';
 import { visibleSortedGridRowIdsSelector } from '../../hooks/features/filter/gridFilterSelector';

packages/grid/_modules_/grid/components/containers/GridColumnsContainer.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridDensityHeaderHeightSelector } from '../../hooks/features/density/densitySelector';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 type GridColumnsContainerProps = React.HTMLAttributes<HTMLDivElement>;

packages/grid/_modules_/grid/components/containers/GridDataContainer.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridDataContainerSizesSelector } from '../../hooks/features/container/gridContainerSizesSelector';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 type GridDataContainerProps = React.HTMLAttributes<HTMLDivElement>;

packages/grid/_modules_/grid/components/containers/GridFooterContainer.tsx

@@ -1,8 +1,8 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export type GridFooterContainerProps = React.HTMLAttributes<HTMLDivElement>;

packages/grid/_modules_/grid/components/containers/GridMainContainer.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 type OwnerState = { classes: GridComponentProps['classes'] };

packages/grid/_modules_/grid/components/containers/GridOverlay.tsx

@@ -1,11 +1,11 @@
 import * as React from 'react';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridDensityHeaderHeightSelector } from '../../hooks/features/density/densitySelector';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export type GridOverlayProps = React.HTMLAttributes<HTMLDivElement>;

packages/grid/_modules_/grid/components/containers/GridWindow.tsx

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
+import { unstable_composeClasses as composeClasses } from '@mui/core';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import {
   gridDensityHeaderHeightSelector,
@@ -10,7 +11,6 @@ import { gridDataContainerHeightSelector } from '../../hooks/features/container/
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { getDataGridUtilityClass } from '../../gridClasses';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
-import { composeClasses } from '../../utils/material-ui-utils';
 import { GridComponentProps } from '../../GridComponentProps';
 
 export interface GridWindowProps extends React.HTMLAttributes<HTMLDivElement> {