[Sheets] [Pt. 8] Allow nesting in other sheets or native modals (#5567)

This commit is contained in:
Hailey
2024-10-02 21:26:58 -07:00
committed by GitHub
parent ecf7215a34
commit c49182009a
11 changed files with 97 additions and 63 deletions
+17 -6
View File
@@ -3,8 +3,9 @@ import {GestureResponderEvent, View} from 'react-native'
import {msg} from '@lingui/macro'
import {useLingui} from '@lingui/react'
import {isNative} from '#/platform/detection'
import {atoms as a, useBreakpoints, useTheme} from '#/alf'
import {Button, ButtonColor, ButtonProps, ButtonText} from '#/components/Button'
import {Button, ButtonColor, ButtonText} from '#/components/Button'
import * as Dialog from '#/components/Dialog'
import {Text} from '#/components/Typography'
@@ -25,9 +26,11 @@ export function Outer({
children,
control,
testID,
withoutPortal,
}: React.PropsWithChildren<{
control: Dialog.DialogControlProps
testID?: string
withoutPortal?: boolean
}>) {
const {gtMobile} = useBreakpoints()
const titleId = React.useId()
@@ -38,8 +41,11 @@ export function Outer({
[titleId, descriptionId],
)
const Wrapper =
withoutPortal && isNative ? Dialog.OuterWithoutPortal : Dialog.Outer
return (
<Dialog.Outer control={control} testID={testID}>
<Wrapper control={control} testID={testID}>
<Context.Provider value={context}>
<Dialog.ScrollableInner
accessibilityLabelledBy={titleId}
@@ -50,7 +56,7 @@ export function Outer({
{children}
</Dialog.ScrollableInner>
</Context.Provider>
</Dialog.Outer>
</Wrapper>
)
}
@@ -139,7 +145,7 @@ export function Action({
* Note: The dialog will close automatically when the action is pressed, you
* should NOT close the dialog as a side effect of this method.
*/
onPress: ButtonProps['onPress']
onPress: (e: GestureResponderEvent) => void
color?: ButtonColor
/**
* Optional i18n string. If undefined, it will default to "Confirm".
@@ -179,6 +185,7 @@ export function Basic({
onConfirm,
confirmButtonColor,
showCancel = true,
withoutPortal,
}: React.PropsWithChildren<{
control: Dialog.DialogOuterProps['control']
title: string
@@ -192,12 +199,16 @@ export function Basic({
* Note: The dialog will close automatically when the action is pressed, you
* should NOT close the dialog as a side effect of this method.
*/
onConfirm: ButtonProps['onPress']
onConfirm: (e: GestureResponderEvent) => void
confirmButtonColor?: ButtonColor
showCancel?: boolean
withoutPortal?: boolean
}>) {
return (
<Outer control={control} testID="confirmModal">
<Outer
control={control}
testID="confirmModal"
withoutPortal={withoutPortal}>
<TitleText>{title}</TitleText>
<DescriptionText>{description}</DescriptionText>
<Actions>