status-im/react-navigation
2
0
Fork 0
mirror of https://github.com/status-im/react-navigation.git synced 2025-02-24 09:08:15 +00:00
Code Issues Projects Releases Wiki Activity

Set the default value of the DrawerNavigatorConfig correctly. (#3152)

Browse Source 
* Set the default value of the DrawerNavigatorConfig correctly.

* update DrawerViewProps type
This commit is contained in:
混沌DM 2018-01-09 17:28:27 +08:00 committed by Satyajit Sahoo
parent c7b73cd8b4
commit 50d5c8bc0a
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/navigators/DrawerNavigator.js
View File

@ -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 {

24
src/views/Drawer/DrawerView.js
View File

@ -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,
@ -44,11 +44,21 @@ export type DrawerViewConfig = {
screenProps?: {},
};
export type DrawerViewPropsExceptRouter = DrawerViewConfig & {
navigation: NavigationScreenProp<NavigationState>,
};
export type DrawerViewProps = {
drawerLockMode?: 'unlocked' | 'locked-closed' | 'locked-open',
drawerWidth: number | (() => number),
drawerPosition: 'left' | 'right',
drawerOpenRoute: string,
drawerCloseRoute: string,
drawerToggleRoute: string,
contentComponent: React.ComponentType<*>,
contentOptions?: {},
style?: ViewStyleProp,
useNativeAnimations: boolean,
drawerBackgroundColor: string,
screenProps?: {},
export type DrawerViewProps = DrawerViewPropsExceptRouter & {
navigation: NavigationScreenProp<NavigationState>,
router: NavigationRouter<NavigationState, NavigationDrawerScreenOptions>,
};