Merge branch 'ddincheva/focuslessKBNav' of https://github.com/IgniteUI/igniteui-angular into ddincheva/focuslessKBNav

Author: ddincheva

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

@@ -5584,10 +5584,11 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
         if (this.dataView.slice(rowIndex, rowIndex + 1).find(rec => rec.expression || rec.childGridsData)) {
             visibleColIndex = -1;
         }
-        const shouldScrollVertically = this.navigation.shouldPerformVerticalScroll(rowIndex);
+        const shouldScrollVertically = this.navigation.shouldPerformVerticalScroll(rowIndex, visibleColIndex);
         const shouldScrollHorizontally = this.navigation.shouldPerformHorizontalScroll(visibleColIndex, rowIndex);
         if (shouldScrollVertically) {
-            this.navigation.performVerticalScrollToCell(rowIndex, () => { this.navigateTo(rowIndex, visibleColIndex, cb); });
+            this.navigation.performVerticalScrollToCell(rowIndex, visibleColIndex,
+                () => { this.navigateTo(rowIndex, visibleColIndex, cb); });
         } else if (shouldScrollHorizontally) {
             this.navigation.performHorizontalScrollToCell(visibleColIndex, () => { this.navigateTo(rowIndex, visibleColIndex, cb); });
         } else {

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

@@ -73,12 +73,12 @@ export class IgxGridMRLNavigationService extends IgxGridNavigationService {
         return true;
     }
 
-    public shouldPerformVerticalScroll(targetRowIndex: number): boolean {
-        if (!super.shouldPerformVerticalScroll(targetRowIndex)) { return false; }
+    public shouldPerformVerticalScroll(targetRowIndex: number, visibleColIndex: number): boolean {
+        if (!super.shouldPerformVerticalScroll(targetRowIndex, visibleColIndex)) { return false; }
 
         const targetRow = super.getRowElementByIndex(targetRowIndex);
         const containerHeight = this.grid.calcHeight ? Math.ceil(this.grid.calcHeight) : 0;
-        const scrollPos = this.getVerticalScrollPositions(targetRowIndex, this.activeNode.column);
+        const scrollPos = this.getVerticalScrollPositions(targetRowIndex, visibleColIndex);
         return (!targetRow || targetRow.offsetTop + scrollPos.topOffset < Math.abs(this.containerTopOffset)
             || containerHeight && containerHeight < scrollPos.rowBottom -  Math.ceil(this.scrollTop));
     }
@@ -140,12 +140,12 @@ export class IgxGridMRLNavigationService extends IgxGridNavigationService {
             });
     }
 
-    public performVerticalScrollToCell(rowIndex: number, cb?: () => void) {
-        const children = this.parentByChildIndex(this.activeNode.column || 0).children;
-        if (!super.isDataRow(rowIndex) || children.length < 2) { return super.performVerticalScrollToCell(rowIndex, cb); }
+    public performVerticalScrollToCell(rowIndex: number, visibleColIndex: number, cb?: () => void) {
+        const children = this.parentByChildIndex(visibleColIndex || 0).children;
+        if (!super.isDataRow(rowIndex) || children.length < 2) { return super.performVerticalScrollToCell(rowIndex, visibleColIndex, cb); }
 
         const containerHeight = this.grid.calcHeight ? Math.ceil(this.grid.calcHeight) : 0;
-        const pos = this.getVerticalScrollPositions(rowIndex, this.activeNode.column);
+        const pos = this.getVerticalScrollPositions(rowIndex, visibleColIndex);
         const row = super.getRowElementByIndex(rowIndex);
         if ((this.scrollTop > pos.rowTop) && (!row || row.offsetTop + pos.topOffset < Math.abs(this.containerTopOffset))) {
             pos.topOffset === 0 ? this.grid.verticalScrollContainer.scrollTo(rowIndex) :

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

@@ -313,21 +313,21 @@ export class IgxGridNavigationService {
         return row.expression || row.detailsData ? false : !this.isColumnFullyVisible(visibleColIndex);
     }
 
-    public shouldPerformVerticalScroll(targetRowIndex: number): boolean {
+    public shouldPerformVerticalScroll(targetRowIndex: number, visibleColIndex: number): boolean {
         const targetRow = this.getRowElementByIndex(targetRowIndex);
         const rowHeight = this.grid.verticalScrollContainer.getSizeAt(targetRowIndex);
         const containerHeight = this.grid.calcHeight ? Math.ceil(this.grid.calcHeight) : 0;
         const endTopOffset = targetRow ? targetRow.offsetTop + rowHeight + this.containerTopOffset : containerHeight + rowHeight;
         return !targetRow || targetRow.offsetTop < Math.abs(this.containerTopOffset)
-            || containerHeight && containerHeight < endTopOffset;
+        || containerHeight && containerHeight < endTopOffset;
     }
 
     public navigateInBody(rowIndex, visibleColIndex, cb: Function = null): void {
         if (!this.isValidPosition(rowIndex, visibleColIndex) || this.isActiveNode(rowIndex, visibleColIndex)) { return; }
         this.grid.navigateTo(this.activeNode.row = rowIndex, this.activeNode.column = visibleColIndex, cb);
     }
 
-    public performVerticalScrollToCell(rowIndex: number, cb?: () => void) {
+    public performVerticalScrollToCell(rowIndex: number, visibleColIndex = -1, cb?: () => void) {
         this.grid.verticalScrollContainer.scrollTo(rowIndex);
         this.grid.verticalScrollContainer.onChunkLoad
             .pipe(first()).subscribe(() => {

projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts

@@ -1702,15 +1702,15 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 fix.detectChanges();
 
                 GridFunctions.simulateGridContentKeydown(fix, 'end', false, false, true);
-                await wait(100);
+                await wait(200);
                 fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value)
                     .toEqual(fix.componentInstance.data[fix.componentInstance.data.length - 1].Fax);
                 expect(fix.componentInstance.selectedCell.column.field).toMatch('Fax');
 
                 GridFunctions.simulateGridContentKeydown(fix, 'home', false, false, true);
-                await wait(100);
+                await wait(200);
                 fix.detectChanges();
 
                 expect(fix.componentInstance.selectedCell.value).toEqual(fix.componentInstance.data[0].CompanyName);
@@ -2520,7 +2520,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 // tab through cols and check order is correct - ContactName should be skipped.
                 for (let i = 1; i < order.length; i++) {
                     GridFunctions.simulateGridContentKeydown(fix, 'Tab');
-                    await wait();
+                    await wait(DEBOUNCETIME);
                     fix.detectChanges();
 
                     cell = grid.getCellByColumn(0, order[i]);
@@ -2530,7 +2530,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
                 // shift+tab through  cols and check order is correct - ContactName should be skipped.
                 for (let j = order.length - 2; j >= 0; j--) {
                     GridFunctions.simulateGridContentKeydown(fix, 'Tab', false, true);
-                    await wait();
+                    await wait(DEBOUNCETIME);
                     fix.detectChanges();
 
                     cell = grid.getCellByColumn(0, order[j]);

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

@@ -89,15 +89,15 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
         super.navigateInBody(rowIndex, visibleColIndex, cb);
     }
 
-    public shouldPerformVerticalScroll(index, isNext?) {
+    public shouldPerformVerticalScroll(index, visibleColumnIndex = -1, isNext?) {
         const targetRec = this.grid.dataView[index];
         if (this.grid.isChildGridRecord(targetRec)) {
             const scrollAmount = this.grid.verticalScrollContainer.getScrollForIndex(index, !isNext);
             const currScroll = this.grid.verticalScrollContainer.getScroll().scrollTop;
             const shouldScroll = !isNext ? scrollAmount > currScroll : currScroll < scrollAmount;
             return shouldScroll;
         } else {
-            return super.shouldPerformVerticalScroll(index);
+            return super.shouldPerformVerticalScroll(index, visibleColumnIndex);
         }
     }
 
@@ -130,9 +130,9 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
      * @param cb  Optional.Callback function called when operation is complete.
      */
     protected _handleScrollInChild(rowIndex: number, isNext?: boolean, cb?: Function) {
-        const shouldScroll = this.shouldPerformVerticalScroll(rowIndex, isNext);
+        const shouldScroll = this.shouldPerformVerticalScroll(rowIndex, -1, isNext);
         if (shouldScroll) {
-            this.grid.navigation.performVerticalScrollToCell(rowIndex, () => {
+            this.grid.navigation.performVerticalScrollToCell(rowIndex, -1, () => {
                 this.positionInParent(rowIndex, isNext, cb);
             });
         } else {