mirror of
https://github.com/zhigang1992/react-native.git
synced 2026-05-09 13:37:58 +08:00
Updates from Mon 30 Mar
- [ReactNative] Clean up no longer needed reference to NavigationBarClass | Philipp von Weitershausen - [TextInput] returnKeyType, enablesReturnKeyAutomatically, secureTextEntry, more keyboardTypes | Tadeu Zagallo - [ReactNative] PropTypes for NavigationBars | Philipp von Weitershausen - Changed LayoutAnimation to use ms instead of seconds for consistency | Nick Lockwood - Better date support | Nick Lockwood - Renamed throttleScrollCallbackMS to scrollEventThrottle | Nick Lockwood - Fixed threading issues in RCTImageDownloader | Nick Lockwood - [iOS][Assets]: Cleaning up more 1x png from Libraries | Radu Marin - [ReactNative][docs] LinkingIOS | Tadeu Zagallo - Fixing TouchableOpacity and TouchableHighlight documentation | Ben Alpert - [react-native] Add React.addons.createFragment | Ben Alpert
This commit is contained in:
@@ -80,10 +80,18 @@ static UIViewAnimationCurve UIViewAnimationCurveFromRCTAnimationType(RCTAnimatio
|
||||
if ((self = [super init])) {
|
||||
_property = [RCTConvert NSString:config[@"property"]];
|
||||
|
||||
// TODO: this should be provided in ms, not seconds
|
||||
// (this will require changing all call sites to ms as well)
|
||||
_duration = [RCTConvert NSTimeInterval:config[@"duration"]] * 1000.0 ?: duration;
|
||||
_delay = [RCTConvert NSTimeInterval:config[@"delay"]] * 1000.0;
|
||||
_duration = [RCTConvert NSTimeInterval:config[@"duration"]] ?: duration;
|
||||
if (_duration > 0.0 && _duration < 0.01) {
|
||||
RCTLogError(@"RCTLayoutAnimation expects timings to be in ms, not seconds.");
|
||||
_duration = _duration * 1000.0;
|
||||
}
|
||||
|
||||
_delay = [RCTConvert NSTimeInterval:config[@"delay"]];
|
||||
if (_delay > 0.0 && _delay < 0.01) {
|
||||
RCTLogError(@"RCTLayoutAnimation expects timings to be in ms, not seconds.");
|
||||
_delay = _delay * 1000.0;
|
||||
}
|
||||
|
||||
_animationType = [RCTConvert RCTAnimationType:config[@"type"]];
|
||||
if (_animationType == RCTAnimationTypeSpring) {
|
||||
_springDamping = [RCTConvert CGFloat:config[@"springDamping"]];
|
||||
@@ -142,9 +150,11 @@ static UIViewAnimationCurve UIViewAnimationCurveFromRCTAnimationType(RCTAnimatio
|
||||
|
||||
if ((self = [super init])) {
|
||||
|
||||
// TODO: this should be provided in ms, not seconds
|
||||
// (this will require changing all call sites to ms as well)
|
||||
NSTimeInterval duration = [RCTConvert NSTimeInterval:config[@"duration"]] * 1000.0;
|
||||
NSTimeInterval duration = [RCTConvert NSTimeInterval:config[@"duration"]];
|
||||
if (duration > 0.0 && duration < 0.01) {
|
||||
RCTLogError(@"RCTLayoutAnimation expects timings to be in ms, not seconds.");
|
||||
duration = duration * 1000.0;
|
||||
}
|
||||
|
||||
_createAnimation = [[RCTAnimation alloc] initWithDuration:duration dictionary:config[@"create"]];
|
||||
_updateAnimation = [[RCTAnimation alloc] initWithDuration:duration dictionary:config[@"update"]];
|
||||
@@ -1291,6 +1301,32 @@ static void RCTMeasureLayout(RCTShadowView *view,
|
||||
@"always": @(UITextFieldViewModeAlways),
|
||||
},
|
||||
},
|
||||
@"UIKeyboardType": @{
|
||||
@"default": @(UIKeyboardTypeDefault),
|
||||
@"ascii-capable": @(UIKeyboardTypeASCIICapable),
|
||||
@"numbers-and-punctuation": @(UIKeyboardTypeNumbersAndPunctuation),
|
||||
@"url": @(UIKeyboardTypeURL),
|
||||
@"number-pad": @(UIKeyboardTypeNumberPad),
|
||||
@"phone-pad": @(UIKeyboardTypePhonePad),
|
||||
@"name-phone-pad": @(UIKeyboardTypeNamePhonePad),
|
||||
@"decimal-pad": @(UIKeyboardTypeDecimalPad),
|
||||
@"email-address": @(UIKeyboardTypeEmailAddress),
|
||||
@"twitter": @(UIKeyboardTypeTwitter),
|
||||
@"web-search": @(UIKeyboardTypeWebSearch),
|
||||
},
|
||||
@"UIReturnKeyType": @{
|
||||
@"default": @(UIReturnKeyDefault),
|
||||
@"go": @(UIReturnKeyGo),
|
||||
@"google": @(UIReturnKeyGoogle),
|
||||
@"join": @(UIReturnKeyJoin),
|
||||
@"next": @(UIReturnKeyNext),
|
||||
@"route": @(UIReturnKeyRoute),
|
||||
@"search": @(UIReturnKeySearch),
|
||||
@"send": @(UIReturnKeySend),
|
||||
@"yahoo": @(UIReturnKeyYahoo),
|
||||
@"done": @(UIReturnKeyDone),
|
||||
@"emergency-call": @(UIReturnKeyEmergencyCall),
|
||||
},
|
||||
@"UIView": @{
|
||||
@"ContentMode": @{
|
||||
@"ScaleToFill": @(UIViewContentModeScaleToFill),
|
||||
|
||||
Reference in New Issue
Block a user