Skip to content

Fix transitions aborting on repeated style values #257

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

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

Fix transitions aborting on repeated style values #257

Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
cfdc48d
Fix transitions aborting on repeated values
solidfox Mar 6, 2019
235ea64
Remove for in usage
solidfox Mar 6, 2019
d4071a4
Code style compliance
solidfox Mar 6, 2019
c3d0142
Fix all animations using interpolation
solidfox Mar 7, 2019
8793a6d
Add iterationDelay to componentWillReceiveProps (#261)
IceInBeard Mar 19, 2019
dc06573
Release 1.3.2
oblador Mar 19, 2019
c1fb6b0
Add custom animation imperative usage (#275)
mifi Aug 20, 2019
2c55fa8
Fix typing of AnimatableProperties.animation (#256)
Lilysunstrider Aug 20, 2019
9e78d3c
Export sub typings (#287)
Andries-Smit Oct 13, 2019
277347b
Update AnimatableExplorer project to RN 0.61
oblador Oct 13, 2019
0f8d55d
Update MakeItRain example to RN 0.61
oblador Oct 13, 2019
ad6a336
Bump eslint and config
oblador Oct 13, 2019
16a6f02
Bump prettier
oblador Oct 13, 2019
29751f0
Bump jest/react/react-native deps
oblador Oct 13, 2019
c12f9ba
Release 1.3.3
oblador Oct 13, 2019
b106ba6
Remove dev config from published artifact
oblador Oct 13, 2019
4cc41c8
Fix all animations using interpolation
solidfox Mar 7, 2019
5a9f8a7
Merge branch 'master' into master
solidfox Oct 18, 2019
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
15 changes: 13 additions & 2 deletions createAnimatableComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,7 +336,18 @@ export default function createAnimatableComponent(WrappedComponent) {
} = props;

if (transition) {
const oldProps = this.props;
const values = getStyleValues(transition, props.style);
// Don't transition values that are already correct or currently transitioning to the new value.
// Prevents transitions being aborted when props are repeated before transition ends.
const oldValues = getStyleValues(oldProps.transition, oldProps.style);
Object.keys(values).forEach( styleAttribute => {
const oldValue = oldValues[styleAttribute];
const newValue = values[styleAttribute];
if (oldValue === newValue) {
delete values[styleAttribute];
}
});
this.transitionTo(values, duration, easing, delay);
} else if (!deepEquals(animation, this.props.animation)) {
if (animation) {
Expand Down Expand Up @@ -461,7 +472,7 @@ export default function createAnimatableComponent(WrappedComponent) {
}
const needsInterpolation =
INTERPOLATION_STYLE_PROPERTIES.indexOf(property) !== -1 ||
typeof value !== 'number';
typeof toValue !== 'number';
const needsZeroClamping =
ZERO_CLAMPED_STYLE_PROPERTIES.indexOf(property) !== -1;
if (needsInterpolation) {
Expand Down Expand Up @@ -511,7 +522,7 @@ export default function createAnimatableComponent(WrappedComponent) {
const toValue = toValuesFlat[property];
const needsInterpolation =
INTERPOLATION_STYLE_PROPERTIES.indexOf(property) !== -1 ||
typeof value !== 'number';
typeof toValue !== 'number';
const needsZeroClamping =
ZERO_CLAMPED_STYLE_PROPERTIES.indexOf(property) !== -1;
const transitionStyle = this.state.transitionStyle[property];
Expand Down