Merge pull request #7391 from IgniteUI/nrobakova/fix-issue-7388

Update selection when remote data is used
IgniteUI · May 26, 2020 · 7f85ddb · 7f85ddb
2 parents abfa67f + 3ae8b9e
commit 7f85ddb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts b/projects/igniteui-angular/src/lib/grids/grid-navigation.service.ts
@@ -171,7 +171,8 @@ export class IgxGridNavigationService {
     }
 
     focusTbody(event) {
-        if (!this.activeNode || this.activeNode.row < 0 || this.activeNode.row > this.grid.dataView.length - 1) {
+        const gridRows = this.grid.verticalScrollContainer.totalItemCount ?? this.grid.dataView.length;
+        if (!this.activeNode || this.activeNode.row < 0 || this.activeNode.row > gridRows - 1) {
             this.activeNode = { row: 0, column: 0 };
             this.grid.navigateTo(0, 0, (obj) => {
                 this.grid.clearCellSelection();