Skip to content

fix: use providers' map for injectors in page-router-outlet (#744) #748

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

Merged
merged 1 commit into from
Apr 18, 2017
Merged

fix: use providers' map for injectors in page-router-outlet (#744) #748

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
57 changes: 18 additions & 39 deletions nativescript-angular/router/page-router-outlet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import {
Attribute, ComponentFactory, ComponentRef, Directive,
ViewContainerRef,
ViewContainerRef, Type, InjectionToken,
Inject, ComponentFactoryResolver, Injector
} from "@angular/core";
import { RouterOutletMap, ActivatedRoute, PRIMARY_OUTLET } from "@angular/router";
Expand Down Expand Up @@ -167,19 +167,22 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
activatedRoute: ActivatedRoute,
outletMap: RouterOutletMap,
loadedResolver: ComponentFactoryResolver): void {
const factory = this.getComponentFactory(activatedRoute, loadedResolver);

const pageRoute = new PageRoute(activatedRoute);

let providers = new Map<Type<any>|InjectionToken<any>, any>();
providers.set(PageRoute, pageRoute);
providers.set(ActivatedRoute, activatedRoute);
providers.set(RouterOutletMap, outletMap);
const childInjector = new ChildInjector(providers, this.location.injector);

const factory = this.getComponentFactory(activatedRoute, loadedResolver);
if (this.isInitialPage) {
log("PageRouterOutlet.activate() initial page - just load component");

this.isInitialPage = false;

const injector = new OutletInjector(activatedRoute, outletMap, this.location.injector);
this.currentActivatedComp = this.location.createComponent(
factory, this.location.length, injector, []);

factory, this.location.length, childInjector, []);
this.currentActivatedComp.changeDetectorRef.detectChanges();

this.refCache.push(this.currentActivatedComp, pageRoute, outletMap, null);
Expand All @@ -193,7 +196,7 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
componentType: factory.componentType
});

const childInjector = new ChildInjector(activatedRoute, outletMap, page, this.location.injector);
providers.set(Page, page);

const loaderRef = this.location.createComponent(
this.detachedLoaderFactory, this.location.length, childInjector, []);
Expand Down Expand Up @@ -264,47 +267,23 @@ export class PageRouterOutlet { // tslint:disable-line:directive-class-suffix
): ComponentFactory<any> {
const snapshot = activatedRoute._futureSnapshot;
const component = <any>snapshot._routeConfig.component;
let factory: ComponentFactory<any>;

if (loadedResolver) {
factory = loadedResolver.resolveComponentFactory(component);
return loadedResolver.resolveComponentFactory(component);
} else {
factory = this.componentFactoryResolver.resolveComponentFactory(component);
}

return factory;
}
}

class OutletInjector implements Injector {
constructor(
private route: ActivatedRoute, private map: RouterOutletMap, private parent: Injector) { }

get(token: any, notFoundValue?: any): any {
if (token === ActivatedRoute) {
return this.route;
}

if (token === RouterOutletMap) {
return this.map;
return this.componentFactoryResolver.resolveComponentFactory(component);
}

return this.parent.get(token, notFoundValue);
}
}

class ChildInjector extends OutletInjector {
class ChildInjector implements Injector {
constructor(
route: ActivatedRoute, map: RouterOutletMap, private page: Page, parent: Injector) {
super(route, map, parent);
}

get(token: any, notFoundValue?: any): any {
if (token === Page) {
return this.page;
}
private providers: Map<Type<any>|InjectionToken<any>, any>,
private parent: Injector
) {}

return super.get(token, notFoundValue);
get<T>(token: Type<T>|InjectionToken<T>, notFoundValue?: T): T {
return this.providers.get(token) || this.parent.get(token, notFoundValue);
}
}

Expand Down