[ReactNative] Update core RN modules to work with React 0.14-beta1

Libraries/ReactNative/ReactNative.js

@@ -14,7 +14,6 @@
 var ReactChildren = require('ReactChildren');
 var ReactClass = require('ReactClass');
 var ReactComponent = require('ReactComponent');
-var ReactContext = require('ReactContext');
 var ReactCurrentOwner = require('ReactCurrentOwner');
 var ReactElement = require('ReactElement');
 var ReactElementValidator = require('ReactElementValidator');
@@ -27,6 +26,7 @@ var deprecated = require('deprecated');
 var findNodeHandle = require('findNodeHandle');
 var invariant = require('invariant');
 var onlyChild = require('onlyChild');
+var warning = require('warning');
 
 ReactNativeDefaultInjection.inject();
 
@@ -61,7 +61,6 @@ var augmentElement = function(element: ReactElement) {
     );
   }
   element._owner = ReactCurrentOwner.current;
-  element._context = ReactContext.current;
   if (element.type.defaultProps) {
     resolveDefaultProps(element);
   }
@@ -103,20 +102,14 @@ var ReactNative = {
   isValidElement: ReactElement.isValidElement,
 
   // Deprecations (remove for 0.13)
-  renderComponent: deprecated(
-    'React',
-    'renderComponent',
-    'render',
-    this,
-    render
-  ),
-  isValidComponent: deprecated(
-    'React',
-    'isValidComponent',
-    'isValidElement',
-    this,
-    ReactElement.isValidElement
-  )
+  renderComponent: function(
+    element: ReactElement,
+    mountInto: number,
+    callback?: ?(() => void)
+  ): ?ReactComponent {
+    warning('Use React.render instead of React.renderComponent');
+    return ReactNative.render(element, mountInto, callback);
+  },
 };
 
 // Inject the runtime into a devtools global hook regardless of browser.

Libraries/ReactNative/ReactNativeDefaultInjection.js

@@ -90,7 +90,7 @@ function inject() {
   ReactNativeComponent.injection.injectTextComponentClass(
     ReactNativeTextComponent
   );
-  ReactNativeComponent.injection.injectAutoWrapper(function(tag) {
+  ReactNativeComponent.injection.injectGenericComponentClass(function(tag) {
     // Show a nicer error message for non-function tags
     var info = '';
     if (typeof tag === 'string' && /^[a-z]/.test(tag)) {

Libraries/ReactNative/ReactNativeMount.js

@@ -13,6 +13,7 @@
 
 var RCTUIManager = require('NativeModules').UIManager;
 
+var ReactElement = require('ReactElement');
 var ReactNativeTagHandles = require('ReactNativeTagHandles');
 var ReactPerf = require('ReactPerf');
 var ReactReconciler = require('ReactReconciler');
@@ -27,6 +28,17 @@ function instanceNumberToChildRootID(rootNodeID, instanceNumber) {
   return rootNodeID + '[' + instanceNumber + ']';
 }
 
+/**
+ * Temporary (?) hack so that we can store all top-level pending updates on
+ * composites instead of having to worry about different types of components
+ * here.
+ */
+var TopLevelWrapper = function() {};
+TopLevelWrapper.prototype.render = function() {
+  // this.props is actually a ReactElement
+  return this.props;
+};
+
 /**
  * Mounts this component and inserts it into the DOM.
  *
@@ -43,7 +55,7 @@ function mountComponentIntoNode(
   var markup = ReactReconciler.mountComponent(
     componentInstance, rootID, transaction, emptyObject
   );
-  componentInstance._isTopLevel = true;
+  componentInstance._renderedComponent._topLevelWrapper = componentInstance;
   ReactNativeMount._mountImageIntoNode(markup, container);
 }
 
@@ -94,13 +106,22 @@ var ReactNativeMount = {
     containerTag: number,
     callback?: ?(() => void)
   ): ?ReactComponent {
+    var nextWrappedElement = new ReactElement(
+      TopLevelWrapper,
+      null,
+      null,
+      null,
+      nextElement
+    );
+
     var topRootNodeID = ReactNativeTagHandles.tagToRootNodeID[containerTag];
     if (topRootNodeID) {
       var prevComponent = ReactNativeMount._instancesByContainerID[topRootNodeID];
       if (prevComponent) {
-        var prevElement = prevComponent._currentElement;
+        var prevWrappedElement = prevComponent._currentElement;
+        var prevElement = prevWrappedElement.props;
         if (shouldUpdateReactComponent(prevElement, nextElement)) {
-          ReactUpdateQueue.enqueueElementInternal(prevComponent, nextElement);
+          ReactUpdateQueue.enqueueElementInternal(prevComponent, nextWrappedElement);
           if (callback) {
             ReactUpdateQueue.enqueueCallbackInternal(prevComponent, callback);
           }
@@ -122,7 +143,7 @@ var ReactNativeMount = {
       containerTag
     );
 
-    var instance = instantiateReactComponent(nextElement);
+    var instance = instantiateReactComponent(nextWrappedElement);
     ReactNativeMount._instancesByContainerID[topRootNodeID] = instance;
 
     var childRootNodeID = instanceNumberToChildRootID(
@@ -234,6 +255,10 @@ var ReactNativeMount = {
 
   getNode: function<T>(id: T): T {
     return id;
+  },
+
+  getID: function<T>(id: T): T {
+    return id;
   }
 };