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
2026-04-24 04:16:00 +08:00 · 2015-03-17 13:42:44 -07:00
parent 299dea8594
commit f7cf017d29
77 changed files with 937 additions and 530 deletions
--- a/Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js
+++ b/Libraries/Components/ActivityIndicatorIOS/ActivityIndicatorIOS.ios.js
@@ -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;
--- a/Libraries/Components/DatePicker/DatePickerIOS.ios.js
+++ b/Libraries/Components/DatePicker/DatePickerIOS.ios.js
@@ -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',
 });
--- a/Libraries/Components/ListView/ListView.js
+++ b/Libraries/Components/ListView/ListView.js
@@ -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
--- a/Libraries/Components/MapView/MapView.js
+++ b/Libraries/Components/MapView/MapView.js
@@ -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,
--- a/Libraries/Components/Navigation/NavigatorIOS.ios.js
+++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js
@@ -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>
    );
  },
--- a/Libraries/Components/ScrollResponder.js
+++ b/Libraries/Components/ScrollResponder.js
@@ -6,14 +6,14 @@
 'use strict';

 var NativeModules = require('NativeModules');
-var NativeModulesDeprecated = require('NativeModulesDeprecated');
+var NativeModules = require('NativeModules');
 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 = NativeModules.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,
--- a/Libraries/Components/ScrollView/ScrollView.js
+++ b/Libraries/Components/ScrollView/ScrollView.js
@@ -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('NativeModules').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
--- a/Libraries/Components/Slider/Slider.js
+++ b/Libraries/Components/Slider/Slider.js
@@ -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',
 });
--- a/Libraries/Components/StatusBar/StatusBarIOS.ios.js
+++ b/Libraries/Components/StatusBar/StatusBarIOS.ios.js
@@ -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);
  },
 };

--- a/Libraries/Components/Subscribable.js
+++ b/Libraries/Components/Subscribable.js
@@ -29,7 +29,7 @@
 *   RCTDeviceEventEmitter,
 *   'reachabilityDidChange',
 *   (resp) => resp.network_reachability,
- *   RKReachability.getCurrentReachability
+ *   RCTReachability.getCurrentReachability
 * );
 *
 * var myComponent = React.createClass({
--- a/Libraries/Components/SwitchIOS/SwitchIOS.ios.js
+++ b/Libraries/Components/SwitchIOS/SwitchIOS.ios.js
@@ -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',
 });
--- a/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarIOS.ios.js
@@ -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;
--- a/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
+++ b/Libraries/Components/TabBarIOS/TabBarItemIOS.ios.js
@@ -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,
--- a/Libraries/Components/TextInput/TextInput.ios.js
+++ b/Libraries/Components/TextInput/TextInput.ios.js
@@ -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',
 });

--- a/Libraries/Components/TextInput/TextInputState.js
+++ b/Libraries/Components/TextInput/TextInputState.js
@@ -9,7 +9,7 @@
 */
 'use strict';

-var RKUIManager = require('NativeModulesDeprecated').RKUIManager;
+var RCTUIManager = require('NativeModules').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);
    }
  }
 };
--- a/Libraries/Components/Touchable/TouchableHighlight.js
+++ b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -118,7 +118,7 @@ var TouchableHighlight = React.createClass({

  viewConfig: {
    uiViewClassName: 'RCTView',
-    validAttributes: ReactIOSViewAttributes.RKView
+    validAttributes: ReactIOSViewAttributes.RCTView
  },

  /**
--- a/Libraries/Components/View/View.js
+++ b/Libraries/Components/View/View.js
@@ -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;
 }
--- a/Libraries/Components/WebView/WebView.android.js
+++ b/Libraries/Components/WebView/WebView.android.js
@@ -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) {
--- a/Libraries/Components/WebView/WebView.ios.js
+++ b/Libraries/Components/WebView/WebView.ios.js
@@ -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) {