From a6a2520a7890273b438328d219ed6a468e2248e9 Mon Sep 17 00:00:00 2001
From: Bilal Shafi <bilalshafidev@gmail.com>
Date: Mon, 3 Feb 2025 15:58:20 +0500
Subject: [PATCH] [DataGrid] Fix loading overlay not in sync with scroll

---
 .../src/hooks/features/overlays/useGridOverlays.tsx            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/x-data-grid/src/hooks/features/overlays/useGridOverlays.tsx b/packages/x-data-grid/src/hooks/features/overlays/useGridOverlays.tsx
index ba16aba36e2cf..828f17f99999d 100644
--- a/packages/x-data-grid/src/hooks/features/overlays/useGridOverlays.tsx
+++ b/packages/x-data-grid/src/hooks/features/overlays/useGridOverlays.tsx
@@ -40,7 +40,8 @@ export const useGridOverlays = () => {
   if (loading) {
     overlayType = 'loadingOverlay';
     loadingOverlayVariant =
-      rootProps.slotProps?.loadingOverlay?.[noRows ? 'noRowsVariant' : 'variant'] || null;
+      rootProps.slotProps?.loadingOverlay?.[noRows ? 'noRowsVariant' : 'variant'] ??
+      (noRows ? 'skeleton' : 'linear-progress');
   }
 
   const overlaysProps = { overlayType, loadingOverlayVariant };