diff --git a/src/navigators/DrawerNavigator.js b/src/navigators/DrawerNavigator.js index 26916a5..5f74163 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 8062fab..3ba29e0 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, @@ -44,11 +44,21 @@ export type DrawerViewConfig = { screenProps?: {}, }; -export type DrawerViewPropsExceptRouter = DrawerViewConfig & { - navigation: NavigationScreenProp, -}; +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, router: NavigationRouter, };