Updates from Tue 17 Mar

- [ReactNative] Remove pushNotification prop from renderApplication | Eric Vicenti
- [react_native] Stub VibrationIOS on Android | Andy Street
- [ReactNative] Simplify and test interpolators | Christopher Chedeau
- [ReactNative] Increase timeout for obj-c tests | Christopher Chedeau
- [ReactNative] Updated RKText to new UIManager system | Nick Lockwood
- [ReactNative] Unforked RCTShadowView, moved RKTextView into FBReactKitTextModule | Nick Lockwood
- [ReactKit] Remove NativeModulesDeprecated | Spencer Ahrens
- [ReactNative] Allow single callbacks in NativeModules | Spencer Ahrens
- [ReactNative] s/RK/RCT in OSS | Spencer Ahrens
- [ReactNative] Cleanup StyleSheet API | Christopher Chedeau
- [RCTVibration] Basic Vibration API | Christopher Chedeau
- [React Native] Prevent crash in redbox code with two thrown errors | Ben Alpert
- [ReactNative] unbreak Android | Andrew Rasmussen
This commit is contained in:
Christopher Chedeau
2015-03-17 13:42:44 -07:00
parent 299dea8594
commit f7cf017d29
77 changed files with 937 additions and 530 deletions

View File

@@ -3,7 +3,7 @@
*
* @providesModule PickerIOS
*
* This is a controlled component version of RKPickerIOS
* This is a controlled component version of RCTPickerIOS
*/
'use strict';

View File

@@ -3,7 +3,7 @@
*
* @providesModule PickerIOS
*
* This is a controlled component version of RKPickerIOS
* This is a controlled component version of RCTPickerIOS
*/
'use strict';
@@ -11,7 +11,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
var React = require('React');
var ReactChildren = require('ReactChildren');
var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
var RKPickerIOSConsts = require('NativeModules').RKUIManager.RCTPicker.Constants;
var RCTPickerIOSConsts = require('NativeModules').RCTUIManager.RCTPicker.Constants;
var StyleSheet = require('StyleSheet');
var View = require('View');
@@ -37,7 +37,7 @@ var PickerIOS = React.createClass({
this.setState(this._stateFromProps(nextProps));
},
// Translate PickerIOS prop and children into stuff that RKPickerIOS understands.
// Translate PickerIOS prop and children into stuff that RCTPickerIOS understands.
_stateFromProps: function(props) {
var selectedIndex = 0;
var items = [];
@@ -53,7 +53,7 @@ var PickerIOS = React.createClass({
render: function() {
return (
<View style={this.props.style}>
<RKPickerIOS
<RCTPickerIOS
ref={PICKER}
style={styles.rkPickerIOS}
items={this.state.items}
@@ -103,7 +103,7 @@ var styles = StyleSheet.create({
// The picker will conform to whatever width is given, but we do
// have to set the component's height explicitly on the
// surrounding view to ensure it gets rendered.
height: RKPickerIOSConsts.ComponentHeight,
height: RCTPickerIOSConsts.ComponentHeight,
},
});
@@ -112,7 +112,7 @@ var rkPickerIOSAttributes = merge(ReactIOSViewAttributes.UIView, {
selectedIndex: true,
});
var RKPickerIOS = createReactIOSNativeComponentClass({
var RCTPickerIOS = createReactIOSNativeComponentClass({
validAttributes: rkPickerIOSAttributes,
uiViewClassName: 'RCTPicker',
});