Skip to content

Commit 7e91e63

Browse files
authored
Merge pull request #6424 from IgniteUI/mkirova/fix-6411-9.0.x
fix(igxHierarchicalGrid): Skip scrolling horizontally to child grid c…
2 parents 7eeecf9 + c2848ba commit 7e91e63

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
@@ -451,7 +451,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
451451
// move focus to last summary row cell
452452
const summaryRow = summaryRows[0].nativeElement;
453453
this.focusPrevRow(summaryRow, lastIndex, childGrid, true, true);
454-
} else if (childGrid.rowList.toArray().length === 0 &&
454+
} else if (childGrid.rowList.length === 0 &&
455455
childGrid.allowFiltering && childGrid.filterMode === FilterMode.quickFilter) {
456456
// move to filter cell
457457
childGrid.navigation.moveFocusToFilterCell();
@@ -486,7 +486,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
486486
const childGridID = gridElem.getAttribute('id');
487487
const childGrid = this.getChildGrid(childGridID, grid);
488488

489-
if (childGrid.rowList.toArray().length === 0) {
489+
if (childGrid.rowList.length === 0) {
490490
this.focusNext(visibleColumnIndex, childGrid);
491491
return;
492492
}
@@ -516,7 +516,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
516516
const childGridID = gridElem.getAttribute('id');
517517
const childGrid = this.getChildGrid(childGridID, grid);
518518

519-
if (childGrid.rowList.toArray().length === 0) {
519+
if (childGrid.rowList.length === 0) {
520520
this.focusPrev(visibleColumnIndex, childGrid);
521521
return;
522522
}
@@ -669,7 +669,7 @@ export class IgxHierarchicalGridNavigationService extends IgxGridNavigationServi
669669

670670
private focusNextRow(elem, visibleColumnIndex, grid, isSummary?) {
671671
const cellSelector = this.getCellSelector(visibleColumnIndex, isSummary);
672-
if (grid.navigation.isColumnFullyVisible(visibleColumnIndex)) {
672+
if (grid.navigation.isColumnFullyVisible(visibleColumnIndex) || grid.rowList.length === 0) {
673673
const cell =
674674
elem.querySelector(`${cellSelector}[data-visibleIndex="${visibleColumnIndex}"]`);
675675
const closestScrollableGrid = this.getNextScrollableDown(grid).grid;

0 commit comments

Comments
 (0)