scope legacy modals

This commit is contained in:
Samuel Newman
2024-04-17 00:30:28 +01:00
parent cf175f5b11
commit d4f6e84f29
+18 -13
View File
@@ -4,7 +4,9 @@ import {StatusBar} from 'expo-status-bar'
import {observer} from 'mobx-react-lite' import {observer} from 'mobx-react-lite'
import {isIOS} from '#/platform/detection' import {isIOS} from '#/platform/detection'
import {Provider as LegacyModalProvider} from '#/state/modals'
import {useComposerState} from 'state/shell/composer' import {useComposerState} from 'state/shell/composer'
import {ModalsContainer as LegacyModalsContainer} from '#/view/com/modals/Modal'
import { import {
Outlet as PortalOutlet, Outlet as PortalOutlet,
Provider as PortalProvider, Provider as PortalProvider,
@@ -25,19 +27,22 @@ export const Composer = observer(function ComposerImpl({}: {
presentationStyle="formSheet" presentationStyle="formSheet"
animationType="slide" animationType="slide"
onRequestClose={() => ref.current?.onPressCancel()}> onRequestClose={() => ref.current?.onPressCancel()}>
<PortalProvider> <LegacyModalProvider>
<ComposePost <PortalProvider>
cancelRef={ref} <ComposePost
replyTo={state?.replyTo} cancelRef={ref}
onPost={state?.onPost} replyTo={state?.replyTo}
quote={state?.quote} onPost={state?.onPost}
mention={state?.mention} quote={state?.quote}
text={state?.text} mention={state?.mention}
imageUris={state?.imageUris} text={state?.text}
/> imageUris={state?.imageUris}
<PortalOutlet /> />
{isIOS && <StatusBar style="light" />} <LegacyModalsContainer />
</PortalProvider> <PortalOutlet />
</PortalProvider>
</LegacyModalProvider>
{isIOS && <StatusBar style="light" />}
</Modal> </Modal>
) )
}) })