Skip to content
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

Jump to bottom

fix(storefront): BCTHEME-66 Add aria labels to menu links #1729

Merged
merged 1 commit into from
Jul 27, 2020
Merged

fix(storefront): BCTHEME-66 Add aria labels to menu links #1729

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions assets/js/theme/common/collapsible.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ export class Collapsible {
// Assign DOM attributes
this.$target.attr('aria-hidden', this.isCollapsed);
this.$toggle
.attr('aria-label', $toggle.text().trim())
.attr('aria-controls', $target.attr('id'))
.attr('aria-expanded', this.isOpen);

Expand Down
18 changes: 15 additions & 3 deletions templates/components/common/navigation-list-alternate.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,20 @@
{{#if children}}
<a class="navPages-action navPages-action-depth-max has-subMenu is-root{{#if is_active}} activePage{{/if}}" href="{{url}}" data-collapsible="navPages-{{id}}">
{{name}}<i class="icon navPages-action-moreIcon" aria-hidden="true"><svg><use xlink:href="#icon-chevron-down" /></svg></i>
<a class="navPages-action navPages-action-depth-max has-subMenu is-root{{#if is_active}} activePage{{/if}}"
href="{{url}}"
data-collapsible="navPages-{{id}}"
aria-label="{{name}}"
>
{{name}}
<i class="icon navPages-action-moreIcon" aria-hidden="true">
<svg><use xlink:href="#icon-chevron-down" /></svg>
</i>
</a>
{{> components/common/navigation-dropdown}}
{{else}}
<a class="navPages-action{{#if is_active}} activePage{{/if}}" href="{{url}}">{{name}}</a>
<a class="navPages-action{{#if is_active}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
</a>
{{/if}}
64 changes: 47 additions & 17 deletions templates/components/common/navigation-list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,41 +1,71 @@
{{#if children}}
<a class="navPages-action has-subMenu{{#if is_active}} activePage{{/if}}" href="{{url}}" data-collapsible="navPages-{{id}}">
{{name}}<i class="icon navPages-action-moreIcon" aria-hidden="true"><svg><use xlink:href="#icon-chevron-down" /></svg></i>
<a class="navPages-action has-subMenu{{#if is_active}} activePage{{/if}}"
href="{{url}}"
data-collapsible="navPages-{{id}}"
>
{{name}}
<i class="icon navPages-action-moreIcon" aria-hidden="true">
<svg><use xlink:href="#icon-chevron-down" /></svg>
</i>
</a>
<div class="navPage-subMenu" id="navPages-{{id}}" aria-hidden="true" tabindex="-1">
<ul class="navPage-subMenu-list">
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{url}}">{{lang 'category.view_all.name' category=name}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{url}}"
aria-label="{{lang 'category.view_all.name' category=name}}"
>
{{lang 'category.view_all.name' category=name}}
</a>
</li>
{{#each children}}
<li class="navPage-subMenu-item">
{{#if children}}
<a
class="navPage-subMenu-action navPages-action has-subMenu{{#if is_active}} activePage{{/if}}"
href="{{url}}"
>
{{name}}<span class="collapsible-icon-wrapper"
data-collapsible="navPages-{{id}}"
data-collapsible-disabled-breakpoint="medium"
data-collapsible-disabled-state="open"
data-collapsible-enabled-state="closed">
<i class="icon navPages-action-moreIcon" aria-hidden="true"><svg><use xlink:href="#icon-chevron-down" /></svg></i>
</span>
<a class="navPage-subMenu-action navPages-action has-subMenu{{#if is_active}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
<span class="collapsible-icon-wrapper"
data-collapsible="navPages-{{id}}"
data-collapsible-disabled-breakpoint="medium"
data-collapsible-disabled-state="open"
data-collapsible-enabled-state="closed"
>
<i class="icon navPages-action-moreIcon" aria-hidden="true">
<svg><use xlink:href="#icon-chevron-down" /></svg>
</i>
</span>
</a>
<ul class="navPage-childList" id="navPages-{{id}}">
{{#each children}}
<li class="navPage-childList-item">
<a class="navPage-childList-action navPages-action{{#if is_active}} activePage{{/if}}" href="{{url}}">{{name}}</a>
<a class="navPage-childList-action navPages-action{{#if is_active}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
</a>
</li>
{{/each}}
</ul>
{{else}}
<a class="navPage-subMenu-action navPages-action{{#if is_active}} activePage{{/if}}" href="{{url}}">{{name}}</a>
<a class="navPage-subMenu-action navPages-action{{#if is_active}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
</a>
{{/if}}
</li>
{{/each}}
</ul>
</div>
{{else}}
<a class="navPages-action{{#if is_active}} activePage{{/if}}" href="{{url}}">{{name}}</a>
<a class="navPages-action{{#if is_active}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
</a>
{{/if}}
132 changes: 113 additions & 19 deletions templates/components/common/navigation-menu.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,41 @@
{{#unless theme_settings.hide_content_navigation}}
{{#each pages}}
<li class="navPages-item navPages-item-page">
<a class="navPages-action{{#if name '==' ../page.title}} activePage{{/if}}" href="{{url}}">{{name}}</a>
<a class="navPages-action{{#if name '==' ../page.title}} activePage{{/if}}"
href="{{url}}"
aria-label="{{name}}"
>
{{name}}
</a>
</li>
{{/each}}
{{/unless}}
</ul>
<ul class="navPages-list navPages-list--user">
{{#if currency_selector.currencies.length '>' 1}}
<li class="navPages-item">
<a class="navPages-action has-subMenu" href="#" data-collapsible="navPages-currency" aria-controls="navPages-currency" aria-expanded="false">
{{lang 'common.currency' code=currency_selector.active_currency_code}} <i class="icon navPages-action-moreIcon" aria-hidden="true"><svg><use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-chevron-down"></use></svg></i>
<a class="navPages-action has-subMenu"
href="#"
data-collapsible="navPages-currency"
aria-controls="navPages-currency"
aria-expanded="false"
aria-label="{{lang 'common.currency' code=currency_selector.active_currency_code}}"
>
{{lang 'common.currency' code=currency_selector.active_currency_code}}
<i class="icon navPages-action-moreIcon" aria-hidden="true">
<svg>
<use xmlns:xlink="http://www.w3.org/1999/xlink" xlink:href="#icon-chevron-down"></use>
</svg>
</i>
</a>
<div class="navPage-subMenu" id="navPages-currency" aria-hidden="true" tabindex="-1">
<ul class="navPage-subMenu-list">
{{#each currency_selector.currencies}}
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{{switch_url}}}">
<a class="navPage-subMenu-action navPages-action"
href="{{{switch_url}}}"
aria-label="{{name}}"
>
{{#if is_active}}
<strong>{{name}}</strong>
{{else}}
Expand All @@ -46,7 +65,12 @@
{{/if}}
{{#if settings.gift_certificates_enabled}}
<li class="navPages-item">
<a class="navPages-action" href="{{urls.gift_certificate.purchase}}">{{lang 'common.gift_cert'}}</a>
<a class="navPages-action"
href="{{urls.gift_certificate.purchase}}"
aria-label="{{lang 'common.gift_cert'}}"
>
{{lang 'common.gift_cert'}}
</a>
</li>
{{/if}}
{{#if customer.store_credit.value '>' 0}}
Expand All @@ -58,55 +82,125 @@
{{/if}}
{{#if theme_settings.product_list_display_mode '==' 'list'}}
<li class="navPages-item">
<a class="navPages-action navPages-action--compare" href="{{urls.compare}}" data-compare-nav>{{lang 'common.compare'}} <span class="countPill countPill--positive countPill--alt"></span></a>
<a class="navPages-action navPages-action--compare"
href="{{urls.compare}}"
data-compare-nav
aria-label="{{lang 'common.compare'}}"
>
{{lang 'common.compare'}}
<span class="countPill countPill--positive countPill--alt"></span>
</a>
</li>
{{/if}}
{{#if customer}}
<li class="navPages-item">
<a class="navPages-action has-subMenu" href="{{urls.account.index}}" data-collapsible="navPages-account">
{{lang 'common.account'}} <i class="icon navPages-action-moreIcon" aria-hidden="true"><svg><use xlink:href="#icon-chevron-down" /></svg></i>
<a class="navPages-action has-subMenu"
href="{{urls.account.index}}"
data-collapsible="navPages-account"
aria-label="{{lang 'common.account'}}"
>
{{lang 'common.account'}}
<i class="icon navPages-action-moreIcon" aria-hidden="true">
<svg><use xlink:href="#icon-chevron-down" /></svg>
</i>
</a>
<div class="navPage-subMenu" id="navPages-account" aria-hidden="true" tabindex="-1">
<ul class="navPage-subMenu-list">
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.orders.all}}">{{lang 'account.nav.orders'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.orders.all}}"
aria-label="{{lang 'account.nav.orders'}}"
>
{{lang 'account.nav.orders'}}
</a>
</li>
{{#if settings.returns_enabled}}
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.returns}}">{{lang 'account.nav.returns'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.returns}}"
aria-label="{{lang 'account.nav.returns'}}"
>
{{lang 'account.nav.returns'}}
</a>
</li>
{{/if}}
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.inbox}}">{{lang 'account.mobile_nav.messages'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.inbox}}"
aria-label="{{lang 'account.mobile_nav.messages'}}"
>
{{lang 'account.mobile_nav.messages'}}
</a>
</li>
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.addresses}}">{{lang 'account.nav.addresses'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.addresses}}"
aria-label="{{lang 'account.nav.addresses'}}"
>
{{lang 'account.nav.addresses'}}
</a>
</li>
{{#if settings.show_payment_methods}}
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.payment_methods.all}}">{{lang 'account.nav.payment_methods'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.payment_methods.all}}"
aria-label="{{lang 'account.nav.payment_methods'}}"
>
{{lang 'account.nav.payment_methods'}}
</a>
</li>
{{/if}}
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.wishlists.all}}">{{lang 'account.mobile_nav.wishlists'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.wishlists.all}}"
aria-label="{{lang 'account.mobile_nav.wishlists'}}"
>
{{lang 'account.mobile_nav.wishlists'}}
</a>
</li>
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.recent_items}}">{{lang 'account.nav.recently_viewed'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.recent_items}}"
aria-label="{{lang 'account.nav.recently_viewed'}}"
>
{{lang 'account.nav.recently_viewed'}}
</a>
</li>
<li class="navPage-subMenu-item">
<a class="navPage-subMenu-action navPages-action" href="{{urls.account.details}}">{{lang 'account.nav.settings'}}</a>
<a class="navPage-subMenu-action navPages-action"
href="{{urls.account.details}}"
aria-label="{{lang 'account.nav.settings'}}"
>
{{lang 'account.nav.settings'}}
</a>
</li>
</ul>
</div>
</li>
<li class="navPages-item">
<a class="navPages-action" href="{{urls.auth.logout}}">{{lang 'common.logout'}}</a>
<a class="navPages-action"
href="{{urls.auth.logout}}"
aria-label="{{lang 'common.logout'}}"
>
{{lang 'common.logout'}}
</a>
</li>
{{else}}
<li class="navPages-item">
<a class="navPages-action" href="{{urls.auth.login}}">{{lang 'common.login'}}</a>
<a class="navPages-action"
href="{{urls.auth.login}}"
aria-label="{{lang 'common.login'}}"
>
{{lang 'common.login'}}
</a>
{{#if settings.account_creation_enabled}}
{{lang 'common.or'}} <a class="navPages-action" href="{{urls.auth.create_account}}">{{lang 'common.sign_up'}}</a>
{{lang 'common.or'}}
<a class="navPages-action"
href="{{urls.auth.create_account}}"
aria-label="{{lang 'common.sign_up'}}"
>
{{lang 'common.sign_up'}}
</a>
{{/if}}
</li>
{{/if}}
Expand Down
Loading