Skip to content

Commit 24f313a

Browse files
authored
Merge branch '8.2.x' into mkirova/fix-flicker-8.2.x
2 parents 806b748 + 94f4971 commit 24f313a

File tree

7 files changed

+32
-5
lines changed

7 files changed

+32
-5
lines changed

projects/igniteui-angular/src/lib/grids/common/grid.interface.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { FilterMode } from './enums';
22

33
export interface GridType {
4-
id: string;
54
nativeElement: HTMLElement;
65
rowEditable: boolean;
76
rootSummariesEnabled: boolean;

projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -628,7 +628,7 @@ export class IgxGridNavigationService {
628628

629629
protected getNextRowByIndex(nextIndex) {
630630
return this.grid.tbody.nativeElement.querySelector(
631-
`[data-rowindex="${nextIndex}"][data-gridid="${this.grid.id}"]`);
631+
`[data-rowindex="${nextIndex}"]`);
632632
}
633633

634634
private getAllRows() {

projects/igniteui-angular/src/lib/grids/grid/groupby-row.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ export class IgxGridGroupByRowComponent {
8383
* ```
8484
*/
8585
@Input()
86-
@HostBinding('attr.data-gridID')
8786
public gridID: string;
8887

8988
/**

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid-navigation.service.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -806,4 +806,8 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
806806
}
807807
return null;
808808
}
809+
810+
protected getNextRowByIndex(nextIndex) {
811+
return this.grid.dataRowList.find(element => element.index === nextIndex).element.nativeElement;
812+
}
809813
}

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.navigation.spec.ts

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -916,6 +916,33 @@ describe('IgxHierarchicalGrid Complex Navigation #hGrid', () => {
916916
expect(lastCell.rowIndex).toBe(4);
917917

918918
}));
919+
920+
it('should navigate to the first cell of next row using Tab from last cell in the row above', (async () => {
921+
hierarchicalGrid.expandChildren = false;
922+
hierarchicalGrid.height = '600px';
923+
hierarchicalGrid.width = '1000px';
924+
fixture.componentInstance.rowIsland.height = '350px';
925+
fixture.detectChanges();
926+
await wait(100);
927+
928+
const row = hierarchicalGrid.getRowByIndex(0);
929+
(row as IgxHierarchicalRowComponent).toggle();
930+
await wait(100);
931+
fixture.detectChanges();
932+
933+
const cell = hierarchicalGrid.getCellByColumn(2, 'childData2');
934+
cell.nativeElement.dispatchEvent(new Event('focus'));
935+
await wait(100);
936+
fixture.detectChanges();
937+
938+
UIInteractions.triggerKeyDownEvtUponElem('Tab', cell.nativeElement, true);
939+
await wait(100);
940+
fixture.detectChanges();
941+
942+
const currentCell = hierarchicalGrid.getCellByColumn(3, 'ID');
943+
expect(currentCell.focused).toBe(true);
944+
expect(currentCell.rowIndex).toBe(3);
945+
}));
919946
});
920947

921948
describe('IgxHierarchicalGrid Multi-layout Navigation #hGrid', () => {

projects/igniteui-angular/src/lib/grids/row.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ export abstract class IgxRowComponent<T extends IgxGridBaseComponent & IGridData
5959
* @hidden
6060
*/
6161
@Input()
62-
@HostBinding('attr.data-gridID')
6362
public gridID: string;
6463

6564
/**

projects/igniteui-angular/src/lib/grids/summaries/summary-row.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ export class IgxSummaryRowComponent implements DoCheck {
3232
public summaries: Map<string, IgxSummaryResult[]>;
3333

3434
@Input()
35-
@HostBinding('attr.data-gridID')
3635
public gridID;
3736

3837
@Input()

0 commit comments

Comments
 (0)