Unify renderApplication across iOS and Android

Reviewed By: spicyj Differential Revision: D3385860 fbshipit-source-id: 256a2d12691dc9fddc56eaf150697f07b830da92
n-miyo · Jun 13, 2016 · 23027cd · 23027cd
1 parent 8c29a52
commit 23027cd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 129 deletions.
diff --git a/Libraries/ReactIOS/AppContainer.js b/Libraries/ReactIOS/AppContainer.js
@@ -60,7 +60,7 @@ var AppContainer = React.createClass({
     return (
       <View style={styles.appContainer}>
         <View
-          collapsable={false}
+          collapsable={!this.state.inspector}
           key={this.state.mainKey}
           style={styles.appContainer} ref="main">
           {this.props.children}

diff --git a/Libraries/ReactIOS/renderApplication.android.js b/Libraries/ReactIOS/renderApplication.android.js
diff --git a/Libraries/ReactIOS/renderApplication.ios.js → Libraries/ReactIOS/renderApplication.js b/Libraries/ReactIOS/renderApplication.ios.js → Libraries/ReactIOS/renderApplication.js
@@ -18,9 +18,12 @@ var ReactNative = require('ReactNative');
 
 var invariant = require('fbjs/lib/invariant');
 
-function renderApplication<P>(
-  RootComponent: ReactClass<P>,
-  initialProps: P,
+// require BackAndroid so it sets the default handler that exits the app if no listeners respond
+require('BackAndroid');
+
+function renderApplication<Props>(
+  RootComponent: ReactClass<Props>,
+  initialProps: Props,
   rootTag: any
 ) {
   invariant(
@@ -38,5 +41,4 @@ function renderApplication<P>(
   );
 }
 
-
 module.exports = renderApplication;