From e1693b8894c9ed9fca5193832f629c6f49b77122 Mon Sep 17 00:00:00 2001
From: Lucas Hilgert <77863078+lhilgert9@users.noreply.github.com>
Date: Mon, 18 Nov 2024 06:29:35 +0100
Subject: [PATCH] [DataGrid] Fix row-spanning in combination with
 column-pinning (#15368)

Co-authored-by: Bilal Shafi <bilalshafidev@gmail.com>
---
 packages/x-data-grid/src/components/cell/GridCell.tsx | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/x-data-grid/src/components/cell/GridCell.tsx b/packages/x-data-grid/src/components/cell/GridCell.tsx
index 3760b113a261f..f81ba9e89e3d5 100644
--- a/packages/x-data-grid/src/components/cell/GridCell.tsx
+++ b/packages/x-data-grid/src/components/cell/GridCell.tsx
@@ -368,6 +368,10 @@ const GridCell = React.forwardRef<HTMLDivElement, GridCellProps>(function GridCe
     if (rowSpan > 1) {
       cellStyle.height = `calc(var(--height) * ${rowSpan})`;
       cellStyle.zIndex = 5;
+
+      if (isLeftPinned || isRightPinned) {
+        cellStyle.zIndex = 6;
+      }
     }
 
     return cellStyle;