From 0fb22357311881cdbd9bf5f70a7a60024a088ec4 Mon Sep 17 00:00:00 2001
From: Andrew Cherniavskyi <andrew@mui.com>
Date: Fri, 13 Oct 2023 16:20:49 +0200
Subject: [PATCH] remove unnecessary state for tracking scrollbar size

---
 .../src/components/GridColumnHeaders.tsx      | 24 ++++---------------
 1 file changed, 4 insertions(+), 20 deletions(-)

diff --git a/packages/grid/x-data-grid-pro/src/components/GridColumnHeaders.tsx b/packages/grid/x-data-grid-pro/src/components/GridColumnHeaders.tsx
index 74506a02dbfbe..02bc53a875708 100644
--- a/packages/grid/x-data-grid-pro/src/components/GridColumnHeaders.tsx
+++ b/packages/grid/x-data-grid-pro/src/components/GridColumnHeaders.tsx
@@ -1,15 +1,10 @@
 import * as React from 'react';
 import PropTypes from 'prop-types';
-import {
-  refType,
-  unstable_composeClasses as composeClasses,
-  unstable_useEventCallback as useEventCallback,
-} from '@mui/utils';
+import { refType, unstable_composeClasses as composeClasses } from '@mui/utils';
 import { styled, alpha, useTheme } from '@mui/material/styles';
 import {
   getDataGridUtilityClass,
   gridClasses,
-  useGridApiEventHandler,
   GridColumnHeaderSeparatorSides,
 } from '@mui/x-data-grid';
 import {
@@ -144,22 +139,11 @@ const GridColumnHeaders = React.forwardRef<HTMLDivElement, DataGridProColumnHead
     } = props;
     const rootProps = useGridRootProps();
     const apiRef = useGridApiContext();
-    const [scrollbarSize, setScrollbarSize] = React.useState(0);
     const theme = useTheme();
+    const rootDimensions = apiRef.current.getRootDimensions();
 
-    const handleContentSizeChange = useEventCallback(() => {
-      const rootDimensions = apiRef.current.getRootDimensions();
-      if (!rootDimensions) {
-        return;
-      }
-
-      const newScrollbarSize = rootDimensions.hasScrollY ? rootDimensions.scrollBarSize : 0;
-      if (scrollbarSize !== newScrollbarSize) {
-        setScrollbarSize(newScrollbarSize);
-      }
-    });
-
-    useGridApiEventHandler(apiRef, 'virtualScrollerContentSizeChange', handleContentSizeChange);
+    const scrollbarSize =
+      rootDimensions && rootDimensions.hasScrollY ? rootDimensions.scrollBarSize : 0;
 
     const visibleColumnFields = React.useMemo(
       () => visibleColumns.map(({ field }) => field),