From 21198709e75b16750f694db5a897900c45e61f62 Mon Sep 17 00:00:00 2001
From: Joseph Spear <jspear@greshamtech.com>
Date: Wed, 6 Mar 2024 15:21:12 +0000
Subject: [PATCH] [DataGrid] Fix double border under header (#12349)

Signed-off-by: Joseph Spear <jspear@greshamtech.com>
Co-authored-by: Rom Grk <romgrk.cc@gmail.com>
---
 .../src/components/virtualization/GridVirtualScroller.tsx  | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/x-data-grid/src/components/virtualization/GridVirtualScroller.tsx b/packages/x-data-grid/src/components/virtualization/GridVirtualScroller.tsx
index 74ff9502bf94..8ab229b2031e 100644
--- a/packages/x-data-grid/src/components/virtualization/GridVirtualScroller.tsx
+++ b/packages/x-data-grid/src/components/virtualization/GridVirtualScroller.tsx
@@ -70,8 +70,11 @@ function GridVirtualScroller(props: GridVirtualScrollerProps) {
     getRenderZoneProps,
     getScrollbarVerticalProps,
     getScrollbarHorizontalProps,
+    getRows,
   } = virtualScroller;
 
+  const rows = getRows();
+
   return (
     <Container className={classes.root} {...getContainerProps()}>
       <Scroller className={classes.scroller} {...getScrollerProps()} ownerState={rootProps}>
@@ -84,12 +87,12 @@ function GridVirtualScroller(props: GridVirtualScrollerProps) {
 
         <Content {...getContentProps()}>
           <RenderZone {...getRenderZoneProps()}>
-            {virtualScroller.getRows()}
+            {rows}
             {<rootProps.slots.detailPanels virtualScroller={virtualScroller} />}
           </RenderZone>
         </Content>
 
-        <SpaceFiller />
+        {rows.length > 0 && <SpaceFiller />}
 
         <BottomContainer>
           <rootProps.slots.pinnedRows position="bottom" virtualScroller={virtualScroller} />