fix(ivy): descend into view containers on elements when collecting ro…

…otNodes (#33493) PR Close #33493
angular · Oct 30, 2019 · 87743f1 · 87743f1
1 parent 502fb7e
commit 87743f1
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 13 deletions.
diff --git a/packages/core/src/render3/view_ref.ts b/packages/core/src/render3/view_ref.ts
@@ -10,12 +10,13 @@ import {ApplicationRef} from '../application_ref';
 import {ChangeDetectorRef as viewEngine_ChangeDetectorRef} from '../change_detection/change_detector_ref';
 import {ViewContainerRef as viewEngine_ViewContainerRef} from '../linker/view_container_ref';
 import {EmbeddedViewRef as viewEngine_EmbeddedViewRef, InternalViewRef as viewEngine_InternalViewRef} from '../linker/view_ref';
-import {assertDefined} from '../util/assert';
 
 import {checkNoChangesInRootView, checkNoChangesInternal, detectChangesInRootView, detectChangesInternal, markViewDirty, storeCleanupFn} from './instructions/shared';
 import {CONTAINER_HEADER_OFFSET} from './interfaces/container';
+import {LContainer} from './interfaces/container';
 import {TElementNode, TNode, TNodeType, TViewNode} from './interfaces/node';
-import {CONTEXT, FLAGS, HOST, LView, LViewFlags, TView, T_HOST} from './interfaces/view';
+import {isLContainer} from './interfaces/type_checks';
+import {CONTEXT, FLAGS, HOST, LView, LViewFlags, TVIEW, T_HOST} from './interfaces/view';
 import {assertNodeOfPossibleTypes} from './node_assert';
 import {destroyLView, renderDetachView} from './node_manipulation';
 import {findComponentView, getLViewParent} from './util/view_traversal_utils';
@@ -302,33 +303,37 @@ export class RootViewRef<T> extends ViewRef<T> {
   get context(): T { return null !; }
 }
 
+function collectNativeNodesFromAContainer(lContainer: LContainer, result: any[]) {
+  for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
+    const lViewInAContainer = lContainer[i];
+    const lViewFirstChildTNode = lViewInAContainer[TVIEW].firstChild;
+    if (lViewFirstChildTNode !== null) {
+      collectNativeNodes(lViewInAContainer, lViewFirstChildTNode, result);
+    }
+  }
+}
+
 function collectNativeNodes(lView: LView, tNode: TNode | null, result: any[]): any[] {
   while (tNode !== null) {
     ngDevMode && assertNodeOfPossibleTypes(
                      tNode, TNodeType.Element, TNodeType.Container, TNodeType.Projection,
                      TNodeType.ElementContainer);
     const nativeNode = getNativeByTNodeOrNull(tNode, lView);
     nativeNode && result.push(nativeNode);
-    if (tNode.type === TNodeType.ElementContainer) {
+    if (tNode.type === TNodeType.Element && isLContainer(lView[tNode.index])) {
+      collectNativeNodesFromAContainer(lView[tNode.index], result);
+    } else if (tNode.type === TNodeType.ElementContainer) {
       collectNativeNodes(lView, tNode.child, result);
     } else if (tNode.type === TNodeType.Container) {
-      const lContainer = lView[tNode.index];
-      const containerTView = tNode.tViews !as TView;
-      ngDevMode && assertDefined(containerTView, 'TView expected');
-      const containerFirstChildTNode = containerTView.firstChild !;
-      if (containerFirstChildTNode !== null) {
-        for (let i = CONTAINER_HEADER_OFFSET; i < lContainer.length; i++) {
-          collectNativeNodes(lContainer[i], containerFirstChildTNode, result);
-        }
-      }
+      collectNativeNodesFromAContainer(lView[tNode.index], result);
     } else if (tNode.type === TNodeType.Projection) {
       const componentView = findComponentView(lView);
       const componentHost = componentView[T_HOST] as TElementNode;
       const parentView = getLViewParent(componentView);
       let currentProjectedNode: TNode|null =
           (componentHost.projection as(TNode | null)[])[tNode.projection as number];
 
-      while (currentProjectedNode && parentView) {
+      while (currentProjectedNode !== null && parentView !== null) {
         result.push(getNativeByTNode(currentProjectedNode, parentView));
         currentProjectedNode = currentProjectedNode.next;
       }

diff --git a/packages/core/test/acceptance/template_ref_spec.ts b/packages/core/test/acceptance/template_ref_spec.ts
@@ -139,6 +139,38 @@ describe('TemplateRef', () => {
       expect(embeddedView.rootNodes[2].nodeType).toBe(Node.TEXT_NODE);
     });
 
+    it('should descend into view containers on an element', () => {
+      /**
+       * NOTE: In VE, if `SUFFIX` text node below is _not_ present, VE will add an
+       * additional `<!---->` comment, thus being slightly different than Ivy.
+       * (resulting in 1 root node in Ivy and 2 in VE).
+       */
+      @Component({
+        template: `
+          <ng-template #dynamicTpl>text</ng-template>
+          <ng-template #templateRef><div [ngTemplateOutlet]="dynamicTpl"></div>SUFFIX</ng-template>
+        `
+      })
+      class App {
+        @ViewChild('templateRef', {static: true})
+        templateRef !: TemplateRef<any>;
+      }
+
+      TestBed.configureTestingModule({
+        declarations: [App],
+      });
+      const fixture = TestBed.createComponent(App);
+      fixture.detectChanges();
+
+      const embeddedView = fixture.componentInstance.templateRef.createEmbeddedView({});
+      embeddedView.detectChanges();
+
+      expect(embeddedView.rootNodes.length).toBe(3);
+      expect(embeddedView.rootNodes[0].nodeType).toBe(Node.ELEMENT_NODE);
+      expect(embeddedView.rootNodes[1].nodeType).toBe(Node.TEXT_NODE);
+      expect(embeddedView.rootNodes[2].nodeType).toBe(Node.TEXT_NODE);
+    });
+
     it('should descend into element containers when retrieving root nodes', () => {
       @Component({
         template: `