💩 Apply focus capture workaround to dropdown menu trigger (#1109)

#2565
lukevella · May 18, 2024 · acbb6e5 · acbb6e5
1 parent 469fa9b
commit acbb6e5
Showing 1 changed file with 12 additions and 1 deletion.
diff --git 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;