From 7804a69fadf1d5d30cf1db4ecf8326aff515c64c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=B7=B7=E6=B2=8CDM?= Date: Tue, 19 Dec 2017 13:17:28 +0800 Subject: [PATCH] Set the default value of the DrawerNavigatorConfig correctly. --- src/navigators/DrawerNavigator.js | 9 ++++----- src/views/Drawer/DrawerView.js | 6 +++--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/navigators/DrawerNavigator.js b/src/navigators/DrawerNavigator.js index 26916a5c1f..5f741637e3 100644 --- a/src/navigators/DrawerNavigator.js +++ b/src/navigators/DrawerNavigator.js @@ -63,6 +63,9 @@ const DefaultDrawerConfig = { return Math.min(smallerAxisSize - appBarHeight, maxWidth); }, contentComponent: defaultContentComponent, + drawerOpenRoute: 'DrawerOpen', + drawerCloseRoute: 'DrawerClose', + drawerToggleRoute: 'DrawerToggle', drawerPosition: 'left', drawerBackgroundColor: 'white', useNativeAnimations: true, @@ -70,11 +73,7 @@ const DefaultDrawerConfig = { const DrawerNavigator = ( routeConfigs: NavigationRouteConfigMap, - config: DrawerNavigatorConfig = { - drawerOpenRoute: 'DrawerOpen', - drawerCloseRoute: 'DrawerClose', - drawerToggleRoute: 'DrawerToggle', - } + config: DrawerNavigatorConfig = {} ) => { const mergedConfig = { ...DefaultDrawerConfig, ...config }; const { diff --git a/src/views/Drawer/DrawerView.js b/src/views/Drawer/DrawerView.js index 32a73c52b4..ec2dd26d9b 100644 --- a/src/views/Drawer/DrawerView.js +++ b/src/views/Drawer/DrawerView.js @@ -33,9 +33,9 @@ export type DrawerViewConfig = { drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open', drawerWidth?: number | (() => number), drawerPosition?: 'left' | 'right', - drawerOpenRoute: string, - drawerCloseRoute: string, - drawerToggleRoute: string, + drawerOpenRoute?: string, + drawerCloseRoute?: string, + drawerToggleRoute?: string, contentComponent?: React.ComponentType<*>, contentOptions?: {}, style?: ViewStyleProp,