From 22d3226491ab1e593f0063ba4c1fcc3d91bdf9ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matias=20Niemel=C3=A4?= <matias@yearofmoo.com>
Date: Tue, 5 Feb 2019 21:07:03 -0800
Subject: [PATCH] revert: fix(ivy): remove query results from destroyed
 embedded views (#28445)

This reverts commit 5ebc0da640f9e654b3111a0e33ce7844fe884605.
---
 .../core/src/render3/node_manipulation.ts     | 22 ++++--------------
 packages/core/src/render3/util.ts             |  3 +--
 .../test/linker/query_integration_spec.ts     | 23 ++++++++++---------
 3 files changed, 18 insertions(+), 30 deletions(-)

diff --git a/packages/core/src/render3/node_manipulation.ts b/packages/core/src/render3/node_manipulation.ts
index d7faf85de5..4fb1b6ce05 100644
--- a/packages/core/src/render3/node_manipulation.ts
+++ b/packages/core/src/render3/node_manipulation.ts
@@ -242,17 +242,14 @@ export function destroyViewTree(rootView: LView): void {
   while (viewOrContainer) {
     let next: LView|LContainer|null = null;
 
-    if (isLContainer(viewOrContainer)) {
-      // If container, traverse down to its first LView.
-      const container = viewOrContainer as LContainer;
-      const viewsInContainer = container[VIEWS];
-      if (viewsInContainer.length) {
-        next = viewsInContainer[0];
-      }
-    } else {
+    if (viewOrContainer.length >= HEADER_OFFSET) {
       // If LView, traverse down to child.
       const view = viewOrContainer as LView;
       if (view[TVIEW].childIndex > -1) next = getLViewChild(view);
+    } else {
+      // If container, traverse down to its first LView.
+      const container = viewOrContainer as LContainer;
+      if (container[VIEWS].length) next = container[VIEWS][0];
     }
 
     if (next == null) {
@@ -261,15 +258,6 @@ export function destroyViewTree(rootView: LView): void {
       while (viewOrContainer && !viewOrContainer ![NEXT] && viewOrContainer !== rootView) {
         cleanUpView(viewOrContainer);
         viewOrContainer = getParentState(viewOrContainer, rootView);
-        if (isLContainer(viewOrContainer)) {
-          // this view will be destroyed so we need to notify queries that a view is detached
-          const viewsInContainer = (viewOrContainer as LContainer)[VIEWS];
-          for (let viewToDetach of viewsInContainer) {
-            if (viewToDetach[QUERIES]) {
-              viewToDetach[QUERIES] !.removeView();
-            }
-          }
-        }
       }
       cleanUpView(viewOrContainer || rootView);
       next = viewOrContainer && viewOrContainer ![NEXT];
diff --git a/packages/core/src/render3/util.ts b/packages/core/src/render3/util.ts
index 3f67b07d38..a90a6c3001 100644
--- a/packages/core/src/render3/util.ts
+++ b/packages/core/src/render3/util.ts
@@ -127,8 +127,7 @@ export function isComponentDef<T>(def: DirectiveDef<T>): def is ComponentDef<T>
   return (def as ComponentDef<T>).template !== null;
 }
 
-export function isLContainer(
-    value: RElement | RComment | LContainer | LView | StylingContext | null): boolean {
+export function isLContainer(value: RElement | RComment | LContainer | StylingContext): boolean {
   // Styling contexts are also arrays, but their first index contains an element node
   return Array.isArray(value) && value.length === LCONTAINER_LENGTH;
 }
diff --git a/packages/core/test/linker/query_integration_spec.ts b/packages/core/test/linker/query_integration_spec.ts
index 4b4e32f194..fcaf05e908 100644
--- a/packages/core/test/linker/query_integration_spec.ts
+++ b/packages/core/test/linker/query_integration_spec.ts
@@ -633,24 +633,25 @@ describe('Query API', () => {
           expect(q.query.map((d: TextDirective) => d.text)).toEqual(['2', '1']);
         });
 
-    it('should remove manually projected templates if their parent view is destroyed', () => {
-      const template = `
+    fixmeIvy('FW-920: Queries in nested views are not destroyed properly')
+        .it('should remove manually projected templates if their parent view is destroyed', () => {
+          const template = `
           <manual-projecting #q><ng-template #tpl><div text="1"></div></ng-template></manual-projecting>
           <div *ngIf="shouldShow">
             <ng-container [ngTemplateOutlet]="tpl"></ng-container>
           </div>
         `;
-      const view = createTestCmp(MyComp0, template);
-      const q = view.debugElement.children[0].references !['q'];
-      view.componentInstance.shouldShow = true;
-      view.detectChanges();
+          const view = createTestCmp(MyComp0, template);
+          const q = view.debugElement.children[0].references !['q'];
+          view.componentInstance.shouldShow = true;
+          view.detectChanges();
 
-      expect(q.query.length).toBe(1);
+          expect(q.query.length).toBe(1);
 
-      view.componentInstance.shouldShow = false;
-      view.detectChanges();
-      expect(q.query.length).toBe(0);
-    });
+          view.componentInstance.shouldShow = false;
+          view.detectChanges();
+          expect(q.query.length).toBe(0);
+        });
 
     modifiedInIvy('https://github.com/angular/angular/issues/15117 fixed in ivy')
         .it('should not throw if a content template is queried and created in the view during change detection',