status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-01-27 01:40:08 +00:00
Code Issues Projects Releases Wiki Activity

Allow Animated.parallel to accept empty element in the array

Browse Source
This commit is contained in:
Rui Chen 2015-07-21 15:04:02 -07:00
parent 35aa9f3b97
commit 4e33b801ca
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Libraries/Animation/Animated/Animated.js
View File

@ -1177,7 +1177,7 @@ var parallel = function(
}
animations.forEach((animation, idx) => {
animation.start(endResult => {
var cb = function(endResult) {
hasEnded[idx] = true;
doneCount++;
if (doneCount === animations.length) {
@ -1189,7 +1189,13 @@ var parallel = function(
if (!endResult.finished && stopTogether) {
result.stop();
}
});
};
if (!animation) {
cb({finished: true});
} else {
animation.start(cb);
}
});
},

10
Libraries/Animation/Animated/__tests__/Animated-test.js
View File

@ -205,6 +205,16 @@ describe('Animated Parallel', () => {
expect(cb).toBeCalledWith({finished: true});
});
it('works with an empty element in array', () => {
var anim1 = {start: jest.genMockFunction()};
var cb = jest.genMockFunction();
Animated.parallel([null, anim1]).start(cb);
expect(anim1.start).toBeCalled();
anim1.start.mock.calls[0][0]({finished: true});
expect(cb).toBeCalledWith({finished: true});
});
it('parellelizes well', () => {
var anim1 = {start: jest.genMockFunction()};