Skip to content
This repository was archived by the owner on Apr 12, 2024. It is now read-only.

[don't merge]: fix($animateCss): respect transition styles already on the element #13488

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

[don't merge]: fix($animateCss): respect transition styles already on the element #13488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1fda8f
fix($animateCss): respect transition styles already on the element
Narretz Nov 18, 2015
505c11a
refactor($animateCss): various improvements
Narretz Dec 10, 2015
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: 2 additions & 0 deletions src/ngAnimate/.jshintrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@

"TRANSITION_DURATION_PROP": false,
"TRANSITION_DELAY_PROP": false,
"TRANSITION_TIMING_PROP": false,
"TRANSITION_PROPERTY_PROP": false,
"TRANSITION_PROP": false,
"PROPERTY_KEY": false,
"DURATION_KEY": false,
Expand Down
60 changes: 27 additions & 33 deletions src/ngAnimate/animateCss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,13 @@ var ELAPSED_TIME_MAX_DECIMAL_PLACES = 3;
var CLOSING_TIME_BUFFER = 1.5;

var DETECT_CSS_PROPERTIES = {
transitionDuration: TRANSITION_DURATION_PROP,
transitionDelay: TRANSITION_DELAY_PROP,
transitionProperty: TRANSITION_PROP + PROPERTY_KEY,
animationDuration: ANIMATION_DURATION_PROP,
animationDelay: ANIMATION_DELAY_PROP,
animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY
transitionDuration: TRANSITION_DURATION_PROP,
transitionDelay: TRANSITION_DELAY_PROP,
transitionProperty: TRANSITION_PROPERTY_PROP,
transitionTimingFunction: TRANSITION_TIMING_PROP,
animationDuration: ANIMATION_DURATION_PROP,
animationDelay: ANIMATION_DELAY_PROP,
animationIterationCount: ANIMATION_PROP + ANIMATION_ITERATION_COUNT_KEY
};

var DETECT_STAGGER_CSS_PROPERTIES = {
Expand Down Expand Up @@ -292,14 +293,14 @@ function truthyTimingValue(val) {
return val === 0 || val != null;
}

function getCssTransitionDurationStyle(duration, applyOnlyDuration) {
function getCssTransitionStyle(styles, duration) {
var style = TRANSITION_PROP;
var value = duration + 's';
if (applyOnlyDuration) {
style += DURATION_KEY;
} else {
value += ' linear all';
}

value += ' ' + styles[TRANSITION_TIMING_PROP];
value += ' ' + styles[TRANSITION_PROPERTY_PROP];
value += styles[TRANSITION_DELAY_PROP] ? ' ' + styles[TRANSITION_DELAY_PROP] + 's' : '';

return [style, value];
}

Expand Down Expand Up @@ -557,15 +558,6 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
temporaryStyles.push(transitionStyle);
}

if (options.duration >= 0) {
applyOnlyDuration = node.style[TRANSITION_PROP].length > 0;
var durationStyle = getCssTransitionDurationStyle(options.duration, applyOnlyDuration);

// we set the duration so that it will be picked up by getComputedStyle later
applyInlineStyle(node, durationStyle);
temporaryStyles.push(durationStyle);
}

if (options.keyframeStyle) {
var keyframeStyle = [ANIMATION_PROP, options.keyframeStyle];
applyInlineStyle(node, keyframeStyle);
Expand All @@ -578,8 +570,18 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
: gcsLookup.count(cacheKey)
: 0;

var isFirst = itemIndex === 0;
var timings = computeTimings(node, fullClassName, cacheKey);

if (options.duration > 0) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What if options.duration === 0 ?

// Duration in options overwrites duration set in style
timings.transitionDuration = options.duration;
}

var relativeDelay = timings.maxDelay;
maxDelay = Math.max(relativeDelay, 0);
maxDuration = timings.maxDuration;

var isFirst = itemIndex === 0;
// this is a pre-emptive way of forcing the setup classes to be added and applied INSTANTLY
// without causing any combination of transitions to kick in. By adding a negative delay value
// it forces the setup class' transition to end immediately. We later then remove the negative
Expand All @@ -590,18 +592,10 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
blockTransitions(node, SAFE_FAST_FORWARD_DURATION_VALUE);
}

var timings = computeTimings(node, fullClassName, cacheKey);
var relativeDelay = timings.maxDelay;
maxDelay = Math.max(relativeDelay, 0);
maxDuration = timings.maxDuration;

var flags = {};
flags.hasTransitions = timings.transitionDuration > 0;
flags.hasAnimations = timings.animationDuration > 0;
flags.hasTransitionAll = flags.hasTransitions && timings.transitionProperty == 'all';
flags.applyTransitionDuration = hasToStyles && (
(flags.hasTransitions && !flags.hasTransitionAll)
|| (flags.hasAnimations && !flags.hasTransitions));
flags.applyTransitionDuration = options.duration > 0 || hasToStyles && flags.hasTransitions;
flags.applyAnimationDuration = options.duration && flags.hasAnimations;
flags.applyTransitionDelay = truthyTimingValue(options.delay) && (flags.applyTransitionDuration || flags.hasTransitions);
flags.applyAnimationDelay = truthyTimingValue(options.delay) && flags.hasAnimations;
Expand All @@ -613,15 +607,15 @@ var $AnimateCssProvider = ['$animateProvider', function($animateProvider) {
if (flags.applyTransitionDuration) {
flags.hasTransitions = true;
timings.transitionDuration = maxDuration;
applyOnlyDuration = node.style[TRANSITION_PROP + PROPERTY_KEY].length > 0;
temporaryStyles.push(getCssTransitionDurationStyle(maxDuration, applyOnlyDuration));
temporaryStyles.push(getCssTransitionStyle(timings, maxDuration));
}

if (flags.applyAnimationDuration) {
flags.hasAnimations = true;
timings.animationDuration = maxDuration;
temporaryStyles.push(getCssKeyframeDurationStyle(maxDuration));
}

}

if (maxDuration === 0 && !flags.recalculateTimingStyles) {
Expand Down
2 changes: 2 additions & 0 deletions src/ngAnimate/shared.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ var ANIMATION_DELAY_PROP = ANIMATION_PROP + DELAY_KEY;
var ANIMATION_DURATION_PROP = ANIMATION_PROP + DURATION_KEY;
var TRANSITION_DELAY_PROP = TRANSITION_PROP + DELAY_KEY;
var TRANSITION_DURATION_PROP = TRANSITION_PROP + DURATION_KEY;
var TRANSITION_TIMING_PROP = TRANSITION_PROP + TIMING_KEY;
var TRANSITION_PROPERTY_PROP = TRANSITION_PROP + PROPERTY_KEY;

var isPromiseLike = function(p) {
return p && p.then ? true : false;
Expand Down
104 changes: 92 additions & 12 deletions test/ngAnimate/animateCssSpec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

describe("ngAnimate $animateCss", function() {

// Firefox transforms all transition timing function values to their cubic bezier equivalents
var CUBIC_BEZIER_LINEAR_EQUIVALENT = 'cubic-bezier(0, 0, 1, 1)';
var CUBIC_BEZIER_EASE_EQUIVALENT = 'cubic-bezier(0.25, 0.1, 0.25, 1)';

beforeEach(module('ngAnimate'));
beforeEach(module('ngAnimateMock'));

Expand Down Expand Up @@ -634,6 +638,86 @@ describe("ngAnimate $animateCss", function() {
keyframeProgress(element, 1, 20);
assertAnimationComplete(true);
}));

it("should apply all transition shorthand properties that are already on the element",
inject(function($animateCss, $rootElement) {

ss.addRule('.action', 'transition: color 1s cubic-bezier(0.25, 0.1, 0.25, 1) 5s;');
element.addClass('action');

var options = {
to: { background: 'blue' }
};

var animator = $animateCss(element, options);
animator.start();
triggerAnimationStartFrame();

expect(element.css('transition-duration')).toMatch('1s');
expect(element.css('transition-delay')).toMatch('5s');
expect(element.css('transition-property')).toMatch('color');
expect(element.css('transition-timing-function')).toBe('cubic-bezier(0.25, 0.1, 0.25, 1)');
}));

it("should apply all explicit transition properties that are already on the element",
inject(function($animateCss, $rootElement) {

ss.addRule('.action', 'transition-duration: 1s;' +
'transition-timing-function: cubic-bezier(0.25, 0.1, 0.25, 1);' +
'transition-property: color;' +
'transition-delay: 5s');
element.addClass('action');

var options = {
to: { background: 'blue' }
};

var animator = $animateCss(element, options);
animator.start();
triggerAnimationStartFrame();

expect(element.css('transition-duration')).toMatch('1s');
expect(element.css('transition-delay')).toMatch('5s');
expect(element.css('transition-property')).toMatch('color');
expect(element.css('transition-timing-function')).toBe('cubic-bezier(0.25, 0.1, 0.25, 1)');
}));

it("should use the default transition-property (spec: all) if none is supplied in shorthand",
inject(function($animateCss, $rootElement) {

ss.addRule('.action', 'transition: 1s ease');
element.addClass('action');

var options = {
to: { background: 'blue' }
};

var animator = $animateCss(element, options);
animator.start();
triggerAnimationStartFrame();

expect(element.css('transition-property')).toBe('all');
}));

it("should use the default easing (spec: ease) if none is supplied in shorthand",
inject(function($animateCss, $rootElement) {

ss.addRule('.action', 'transition: color 1s');
element.addClass('action');

var options = {
to: { background: 'blue' }
};

var animator = $animateCss(element, options);
animator.start();
triggerAnimationStartFrame();

// IE reports ease in cubic-bezier form
expect(element.css('transition-timing-function')).toBeOneOf('ease', CUBIC_BEZIER_EASE_EQUIVALENT);
}));


});

describe("staggering", function() {
Expand Down Expand Up @@ -2052,7 +2136,7 @@ describe("ngAnimate $animateCss", function() {

var style = element.attr('style');
expect(style).toContain('3000s');
expect(style).toContain('linear');
expect(element.css('transition-timing-function')).toBeOneOf('ease', CUBIC_BEZIER_EASE_EQUIVALENT);
}));

it("should be applied to a CSS keyframe animation directly if keyframes are detected within the CSS class",
Expand Down Expand Up @@ -2158,7 +2242,7 @@ describe("ngAnimate $animateCss", function() {
expect(style).toMatch(/animation(?:-duration)?:\s*4s/);
expect(element.css('transition-duration')).toMatch('4s');
expect(element.css('transition-property')).toMatch('all');
expect(style).toContain('linear');
expect(element.css('transition-timing-function')).toBeOneOf('linear', CUBIC_BEZIER_LINEAR_EQUIVALENT);
}));
});

Expand Down Expand Up @@ -2322,7 +2406,7 @@ describe("ngAnimate $animateCss", function() {
var animator = $animateCss(element, options);

expect(element.attr('style') || '').not.toContain('animation-delay');
expect(element.attr('style') || '').not.toContain('transition-delay');
expect(element.css('transition-delay')).toEqual('-2s');
expect(classSpy).not.toHaveBeenCalled();

//redefine the classSpy to assert that the delay values have been
Expand Down Expand Up @@ -2489,7 +2573,7 @@ describe("ngAnimate $animateCss", function() {
inject(function($animateCss, $rootElement) {

var options = {
transitionStyle: '5.5s ease-in color',
transitionStyle: '5.5s ease color',
duration: 4,
event: 'enter',
structural: true
Expand All @@ -2500,10 +2584,9 @@ describe("ngAnimate $animateCss", function() {
animator.start();
triggerAnimationStartFrame();

var style = element.attr('style');
expect(element.css('transition-duration')).toMatch('4s');
expect(element.css('transition-property')).toMatch('color');
expect(style).toContain('ease-in');
expect(element.css('transition-timing-function')).toBeOneOf('ease', CUBIC_BEZIER_EASE_EQUIVALENT);
}));

it("should give priority to the provided delay value, but only update the delay style itself",
Expand Down Expand Up @@ -2754,11 +2837,9 @@ describe("ngAnimate $animateCss", function() {
animator.start();
triggerAnimationStartFrame();


var style = element.attr('style');
expect(element.css('transition-duration')).toMatch('2.5s');
expect(element.css('transition-property')).toMatch('all');
expect(style).toContain('linear');
expect(element.css('transition-timing-function')).toBeOneOf('ease', CUBIC_BEZIER_EASE_EQUIVALENT);
}));

it("should remove all inline transition styling when an animation completes",
Expand Down Expand Up @@ -2903,10 +2984,9 @@ describe("ngAnimate $animateCss", function() {
triggerAnimationStartFrame();


var style = element.attr('style');
expect(element.css('transition-duration')).toMatch('1s');
expect(element.css('transition-property')).toMatch('all');
expect(style).toContain('linear');
expect(element.css('transition-property')).toMatch('color');
expect(element.css('transition-timing-function')).toBeOneOf('linear', CUBIC_BEZIER_LINEAR_EQUIVALENT);
}));

it("should apply a transition duration and an animation duration if duration + styles options are provided for a matching keyframe animation",
Expand Down