Skip to content

Commit 0664aca

Browse files
Merge branch '8.2.x' into dmdimitrov/issue6289-8.2.x
2 parents ca022ef + 9738c46 commit 0664aca

File tree

7 files changed

+20
-9
lines changed

7 files changed

+20
-9
lines changed

projects/igniteui-angular/src/lib/directives/for-of/for_of.directive.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,8 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
404404
});
405405
const destructor = takeUntil<any>(this.destroy$);
406406
this.contentResizeNotify.pipe(destructor,
407-
filter(() => this.igxForContainerSize && this.igxForOf && this.igxForOf.length > 0), throttleTime(40))
407+
filter(() => this.igxForContainerSize && this.igxForOf && this.igxForOf.length > 0),
408+
throttleTime(40, undefined, {leading: true, trailing: true}))
408409
.subscribe(() => {
409410
this._zone.runTask(() => {
410411
this.updateSizes();

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -560,6 +560,7 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
560560
this.onPagingDone.emit({ previous: this._page, current: val });
561561
this._page = val;
562562
this.pageChange.emit(this._page);
563+
this.navigateTo(0);
563564
this.notifyChanges();
564565
}
565566

@@ -5950,6 +5951,15 @@ export abstract class IgxGridBaseComponent extends DisplayDensityBase implements
59505951
this.closeRowEditingOverlay();
59515952
}
59525953

5954+
/**
5955+
* @hidden
5956+
*/
5957+
public gridOutletKeyboardHandler(event) {
5958+
// TODO: This should be removed after grid keyboard refactoring
5959+
// call stopPropagation for keydown event for the outlet not to propagate event to the grid
5960+
event.stopPropagation();
5961+
}
5962+
59535963
// TODO: Refactor
59545964
/**
59555965
* Finishes the row transactions on the current row.

projects/igniteui-angular/src/lib/grids/grid/grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -271,4 +271,4 @@
271271

272272
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
273273
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
274-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
274+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

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;

projects/igniteui-angular/src/lib/grids/hierarchical-grid/hierarchical-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,4 +236,4 @@
236236

237237
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
238238
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
239-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
239+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
618618
await wait(30);
619619
fixture.detectChanges();
620620
hierarchicalGrid.verticalScrollContainer.scrollTo(hierarchicalGrid.dataView.length - 1);
621-
await wait(30);
621+
await wait(100);
622622
fixture.detectChanges();
623623

624624
// check last row is loaded and is in view

projects/igniteui-angular/src/lib/grids/tree-grid/tree-grid.component.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,4 +212,4 @@
212212

213213
<igx-grid-column-resizer *ngIf="colResizingService.showResizer"></igx-grid-column-resizer>
214214
<div class="igx-grid__loading-outlet" #igxLoadingOverlayOutlet igxOverlayOutlet></div>
215-
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet></div>
215+
<div class="igx-grid__outlet" #igxFilteringOverlayOutlet igxOverlayOutlet (keydown)="gridOutletKeyboardHandler($event)"></div>

0 commit comments

Comments
 (0)