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

package/legacy/components/base/GridOverlays.js

@@ -1,15 +1,16 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/system';
-import { unstable_composeClasses as composeClasses, unstable_useEnhancedEffect as useEnhancedEffect } from '@mui/utils';
+import { unstable_composeClasses as composeClasses } from '@mui/utils';
 import clsx from 'clsx';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { gridExpandedRowCountSelector } from '../../hooks/features/filter/gridFilterSelector';
 import { gridRowCountSelector, gridRowsLoadingSelector } from '../../hooks/features/rows/gridRowsSelector';
+import { gridDimensionsSelector } from '../../hooks/features/dimensions';
 import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
+import { useGridVisibleRows } from '../../hooks/utils/useGridVisibleRows';
 import { getMinimalContentHeight } from '../../hooks/features/rows/gridRowsUtils';
 import { getDataGridUtilityClass } from '../../constants/gridClasses';
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -27,7 +28,7 @@ var GridOverlayWrapperRoot = styled('div', {
   return {
     position: 'sticky',
     // To stay in place while scrolling
-    top: 0,
+    top: 'var(--DataGrid-headersTotalHeight)',
     left: 0,
     width: 0,
     // To stay above the content instead of shifting it down
@@ -56,33 +57,17 @@ var useUtilityClasses = function useUtilityClasses(ownerState) {
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
 function GridOverlayWrapper(props) {
-  var _viewportInnerSize$he, _viewportInnerSize$wi;
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
-  var _React$useState = React.useState(function () {
-      var _apiRef$current$getRo, _apiRef$current$getRo2;
-      return (_apiRef$current$getRo = (_apiRef$current$getRo2 = apiRef.current.getRootDimensions()) == null ? void 0 : _apiRef$current$getRo2.viewportInnerSize) != null ? _apiRef$current$getRo : null;
-    }),
-    _React$useState2 = _slicedToArray(_React$useState, 2),
-    viewportInnerSize = _React$useState2[0],
-    setViewportInnerSize = _React$useState2[1];
-  var handleViewportSizeChange = React.useCallback(function () {
-    var _apiRef$current$getRo3, _apiRef$current$getRo4;
-    setViewportInnerSize((_apiRef$current$getRo3 = (_apiRef$current$getRo4 = apiRef.current.getRootDimensions()) == null ? void 0 : _apiRef$current$getRo4.viewportInnerSize) != null ? _apiRef$current$getRo3 : null);
-  }, [apiRef]);
-  useEnhancedEffect(function () {
-    return apiRef.current.subscribeEvent('viewportInnerSizeChange', handleViewportSizeChange);
-  }, [apiRef, handleViewportSizeChange]);
-  var height = (_viewportInnerSize$he = viewportInnerSize == null ? void 0 : viewportInnerSize.height) != null ? _viewportInnerSize$he : 0;
-  if (rootProps.autoHeight && height === 0) {
-    height = getMinimalContentHeight(apiRef, rootProps.rowHeight); // Give room to show the overlay when there no rows.
+  var currentPage = useGridVisibleRows(apiRef, rootProps);
+  var dimensions = useGridSelector(apiRef, gridDimensionsSelector);
+  var height = dimensions.viewportOuterSize.height - dimensions.headersTotalHeight - (dimensions.hasScrollX ? dimensions.scrollbarSize : 0);
+  if (rootProps.autoHeight && currentPage.rows.length === 0 || height === 0) {
+    height = getMinimalContentHeight(apiRef);
   }
   var classes = useUtilityClasses(_extends({}, props, {
     classes: rootProps.classes
   }));
-  if (!viewportInnerSize) {
-    return null;
-  }
   return /*#__PURE__*/_jsx(GridOverlayWrapperRoot, {
     className: clsx(classes.root),
     overlayType: props.overlayType,
@@ -90,7 +75,7 @@ function GridOverlayWrapper(props) {
       className: clsx(classes.inner),
       style: {
         height: height,
-        width: (_viewportInnerSize$wi = viewportInnerSize == null ? void 0 : viewportInnerSize.width) != null ? _viewportInnerSize$wi : 0
+        width: dimensions.viewportOuterSize.width
       }
     }, props))
   });

package/legacy/components/cell/GridCell.js

@@ -1,9 +1,7 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _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"];
+var _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 var PinnedPosition = /*#__PURE__*/function (PinnedPosition) {
+  PinnedPosition[PinnedPosition["NONE"] = 0] = "NONE";
+  PinnedPosition[PinnedPosition["LEFT"] = 1] = "LEFT";
+  PinnedPosition[PinnedPosition["RIGHT"] = 2] = "RIGHT";
+  return PinnedPosition;
+}({});
 var EMPTY_CELL_PARAMS = {
   id: -1,
   field: '__unset__',
@@ -44,349 +48,25 @@ var EMPTY_CELL_PARAMS = {
 };
 var useUtilityClasses = function useUtilityClasses(ownerState) {
   var align = ownerState.align,
+    showLeftBorder = ownerState.showLeftBorder,
     showRightBorder = ownerState.showRightBorder,
+    pinnedPosition = ownerState.pinnedPosition,
     isEditable = ownerState.isEditable,
     isSelected = ownerState.isSelected,
     isSelectionMode = ownerState.isSelectionMode,
     classes = ownerState.classes;
   var slots = {
-    root: ['cell', "cell--text".concat(capitalize(align)), isEditable && 'cell--editable', isSelected && 'selected', showRightBorder && 'cell--withRightBorder', isSelectionMode && !isEditable && 'cell--selectionMode', 'withBorderColor'],
+    root: ['cell', "cell--text".concat(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);
 };
 var 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.
-var GridCellWrapper = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var column = props.column,
-    rowId = props.rowId,
-    editCellState = props.editCellState;
-  var apiRef = useGridApiContext();
-  var rootProps = useGridRootProps();
-  var field = column.field;
-  var cellParamsWithAPI = useGridSelector(apiRef, function () {
-    // 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 {
-      var cellParams = apiRef.current.getCellParams(rowId, field);
-      var result = cellParams;
-      result.api = apiRef.current;
-      return result;
-    } catch (e) {
-      if (e instanceof MissingRowIdError) {
-        return EMPTY_CELL_PARAMS;
-      }
-      throw e;
-    }
-  }, objectShallowCompare);
-  var isSelected = useGridSelector(apiRef, function () {
-    return apiRef.current.unstable_applyPipeProcessors('isCellSelected', false, {
-      id: rowId,
-      field: field
-    });
-  });
-  if (cellParamsWithAPI === EMPTY_CELL_PARAMS) {
-    return null;
-  }
-  var cellMode = cellParamsWithAPI.cellMode,
-    hasFocus = cellParamsWithAPI.hasFocus,
-    isEditable = cellParamsWithAPI.isEditable,
-    value = cellParamsWithAPI.value,
-    formattedValue = cellParamsWithAPI.formattedValue;
-  var managesOwnFocus = column.type === 'actions';
-  var tabIndex = (cellMode === 'view' || !isEditable) && !managesOwnFocus ? cellParamsWithAPI.tabIndex : -1;
-  var rootClasses = rootProps.classes,
-    getCellClassName = rootProps.getCellClassName;
-  var classNames = apiRef.current.unstable_applyPipeProcessors('cellClassName', [], {
-    id: rowId,
-    field: field
-  });
-  if (column.cellClassName) {
-    classNames.push(typeof column.cellClassName === 'function' ? column.cellClassName(cellParamsWithAPI) : column.cellClassName);
-  }
-  if (getCellClassName) {
-    classNames.push(getCellClassName(cellParamsWithAPI));
-  }
-  var children;
-  if (editCellState == null && column.renderCell) {
-    children = column.renderCell(cellParamsWithAPI);
-    classNames.push(gridClasses['cell--withRenderer']);
-    classNames.push(rootClasses == null ? void 0 : rootClasses['cell--withRenderer']);
-  }
-  if (editCellState != null && column.renderEditCell) {
-    var updatedRow = apiRef.current.getRowWithUpdatedValues(rowId, column.field);
 
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    var changeReason = editCellState.changeReason,
-      unstable_updateValueOnRender = editCellState.unstable_updateValueOnRender,
-      editCellStateRest = _objectWithoutProperties(editCellState, _excluded);
-    var params = _extends({}, cellParamsWithAPI, {
-      row: updatedRow
-    }, editCellStateRest);
-    children = column.renderEditCell(params);
-    classNames.push(gridClasses['cell--editing']);
-    classNames.push(rootClasses == null ? void 0 : rootClasses['cell--editing']);
-  }
-  var slots = rootProps.slots;
-  var CellComponent = slots.cell;
-  var cellProps = _extends({}, props, {
-    ref: ref,
-    field: field,
-    formattedValue: formattedValue,
-    hasFocus: hasFocus,
-    isEditable: isEditable,
-    isSelected: isSelected,
-    value: value,
-    cellMode: cellMode,
-    children: children,
-    tabIndex: tabIndex,
-    className: clsx(classNames)
-  });
-  return /*#__PURE__*/React.createElement(CellComponent, cellProps);
-});
 var GridCell = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _rootProps$experiment, _rootProps$experiment2;
-  var align = props.align,
-    childrenProp = props.children,
-    editCellState = props.editCellState,
-    colIndex = props.colIndex,
-    column = props.column,
-    cellMode = props.cellMode,
-    field = props.field,
-    formattedValue = props.formattedValue,
-    hasFocus = props.hasFocus,
-    height = props.height,
-    isEditable = props.isEditable,
-    isSelected = props.isSelected,
-    rowId = props.rowId,
-    tabIndex = props.tabIndex,
-    value = props.value,
-    width = props.width,
-    className = props.className,
-    showRightBorder = props.showRightBorder,
-    extendRowFullWidth = props.extendRowFullWidth,
-    row = props.row,
-    colSpan = props.colSpan,
-    disableDragEvents = props.disableDragEvents,
-    isNotVisible = props.isNotVisible,
-    onClick = props.onClick,
-    onDoubleClick = props.onDoubleClick,
-    onMouseDown = props.onMouseDown,
-    onMouseUp = props.onMouseUp,
-    onMouseOver = props.onMouseOver,
-    onKeyDown = props.onKeyDown,
-    onKeyUp = props.onKeyUp,
-    onDragEnter = props.onDragEnter,
-    onDragOver = props.onDragOver,
-    other = _objectWithoutProperties(props, _excluded2);
-  var valueToRender = formattedValue == null ? value : formattedValue;
-  var cellRef = React.useRef(null);
-  var handleRef = useForkRef(ref, cellRef);
-  var focusElementRef = React.useRef(null);
-  var apiRef = useGridApiContext();
-  var rootProps = useGridRootProps();
-  var ownerState = {
-    align: align,
-    showRightBorder: showRightBorder,
-    isEditable: isEditable,
-    classes: rootProps.classes,
-    isSelected: isSelected
-  };
-  var classes = useUtilityClasses(ownerState);
-  var publishMouseUp = React.useCallback(function (eventName) {
-    return function (event) {
-      var params = apiRef.current.getCellParams(rowId, field || '');
-      apiRef.current.publishEvent(eventName, params, event);
-      if (onMouseUp) {
-        onMouseUp(event);
-      }
-    };
-  }, [apiRef, field, onMouseUp, rowId]);
-  var publishMouseDown = React.useCallback(function (eventName) {
-    return function (event) {
-      var params = apiRef.current.getCellParams(rowId, field || '');
-      apiRef.current.publishEvent(eventName, params, event);
-      if (onMouseDown) {
-        onMouseDown(event);
-      }
-    };
-  }, [apiRef, field, onMouseDown, rowId]);
-  var publish = React.useCallback(function (eventName, propHandler) {
-    return function (event) {
-      // The row might have been deleted during the click
-      if (!apiRef.current.getRow(rowId)) {
-        return;
-      }
-      var params = apiRef.current.getCellParams(rowId, field || '');
-      apiRef.current.publishEvent(eventName, params, event);
-      if (propHandler) {
-        propHandler(event);
-      }
-    };
-  }, [apiRef, field, rowId]);
-  var style = React.useMemo(function () {
-    if (isNotVisible) {
-      return {
-        padding: 0,
-        opacity: 0,
-        width: 0,
-        border: 0
-      };
-    }
-    var 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(function () {
-    if (!hasFocus || cellMode === GridCellModes.Edit) {
-      return;
-    }
-    var doc = ownerDocument(apiRef.current.rootElementRef.current);
-    if (cellRef.current && !cellRef.current.contains(doc.activeElement)) {
-      var focusableElement = cellRef.current.querySelector('[tabindex="0"]');
-      var elementToFocus = focusElementRef.current || focusableElement || cellRef.current;
-      if (doesSupportPreventScroll()) {
-        elementToFocus.focus({
-          preventScroll: true
-        });
-      } else {
-        var scrollPosition = apiRef.current.getScrollPosition();
-        elementToFocus.focus();
-        apiRef.current.scroll(scrollPosition);
-      }
-    }
-  }, [hasFocus, cellMode, apiRef]);
-  var handleFocus = other.onFocus;
-  if (process.env.NODE_ENV === 'test' && (_rootProps$experiment = rootProps.experimentalFeatures) != null && _rootProps$experiment.warnIfFocusStateIsNotSynced) {
-    handleFocus = function handleFocus(event) {
-      var focusedCell = gridFocusCellSelector(apiRef);
-      if ((focusedCell == null ? void 0 : 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=".concat(rowId, " and field=").concat(field, " received focus."), "According to the state, the focus should be at id=".concat(focusedCell == null ? void 0 : focusedCell.id, ", field=").concat(focusedCell == null ? void 0 : 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;
-      }
-    };
-  }
-  var managesOwnFocus = column.type === 'actions';
-  var children = childrenProp;
-  if (children === undefined) {
-    var valueString = valueToRender == null ? void 0 : 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: focusElementRef
-    });
-  }
-  var draggableEventHandlers = disableDragEvents ? null : {
-    onDragEnter: publish('cellDragEnter', onDragEnter),
-    onDragOver: publish('cellDragOver', onDragOver)
-  };
-  var ariaV7 = (_rootProps$experiment2 = rootProps.experimentalFeatures) == null ? void 0 : _rootProps$experiment2.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
-    }))
-  );
-});
-var 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 };
-var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
-  var _getActions, _ref, _rootProps$cellSelect, _rootProps$experiment3, _rootProps$experiment4;
+  var _getActions, _ref, _rootProps$cellSelect, _rootProps$experiment;
   var column = props.column,
     rowId = props.rowId,
     editCellState = props.editCellState,
@@ -396,12 +76,15 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     height = props.height,
     width = props.width,
     className = props.className,
-    showRightBorder = props.showRightBorder,
-    extendRowFullWidth = props.extendRowFullWidth,
-    row = props.row,
+    styleProp = props.style,
+    gridHasScrollX = props.gridHasScrollX,
     colSpan = props.colSpan,
     disableDragEvents = props.disableDragEvents,
     isNotVisible = props.isNotVisible,
+    pinnedOffset = props.pinnedOffset,
+    pinnedPosition = props.pinnedPosition,
+    sectionIndex = props.sectionIndex,
+    sectionLength = props.sectionLength,
     onClick = props.onClick,
     onDoubleClick = props.onDoubleClick,
     onMouseDown = props.onMouseDown,
@@ -411,7 +94,7 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onKeyUp = props.onKeyUp,
     onDragEnter = props.onDragEnter,
     onDragOver = props.onDragOver,
-    other = _objectWithoutProperties(props, _excluded3);
+    other = _objectWithoutProperties(props, _excluded);
   var apiRef = useGridApiContext();
   var rootProps = useGridRootProps();
   var field = column.field;
@@ -439,7 +122,8 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
   });
   var cellMode = cellParamsWithAPI.cellMode,
     hasFocus = cellParamsWithAPI.hasFocus,
-    isEditable = cellParamsWithAPI.isEditable,
+    _cellParamsWithAPI$is = cellParamsWithAPI.isEditable,
+    isEditable = _cellParamsWithAPI$is === void 0 ? false : _cellParamsWithAPI$is,
     value = cellParamsWithAPI.value,
     formattedValue = cellParamsWithAPI.formattedValue;
   var canManageOwnFocus = column.type === 'actions' && ((_getActions = (_ref = column).getActions) == null ? void 0 : _getActions.call(_ref, apiRef.current.getRowParams(rowId)).some(function (action) {
@@ -464,11 +148,16 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var focusElementRef = React.useRef(null);
   // @ts-expect-error To access `cellSelection` flag as it's a `premium` feature
   var isSelectionMode = (_rootProps$cellSelect = rootProps.cellSelection) != null ? _rootProps$cellSelect : false;
+  var isSectionLastCell = sectionIndex === sectionLength - 1;
+  var showLeftBorder = pinnedPosition === PinnedPosition.RIGHT && sectionIndex === 0;
+  var showRightBorder = rootProps.showCellVerticalBorder && (pinnedPosition !== PinnedPosition.LEFT ? !isSectionLastCell : true) || pinnedPosition === PinnedPosition.LEFT && isSectionLastCell;
   var ownerState = {
     align: align,
+    showLeftBorder: showLeftBorder,
     showRightBorder: showRightBorder,
     isEditable: isEditable,
     classes: rootProps.classes,
+    pinnedPosition: pinnedPosition,
     isSelected: isSelected,
     isSelectionMode: isSelectionMode
   };
@@ -513,14 +202,18 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
         border: 0
       };
     }
-    var cellStyle = {
-      minWidth: width,
-      maxWidth: width,
-      minHeight: height,
-      maxHeight: height === 'auto' ? 'none' : height // max-height doesn't support "auto"
-    };
+    var cellStyle = _extends({
+      '--width': "".concat(width, "px"),
+      '--height': typeof height === 'number' ? "".concat(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(function () {
     if (!hasFocus || cellMode === GridCellModes.Edit) {
       return;
@@ -544,7 +237,7 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return null;
   }
   var handleFocus = other.onFocus;
-  if (process.env.NODE_ENV === 'test' && (_rootProps$experiment3 = rootProps.experimentalFeatures) != null && _rootProps$experiment3.warnIfFocusStateIsNotSynced) {
+  if (process.env.NODE_ENV === 'test' && (_rootProps$experiment = rootProps.experimentalFeatures) != null && _rootProps$experiment.warnIfFocusStateIsNotSynced) {
     handleFocus = function handleFocus(event) {
       var focusedCell = gridFocusCellSelector(apiRef);
       if ((focusedCell == null ? void 0 : focusedCell.id) === rowId && focusedCell.field === field) {
@@ -571,7 +264,7 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     // eslint-disable-next-line @typescript-eslint/naming-convention
     var changeReason = editCellState.changeReason,
       unstable_updateValueOnRender = editCellState.unstable_updateValueOnRender,
-      editCellStateRest = _objectWithoutProperties(editCellState, _excluded4);
+      editCellStateRest = _objectWithoutProperties(editCellState, _excluded2);
     var params = _extends({}, cellParamsWithAPI, {
       row: updatedRow
     }, editCellStateRest);
@@ -597,34 +290,29 @@ var GridCellV7 = /*#__PURE__*/React.forwardRef(function (props, ref) {
     onDragEnter: publish('cellDragEnter', onDragEnter),
     onDragOver: publish('cellDragOver', onDragOver)
   };
-  var ariaV7 = (_rootProps$experiment4 = rootProps.experimentalFeatures) == null ? void 0 : _rootProps$experiment4.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"  |
@@ -641,8 +329,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,
@@ -650,9 +339,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;
-var MemoizedGridCellV7 = fastMemo(GridCellV7);
-export { MemoizedGridCellV7 as GridCellV7 };
+var MemoizedGridCell = fastMemo(GridCell);
+export { MemoizedGridCell as GridCell };

package/legacy/components/columnHeaders/GridBaseColumnHeaders.js

@@ -11,7 +11,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 var useUtilityClasses = function useUtilityClasses(ownerState) {
   var classes = ownerState.classes;
   var slots = {
-    root: ['columnHeaders', 'withBorderColor']
+    root: ['columnHeaders']
   };
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
@@ -22,12 +22,7 @@ var GridColumnHeadersRoot = styled('div', {
     return 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)'
 });