Skip to content

Commit 9d2a829

Browse files
authored
Merge pull request #8365 from IgniteUI/async-outlet-route-9.1.x
fix(grid): async router-outlet triggers onDestroy before ngOnInit
2 parents 4b2b4bf + 5ad832f commit 9d2a829

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,7 +251,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
251251

252252

253253
public get displayContainer(): HTMLElement | undefined {
254-
return this.dc.instance._viewContainer.element.nativeElement;
254+
return this.dc?.instance?._viewContainer?.element?.nativeElement;
255255
}
256256

257257
public get virtualHelper() {
@@ -353,11 +353,11 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
353353
protected removeScrollEventListeners() {
354354
if (this.igxForScrollOrientation === 'horizontal') {
355355
this._zone.runOutsideAngular(() =>
356-
this.scrollComponent.nativeElement.removeEventListener('scroll', this.func)
356+
this.scrollComponent?.nativeElement?.removeEventListener('scroll', this.func)
357357
);
358358
} else {
359359
this._zone.runOutsideAngular(() =>
360-
this.scrollComponent.nativeElement.removeEventListener('scroll', this.verticalScrollHandler)
360+
this.scrollComponent?.nativeElement?.removeEventListener('scroll', this.verticalScrollHandler)
361361
);
362362
}
363363
}
@@ -698,7 +698,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
698698
* ```
699699
*/
700700
public getScroll() {
701-
return this.scrollComponent.nativeElement;
701+
return this.scrollComponent?.nativeElement;
702702
}
703703
/**
704704
* Returns the size of the element at the specified index.

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3203,10 +3203,10 @@ export class IgxGridBaseDirective extends DisplayDensityBase implements
32033203

32043204
this.zone.runOutsideAngular(() => {
32053205
this.observer.disconnect();
3206-
this.verticalScrollContainer.getScroll().removeEventListener('scroll', this.verticalScrollHandler);
3207-
this.headerContainer.getScroll().removeEventListener('scroll', this.horizontalScrollHandler);
3208-
const vertScrDC = this.verticalScrollContainer.displayContainer;
3209-
vertScrDC.removeEventListener('scroll', this.preventContainerScroll);
3206+
this.verticalScrollContainer?.getScroll()?.removeEventListener('scroll', this.verticalScrollHandler);
3207+
this.headerContainer?.getScroll()?.removeEventListener('scroll', this.horizontalScrollHandler);
3208+
const vertScrDC = this.verticalScrollContainer?.displayContainer;
3209+
vertScrDC?.removeEventListener('scroll', this.preventContainerScroll);
32103210
});
32113211
}
32123212

0 commit comments

Comments
 (0)