Skip to content

Commit

Permalink
fix failing test
Browse files Browse the repository at this point in the history
  • Loading branch information
cherniavskii committed Jul 9, 2024
1 parent c3c7ba8 commit c6d8bf4
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion packages/x-data-grid/src/components/GridRow.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ const GridRow = React.forwardRef<HTMLDivElement, GridRowProps>(function GridRow(
}

const getCell = (
column: GridStateColDef,
column: GridStateColDef | undefined,
indexInSection: number,
indexRelativeToAllColumns: number,
sectionLength: number,
Expand All @@ -357,6 +357,11 @@ const GridRow = React.forwardRef<HTMLDivElement, GridRowProps>(function GridRow(
indexRelativeToAllColumns,
);

if (!column) {
// See https://github.com/mui/mui-x/issues/13719
return null;
}

if (cellColSpanInfo?.spannedByColSpan) {
return null;
}
Expand Down

0 comments on commit c6d8bf4

Please sign in to comment.