diff --git a/apps/src/shared/gamma/containers/stack/StackContainer.tsx b/apps/src/shared/gamma/containers/stack/StackContainer.tsx index a5cb87f84e..35f4b229e2 100644 --- a/apps/src/shared/gamma/containers/stack/StackContainer.tsx +++ b/apps/src/shared/gamma/containers/stack/StackContainer.tsx @@ -3,8 +3,10 @@ import { ScreenStackHost, StackScreen, StackScreenLifecycleState, + StackScreenHeaderConfig, } from 'react-native-screens'; import type { StackScreenNativeProps } from 'react-native-screens/components/gamma/StackScreen'; +import type { StackScreenHeaderConfigNativeProps } from 'react-native-screens/components/gamma/StackScreenHeaderConfig'; let id = 0; @@ -17,7 +19,7 @@ interface StackProps { } interface ScreenProps { - // TBA + navigationBar: StackScreenHeaderConfigNativeProps; } type Path = { @@ -156,11 +158,13 @@ export function StackContainer({ pathConfigs }: StackContainerProps) { onPop={handlePop}> + ...screenProps, + pop, + push, + }} + > + ))} diff --git a/apps/src/tests/TestScreenStack/helper.tsx b/apps/src/tests/TestScreenStack/helper.tsx index 54d1c9cb2d..d3a850ddf5 100644 --- a/apps/src/tests/TestScreenStack/helper.tsx +++ b/apps/src/tests/TestScreenStack/helper.tsx @@ -2,26 +2,28 @@ import React from 'react'; import { Button } from 'react-native'; import { ScreenLayout } from './ScreenLayout'; import { useStackNavigation } from '../../shared/gamma/containers/stack/StackContainer'; +import { ScreenProps } from 'react-native-screens'; -export function generateStackWithNames(screenNames: string[]) { +export function generateStackWithNames(screens: {name: string; options?: ScreenProps;}[]) { const TestComponent = () => { const navigation = useStackNavigation(); return ( - {screenNames.map(screenName => ( + {screens.map(screen => (