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

Make autocomplete arrow button work #2929

Merged
merged 1 commit into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all 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
10 changes: 10 additions & 0 deletions app/assets/javascripts/modules/accessible-autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,23 @@ window.GOVUK.Modules = window.GOVUK.Modules || {}
new window.accessibleAutocomplete.enhanceSelectElement(configOptions) // eslint-disable-line no-new, new-cap

const autocompleteElement = selectElement.parentNode.querySelector('.autocomplete__input')
enableArrow(autocompleteElement)
resetSelectWhenDesynced(selectElement, autocompleteElement)
enableClearButton(selectElement, autocompleteElement)
}

Modules.AccessibleAutocomplete = AccessibleAutocomplete
})(window.GOVUK.Modules)

function enableArrow (autocompleteElement) {
const arrowElement = autocompleteElement.parentNode.querySelector('.autocomplete__dropdown-arrow-down')

arrowElement.addEventListener('click', function () {
autocompleteElement.click()
autocompleteElement.focus()
})
}

function resetSelectWhenDesynced (selectElement, autocompleteElement) {
// if the autocomplete element's value no longer matches the selected option
// in the select element, reset the select element - in particular, this
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,14 @@
z-index: 0;
}

.autocomplete__input--focused + .autocomplete__dropdown-arrow-down {
display: none;
}

.autocomplete__dropdown-arrow-down {
cursor: pointer;
}

// This ensures the empty option is the same height as the options with values
.autocomplete__option {
min-height: 1rem;
Expand Down
46 changes: 46 additions & 0 deletions spec/javascripts/modules/accessible-autocomplete-dropdown-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
describe('GOVUK.Modules.AccessibleAutocomplete', function () {
let component, module

beforeEach(async function () {
component = document.createElement('div')
component.setAttribute('data-module', 'accessible-autocomplete')
component.innerHTML = `
<label class="govuk-label govuk-label--m" for="new_permission_id">Add a permission</label>
<div id="hint-1234" class="gem-c-hint govuk-hint">
Search for the permission you want to add.
<select name="application[new_permission_id]" id="new_permission_id" class="govuk-select" aria-describedby="hint-1234">
<option value=""></option>
<option value="1">permission-1</option>
<option value="2">permission-2</option>
<option value="3">permission-3</option>
<option value="4">permission-4</option>
<option value="5">permission-5</option>
<option value="6">permission-6</option>
<option value="7">permission-7</option>
<option value="8">permission-8</option>
<option value="9">permission-9</option>
</select>
</div>
`
module = new GOVUK.Modules.AccessibleAutocomplete(component)
module.init()
})

it('opens the menu when clicking the arrow', async function () {
const menuElement = component.querySelector('.autocomplete__menu')
const menuElementClassesBefore = Array.from(menuElement.classList)
expect(menuElementClassesBefore.includes('autocomplete__menu--visible')).toBe(false)
expect(menuElementClassesBefore.includes('autocomplete__menu--hidden')).toBe(true)

const arrowElement = component.querySelector('.autocomplete__dropdown-arrow-down')
arrowElement.dispatchEvent(new Event('click'))

await wait()

const menuElementClassesAfter = Array.from(menuElement.classList)
expect(menuElementClassesAfter.includes('autocomplete__menu--visible')).toBe(true)
expect(menuElementClassesAfter.includes('autocomplete__menu--hidden')).toBe(false)
})
})

const wait = async () => await new Promise(resolve => setTimeout(resolve, 100))