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

[ReactNative] s/RK/RCT in OSS

Browse Source
This commit is contained in:
Spencer Ahrens 2015-03-17 03:08:46 -07:00
parent 733596b67a
commit b396de3cc8
50 changed files with 276 additions and 263 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Libraries/ActionSheetIOS/ActionSheetIOS.js
View File

@ -6,7 +6,7 @@
'use strict';
var invariant = require('invariant');
var RCTActionSheetManager = require('NativeModulesDeprecated').RKActionSheetManager;
var RCTActionSheetManager = require('NativeModulesDeprecated').RCTActionSheetManager;
var ActionSheetIOS = {
showActionSheetWithOptions(options, callback) {

4
Libraries/Animation/LayoutAnimation.js
View File

@ -6,7 +6,7 @@
'use strict';
var PropTypes = require('ReactPropTypes');
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
var keyMirror = require('keyMirror');
@ -47,7 +47,7 @@ var configChecker = createStrictShapeTypeChecker({
var LayoutAnimation = {
configureNext(config, onAnimationDidEnd, onError) {
configChecker({config}, 'config', 'LayoutAnimation.configureNext');
RKUIManager.configureNextLayoutAnimation(config, onAnimationDidEnd, onError);
RCTUIManager.configureNextLayoutAnimation(config, onAnimationDidEnd, onError);
},
create(duration, type, creationProp) {
return {

11
Libraries/AppState/AppState.js
View File

@ -6,21 +6,16 @@
'use strict';
var NativeModules = require('NativeModulesDeprecated');
var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
var RKAppState = NativeModules.RKAppState;
var RKReachability = NativeModules.RKReachability;
var Subscribable = require('Subscribable');
var keyMirror = require('keyMirror');
var RCTAppState = NativeModules.RCTAppState;
var AppState = {
setApplicationIconBadgeNumber: function(number) {
RKAppState.setApplicationIconBadgeNumber(number);
RCTAppState.setApplicationIconBadgeNumber(number);
},
getApplicationIconBadgeNumber: function(callback) {
RKAppState.getApplicationIconBadgeNumber(callback);
RCTAppState.getApplicationIconBadgeNumber(callback);
},
};

4
Libraries/AppStateIOS/AppStateIOS.ios.js
View File

@ -7,7 +7,7 @@
var NativeModules = require('NativeModules');
var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
var RKAppState = NativeModules.RKAppState;
var RCTAppState = NativeModules.RCTAppState;
var logError = require('logError');
@ -45,7 +45,7 @@ RCTDeviceEventEmitter.addListener(
}
);
RKAppState.getCurrentAppState(
RCTAppState.getCurrentAppState(
(appStateData) => {
AppStateIOS.currentState = appStateData.app_state;
},

8
Libraries/BatchedBridge/BatchedBridgedModules/NativeModules.js
View File

@ -7,10 +7,8 @@
var NativeModules = require('BatchedBridge').RemoteModules;
// Dirty hack to support old (RK) and new (RCT) native module name conventions
Object.keys(NativeModules).forEach((moduleName) => {
var rkModuleName = moduleName.replace(/^RCT/, 'RK');
NativeModules[rkModuleName] = NativeModules[moduleName];
});
var nativeModulePrefixDuplicator = require('nativeModulePrefixDuplicator');
nativeModulePrefixDuplicator(NativeModules);
module.exports = NativeModules;

12
Libraries/BatchedBridge/BatchedBridgedModules/NativeModulesDeprecated.js
View File

@ -5,12 +5,10 @@
*/
'use strict';
var RemoteModulesDeprecated = require('BatchedBridge').RemoteModulesDeprecated;
var NativeModulesDeprecated = require('BatchedBridge').RemoteModulesDeprecated;
// Dirty hack to support old (RK) and new (RCT) native module name conventions
Object.keys(RemoteModulesDeprecated).forEach((moduleName) => {
var rkModuleName = moduleName.replace(/^RCT/, 'RK');
RemoteModulesDeprecated[rkModuleName] = RemoteModulesDeprecated[moduleName];
});
var nativeModulePrefixDuplicator = require('nativeModulePrefixDuplicator');
module.exports = RemoteModulesDeprecated;
nativeModulePrefixDuplicator(NativeModulesDeprecated);
module.exports = NativeModulesDeprecated;

92
Libraries/BatchedBridge/BatchedBridgedModules/POPAnimation.js
View File

@ -5,8 +5,8 @@
*/
'use strict';
var RKPOPAnimationManager = require('NativeModulesDeprecated').RKPOPAnimationManager;
if (!RKPOPAnimationManager) {
var RCTPOPAnimationManager = require('NativeModulesDeprecated').RCTPOPAnimationManager;
if (!RCTPOPAnimationManager) {
// POP animation isn't available in the OSS fork - this is a temporary
// workaround to enable its availability to be determined at runtime.
module.exports = null;
@ -18,45 +18,45 @@ var getObjectValues = require('getObjectValues');
var invariant = require('invariant');
var merge = require('merge');
var RKTypes = RKPOPAnimationManager.Types;
var RKProperties = RKPOPAnimationManager.Properties;
var RCTTypes = RCTPOPAnimationManager.Types;
var RCTProperties = RCTPOPAnimationManager.Properties;
var Properties = {
bounds: RKProperties.bounds,
opacity: RKProperties.opacity,
position: RKProperties.position,
positionX: RKProperties.positionX,
positionY: RKProperties.positionY,
zPosition: RKProperties.zPosition,
rotation: RKProperties.rotation,
rotationX: RKProperties.rotationX,
rotationY: RKProperties.rotationY,
scaleX: RKProperties.scaleX,
scaleXY: RKProperties.scaleXY,
scaleY: RKProperties.scaleY,
shadowColor: RKProperties.shadowColor,
shadowOffset: RKProperties.shadowOffset,
shadowOpacity: RKProperties.shadowOpacity,
shadowRadius: RKProperties.shadowRadius,
size: RKProperties.size,
subscaleXY: RKProperties.subscaleXY,
subtranslationX: RKProperties.subtranslationX,
subtranslationXY: RKProperties.subtranslationXY,
subtranslationY: RKProperties.subtranslationY,
subtranslationZ: RKProperties.subtranslationZ,
translationX: RKProperties.translationX,
translationXY: RKProperties.translationXY,
translationY: RKProperties.translationY,
translationZ: RKProperties.translationZ,
bounds: RCTProperties.bounds,
opacity: RCTProperties.opacity,
position: RCTProperties.position,
positionX: RCTProperties.positionX,
positionY: RCTProperties.positionY,
zPosition: RCTProperties.zPosition,
rotation: RCTProperties.rotation,
rotationX: RCTProperties.rotationX,
rotationY: RCTProperties.rotationY,
scaleX: RCTProperties.scaleX,
scaleXY: RCTProperties.scaleXY,
scaleY: RCTProperties.scaleY,
shadowColor: RCTProperties.shadowColor,
shadowOffset: RCTProperties.shadowOffset,
shadowOpacity: RCTProperties.shadowOpacity,
shadowRadius: RCTProperties.shadowRadius,
size: RCTProperties.size,
subscaleXY: RCTProperties.subscaleXY,
subtranslationX: RCTProperties.subtranslationX,
subtranslationXY: RCTProperties.subtranslationXY,
subtranslationY: RCTProperties.subtranslationY,
subtranslationZ: RCTProperties.subtranslationZ,
translationX: RCTProperties.translationX,
translationXY: RCTProperties.translationXY,
translationY: RCTProperties.translationY,
translationZ: RCTProperties.translationZ,
};
var Types = {
decay: RKTypes.decay,
easeIn: RKTypes.easeIn,
easeInEaseOut: RKTypes.easeInEaseOut,
easeOut: RKTypes.easeOut,
linear: RKTypes.linear,
spring: RKTypes.spring,
decay: RCTTypes.decay,
easeIn: RCTTypes.easeIn,
easeInEaseOut: RCTTypes.easeInEaseOut,
easeOut: RCTTypes.easeOut,
linear: RCTTypes.linear,
spring: RCTTypes.spring,
};
var POPAnimation = {
@ -98,7 +98,7 @@ var POPAnimation = {
);
}
RKPOPAnimationManager.createAnimationInternal(tag, typeName, attrs);
RCTPOPAnimationManager.createAnimationInternal(tag, typeName, attrs);
return tag;
},
@ -127,35 +127,35 @@ var POPAnimation = {
},
addAnimation: function(nodeHandle, anim, callback) {
RKPOPAnimationManager.addAnimation(nodeHandle, anim, callback);
RCTPOPAnimationManager.addAnimation(nodeHandle, anim, callback);
},
removeAnimation: function(nodeHandle, anim) {
RKPOPAnimationManager.removeAnimation(nodeHandle, anim);
RCTPOPAnimationManager.removeAnimation(nodeHandle, anim);
},
};
// Make sure that we correctly propagate RKPOPAnimationManager constants
// Make sure that we correctly propagate RCTPOPAnimationManager constants
// to POPAnimation
if (__DEV__) {
var allProperties = merge(
RKPOPAnimationManager.Properties,
RKPOPAnimationManager.Properties
RCTPOPAnimationManager.Properties,
RCTPOPAnimationManager.Properties
);
for (var key in allProperties) {
invariant(
POPAnimation.Properties[key] === RKPOPAnimationManager.Properties[key],
POPAnimation.Properties[key] === RCTPOPAnimationManager.Properties[key],
'POPAnimation doesn\'t copy property ' + key + ' correctly'
);
}
var allTypes = merge(
RKPOPAnimationManager.Types,
RKPOPAnimationManager.Types
RCTPOPAnimationManager.Types,
RCTPOPAnimationManager.Types
);
for (var key in allTypes) {
invariant(
POPAnimation.Types[key] === RKPOPAnimationManager.Types[key],
POPAnimation.Types[key] === RCTPOPAnimationManager.Types[key],
'POPAnimation doesn\'t copy type ' + key + ' correctly'
);
}

10
Libraries/BatchedBridge/BatchedBridgedModules/RCTAlertManager.ios.js Normal file
View File

@ -0,0 +1,10 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @providesModule RCTAlertManager
*/
'use strict';
var RCTAlertManager = require('NativeModulesDeprecated').RCTAlertManager;
module.exports = RCTAlertManager;

10
Libraries/BatchedBridge/BatchedBridgedModules/RKAlertManager.ios.js
View File

@ -1,10 +0,0 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @providesModule RKAlertManager
*/
'use strict';
var RKAlertManager = require('NativeModulesDeprecated').RKAlertManager;
module.exports = RKAlertManager;

6
Libraries/CameraRoll/CameraRoll.js
View File

@ -6,7 +6,7 @@
'use strict';
var ReactPropTypes = require('ReactPropTypes');
var RKCameraRollManager = require('NativeModules').RKCameraRollManager;
var RCTCameraRollManager = require('NativeModules').RCTCameraRollManager;
var createStrictShapeTypeChecker = require('createStrictShapeTypeChecker');
var deepFreezeAndThrowOnMutationInDev =
@ -98,7 +98,7 @@ class CameraRoll {
typeof tag === 'string',
'CameraRoll.saveImageWithTag tag must be a valid string.'
);
RKCameraRollManager.saveImageWithTag(
RCTCameraRollManager.saveImageWithTag(
tag,
(imageTag) => {
successCallback && successCallback(imageTag);
@ -140,7 +140,7 @@ class CameraRoll {
callback(response);
};
}
RKCameraRollManager.getPhotos(params, metaCallback, errorCallback);
RCTCameraRollManager.getPhotos(params, metaCallback, errorCallback);
}
}

2
Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js
View File

@ -53,7 +53,7 @@ var ActivityIndicatorIOS = React.createClass({
render: function() {
var style = styles.sizeSmall;
var NativeConstants = NativeModules.RKUIManager.UIActivityIndicatorView.Constants;
var NativeConstants = NativeModules.RCTUIManager.UIActivityIndicatorView.Constants;
var activityIndicatorViewStyle = NativeConstants.StyleWhite;
if (this.props.size === 'large') {
style = styles.sizeLarge;

16
Libraries/Components/DatePicker/DatePickerIOS.ios.js
View File

@ -3,7 +3,7 @@
*
* @providesModule DatePickerIOS
*
* This is a controlled component version of RKDatePickerIOS
* This is a controlled component version of RCTDatePickerIOS
*/
'use strict';
@ -11,7 +11,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
var PropTypes = require('ReactPropTypes');
var React = require('React');
var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
var RKDatePickerIOSConsts = require('NativeModules').RKUIManager.RCTDatePicker.Constants;
var RCTDatePickerIOSConsts = require('NativeModules').RCTUIManager.RCTDatePicker.Constants;
var StyleSheet = require('StyleSheet');
var View = require('View');
@ -65,7 +65,7 @@ var DatePickerIOS = React.createClass({
*
* Valid modes on iOS are: 'date', 'time', 'datetime'.
*/
mode: PropTypes.oneOf(Object.keys(RKDatePickerIOSConsts.DatePickerModes)),
mode: PropTypes.oneOf(Object.keys(RCTDatePickerIOSConsts.DatePickerModes)),
/**
* The interval at which minutes can be selected.
@ -111,7 +111,7 @@ var DatePickerIOS = React.createClass({
var props = this.props;
return (
<View style={props.style}>
<RKDatePickerIOS
<RCTDatePickerIOS
ref={DATEPICKER}
style={styles.rkDatePickerIOS}
date={props.date.getTime()}
@ -121,7 +121,7 @@ var DatePickerIOS = React.createClass({
minimumDate={
props.minimumDate ? props.minimumDate.getTime() : undefined
}
mode={RKDatePickerIOSConsts.DatePickerModes[props.mode]}
mode={RCTDatePickerIOSConsts.DatePickerModes[props.mode]}
minuteInterval={props.minuteInterval}
timeZoneOffsetInMinutes={props.timeZoneOffsetInMinutes}
onChange={this._onChange}
@ -133,8 +133,8 @@ var DatePickerIOS = React.createClass({
var styles = StyleSheet.create({
rkDatePickerIOS: {
height: RKDatePickerIOSConsts.ComponentHeight,
width: RKDatePickerIOSConsts.ComponentWidth,
height: RCTDatePickerIOSConsts.ComponentHeight,
width: RCTDatePickerIOSConsts.ComponentWidth,
},
});
@ -147,7 +147,7 @@ var rkDatePickerIOSAttributes = merge(ReactIOSViewAttributes.UIView, {
timeZoneOffsetInMinutes: true,
});
var RKDatePickerIOS = createReactIOSNativeComponentClass({
var RCTDatePickerIOS = createReactIOSNativeComponentClass({
validAttributes: rkDatePickerIOSAttributes,
uiViewClassName: 'RCTDatePicker',
});

6
Libraries/Components/ListView/ListView.js
View File

@ -7,7 +7,7 @@
var ListViewDataSource = require('ListViewDataSource');
var React = require('React');
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var ScrollView = require('ScrollView');
var ScrollResponder = require('ScrollResponder');
var StaticRenderer = require('StaticRenderer');
@ -323,13 +323,13 @@ var ListView = React.createClass({
*/
_measureAndUpdateScrollProps: function() {
RKUIManager.measureLayout(
RCTUIManager.measureLayout(
this.refs[SCROLLVIEW_REF].getInnerViewNode(),
this.refs[SCROLLVIEW_REF].getNodeHandle(),
logError,
this._setScrollContentHeight
);
RKUIManager.measureLayoutRelativeToParent(
RCTUIManager.measureLayoutRelativeToParent(
this.refs[SCROLLVIEW_REF].getNodeHandle(),
logError,
this._setScrollVisibleHeight

4
Libraries/Components/MapView/MapView.js
View File

@ -126,7 +126,7 @@ var MapView = React.createClass({
render: function() {
return (
<RKMap
<RCTMap
style={this.props.style}
showsUserLocation={this.props.showsUserLocation}
zoomEnabled={this.props.zoomEnabled}
@ -145,7 +145,7 @@ var MapView = React.createClass({
});
var RKMap = createReactIOSNativeComponentClass({
var RCTMap = createReactIOSNativeComponentClass({
validAttributes: merge(
ReactIOSViewAttributes.UIView, {
showsUserLocation: true,

20
Libraries/Components/Navigation/NavigatorIOS.ios.js
View File

@ -8,7 +8,7 @@
var EventEmitter = require('EventEmitter');
var React = require('React');
var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
var { RKNavigatorManager } = require('NativeModules');
var { RCTNavigatorManager } = require('NativeModules');
var StyleSheet = require('StyleSheet');
var StaticContainer = require('StaticContainer.react');
var View = require('View');
@ -28,14 +28,14 @@ function getuid() {
return __uid++;
}
var RKNavigator = createReactIOSNativeComponentClass({
var RCTNavigator = createReactIOSNativeComponentClass({
validAttributes: merge(ReactIOSViewAttributes.UIView, {
requestedTopOfStack: true
}),
uiViewClassName: 'RCTNavigator',
});
var RKNavigatorItem = createReactIOSNativeComponentClass({
var RCTNavigatorItem = createReactIOSNativeComponentClass({
validAttributes: {
// TODO: Remove or fix the attributes that are not fully functional.
// NavigatorIOS does not use them all, because some are problematic
@ -53,7 +53,7 @@ var RKNavigatorItem = createReactIOSNativeComponentClass({
var NavigatorTransitionerIOS = React.createClass({
requestSchedulingNavigation: function(cb) {
RKNavigatorManager.requestSchedulingJavaScriptNavigation(
RCTNavigatorManager.requestSchedulingJavaScriptNavigation(
this.getNodeHandle(),
logError,
cb
@ -62,7 +62,7 @@ var NavigatorTransitionerIOS = React.createClass({
render: function() {
return (
<RKNavigator {...this.props}/>
<RCTNavigator {...this.props}/>
);
},
});
@ -70,12 +70,12 @@ var NavigatorTransitionerIOS = React.createClass({
/**
* Think of `<NavigatorIOS>` as simply a component that renders an
* `RKNavigator`, and moves the `RKNavigator`'s `requestedTopOfStack` pointer
* forward and backward. The `RKNavigator` interprets changes in
* `RCTNavigator`, and moves the `RCTNavigator`'s `requestedTopOfStack` pointer
* forward and backward. The `RCTNavigator` interprets changes in
* `requestedTopOfStack` to be pushes and pops of children that are rendered.
* `<NavigatorIOS>` always ensures that whenever the `requestedTopOfStack`
* pointer is moved, that we've also rendered enough children so that the
* `RKNavigator` can carry out the push/pop with those children.
* `RCTNavigator` can carry out the push/pop with those children.
* `<NavigatorIOS>` also removes children that will no longer be needed
* (after the pop of a child has been fully completed/animated out).
*/
@ -496,7 +496,7 @@ var NavigatorIOS = React.createClass({
return (
<StaticContainer key={'nav' + i} shouldUpdate={shouldUpdateChild}>
<RKNavigatorItem
<RCTNavigatorItem
title={route.title}
style={[
styles.stackItem,
@ -512,7 +512,7 @@ var NavigatorIOS = React.createClass({
route={route}
{...route.passProps}
/>
</RKNavigatorItem>
</RCTNavigatorItem>
</StaticContainer>
);
},

14
Libraries/Components/ScrollResponder.js
View File

@ -11,9 +11,9 @@ var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
var Subscribable = require('Subscribable');
var TextInputState = require('TextInputState');
var RKUIManager = NativeModules.RKUIManager;
var RKUIManagerDeprecated = NativeModulesDeprecated.RKUIManager;
var RKScrollViewConsts = RKUIManager.RCTScrollView.Constants;
var RCTUIManager = NativeModules.RCTUIManager;
var RCTUIManagerDeprecated = NativeModulesDeprecated.RCTUIManager;
var RCTScrollViewConsts = RCTUIManager.RCTScrollView.Constants;
var warning = require('warning');
@ -99,7 +99,7 @@ var IS_ANIMATING_TOUCH_START_THRESHOLD_MS = 16;
var ScrollResponderMixin = {
mixins: [Subscribable.Mixin],
statics: RKScrollViewConsts,
statics: RCTScrollViewConsts,
scrollResponderMixinGetInitialState: function() {
return {
isTouching: false,
@ -336,7 +336,7 @@ var ScrollResponderMixin = {
* can also be used to quickly scroll to any element we want to focus
*/
scrollResponderScrollTo: function(offsetX, offsetY) {
RKUIManagerDeprecated.scrollTo(this.getNodeHandle(), offsetX, offsetY);
RCTUIManagerDeprecated.scrollTo(this.getNodeHandle(), offsetX, offsetY);
},
/**
@ -344,7 +344,7 @@ var ScrollResponderMixin = {
* @param {object} rect Should have shape {x, y, w, h}
*/
scrollResponderZoomTo: function(rect) {
RKUIManagerDeprecated.zoomToRect(this.getNodeHandle(), rect);
RCTUIManagerDeprecated.zoomToRect(this.getNodeHandle(), rect);
},
/**
@ -354,7 +354,7 @@ var ScrollResponderMixin = {
*/
scrollResponderScrollNativeHandleToKeyboard: function(nodeHandle, additionalOffset) {
this.additionalScrollOffset = additionalOffset || 0;
RKUIManager.measureLayout(
RCTUIManager.measureLayout(
nodeHandle,
this.getNodeHandle(),
this.scrollResponderTextInputFocusError,

6
Libraries/Components/ScrollView/ScrollView.js
View File

@ -8,12 +8,12 @@
var EdgeInsetsPropType = require('EdgeInsetsPropType');
var Platform = require('Platform');
var PointPropType = require('PointPropType');
var RCTScrollView = require('NativeModules').RKUIManager.RCTScrollView;
var RCTScrollView = require('NativeModules').RCTUIManager.RCTScrollView;
var RCTScrollViewConsts = RCTScrollView.Constants;
var React = require('React');
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var ScrollResponder = require('ScrollResponder');
var StyleSheet = require('StyleSheet');
var StyleSheetPropType = require('StyleSheetPropType');
@ -182,7 +182,7 @@ var ScrollView = React.createClass({
},
scrollTo: function(destY, destX) {
RKUIManager.scrollTo(
RCTUIManager.scrollTo(
this.getNodeHandle(),
destX || 0,
destY || 0

4
Libraries/Components/Slider/Slider.js
View File

@ -60,7 +60,7 @@ var Slider = React.createClass({
render: function() {
return (
<RKSlider
<RCTSlider
style={[styles.slider, this.props.style]}
value={this.props.value}
onChange={this._onValueChange}
@ -75,7 +75,7 @@ var styles = StyleSheet.create({
},
});
var RKSlider = createReactIOSNativeComponentClass({
var RCTSlider = createReactIOSNativeComponentClass({
validAttributes: merge(ReactIOSViewAttributes.UIView, {value: true}),
uiViewClassName: 'RCTSlider',
});

16
Libraries/Components/StatusBar/StatusBarIOS.ios.js
View File

@ -6,29 +6,29 @@
*/
'use strict';
var { RKStatusBarManager } = require('NativeModules');
var { RCTStatusBarManager } = require('NativeModules');
var StatusBarIOS = {
Style: {
default: RKStatusBarManager.Style.default,
lightContent: RKStatusBarManager.Style.lightContent
default: RCTStatusBarManager.Style.default,
lightContent: RCTStatusBarManager.Style.lightContent
},
Animation: {
none: RKStatusBarManager.Animation.none,
fade: RKStatusBarManager.Animation.fade,
slide: RKStatusBarManager.Animation.slide,
none: RCTStatusBarManager.Animation.none,
fade: RCTStatusBarManager.Animation.fade,
slide: RCTStatusBarManager.Animation.slide,
},
setStyle(style: number, animated: boolean) {
animated = animated || false;
RKStatusBarManager.setStyle(style, animated);
RCTStatusBarManager.setStyle(style, animated);
},
setHidden(hidden: boolean, animation: number) {
animation = animation || StatusBarIOS.Animation.none;
RKStatusBarManager.setHidden(hidden, animation);
RCTStatusBarManager.setHidden(hidden, animation);
},
};

2
Libraries/Components/Subscribable.js
View File

@ -29,7 +29,7 @@
* RCTDeviceEventEmitter,
* 'reachabilityDidChange',
* (resp) => resp.network_reachability,
* RKReachability.getCurrentReachability
* RCTReachability.getCurrentReachability
* );
*
* var myComponent = React.createClass({

6
Libraries/Components/SwitchIOS/SwitchIOS.ios.js
View File

@ -3,7 +3,7 @@
*
* @providesModule SwitchIOS
*
* This is a controlled component version of RKSwitch.
* This is a controlled component version of RCTSwitch.
*/
'use strict';
@ -80,7 +80,7 @@ var SwitchIOS = React.createClass({
render: function() {
return (
<RKSwitch
<RCTSwitch
ref={SWITCH}
style={[styles.rkSwitch, this.props.style]}
enabled={!this.props.disabled}
@ -109,7 +109,7 @@ var rkSwitchAttributes = merge(ReactIOSViewAttributes.UIView, {
enabled: true,
});
var RKSwitch = createReactIOSNativeComponentClass({
var RCTSwitch = createReactIOSNativeComponentClass({
validAttributes: rkSwitchAttributes,
uiViewClassName: 'RCTSwitch',
});

6
Libraries/Components/TabBarIOS/TabBarIOS.ios.js
View File

@ -14,9 +14,9 @@ var createReactIOSNativeComponentClass = require('createReactIOSNativeComponentC
var TabBarIOS = React.createClass({
render: function() {
return (
<RKTabBar style={[styles.tabGroup, this.props.style]}>
<RCTTabBar style={[styles.tabGroup, this.props.style]}>
{this.props.children}
</RKTabBar>
</RCTTabBar>
);
}
});
@ -31,6 +31,6 @@ var config = {
validAttributes: ReactIOSViewAttributes.UIView,
uiViewClassName: 'RCTTabBar',
};
var RKTabBar = createReactIOSNativeComponentClass(config);
var RCTTabBar = createReactIOSNativeComponentClass(config);
module.exports = TabBarIOS;

6
Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
View File

@ -58,7 +58,7 @@ var TabBarItemIOS = React.createClass({
}
return (
<RKTabBarItem
<RCTTabBarItem
icon={this.props.icon.uri}
selectedIcon={this.props.selectedIcon && this.props.selectedIcon.uri}
onPress={this.props.onPress}
@ -67,7 +67,7 @@ var TabBarItemIOS = React.createClass({
title={this.props.title}
style={[styles.tab, this.props.style]}>
{tabContents}
</RKTabBarItem>
</RCTTabBarItem>
);
}
});
@ -80,7 +80,7 @@ var styles = StyleSheet.create({
}
});
var RKTabBarItem = createReactIOSNativeComponentClass({
var RCTTabBarItem = createReactIOSNativeComponentClass({
validAttributes: merge(ReactIOSViewAttributes.UIView, {
title: true,
icon: true,

24
Libraries/Components/TextInput/TextInput.ios.js
View File

@ -8,7 +8,7 @@
var DocumentSelectionState = require('DocumentSelectionState');
var EventEmitter = require('EventEmitter');
var NativeMethodsMixin = require('NativeMethodsMixin');
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var PropTypes = require('ReactPropTypes');
var React = require('React');
var ReactChildren = require('ReactChildren');
@ -25,10 +25,10 @@ var getObjectValues = require('getObjectValues');
var invariant = require('invariant');
var merge = require('merge');
var autoCapitalizeConsts = RKUIManager.UIText.AutocapitalizationType;
var clearButtonModeConsts = RKUIManager.UITextField.clearButtonMode;
var autoCapitalizeConsts = RCTUIManager.UIText.AutocapitalizationType;
var clearButtonModeConsts = RCTUIManager.UITextField.clearButtonMode;
var RKTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
var RCTTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
autoCorrect: true,
autoCapitalize: true,
color: true,
@ -42,7 +42,7 @@ var RKTextViewAttributes = merge(ReactIOSViewAttributes.UIView, {
text: true,
});
var RKTextFieldAttributes = merge(RKTextViewAttributes, {
var RCTTextFieldAttributes = merge(RCTTextViewAttributes, {
caretHidden: true,
enabled: true,
clearButtonMode: true,
@ -198,7 +198,7 @@ var TextInput = React.createClass({
viewConfig: {
uiViewClassName: 'RCTTextField',
validAttributes: RKTextFieldAttributes,
validAttributes: RCTTextFieldAttributes,
},
isFocused: function() {
@ -309,7 +309,7 @@ var TextInput = React.createClass({
}
}
textContainer =
<RKTextField
<RCTTextField
ref="input"
style={[styles.input, this.props.style]}
enabled={this.props.editable}
@ -349,7 +349,7 @@ var TextInput = React.createClass({
children = [children, this.props.inputView];
}
textContainer =
<RKTextView
<RCTTextView
ref="input"
style={[styles.input, this.props.style]}
children={children}
@ -428,13 +428,13 @@ var styles = StyleSheet.create({
},
});
var RKTextView = createReactIOSNativeComponentClass({
validAttributes: RKTextViewAttributes,
var RCTTextView = createReactIOSNativeComponentClass({
validAttributes: RCTTextViewAttributes,
uiViewClassName: 'RCTTextView',
});
var RKTextField = createReactIOSNativeComponentClass({
validAttributes: RKTextFieldAttributes,
var RCTTextField = createReactIOSNativeComponentClass({
validAttributes: RCTTextFieldAttributes,
uiViewClassName: 'RCTTextField',
});

6
Libraries/Components/TextInput/TextInputState.js
View File

@ -9,7 +9,7 @@
*/
'use strict';
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var TextInputState = {
/**
@ -33,7 +33,7 @@ var TextInputState = {
focusTextInput: function(textFieldID) {
if (this._currentlyFocusedID != textFieldID && textFieldID != null) {
this._currentlyFocusedID = textFieldID;
RKUIManager.focus(textFieldID);
RCTUIManager.focus(textFieldID);
}
},
@ -45,7 +45,7 @@ var TextInputState = {
blurTextInput: function(textFieldID) {
if (this._currentlyFocusedID == textFieldID && textFieldID != null) {
this._currentlyFocusedID = null;
RKUIManager.blur(textFieldID);
RCTUIManager.blur(textFieldID);
}
}
};

2
Libraries/Components/Touchable/TouchableHighlight.js
View File

@ -118,7 +118,7 @@ var TouchableHighlight = React.createClass({
viewConfig: {
uiViewClassName: 'RCTView',
validAttributes: ReactIOSViewAttributes.RKView
validAttributes: ReactIOSViewAttributes.RCTView
},
/**

14
Libraries/Components/View/View.js
View File

@ -56,7 +56,7 @@ var View = React.createClass({
*/
viewConfig: {
uiViewClassName: 'RCTView',
validAttributes: ReactIOSViewAttributes.RKView
validAttributes: ReactIOSViewAttributes.RCTView
},
propTypes: {
@ -116,7 +116,7 @@ var View = React.createClass({
style: stylePropType,
/**
* This is a special performance property exposed by RKView and is useful
* This is a special performance property exposed by RCTView and is useful
* for scrolling content when there are many subviews, most of which are
* offscreen. For this property to be effective, it must be applied to a
* view that contains many subviews that extend outside its bound. The
@ -127,18 +127,18 @@ var View = React.createClass({
},
render: function() {
return <RKView {...this.props} />;
return <RCTView {...this.props} />;
},
});
var RKView = createReactIOSNativeComponentClass({
validAttributes: ReactIOSViewAttributes.RKView,
var RCTView = createReactIOSNativeComponentClass({
validAttributes: ReactIOSViewAttributes.RCTView,
uiViewClassName: 'RCTView',
});
RKView.propTypes = View.propTypes;
RCTView.propTypes = View.propTypes;
var ViewToExport = RKView;
var ViewToExport = RCTView;
if (__DEV__) {
ViewToExport = View;
}

14
Libraries/Components/WebView/WebView.android.js
View File

@ -16,9 +16,9 @@ var keyMirror = require('keyMirror');
var merge = require('merge');
var PropTypes = React.PropTypes;
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var RK_WEBVIEW_REF = 'webview';
var RCT_WEBVIEW_REF = 'webview';
var WebViewState = keyMirror({
IDLE: null,
@ -81,7 +81,7 @@ var WebView = React.createClass({
var webView =
<RCTWebView
ref={RK_WEBVIEW_REF}
ref={RCT_WEBVIEW_REF}
key="webViewKey"
style={webViewStyles}
url={this.props.url}
@ -102,15 +102,15 @@ var WebView = React.createClass({
},
goForward: function() {
RKUIManager.webViewGoForward(this.getWebWiewHandle());
RCTUIManager.webViewGoForward(this.getWebWiewHandle());
},
goBack: function() {
RKUIManager.webViewGoBack(this.getWebWiewHandle());
RCTUIManager.webViewGoBack(this.getWebWiewHandle());
},
reload: function() {
RKUIManager.webViewReload(this.getWebWiewHandle());
RCTUIManager.webViewReload(this.getWebWiewHandle());
},
/**
@ -124,7 +124,7 @@ var WebView = React.createClass({
},
getWebWiewHandle: function() {
return this.refs[RK_WEBVIEW_REF].getNodeHandle();
return this.refs[RCT_WEBVIEW_REF].getNodeHandle();
},
onLoadingStart: function(event) {

28
Libraries/Components/WebView/WebView.ios.js
View File

@ -17,9 +17,9 @@ var insetsDiffer = require('insetsDiffer');
var merge = require('merge');
var PropTypes = React.PropTypes;
var { RKWebViewManager } = require('NativeModules');
var { RCTWebViewManager } = require('NativeModules');
var RK_WEBVIEW_REF = 'webview';
var RCT_WEBVIEW_REF = 'webview';
var WebViewState = keyMirror({
IDLE: null,
@ -28,12 +28,12 @@ var WebViewState = keyMirror({
});
var NavigationType = {
click: RKWebViewManager.NavigationType.LinkClicked,
formsubmit: RKWebViewManager.NavigationType.FormSubmitted,
backforward: RKWebViewManager.NavigationType.BackForward,
reload: RKWebViewManager.NavigationType.Reload,
formresubmit: RKWebViewManager.NavigationType.FormResubmitted,
other: RKWebViewManager.NavigationType.Other,
click: RCTWebViewManager.NavigationType.LinkClicked,
formsubmit: RCTWebViewManager.NavigationType.FormSubmitted,
backforward: RCTWebViewManager.NavigationType.BackForward,
reload: RCTWebViewManager.NavigationType.Reload,
formresubmit: RCTWebViewManager.NavigationType.FormResubmitted,
other: RCTWebViewManager.NavigationType.Other,
};
var WebView = React.createClass({
@ -79,7 +79,7 @@ var WebView = React.createClass({
errorEvent.code,
errorEvent.description);
} else if (this.state.viewState !== WebViewState.IDLE) {
console.error("RKWebView invalid state encountered: " + this.state.loading);
console.error('RCTWebView invalid state encountered: ' + this.state.loading);
}
var webViewStyles = [styles.container, this.props.style];
@ -91,7 +91,7 @@ var WebView = React.createClass({
var webView =
<RCTWebView
ref={RK_WEBVIEW_REF}
ref={RCT_WEBVIEW_REF}
key="webViewKey"
style={webViewStyles}
url={this.props.url}
@ -112,15 +112,15 @@ var WebView = React.createClass({
},
goForward: function() {
RKWebViewManager.goForward(this.getWebWiewHandle());
RCTWebViewManager.goForward(this.getWebWiewHandle());
},
goBack: function() {
RKWebViewManager.goBack(this.getWebWiewHandle());
RCTWebViewManager.goBack(this.getWebWiewHandle());
},
reload: function() {
RKWebViewManager.reload(this.getWebWiewHandle());
RCTWebViewManager.reload(this.getWebWiewHandle());
},
/**
@ -134,7 +134,7 @@ var WebView = React.createClass({
},
getWebWiewHandle: function() {
return this.refs[RK_WEBVIEW_REF].getNodeHandle();
return this.refs[RCT_WEBVIEW_REF].getNodeHandle();
},
onLoadingStart: function(event) {

10
Libraries/Image/Image.ios.js
View File

@ -108,13 +108,13 @@ var Image = React.createClass({
'static image uris cannot start with "http": "' + source.uri + '"'
);
var isStored = !source.isStatic && !isNetwork;
var RawImage = isNetwork ? RKNetworkImage : RKStaticImage;
var RawImage = isNetwork ? RCTNetworkImage : RCTStaticImage;
if (this.props.style && this.props.style.tintColor) {
warning(RawImage === RKStaticImage, 'tintColor style only supported on static images.');
warning(RawImage === RCTStaticImage, 'tintColor style only supported on static images.');
}
var contentModes = NativeModulesDeprecated.RKUIManager.UIView.ContentMode;
var contentModes = NativeModulesDeprecated.RCTUIManager.UIView.ContentMode;
var resizeMode;
if (style.resizeMode === ImageResizeMode.stretch) {
resizeMode = contentModes.ScaleToFill;
@ -155,12 +155,12 @@ var CommonImageViewAttributes = merge(ReactIOSViewAttributes.UIView, {
testID: PropTypes.string,
});
var RKStaticImage = createReactIOSNativeComponentClass({
var RCTStaticImage = createReactIOSNativeComponentClass({
validAttributes: merge(CommonImageViewAttributes, { tintColor: true }),
uiViewClassName: 'RCTStaticImage',
});
var RKNetworkImage = createReactIOSNativeComponentClass({
var RCTNetworkImage = createReactIOSNativeComponentClass({
validAttributes: merge(CommonImageViewAttributes, { defaultImageSrc: true }),
uiViewClassName: 'RCTNetworkImageView',
});

14
Libraries/JavaScriptAppEngine/Initialization/InitializeJavaScriptAppEngine.js
View File

@ -60,7 +60,7 @@ function setupDocumentShim() {
var sourceMapPromise;
function handleErrorWithRedBox(e) {
var RKExceptionsManager = require('NativeModules').RKExceptionsManager;
var RCTExceptionsManager = require('NativeModules').RCTExceptionsManager;
var errorToString = require('errorToString');
var loadSourceMap = require('loadSourceMap');
@ -72,13 +72,13 @@ function handleErrorWithRedBox(e) {
'\n message: ' + e.message
);
if (RKExceptionsManager) {
RKExceptionsManager.reportUnhandledException(e.message, errorToString(e));
if (RCTExceptionsManager) {
RCTExceptionsManager.reportUnhandledException(e.message, errorToString(e));
if (__DEV__) {
(sourceMapPromise = sourceMapPromise || loadSourceMap())
.then(map => {
var prettyStack = errorToString(e, map);
RKExceptionsManager.updateExceptionMessage(e.message, prettyStack);
RCTExceptionsManager.updateExceptionMessage(e.message, prettyStack);
})
.then(null, error => {
GLOBAL.console.error('#CLOWNTOWN (error while displaying error): ' + error.message);
@ -95,7 +95,7 @@ function setupRedBoxErrorHandler() {
/**
* Sets up a set of window environment wrappers that ensure that the
* BatchedBridge is flushed after each tick. In both the case of the
* `UIWebView` based `RKJavaScriptCaller` and `RKContextCaller`, we
* `UIWebView` based `RCTJavaScriptCaller` and `RCTContextCaller`, we
* implement our own custom timing bridge that should be immune to
* unexplainably dropped timing signals.
*/
@ -115,7 +115,7 @@ function setupTimers() {
}
function setupAlert() {
var RKAlertManager = require('RKAlertManager');
var RCTAlertManager = require('RCTAlertManager');
if (!GLOBAL.alert) {
GLOBAL.alert = function(text) {
var alertOpts = {
@ -123,7 +123,7 @@ function setupAlert() {
message: '' + text,
buttons: [{'cancel': 'Okay'}],
};
RKAlertManager.alertWithArgs(alertOpts, null);
RCTAlertManager.alertWithArgs(alertOpts, null);
};
}
}

10
Libraries/JavaScriptAppEngine/System/JSTimers/JSTimers.js
View File

@ -7,7 +7,7 @@
// Note that the module JSTimers is split into two in order to solve a cycle
// in dependencies. NativeModules > BatchedBridge > MessageQueue > JSTimersExecution
var RKTiming = require('NativeModules').RKTiming;
var RCTTiming = require('NativeModules').RCTTiming;
var JSTimersExecution = require('JSTimersExecution');
/**
@ -43,7 +43,7 @@ var JSTimers = {
return func.apply(undefined, args);
};
JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setTimeout;
RKTiming.createTimer(newID, duration, Date.now(), /** recurring */ false);
RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ false);
return newID;
},
@ -60,7 +60,7 @@ var JSTimers = {
return func.apply(undefined, args);
};
JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.setInterval;
RKTiming.createTimer(newID, duration, Date.now(), /** recurring */ true);
RCTTiming.createTimer(newID, duration, Date.now(), /** recurring */ true);
return newID;
},
@ -90,7 +90,7 @@ var JSTimers = {
JSTimersExecution.timerIDs[freeIndex] = newID;
JSTimersExecution.callbacks[freeIndex] = func;
JSTimersExecution.types[freeIndex] = JSTimersExecution.Type.requestAnimationFrame;
RKTiming.createTimer(newID, 0, Date.now(), /** recurring */ false);
RCTTiming.createTimer(newID, 0, Date.now(), /** recurring */ false);
return newID;
},
@ -126,7 +126,7 @@ var JSTimers = {
if (index !== -1) {
JSTimersExecution._clearIndex(index);
if (JSTimersExecution.types[index] !== JSTimersExecution.Type.setImmediate) {
RKTiming.deleteTimer(timerID);
RCTTiming.deleteTimer(timerID);
}
}
},

6
Libraries/Network/NetInfo.js
View File

@ -8,7 +8,7 @@
var NativeModules = require('NativeModules');
var RCTDeviceEventEmitter = require('RCTDeviceEventEmitter');
var RKReachability = NativeModules.RKReachability;
var RCTReachability = NativeModules.RCTReachability;
var DEVICE_REACHABILITY_EVENT = 'reachabilityDidChange';
@ -49,7 +49,7 @@ type ChangeEventName = $Enum<{
var NetInfo = {};
if (RKReachability) {
if (RCTReachability) {
var _reachabilitySubscriptions = {};
NetInfo.reachabilityIOS = {
@ -78,7 +78,7 @@ if (RKReachability) {
fetch: function(): Promise {
return new Promise((resolve, reject) => {
RKReachability.getCurrentReachability(
RCTReachability.getCurrentReachability(
(resp) => {
resolve(resp.network_reachability);
},

4
Libraries/Network/XMLHttpRequest.ios.js
View File

@ -6,7 +6,7 @@
*/
'use strict';
var RKDataManager = require('NativeModulesDeprecated').RKDataManager;
var RCTDataManager = require('NativeModulesDeprecated').RCTDataManager;
var crc32 = require('crc32');
@ -91,7 +91,7 @@ class XMLHttpRequest {
}
this._sent = true;
RKDataManager.queryData(
RCTDataManager.queryData(
'http',
JSON.stringify({
method: this._method,

2
Libraries/Picker/PickerIOS.android.js
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';

12
Libraries/Picker/PickerIOS.ios.js
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',
});

4
Libraries/RKBackendNode/queryLayoutByID.js
View File

@ -6,7 +6,7 @@
'use strict';
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
/**
* Queries the layout of a view. The layout does not reflect the element as
@ -29,7 +29,7 @@ var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
*/
var queryLayoutByID = function(rootNodeID, onError, onSuccess) {
// Native bridge doesn't *yet* surface errors.
RKUIManager.measure(
RCTUIManager.measure(
ReactIOSTagHandles.rootNodeIDToTag[rootNodeID],
onSuccess
);

6
Libraries/ReactIOS/IOSNativeBridgeEventPlugin.js
View File

@ -13,10 +13,10 @@ var SyntheticEvent = require('SyntheticEvent');
var merge = require('merge');
var warning = require('warning');
var RKUIManager = NativeModulesDeprecated.RKUIManager;
var RCTUIManager = NativeModulesDeprecated.RCTUIManager;
var customBubblingEventTypes = RKUIManager.customBubblingEventTypes;
var customDirectEventTypes = RKUIManager.customDirectEventTypes;
var customBubblingEventTypes = RCTUIManager.customBubblingEventTypes;
var customDirectEventTypes = RCTUIManager.customDirectEventTypes;
var allTypesByEventName = {};

16
Libraries/ReactIOS/NativeMethodsMixin.js
View File

@ -7,9 +7,9 @@
var NativeModules = require('NativeModules');
var NativeModulesDeprecated = require('NativeModulesDeprecated');
var RKUIManager = NativeModules.RKUIManager;
var RKUIManagerDeprecated = NativeModulesDeprecated.RKUIManager;
var RKPOPAnimationManagerDeprecated = NativeModulesDeprecated.RKPOPAnimationManager;
var RCTPOPAnimationManagerDeprecated = NativeModulesDeprecated.RCTPOPAnimationManager;
var RCTUIManager = NativeModules.RCTUIManager;
var RCTUIManagerDeprecated = NativeModulesDeprecated.RCTUIManager;
var TextInputState = require('TextInputState');
var flattenStyle = require('flattenStyle');
@ -27,20 +27,20 @@ var animationIDInvariant = function(funcName, anim) {
var NativeMethodsMixin = {
addAnimation: function(anim, callback) {
animationIDInvariant('addAnimation', anim);
RKPOPAnimationManagerDeprecated.addAnimation(this.getNodeHandle(), anim, callback);
RCTPOPAnimationManagerDeprecated.addAnimation(this.getNodeHandle(), anim, callback);
},
removeAnimation: function(anim) {
animationIDInvariant('removeAnimation', anim);
RKPOPAnimationManagerDeprecated.removeAnimation(this.getNodeHandle(), anim);
RCTPOPAnimationManagerDeprecated.removeAnimation(this.getNodeHandle(), anim);
},
measure: function(callback) {
RKUIManagerDeprecated.measure(this.getNodeHandle(), callback);
RCTUIManagerDeprecated.measure(this.getNodeHandle(), callback);
},
measureLayout: function(relativeToNativeNode, onSuccess, onFail) {
RKUIManager.measureLayout(
RCTUIManager.measureLayout(
this.getNodeHandle(),
relativeToNativeNode,
onFail,
@ -77,7 +77,7 @@ var NativeMethodsMixin = {
props = mergeFast(nativeProps, style);
}
RKUIManagerDeprecated.updateView(
RCTUIManagerDeprecated.updateView(
this.getNodeHandle(),
this.viewConfig.uiViewClassName,
props

3
Libraries/ReactIOS/ReactIOSComponentEnvironment.js
View File

@ -4,12 +4,9 @@
* @providesModule ReactIOSComponentEnvironment
*/
'use strict';
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var ReactIOSDOMIDOperations = require('ReactIOSDOMIDOperations');
var ReactIOSReconcileTransaction = require('ReactIOSReconcileTransaction');
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactPerf = require('ReactPerf');
var ReactIOSComponentEnvironment = {

6
Libraries/ReactIOS/ReactIOSDOMIDOperations.js
View File

@ -9,7 +9,7 @@
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactMultiChildUpdateTypes = require('ReactMultiChildUpdateTypes');
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var ReactPerf = require('ReactPerf');
/**
@ -55,7 +55,7 @@ var dangerouslyProcessChildrenUpdates = function(childrenUpdates, markupList) {
for (var updateParentTagString in byContainerTag) {
var updateParentTagNumber = +updateParentTagString;
var childUpdatesToSend = byContainerTag[updateParentTagNumber];
RKUIManager.manageChildren(
RCTUIManager.manageChildren(
updateParentTagNumber,
childUpdatesToSend.moveFromIndices,
childUpdatesToSend.moveToIndices,
@ -89,7 +89,7 @@ var ReactIOSDOMIDOperations = {
'dangerouslyReplaceNodeWithMarkupByID',
function(id, mountImage) {
var oldTag = ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(id);
RKUIManager.replaceExistingNonRootView(oldTag, mountImage.tag);
RCTUIManager.replaceExistingNonRootView(oldTag, mountImage.tag);
ReactIOSTagHandles.associateRootNodeIDWithMountedNodeHandle(id, mountImage.tag);
}
),

6
Libraries/ReactIOS/ReactIOSGlobalResponderHandler.js
View File

@ -3,17 +3,17 @@
*/
'use strict';
var RKUIManager = require('NativeModules').RKUIManager;
var RCTUIManager = require('NativeModules').RCTUIManager;
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactIOSGlobalResponderHandler = {
onChange: function(from, to) {
if (to !== null) {
RKUIManager.setJSResponder(
RCTUIManager.setJSResponder(
ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(to)
);
} else {
RKUIManager.clearJSResponder();
RCTUIManager.clearJSResponder();
}
}
};

8
Libraries/ReactIOS/ReactIOSMount.js
View File

@ -5,7 +5,7 @@
*/
'use strict';
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactPerf = require('ReactPerf');
@ -128,7 +128,7 @@ var ReactIOSMount = {
);
var addChildTags = [mountImage.tag];
var addAtIndices = [0];
RKUIManager.manageChildren(
RCTUIManager.manageChildren(
ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(containerID),
null, // moveFromIndices
null, // moveToIndices
@ -150,7 +150,7 @@ var ReactIOSMount = {
unmountComponentAtNodeAndRemoveContainer: function(containerTag) {
ReactIOSMount.unmountComponentAtNode(containerTag);
// call back into native to remove all of the subviews from this container
RKUIManager.removeRootView(containerTag);
RCTUIManager.removeRootView(containerTag);
},
/**
@ -190,7 +190,7 @@ var ReactIOSMount = {
instance.unmountComponent();
var containerTag =
ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(containerID);
RKUIManager.removeSubviewsFromContainerWithID(containerTag);
RCTUIManager.removeSubviewsFromContainerWithID(containerTag);
},
getNode: function(id) {

8
Libraries/ReactIOS/ReactIOSNativeComponent.js
View File

@ -11,7 +11,7 @@ var ReactIOSEventEmitter = require('ReactIOSEventEmitter');
var ReactIOSStyleAttributes = require('ReactIOSStyleAttributes');
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var ReactMultiChild = require('ReactMultiChild');
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var styleDiffer = require('styleDiffer');
var deepFreezeAndThrowOnMutationInDev = require('deepFreezeAndThrowOnMutationInDev');
@ -109,7 +109,7 @@ ReactIOSNativeComponent.Mixin = {
);
createdTags[i] = mountImage.tag;
}
RKUIManager
RCTUIManager
.manageChildren(containerTag, null, null, createdTags, indexes, null);
}
},
@ -180,7 +180,7 @@ ReactIOSNativeComponent.Mixin = {
);
if (updatePayload) {
RKUIManager.updateView(
RCTUIManager.updateView(
ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(this._rootNodeID),
this.viewConfig.uiViewClassName,
updatePayload
@ -237,7 +237,7 @@ ReactIOSNativeComponent.Mixin = {
this._currentElement.props, // next props
this.viewConfig.validAttributes
);
RKUIManager.createView(tag, this.viewConfig.uiViewClassName, updatePayload);
RCTUIManager.createView(tag, this.viewConfig.uiViewClassName, updatePayload);
this._registerListenersUponCreation(this._currentElement.props);
this.initializeChildren(

6
Libraries/ReactIOS/ReactIOSTextComponent.js
View File

@ -7,7 +7,7 @@
'use strict';
var ReactIOSTagHandles = require('ReactIOSTagHandles');
var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
var RCTUIManager = require('NativeModulesDeprecated').RCTUIManager;
var assign = require('Object.assign');
@ -27,7 +27,7 @@ assign(ReactIOSTextComponent.prototype, {
mountComponent: function(rootID, transaction, context) {
this._rootNodeID = rootID;
var tag = ReactIOSTagHandles.allocateTag();
RKUIManager.createView(tag, 'RCTRawText', {text: this._stringText});
RCTUIManager.createView(tag, 'RCTRawText', {text: this._stringText});
return {
rootNodeID: rootID,
tag: tag,
@ -40,7 +40,7 @@ assign(ReactIOSTextComponent.prototype, {
var nextStringText = '' + nextText;
if (nextStringText !== this._stringText) {
this._stringText = nextStringText;
RKUIManager.updateView(
RCTUIManager.updateView(
ReactIOSTagHandles.mostRecentMountedNodeHandleForRootNodeID(
this._rootNodeID
),

4
Libraries/ReactIOS/ReactIOSViewAttributes.js
View File

@ -17,10 +17,10 @@ ReactIOSViewAttributes.UIView = {
testID: true,
};
ReactIOSViewAttributes.RKView = merge(
ReactIOSViewAttributes.RCTView = merge(
ReactIOSViewAttributes.UIView, {
// This is a special performance property exposed by RKView and useful for
// This is a special performance property exposed by RCTView and useful for
// scrolling content when there are many subviews, most of which are offscreen.
// For this property to be effective, it must be applied to a view that contains
// many subviews that extend outside its bound. The subviews must also have

28
Libraries/Storage/AsyncStorage.ios.js
View File

@ -7,11 +7,11 @@
'use strict';
var NativeModules = require('NativeModulesDeprecated');
var RKAsyncLocalStorage = NativeModules.RKAsyncLocalStorage;
var RKAsyncRocksDBStorage = NativeModules.RKAsyncRocksDBStorage;
var RCTAsyncLocalStorage = NativeModules.RCTAsyncLocalStorage;
var RCTAsyncRocksDBStorage = NativeModules.RCTAsyncRocksDBStorage;
// We use RocksDB if available.
var RKAsyncStorage = RKAsyncRocksDBStorage || RKAsyncLocalStorage;
var RCTAsyncStorage = RCTAsyncRocksDBStorage || RCTAsyncLocalStorage;
/**
* AsyncStorage is a simple, asynchronous, persistent, global, key-value storage
@ -33,7 +33,7 @@ var AsyncStorage = {
key: string,
callback: (error: ?Error, result: ?string) => void
): void {
RKAsyncStorage.multiGet([key], function(errors, result) {
RCTAsyncStorage.multiGet([key], function(errors, result) {
// Unpack result to get value from [[key,value]]
var value = (result && result[0] && result[0][1]) ? result[0][1] : null;
callback((errors && convertError(errors[0])) || null, value);
@ -49,7 +49,7 @@ var AsyncStorage = {
value: string,
callback: ?(error: ?Error) => void
): void {
RKAsyncStorage.multiSet([[key,value]], function(errors) {
RCTAsyncStorage.multiSet([[key,value]], function(errors) {
callback && callback((errors && convertError(errors[0])) || null);
});
},
@ -58,7 +58,7 @@ var AsyncStorage = {
key: string,
callback: ?(error: ?Error) => void
): void {
RKAsyncStorage.multiRemove([key], function(errors) {
RCTAsyncStorage.multiRemove([key], function(errors) {
callback && callback((errors && convertError(errors[0])) || null);
});
},
@ -73,7 +73,7 @@ var AsyncStorage = {
value: string,
callback: ?(error: ?Error) => void
): void {
RKAsyncStorage.multiMerge([[key,value]], function(errors) {
RCTAsyncStorage.multiMerge([[key,value]], function(errors) {
callback && callback((errors && convertError(errors[0])) || null);
});
},
@ -84,7 +84,7 @@ var AsyncStorage = {
* own keys instead.
*/
clear: function(callback: ?(error: ?Error) => void) {
RKAsyncStorage.clear(function(error) {
RCTAsyncStorage.clear(function(error) {
callback && callback(convertError(error));
});
},
@ -93,7 +93,7 @@ var AsyncStorage = {
* Gets *all* keys known to the system, for all callers, libraries, etc.
*/
getAllKeys: function(callback: (error: ?Error) => void) {
RKAsyncStorage.getAllKeys(function(error, keys) {
RCTAsyncStorage.getAllKeys(function(error, keys) {
callback(convertError(error), keys);
});
},
@ -118,7 +118,7 @@ var AsyncStorage = {
keys: Array<string>,
callback: (errors: ?Array<Error>, result: ?Array<Array<string>>) => void
): void {
RKAsyncStorage.multiGet(keys, function(errors, result) {
RCTAsyncStorage.multiGet(keys, function(errors, result) {
callback(
(errors && errors.map((error) => convertError(error))) || null,
result
@ -136,7 +136,7 @@ var AsyncStorage = {
keyValuePairs: Array<Array<string>>,
callback: ?(errors: ?Array<Error>) => void
): void {
RKAsyncStorage.multiSet(keyValuePairs, function(errors) {
RCTAsyncStorage.multiSet(keyValuePairs, function(errors) {
callback && callback(
(errors && errors.map((error) => convertError(error))) || null
);
@ -150,7 +150,7 @@ var AsyncStorage = {
keys: Array<string>,
callback: ?(errors: ?Array<Error>) => void
): void {
RKAsyncStorage.multiRemove(keys, function(errors) {
RCTAsyncStorage.multiRemove(keys, function(errors) {
callback && callback(
(errors && errors.map((error) => convertError(error))) || null
);
@ -167,7 +167,7 @@ var AsyncStorage = {
keyValuePairs: Array<Array<string>>,
callback: ?(errors: ?Array<Error>) => void
): void {
RKAsyncStorage.multiMerge(keyValuePairs, function(errors) {
RCTAsyncStorage.multiMerge(keyValuePairs, function(errors) {
callback && callback(
(errors && errors.map((error) => convertError(error))) || null
);
@ -176,7 +176,7 @@ var AsyncStorage = {
};
// Not all native implementations support merge.
if (!RKAsyncStorage.multiMerge) {
if (!RCTAsyncStorage.multiMerge) {
delete AsyncStorage.mergeItem;
delete AsyncStorage.multiMerge;
}

4
Libraries/Text/Text.js
View File

@ -184,12 +184,12 @@ var Text = React.createClass({
props.onResponderMove = this.handleResponderMove;
props.onResponderRelease = this.handleResponderRelease;
props.onResponderTerminate = this.handleResponderTerminate;
return <RKText {...props} />;
return <RCTText {...props} />;
},
});
var PRESS_RECT_OFFSET = {top: 20, left: 20, right: 20, bottom: 30};
var RKText = createReactIOSNativeComponentClass(viewConfig);
var RCTText = createReactIOSNativeComponentClass(viewConfig);
module.exports = Text;

2
Libraries/Utilities/Dimensions.js
View File

@ -9,7 +9,7 @@ var NativeModules = require('NativeModules');
var invariant = require('invariant');
var dimensions = NativeModules.RKUIManager.Dimensions;
var dimensions = NativeModules.RCTUIManager.Dimensions;
class Dimensions {
/**

25
Libraries/Utilities/nativeModulePrefixDuplicator.js Normal file
View File

@ -0,0 +1,25 @@
/**
* Copyright 2004-present Facebook. All Rights Reserved.
*
* @providesModule nativeModulePrefixDuplicator
*/
'use strict';
// Dirty hack to support old (RK) and new (RCT) native module name conventions
function nativeModulePrefixDuplicator(modules) {
Object.keys(modules).forEach((moduleName) => {
var rkModuleName = moduleName.replace(/^RCT/, 'RK');
var rctModuleName = moduleName.replace(/^RK/, 'RCT');
if (rkModuleName !== rctModuleName) {
if (modules[rkModuleName] && modules[rctModuleName]) {
throw new Error(
'Module cannot be registered as both RCT and RK: ' + moduleName
);
}
modules[rkModuleName] = modules[moduleName];
modules[rctModuleName] = modules[moduleName];
}
});
}
module.exports = nativeModulePrefixDuplicator;