kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-23 20:01:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

Native Animated - Fix timing animation delay on iOS

Browse Source 
Summary:
Delay was broken with native animations on iOS. After checking what android does to handle delay, I noticed it does nothing at all since the delay is already handled when generating the animation frames. This removes all code that tried to handle delay on iOS since it is not needed and breaks it. Also updated an example to have delay in UI explorer.

Fixes #12388

**Test plan**
Tested that delay works in UIExplorer on iOS and Android.
Closes https://github.com/facebook/react-native/pull/12443

Differential Revision: D4582514

Pulled By: javache

fbshipit-source-id: dc53295e716c8476c71ccd578380962f056de2be
This commit is contained in:
Janic Duplessis
2017-03-28 09:08:49 -07:00
committed by Facebook Github Bot
parent bb48c0c608
commit fb54a1eb3e
4 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Libraries/NativeAnimation/Drivers/RCTFrameAnimation.m
View File

@@ -33,7 +33,6 @@ const double SINGLE_FRAME_INTERVAL = 1.0 / 60.0;
NSArray<NSNumber *> *_frames;
CGFloat _toValue;
CGFloat _fromValue;
NSTimeInterval _delay;
NSTimeInterval _animationStartTime;
NSTimeInterval _animationCurrentTime;
RCTResponseSenderBlock _callback;
@@ -46,14 +45,12 @@ const double SINGLE_FRAME_INTERVAL = 1.0 / 60.0;
{
if ((self = [super init])) {
NSNumber *toValue = [RCTConvert NSNumber:config[@"toValue"]] ?: @1;
NSTimeInterval delay = [RCTConvert double:config[@"delay"]];
NSArray<NSNumber *> *frames = [RCTConvert NSNumberArray:config[@"frames"]];
_animationId = animationId;
_toValue = toValue.floatValue;
_fromValue = valueNode.value;
_valueNode = valueNode;
_delay = delay;
_frames = [frames copy];
_callback = [callback copy];
}
@@ -93,16 +90,9 @@ RCT_NOT_IMPLEMENTED(- (instancetype)init)
}
NSTimeInterval currentTime = CACurrentMediaTime();
NSTimeInterval stepInterval = currentTime - _animationCurrentTime;
_animationCurrentTime = currentTime;
NSTimeInterval currentDuration = _animationCurrentTime - _animationStartTime;
if (_delay > 0) {
// Decrement delay
_delay -= stepInterval;
return;
}
// Determine how many frames have passed since last update.
// Get index of frames that surround the current interval
NSUInteger startIndex = floor(currentDuration / SINGLE_FRAME_INTERVAL);