Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(detached-loader): completely deatch components #2257

Merged
merged 2 commits into from
Sep 21, 2020
Merged

fix(detached-loader): completely deatch components #2257

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
acec4f7
fix(detached-loader): completely deatch components
edusperoni Sep 20, 2020
f75ab45
chore: fix lint
edusperoni Sep 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 15 additions & 4 deletions nativescript-angular/common/detached-loader.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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