Skip to content

Commit dd535ca

Browse files
authored
Merge branch 'master' into mkirova/fix-6540-master
2 parents d8376d6 + 0e6ff1d commit dd535ca

File tree

4 files changed

+12
-4
lines changed

4 files changed

+12
-4
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
@@ -419,7 +419,8 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
419419
});
420420
const destructor = takeUntil<any>(this.destroy$);
421421
this.contentResizeNotify.pipe(destructor,
422-
filter(() => this.igxForContainerSize && this.igxForOf && this.igxForOf.length > 0), throttleTime(40))
422+
filter(() => this.igxForContainerSize && this.igxForOf && this.igxForOf.length > 0),
423+
throttleTime(40, undefined, {leading: true, trailing: true}))
423424
.subscribe(() => {
424425
this._zone.runTask(() => {
425426
this.updateSizes();

projects/igniteui-angular/src/lib/grids/grid/grid-mrl-keyboard-nav.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1637,6 +1637,7 @@ describe('IgxGrid Multi Row Layout - Keyboard navigation #grid', () => {
16371637
]
16381638
}];
16391639
fix.detectChanges();
1640+
await wait(DEBOUNCETIME * 2);
16401641

16411642
let firstCell;
16421643
let secondCell;

projects/igniteui-angular/src/lib/grids/grid/grid.master-detail.spec.ts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,7 @@ describe('IgxGrid Master Detail #grid', () => {
217217

218218
grid.expansionStates = newExpanded;
219219
fix.detectChanges();
220+
await wait(DEBOUNCETIME);
220221

221222
const newData = [...grid.data].slice(0, 4);
222223
newData.splice(1, 1);
@@ -308,10 +309,12 @@ describe('IgxGrid Master Detail #grid', () => {
308309
});
309310

310311
describe('Keyboard Navigation ', () => {
311-
beforeEach(async(() => {
312+
beforeEach(async(async() => {
312313
fix = TestBed.createComponent(AllExpandedGridMasterDetailComponent);
313314
fix.detectChanges();
314315
grid = fix.componentInstance.grid;
316+
await wait(DEBOUNCETIME * 4);
317+
fix.detectChanges();
315318
}));
316319

317320
it('Should navigate down through a detail view by focusing the whole row and continuing onto the next with arrow down.',
@@ -485,6 +488,7 @@ describe('IgxGrid Master Detail #grid', () => {
485488
});
486489

487490
it('Should navigate to the correct row/cell when using the navigateTo method in a grid with expanded detail views.', async() => {
491+
await wait(DEBOUNCETIME);
488492
grid.navigateTo(20, 0);
489493
await wait(DEBOUNCETIME);
490494
fix.detectChanges();

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,12 +590,13 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
590590
hierarchicalGrid.paging = true;
591591
hierarchicalGrid.perPage = 20;
592592
hierarchicalGrid.reflow();
593-
await wait();
593+
await wait(60);
594594
fixture.detectChanges();
595595
expect(hierarchicalGrid.hasVerticalSroll()).toBeTruthy();
596596
hierarchicalGrid.perPage = 5;
597597
await wait(30);
598598
fixture.detectChanges();
599+
await wait(30);
599600

600601
expect(hierarchicalGrid.hasVerticalSroll()).toBeFalsy();
601602

@@ -623,8 +624,9 @@ describe('IgxHierarchicalGrid Integration #hGrid', () => {
623624
await wait(30);
624625
fixture.detectChanges();
625626
hierarchicalGrid.verticalScrollContainer.scrollTo(hierarchicalGrid.dataView.length - 1);
626-
await wait(30);
627+
await wait(60);
627628
fixture.detectChanges();
629+
await wait(60);
628630

629631
// check last row is loaded and is in view
630632
rows = hierarchicalGrid.rowList.toArray();

0 commit comments

Comments
 (0)