Merge pull request #6465 from IgniteUI/mkirova/fix-5472-9.0.x

fix(igxHierarchicalGrid): Make sure correct column index is used when…

Author: ChronosSF

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

@@ -687,11 +687,17 @@ 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?) {
         if (grid.navigation.isColumnFullyVisible(visibleColumnIndex)) {
@@ -728,7 +734,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);