From 248879f5a3269abe2e1814e70d81a98935b42f72 Mon Sep 17 00:00:00 2001
From: Sebastian Markbage <sema@fb.com>
Date: Fri, 22 Apr 2016 18:01:49 -0700
Subject: [PATCH] Fix react-native.js.flow

Summary:We no longer forward React onto this object. We only forward the ReactNative
module onto it.

We also deprecated the addons so they'll all warn. We'll remove it
completely soon.
Closes https://github.com/facebook/react-native/pull/7136

Reviewed By: gabelevi

Differential Revision: D3211809

Pulled By: sebmarkbage

fb-gh-sync-id: 77aaa909dca5e2522cfaa7b4ca361fabc614be58
fbshipit-source-id: 77aaa909dca5e2522cfaa7b4ca361fabc614be58
---
 Examples/Movies/MovieCell.js                |  3 ---
 Examples/Movies/MovieScreen.js              |  3 ---
 Libraries/react-native/react-native.js.flow | 21 ++-------------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/Examples/Movies/MovieCell.js b/Examples/Movies/MovieCell.js
index 64cfcfedb..daa7d41b5 100644
--- a/Examples/Movies/MovieCell.js
+++ b/Examples/Movies/MovieCell.js
@@ -45,9 +45,6 @@ var MovieCell = React.createClass({
           onShowUnderlay={this.props.onHighlight}
           onHideUnderlay={this.props.onUnhighlight}>
           <View style={styles.row}>
-            {/* $FlowIssue #7363964 - There's a bug in Flow where you cannot
-              * omit a property or set it to undefined if it's inside a shape,
-              * even if it isn't required */}
             <Image
               source={getImageSource(this.props.movie, 'det')}
               style={styles.cellImage}
diff --git a/Examples/Movies/MovieScreen.js b/Examples/Movies/MovieScreen.js
index b83d00d01..cae726f0c 100644
--- a/Examples/Movies/MovieScreen.js
+++ b/Examples/Movies/MovieScreen.js
@@ -34,9 +34,6 @@ var MovieScreen = React.createClass({
     return (
       <ScrollView contentContainerStyle={styles.contentContainer}>
         <View style={styles.mainSection}>
-          {/* $FlowIssue #7363964 - There's a bug in Flow where you cannot
-            * omit a property or set it to undefined if it's inside a shape,
-            * even if it isn't required */}
           <Image
             source={getImageSource(this.props.movie, 'det')}
             style={styles.detailsImage}
diff --git a/Libraries/react-native/react-native.js.flow b/Libraries/react-native/react-native.js.flow
index ae9db08d1..0bb568e5c 100644
--- a/Libraries/react-native/react-native.js.flow
+++ b/Libraries/react-native/react-native.js.flow
@@ -16,14 +16,14 @@
  */
 'use strict';
 
-// Export React, plus some native additions.
+// Export ReactNative, plus some native additions.
 //
 // The use of Object.create/assign is to work around a Flow bug (#6560135).
 // Once that is fixed, change this back to
 //
 //   var ReactNative = {...require('React'), /* additions */}
 //
-var ReactNative = Object.assign(Object.create(require('react')), {
+var ReactNative = Object.assign(Object.create(require('ReactNative')), {
   // Components
   ActivityIndicatorIOS: require('ActivityIndicatorIOS'),
   ART: require('ReactNativeART'),
@@ -114,23 +114,6 @@ var ReactNative = Object.assign(Object.create(require('react')), {
   ColorPropType: require('ColorPropType'),
   EdgeInsetsPropType: require('EdgeInsetsPropType'),
   PointPropType: require('PointPropType'),
-
-  // See http://facebook.github.io/react/docs/addons.html
-  addons: {
-    LinkedStateMixin: require('LinkedStateMixin'),
-    Perf: undefined,
-    PureRenderMixin: require('ReactComponentWithPureRenderMixin'),
-    TestModule: require('NativeModules').TestModule,
-    TestUtils: undefined,
-    batchedUpdates: require('ReactUpdates').batchedUpdates,
-    createFragment: require('ReactFragment').create,
-    update: require('update'),
-  },
 });
 
-if (__DEV__) {
-  ReactNative.addons.Perf = require('ReactDefaultPerf');
-  ReactNative.addons.TestUtils = require('ReactTestUtils');
-}
-
 module.exports = ReactNative;