fix(animations): ensure animation callbacks are fired for embedded views
This commit is contained in:
parent
99c0a7fae2
commit
562c8263dc
|
@ -486,10 +486,13 @@ class _AnimationTemplatePropertyVisitor implements t.TemplateAstVisitor {
|
|||
t.templateVisitAll(this, ast.children);
|
||||
}
|
||||
|
||||
visitEmbeddedTemplate(ast: t.EmbeddedTemplateAst, ctx: any): any {
|
||||
t.templateVisitAll(this, ast.children);
|
||||
}
|
||||
|
||||
visitEvent(ast: t.BoundEventAst, ctx: any): any {}
|
||||
visitBoundText(ast: t.BoundTextAst, ctx: any): any {}
|
||||
visitText(ast: t.TextAst, ctx: any): any {}
|
||||
visitEmbeddedTemplate(ast: t.EmbeddedTemplateAst, ctx: any): any {}
|
||||
visitNgContent(ast: t.NgContentAst, ctx: any): any {}
|
||||
visitAttr(ast: t.AttrAst, ctx: any): any {}
|
||||
visitDirective(ast: t.DirectiveAst, ctx: any): any {}
|
||||
|
|
|
@ -28,7 +28,7 @@ class ViewBinderVisitor implements TemplateAstVisitor {
|
|||
private _nodeIndex: number = 0;
|
||||
private _animationOutputsMap: {[key: string]: AnimationOutput} = {};
|
||||
|
||||
constructor(public view: CompileView, animationOutputs: AnimationOutput[]) {
|
||||
constructor(public view: CompileView, public animationOutputs: AnimationOutput[]) {
|
||||
animationOutputs.forEach(
|
||||
entry => { this._animationOutputsMap[entry.fullPropertyName] = entry; });
|
||||
}
|
||||
|
@ -108,7 +108,7 @@ class ViewBinderVisitor implements TemplateAstVisitor {
|
|||
var providerInstance = compileElement.instances.get(providerAst.token.reference);
|
||||
bindInjectableDestroyLifecycleCallbacks(providerAst, providerInstance, compileElement);
|
||||
});
|
||||
bindView(compileElement.embeddedView, ast.children, []);
|
||||
bindView(compileElement.embeddedView, ast.children, this.animationOutputs);
|
||||
return null;
|
||||
}
|
||||
|
||||
|
|
|
@ -1266,6 +1266,59 @@ function declareTests({useJit}: {useJit: boolean}) {
|
|||
expect(ifCalls).toEqual(2);
|
||||
expect(loadingCalls).toEqual(2);
|
||||
}));
|
||||
|
||||
|
||||
it('should allow animation triggers to trigger on the component when bound to embedded views via ngFor',
|
||||
fakeAsync(() => {
|
||||
TestBed.overrideComponent(DummyIfCmp, {
|
||||
set: {
|
||||
template: `
|
||||
<div *ngFor="let item of items"
|
||||
(@trigger.start)="callback($event, item, 'start')"
|
||||
(@trigger.done)="callback($event, item, 'done')"
|
||||
@trigger>{{ item }}</div>
|
||||
`,
|
||||
animations: [trigger('trigger', [transition('* => *', [animate(1000)])])]
|
||||
}
|
||||
});
|
||||
|
||||
const driver = TestBed.get(AnimationDriver) as InnerContentTrackingAnimationDriver;
|
||||
let fixture = TestBed.createComponent(DummyIfCmp);
|
||||
var cmp = fixture.debugElement.componentInstance;
|
||||
|
||||
var startCalls = [0, 0, 0, 0, 0];
|
||||
var doneCalls = [0, 0, 0, 0, 0];
|
||||
cmp.callback = (e: any, index: number, phase: string) => {
|
||||
(phase == 'start' ? startCalls : doneCalls)[index] = 1;
|
||||
};
|
||||
|
||||
cmp.items = [0, 1, 2, 3, 4];
|
||||
fixture.detectChanges();
|
||||
flushMicrotasks();
|
||||
|
||||
for (var i = 0; i < cmp.items.length; i++) {
|
||||
expect(startCalls[i]).toEqual(1);
|
||||
}
|
||||
|
||||
driver.log[0]['player'].finish();
|
||||
driver.log[2]['player'].finish();
|
||||
driver.log[4]['player'].finish();
|
||||
|
||||
expect(doneCalls[0]).toEqual(1);
|
||||
expect(doneCalls[1]).toEqual(0);
|
||||
expect(doneCalls[2]).toEqual(1);
|
||||
expect(doneCalls[3]).toEqual(0);
|
||||
expect(doneCalls[4]).toEqual(1);
|
||||
|
||||
driver.log[1]['player'].finish();
|
||||
driver.log[3]['player'].finish();
|
||||
|
||||
expect(doneCalls[0]).toEqual(1);
|
||||
expect(doneCalls[1]).toEqual(1);
|
||||
expect(doneCalls[2]).toEqual(1);
|
||||
expect(doneCalls[3]).toEqual(1);
|
||||
expect(doneCalls[4]).toEqual(1);
|
||||
}));
|
||||
});
|
||||
|
||||
describe('ng directives', () => {
|
||||
|
|
Loading…
Reference in New Issue