Merge pull request #4888 from nextcloud/a11y/toolbar2

fix(menubar): Add aria-selected and aria-activedescendant to menu bar items (fix #3911)
nextcloud · Oct 20, 2023 · 052cf54 · 052cf54
2 parents b8e54e5 + 15ae86a
commit 052cf54
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/src/components/Menu/ActionList.vue b/src/components/Menu/ActionList.vue
@@ -27,6 +27,7 @@
 		v-bind="state"
 		:container="menuIDSelector"
 		:aria-label="actionEntry.label"
+		:aria-activedescendant="currentChild ? `${$menuID}-child-${currentChild.key}` : null"
 		:force-menu="true"
 		:name="actionEntry.label"
 		:data-text-action-entry="actionEntry.key"
@@ -37,6 +38,7 @@
 		</template>
 		<ActionSingle v-for="child in children"
 			:key="`child-${child.key}`"
+			:id="`${$menuID}-child-${child.key}`"
 			is-item
 			:action-entry="child"
 			v-on="$listeners"

diff --git a/src/components/Menu/utils.js b/src/components/Menu/utils.js
@@ -75,6 +75,7 @@ const getActionState = (actionEntry, $editor) => {
 		disabled: isDisabled(actionEntry, $editor),
 		class: getEntryClasses(actionEntry, active),
 		active,
+		'aria-selected': active,
 	}
 }