drawer fixed and faulty closeDrawer removed (#2745)

aksonov · Dec 29, 2017 · 2843534 · 2843534
1 parent af8d461
commit 2843534
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 3 deletions.
diff --git a/Example/Example.js b/Example/Example.js
@@ -62,12 +62,21 @@ const getSceneStyle = () => ({
 // on Android, the URI prefix typically contains a host in addition to scheme
 const prefix = Platform.OS === 'android' ? 'mychat://mychat/' : 'mychat://';
 
+const onBackPress = () => {
+    if (Actions.state.index !== 0) {
+      return false
+    }
+    Actions.pop()
+    return true
+  }
+
 const Example = () => (
   <Router
     createReducer={reducerCreate}
     getSceneStyle={getSceneStyle}
     uriPrefix={prefix}
-  >
+    backAndroidHandler={onBackPress}>
+
     <Overlay key="overlay">
       <Modal key="modal"
         hideNavBar
@@ -130,6 +139,9 @@ const Example = () => (
               contentComponent={DrawerContent}
               drawerImage={MenuIcon}
               drawerWidth={300}
+            drawerOpenRoute = 'DrawerOpen'
+        	drawerCloseRoute = 'DrawerClose'
+        	drawerToggleRoute = 'DrawerToggle'
             >
               {/*
                 Wrapper Scene needed to fix a bug where the tabs would

diff --git a/Example/components/drawer/DrawerContent.js b/Example/components/drawer/DrawerContent.js
@@ -29,8 +29,8 @@ class DrawerContent extends React.Component {
   render() {
     return (
       <View style={styles.container}>
-        <Text>Drawer Content</Text>
-        <Button onPress={Actions.closeDrawer}>Back</Button>
+        {/* <Text>Drawer Content</Text>
+        <Button onPress={Actions.closeDrawer}>Back</Button> */}
         <Text>Title: {this.props.title}</Text>
         {this.props.name === 'tab1_1' &&
           <Button onPress={Actions.tab_1_2}>next screen for tab1_1</Button>