diff options
Diffstat (limited to 'src/components/Menu')
-rw-r--r-- | src/components/Menu/index.tsx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/src/components/Menu/index.tsx b/src/components/Menu/index.tsx index a0a21a50f..a22f43cf8 100644 --- a/src/components/Menu/index.tsx +++ b/src/components/Menu/index.tsx @@ -4,7 +4,7 @@ import {msg, Trans} from '@lingui/macro' import {useLingui} from '@lingui/react' import flattenReactChildren from 'react-keyed-flatten-children' -import {isNative} from 'platform/detection' +import {isNative} from '#/platform/detection' import {atoms as a, useTheme} from '#/alf' import {Button, ButtonText} from '#/components/Button' import * as Dialog from '#/components/Dialog' @@ -82,19 +82,21 @@ export function Outer({ style?: StyleProp<ViewStyle> }>) { const context = React.useContext(Context) + const {_} = useLingui() return ( - <Dialog.Outer control={context.control}> + <Dialog.Outer + control={context.control} + nativeOptions={{preventExpansion: true}}> <Dialog.Handle /> - {/* Re-wrap with context since Dialogs are portal-ed to root */} <Context.Provider value={context}> - <Dialog.ScrollableInner label="Menu TODO"> + <Dialog.ScrollableInner label={_(msg`Menu`)} style={[a.pt_sm]}> <View style={[a.gap_lg]}> {children} {isNative && showCancel && <Cancel />} + <View style={[{height: a.pb_lg.paddingBottom}]} /> </View> - <View style={{height: a.gap_lg.gap}} /> </Dialog.ScrollableInner> </Context.Provider> </Dialog.Outer> @@ -116,15 +118,14 @@ export function Item({children, label, style, onPress, ...rest}: ItemProps) { {...rest} accessibilityHint="" accessibilityLabel={label} - onPress={e => { - onPress(e) - + onFocus={onFocus} + onBlur={onBlur} + onPress={async e => { + await onPress(e) if (!e.defaultPrevented) { control?.close() } }} - onFocus={onFocus} - onBlur={onBlur} onPressIn={e => { onPressIn() rest.onPressIn?.(e) |