Merge branch '8.1.x' into astaev/issue5627-8.1.x

Author: DiyanDimitrov

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

@@ -5072,16 +5072,16 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
         if (this.verticalScrollContainer.igxForOf.slice(rowIndex, rowIndex + 1).find(rec => rec.expression || rec.childGridsData)) {
             visibleColIndex = -1;
         }
-        if (visibleColIndex === -1 || this.navigation.isColumnFullyVisible(visibleColIndex)) {
-            if (this.navigation.shouldPerformVerticalScroll(rowIndex, visibleColIndex)) {
-                this.navigation.performVerticalScrollToCell(rowIndex, visibleColIndex,
-                    () => { this.executeCallback(rowIndex, visibleColIndex, cb); });
-            } else {
-                this.executeCallback(rowIndex, visibleColIndex, cb);
-            }
-        } else {
+        const shouldScrollVertically = this.navigation.shouldPerformVerticalScroll(rowIndex, visibleColIndex);
+        const shouldScrollHorizontally = visibleColIndex !== -1 && !this.navigation.isColumnFullyVisible(visibleColIndex);
+        if (shouldScrollVertically) {
+            this.navigation.performVerticalScrollToCell(rowIndex, visibleColIndex,
+                () => { this.navigateTo(rowIndex, visibleColIndex, cb); });
+        } else if (shouldScrollHorizontally) {
             this.navigation.performHorizontalScrollToCell(rowIndex, visibleColIndex, false,
-                () => { this.executeCallback(rowIndex, visibleColIndex, cb); });
+                     () => { this.navigateTo(rowIndex, visibleColIndex, cb); });
+        } else {
+            this.executeCallback(rowIndex, visibleColIndex, cb);
         }
     }
 

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

@@ -844,6 +844,23 @@ describe('IgxGrid - Keyboard navigation', () => {
             expect(target.focused).toBe(true);
         });
 
+        it('Custom KB navigation: should be able to scroll horizontally and vertically to a cell in the grid', async () => {
+            fix.componentInstance.columns = fix.componentInstance.generateCols(100);
+            fix.componentInstance.data = fix.componentInstance.generateData(100);
+
+            fix.detectChanges();
+
+            grid.navigateTo(50, 50, (args) => { args.target.nativeElement.focus(); });
+            await wait(DEBOUNCETIME);
+            fix.detectChanges();
+            await wait(DEBOUNCETIME);
+            fix.detectChanges();
+
+            const target = grid.getCellByColumn(50, '50');
+            expect(target).toBeDefined();
+            expect(target.focused).toBe(true);
+        });
+
         it('Custom KB navigation: onGridKeydown should be emitted', async () => {
             fix.componentInstance.columns = fix.componentInstance.generateCols(25);
             fix.componentInstance.data = fix.componentInstance.generateData(25);