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

Dropdown a11y updates #3586

Merged
merged 21 commits into from
Aug 5, 2019
Merged

Dropdown a11y updates #3586

Show file tree
Hide file tree
Changes from 20 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4fdf6f6
fix(dropdown): a11y html
Jul 26, 2019
35b3ecd
fix(dropdown): fix double click
Jul 26, 2019
667e2ef
Merge branch 'master' into feature/dropdown
Jul 30, 2019
d9816ee
fix(dropdown): style updates
Jul 30, 2019
6e6224c
fix(dropdown): update scripts
Jul 30, 2019
5e347e9
fix(dropdown): update html for a11y
Jul 30, 2019
0c06b0b
Merge branch 'master' into feature/dropdown
Jul 30, 2019
8315479
fix(dropdown): focus styles
Jul 30, 2019
b44f97e
Merge branch 'master' into feature/dropdown
Jul 31, 2019
2313a3b
fix(dropdown): active descendant setup
Jul 31, 2019
8e52875
Merge branch 'master' of github.com:carbon-design-system/carbon into …
Jul 31, 2019
1044121
Merge branch 'feature/dropdown' into feature/a11y-dropdown
Jul 31, 2019
7049f04
Merge branch 'master' into feature/dropdown
tw15egan Jul 31, 2019
936cc87
fix(dropdown): remove references to floating menu
Aug 1, 2019
61248ff
fix(dropdown): bugfix for tests
Aug 1, 2019
31c3c17
Merge branch 'master' into feature/dropdown
tw15egan Aug 2, 2019
ae49eeb
fix(dropdown): query elements within functions
Aug 2, 2019
7542bc3
Merge branch 'master' of github.com:carbon-design-system/carbon into …
Aug 5, 2019
766c73f
fix(dropdown): add tests
Aug 5, 2019
2ed52c9
Merge branch 'master' of github.com:carbon-design-system/carbon into …
Aug 5, 2019
42d2d73
Merge branch 'master' into feature/dropdown
asudoh Aug 5, 2019
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
26 changes: 20 additions & 6 deletions packages/components/src/components/dropdown/_dropdown.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,18 @@
transform-origin: 50% 45%;
}

button.#{$prefix}--dropdown-text {
// button-reset mixin contradicts with bx--dropdown-text styles
background: none;
border: none;
width: 100%;
text-align: left;

&:focus {
@include focus-outline('outline');
}
}

.#{$prefix}--dropdown-text {
@include type-style('body-short-01');
display: block;
Expand All @@ -137,6 +149,7 @@

.#{$prefix}--dropdown-list {
@include reset;
@include focus-outline('reset');
@include layer('overlay');
@include type-style('body-short-01');
background-color: $ui-01;
Expand Down Expand Up @@ -200,18 +213,19 @@
overflow: hidden;
white-space: nowrap;

&:focus {
@include focus-outline('outline');
margin: 0;
padding: rem(11px) rem(16px);
}

&:hover {
color: $text-01;
border-color: transparent;
}
}

.#{$prefix}--dropdown--focused,
.#{$prefix}--dropdown-link:focus {
@include focus-outline('outline');
margin: 0;
padding: rem(11px) rem(16px);
}

.#{$prefix}--dropdown-item:hover .#{$prefix}--dropdown-link {
border-bottom-color: $hover-ui;
}
Expand Down
20 changes: 20 additions & 0 deletions packages/components/src/components/dropdown/dropdown.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,26 @@ const items = [
module.exports = {
context: {
prefix,
default: {
idSuffix: `example-${Math.random()
.toString(36)
.substr(2)}`,
},
helper: {
idSuffix: `example-${Math.random()
.toString(36)
.substr(2)}`,
},
disabled: {
idSuffix: `example-${Math.random()
.toString(36)
.substr(2)}`,
},
invalid: {
idSuffix: `example-${Math.random()
.toString(36)
.substr(2)}`,
},
},
variants: [
{
Expand Down
188 changes: 79 additions & 109 deletions packages/components/src/components/dropdown/dropdown.hbs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,150 +4,120 @@
This source code is licensed under the Apache-2.0 license found in the
LICENSE file in the root directory of this source tree.
-->

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--dropdown__wrapper {{#if inline}}{{@root.prefix}}--dropdown__wrapper--inline{{/if}}">
<label for="dropdown-id" class="{{@root.prefix}}--label">Dropdown label</label>
<span id="{{default.idSuffix}}-label" class="{{@root.prefix}}--label">Dropdown label</span>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text.</div>
{{/unless}}
<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value id="dropdown-id"
class="{{@root.prefix}}--dropdown {{#if up}}{{@root.prefix}}--dropdown--up{{/if}} {{#if light}}{{@root.prefix}}--dropdown--light{{/if}} {{#if inline}}{{@root.prefix}}--dropdown--inline{{/if}}"
tabindex="0">
<li class="{{@root.prefix}}--dropdown-text">
{{#unless inline}} Dropdown option {{else}}
<span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
{{/unless}}
{{#unless inline}}
</li>
<li class="{{@root.prefix}}--dropdown__arrow-container">
{{/unless}}
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</li>
<li>
<ul class="{{@root.prefix}}--dropdown-list">
{{#each items}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
</li>
{{/each}}
</ul>
</li>
</ul>
<div data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
class="{{@root.prefix}}--dropdown {{#if up}}{{@root.prefix}}--dropdown--up{{/if}} {{#if light}}{{@root.prefix}}--dropdown--light{{/if}} {{#if inline}}{{@root.prefix}}--dropdown--inline{{/if}}">
<button class="{{@root.prefix}}--dropdown-text" aria-haspopup="true" aria-expanded="false" aria-controls="{{default.idSuffix}}-menu" aria-labelledby="{{default.idSuffix}}-label {{default.idSuffix}}-value" type="button">
<span class="{{@root.prefix}}--dropdown-text__inner" id="{{default.idSuffix}}-value">{{#unless inline}} Dropdown option {{else}}Inline Dropdown label{{/unless}}</span>
<span class="{{@root.prefix}}--dropdown__arrow-container">
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</span>
</button>
<ul class="{{@root.prefix}}--dropdown-list" id="{{default.idSuffix}}-menu" role="menu" tabindex="0" id="{{default.idSuffix}}-menu" aria-hidden="true" wh-menu-anchor="left" aria-labelledby="{{default.idSuffix}}-label">
{{#each items as |item index|}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1" role="menuitemradio" aria-checked="{{#if index}}false{{else}}true{{/if}}" id="{{../default.idSuffix}}-item{{@index}}">{{label}}</a>
</li>
{{/each}}
</ul>
</div>
</div>
</div>

{{#unless inline}}
<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--dropdown__wrapper {{#if inline}}{{@root.prefix}}--dropdown__wrapper--inline{{/if}}">
<label for="dropdown-id-longer-helper-text" class="{{@root.prefix}}--label">Dropdown label</label>
<span id="{{helper.idSuffix}}-label" class="{{@root.prefix}}--label">Dropdown label</span>
<div class="{{@root.prefix}}--form__helper-text">Optional helper text here; if message is more than one line text
should wrap (~100 character count maximum)</div>
<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value id="dropdown-id-longer-helper-text"
class="{{@root.prefix}}--dropdown {{#if up}}{{@root.prefix}}--dropdown--up{{/if}} {{#if light}}{{@root.prefix}}--dropdown--light{{/if}} {{#if inline}}{{@root.prefix}}--dropdown--inline{{/if}}"
tabindex="0">
<li class="{{@root.prefix}}--dropdown-text">
{{#unless inline}} Dropdown option {{else}}
<span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
{{/unless}}
{{#unless inline}}
</li>
<li class="{{@root.prefix}}--dropdown__arrow-container">
{{/unless}}
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</li>
<li>
<ul class="{{@root.prefix}}--dropdown-list">
{{#each items}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
</li>
{{/each}}
</ul>
</li>
</ul>
<div data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
class="{{@root.prefix}}--dropdown {{#if up}}{{@root.prefix}}--dropdown--up{{/if}} {{#if light}}{{@root.prefix}}--dropdown--light{{/if}} {{#if inline}}{{@root.prefix}}--dropdown--inline{{/if}}">
<button class="{{@root.prefix}}--dropdown-text" aria-haspopup="true" aria-expanded="false" aria-controls="{{helper.idSuffix}}-menu" aria-labelledby="{{helper.idSuffix}}-label {{helper.idSuffix}}-value" type="button">
<span class="{{@root.prefix}}--dropdown-text__inner" id="{{helper.idSuffix}}-value">{{#unless inline}} Dropdown option {{else}}Inline Dropdown label{{/unless}}</span>
<span class="{{@root.prefix}}--dropdown__arrow-container">
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</span>
</button>
<ul class="{{@root.prefix}}--dropdown-list" role="menu" tabindex="0" id="{{helper.idSuffix}}-menu" aria-hidden="true" wh-menu-anchor="left" aria-labelledby="{{helper.idSuffix}}-label">
{{#each items as |item index|}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1" role="menuitemradio" aria-checked="{{#if index}}false{{else}}true{{/if}}" id="{{../helper.idSuffix}}-item{{@index}}">{{label}}</a>
</li>
{{/each}}
</ul>
</div>
</div>
</div>
{{/unless}}

<div class="{{@root.prefix}}--form-item">
<div class="{{@root.prefix}}--dropdown__wrapper {{#if inline}}{{@root.prefix}}--dropdown__wrapper--inline{{/if}}">
<label for="dropdown-id-disabled" class="{{@root.prefix}}--label {{@root.prefix}}--label--disabled">Dropdown
label</label>
<span id="{{disabled.idSuffix}}-label" class="{{@root.prefix}}--label {{@root.prefix}}--label--disabled" aria-disabled="true">Dropdown label</span>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text {{@root.prefix}}--form__helper-text--disabled">Optional helper text
<div class="{{@root.prefix}}--form__helper-text {{@root.prefix}}--form__helper-text--disabled" aria-disabled="true">Optional helper text
here; if message is more than one line text
should wrap (~100 character count maximum)</div>
{{/unless}}
<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value id="dropdown-id-disabled"
class="{{@root.prefix}}--dropdown{{#if up}} {{@root.prefix}}--dropdown--up{{/if}}{{#if light}} {{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}} {{@root.prefix}}--dropdown--disabled"
tabindex="0">
<li class="{{@root.prefix}}--dropdown-text">
{{#unless inline}} Dropdown option {{else}}
<span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
{{/unless}}
{{#unless inline}}
</li>
<li class="{{@root.prefix}}--dropdown__arrow-container">
{{/unless}}
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</li>
<li>
<ul class="{{@root.prefix}}--dropdown-list">
{{#each items}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
</li>
{{/each}}
</ul>
</li>
</ul>
<div data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
class="{{@root.prefix}}--dropdown{{#if up}} {{@root.prefix}}--dropdown--up{{/if}}{{#if light}} {{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}} {{@root.prefix}}--dropdown--disabled">
<button disabled class="{{@root.prefix}}--dropdown-text" aria-haspopup="true" aria-expanded="false" aria-controls="{{disabled.idSuffix}}-menu" aria-labelledby="{{disabled.idSuffix}}-label {{disabled.idSuffix}}-value" type="button">
<span class="{{@root.prefix}}--dropdown-text__inner" id="{{disabled.idSuffix}}-value">{{#unless inline}} Dropdown option {{else}}Inline Dropdown label{{/unless}}</span>
<span class="{{@root.prefix}}--dropdown__arrow-container">
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</span>
</button>
<!-- Note: remove `tabindex` from disabled dropdown lists -->
<ul class="{{@root.prefix}}--dropdown-list" id="{{disabled.idSuffix}}-menu" role="menu" id="{{disabled.idSuffix}}-menu" aria-hidden="true" wh-menu-anchor="left" aria-labelledby="{{disabled.idSuffix}}-label">
{{#each items as |item index|}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1" role="menuitemradio" aria-checked="{{#if index}}false{{else}}true{{/if}}" id="{{../disabled.idSuffix}}-item{{@index}}">{{label}}</a>
</li>
{{/each}}
</ul>
</div>
</div>
</div>

<div class="{{@root.prefix}}--form-item">
<div
class="{{@root.prefix}}--dropdown__wrapper {{#if inline}}{{@root.prefix}}--dropdown__wrapper--inline {{@root.prefix}}--dropdown__wrapper--inline--invalid{{/if}}">
<label for="dropdown-id-invalid" class="{{@root.prefix}}--label">Dropdown
label</label>
<div class="{{@root.prefix}}--dropdown__wrapper {{#if inline}}{{@root.prefix}}--dropdown__wrapper--inline {{@root.prefix}}--dropdown__wrapper--inline--invalid{{/if}}">
<span id="{{invalid.idSuffix}}-label" class="{{@root.prefix}}--label">Dropdown label</span>
{{#unless inline}}
<div class="{{@root.prefix}}--form__helper-text">Optional helper text
here; if message is more than one line text
should wrap (~100 character count maximum)</div>
{{/unless}}
<ul data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value id="dropdown-id-invalid"
<div data-dropdown{{#if inline}} data-dropdown-type="inline" {{/if}} data-value
class="{{@root.prefix}}--dropdown {{@root.prefix}}--dropdown--invalid {{#if up}}{{@root.prefix}}--dropdown--up{{/if}} {{#if light}}{{@root.prefix}}--dropdown--light{{/if}}{{#if inline}} {{@root.prefix}}--dropdown--inline{{/if}}"
tabindex="0" data-invalid>
{{ carbon-icon 'WarningFilled16' class=(add @root.prefix '--dropdown__invalid-icon')}}
<li class="{{@root.prefix}}--dropdown-text">
{{#unless inline}} Dropdown option {{else}}
<span class="{{@root.prefix}}--dropdown-text__inner">Inline Dropdown label</span>
{{/unless}}
{{#unless inline}}
</li>
<li class="{{@root.prefix}}--dropdown__arrow-container">
{{/unless}}
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</li>
<li>
<ul class="{{@root.prefix}}--dropdown-list">
{{#each items}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1">{{label}}</a>
</li>
{{/each}}
</ul>
</li>
</ul>
{{#if inline}}
data-invalid>
<button class="{{@root.prefix}}--dropdown-text" aria-haspopup="true" aria-expanded="false" aria-controls="{{invalid.idSuffix}}-menu" aria-labelledby="{{invalid.idSuffix}}-label {{invalid.idSuffix}}-value" type="button">
{{ carbon-icon 'WarningFilled16' class=(add @root.prefix '--dropdown__invalid-icon')}}
<span class="{{@root.prefix}}--dropdown-text__inner" id="{{invalid.idSuffix}}-value">{{#unless inline}} Dropdown option {{else}}Inline Dropdown label{{/unless}}</span>
<span class="{{@root.prefix}}--dropdown__arrow-container">
{{ carbon-icon 'ChevronDown16' class=(add @root.prefix '--dropdown__arrow') }}
</span>
</button>
<ul class="{{@root.prefix}}--dropdown-list" id="{{invalid.idSuffix}}-menu" role="menu" tabindex="0" id="{{invalid.idSuffix}}-menu" aria-hidden="true" wh-menu-anchor="left" aria-labelledby="{{invalid.idSuffix}}-label">
{{#each items as |item index|}}
<li data-option data-value="{{value}}" class="{{@root.prefix}}--dropdown-item">
<a class="{{@root.prefix}}--dropdown-link" href="javascript:void(0)" tabindex="-1" role="menuitemradio" aria-checked="{{#if index}}false{{else}}true{{/if}}" id="{{../invalid.idSuffix}}-item{{@index}}">{{label}}</a>
</li>
{{/each}}
</ul>
{{#if inline}}
<div class="{{@root.prefix}}--form-requirement">
This is not a validation message
</div>
{{/if}}
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form-requirement">
This is not a validation message
</div>
{{/if}}
</div>
{{#unless inline}}
<div class="{{@root.prefix}}--form-requirement">
This is not a validation message
{{/unless}}
</div>
{{/unless}}
</div>
Loading