Skip to content

refactor: adjust aria-controls to triggers according to conditions #3591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

refactor: adjust aria-controls to triggers according to conditions #3591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f5cb07
feat: adjust aria-controls only when dialog is opened
seongminn Jun 10, 2025
b7626c9
feat: adjust aria-controls only when menu is opened
seongminn Jun 10, 2025
ad7c50d
feat: adjust aria-controls only when navigation-menu is opened
seongminn Jun 10, 2025
195f0d4
feat: adjust aria-controls only when popover is opened
seongminn Jun 10, 2025
99a851d
feat: adjust aria-controls only when select is opened
seongminn Jun 10, 2025
acdd1fb
chore: add changeset
seongminn Jun 10, 2025
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
9 changes: 9 additions & 0 deletions .changeset/brown-falcons-battle.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
---
'@radix-ui/react-navigation-menu': patch
'@radix-ui/react-popover': patch
'@radix-ui/react-dialog': patch
'@radix-ui/react-select': patch
'@radix-ui/react-menu': patch
---

adjust aria-controls to triggers according to conditions.
2 changes: 1 addition & 1 deletion packages/react/dialog/src/dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ const DialogTrigger = React.forwardRef<DialogTriggerElement, DialogTriggerProps>
type="button"
aria-haspopup="dialog"
aria-expanded={context.open}
aria-controls={context.contentId}
aria-controls={context.open ? context.contentId : undefined}
data-state={getState(context.open)}
{...triggerProps}
ref={composedTriggerRef}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/menu/src/menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1049,7 +1049,7 @@ const MenuSubTrigger = React.forwardRef<MenuSubTriggerElement, MenuSubTriggerPro
id={subContext.triggerId}
aria-haspopup="menu"
aria-expanded={context.open}
aria-controls={subContext.contentId}
aria-controls={context.open ? subContext.contentId : undefined}
data-state={getOpenState(context.open)}
{...props}
ref={composeRefs(forwardedRef, subContext.onTriggerChange)}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/navigation-menu/src/navigation-menu.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ const NavigationMenuTrigger = React.forwardRef<
data-disabled={disabled ? '' : undefined}
data-state={getOpenState(open)}
aria-expanded={open}
aria-controls={contentId}
aria-controls={open ? contentId : undefined}
{...triggerProps}
ref={composedRefs}
onPointerEnter={composeEventHandlers(props.onPointerEnter, () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/react/popover/src/popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ const PopoverTrigger = React.forwardRef<PopoverTriggerElement, PopoverTriggerPro
type="button"
aria-haspopup="dialog"
aria-expanded={context.open}
aria-controls={context.contentId}
aria-controls={context.open ? context.contentId : undefined}
data-state={getState(context.open)}
{...triggerProps}
ref={composedTriggerRef}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/select/src/select.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ const SelectTrigger = React.forwardRef<SelectTriggerElement, SelectTriggerProps>
<Primitive.button
type="button"
role="combobox"
aria-controls={context.contentId}
aria-controls={context.open ? context.contentId : undefined}
aria-expanded={context.open}
aria-required={context.required}
aria-autocomplete="none"
Expand Down