[DataGrid] Fix first row flickering with autoHeight enabled

docs/data/data-grid/virtualization/virtualization.md

@@ -14,6 +14,10 @@ Row virtualization is the insertion and removal of rows as the data grid scrolls
 The grid renders some additional rows above and below the visible rows. You can use `rowBufferPx` prop to hint to the Data Grid the area to render, but this value may not be respected in certain situations, for example during high-speed scrolling.
 Row virtualization is limited to 100 rows in the `DataGrid` component.
 
+:::warning
+Row virtualization does not work with the `autoHeight` prop enabled.
+:::
+
 ## Column virtualization
 
 Column virtualization is the insertion and removal of columns as the data grid scrolls horizontally.

packages/x-data-grid/src/hooks/features/virtualization/useGridVirtualization.tsx

@@ -5,7 +5,7 @@ import { DataGridProcessedProps } from '../../../models/props/DataGridProps';
 import { useGridApiMethod } from '../../utils/useGridApiMethod';
 import { GridStateInitializer } from '../../utils/useGridInitializeState';
 
-type RootProps = Pick<DataGridProcessedProps, 'disableVirtualization'>;
+type RootProps = Pick<DataGridProcessedProps, 'disableVirtualization' | 'autoHeight'>;
 
 export type GridVirtualizationState = {
   enabled: boolean;
@@ -22,7 +22,7 @@ export const EMPTY_RENDER_CONTEXT = {
 
 export const virtualizationStateInitializer: GridStateInitializer<RootProps> = (state, props) => {
   const virtualization = {
-    enabled: !props.disableVirtualization,
+    enabled: !props.disableVirtualization && !props.autoHeight,
     enabledForColumns: true,
     renderContext: EMPTY_RENDER_CONTEXT,
   };
@@ -74,7 +74,7 @@ export function useGridVirtualization(
 
   /* eslint-disable react-hooks/exhaustive-deps */
   React.useEffect(() => {
-    setVirtualization(!props.disableVirtualization);
-  }, [props.disableVirtualization]);
+    setVirtualization(!props.disableVirtualization && !props.autoHeight);
+  }, [props.disableVirtualization, props.autoHeight]);
   /* eslint-enable react-hooks/exhaustive-deps */
 }