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
3 changes: 2 additions & 1 deletion src/components/ActionButton/ActionButton.vue
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,11 @@ export default {
</docs>

<template>
<li class="action" :class="{ 'action--disabled': disabled }">
<li class="action" role="presentation" :class="{ 'action--disabled': disabled }">
<button class="action-button"
:class="{ focusable: isFocusable }"
:aria-label="ariaLabel"
role="menuitem"
type="button"
@click="onClick">
<!-- @slot Manually provide icon -->
Expand Down
5 changes: 3 additions & 2 deletions src/components/Actions/Actions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,7 @@ export default {
<div v-else
v-show="hasMultipleActions || forceMenu"
:class="{'action-item--open': opened}"

class="action-item">
<!-- If more than one action, create a popovermenu -->
<Popover :delay="0"
Expand All @@ -186,7 +187,7 @@ export default {
'action-item__menutoggle--default-icon': !iconSlotIsPopulated && defaultIcon === '',
'action-item__menutoggle--primary': primary
}"
aria-haspopup="true"
aria-haspopup="menu"
:aria-label="ariaLabel"
:aria-controls="randomId"
:aria-expanded="opened ? 'true' : 'false'"
Expand All @@ -213,7 +214,7 @@ export default {
@keydown.esc.exact.prevent="closeMenu"
@mousemove="onMouseFocusAction">
<!-- menu content -->
<ul :id="randomId" tabindex="-1">
<ul :id="randomId" tabindex="-1" role="menu">
<template v-if="opened">
<slot />
</template>
Expand Down