honeymoose
/
angular-cn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(ivy): Ensure ComponentFactory uses both injectors to retrieve rendererFactory (#27341) 

PR Close #27341
This commit is contained in:
Misko Hevery 2018-11-28 20:42:40 -08:00 committed by Alex Rickabaugh
parent 6f5c124fe9
commit 7d89cff545
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packages/core/src/render3/component_ref.ts
View File

@ -115,15 +115,12 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> { ngModule?: viewEngine_NgModuleRef<any>|undefined): viewEngine_ComponentRef<T> {
const isInternalRootView = rootSelectorOrNode === undefined; const isInternalRootView = rootSelectorOrNode === undefined;
let rendererFactory: RendererFactory3; const rootViewInjector =
let sanitizer: Sanitizer|null = null; ngModule ? createChainedInjector(injector, ngModule.injector) : injector;
if (ngModule) { const rendererFactory =
rendererFactory = ngModule.injector.get(RendererFactory2) as RendererFactory3; rootViewInjector.get(RendererFactory2, domRendererFactory3) as RendererFactory3;
sanitizer = ngModule.injector.get(Sanitizer, null); const sanitizer = rootViewInjector.get(Sanitizer, null);
} else {
rendererFactory = domRendererFactory3;
}
const hostRNode = isInternalRootView ? const hostRNode = isInternalRootView ?
elementCreate(this.selector, rendererFactory.createRenderer(null, this.componentDef)) : elementCreate(this.selector, rendererFactory.createRenderer(null, this.componentDef)) :
@ -132,11 +129,9 @@ export class ComponentFactory<T> extends viewEngine_ComponentFactory<T> {
const rootFlags = this.componentDef.onPush ? LViewFlags.Dirty | LViewFlags.IsRoot : const rootFlags = this.componentDef.onPush ? LViewFlags.Dirty | LViewFlags.IsRoot :
LViewFlags.CheckAlways | LViewFlags.IsRoot; LViewFlags.CheckAlways | LViewFlags.IsRoot;
const rootContext: RootContext = const rootContext: RootContext =
ngModule && !isInternalRootView ? ngModule.injector.get(ROOT_CONTEXT) : createRootContext(); !isInternalRootView ? rootViewInjector.get(ROOT_CONTEXT) : createRootContext();
const renderer = rendererFactory.createRenderer(hostRNode, this.componentDef); const renderer = rendererFactory.createRenderer(hostRNode, this.componentDef);
const rootViewInjector =
ngModule ? createChainedInjector(injector, ngModule.injector) : injector;
if (rootSelectorOrNode && hostRNode) { if (rootSelectorOrNode && hostRNode) {
ngDevMode && ngDevMode.rendererSetAttribute++; ngDevMode && ngDevMode.rendererSetAttribute++;