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.

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

Add option to auto navigate to the first item on open #81

Merged
merged 6 commits into from
Feb 22, 2024
Merged
Show file tree
Hide file tree
Changes from 3 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
20 changes: 14 additions & 6 deletions src/index.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
export type ComboboxSettings = {
tabInsertsSuggestions?: boolean
defaultFirstOption?: boolean
firstOptionSelectionMode?: FirstOptionSelectionMode
anleac marked this conversation as resolved.
Show resolved Hide resolved
scrollIntoViewOptions?: boolean | ScrollIntoViewOptions
}

// Indicates the default behaviour for the first option when the list is shown.
export type FirstOptionSelectionMode = 'none' | 'active' | 'selected'

export default class Combobox {
isComposing: boolean
list: HTMLElement
Expand All @@ -13,18 +16,18 @@ export default class Combobox {
inputHandler: (event: Event) => void
ctrlBindings: boolean
tabInsertsSuggestions: boolean
defaultFirstOption: boolean
firstOptionSelectionMode: FirstOptionSelectionMode
scrollIntoViewOptions?: boolean | ScrollIntoViewOptions

constructor(
input: HTMLTextAreaElement | HTMLInputElement,
list: HTMLElement,
{tabInsertsSuggestions, defaultFirstOption, scrollIntoViewOptions}: ComboboxSettings = {},
{tabInsertsSuggestions, firstOptionSelectionMode, scrollIntoViewOptions}: ComboboxSettings = {},
) {
this.input = input
this.list = list
this.tabInsertsSuggestions = tabInsertsSuggestions ?? true
this.defaultFirstOption = defaultFirstOption ?? false
this.firstOptionSelectionMode = firstOptionSelectionMode ?? 'none'
this.scrollIntoViewOptions = scrollIntoViewOptions ?? {block: 'nearest', inline: 'nearest'}

this.isComposing = false
Expand Down Expand Up @@ -77,10 +80,12 @@ export default class Combobox {
}

indicateDefaultOption(): void {
if (this.defaultFirstOption) {
if (this.firstOptionSelectionMode === 'active') {
Array.from(this.list.querySelectorAll<HTMLElement>('[role="option"]:not([aria-disabled="true"])'))
.filter(visible)[0]
?.setAttribute('data-combobox-option-default', 'true')
} else if (this.firstOptionSelectionMode === 'selected') {
this.navigate(1)
}
}

Expand Down Expand Up @@ -123,7 +128,10 @@ export default class Combobox {
for (const el of this.list.querySelectorAll('[aria-selected="true"]')) {
el.removeAttribute('aria-selected')
}
this.indicateDefaultOption()

if (this.firstOptionSelectionMode === 'active') {
this.indicateDefaultOption()
}
}
}

Expand Down
64 changes: 62 additions & 2 deletions test/test.js
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,7 @@ describe('combobox-nav', function () {
})
})

describe('with defaulting to first option', function () {
describe('with defaulting to the first option being active', function () {
let input
let list
let options
Expand All @@ -263,7 +263,7 @@ describe('combobox-nav', function () {
input = document.querySelector('input')
list = document.querySelector('ul')
options = document.querySelectorAll('[role=option]')
combobox = new Combobox(input, list, {defaultFirstOption: true})
combobox = new Combobox(input, list, {firstOptionSelectionMode: 'active'})
combobox.start()
})

Expand All @@ -276,6 +276,7 @@ describe('combobox-nav', function () {
it('indicates first option when started', () => {
assert.equal(document.querySelector('[data-combobox-option-default]'), options[0])
assert.equal(document.querySelectorAll('[data-combobox-option-default]').length, 1)
assert.equal(list.children[0].getAttribute('aria-selected'), null)
})

it('indicates first option when restarted', () => {
Expand Down Expand Up @@ -311,4 +312,63 @@ describe('combobox-nav', function () {
})
})
})

describe('with defaulting to the first option being selected', function () {
let input
let list
let combobox
beforeEach(function () {
document.body.innerHTML = `
<input type="text">
<ul role="listbox" id="list-id">
<li id="baymax" role="option">Baymax</li>
<li><del>BB-8</del></li>
<li id="hubot" role="option">Hubot</li>
<li id="r2-d2" role="option">R2-D2</li>
<li id="johnny-5" hidden role="option">Johnny 5</li>
<li id="wall-e" role="option" aria-disabled="true">Wall-E</li>
<li><a href="#link" role="option" id="link">Link</a></li>
</ul>
`
input = document.querySelector('input')
list = document.querySelector('ul')
combobox = new Combobox(input, list, {firstOptionSelectionMode: 'selected'})
combobox.start()
})

afterEach(function () {
combobox.destroy()
combobox = null
document.body.innerHTML = ''
})

it('focuses first option when started', () => {
// Does not set the default attribute
assert.equal(document.querySelectorAll('[data-combobox-option-default]').length, 0)
// Item is correctly selected
assert.equal(list.children[0].getAttribute('aria-selected'), 'true')
})

it('indicates first option when restarted', () => {
combobox.stop()
combobox.start()
assert.equal(list.children[0].getAttribute('aria-selected'), 'true')
})

it('applies default option on Enter', () => {
let commits = 0
document.addEventListener('combobox-commit', () => commits++)

assert.equal(commits, 0)
press(input, 'Enter')
assert.equal(commits, 1)
})

it('does not error when no options are visible', () => {
assert.doesNotThrow(() => {
document.getElementById('list-id').style.display = 'none'
combobox.clearSelection()
})
})
})
})
Loading