Unverified Commit 447f20e5 authored by rauno's avatar rauno Committed by GitHub

[dev-tools] Re-focus previous item after closing sub menu (#80099)

This PR fixes a small bug with the menu keyboard interactions. Namely,
if you open a sub-menu and close it, visually the correct item is
highlighted but does not respond when pressing Enter.


The bug is visible here on this video:


https://github.com/user-attachments/assets/368311eb-1400-4a76-b42b-b59676dedef2


After this PR you can infinitely toggle between the menus:



https://github.com/user-attachments/assets/9ff7f5cd-67cf-4db5-a12f-fd1bf8ebe96b
parent 6d8bcd62
...@@ -219,18 +219,21 @@ function DevToolsPopover({ ...@@ -219,18 +219,21 @@ function DevToolsPopover({
dispatch({ type: ACTION_ERROR_OVERLAY_TOGGLE }) dispatch({ type: ACTION_ERROR_OVERLAY_TOGGLE })
} }
function openRootMenu() { function closeToRootMenu() {
setOpen((prevOpen) => { setOpen(OVERLAYS.Root)
if (prevOpen === null) select('first') // We wait for the menu animation to complete
return OVERLAYS.Root setTimeout(() => {
}) // This places focus again on the selected item
// so you can press Enter to trigger the selected item again
select(selectedIndex)
}, MENU_DURATION_MS)
} }
function onTriggerClick() { function onTriggerClick() {
if (open === OVERLAYS.Root) { if (open === OVERLAYS.Root) {
setOpen(null) setOpen(null)
} else { } else {
openRootMenu() setOpen(OVERLAYS.Root)
setTimeout(() => { setTimeout(() => {
select('first') select('first')
}) })
...@@ -301,7 +304,7 @@ function DevToolsPopover({ ...@@ -301,7 +304,7 @@ function DevToolsPopover({
{/* Route Info */} {/* Route Info */}
<RouteInfo <RouteInfo
isOpen={isRouteInfoOpen} isOpen={isRouteInfoOpen}
close={openRootMenu} close={closeToRootMenu}
triggerRef={triggerRef} triggerRef={triggerRef}
style={popover} style={popover}
routerType={routerType} routerType={routerType}
...@@ -311,7 +314,7 @@ function DevToolsPopover({ ...@@ -311,7 +314,7 @@ function DevToolsPopover({
{/* Turbopack Info */} {/* Turbopack Info */}
<TurbopackInfo <TurbopackInfo
isOpen={isTurbopackInfoOpen} isOpen={isTurbopackInfoOpen}
close={openRootMenu} close={closeToRootMenu}
triggerRef={triggerRef} triggerRef={triggerRef}
style={popover} style={popover}
/> />
...@@ -319,7 +322,7 @@ function DevToolsPopover({ ...@@ -319,7 +322,7 @@ function DevToolsPopover({
{/* Preferences */} {/* Preferences */}
<UserPreferences <UserPreferences
isOpen={isPreferencesOpen} isOpen={isPreferencesOpen}
close={openRootMenu} close={closeToRootMenu}
triggerRef={triggerRef} triggerRef={triggerRef}
style={popover} style={popover}
hide={handleHideDevtools} hide={handleHideDevtools}
...@@ -333,7 +336,7 @@ function DevToolsPopover({ ...@@ -333,7 +336,7 @@ function DevToolsPopover({
{process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER ? ( {process.env.__NEXT_DEVTOOL_SEGMENT_EXPLORER ? (
<SegmentsExplorer <SegmentsExplorer
isOpen={isSegmentExplorerOpen} isOpen={isSegmentExplorerOpen}
close={openRootMenu} close={closeToRootMenu}
triggerRef={triggerRef} triggerRef={triggerRef}
style={popover} style={popover}
/> />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment