From 202adb6d7b076e2837169bd7585ca76e78e86a1f Mon Sep 17 00:00:00 2001 From: Eric Bailey Date: Tue, 12 Mar 2024 19:25:58 -0500 Subject: Fix dropdown close via a portaled backdrop (#3191) --- src/components/Menu/index.web.tsx | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) (limited to 'src/components/Menu/index.web.tsx') diff --git a/src/components/Menu/index.web.tsx b/src/components/Menu/index.web.tsx index 47193bce0..f4b03f680 100644 --- a/src/components/Menu/index.web.tsx +++ b/src/components/Menu/index.web.tsx @@ -3,6 +3,8 @@ import React from 'react' import {View, Pressable, ViewStyle, StyleProp} from 'react-native' import * as DropdownMenu from '@radix-ui/react-dropdown-menu' +import {msg} from '@lingui/macro' +import {useLingui} from '@lingui/react' import * as Dialog from '#/components/Dialog' import {useInteractionState} from '#/components/hooks/useInteractionState' @@ -19,6 +21,7 @@ import { RadixPassThroughTriggerProps, } from '#/components/Menu/types' import {Context} from '#/components/Menu/context' +import {Portal} from '#/components/Portal' export function useMenuControl(): Dialog.DialogControlProps { const id = React.useId() @@ -50,6 +53,7 @@ export function Root({ }: React.PropsWithChildren<{ control?: Dialog.DialogOuterProps['control'] }>) { + const {_} = useLingui() const defaultControl = useMenuControl() const context = React.useMemo( () => ({ @@ -70,6 +74,18 @@ export function Root({ return ( + {context.control.isOpen && ( + + context.control.close()} + accessibilityHint="" + accessibilityLabel={_( + msg`Context menu backdrop, click to close the menu.`, + )} + /> + + )} -- cgit 1.4.1