Skip to content

feat(accessibility): use correct aria properties #349

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

Merged
merged 3 commits into from
Dec 19, 2018
Merged

feat(accessibility): use correct aria properties #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5804502
chore: build
quinnlangille Dec 7, 2018
db2d9ed
feat(accessibility): use correct aria properties
AdminXVII Dec 16, 2018
bb826df
Merge branch 'v0.17.0' into feat-fix-aria
quinnlangille Dec 19, 2018
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
4 changes: 2 additions & 2 deletions dist/vue-carousel.min.js
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions docs/themes/vue/source/js/vue-carousel.min.js
View file
Open in desktop

Large diffs are not rendered by default.

9 changes: 4 additions & 5 deletions src/Carousel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
'VueCarousel-inner',
{ 'VueCarousel-inner--center': isCenterModeEnabled }
]"
role="listbox"
:style="{
'transform': `translate(${currentOffset}px, 0)`,
'transition': dragging ? 'none' : transitionStyle,
Expand All @@ -30,10 +29,6 @@
</div>
</div>

<slot name="pagination" v-if="paginationEnabled">
<pagination @paginationclick="goToPage($event, 'pagination')"/>
</slot>

<slot name="navigation" v-if="navigationEnabled">
<navigation
v-if="isNavigationRequired"
Expand All @@ -43,6 +38,10 @@
@navigationclick="handleNavigation"
/>
</slot>

<slot name="pagination" v-if="paginationEnabled">
<pagination @paginationclick="goToPage($event, 'pagination')"/>
</slot>
</section>
</template>
<script>
Expand Down
8 changes: 6 additions & 2 deletions src/Navigation.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<button
type="button"
aria-label="Previous page"
role="button"
:tabindex="canAdvanceBackward ? 0 : -1"
class="VueCarousel-navigation-button VueCarousel-navigation-prev"
v-on:click.prevent="triggerPageAdvance('backward')"
v-bind:class="{ 'VueCarousel-navigation--disabled': !canAdvanceBackward }"
Expand All @@ -12,7 +12,7 @@
<button
type="button"
aria-label="Next page"
role="button"
:tabindex="canAdvanceForward ? 0 : -1"
class="VueCarousel-navigation-button VueCarousel-navigation-next"
v-on:click.prevent="triggerPageAdvance()"
v-bind:class="{ 'VueCarousel-navigation--disabled': !canAdvanceForward }"
Expand Down Expand Up @@ -94,6 +94,10 @@ export default {
outline: none;
}
.VueCarousel-navigation-button:focus {
outline: 1px solid lightblue;
}
.VueCarousel-navigation-next {
right: 0;
transform: translateY(-50%) translateX(100%);
Expand Down
43 changes: 16 additions & 27 deletions src/Pagination.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,28 @@
class="VueCarousel-pagination"
v-bind:class="{ [`VueCarousel-pagination--${paginationPositionModifierName}`]: paginationPositionModifierName }"
>
<ul class="VueCarousel-dot-container" role="tablist">
<li
<div class="VueCarousel-dot-container" role="tablist" :style="`margin-top: ${carousel.paginationPadding * 2}px;`">
<button
v-for="(page, index) in paginationCount"
:key="`${page}_${index}`"
class="VueCarousel-dot"
aria-hidden="false"
role="presentation"
role="tab"
:title="`Item ${index}`"
:value="`Item ${index}`"
:aria-label="`Item ${index}`"
:aria-selected="isCurrentDot(index) ? 'true' : 'false'"
v-bind:class="{ 'VueCarousel-dot--active': isCurrentDot(index) }"
v-for="(page, index) in paginationCount"
:key="`${page}_${index}`"
v-on:click="goToPage(index)"
:style="`
margin-${paginationPropertyBasedOnPosition}: ${carousel.paginationPadding * 2}px;
padding: ${carousel.paginationPadding}px;
width: ${carousel.paginationSize}px;
height: ${carousel.paginationSize}px;
background-color: ${isCurrentDot(index) ? carousel.paginationActiveColor : carousel.paginationColor};
`"
>
<button
type="button"
role="button"
aria-label="`Item ${index}`"
:title="`Item ${index}`"
class="VueCarousel-dot-button"
:tabindex="0"
:style="`
width: ${carousel.paginationSize}px;
height: ${carousel.paginationSize}px;
background: ${isCurrentDot(index) ? carousel.paginationActiveColor : carousel.paginationColor};
`"
></button>
</li>
</ul>
></button>
</div>
</div>
</template>

Expand Down Expand Up @@ -112,19 +104,16 @@ export default {
.VueCarousel-dot {
display: inline-block;
cursor: pointer;
}
.VueCarousel-dot-button {
appearance: none;
border: none;
background-color: transparent;
background-clip: content-box;
box-sizing: content-box;
padding: 0;
border-radius: 100%;
outline: none;
cursor: pointer;
}
.VueCarousel-dot-button:focus {
.VueCarousel-dot:focus {
outline: 1px solid lightblue;
}
</style>
2 changes: 2 additions & 0 deletions src/Slide.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
<div
class="VueCarousel-slide"
tabindex="-1"
:aria-hidden="!isActive"
role="tabpanel"
:class="{
'VueCarousel-slide-active': isActive,
'VueCarousel-slide-center': isCenter,
Expand Down
292 changes: 121 additions & 171 deletions tests/client/components/__snapshots__/carousel.spec.js.snap
View file
Open in desktop

Large diffs are not rendered by default.

110 changes: 50 additions & 60 deletions tests/client/components/__snapshots__/navigation.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,100 +2,90 @@

exports[`Navigation should mount successfully 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1')
|
.VueCarousel-pagination(style='')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot(aria-hidden='false', role='presentation', aria-selected='false', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(239, 239, 239);')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 1', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', role='tabpanel', aria-hidden='true')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1', role='tabpanel')
|
.VueCarousel-navigation
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', role='button', style='padding: 8px; margin-right: -8px;') &#x25C0;
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', tabindex='0', style='padding: 8px; margin-right: -8px;') &#x25C0;
|
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', role='button', style='padding: 8px; margin-left: -8px;') &#x25B6;
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', tabindex='-1', style='padding: 8px; margin-left: -8px;') &#x25B6;
|
.VueCarousel-pagination(style='')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='false', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(239, 239, 239);')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 1', value='Item 1', aria-label='Item 1', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;

exports[`Navigation should render a next button 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1')
|
.VueCarousel-pagination(style='')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot(aria-hidden='false', role='presentation', aria-selected='false', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(239, 239, 239);')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 1', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', role='tabpanel', aria-hidden='true')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1', role='tabpanel')
|
.VueCarousel-navigation
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', role='button', style='padding: 8px; margin-right: -8px;') &#x25C0;
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', tabindex='0', style='padding: 8px; margin-right: -8px;') &#x25C0;
|
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', role='button', style='padding: 8px; margin-left: -8px;') &#x25B6;
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', tabindex='-1', style='padding: 8px; margin-left: -8px;') &#x25B6;
|
.VueCarousel-pagination(style='')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='false', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(239, 239, 239);')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 1', value='Item 1', aria-label='Item 1', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;

exports[`Navigation should render a prev button 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1')
|
.VueCarousel-pagination(style='')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot(aria-hidden='false', role='presentation', aria-selected='false', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(239, 239, 239);')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 1', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', role='tabpanel', aria-hidden='true')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1', role='tabpanel')
|
.VueCarousel-navigation
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', role='button', style='padding: 8px; margin-right: -8px;') &#x25C0;
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', tabindex='0', style='padding: 8px; margin-right: -8px;') &#x25C0;
|
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', role='button', style='padding: 8px; margin-left: -8px;') &#x25B6;
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', tabindex='-1', style='padding: 8px; margin-left: -8px;') &#x25B6;
|
.VueCarousel-pagination(style='')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='false', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(239, 239, 239);')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 1', value='Item 1', aria-label='Item 1', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;

exports[`Navigation should trigger page advance backward when prev is clicked 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1')
|
.VueCarousel-pagination(style='')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot(aria-hidden='false', role='presentation', aria-selected='false', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(239, 239, 239);')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 1', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', role='tabpanel', aria-hidden='true')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1', role='tabpanel')
|
.VueCarousel-navigation
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', role='button', style='padding: 8px; margin-right: -8px;') &#x25C0;
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', tabindex='0', style='padding: 8px; margin-right: -8px;') &#x25C0;
|
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', role='button', style='padding: 8px; margin-left: -8px;') &#x25B6;
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', tabindex='-1', style='padding: 8px; margin-left: -8px;') &#x25B6;
|
.VueCarousel-pagination(style='')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='false', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(239, 239, 239);')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 1', value='Item 1', aria-label='Item 1', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;

exports[`Navigation should trigger page advance when next is clicked 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1')
|
.VueCarousel-pagination(style='')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot(aria-hidden='false', role='presentation', aria-selected='false', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(239, 239, 239);')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 1', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', role='tabpanel', aria-hidden='true')
.VueCarousel-slide.VueCarousel-slide-active.VueCarousel-slide-center(tabindex='-1', role='tabpanel')
|
.VueCarousel-navigation
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', role='button', style='padding: 8px; margin-right: -8px;') &#x25C0;
button.VueCarousel-navigation-button.VueCarousel-navigation-prev(type='button', aria-label='Previous page', tabindex='0', style='padding: 8px; margin-right: -8px;') &#x25C0;
|
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', role='button', style='padding: 8px; margin-left: -8px;') &#x25B6;
button.VueCarousel-navigation-button.VueCarousel-navigation-next.VueCarousel-navigation--disabled(type='button', aria-label='Next page', tabindex='-1', style='padding: 8px; margin-left: -8px;') &#x25B6;
|
.VueCarousel-pagination(style='')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='false', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(239, 239, 239);')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 1', value='Item 1', aria-label='Item 1', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;
12 changes: 5 additions & 7 deletions tests/client/components/__snapshots__/slide.spec.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@

exports[`Slide should mount successfully 1`] = `
".VueCarousel-wrapper
.VueCarousel-inner(role='listbox', style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1')
|
.VueCarousel-pagination(style='display: none;')
ul.VueCarousel-dot-container(role='tablist')
li.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='presentation', aria-selected='true', style='margin-top: 20px; padding: 10px;')
button.VueCarousel-dot-button(type='button', role='button', aria-label='\`Item \${index}\`', title='Item 0', tabindex='0', style='width: 10px; height: 10px; background: rgb(0, 0, 0);')
.VueCarousel-inner(style='transform: translate(0px, 0); visibility: hidden; height: auto;')
.VueCarousel-slide(tabindex='-1', aria-hidden='true', role='tabpanel')
//
.VueCarousel-pagination(style='display: none;')
.VueCarousel-dot-container(role='tablist', style='margin-top: 20px;')
button.VueCarousel-dot.VueCarousel-dot--active(aria-hidden='false', role='tab', title='Item 0', value='Item 0', aria-label='Item 0', aria-selected='true', style='margin-top: 20px; padding: 10px; width: 10px; height: 10px; background-color: rgb(0, 0, 0);')
"
`;