[DataGrid] Fix row-spanning in combination with column-pinning (#15368)

Co-authored-by: Bilal Shafi <bilalshafidev@gmail.com>
mui · Nov 18, 2024 · e1693b8 · e1693b8
1 parent e430b20
commit e1693b8
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
@@ -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;