@mui/x-data-grid 7.0.0-alpha.8 → 7.0.0-beta.0

package/modern/components/cell/GridCell.js

@@ -1,9 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["changeReason", "unstable_updateValueOnRender"],
-  _excluded2 = ["align", "children", "editCellState", "colIndex", "column", "cellMode", "field", "formattedValue", "hasFocus", "height", "isEditable", "isSelected", "rowId", "tabIndex", "value", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
-  _excluded3 = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "showRightBorder", "extendRowFullWidth", "row", "colSpan", "disableDragEvents", "isNotVisible", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
-  _excluded4 = ["changeReason", "unstable_updateValueOnRender"];
+const _excluded = ["column", "rowId", "editCellState", "align", "children", "colIndex", "height", "width", "className", "style", "gridHasScrollX", "colSpan", "disableDragEvents", "isNotVisible", "pinnedOffset", "pinnedPosition", "sectionIndex", "sectionLength", "onClick", "onDoubleClick", "onMouseDown", "onMouseUp", "onMouseOver", "onKeyDown", "onKeyUp", "onDragEnter", "onDragOver"],
+  _excluded2 = ["changeReason", "unstable_updateValueOnRender"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
@@ -18,6 +16,12 @@ import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { gridFocusCellSelector } from '../../hooks/features/focus/gridFocusStateSelector';
 import { MissingRowIdError } from '../../hooks/features/rows/useGridParamsApi';
 import { jsx as _jsx } from "react/jsx-runtime";
+export let PinnedPosition = /*#__PURE__*/function (PinnedPosition) {
+  PinnedPosition[PinnedPosition["NONE"] = 0] = "NONE";
+  PinnedPosition[PinnedPosition["LEFT"] = 1] = "LEFT";
+  PinnedPosition[PinnedPosition["RIGHT"] = 2] = "RIGHT";
+  return PinnedPosition;
+}({});
 const EMPTY_CELL_PARAMS = {
   id: -1,
   field: '__unset__',
@@ -45,345 +49,25 @@ const EMPTY_CELL_PARAMS = {
 const useUtilityClasses = ownerState => {
   const {
     align,
+    showLeftBorder,
     showRightBorder,
+    pinnedPosition,
     isEditable,
     isSelected,
     isSelectionMode,
     classes
   } = ownerState;
   const slots = {
-    root: ['cell', `cell--text${capitalize(align)}`, isEditable && 'cell--editable', isSelected && 'selected', showRightBorder && 'cell--withRightBorder', isSelectionMode && !isEditable && 'cell--selectionMode', 'withBorderColor'],
+    root: ['cell', `cell--text${capitalize(align)}`, isSelected && 'selected', isEditable && 'cell--editable', showLeftBorder && 'cell--withLeftBorder', showRightBorder && 'cell--withRightBorder', pinnedPosition === PinnedPosition.LEFT && 'cell--pinnedLeft', pinnedPosition === PinnedPosition.RIGHT && 'cell--pinnedRight', isSelectionMode && !isEditable && 'cell--selectionMode'],
     content: ['cellContent']
   };
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
 let warnedOnce = false;
 
-// GridCellWrapper is a compatibility layer for the V6 cell slot. If we can use the more efficient
-// `GridCellV7`, we should. That component is a merge of `GridCellWrapper` and `GridCell`.
-// TODO(v7): Remove the wrapper & cellV6 and use the cellV7 exclusively.
 // TODO(v7): Removing the wrapper will break the docs performance visualization demo.
-const GridCellWrapper = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const {
-    column,
-    rowId,
-    editCellState
-  } = props;
-  const apiRef = useGridApiContext();
-  const rootProps = useGridRootProps();
-  const field = column.field;
-  const cellParamsWithAPI = useGridSelector(apiRef, () => {
-    // This is required because `.getCellParams` tries to get the `state.rows.tree` entry
-    // associated with `rowId`/`fieldId`, but this selector runs after the state has been
-    // updated, while `rowId`/`fieldId` reference an entry in the old state.
-    try {
-      const cellParams = apiRef.current.getCellParams(rowId, field);
-      const result = cellParams;
-      result.api = apiRef.current;
-      return result;
-    } catch (e) {
-      if (e instanceof MissingRowIdError) {
-        return EMPTY_CELL_PARAMS;
-      }
-      throw e;
-    }
-  }, objectShallowCompare);
-  const isSelected = useGridSelector(apiRef, () => apiRef.current.unstable_applyPipeProcessors('isCellSelected', false, {
-    id: rowId,
-    field
-  }));
-  if (cellParamsWithAPI === EMPTY_CELL_PARAMS) {
-    return null;
-  }
-  const {
-    cellMode,
-    hasFocus,
-    isEditable,
-    value,
-    formattedValue
-  } = cellParamsWithAPI;
-  const managesOwnFocus = column.type === 'actions';
-  const tabIndex = (cellMode === 'view' || !isEditable) && !managesOwnFocus ? cellParamsWithAPI.tabIndex : -1;
-  const {
-    classes: rootClasses,
-    getCellClassName
-  } = rootProps;
-  const classNames = apiRef.current.unstable_applyPipeProcessors('cellClassName', [], {
-    id: rowId,
-    field
-  });
-  if (column.cellClassName) {
-    classNames.push(typeof column.cellClassName === 'function' ? column.cellClassName(cellParamsWithAPI) : column.cellClassName);
-  }
-  if (getCellClassName) {
-    classNames.push(getCellClassName(cellParamsWithAPI));
-  }
-  let children;
-  if (editCellState == null && column.renderCell) {
-    children = column.renderCell(cellParamsWithAPI);
-    classNames.push(gridClasses['cell--withRenderer']);
-    classNames.push(rootClasses?.['cell--withRenderer']);
-  }
-  if (editCellState != null && column.renderEditCell) {
-    const updatedRow = apiRef.current.getRowWithUpdatedValues(rowId, column.field);
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const editCellStateRest = _objectWithoutPropertiesLoose(editCellState, _excluded);
-    const params = _extends({}, cellParamsWithAPI, {
-      row: updatedRow
-    }, editCellStateRest);
-    children = column.renderEditCell(params);
-    classNames.push(gridClasses['cell--editing']);
-    classNames.push(rootClasses?.['cell--editing']);
-  }
-  const {
-    slots
-  } = rootProps;
-  const CellComponent = slots.cell;
-  const cellProps = _extends({}, props, {
-    ref,
-    field,
-    formattedValue,
-    hasFocus,
-    isEditable,
-    isSelected,
-    value,
-    cellMode,
-    children,
-    tabIndex,
-    className: clsx(classNames)
-  });
-  return /*#__PURE__*/React.createElement(CellComponent, cellProps);
-});
 const GridCell = /*#__PURE__*/React.forwardRef((props, ref) => {
-  const {
-      align,
-      children: childrenProp,
-      colIndex,
-      column,
-      cellMode,
-      field,
-      formattedValue,
-      hasFocus,
-      height,
-      isEditable,
-      isSelected,
-      rowId,
-      tabIndex,
-      value,
-      width,
-      className,
-      showRightBorder,
-      colSpan,
-      disableDragEvents,
-      isNotVisible,
-      onClick,
-      onDoubleClick,
-      onMouseDown,
-      onMouseUp,
-      onMouseOver,
-      onKeyDown,
-      onKeyUp,
-      onDragEnter,
-      onDragOver
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded2);
-  const valueToRender = formattedValue == null ? value : formattedValue;
-  const cellRef = React.useRef(null);
-  const handleRef = useForkRef(ref, cellRef);
-  const focusElementRef = React.useRef(null);
-  const apiRef = useGridApiContext();
-  const rootProps = useGridRootProps();
-  const ownerState = {
-    align,
-    showRightBorder,
-    isEditable,
-    classes: rootProps.classes,
-    isSelected
-  };
-  const classes = useUtilityClasses(ownerState);
-  const publishMouseUp = React.useCallback(eventName => event => {
-    const params = apiRef.current.getCellParams(rowId, field || '');
-    apiRef.current.publishEvent(eventName, params, event);
-    if (onMouseUp) {
-      onMouseUp(event);
-    }
-  }, [apiRef, field, onMouseUp, rowId]);
-  const publishMouseDown = React.useCallback(eventName => event => {
-    const params = apiRef.current.getCellParams(rowId, field || '');
-    apiRef.current.publishEvent(eventName, params, event);
-    if (onMouseDown) {
-      onMouseDown(event);
-    }
-  }, [apiRef, field, onMouseDown, rowId]);
-  const publish = React.useCallback((eventName, propHandler) => event => {
-    // The row might have been deleted during the click
-    if (!apiRef.current.getRow(rowId)) {
-      return;
-    }
-    const params = apiRef.current.getCellParams(rowId, field || '');
-    apiRef.current.publishEvent(eventName, params, event);
-    if (propHandler) {
-      propHandler(event);
-    }
-  }, [apiRef, field, rowId]);
-  const style = React.useMemo(() => {
-    if (isNotVisible) {
-      return {
-        padding: 0,
-        opacity: 0,
-        width: 0,
-        border: 0
-      };
-    }
-    const cellStyle = {
-      minWidth: width,
-      maxWidth: width,
-      minHeight: height,
-      maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
-    };
-    return cellStyle;
-  }, [width, height, isNotVisible]);
-  React.useEffect(() => {
-    if (!hasFocus || cellMode === GridCellModes.Edit) {
-      return;
-    }
-    const doc = ownerDocument(apiRef.current.rootElementRef.current);
-    if (cellRef.current && !cellRef.current.contains(doc.activeElement)) {
-      const focusableElement = cellRef.current.querySelector('[tabindex="0"]');
-      const elementToFocus = focusElementRef.current || focusableElement || cellRef.current;
-      if (doesSupportPreventScroll()) {
-        elementToFocus.focus({
-          preventScroll: true
-        });
-      } else {
-        const scrollPosition = apiRef.current.getScrollPosition();
-        elementToFocus.focus();
-        apiRef.current.scroll(scrollPosition);
-      }
-    }
-  }, [hasFocus, cellMode, apiRef]);
-  let handleFocus = other.onFocus;
-  if (process.env.NODE_ENV === 'test' && rootProps.experimentalFeatures?.warnIfFocusStateIsNotSynced) {
-    handleFocus = event => {
-      const focusedCell = gridFocusCellSelector(apiRef);
-      if (focusedCell?.id === rowId && focusedCell.field === field) {
-        if (typeof other.onFocus === 'function') {
-          other.onFocus(event);
-        }
-        return;
-      }
-      if (!warnedOnce) {
-        console.warn([`MUI X: The cell with id=${rowId} and field=${field} received focus.`, `According to the state, the focus should be at id=${focusedCell?.id}, field=${focusedCell?.field}.`, "Not syncing the state may cause unwanted behaviors since the `cellFocusIn` event won't be fired.", 'Call `fireEvent.mouseUp` before the `fireEvent.click` to sync the focus with the state.'].join('\n'));
-        warnedOnce = true;
-      }
-    };
-  }
-  const managesOwnFocus = column.type === 'actions';
-  let children = childrenProp;
-  if (children === undefined) {
-    const valueString = valueToRender?.toString();
-    children = /*#__PURE__*/_jsx("div", {
-      className: classes.content,
-      title: valueString,
-      role: "presentation",
-      children: valueString
-    });
-  }
-  if ( /*#__PURE__*/React.isValidElement(children) && managesOwnFocus) {
-    children = /*#__PURE__*/React.cloneElement(children, {
-      focusElementRef
-    });
-  }
-  const draggableEventHandlers = disableDragEvents ? null : {
-    onDragEnter: publish('cellDragEnter', onDragEnter),
-    onDragOver: publish('cellDragOver', onDragOver)
-  };
-  const ariaV7 = rootProps.experimentalFeatures?.ariaV7;
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-    _jsx("div", _extends({
-      ref: handleRef,
-      className: clsx(className, classes.root),
-      role: ariaV7 ? 'gridcell' : 'cell',
-      "data-field": field,
-      "data-colindex": colIndex,
-      "aria-colindex": colIndex + 1,
-      "aria-colspan": colSpan,
-      style: style,
-      tabIndex: tabIndex,
-      onClick: publish('cellClick', onClick),
-      onDoubleClick: publish('cellDoubleClick', onDoubleClick),
-      onMouseOver: publish('cellMouseOver', onMouseOver),
-      onMouseDown: publishMouseDown('cellMouseDown'),
-      onMouseUp: publishMouseUp('cellMouseUp'),
-      onKeyDown: publish('cellKeyDown', onKeyDown),
-      onKeyUp: publish('cellKeyUp', onKeyUp)
-    }, draggableEventHandlers, other, {
-      onFocus: handleFocus,
-      children: children
-    }))
-  );
-});
-const MemoizedCellWrapper = fastMemo(GridCellWrapper);
-process.env.NODE_ENV !== "production" ? GridCellWrapper.propTypes = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // | To update them edit the TypeScript types and run "yarn proptypes"  |
-  // ----------------------------------------------------------------------
-  align: PropTypes.oneOf(['center', 'left', 'right']),
-  className: PropTypes.string,
-  colIndex: PropTypes.number,
-  colSpan: PropTypes.number,
-  column: PropTypes.object,
-  disableDragEvents: PropTypes.bool,
-  height: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  onClick: PropTypes.func,
-  onDoubleClick: PropTypes.func,
-  onDragEnter: PropTypes.func,
-  onDragOver: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  onMouseDown: PropTypes.func,
-  onMouseUp: PropTypes.func,
-  rowId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  showRightBorder: PropTypes.bool,
-  width: PropTypes.number
-} : void 0;
-process.env.NODE_ENV !== "production" ? GridCell.propTypes = {
-  // ----------------------------- Warning --------------------------------
-  // | These PropTypes are generated from the TypeScript type definitions |
-  // | To update them edit the TypeScript types and run "yarn proptypes"  |
-  // ----------------------------------------------------------------------
-  align: PropTypes.oneOf(['center', 'left', 'right']),
-  cellMode: PropTypes.oneOf(['edit', 'view']),
-  children: PropTypes.node,
-  className: PropTypes.string,
-  colIndex: PropTypes.number,
-  colSpan: PropTypes.number,
-  column: PropTypes.object,
-  disableDragEvents: PropTypes.bool,
-  editCellState: PropTypes.shape({
-    changeReason: PropTypes.oneOf(['debouncedSetEditCellValue', 'setEditCellValue']),
-    isProcessingProps: PropTypes.bool,
-    isValidating: PropTypes.bool,
-    value: PropTypes.any
-  }),
-  isNotVisible: PropTypes.bool,
-  height: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]),
-  onClick: PropTypes.func,
-  onDoubleClick: PropTypes.func,
-  onDragEnter: PropTypes.func,
-  onDragOver: PropTypes.func,
-  onKeyDown: PropTypes.func,
-  onMouseDown: PropTypes.func,
-  onMouseUp: PropTypes.func,
-  rowId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
-  showRightBorder: PropTypes.bool,
-  width: PropTypes.number
-} : void 0;
-export { MemoizedCellWrapper as GridCellWrapper, GridCell };
-const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
       column,
       rowId,
@@ -393,10 +77,14 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
       height,
       width,
       className,
-      showRightBorder,
+      style: styleProp,
       colSpan,
       disableDragEvents,
       isNotVisible,
+      pinnedOffset,
+      pinnedPosition,
+      sectionIndex,
+      sectionLength,
       onClick,
       onDoubleClick,
       onMouseDown,
@@ -407,7 +95,7 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
       onDragEnter,
       onDragOver
     } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded3);
+    other = _objectWithoutPropertiesLoose(props, _excluded);
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
   const field = column.field;
@@ -434,7 +122,7 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
   const {
     cellMode,
     hasFocus,
-    isEditable,
+    isEditable = false,
     value,
     formattedValue
   } = cellParamsWithAPI;
@@ -460,11 +148,16 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
   const focusElementRef = React.useRef(null);
   // @ts-expect-error To access `cellSelection` flag as it's a `premium` feature
   const isSelectionMode = rootProps.cellSelection ?? false;
+  const isSectionLastCell = sectionIndex === sectionLength - 1;
+  const showLeftBorder = pinnedPosition === PinnedPosition.RIGHT && sectionIndex === 0;
+  const showRightBorder = rootProps.showCellVerticalBorder && (pinnedPosition !== PinnedPosition.LEFT ? !isSectionLastCell : true) || pinnedPosition === PinnedPosition.LEFT && isSectionLastCell;
   const ownerState = {
     align,
+    showLeftBorder,
     showRightBorder,
     isEditable,
     classes: rootProps.classes,
+    pinnedPosition,
     isSelected,
     isSelectionMode
   };
@@ -503,14 +196,18 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
         border: 0
       };
     }
-    const cellStyle = {
-      minWidth: width,
-      maxWidth: width,
-      minHeight: height,
-      maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
-    };
+    const cellStyle = _extends({
+      '--width': `${width}px`,
+      '--height': typeof height === 'number' ? `${height}px` : height
+    }, styleProp);
+    if (pinnedPosition === PinnedPosition.LEFT) {
+      cellStyle.left = pinnedOffset;
+    }
+    if (pinnedPosition === PinnedPosition.RIGHT) {
+      cellStyle.right = pinnedOffset;
+    }
     return cellStyle;
-  }, [width, height, isNotVisible]);
+  }, [width, height, isNotVisible, styleProp, pinnedOffset, pinnedPosition]);
   React.useEffect(() => {
     if (!hasFocus || cellMode === GridCellModes.Edit) {
       return;
@@ -559,7 +256,7 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
     const updatedRow = apiRef.current.getRowWithUpdatedValues(rowId, column.field);
 
     // eslint-disable-next-line @typescript-eslint/naming-convention
-    const editCellStateRest = _objectWithoutPropertiesLoose(editCellState, _excluded4);
+    const editCellStateRest = _objectWithoutPropertiesLoose(editCellState, _excluded2);
     const params = _extends({}, cellParamsWithAPI, {
       row: updatedRow
     }, editCellStateRest);
@@ -585,34 +282,29 @@ const GridCellV7 = /*#__PURE__*/React.forwardRef((props, ref) => {
     onDragEnter: publish('cellDragEnter', onDragEnter),
     onDragOver: publish('cellDragOver', onDragOver)
   };
-  const ariaV7 = rootProps.experimentalFeatures?.ariaV7;
-  return (
-    /*#__PURE__*/
-    // eslint-disable-next-line jsx-a11y/no-static-element-interactions
-    _jsx("div", _extends({
-      ref: handleRef,
-      className: clsx(className, classNames, classes.root),
-      role: ariaV7 ? 'gridcell' : 'cell',
-      "data-field": field,
-      "data-colindex": colIndex,
-      "aria-colindex": colIndex + 1,
-      "aria-colspan": colSpan,
-      style: style,
-      tabIndex: tabIndex,
-      onClick: publish('cellClick', onClick),
-      onDoubleClick: publish('cellDoubleClick', onDoubleClick),
-      onMouseOver: publish('cellMouseOver', onMouseOver),
-      onMouseDown: publishMouseDown('cellMouseDown'),
-      onMouseUp: publishMouseUp('cellMouseUp'),
-      onKeyDown: publish('cellKeyDown', onKeyDown),
-      onKeyUp: publish('cellKeyUp', onKeyUp)
-    }, draggableEventHandlers, other, {
-      onFocus: handleFocus,
-      children: children
-    }))
-  );
+  return /*#__PURE__*/_jsx("div", _extends({
+    ref: handleRef,
+    className: clsx(className, classNames, classes.root),
+    role: "gridcell",
+    "data-field": field,
+    "data-colindex": colIndex,
+    "aria-colindex": colIndex + 1,
+    "aria-colspan": colSpan,
+    style: style,
+    tabIndex: tabIndex,
+    onClick: publish('cellClick', onClick),
+    onDoubleClick: publish('cellDoubleClick', onDoubleClick),
+    onMouseOver: publish('cellMouseOver', onMouseOver),
+    onMouseDown: publishMouseDown('cellMouseDown'),
+    onMouseUp: publishMouseUp('cellMouseUp'),
+    onKeyDown: publish('cellKeyDown', onKeyDown),
+    onKeyUp: publish('cellKeyUp', onKeyUp)
+  }, draggableEventHandlers, other, {
+    onFocus: handleFocus,
+    children: children
+  }));
 });
-process.env.NODE_ENV !== "production" ? GridCellV7.propTypes = {
+process.env.NODE_ENV !== "production" ? GridCell.propTypes = {
   // ----------------------------- Warning --------------------------------
   // | These PropTypes are generated from the TypeScript type definitions |
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
@@ -629,8 +321,9 @@ process.env.NODE_ENV !== "production" ? GridCellV7.propTypes = {
     isValidating: PropTypes.bool,
     value: PropTypes.any
   }),
+  gridHasScrollX: PropTypes.bool.isRequired,
   height: PropTypes.oneOfType([PropTypes.oneOf(['auto']), PropTypes.number]).isRequired,
-  isNotVisible: PropTypes.bool,
+  isNotVisible: PropTypes.bool.isRequired,
   onClick: PropTypes.func,
   onDoubleClick: PropTypes.func,
   onDragEnter: PropTypes.func,
@@ -638,9 +331,12 @@ process.env.NODE_ENV !== "production" ? GridCellV7.propTypes = {
   onKeyDown: PropTypes.func,
   onMouseDown: PropTypes.func,
   onMouseUp: PropTypes.func,
+  pinnedOffset: PropTypes.number.isRequired,
+  pinnedPosition: PropTypes.oneOf([0, 1, 2]).isRequired,
   rowId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]).isRequired,
-  showRightBorder: PropTypes.bool,
+  sectionIndex: PropTypes.number.isRequired,
+  sectionLength: PropTypes.number.isRequired,
   width: PropTypes.number.isRequired
 } : void 0;
-const MemoizedGridCellV7 = fastMemo(GridCellV7);
-export { MemoizedGridCellV7 as GridCellV7 };
+const MemoizedGridCell = fastMemo(GridCell);
+export { MemoizedGridCell as GridCell };

package/modern/components/columnHeaders/GridBaseColumnHeaders.js

@@ -13,7 +13,7 @@ const useUtilityClasses = ownerState => {
     classes
   } = ownerState;
   const slots = {
-    root: ['columnHeaders', 'withBorderColor']
+    root: ['columnHeaders']
   };
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
@@ -22,12 +22,7 @@ const GridColumnHeadersRoot = styled('div', {
   slot: 'ColumnHeaders',
   overridesResolver: (props, styles) => styles.columnHeaders
 })({
-  position: 'relative',
-  overflow: 'hidden',
   display: 'flex',
-  alignItems: 'center',
-  boxSizing: 'border-box',
-  borderBottom: '1px solid',
   borderTopLeftRadius: 'var(--unstable_DataGrid-radius)',
   borderTopRightRadius: 'var(--unstable_DataGrid-radius)'
 });

package/modern/components/columnHeaders/GridColumnHeaderItem.js

@@ -2,6 +2,7 @@ import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { unstable_composeClasses as composeClasses, unstable_useId as useId } from '@mui/utils';
+import { fastMemo } from '../../utils/fastMemo';
 import { useGridPrivateApiContext } from '../../hooks/utils/useGridPrivateApiContext';
 import { GridColumnHeaderSortIcon } from './GridColumnHeaderSortIcon';
 import { ColumnHeaderMenuIcon } from './ColumnHeaderMenuIcon';
@@ -124,14 +125,16 @@ function GridColumnHeaderItem(props) {
     onExited: handleExited
   });
   const sortingOrder = colDef.sortingOrder ?? rootProps.sortingOrder;
+  const showSortIcon = (colDef.sortable || sortDirection != null) && !colDef.hideSortIcons && !rootProps.disableColumnSorting;
   const columnTitleIconButtons = /*#__PURE__*/_jsxs(React.Fragment, {
     children: [!rootProps.disableColumnFilter && /*#__PURE__*/_jsx(rootProps.slots.columnHeaderFilterIconButton, _extends({
       field: colDef.field,
       counter: filterItemsCounter
-    }, rootProps.slotProps?.columnHeaderFilterIconButton)), colDef.sortable && !colDef.hideSortIcons && /*#__PURE__*/_jsx(GridColumnHeaderSortIcon, {
+    }, rootProps.slotProps?.columnHeaderFilterIconButton)), showSortIcon && /*#__PURE__*/_jsx(GridColumnHeaderSortIcon, {
       direction: sortDirection,
       index: sortIndex,
-      sortingOrder: sortingOrder
+      sortingOrder: sortingOrder,
+      disabled: !colDef.sortable
     })]
   });
   React.useLayoutEffect(() => {
@@ -194,4 +197,5 @@ process.env.NODE_ENV !== "production" ? GridColumnHeaderItem.propTypes = {
   sortIndex: PropTypes.number,
   tabIndex: PropTypes.oneOf([-1, 0]).isRequired
 } : void 0;
-export { GridColumnHeaderItem };
+const Memoized = fastMemo(GridColumnHeaderItem);
+export { Memoized as GridColumnHeaderItem };

package/modern/components/columnHeaders/GridColumnHeaderSortIcon.js

@@ -38,7 +38,8 @@ function GridColumnHeaderSortIconRaw(props) {
   const {
     direction,
     index,
-    sortingOrder
+    sortingOrder,
+    disabled
   } = props;
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
@@ -54,7 +55,8 @@ function GridColumnHeaderSortIconRaw(props) {
     tabIndex: -1,
     "aria-label": apiRef.current.getLocaleText('columnHeaderSortIconLabel'),
     title: apiRef.current.getLocaleText('columnHeaderSortIconLabel'),
-    size: "small"
+    size: "small",
+    disabled: disabled
   }, rootProps.slotProps?.baseIconButton, {
     children: iconElement
   }));
@@ -73,6 +75,7 @@ process.env.NODE_ENV !== "production" ? GridColumnHeaderSortIconRaw.propTypes =
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
   direction: PropTypes.oneOf(['asc', 'desc']),
+  disabled: PropTypes.bool,
   index: PropTypes.number,
   sortingOrder: PropTypes.arrayOf(PropTypes.oneOf(['asc', 'desc'])).isRequired
 } : void 0;

package/modern/components/columnHeaders/GridColumnHeadersInner.js

@@ -47,7 +47,7 @@ export const GridColumnHeadersInner = /*#__PURE__*/React.forwardRef(function Gri
   const rootProps = useGridRootProps();
   const ownerState = _extends({}, rootProps, {
     isDragging,
-    hasScrollX: apiRef.current.getRootDimensions()?.hasScrollX ?? false
+    hasScrollX: apiRef.current.getRootDimensions().hasScrollX
   });
   const classes = useUtilityClasses(ownerState);
   return /*#__PURE__*/_jsx(GridColumnHeadersInnerRoot, _extends({