From acbb6e552f9ba0f1d7b03ef88bf9a8e274449b2e Mon Sep 17 00:00:00 2001
From: Luke Vella <me@lukevella.com>
Date: Sat, 18 May 2024 13:32:34 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=A9=20Apply=20focus=20capture=20workar?=
 =?UTF-8?q?ound=20to=20dropdown=20menu=20trigger=20(#1109)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#2565
---
 packages/ui/src/dropdown-menu.tsx | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/ui/src/dropdown-menu.tsx b/packages/ui/src/dropdown-menu.tsx
index 4d0095ffa..ade17a406 100644
--- a/packages/ui/src/dropdown-menu.tsx
+++ b/packages/ui/src/dropdown-menu.tsx
@@ -9,7 +9,18 @@ import { Icon } from "./icon";
 
 const DropdownMenu = DropdownMenuPrimitive.Root;
 
-const DropdownMenuTrigger = DropdownMenuPrimitive.Trigger;
+const DropdownMenuTrigger = React.forwardRef<
+  React.ElementRef<typeof DropdownMenuPrimitive.Trigger>,
+  React.ComponentPropsWithoutRef<typeof DropdownMenuPrimitive.Trigger>
+>(({ ...props }, ref) => (
+  <DropdownMenuPrimitive.Trigger
+    ref={ref}
+    {...props}
+    onFocusCapture={(e) => {
+      e.stopPropagation();
+    }}
+  />
+));
 
 const DropdownMenuGroup = DropdownMenuPrimitive.Group;