Revert changes made in mui#14877

arminmeh · Oct 9, 2024 · d552ec5 · d552ec5
1 parent b4b1794
commit d552ec5
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/packages/x-data-grid/src/components/virtualization/GridVirtualScrollbar.tsx b/packages/x-data-grid/src/components/virtualization/GridVirtualScrollbar.tsx
@@ -70,8 +70,8 @@ const GridVirtualScrollbar = React.forwardRef<HTMLDivElement, GridVirtualScrollb
   function GridVirtualScrollbar(props, ref) {
     const apiRef = useGridPrivateApiContext();
     const rootProps = useGridRootProps();
-    const lastPositionScroller = React.useRef(0);
-    const lastPositionScrollbar = React.useRef(0);
+    const isLocked = React.useRef(false);
+    const lastPosition = React.useRef(0);
     const scrollbarRef = React.useRef<HTMLDivElement>(null);
     const contentRef = React.useRef<HTMLDivElement>(null);
     const classes = useUtilityClasses(rootProps, props.position);
@@ -96,28 +96,34 @@ const GridVirtualScrollbar = React.forwardRef<HTMLDivElement, GridVirtualScrollb
       const scroller = apiRef.current.virtualScrollerRef.current!;
       const scrollbar = scrollbarRef.current!;
 
-      if (scroller[propertyScroll] === lastPositionScroller.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;
 
-      lastPositionScrollbar.current = scrollbar[propertyScroll];
+      lastPosition.current = scrollbar[propertyScroll];
     });
 
     const onScrollbarScroll = useEventCallback(() => {
       const scroller = apiRef.current.virtualScrollerRef.current!;
       const scrollbar = scrollbarRef.current!;
 
-      if (scrollbar[propertyScroll] === lastPositionScrollbar.current) {
+      if (isLocked.current) {
+        isLocked.current = false;
         return;
       }
+      isLocked.current = true;
 
       const value = scrollbar[propertyScroll] / scrollbarInnerSize;
       scroller[propertyScroll] = value * contentSize;
-
-      lastPositionScroller.current = scroller[propertyScroll];
     });
 
     useOnMount(() => {