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

package/modern/components/toolbar/GridToolbarDensitySelector.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["onClick"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { unstable_useId as useId, unstable_useForkRef as useForkRef } from '@mui/utils';
 import MenuList from '@mui/material/MenuList';
 import MenuItem from '@mui/material/MenuItem';
@@ -15,11 +14,12 @@ import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { gridClasses } from '../../constants/gridClasses';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export const GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function GridToolbarDensitySelector(props, ref) {
+const GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function GridToolbarDensitySelector(props, ref) {
   const {
-      onClick
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    slotProps = {}
+  } = props;
+  const buttonProps = slotProps.button || {};
+  const tooltipProps = slotProps.tooltip || {};
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
   const densityValue = useGridSelector(apiRef, gridDensityValueSelector);
@@ -53,7 +53,7 @@ export const GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function
   }, [densityValue, rootProps]);
   const handleDensitySelectorOpen = event => {
     setOpen(prevOpen => !prevOpen);
-    onClick?.(event);
+    buttonProps.onClick?.(event);
   };
   const handleDensitySelectorClose = () => {
     setOpen(false);
@@ -83,19 +83,24 @@ export const GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function
     }), option.label]
   }, index));
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
-      ref: handleRef,
-      size: "small",
-      startIcon: startIcon,
-      "aria-label": apiRef.current.getLocaleText('toolbarDensityLabel'),
-      "aria-haspopup": "menu",
-      "aria-expanded": open,
-      "aria-controls": open ? densityMenuId : undefined,
-      id: densityButtonId
-    }, other, {
-      onClick: handleDensitySelectorOpen
-    }, rootProps.slotProps?.baseButton, {
-      children: apiRef.current.getLocaleText('toolbarDensity')
+    children: [/*#__PURE__*/_jsx(rootProps.slots.baseTooltip, _extends({
+      title: apiRef.current.getLocaleText('toolbarDensityLabel'),
+      enterDelay: 1000
+    }, tooltipProps, rootProps.slotProps?.baseTooltip, {
+      children: /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
+        ref: handleRef,
+        size: "small",
+        startIcon: startIcon,
+        "aria-label": apiRef.current.getLocaleText('toolbarDensityLabel'),
+        "aria-haspopup": "menu",
+        "aria-expanded": open,
+        "aria-controls": open ? densityMenuId : undefined,
+        id: densityButtonId
+      }, buttonProps, {
+        onClick: handleDensitySelectorOpen
+      }, rootProps.slotProps?.baseButton, {
+        children: apiRef.current.getLocaleText('toolbarDensity')
+      }))
     })), /*#__PURE__*/_jsx(GridMenu, {
       open: open,
       target: buttonRef.current,
@@ -111,4 +116,16 @@ export const GridToolbarDensitySelector = /*#__PURE__*/React.forwardRef(function
       })
     })]
   });
-});
+});
+process.env.NODE_ENV !== "production" ? GridToolbarDensitySelector.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The props used for each slot inside.
+   * @default {}
+   */
+  slotProps: PropTypes.object
+} : void 0;
+export { GridToolbarDensitySelector };

package/modern/components/toolbar/GridToolbarExport.js

@@ -70,6 +70,11 @@ process.env.NODE_ENV !== "production" ? GridToolbarExport.propTypes = {
   // | To update them edit the TypeScript types and run "yarn proptypes"  |
   // ----------------------------------------------------------------------
   csvOptions: PropTypes.object,
-  printOptions: PropTypes.object
+  printOptions: PropTypes.object,
+  /**
+   * The props used for each slot inside.
+   * @default {}
+   */
+  slotProps: PropTypes.object
 } : void 0;
 export { GridToolbarExport };

package/modern/components/toolbar/GridToolbarExportContainer.js

@@ -1,7 +1,6 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["children", "onClick"];
 import * as React from 'react';
+import PropTypes from 'prop-types';
 import { unstable_useId as useId, unstable_useForkRef as useForkRef } from '@mui/utils';
 import MenuList from '@mui/material/MenuList';
 import { isHideMenuKey, isTabKey } from '../../utils/keyboardUtils';
@@ -11,12 +10,13 @@ import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
 import { gridClasses } from '../../constants/gridClasses';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-export const GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function GridToolbarExportContainer(props, ref) {
+const GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function GridToolbarExportContainer(props, ref) {
   const {
-      children,
-      onClick
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
+    children,
+    slotProps = {}
+  } = props;
+  const buttonProps = slotProps.button || {};
+  const tooltipProps = slotProps.tooltip || {};
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
   const exportButtonId = useId();
@@ -26,7 +26,7 @@ export const GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function
   const handleRef = useForkRef(ref, buttonRef);
   const handleMenuOpen = event => {
     setOpen(prevOpen => !prevOpen);
-    onClick?.(event);
+    buttonProps.onClick?.(event);
   };
   const handleMenuClose = () => setOpen(false);
   const handleListKeyDown = event => {
@@ -41,19 +41,24 @@ export const GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function
     return null;
   }
   return /*#__PURE__*/_jsxs(React.Fragment, {
-    children: [/*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
-      ref: handleRef,
-      size: "small",
-      startIcon: /*#__PURE__*/_jsx(rootProps.slots.exportIcon, {}),
-      "aria-expanded": open,
-      "aria-label": apiRef.current.getLocaleText('toolbarExportLabel'),
-      "aria-haspopup": "menu",
-      "aria-controls": open ? exportMenuId : undefined,
-      id: exportButtonId
-    }, other, {
-      onClick: handleMenuOpen
-    }, rootProps.slotProps?.baseButton, {
-      children: apiRef.current.getLocaleText('toolbarExport')
+    children: [/*#__PURE__*/_jsx(rootProps.slots.baseTooltip, _extends({
+      title: apiRef.current.getLocaleText('toolbarExportLabel'),
+      enterDelay: 1000
+    }, tooltipProps, rootProps.slotProps?.baseTooltip, {
+      children: /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
+        ref: handleRef,
+        size: "small",
+        startIcon: /*#__PURE__*/_jsx(rootProps.slots.exportIcon, {}),
+        "aria-expanded": open,
+        "aria-label": apiRef.current.getLocaleText('toolbarExportLabel'),
+        "aria-haspopup": "menu",
+        "aria-controls": open ? exportMenuId : undefined,
+        id: exportButtonId
+      }, buttonProps, {
+        onClick: handleMenuOpen
+      }, rootProps.slotProps?.baseButton, {
+        children: apiRef.current.getLocaleText('toolbarExport')
+      }))
     })), /*#__PURE__*/_jsx(GridMenu, {
       open: open,
       target: buttonRef.current,
@@ -76,4 +81,16 @@ export const GridToolbarExportContainer = /*#__PURE__*/React.forwardRef(function
       })
     })]
   });
-});
+});
+process.env.NODE_ENV !== "production" ? GridToolbarExportContainer.propTypes = {
+  // ----------------------------- Warning --------------------------------
+  // | These PropTypes are generated from the TypeScript type definitions |
+  // | To update them edit the TypeScript types and run "yarn proptypes"  |
+  // ----------------------------------------------------------------------
+  /**
+   * The props used for each slot inside.
+   * @default {}
+   */
+  slotProps: PropTypes.object
+} : void 0;
+export { GridToolbarExportContainer };

package/modern/components/toolbar/GridToolbarFilterButton.js

@@ -1,6 +1,4 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
-import _objectWithoutPropertiesLoose from "@babel/runtime/helpers/esm/objectWithoutPropertiesLoose";
-const _excluded = ["componentsProps"];
 import * as React from 'react';
 import PropTypes from 'prop-types';
 import { styled } from '@mui/material/styles';
@@ -37,10 +35,10 @@ const GridToolbarFilterListRoot = styled('ul', {
 }));
 const GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolbarFilterButton(props, ref) {
   const {
-      componentsProps = {}
-    } = props,
-    other = _objectWithoutPropertiesLoose(props, _excluded);
-  const buttonProps = componentsProps.button || {};
+    slotProps = {}
+  } = props;
+  const buttonProps = slotProps.button || {};
+  const tooltipProps = slotProps.tooltip || {};
   const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
   const activeFilters = useGridSelector(apiRef, gridFilterActiveItemsSelector);
@@ -98,7 +96,7 @@ const GridToolbarFilterButton = /*#__PURE__*/React.forwardRef(function GridToolb
   return /*#__PURE__*/_jsx(rootProps.slots.baseTooltip, _extends({
     title: tooltipContentNode,
     enterDelay: 1000
-  }, other, rootProps.slotProps?.baseTooltip, {
+  }, tooltipProps, rootProps.slotProps?.baseTooltip, {
     children: /*#__PURE__*/_jsx(rootProps.slots.baseButton, _extends({
       ref: ref,
       id: filterButtonId,
@@ -128,8 +126,6 @@ process.env.NODE_ENV !== "production" ? GridToolbarFilterButton.propTypes = {
    * The props used for each slot inside.
    * @default {}
    */
-  componentsProps: PropTypes.shape({
-    button: PropTypes.object
-  })
+  slotProps: PropTypes.object
 } : void 0;
 export { GridToolbarFilterButton };

package/modern/components/virtualization/GridBottomContainer.js

@@ -0,0 +1,25 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import clsx from 'clsx';
+import { styled } from '@mui/system';
+import { unstable_composeClasses as composeClasses } from '@mui/utils';
+import { gridClasses, getDataGridUtilityClass } from '../../constants/gridClasses';
+import { jsx as _jsx } from "react/jsx-runtime";
+const useUtilityClasses = () => {
+  const slots = {
+    root: ['bottomContainer']
+  };
+  return composeClasses(slots, getDataGridUtilityClass, {});
+};
+const Element = styled('div')({
+  position: 'sticky',
+  zIndex: 2,
+  bottom: 'calc(var(--DataGrid-hasScrollX) * var(--DataGrid-scrollbarSize))'
+});
+export function GridBottomContainer(props) {
+  const classes = useUtilityClasses();
+  return /*#__PURE__*/_jsx(Element, _extends({}, props, {
+    className: clsx(classes.root, props.className, gridClasses['container--bottom']),
+    role: "presentation"
+  }));
+}

package/modern/components/virtualization/GridMainContainer.js

@@ -0,0 +1,20 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import { styled } from '@mui/system';
+import { useGridAriaAttributes } from '../../hooks/utils/useGridAriaAttributes';
+import { jsx as _jsx } from "react/jsx-runtime";
+const Element = styled('div')({
+  flexGrow: 1,
+  position: 'relative',
+  overflow: 'hidden'
+});
+export const GridMainContainer = /*#__PURE__*/React.forwardRef((props, ref) => {
+  const ariaAttributes = useGridAriaAttributes();
+  return /*#__PURE__*/_jsx(Element, _extends({
+    ref: ref,
+    className: props.className,
+    tabIndex: -1
+  }, ariaAttributes, {
+    children: props.children
+  }));
+});

package/modern/components/virtualization/GridTopContainer.js

@@ -0,0 +1,35 @@
+import _extends from "@babel/runtime/helpers/esm/extends";
+import * as React from 'react';
+import clsx from 'clsx';
+import { styled } from '@mui/system';
+import { unstable_composeClasses as composeClasses } from '@mui/utils';
+import { gridClasses, getDataGridUtilityClass } from '../../constants/gridClasses';
+import { jsx as _jsx } from "react/jsx-runtime";
+const useUtilityClasses = () => {
+  const slots = {
+    root: ['topContainer']
+  };
+  return composeClasses(slots, getDataGridUtilityClass, {});
+};
+const Element = styled('div')({
+  position: 'sticky',
+  zIndex: 2,
+  top: 0,
+  '&::after': {
+    content: '" "',
+    position: 'absolute',
+    zIndex: 5,
+    bottom: 0,
+    left: 0,
+    height: 1,
+    width: 'var(--DataGrid-rowWidth)',
+    backgroundColor: 'var(--DataGrid-rowBorderColor)'
+  }
+});
+export function GridTopContainer(props) {
+  const classes = useUtilityClasses();
+  return /*#__PURE__*/_jsx(Element, _extends({}, props, {
+    className: clsx(classes.root, props.className, gridClasses['container--top']),
+    role: "presentation"
+  }));
+}

package/modern/components/virtualization/GridVirtualScrollbar.js

@@ -0,0 +1,131 @@
+import * as React from 'react';
+import { styled } from '@mui/system';
+import { unstable_composeClasses as composeClasses, unstable_useForkRef as useForkRef, unstable_useEventCallback as useEventCallback } from '@mui/utils';
+import { useOnMount } from '../../hooks/utils/useOnMount';
+import { useGridPrivateApiContext } from '../../hooks/utils/useGridPrivateApiContext';
+import { gridDimensionsSelector, useGridSelector } from '../../hooks';
+import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
+import { getDataGridUtilityClass } from '../../constants/gridClasses';
+import { jsx as _jsx } from "react/jsx-runtime";
+const useUtilityClasses = (ownerState, position) => {
+  const {
+    classes
+  } = ownerState;
+  const slots = {
+    root: ['scrollbar', `scrollbar--${position}`],
+    content: ['scrollbarContent']
+  };
+  return composeClasses(slots, getDataGridUtilityClass, classes);
+};
+const Scrollbar = styled('div')({
+  position: 'absolute',
+  display: 'inline-block',
+  zIndex: 6,
+  '& > div': {
+    display: 'inline-block'
+  },
+  // In macOS Safari and Gnome Web, scrollbars are overlaid and don't affect the layout. So we consider
+  // their size to be 0px throughout all the calculations, but the floating scrollbar container does need
+  // to appear and have a real size. We set it to 14px because it seems like an acceptable value and we
+  // don't have a method to find the required size for scrollbars on those platforms.
+  '--size': 'calc(max(var(--DataGrid-scrollbarSize), 14px))'
+});
+const ScrollbarVertical = styled(Scrollbar)({
+  width: 'var(--size)',
+  height: 'calc(var(--DataGrid-hasScrollY) * (100% - var(--DataGrid-topContainerHeight) - var(--DataGrid-bottomContainerHeight) - var(--DataGrid-hasScrollX) * var(--DataGrid-scrollbarSize)))',
+  overflowY: 'auto',
+  overflowX: 'hidden',
+  '& > div': {
+    width: 'var(--size)'
+  },
+  top: 'var(--DataGrid-topContainerHeight)',
+  right: '0px'
+});
+const ScrollbarHorizontal = styled(Scrollbar)({
+  width: '100%',
+  height: 'var(--size)',
+  overflowY: 'hidden',
+  overflowX: 'auto',
+  '& > div': {
+    height: 'var(--size)'
+  },
+  bottom: '0px'
+});
+const Content = styled('div')({
+  display: 'inline-block'
+});
+const GridVirtualScrollbar = /*#__PURE__*/React.forwardRef(function GridVirtualScrollbar(props, ref) {
+  const apiRef = useGridPrivateApiContext();
+  const rootProps = useGridRootProps();
+  const isLocked = React.useRef(false);
+  const lastPosition = React.useRef(0);
+  const scrollbarRef = React.useRef(null);
+  const contentRef = React.useRef(null);
+  const classes = useUtilityClasses(rootProps, props.position);
+  const dimensions = useGridSelector(apiRef, gridDimensionsSelector);
+  const propertyDimension = props.position === 'vertical' ? 'height' : 'width';
+  const propertyScroll = props.position === 'vertical' ? 'scrollTop' : 'scrollLeft';
+  const hasScroll = props.position === 'vertical' ? dimensions.hasScrollX : dimensions.hasScrollY;
+  const contentSize = dimensions.minimumSize[propertyDimension] + (hasScroll ? dimensions.scrollbarSize : 0);
+  const scrollbarSize = props.position === 'vertical' ? dimensions.viewportInnerSize.height : dimensions.viewportOuterSize.width;
+  const scrollbarInnerSize = scrollbarSize * (contentSize / dimensions.viewportOuterSize[propertyDimension]);
+  const onScrollerScroll = useEventCallback(() => {
+    const scroller = apiRef.current.virtualScrollerRef.current;
+    const scrollbar = scrollbarRef.current;
+    if (scroller[propertyScroll] === lastPosition.current) {
+      return;
+    }
+    if (isLocked.current) {
+      isLocked.current = false;
+      return;
+    }
+    isLocked.current = true;
+    const value = scroller[propertyScroll] / contentSize;
+    scrollbar[propertyScroll] = value * scrollbarInnerSize;
+    lastPosition.current = scroller[propertyScroll];
+  });
+  const onScrollbarScroll = useEventCallback(() => {
+    const scroller = apiRef.current.virtualScrollerRef.current;
+    const scrollbar = scrollbarRef.current;
+    if (isLocked.current) {
+      isLocked.current = false;
+      return;
+    }
+    isLocked.current = true;
+    const value = scrollbar[propertyScroll] / scrollbarInnerSize;
+    scroller[propertyScroll] = value * contentSize;
+  });
+  useOnMount(() => {
+    const scroller = apiRef.current.virtualScrollerRef.current;
+    const scrollbar = scrollbarRef.current;
+    scroller.addEventListener('scroll', onScrollerScroll, {
+      capture: true
+    });
+    scrollbar.addEventListener('scroll', onScrollbarScroll, {
+      capture: true
+    });
+    return () => {
+      scroller.removeEventListener('scroll', onScrollerScroll, {
+        capture: true
+      });
+      scrollbar.removeEventListener('scroll', onScrollbarScroll, {
+        capture: true
+      });
+    };
+  });
+  React.useEffect(() => {
+    const content = contentRef.current;
+    content.style.setProperty(propertyDimension, `${scrollbarInnerSize}px`);
+  }, [scrollbarInnerSize, propertyDimension]);
+  const Container = props.position === 'vertical' ? ScrollbarVertical : ScrollbarHorizontal;
+  return /*#__PURE__*/_jsx(Container, {
+    ref: useForkRef(ref, scrollbarRef),
+    className: classes.root,
+    tabIndex: -1,
+    children: /*#__PURE__*/_jsx(Content, {
+      ref: contentRef,
+      className: classes.content
+    })
+  });
+});
+export { GridVirtualScrollbar };

package/modern/components/virtualization/GridVirtualScroller.js

@@ -1,42 +1,95 @@
 import _extends from "@babel/runtime/helpers/esm/extends";
 import * as React from 'react';
-import clsx from 'clsx';
 import { styled } from '@mui/system';
 import { unstable_composeClasses as composeClasses } from '@mui/utils';
 import { useGridRootProps } from '../../hooks/utils/useGridRootProps';
+import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
+import { useGridSelector } from '../../hooks/utils/useGridSelector';
 import { getDataGridUtilityClass } from '../../constants/gridClasses';
+import { gridDimensionsSelector } from '../../hooks/features/dimensions';
+import { useGridVirtualScroller } from '../../hooks/features/virtualization/useGridVirtualScroller';
+import { GridOverlays } from '../base/GridOverlays';
+import { GridHeaders } from '../GridHeaders';
+import { GridMainContainer as Container } from './GridMainContainer';
+import { GridTopContainer as TopContainer } from './GridTopContainer';
+import { GridBottomContainer as BottomContainer } from './GridBottomContainer';
+import { GridVirtualScrollerContent as Content } from './GridVirtualScrollerContent';
+import { GridVirtualScrollerFiller as SpaceFiller } from './GridVirtualScrollerFiller';
+import { GridVirtualScrollerRenderZone as RenderZone } from './GridVirtualScrollerRenderZone';
+import { GridVirtualScrollbar as Scrollbar } from './GridVirtualScrollbar';
 import { jsx as _jsx } from "react/jsx-runtime";
-const useUtilityClasses = ownerState => {
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const useUtilityClasses = (ownerState, dimensions) => {
   const {
     classes
   } = ownerState;
   const slots = {
-    root: ['virtualScroller']
+    root: ['main', dimensions.rightPinnedWidth > 0 && 'main--hasPinnedRight'],
+    scroller: ['virtualScroller']
   };
   return composeClasses(slots, getDataGridUtilityClass, classes);
 };
-const VirtualScrollerRoot = styled('div', {
+const Scroller = styled('div', {
   name: 'MuiDataGrid',
   slot: 'VirtualScroller',
   overridesResolver: (props, styles) => styles.virtualScroller
 })({
-  overflow: 'auto',
-  height: '100%',
-  // See https://github.com/mui/mui-x/issues/4360
   position: 'relative',
+  height: '100%',
+  overflow: 'scroll',
+  scrollbarWidth: 'none' /* Firefox */,
+  '&::-webkit-scrollbar': {
+    display: 'none' /* Safari and Chrome */
+  },
   '@media print': {
     overflow: 'hidden'
   },
-  zIndex: 0 // See https://github.com/mui/mui-x/issues/10547
+  // See https://github.com/mui/mui-x/issues/10547
+  zIndex: 0
 });
-const GridVirtualScroller = /*#__PURE__*/React.forwardRef(function GridVirtualScroller(props, ref) {
+function GridVirtualScroller(props) {
+  const apiRef = useGridApiContext();
   const rootProps = useGridRootProps();
-  const classes = useUtilityClasses(rootProps);
-  return /*#__PURE__*/_jsx(VirtualScrollerRoot, _extends({
-    ref: ref
-  }, props, {
-    className: clsx(classes.root, props.className),
-    ownerState: rootProps
+  const dimensions = useGridSelector(apiRef, gridDimensionsSelector);
+  const classes = useUtilityClasses(rootProps, dimensions);
+  const virtualScroller = useGridVirtualScroller();
+  const {
+    getContainerProps,
+    getScrollerProps,
+    getContentProps,
+    getRenderZoneProps,
+    getScrollbarVerticalProps,
+    getScrollbarHorizontalProps
+  } = virtualScroller;
+  return /*#__PURE__*/_jsxs(Container, _extends({
+    className: classes.root
+  }, getContainerProps(), {
+    children: [/*#__PURE__*/_jsxs(Scroller, _extends({
+      className: classes.scroller
+    }, getScrollerProps(), {
+      ownerState: rootProps,
+      children: [/*#__PURE__*/_jsxs(TopContainer, {
+        children: [/*#__PURE__*/_jsx(GridHeaders, {}), /*#__PURE__*/_jsx(rootProps.slots.pinnedRows, {
+          position: "top",
+          virtualScroller: virtualScroller
+        })]
+      }), /*#__PURE__*/_jsx(GridOverlays, {}), /*#__PURE__*/_jsx(Content, _extends({}, getContentProps(), {
+        children: /*#__PURE__*/_jsxs(RenderZone, _extends({}, getRenderZoneProps(), {
+          children: [virtualScroller.getRows(), /*#__PURE__*/_jsx(rootProps.slots.detailPanels, {
+            virtualScroller: virtualScroller
+          })]
+        }))
+      })), /*#__PURE__*/_jsx(SpaceFiller, {}), /*#__PURE__*/_jsx(BottomContainer, {
+        children: /*#__PURE__*/_jsx(rootProps.slots.pinnedRows, {
+          position: "bottom",
+          virtualScroller: virtualScroller
+        })
+      })]
+    })), /*#__PURE__*/_jsx(Scrollbar, _extends({
+      position: "vertical"
+    }, getScrollbarVerticalProps())), /*#__PURE__*/_jsx(Scrollbar, _extends({
+      position: "horizontal"
+    }, getScrollbarHorizontalProps())), props.children]
   }));
-});
+}
 export { GridVirtualScroller };

package/modern/components/virtualization/GridVirtualScrollerFiller.js

@@ -0,0 +1,71 @@
+import * as React from 'react';
+import { styled } from '@mui/system';
+import { fastMemo } from '../../utils/fastMemo';
+import { useGridSelector } from '../../hooks/utils/useGridSelector';
+import { useGridApiContext } from '../../hooks/utils/useGridApiContext';
+import { gridDimensionsSelector } from '../../hooks/features/dimensions';
+import { gridClasses } from '../../constants';
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+const Filler = styled('div')({
+  display: 'flex',
+  flexDirection: 'row',
+  width: 'var(--DataGrid-rowWidth)',
+  boxSizing: 'border-box'
+});
+const Pinned = styled('div')({
+  position: 'sticky',
+  height: '100%',
+  boxSizing: 'border-box',
+  borderTop: '1px solid var(--DataGrid-rowBorderColor)',
+  backgroundColor: 'var(--DataGrid-pinnedBackground)'
+});
+const PinnedLeft = styled(Pinned)({
+  left: 0,
+  borderRight: '1px solid var(--DataGrid-rowBorderColor)'
+});
+const PinnedRight = styled(Pinned)({
+  right: 0,
+  borderLeft: '1px solid var(--DataGrid-rowBorderColor)'
+});
+const Main = styled('div')({
+  flexGrow: 1,
+  borderTop: '1px solid var(--DataGrid-rowBorderColor)'
+});
+function GridVirtualScrollerFiller() {
+  const apiRef = useGridApiContext();
+  const {
+    viewportOuterSize,
+    minimumSize,
+    hasScrollX,
+    scrollbarSize,
+    leftPinnedWidth,
+    rightPinnedWidth
+  } = useGridSelector(apiRef, gridDimensionsSelector);
+  const scrollbarHeight = hasScrollX ? scrollbarSize : 0;
+  const expandedHeight = viewportOuterSize.height - minimumSize.height - scrollbarHeight;
+  const height = Math.max(scrollbarHeight, expandedHeight);
+  if (height === 0) {
+    return null;
+  }
+  return /*#__PURE__*/_jsxs(Filler, {
+    className: gridClasses.filler,
+    role: "presentation",
+    style: {
+      height
+    },
+    children: [leftPinnedWidth > 0 && /*#__PURE__*/_jsx(PinnedLeft, {
+      className: gridClasses['filler--pinnedLeft'],
+      style: {
+        width: leftPinnedWidth
+      }
+    }), /*#__PURE__*/_jsx(Main, {}), rightPinnedWidth > 0 && /*#__PURE__*/_jsx(PinnedRight, {
+      className: gridClasses['filler--pinnedRight'],
+      style: {
+        width: rightPinnedWidth
+      }
+    })]
+  });
+}
+const Memoized = fastMemo(GridVirtualScrollerFiller);
+export { Memoized as GridVirtualScrollerFiller };

package/modern/components/virtualization/GridVirtualScrollerRenderZone.js

@@ -25,7 +25,8 @@ const VirtualScrollerRenderZoneRoot = styled('div', {
   position: 'absolute',
   display: 'flex',
   // Prevents margin collapsing when using `getRowSpacing`
-  flexDirection: 'column'
+  flexDirection: 'column',
+  transform: 'translate3d(0, var(--DataGrid-offsetTop), 0)'
 });
 const GridVirtualScrollerRenderZone = /*#__PURE__*/React.forwardRef(function GridVirtualScrollerRenderZone(props, ref) {
   const {