Merge branch 'master' into mdragnev/add-row-tests

Author: ChronosSF

projects/igniteui-angular/src/lib/grids/grid-base.directive.ts

@@ -4096,7 +4096,13 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
         };
         this.verticalScrollContainer.onDataChanged.pipe(first()).subscribe(() => {
             this.cdr.detectChanges();
-            const row = this.getRowByIndex(this.addRowParent.index + 1);
+            const newRowIndex = this.addRowParent.index + 1;
+            // ensure adding row is in view.
+            const shouldScroll = this.navigation.shouldPerformVerticalScroll(newRowIndex, -1);
+            if (shouldScroll) {
+                this.navigateTo(newRowIndex, -1);
+            }
+            const row = this.getRowByIndex(newRowIndex);
             const cell = row.cells.find(c => c.editable);
             cell.setEditMode(true);
             cell.activate();

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

@@ -4,7 +4,7 @@ import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { IgxHierarchicalGridModule } from './public_api';
 import { Component, ViewChild, DebugElement} from '@angular/core';
 import { IgxHierarchicalGridComponent } from './hierarchical-grid.component';
-import { wait, UIInteractions } from '../../test-utils/ui-interactions.spec';
+import { wait, UIInteractions, waitForSelectionChange, waitForGridScroll } from '../../test-utils/ui-interactions.spec';
 import { IgxRowIslandComponent } from './row-island.component';
 import { By } from '@angular/platform-browser';
 import { IgxHierarchicalRowComponent } from './hierarchical-row.component';
@@ -193,7 +193,8 @@ describe('IgxHierarchicalGrid Basic Navigation #hGrid', () => {
         const childGridContent =  fixture.debugElement.queryAll(By.css(GRID_CONTENT_CLASS))[1];
         UIInteractions.triggerEventHandlerKeyDown('arrowdown', childGridContent, false, false, true);
         fixture.detectChanges();
-        await wait(1000);
+        // wait for parent grid to complete scroll to child cell.
+        await waitForGridScroll(hierarchicalGrid);
         fixture.detectChanges();
 
         const selectedCell = fixture.componentInstance.selectedCell;
@@ -368,7 +369,7 @@ describe('IgxHierarchicalGrid Basic Navigation #hGrid', () => {
 
         UIInteractions.triggerEventHandlerKeyDown('end', baseHGridContent, false, false, true);
         fixture.detectChanges();
-        await wait(1000);
+        await waitForSelectionChange(hierarchicalGrid);
         fixture.detectChanges();
 
         const lastDataCell = hierarchicalGrid.getCellByKey(19, 'childData2');

projects/igniteui-angular/src/lib/test-utils/ui-interactions.spec.ts

@@ -6,8 +6,18 @@ export function wait(ms = 0) {
     return new Promise((resolve, reject) => setTimeout(resolve, ms));
 }
 
-export function waitForActiveNodeChange (grid) {
+export function waitForGridScroll(grid) {
     // wait for grid scroll operation to complete and state to be updated.
+    return new Promise((resolve, reject) => {
+        grid.onScroll.pipe(first()).subscribe(() => {
+            grid.cdr.detectChanges();
+            resolve();
+        });
+    });
+}
+
+export function waitForActiveNodeChange (grid) {
+    // wait for grid activation operation to complete and state to be updated.
     return new Promise((resolve, reject) => {
         grid.activeNodeChange.pipe(first()).subscribe(() => {
             grid.cdr.detectChanges();
@@ -17,7 +27,7 @@ export function waitForActiveNodeChange (grid) {
 }
 
 export function waitForSelectionChange (grid) {
-    // wait for grid scroll operation to complete and state to be updated.
+    // wait for grid selection operation to complete and state to be updated.
     return new Promise((resolve, reject) => {
         grid.onSelection.pipe(first()).subscribe(() => {
             grid.cdr.detectChanges();