Merge branch '8.2.x' into dpetev/combo-control-touched-8.2

Author: Lipata

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

@@ -675,6 +675,8 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
     }
 
     private focusNextRow(elem, visibleColumnIndex, grid, isSummary?) {
+        const lastCellIndex = grid.unpinnedColumns[grid.unpinnedColumns.length - 1].visibleIndex;
+        visibleColumnIndex = Math.min(lastCellIndex, visibleColumnIndex);
         const cellSelector = this.getCellSelector(visibleColumnIndex, isSummary);
         if (grid.navigation.isColumnFullyVisible(visibleColumnIndex) || grid.rowList.length === 0) {
             const cell =
@@ -694,13 +696,21 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
                 cell.focus({ preventScroll: true });
             }
         } else {
-            const cellElem = elem.querySelector(`${cellSelector}`);
-            const rowIndex = parseInt(cellElem.getAttribute('data-rowindex'), 10);
-            grid.navigation.performHorizontalScrollToCell(rowIndex, visibleColumnIndex);
+            this.horizontalScrollGridToIndex(grid, visibleColumnIndex, () => {
+                this.focusNextRow(elem, visibleColumnIndex, grid, isSummary);
+            });
         }
     }
+    public getColumnUnpinnedIndex(visibleColumnIndex: number, grid?: IgxHierarchicalGridComponent) {
+        const currGrid = grid || this.grid;
+        const column = currGrid.unpinnedColumns.find((col) => !col.columnGroup && col.visibleIndex === visibleColumnIndex);
+        return currGrid.pinnedColumns.length ? currGrid.unpinnedColumns.filter((c) => !c.columnGroup).indexOf(column) :
+            visibleColumnIndex;
+    }
 
     private focusPrevRow(elem, visibleColumnIndex, grid, inChild?, isSummary?) {
+        const lastCellIndex = grid.unpinnedColumns[grid.unpinnedColumns.length - 1].visibleIndex;
+        visibleColumnIndex = Math.min(lastCellIndex, visibleColumnIndex);
         if (grid.navigation.isColumnFullyVisible(visibleColumnIndex)) {
             const cellSelector = this.getCellSelector(visibleColumnIndex, isSummary);
             const cells = elem.querySelectorAll(`${cellSelector}[data-visibleIndex="${visibleColumnIndex}"]`);
@@ -735,7 +745,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
     }
 
     private horizontalScrollGridToIndex(grid, visibleColumnIndex, callBackFunc) {
-        const unpinnedIndex = this.getColumnUnpinnedIndex(visibleColumnIndex);
+        const unpinnedIndex = this.getColumnUnpinnedIndex(visibleColumnIndex, grid);
         grid.parentVirtDir.onChunkLoad
             .pipe(first())
             .subscribe(callBackFunc);