move fix to layout screen
This commit is contained in:
@@ -3,7 +3,7 @@ import {View, ViewStyle} from 'react-native'
|
|||||||
import {StyleProp} from 'react-native'
|
import {StyleProp} from 'react-native'
|
||||||
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
import {useSafeAreaInsets} from 'react-native-safe-area-context'
|
||||||
|
|
||||||
import {atoms as a} from '#/alf'
|
import {atoms as a, web} from '#/alf'
|
||||||
|
|
||||||
// Every screen should have a Layout component wrapping it.
|
// Every screen should have a Layout component wrapping it.
|
||||||
// This component provides a default padding for the top of the screen.
|
// This component provides a default padding for the top of the screen.
|
||||||
@@ -31,6 +31,7 @@ let Screen = ({
|
|||||||
style={[
|
style={[
|
||||||
{paddingTop: disableTopPadding ? 0 : top},
|
{paddingTop: disableTopPadding ? 0 : top},
|
||||||
a.util_screen_outer,
|
a.util_screen_outer,
|
||||||
|
web([{minHeight: 0}, a.flex_1]),
|
||||||
style,
|
style,
|
||||||
]}
|
]}
|
||||||
{...props}
|
{...props}
|
||||||
|
|||||||
@@ -18,7 +18,7 @@ import {useProfileQuery} from '#/state/queries/profile'
|
|||||||
import {useSetMinimalShellMode} from '#/state/shell'
|
import {useSetMinimalShellMode} from '#/state/shell'
|
||||||
import {CenteredView} from '#/view/com/util/Views'
|
import {CenteredView} from '#/view/com/util/Views'
|
||||||
import {MessagesList} from '#/screens/Messages/components/MessagesList'
|
import {MessagesList} from '#/screens/Messages/components/MessagesList'
|
||||||
import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
|
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
|
||||||
import {MessagesListBlockedFooter} from '#/components/dms/MessagesListBlockedFooter'
|
import {MessagesListBlockedFooter} from '#/components/dms/MessagesListBlockedFooter'
|
||||||
import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
|
import {MessagesListHeader} from '#/components/dms/MessagesListHeader'
|
||||||
import {Error} from '#/components/Error'
|
import {Error} from '#/components/Error'
|
||||||
@@ -65,7 +65,7 @@ export function MessagesConversationScreen({route}: Props) {
|
|||||||
)
|
)
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen testID="convoScreen" style={web([{minHeight: 0}, a.flex_1])}>
|
<Layout.Screen testID="convoScreen">
|
||||||
<ConvoProvider key={convoId} convoId={convoId}>
|
<ConvoProvider key={convoId} convoId={convoId}>
|
||||||
<Inner />
|
<Inner />
|
||||||
</ConvoProvider>
|
</ConvoProvider>
|
||||||
|
|||||||
@@ -49,7 +49,7 @@ import {useWizardState, WizardStep} from '#/screens/StarterPack/Wizard/State'
|
|||||||
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
|
import {StepDetails} from '#/screens/StarterPack/Wizard/StepDetails'
|
||||||
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
|
import {StepFeeds} from '#/screens/StarterPack/Wizard/StepFeeds'
|
||||||
import {StepProfiles} from '#/screens/StarterPack/Wizard/StepProfiles'
|
import {StepProfiles} from '#/screens/StarterPack/Wizard/StepProfiles'
|
||||||
import {atoms as a, useTheme, web} from '#/alf'
|
import {atoms as a, useTheme} from '#/alf'
|
||||||
import {Button, ButtonText} from '#/components/Button'
|
import {Button, ButtonText} from '#/components/Button'
|
||||||
import {useDialogControl} from '#/components/Dialog'
|
import {useDialogControl} from '#/components/Dialog'
|
||||||
import * as Layout from '#/components/Layout'
|
import * as Layout from '#/components/Layout'
|
||||||
@@ -121,9 +121,7 @@ export function Wizard({
|
|||||||
}
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Layout.Screen
|
<Layout.Screen testID="starterPackWizardScreen">
|
||||||
testID="starterPackWizardScreen"
|
|
||||||
style={web([{minHeight: 0}, a.flex_1])}>
|
|
||||||
<Provider starterPack={starterPack} listItems={listItems}>
|
<Provider starterPack={starterPack} listItems={listItems}>
|
||||||
<WizardInner
|
<WizardInner
|
||||||
currentStarterPack={starterPack}
|
currentStarterPack={starterPack}
|
||||||
|
|||||||
Reference in New Issue
Block a user