Back out of D3000972

Reviewed By: dmmiller Differential Revision: D3003211 fb-gh-sync-id: e64f1f17dcbf19a32066de91d6e839d59cd5d27c shipit-source-id: e64f1f17dcbf19a32066de91d6e839d59cd5d27c
whippersnapper · Mar 3, 2016 · 5ffeb97 · 5ffeb97
1 parent 36f1961
commit 5ffeb97
Show file tree

Hide file tree

Showing 22 changed files with 117 additions and 373 deletions.
diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationAnimatedExample.js
@@ -27,7 +27,6 @@ var {
   RootContainer: NavigationRootContainer,
   Reducer: NavigationReducer,
   Header: NavigationHeader,
-  HeaderTitle: NavigationHeaderTitle,
 } = NavigationExperimental;
 
 const NavigationBasicReducer = NavigationReducer.StackReducer({
@@ -61,6 +60,12 @@ class NavigationAnimatedExample extends React.Component {
       />
     );
   }
+  handleBackAction() {
+    return (
+      this.navRootContainer &&
+      this.navRootContainer.handleNavigation(NavigationRootContainer.getBackAction())
+    );
+  }
   _renderNavigated(navigationState, onNavigate) {
     if (!navigationState) {
       return null;
@@ -69,13 +74,11 @@ class NavigationAnimatedExample extends React.Component {
       <NavigationAnimatedView
         navigationState={navigationState}
         style={styles.animatedView}
-        renderOverlay={(scenes, index, position, layout) => (
+        renderOverlay={(props) => (
           <NavigationHeader
-            scenes={scenes}
-            index={index}
-            position={position}
-            layout={layout}
-            renderTitleComponent={pageState => <NavigationHeaderTitle>{pageState.key}</NavigationHeaderTitle>}
+            navigationState={props.navigationParentState}
+            position={props.position}
+            getTitle={state => state.key}
           />
         )}
         setTiming={(pos, navState) => {
@@ -118,7 +121,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   scrollView: {
-    marginTop: NavigationHeader.APPBAR_HEIGHT + NavigationHeader.STATUSBAR_HEIGHT,
+    marginTop: 64
   },
 });
 

diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationBasicExample.js
@@ -23,7 +23,6 @@ const NavigationExampleRow = require('./NavigationExampleRow');
 const {
   RootContainer: NavigationRootContainer,
   Reducer: NavigationReducer,
-  Header: NavigationHeader,
 } = NavigationExperimental;
 const StackReducer = NavigationReducer.StackReducer;
 
@@ -94,7 +93,7 @@ const styles = StyleSheet.create({
   topView: {
     backgroundColor: '#E9E9EF',
     flex: 1,
-    paddingTop: NavigationHeader.STATUSBAR_HEIGHT,
+    paddingTop: 30,
   },
 });
 

diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js b/Examples/UIExplorer/NavigationExperimental/NavigationCompositionExample.js
@@ -28,7 +28,6 @@ const {
   Container: NavigationContainer,
   RootContainer: NavigationRootContainer,
   Header: NavigationHeader,
-  HeaderTitle: NavigationHeaderTitle,
   Reducer: NavigationReducer,
   View: NavigationView,
 } = NavigationExperimental;
@@ -155,15 +154,13 @@ class ExampleTabScreen extends React.Component {
       />
     );
   }
-
-  _renderHeader(scenes, index, position, layout) {
+  _renderHeader(props) {
     return (
       <NavigationHeader
-        scenes={scenes}
-        index={index}
-        position={position}
-        layout={layout}
-        renderTitleComponent={pageState => <NavigationHeaderTitle>{stateTypeTitleMap(pageState)}</NavigationHeaderTitle>}
+        navigationState={props.navigationParentState}
+        position={props.position}
+        layout={props.layout}
+        getTitle={state => stateTypeTitleMap(state)}
       />
     );
   }
@@ -273,7 +270,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   scrollView: {
-    marginTop: NavigationHeader.APPBAR_HEIGHT + NavigationHeader.STATUSBAR_HEIGHT,
+    marginTop: 64
   },
   tabContent: {
     flex: 1,

diff --git a/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js b/Examples/UIExplorer/NavigationExperimental/NavigationExampleRow.js
@@ -16,6 +16,7 @@
 var React = require('react-native');
 var {
   Text,
+  PixelRatio,
   StyleSheet,
   View,
   TouchableHighlight,
@@ -49,7 +50,7 @@ const styles = StyleSheet.create({
   row: {
     padding: 15,
     backgroundColor: 'white',
-    borderBottomWidth: StyleSheet.hairlineWidth,
+    borderBottomWidth: 1 / PixelRatio.get(),
     borderBottomColor: '#CDCDCD',
   },
   rowText: {

diff --git a/Examples/UIExplorer/UIExplorerList.android.js b/Examples/UIExplorer/UIExplorerList.android.js
@@ -15,8 +15,6 @@
  */
 'use strict';
 
-const React = require('react');
-
 export type UIExplorerExample = {
   key: string;
   module: React.Component;