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

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({

package/modern/components/containers/GridRoot.js

@@ -5,25 +5,32 @@ import * as React from 'react';
 import PropTypes from 'prop-types';
 import clsx from 'clsx';
 import { unstable_useForkRef as useForkRef, unstable_useEnhancedEffect as useEnhancedEffect, unstable_capitalize as capitalize, unstable_composeClasses as composeClasses } from '@mui/utils';
+import { styled } from '@mui/system';
 import { GridRootStyles } from './GridRootStyles';
 import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { useGridPrivateApiContext } from '../../hooks/utils/useGridPrivateApiContext';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { getDataGridUtilityClass } from '../../constants/gridClasses';
 import { gridDensityValueSelector } from '../../hooks/features/density/densitySelector';
-import { useGridAriaAttributes } from '../../hooks/utils/useGridAriaAttributes';
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 const useUtilityClasses = ownerState => {
   const {
     autoHeight,
     density,
-    classes
+    classes,
+    showCellVerticalBorder
   } = ownerState;
   const slots = {
-    root: ['root', autoHeight && 'autoHeight', `root--density${capitalize(density)}`, 'withBorderColor']
+    root: ['root', autoHeight && 'autoHeight', `root--density${capitalize(density)}`, 'withBorderColor', showCellVerticalBorder && 'withVerticalBorder']
   };
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
+const GridPanelAnchor = styled('div')({
+  position: 'absolute',
+  top: `var(--DataGrid-headersTotalHeight)`,
+  left: 0
+});
 const GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
   const rootProps = useGridRootProps();
   const {
@@ -33,18 +40,12 @@ const GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
     other = _objectWithoutPropertiesLoose(props, _excluded);
   const apiRef = useGridPrivateApiContext();
   const densityValue = useGridSelector(apiRef, gridDensityValueSelector);
-  const rootContainerRef = React.useRef(null);
-  const handleRef = useForkRef(rootContainerRef, ref);
-  const getAriaAttributes = rootProps.experimentalFeatures?.ariaV7 // ariaV7 should never change
-  ? null : useGridAriaAttributes;
-  const ariaAttributes = typeof getAriaAttributes === 'function' ? getAriaAttributes() : null;
+  const rootElementRef = apiRef.current.rootElementRef;
+  const handleRef = useForkRef(rootElementRef, ref);
   const ownerState = _extends({}, rootProps, {
     density: densityValue
   });
   const classes = useUtilityClasses(ownerState);
-  apiRef.current.register('public', {
-    rootElementRef: rootContainerRef
-  });
 
   // Our implementation of <NoSsr />
   const [mountedState, setMountedState] = React.useState(false);
@@ -54,12 +55,15 @@ const GridRoot = /*#__PURE__*/React.forwardRef(function GridRoot(props, ref) {
   if (!mountedState) {
     return null;
   }
-  return /*#__PURE__*/_jsx(GridRootStyles, _extends({
+  return /*#__PURE__*/_jsxs(GridRootStyles, _extends({
     ref: handleRef,
     className: clsx(className, classes.root),
     ownerState: ownerState
-  }, ariaAttributes, other, {
-    children: children
+  }, other, {
+    children: [/*#__PURE__*/_jsx(GridPanelAnchor, {
+      role: "presentation",
+      "data-id": "gridPanelAnchor"
+    }), children]
   }));
 });
 process.env.NODE_ENV !== "production" ? GridRoot.propTypes = {