Skip to content

Commit d214db5

Browse files
committed
fix(grid): async router-outlet triggers onDestroy before ngOnInit Closes #8071
1 parent ca2d891 commit d214db5

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
@@ -270,7 +270,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
270270

271271

272272
public get displayContainer(): HTMLElement | undefined {
273-
return this.dc.instance._viewContainer.element.nativeElement;
273+
return this.dc?.instance?._viewContainer?.element?.nativeElement;
274274
}
275275

276276
public get virtualHelper() {
@@ -372,11 +372,11 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
372372
protected removeScrollEventListeners() {
373373
if (this.igxForScrollOrientation === 'horizontal') {
374374
this._zone.runOutsideAngular(() =>
375-
this.scrollComponent.nativeElement.removeEventListener('scroll', this.func)
375+
this.scrollComponent?.nativeElement?.removeEventListener('scroll', this.func)
376376
);
377377
} else {
378378
this._zone.runOutsideAngular(() =>
379-
this.scrollComponent.nativeElement.removeEventListener('scroll', this.verticalScrollHandler)
379+
this.scrollComponent?.nativeElement?.removeEventListener('scroll', this.verticalScrollHandler)
380380
);
381381
}
382382
}
@@ -717,7 +717,7 @@ export class IgxForOfDirective<T> implements OnInit, OnChanges, DoCheck, OnDestr
717717
* ```
718718
*/
719719
public getScroll() {
720-
return this.scrollComponent.nativeElement;
720+
return this.scrollComponent?.nativeElement;
721721
}
722722
/**
723723
* 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
@@ -3288,10 +3288,10 @@ export abstract class IgxGridBaseDirective extends DisplayDensityBase implements
32883288

32893289
this.zone.runOutsideAngular(() => {
32903290
this.observer.disconnect();
3291-
this.verticalScrollContainer.getScroll().removeEventListener('scroll', this.verticalScrollHandler);
3292-
this.headerContainer.getScroll().removeEventListener('scroll', this.horizontalScrollHandler);
3293-
const vertScrDC = this.verticalScrollContainer.displayContainer;
3294-
vertScrDC.removeEventListener('scroll', this.preventContainerScroll);
3291+
this.verticalScrollContainer?.getScroll()?.removeEventListener('scroll', this.verticalScrollHandler);
3292+
this.headerContainer?.getScroll()?.removeEventListener('scroll', this.horizontalScrollHandler);
3293+
const vertScrDC = this.verticalScrollContainer?.displayContainer;
3294+
vertScrDC?.removeEventListener('scroll', this.preventContainerScroll);
32953295
});
32963296
}
32973297

0 commit comments

Comments
 (0)