Skip to content

Commit 9738c46

Browse files
authored
Merge pull request #6423 from IgniteUI/mkirova/fix-6411
fix(igxHierarchicalGrid): Skip scrolling horizontally to child grid c…
2 parents f53ecd9 + 51875f9 commit 9738c46

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
458458
// move focus to last summary row cell
459459
const summaryRow = summaryRows[0].nativeElement;
460460
this.focusPrevRow(summaryRow, lastIndex, childGrid, true, true);
461-
} else if (childGrid.rowList.toArray().length === 0 &&
461+
} else if (childGrid.rowList.length === 0 &&
462462
childGrid.allowFiltering && childGrid.filterMode === FilterMode.quickFilter) {
463463
// move to filter cell
464464
childGrid.navigation.moveFocusToFilterCell();
@@ -493,7 +493,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
493493
const childGridID = gridElem.getAttribute('id');
494494
const childGrid = this.getChildGrid(childGridID, grid);
495495

496-
if (childGrid.rowList.toArray().length === 0) {
496+
if (childGrid.rowList.length === 0) {
497497
this.focusNext(visibleColumnIndex, childGrid);
498498
return;
499499
}
@@ -523,7 +523,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
523523
const childGridID = gridElem.getAttribute('id');
524524
const childGrid = this.getChildGrid(childGridID, grid);
525525

526-
if (childGrid.rowList.toArray().length === 0) {
526+
if (childGrid.rowList.length === 0) {
527527
this.focusPrev(visibleColumnIndex, childGrid);
528528
return;
529529
}
@@ -676,7 +676,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
676676

677677
private focusNextRow(elem, visibleColumnIndex, grid, isSummary?) {
678678
const cellSelector = this.getCellSelector(visibleColumnIndex, isSummary);
679-
if (grid.navigation.isColumnFullyVisible(visibleColumnIndex)) {
679+
if (grid.navigation.isColumnFullyVisible(visibleColumnIndex) || grid.rowList.length === 0) {
680680
const cell =
681681
elem.querySelector(`${cellSelector}[data-visibleIndex="${visibleColumnIndex}"]`);
682682
const closestScrollableGrid = this.getNextScrollableDown(grid).grid;

0 commit comments

Comments
 (0)