Merge pull request #7288 from IgniteUI/skrastev/fix-7284-9.1.x

fix(igxGrid): Fix trying to perform horizontal scroll when passed index is not valid.

Author: ChronosSF

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

@@ -5662,7 +5662,7 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
     }
 
     /**
-     * Navigates to a posution in the grid based on provided `rowindex` and `visibleColumnIndex`.
+     * Navigates to a position in the grid based on provided `rowindex` and `visibleColumnIndex`.
      * @remarks
      * Also can execute a custom logic over the target element,
      * through a callback function that accepts { targetType: GridKeydownTargetType, target: Object }

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

@@ -301,6 +301,7 @@ export class IgxGridNavigationService {
     }
 
     public shouldPerformHorizontalScroll(visibleColIndex: number, rowIndex = -1) {
+        if (visibleColIndex < 0 || visibleColIndex > this.grid.visibleColumns.length - 1) { return false; }
         if (rowIndex < 0 || rowIndex > this.grid.dataView.length - 1) {
             return !this.isColumnFullyVisible(visibleColIndex);
         }

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

@@ -1571,6 +1571,32 @@ describe('IgxGrid Component Tests #grid', () => {
             prevCellCoords = grid.getPreviousCell(99, 0, (col) => col.editable);
             expect(prevCellCoords).toEqual({ rowIndex: 99, visibleColumnIndex: 0 });
         });
+
+        it('should not reset vertical scroll position when calling navigateTo with only rowIndex specified', async() => {
+            const fix = TestBed.createComponent(IgxGridDefaultRenderingComponent);
+            fix.componentInstance.initColumnsRows(15, 5);
+            fix.detectChanges();
+
+            const grid = fix.componentInstance.grid;
+            grid.height = '300px';
+            grid.width = '500px';
+            fix.detectChanges();
+
+            grid.navigateTo(0);
+            await wait();
+            fix.detectChanges();
+
+            grid.verticalScrollContainer.getScroll().scrollTop = 200;
+            await wait();
+            fix.detectChanges();
+            expect(grid.verticalScrollContainer.getScroll().scrollTop).toEqual(200);
+
+            grid.headerContainer.getScroll().scrollLeft = 100;
+            await wait();
+            fix.detectChanges();
+
+            expect(grid.verticalScrollContainer.getScroll().scrollTop).toEqual(200);
+        });
     });
 
     describe('IgxGrid - Integration with other Igx Controls', () => {