[DataGrid] Fix null reference error in GridVirtualScrollbar (#15009)

mui · Nov 5, 2024 · 45dc398 · 45dc398
1 parent 19d6bce
commit 45dc398
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/packages/x-data-grid/src/components/virtualization/GridVirtualScrollbar.tsx b/packages/x-data-grid/src/components/virtualization/GridVirtualScrollbar.tsx
@@ -94,7 +94,10 @@ const GridVirtualScrollbar = React.forwardRef<HTMLDivElement, GridVirtualScrollb
 
     const onScrollerScroll = useEventCallback(() => {
       const scroller = apiRef.current.virtualScrollerRef.current!;
-      const scrollbar = scrollbarRef.current!;
+      const scrollbar = scrollbarRef.current;
+      if (!scrollbar) {
+        return;
+      }
 
       if (scroller[propertyScroll] === lastPosition.current) {
         return;
@@ -114,7 +117,10 @@ const GridVirtualScrollbar = React.forwardRef<HTMLDivElement, GridVirtualScrollb
 
     const onScrollbarScroll = useEventCallback(() => {
       const scroller = apiRef.current.virtualScrollerRef.current!;
-      const scrollbar = scrollbarRef.current!;
+      const scrollbar = scrollbarRef.current;
+      if (!scrollbar) {
+        return;
+      }
 
       if (isLocked.current) {
         isLocked.current = false;