refactor(core): allow passing an environment injector while creating a view (#54903)

AndrewKushnir · alxhub · commit 1f5ab960ef87 · 2024-03-18T16:37:36.000-07:00
This commit updates the name of an internal function argument that represents an embedded view injector. Also it introduces a new config option that allows passing an environment injector to be used in the underlying LView. There are no changes to the behavior, just some initial cleanup for upcoming changes. PR Close #54903
diff --git a/packages/core/src/defer/instructions.ts b/packages/core/src/defer/instructions.ts
@@ -542,8 +542,8 @@ function applyDeferBlockState(
       }
     }
     const dehydratedView = findMatchingDehydratedView(lContainer, activeBlockTNode.tView!.ssrId);
-    const embeddedLView =
-        createAndRenderEmbeddedLView(hostLView, activeBlockTNode, null, {dehydratedView, injector});
+    const embeddedLView = createAndRenderEmbeddedLView(
+        hostLView, activeBlockTNode, null, {dehydratedView, embeddedViewInjector: injector});
     addLViewToLContainer(
         lContainer, embeddedLView, viewIndex, shouldAddViewToDom(activeBlockTNode, dehydratedView));
     markViewDirty(embeddedLView);
diff --git a/packages/core/src/linker/template_ref.ts b/packages/core/src/linker/template_ref.ts
@@ -120,7 +120,8 @@ const R3TemplateRef = class TemplateRef<T> extends ViewEngineTemplateRef<T> {
       context: T, injector?: Injector,
       dehydratedView?: DehydratedContainerView): EmbeddedViewRef<T> {
     const embeddedLView = createAndRenderEmbeddedLView(
-        this._declarationLView, this._declarationTContainer, context, {injector, dehydratedView});
+        this._declarationLView, this._declarationTContainer, context,
+        {embeddedViewInjector: injector, dehydratedView});
     return new R3_ViewRef<T>(embeddedLView);
   }
 };
diff --git a/packages/core/src/render3/view_manipulation.ts b/packages/core/src/render3/view_manipulation.ts
@@ -23,8 +23,11 @@ import {DECLARATION_LCONTAINER, FLAGS, HYDRATION, LView, LViewFlags, QUERIES, RE
 import {addViewToDOM, destroyLView, detachView, getBeforeNodeForView, insertView, nativeParentNode} from './node_manipulation';
 
 export function createAndRenderEmbeddedLView<T>(
-    declarationLView: LView<unknown>, templateTNode: TNode, context: T,
-    options?: {injector?: Injector, dehydratedView?: DehydratedContainerView|null}): LView<T> {
+    declarationLView: LView<unknown>, templateTNode: TNode, context: T, options?: {
+      injector?: Injector,
+      embeddedViewInjector?: Injector,
+      dehydratedView?: DehydratedContainerView|null
+    }): LView<T> {
   const prevConsumer = setActiveConsumer(null);
   try {
     const embeddedTView = templateTNode.tView!;
@@ -35,8 +38,9 @@ export function createAndRenderEmbeddedLView<T>(
     const isSignalView = declarationLView[FLAGS] & LViewFlags.SignalView;
     const viewFlags = isSignalView ? LViewFlags.SignalView : LViewFlags.CheckAlways;
     const embeddedLView = createLView<T>(
-        declarationLView, embeddedTView, context, viewFlags, null, templateTNode, null, null, null,
-        options?.injector ?? null, options?.dehydratedView ?? null);
+        declarationLView, embeddedTView, context, viewFlags, null, templateTNode, null, null,
+        options?.injector ?? null, options?.embeddedViewInjector ?? null,
+        options?.dehydratedView ?? null);
 
     const declarationLContainer = declarationLView[templateTNode.index];
     ngDevMode && assertLContainer(declarationLContainer);

Original file line number	Diff line number	Diff line change
`@@ -542,8 +542,8 @@ function applyDeferBlockState(`
`542`	`542`	`}`
`543`	`543`	`}`
`544`	`544`	`const dehydratedView = findMatchingDehydratedView(lContainer, activeBlockTNode.tView!.ssrId);`
`545`		`- const embeddedLView =`
`546`		`- createAndRenderEmbeddedLView(hostLView, activeBlockTNode, null, {dehydratedView, injector});`
	`545`	`+ const embeddedLView = createAndRenderEmbeddedLView(`
	`546`	`+ hostLView, activeBlockTNode, null, {dehydratedView, embeddedViewInjector: injector});`
`547`	`547`	`addLViewToLContainer(`
`548`	`548`	`lContainer, embeddedLView, viewIndex, shouldAddViewToDom(activeBlockTNode, dehydratedView));`
`549`	`549`	`markViewDirty(embeddedLView);`