From 6f5cb07ff89b1151e4a8a861a888e5bb5bd49d30 Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Tue, 10 Jun 2025 23:59:51 +0900
Subject: [PATCH 1/6] feat: adjust aria-controls only when dialog is opened

---
 packages/react/dialog/src/dialog.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/dialog/src/dialog.tsx b/packages/react/dialog/src/dialog.tsx
index 7bf964798..2a8ad2c1d 100644
--- a/packages/react/dialog/src/dialog.tsx
+++ b/packages/react/dialog/src/dialog.tsx
@@ -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}

From b7626c926af023a1185dae32e309c04cd8d763aa Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Wed, 11 Jun 2025 00:03:16 +0900
Subject: [PATCH 2/6] feat: adjust aria-controls only when menu is opened

---
 packages/react/menu/src/menu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/menu/src/menu.tsx b/packages/react/menu/src/menu.tsx
index bbc040aa7..43d5a5286 100644
--- a/packages/react/menu/src/menu.tsx
+++ b/packages/react/menu/src/menu.tsx
@@ -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)}

From ad7c50d9e2b595ef64f8bd48e0084bf6ef609ba7 Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Wed, 11 Jun 2025 00:04:32 +0900
Subject: [PATCH 3/6] feat: adjust aria-controls only when navigation-menu is
 opened

---
 packages/react/navigation-menu/src/navigation-menu.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/navigation-menu/src/navigation-menu.tsx b/packages/react/navigation-menu/src/navigation-menu.tsx
index d911b06e7..e194b4792 100644
--- a/packages/react/navigation-menu/src/navigation-menu.tsx
+++ b/packages/react/navigation-menu/src/navigation-menu.tsx
@@ -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, () => {

From 195f0d48cccd638dfcb0922bd4dcd2fff879a21d Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Wed, 11 Jun 2025 00:06:34 +0900
Subject: [PATCH 4/6] feat: adjust aria-controls only when popover is opened

---
 packages/react/popover/src/popover.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/popover/src/popover.tsx b/packages/react/popover/src/popover.tsx
index e9410e970..878fb8553 100644
--- a/packages/react/popover/src/popover.tsx
+++ b/packages/react/popover/src/popover.tsx
@@ -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}

From 99a851d2f3a7ff79ac23a666b87ac83d9b6408a9 Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Wed, 11 Jun 2025 00:08:56 +0900
Subject: [PATCH 5/6] feat: adjust aria-controls only when select is opened

---
 packages/react/select/src/select.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/react/select/src/select.tsx b/packages/react/select/src/select.tsx
index 042a0f333..390501b7f 100644
--- a/packages/react/select/src/select.tsx
+++ b/packages/react/select/src/select.tsx
@@ -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"

From acdd1fbcc66b21902f693d7fd808a8fad8f6d2e6 Mon Sep 17 00:00:00 2001
From: seongminn <berry9901@gmail.com>
Date: Wed, 11 Jun 2025 00:38:12 +0900
Subject: [PATCH 6/6] chore: add changeset

---
 .changeset/brown-falcons-battle.md | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 .changeset/brown-falcons-battle.md

diff --git a/.changeset/brown-falcons-battle.md b/.changeset/brown-falcons-battle.md
new file mode 100644
index 000000000..33752bf56
--- /dev/null
+++ b/.changeset/brown-falcons-battle.md
@@ -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.