diff --git a/native/account/registration/registration-container.react.js b/native/account/registration/registration-container.react.js --- a/native/account/registration/registration-container.react.js +++ b/native/account/registration/registration-container.react.js @@ -2,7 +2,7 @@ import { useHeaderHeight } from '@react-navigation/elements'; import * as React from 'react'; -import { View } from 'react-native'; +import { ScrollView } from 'react-native'; import { useStyles } from '../../themes/colors.js'; @@ -10,23 +10,27 @@ +children: React.Node, }; function RegistrationContainer(props: Props): React.Node { - const styles = useStyles(unboundStyles); - const headerHeight = useHeaderHeight(); const backgroundStyle = React.useMemo( () => ({ - ...styles.background, marginTop: headerHeight, }), - [headerHeight, styles.background], + [headerHeight], ); - return {props.children}; + const styles = useStyles(unboundStyles); + return ( + + {props.children} + + ); } const unboundStyles = { - background: { - backgroundColor: 'panelBackground', + scrollViewContentContainer: { padding: 16, }, }; diff --git a/native/account/registration/registration-navigator.react.js b/native/account/registration/registration-navigator.react.js --- a/native/account/registration/registration-navigator.react.js +++ b/native/account/registration/registration-navigator.react.js @@ -9,6 +9,7 @@ import { View } from 'react-native'; import KeyserverSelection from './keyserver-selection.react.js'; +import KeyboardAvoidingView from '../../components/keyboard-avoiding-view.react.js'; import type { RootNavigationProp } from '../../navigation/root-navigator.react.js'; import { KeyserverSelectionRouteName, @@ -46,12 +47,17 @@ const styles = useStyles(unboundStyles); return ( - - - + + + + + ); } @@ -61,6 +67,9 @@ flex: 1, backgroundColor: 'panelBackground', }, + keyboardAvoidingView: { + flex: 1, + }, }; export default RegistrationNavigator;