[DataGrid] Fix row-spanning in combination with column-pinning (@lhil…

…gert9) (#15460) Co-authored-by: Lucas Hilgert <[email protected]> Co-authored-by: Bilal Shafi <[email protected]>
mui · Nov 25, 2024 · 2523a14 · 2523a14
1 parent 3e0fdae
commit 2523a14
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/packages/x-data-grid/src/components/cell/GridCell.tsx b/packages/x-data-grid/src/components/cell/GridCell.tsx
@@ -369,6 +369,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;