Elgato_dark/angular
1
0
Fork 0
mirror of https://github.com/angular/angular synced 2026-05-24 09:28:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

refactor(router): Remove use of OutletInjector

Browse source 
OutletInjector doesn't do anything special. Injector.create can be used instead
This commit is contained in:
Andrew Scott 2022-07-08 12:25:14 -07:00
parent bd927236df
commit e288d87742
2 changed files with 7 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
packages/core/test/bundling/router/bundle.golden_symbols.json
View file

@ -428,9 +428,6 @@
{
"name": "OuterSubscriber"
},
{
"name": "OutletInjector"
},
{
"name": "PLATFORM_DESTROY_LISTENERS"
},

26
packages/router/src/directives/router_outlet.ts
View file

@ -287,7 +287,13 @@ export class RouterOutlet implements OnDestroy, OnInit, RouterOutletContract {
const snapshot = activatedRoute._futureSnapshot;
const component = snapshot.component!;
const childContexts = this.parentContexts.getOrCreateContext(this.name).children;
const injector = new OutletInjector(activatedRoute, childContexts, location.injector);
const injector = Injector.create({
providers: [
{provide: ActivatedRoute, useValue: activatedRoute},
{provide: ChildrenOutletContexts, useValue: childContexts}
],
parent: location.injector
});
if (resolverOrInjector && isComponentFactoryResolver(resolverOrInjector)) {
const factory = resolverOrInjector.resolveComponentFactory(component);
@ -304,24 +310,6 @@ export class RouterOutlet implements OnDestroy, OnInit, RouterOutletContract {
}
}
class OutletInjector implements Injector {
constructor(
private route: ActivatedRoute, private childContexts: ChildrenOutletContexts,
private parent: Injector) {}
get(token: any, notFoundValue?: any): any {
if (token === ActivatedRoute) {
return this.route;
}
if (token === ChildrenOutletContexts) {
return this.childContexts;
}
return this.parent.get(token, notFoundValue);
}
}
function isComponentFactoryResolver(item: any): item is ComponentFactoryResolver {
return !!item.resolveComponentFactory;
}