Skip to content

Commit

Permalink
fix(detached-loader): completely deatch components (#2257)
Browse files Browse the repository at this point in the history
  • Loading branch information
edusperoni committed Sep 21, 2020
1 parent fa761ae commit 623d2f7
Showing 1 changed file with 15 additions and 4 deletions.
19 changes: 15 additions & 4 deletions nativescript-angular/common/detached-loader.ts
@@ -1,4 +1,4 @@
import { ComponentRef, ComponentFactory, ViewContainerRef, Component, Type, ComponentFactoryResolver, ChangeDetectorRef } from '@angular/core';
import { ComponentRef, ComponentFactory, ViewContainerRef, Component, Type, ComponentFactoryResolver, ChangeDetectorRef, ApplicationRef, OnDestroy } from '@angular/core';
import { Trace } from '@nativescript/core';

/**
Expand All @@ -10,13 +10,20 @@ import { Trace } from '@nativescript/core';
selector: 'DetachedContainer',
template: `<Placeholder #loader></Placeholder>`,
})
export class DetachedLoader {
export class DetachedLoader implements OnDestroy {
private disposeFunctions: Array<() => void> = [];
// tslint:disable-line:component-class-suffix
constructor(private resolver: ComponentFactoryResolver, private changeDetector: ChangeDetectorRef, private containerRef: ViewContainerRef) {}
constructor(private resolver: ComponentFactoryResolver, private changeDetector: ChangeDetectorRef, private containerRef: ViewContainerRef, private appRef: ApplicationRef) {}

private loadInLocation(componentType: Type<any>): Promise<ComponentRef<any>> {
const factory = this.resolver.resolveComponentFactory(componentType);
const componentRef = this.containerRef.createComponent(factory, this.containerRef.length, this.containerRef.injector);
const componentRef = factory.create(this.containerRef.injector);
this.appRef.attachView(componentRef.hostView);

this.disposeFunctions.push(() => {
this.appRef.detachView(componentRef.hostView);
componentRef.destroy();
});

// Component is created, built may not be checked if we are loading
// inside component with OnPush CD strategy. Mark us for check to be sure CD will reach us.
Expand All @@ -27,6 +34,10 @@ export class DetachedLoader {
return Promise.resolve(componentRef);
}

public ngOnDestroy() {
this.disposeFunctions.forEach((fn) => fn());
}

public detectChanges() {
this.changeDetector.markForCheck();
}
Expand Down

0 comments on commit 623d2f7

Please sign in to comment.