fix: onEscKeyDown behavior

hashicorp · Sep 6, 2024 · 2c12856 · 2c12856
1 parent 0a2b19f
commit 2c12856
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/src/components/navigation-header/components/dropdown-menu/index.tsx b/src/components/navigation-header/components/dropdown-menu/index.tsx
@@ -65,7 +65,14 @@ const NavigationHeaderDropdownMenu = ({
 	useOnFocusOutside([menuRef], () => setIsOpen(false), isOpen)
 
 	// Handles closing the menu if Esc is pressed while navigating with a keyboard and the menu is focused.
-	useOnEscapeKeyDown([menuRef], () => setIsOpen(false), isOpen)
+	useOnEscapeKeyDown(
+		[menuRef],
+		() => {
+			setIsOpen(false)
+			activatorButtonRef.current.focus()
+		},
+		isOpen
+	)
 
 	// Check for a visible icon or label
 	if (!label && !hasLeadingIcon) {