From 46992b4bda140fd4571fe274fc27bf3f1cef6920 Mon Sep 17 00:00:00 2001
From: Chuck Jazdzewski <chuckj@google.com>
Date: Wed, 11 Oct 2017 10:51:52 -0700
Subject: [PATCH] Revert "fix(animations): ensure animateChild() works with all
 inner leave animations (#19006) (#19532)"

This reverts commit 9130505b57c10dc6f4cd9b12ca47e06c4f429b74.
---
 .../src/render/transition_animation_engine.ts | 42 +++--------
 .../animation_query_integration_spec.ts       | 71 -------------------
 2 files changed, 11 insertions(+), 102 deletions(-)

diff --git a/packages/animations/browser/src/render/transition_animation_engine.ts b/packages/animations/browser/src/render/transition_animation_engine.ts
index ce0ca4231f..dbb2ce4f16 100644
--- a/packages/animations/browser/src/render/transition_animation_engine.ts
+++ b/packages/animations/browser/src/render/transition_animation_engine.ts
@@ -68,7 +68,7 @@ export class StateValue {
 
   get params(): {[key: string]: any} { return this.options.params as{[key: string]: any}; }
 
-  constructor(input: any, public namespaceId: string = '') {
+  constructor(input: any) {
     const isObj = input && input.hasOwnProperty('value');
     const value = isObj ? input['value'] : input;
     this.value = normalizeTriggerValue(value);
@@ -192,7 +192,7 @@ export class AnimationTransitionNamespace {
     }
 
     let fromState = triggersWithStates[triggerName];
-    const toState = new StateValue(value, this.id);
+    const toState = new StateValue(value);
 
     const isObj = value && value.hasOwnProperty('value');
     if (!isObj && fromState) {
@@ -306,13 +306,16 @@ export class AnimationTransitionNamespace {
   }
 
   private _destroyInnerNodes(rootElement: any, context: any, animate: boolean = false) {
-    // emulate a leave animation for all inner nodes within this node.
-    // If there are no animations found for any of the nodes then clear the cache
-    // for the element.
     this._engine.driver.query(rootElement, NG_TRIGGER_SELECTOR, true).forEach(elm => {
-      const namespaces = this._engine.fetchNamespacesByElement(elm);
-      if (namespaces.size) {
-        namespaces.forEach(ns => ns.removeNode(elm, context, true));
+      if (animate && containsClass(elm, this._hostClassName)) {
+        const innerNs = this._engine.namespacesByHostElement.get(elm);
+
+        // special case for a host element with animations on the same element
+        if (innerNs) {
+          innerNs.removeNode(elm, context, true);
+        }
+
+        this.removeNode(elm, context, true);
       } else {
         this.clearElementCache(elm);
       }
@@ -600,29 +603,6 @@ export class TransitionAnimationEngine {
 
   private _fetchNamespace(id: string) { return this._namespaceLookup[id]; }
 
-  fetchNamespacesByElement(element: any): Set<AnimationTransitionNamespace> {
-    // normally there should only be one namespace per element, however
-    // if @triggers are placed on both the component element and then
-    // its host element (within the component code) then there will be
-    // two namespaces returned. We use a set here to simply the dedupe
-    // of namespaces incase there are multiple triggers both the elm and host
-    const namespaces = new Set<AnimationTransitionNamespace>();
-    const elementStates = this.statesByElement.get(element);
-    if (elementStates) {
-      const keys = Object.keys(elementStates);
-      for (let i = 0; i < keys.length; i++) {
-        const nsId = elementStates[keys[i]].namespaceId;
-        if (nsId) {
-          const ns = this._fetchNamespace(nsId);
-          if (ns) {
-            namespaces.add(ns);
-          }
-        }
-      }
-    }
-    return namespaces;
-  }
-
   trigger(namespaceId: string, element: any, name: string, value: any): boolean {
     if (isElementNode(element)) {
       this._fetchNamespace(namespaceId).trigger(element, name, value);
diff --git a/packages/core/test/animation/animation_query_integration_spec.ts b/packages/core/test/animation/animation_query_integration_spec.ts
index 08ab6edb46..a414458014 100644
--- a/packages/core/test/animation/animation_query_integration_spec.ts
+++ b/packages/core/test/animation/animation_query_integration_spec.ts
@@ -2309,77 +2309,6 @@ export function main() {
            expect(childCmp.childEvent.totalTime).toEqual(1000);
          }));
 
-      it('should emulate a leave animation on a sub component\'s inner elements when a parent leave animation occurs with animateChild',
-         () => {
-           @Component({
-             selector: 'ani-cmp',
-             template: `
-            <div @myAnimation *ngIf="exp" class="parent">
-              <child-cmp></child-cmp>
-            </div>
-          `,
-             animations: [
-               trigger(
-                   'myAnimation',
-                   [
-                     transition(
-                         ':leave',
-                         [
-                           query('@*', animateChild()),
-                         ]),
-                   ]),
-             ]
-           })
-           class ParentCmp {
-             public exp: boolean = true;
-           }
-
-           @Component({
-             selector: 'child-cmp',
-             template: `
-               <section>
-                 <div class="inner-div" @myChildAnimation></div>
-               </section>
-             `,
-             animations: [
-               trigger(
-                   'myChildAnimation',
-                   [
-                     transition(
-                         ':leave',
-                         [
-                           style({opacity: 0}),
-                           animate('1s', style({opacity: 1})),
-                         ]),
-                   ]),
-             ]
-           })
-           class ChildCmp {
-           }
-
-           TestBed.configureTestingModule({declarations: [ParentCmp, ChildCmp]});
-
-           const engine = TestBed.get(ɵAnimationEngine);
-           const fixture = TestBed.createComponent(ParentCmp);
-           const cmp = fixture.componentInstance;
-
-           cmp.exp = true;
-           fixture.detectChanges();
-
-           cmp.exp = false;
-           fixture.detectChanges();
-
-           let players = getLog();
-           expect(players.length).toEqual(1);
-           const [player] = players;
-
-           expect(player.element.classList.contains('inner-div')).toBeTruthy();
-           expect(player.keyframes).toEqual([
-             {opacity: '0', offset: 0},
-             {opacity: '1', offset: 1},
-           ]);
-         });
-
       it('should only mark outermost *directive nodes :enter and :leave when inserts and removals occur',
          () => {
            @Component({