Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/fast-pots-say.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

ActionMenu: Ensures that uncontrolled ActionMenu(s) retain tab-focus when fullscreen
19 changes: 16 additions & 3 deletions packages/react/src/ActionMenu/ActionMenu.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,25 @@ const Overlay: FCWithSlotMarker<React.PropsWithChildren<MenuOverlayProps>> = ({
} = React.useContext(MenuContext) as MandateProps<MenuContextProps, 'anchorRef'>

const containerRef = React.useRef<HTMLDivElement>(null)
useMenuKeyboardNavigation(open, onClose, containerRef, anchorRef, isSubmenu)
const isNarrow = useResponsiveValue({narrow: true}, false)
const responsiveVariant = useResponsiveValue(variant, {regular: 'anchored', narrow: 'anchored'})

const isNarrowFullscreen = !!isNarrow && variant.narrow === 'fullscreen'

const handleClose: MenuCloseHandler = React.useCallback(
gesture => {
// In narrow fullscreen mode, don't close on tab, let focus stay in the menu
if (isNarrowFullscreen && gesture === 'tab') {
return
}
onClose?.(gesture)
},
[isNarrowFullscreen, onClose],
)

useMenuKeyboardNavigation(open, handleClose, containerRef, anchorRef, isSubmenu)

const responsiveVariant = useResponsiveValue(variant, {regular: 'anchored', narrow: 'anchored'})

// If the menu anchor is an icon button, we need to label the menu by tooltip that also labelled the anchor.
const [anchorAriaLabelledby, setAnchorAriaLabelledby] = useState<null | string>(null)
useEffect(() => {
Expand All @@ -311,7 +324,7 @@ const Overlay: FCWithSlotMarker<React.PropsWithChildren<MenuOverlayProps>> = ({
anchorId={anchorId}
open={open}
onOpen={onOpen}
onClose={onClose}
onClose={handleClose}
align={align}
side={side ?? (isSubmenu ? 'outside-right' : 'outside-bottom')}
overlayProps={overlayProps}
Expand Down
Loading