Skip to content

Disabled option behavior fix #5

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
muan merged 3 commits into from
Jan 14, 2019
Merged

Disabled option behavior fix #5

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
c906521
Add test for clicking on disabled item
muan Jan 11, 2019
bd787e0
Add disable item to demo
muan Jan 11, 2019
aef3213
Prevent commit if item is disabled
muan Jan 11, 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
6 changes: 4 additions & 2 deletions combobox-nav.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,15 @@ function commitWithElement(event: MouseEvent) {
if (!(event.target instanceof Element)) return
const target = event.target.closest('[role="option"]')
if (!target) return
fireCommitEvent(target)
event.preventDefault()
if (target.getAttribute('aria-disabled') === 'true') return
fireCommitEvent(target)
}

function commit(input: HTMLTextAreaElement | HTMLInputElement, list: HTMLElement): boolean {
const target = list.querySelector('[aria-selected="true"]')
if (!target || target.getAttribute('aria-disabled') === 'true') return false
if (!target) return false
if (target.getAttribute('aria-disabled') === 'true') return true
fireCommitEvent(target)
return true
}
Expand Down
2 changes: 1 addition & 1 deletion examples/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
</label>
<ul role="listbox" id="list-id">
<li id="baymax" role="option">Baymax</li>
<li><del>BB-8</del></li>
<li id="bb-8" role="option" aria-disabled="true"><del>BB-8</del></li>
<li id="hubot" role="option">Hubot</li>
<li id="r2-d2" role="option">R2-D2</li>
</ul>
Expand Down
11 changes: 8 additions & 3 deletions test/test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@ function press(input, key, ctrlKey) {
input.dispatchEvent(new KeyboardEvent('keydown', {key, ctrlKey}))
}

function click(element) {
element.dispatchEvent(new MouseEvent('click', {bubbles: true}))
}

describe('combobox-nav', function() {
describe('with API', function() {
beforeEach(function() {
Expand Down Expand Up @@ -84,6 +88,7 @@ describe('combobox-nav', function() {
assert.equal(options[4].getAttribute('aria-selected'), 'true')
assert.equal(input.getAttribute('aria-activedescendant'), 'wall-e')
press(input, 'Enter')
click(options[4])

press(input, 'p', true)
assert.equal(options[3].getAttribute('aria-selected'), 'true')
Expand All @@ -107,9 +112,9 @@ describe('combobox-nav', function() {
expectedTargets.push(target.id)
})

options[2].dispatchEvent(new MouseEvent('click', {bubbles: true}))
options[1].dispatchEvent(new MouseEvent('click', {bubbles: true}))
options[0].dispatchEvent(new MouseEvent('click', {bubbles: true}))
click(options[2])
click(options[1])
click(options[0])

assert.equal(expectedTargets.length, 2)
assert.equal(expectedTargets[0], 'hubot')
Expand Down