Add dismiss backdrop to native dropdowns (#4711)
parent
1a037d3542
commit
a9fe87b842
|
@ -1,13 +1,15 @@
|
||||||
import React from 'react'
|
import React from 'react'
|
||||||
|
import {Platform, Pressable, StyleSheet, View, ViewStyle} from 'react-native'
|
||||||
|
import {IconProp} from '@fortawesome/fontawesome-svg-core'
|
||||||
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
import {FontAwesomeIcon} from '@fortawesome/react-native-fontawesome'
|
||||||
import * as DropdownMenu from 'zeego/dropdown-menu'
|
import * as DropdownMenu from 'zeego/dropdown-menu'
|
||||||
import {Pressable, StyleSheet, Platform, View, ViewStyle} from 'react-native'
|
|
||||||
import {IconProp} from '@fortawesome/fontawesome-svg-core'
|
|
||||||
import {MenuItemCommonProps} from 'zeego/lib/typescript/menu'
|
import {MenuItemCommonProps} from 'zeego/lib/typescript/menu'
|
||||||
import {usePalette} from 'lib/hooks/usePalette'
|
|
||||||
import {isWeb} from 'platform/detection'
|
|
||||||
import {useTheme} from 'lib/ThemeContext'
|
|
||||||
import {HITSLOP_10} from 'lib/constants'
|
import {HITSLOP_10} from 'lib/constants'
|
||||||
|
import {usePalette} from 'lib/hooks/usePalette'
|
||||||
|
import {useTheme} from 'lib/ThemeContext'
|
||||||
|
import {isIOS, isWeb} from 'platform/detection'
|
||||||
|
import {Portal} from '#/components/Portal'
|
||||||
|
|
||||||
// Custom Dropdown Menu Components
|
// Custom Dropdown Menu Components
|
||||||
// ==
|
// ==
|
||||||
|
@ -169,11 +171,18 @@ export function NativeDropdown({
|
||||||
}: React.PropsWithChildren<Props>) {
|
}: React.PropsWithChildren<Props>) {
|
||||||
const pal = usePalette('default')
|
const pal = usePalette('default')
|
||||||
const theme = useTheme()
|
const theme = useTheme()
|
||||||
|
const [isOpen, setIsOpen] = React.useState(false)
|
||||||
const dropDownBackgroundColor =
|
const dropDownBackgroundColor =
|
||||||
theme.colorScheme === 'dark' ? pal.btn : pal.viewLight
|
theme.colorScheme === 'dark' ? pal.btn : pal.viewLight
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<DropdownMenuRoot>
|
<>
|
||||||
|
{isIOS && isOpen && (
|
||||||
|
<Portal>
|
||||||
|
<Backdrop />
|
||||||
|
</Portal>
|
||||||
|
)}
|
||||||
|
<DropdownMenuRoot onOpenWillChange={setIsOpen}>
|
||||||
<DropdownMenuTrigger
|
<DropdownMenuTrigger
|
||||||
action="press"
|
action="press"
|
||||||
testID={testID}
|
testID={testID}
|
||||||
|
@ -194,7 +203,8 @@ export function NativeDropdown({
|
||||||
}
|
}
|
||||||
if (index > 1 && items[index - 1].label === 'separator') {
|
if (index > 1 && items[index - 1].label === 'separator') {
|
||||||
return (
|
return (
|
||||||
<DropdownMenu.Group key={getKey(item.label, index, item.testID)}>
|
<DropdownMenu.Group
|
||||||
|
key={getKey(item.label, index, item.testID)}>
|
||||||
<DropdownMenuItem
|
<DropdownMenuItem
|
||||||
key={getKey(item.label, index, item.testID)}
|
key={getKey(item.label, index, item.testID)}
|
||||||
onSelect={item.onPress}>
|
onSelect={item.onPress}>
|
||||||
|
@ -237,6 +247,29 @@ export function NativeDropdown({
|
||||||
})}
|
})}
|
||||||
</DropdownMenuContent>
|
</DropdownMenuContent>
|
||||||
</DropdownMenuRoot>
|
</DropdownMenuRoot>
|
||||||
|
</>
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
function Backdrop() {
|
||||||
|
// Not visible but it eats the click outside.
|
||||||
|
// Only necessary for iOS.
|
||||||
|
return (
|
||||||
|
<Pressable
|
||||||
|
accessibilityRole="button"
|
||||||
|
accessibilityLabel="Dialog backdrop"
|
||||||
|
accessibilityHint="Press the backdrop to close the dialog"
|
||||||
|
style={{
|
||||||
|
top: 0,
|
||||||
|
left: 0,
|
||||||
|
right: 0,
|
||||||
|
bottom: 0,
|
||||||
|
position: 'absolute',
|
||||||
|
}}
|
||||||
|
onPress={() => {
|
||||||
|
/* noop */
|
||||||
|
}}
|
||||||
|
/>
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue