test(animations): properly reference body node for SSR environments (#23300)

PR Close #23300
This commit is contained in:
Matias Niemelä 2018-04-10 15:10:29 -07:00 committed by Miško Hevery
parent 5b76f04b7f
commit e8354edcd2
8 changed files with 32 additions and 19 deletions

View File

@ -25,9 +25,11 @@ export class AnimationEngine {
// this method is designed to be overridden by the code that uses this engine // this method is designed to be overridden by the code that uses this engine
public onRemovalComplete = (element: any, context: any) => {}; public onRemovalComplete = (element: any, context: any) => {};
constructor(private _driver: AnimationDriver, normalizer: AnimationStyleNormalizer) { constructor(
this._transitionEngine = new TransitionAnimationEngine(_driver, normalizer); private bodyNode: any, private _driver: AnimationDriver,
this._timelineEngine = new TimelineAnimationEngine(_driver, normalizer); normalizer: AnimationStyleNormalizer) {
this._transitionEngine = new TransitionAnimationEngine(bodyNode, _driver, normalizer);
this._timelineEngine = new TimelineAnimationEngine(bodyNode, _driver, normalizer);
this._transitionEngine.onRemovalComplete = (element: any, context: any) => this._transitionEngine.onRemovalComplete = (element: any, context: any) =>
this.onRemovalComplete(element, context); this.onRemovalComplete(element, context);

View File

@ -25,7 +25,9 @@ export class TimelineAnimationEngine {
private _playersById: {[id: string]: AnimationPlayer} = {}; private _playersById: {[id: string]: AnimationPlayer} = {};
public players: AnimationPlayer[] = []; public players: AnimationPlayer[] = [];
constructor(private _driver: AnimationDriver, private _normalizer: AnimationStyleNormalizer) {} constructor(
public bodyNode: any, private _driver: AnimationDriver,
private _normalizer: AnimationStyleNormalizer) {}
register(id: string, metadata: AnimationMetadata|AnimationMetadata[]) { register(id: string, metadata: AnimationMetadata|AnimationMetadata[]) {
const errors: any[] = []; const errors: any[] = [];

View File

@ -16,7 +16,7 @@ import {AnimationStyleNormalizer} from '../dsl/style_normalization/animation_sty
import {ENTER_CLASSNAME, LEAVE_CLASSNAME, NG_ANIMATING_CLASSNAME, NG_ANIMATING_SELECTOR, NG_TRIGGER_CLASSNAME, NG_TRIGGER_SELECTOR, copyObj, eraseStyles, iteratorToArray, setStyles} from '../util'; import {ENTER_CLASSNAME, LEAVE_CLASSNAME, NG_ANIMATING_CLASSNAME, NG_ANIMATING_SELECTOR, NG_TRIGGER_CLASSNAME, NG_TRIGGER_SELECTOR, copyObj, eraseStyles, iteratorToArray, setStyles} from '../util';
import {AnimationDriver} from './animation_driver'; import {AnimationDriver} from './animation_driver';
import {getBodyNode, getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared'; import {getOrSetAsInMap, listenOnPlayer, makeAnimationEvent, normalizeKeyframes, optimizeGroupPlayer} from './shared';
const QUEUED_CLASSNAME = 'ng-animate-queued'; const QUEUED_CLASSNAME = 'ng-animate-queued';
const QUEUED_SELECTOR = '.ng-animate-queued'; const QUEUED_SELECTOR = '.ng-animate-queued';
@ -530,7 +530,9 @@ export class TransitionAnimationEngine {
/** @internal */ /** @internal */
_onRemovalComplete(element: any, context: any) { this.onRemovalComplete(element, context); } _onRemovalComplete(element: any, context: any) { this.onRemovalComplete(element, context); }
constructor(public driver: AnimationDriver, private _normalizer: AnimationStyleNormalizer) {} constructor(
public bodyNode: any, public driver: AnimationDriver,
private _normalizer: AnimationStyleNormalizer) {}
get queuedPlayers(): TransitionAnimationPlayer[] { get queuedPlayers(): TransitionAnimationPlayer[] {
const players: TransitionAnimationPlayer[] = []; const players: TransitionAnimationPlayer[] = [];
@ -890,7 +892,7 @@ export class TransitionAnimationEngine {
} }
}); });
const bodyNode = getBodyNode(); const bodyNode = this.bodyNode;
const allTriggerElements = Array.from(this.statesByElement.keys()); const allTriggerElements = Array.from(this.statesByElement.keys());
const enterNodeMap = buildRootMap(allTriggerElements, this.collectedEnterElements); const enterNodeMap = buildRootMap(allTriggerElements, this.collectedEnterElements);

View File

@ -9,15 +9,16 @@ import {AnimationMetadata, animate, style} from '@angular/animations';
import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer'; import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
import {AnimationDriver} from '../../src/render/animation_driver'; import {AnimationDriver} from '../../src/render/animation_driver';
import {getBodyNode} from '../../src/render/shared';
import {TimelineAnimationEngine} from '../../src/render/timeline_animation_engine'; import {TimelineAnimationEngine} from '../../src/render/timeline_animation_engine';
import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver'; import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver';
(function() { (function() {
const defaultDriver = new MockAnimationDriver(); const defaultDriver = new MockAnimationDriver();
function makeEngine(driver?: AnimationDriver, normalizer?: AnimationStyleNormalizer) { function makeEngine(body: any, driver?: AnimationDriver, normalizer?: AnimationStyleNormalizer) {
return new TimelineAnimationEngine( return new TimelineAnimationEngine(
driver || defaultDriver, normalizer || new NoopAnimationStyleNormalizer()); body, driver || defaultDriver, normalizer || new NoopAnimationStyleNormalizer());
} }
// these tests are only mean't to be run within the DOM // these tests are only mean't to be run within the DOM
@ -35,7 +36,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
afterEach(() => document.body.removeChild(element)); afterEach(() => document.body.removeChild(element));
it('should animate a timeline', () => { it('should animate a timeline', () => {
const engine = makeEngine(); const engine = makeEngine(getBodyNode());
const steps = [style({height: 100}), animate(1000, style({height: 0}))]; const steps = [style({height: 100}), animate(1000, style({height: 0}))];
expect(MockAnimationDriver.log.length).toEqual(0); expect(MockAnimationDriver.log.length).toEqual(0);
invokeAnimation(engine, element, steps); invokeAnimation(engine, element, steps);
@ -43,7 +44,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
}); });
it('should not destroy timeline-based animations after they have finished', () => { it('should not destroy timeline-based animations after they have finished', () => {
const engine = makeEngine(); const engine = makeEngine(getBodyNode());
const log: string[] = []; const log: string[] = [];
function capture(value: string) { function capture(value: string) {
@ -66,7 +67,8 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
it('should normalize the style values that are animateTransitioned within an a timeline animation', it('should normalize the style values that are animateTransitioned within an a timeline animation',
() => { () => {
const engine = makeEngine(defaultDriver, new SuffixNormalizer('-normalized')); const engine =
makeEngine(getBodyNode(), defaultDriver, new SuffixNormalizer('-normalized'));
const steps = [ const steps = [
style({width: '333px'}), style({width: '333px'}),
@ -82,7 +84,7 @@ import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_a
it('should normalize `*` values', () => { it('should normalize `*` values', () => {
const driver = new SuperMockDriver(); const driver = new SuperMockDriver();
const engine = makeEngine(driver); const engine = makeEngine(getBodyNode(), driver);
const steps = [ const steps = [
style({width: '*'}), style({width: '*'}),

View File

@ -11,6 +11,7 @@ import {TriggerAst} from '../../src/dsl/animation_ast';
import {buildAnimationAst} from '../../src/dsl/animation_ast_builder'; import {buildAnimationAst} from '../../src/dsl/animation_ast_builder';
import {buildTrigger} from '../../src/dsl/animation_trigger'; import {buildTrigger} from '../../src/dsl/animation_trigger';
import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer'; import {AnimationStyleNormalizer, NoopAnimationStyleNormalizer} from '../../src/dsl/style_normalization/animation_style_normalizer';
import {getBodyNode} from '../../src/render/shared';
import {TransitionAnimationEngine} from '../../src/render/transition_animation_engine'; import {TransitionAnimationEngine} from '../../src/render/transition_animation_engine';
import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver'; import {MockAnimationDriver, MockAnimationPlayer} from '../../testing/src/mock_animation_driver';
@ -34,8 +35,8 @@ const DEFAULT_NAMESPACE_ID = 'id';
afterEach(() => { document.body.removeChild(element); }); afterEach(() => { document.body.removeChild(element); });
function makeEngine(normalizer?: AnimationStyleNormalizer) { function makeEngine(normalizer?: AnimationStyleNormalizer) {
const engine = const engine = new TransitionAnimationEngine(
new TransitionAnimationEngine(driver, normalizer || new NoopAnimationStyleNormalizer()); getBodyNode(), driver, normalizer || new NoopAnimationStyleNormalizer());
engine.createNamespace(DEFAULT_NAMESPACE_ID, element); engine.createNamespace(DEFAULT_NAMESPACE_ID, element);
return engine; return engine;
} }

View File

@ -50,7 +50,8 @@ export function getAnimationRendererFactory2(document: any): RendererFactory2 {
const fakeNgZone: NgZone = new NoopNgZone(); const fakeNgZone: NgZone = new NoopNgZone();
return new ɵAnimationRendererFactory( return new ɵAnimationRendererFactory(
getRendererFactory2(document), getRendererFactory2(document),
new ɵAnimationEngine(new MockAnimationDriver(), new ɵNoopAnimationStyleNormalizer()), new ɵAnimationEngine(
document.body, new MockAnimationDriver(), new ɵNoopAnimationStyleNormalizer()),
fakeNgZone); fakeNgZone);
} }

View File

@ -16,6 +16,7 @@ ng_module(
deps = [ deps = [
"//packages/animations", "//packages/animations",
"//packages/animations/browser", "//packages/animations/browser",
"//packages/common",
"//packages/core", "//packages/core",
"//packages/platform-browser", "//packages/platform-browser",
], ],

View File

@ -8,7 +8,8 @@
import {AnimationBuilder} from '@angular/animations'; import {AnimationBuilder} from '@angular/animations';
import {AnimationDriver, ɵAnimationEngine as AnimationEngine, ɵAnimationStyleNormalizer as AnimationStyleNormalizer, ɵCssKeyframesDriver as CssKeyframesDriver, ɵNoopAnimationDriver as NoopAnimationDriver, ɵWebAnimationsDriver as WebAnimationsDriver, ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer, ɵsupportsWebAnimations as supportsWebAnimations} from '@angular/animations/browser'; import {AnimationDriver, ɵAnimationEngine as AnimationEngine, ɵAnimationStyleNormalizer as AnimationStyleNormalizer, ɵCssKeyframesDriver as CssKeyframesDriver, ɵNoopAnimationDriver as NoopAnimationDriver, ɵWebAnimationsDriver as WebAnimationsDriver, ɵWebAnimationsStyleNormalizer as WebAnimationsStyleNormalizer, ɵsupportsWebAnimations as supportsWebAnimations} from '@angular/animations/browser';
import {Injectable, InjectionToken, NgZone, Provider, RendererFactory2} from '@angular/core'; import {DOCUMENT} from '@angular/common';
import {Inject, Injectable, InjectionToken, NgZone, Provider, RendererFactory2} from '@angular/core';
import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser'; import {ɵDomRendererFactory2 as DomRendererFactory2} from '@angular/platform-browser';
import {BrowserAnimationBuilder} from './animation_builder'; import {BrowserAnimationBuilder} from './animation_builder';
@ -16,8 +17,9 @@ import {AnimationRendererFactory} from './animation_renderer';
@Injectable() @Injectable()
export class InjectableAnimationEngine extends AnimationEngine { export class InjectableAnimationEngine extends AnimationEngine {
constructor(driver: AnimationDriver, normalizer: AnimationStyleNormalizer) { constructor(
super(driver, normalizer); @Inject(DOCUMENT) doc: any, driver: AnimationDriver, normalizer: AnimationStyleNormalizer) {
super(doc.body, driver, normalizer);
} }
} }