From 202764631acfc85041540a34db0ea2183f22eb51 Mon Sep 17 00:00:00 2001 From: Silviu Popa Date: Wed, 20 Nov 2019 17:31:19 +0200 Subject: [PATCH] [ADF-5002] Datatable - fix focus selection for grid list (#5268) * [ADF-5002] Datatable - fix focus selection for grid list * fix faling e2e --- .../datatable/components/datatable/datatable.component.ts | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/core/datatable/components/datatable/datatable.component.ts b/lib/core/datatable/components/datatable/datatable.component.ts index 9c61710cc1..0fdf15d5e9 100644 --- a/lib/core/datatable/components/datatable/datatable.component.ts +++ b/lib/core/datatable/components/datatable/datatable.component.ts @@ -408,7 +408,7 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, } if (row) { - const rowIndex = this.data.getRows().indexOf(row) + (this.isHeaderVisible() ? 1 : 0); + const rowIndex = this.data.getRows().indexOf(row) + (this.isHeaderListVisible() ? 1 : 0); this.keyManager.setActiveItem(rowIndex); const dataRowEvent = new DataRowEvent(row, mouseEvent, this); @@ -422,6 +422,10 @@ export class DataTableComponent implements AfterContentInit, OnChanges, DoCheck, } } + private isHeaderListVisible(): boolean { + return this.isHeaderVisible() && this.display === DisplayMode.List; + } + private handleRowSelection(row: DataRow, e: KeyboardEvent | MouseEvent) { if (this.data) { if (this.isSingleSelectionMode()) {