Skip to content

fix(animations): make sure falsy values are added to _globalTimelineStyles #46863

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
dario-piotrowicz wants to merge 1 commit into from
Closed

fix(animations): make sure falsy values are added to _globalTimelineStyles #46863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/animations/browser/src/dsl/animation_timeline_builder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,7 +730,7 @@ export class TimelineBuilder {
const val = interpolateParams(value, params, errors);
this._pendingStyles.set(prop, val);
if (!this._localTimelineStyles.has(prop)) {
this._backFill.set(prop, this._globalTimelineStyles.get(prop) || AUTO_STYLE);
this._backFill.set(prop, this._globalTimelineStyles.get(prop) ?? AUTO_STYLE);
}
this._updateStyle(prop, val);
}
Expand Down
39 changes: 39 additions & 0 deletions packages/core/test/animation/animation_integration_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3981,6 +3981,45 @@ describe('animation tests', function() {
expect(pcp.duration).toEqual(7333); // 2s + 3s + 2000 + 111 + 222
});

it('should keep (transition from/to) styles defined in different timelines', () => {
@Component({
selector: 'cmp',
template: '<div @animation *ngIf="exp"></div>',
animations: [trigger(
'animation',
[transition(':enter', [group([
style({opacity: 0, color: 'red'}),
// Note: the objective of this test is to make sure the animation
// transitions from opacity 0 and color red to opacity 1 and color blue,
// even though the two styles are defined in different timelines
animate(500, style({opacity: 1, color: 'blue'})),
])])])]
})
class Cmp {
exp: boolean = false;
}

TestBed.configureTestingModule({declarations: [Cmp]});

const engine = TestBed.inject(ɵAnimationEngine);
const fixture = TestBed.createComponent(Cmp);
const cmp = fixture.componentInstance;
cmp.exp = true;

fixture.detectChanges();
engine.flush();

const players = getLog();
expect(players.length).toEqual(1);

const [player] = players;

expect(player.keyframes).toEqual([
new Map<string, string|number>([['opacity', '0'], ['color', 'red'], ['offset', 0]]),
new Map<string, string|number>([['opacity', '1'], ['color', 'blue'], ['offset', 1]]),
]);
});

describe('errors for not using the animation module', () => {
beforeEach(() => {
TestBed.configureTestingModule({
Expand Down