diff --git a/apps/src/screens/StackPresentation.tsx b/apps/src/screens/StackPresentation.tsx index fa25ba000c..5773e029cd 100644 --- a/apps/src/screens/StackPresentation.tsx +++ b/apps/src/screens/StackPresentation.tsx @@ -1,6 +1,6 @@ import React from 'react'; import { ScrollView, StyleSheet, View, ImageBackground } from 'react-native'; -import { ParamListBase } from '@react-navigation/native'; +import { ParamListBase, RouteProp } from '@react-navigation/native'; import { createNativeStackNavigator, NativeStackNavigationProp, @@ -15,7 +15,7 @@ type StackParamList = { ContainedModal: undefined; ContainedTransparentModal: undefined; FullScreenModal: undefined; - FormSheet: undefined; + FormSheet: { usesFormSheetPresentation?: boolean }; }; interface MainScreenProps { @@ -71,21 +71,43 @@ const MainScreen = ({ navigation }: MainScreenProps): React.JSX.Element => { ); }; -interface FormScreenProps { - navigation: NativeStackNavigationProp; +interface PushScreenProps { + navigation: NativeStackNavigationProp; } -const FormScreen = ({ navigation }: FormScreenProps): React.JSX.Element => ( +const PushScreen = ({ navigation }: PushScreenProps) => ( + + +) + +interface FormScreenProps { + navigation: NativeStackNavigationProp; + route: RouteProp; +} + +const FormScreenContent = ({ navigation }: { navigation: NativeStackNavigationProp }) => ( + <>