diff --git a/CHANGELOG.md b/CHANGELOG.md index c2e4b9f88a6..692539767c0 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ No public interface changes since `30.4.0`. +*Bug fixes** + +- Fixed wrong columns assigned to `EuiDataGrid` leadingControlColumns ([#4269](https://github.com/elastic/eui/pull/4269)) + ## [`30.4.0`](https://github.com/elastic/eui/tree/v30.4.0) - Added `eql` glyph in `EuiIcon` ([#4110](https://github.com/elastic/eui/pull/4110)) diff --git a/src/components/datagrid/data_grid_data_row.tsx b/src/components/datagrid/data_grid_data_row.tsx index 6ebb7b4eadc..a29b19fb9c3 100644 --- a/src/components/datagrid/data_grid_data_row.tsx +++ b/src/components/datagrid/data_grid_data_row.tsx @@ -93,7 +93,7 @@ const EuiDataGridDataRow: FunctionComponent = memo( visibleRowIndex={visibleRowIndex} colIndex={i} columnId={id} - column={columns[i]} + column={leadingColumn} popoverContent={DefaultColumnFormatter} width={leadingColumn.width} renderCellValue={rowCellRender} @@ -136,8 +136,8 @@ const EuiDataGridDataRow: FunctionComponent = memo( /> ); })} - {trailingControlColumns.map((leadingColumn, i) => { - const { id, rowCellRender } = leadingColumn; + {trailingControlColumns.map((trailingColumn, i) => { + const { id, rowCellRender } = trailingColumn; const colIndex = i + columns.length + leadingControlColumns.length; return ( @@ -147,9 +147,9 @@ const EuiDataGridDataRow: FunctionComponent = memo( visibleRowIndex={visibleRowIndex} colIndex={colIndex} columnId={id} - column={columns[colIndex]} + column={trailingColumn} popoverContent={DefaultColumnFormatter} - width={leadingColumn.width} + width={trailingColumn.width} renderCellValue={rowCellRender} onCellFocus={onCellFocus} isFocused={focusedCellPositionInTheRow === colIndex}