Skip to content
Open
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
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,18 @@

## [Unreleased]

## 1.10.5 - 2023-07-03

- autoselect partially enabled ios - using keyboard Done button
[@viktorgasko](https://github.com/viktorgasko)
([#30](https://github.com/lightingbeetle/accessible-autocomplete/pull/30))

## 1.10.4 - 2019-06-09

- remove unnecessary `menuOpen` state change in `componentDidUpdate` lifecycle
[@benistary](https://github.com/benistary)
([#29](https://github.com/lightingbeetle/accessible-autocomplete/pull/29))

## 1.10.3 - 2019-26-08

- pass `event` to `onChange` function as a second argument
Expand Down
2 changes: 1 addition & 1 deletion dist/accessible-autocomplete.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/accessible-autocomplete.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lib/accessible-autocomplete.preact.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lib/accessible-autocomplete.preact.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lib/accessible-autocomplete.react.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/lib/accessible-autocomplete.react.min.js.map

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@lighting-beetle/accessible-autocomplete",
"version": "1.10.3",
"version": "1.11.0",
"main": "dist/accessible-autocomplete.min.js",
"style": "dist/accessible-autocomplete.min.css",
"description": "An autocomplete component, built to be accessible.",
Expand Down
19 changes: 16 additions & 3 deletions src/autocomplete.js
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ export default class Autocomplete extends Component {
}

hasAutoselect () {
return isIosDevice() ? false : this.props.autoselect
return this.props.autoselect
}

// This template is used when converting from a state.options object into a state.query.
Expand Down Expand Up @@ -234,7 +234,7 @@ export default class Autocomplete extends Component {
const focusingAnotherOption = focused !== index && focused !== -1
const blurComponent = (!focusingAnotherOption && focusingOutsideComponent) || !(focusingAnotherOption || focusingInput)
if (blurComponent) {
const keepMenuOpen = menuOpen && isIosDevice()
const keepMenuOpen = menuOpen && isIosDevice() && !this.hasAutoselect()
this.handleComponentBlur({
menuOpen: keepMenuOpen,
query: this.templateInputValue(options[selected])
Expand All @@ -246,7 +246,18 @@ export default class Autocomplete extends Component {
const { focused, menuOpen, options, query, selected } = this.state
const focusingAnOption = focused !== -1
clearTimeout(this.$blurInput)
if (!focusingAnOption) {
if (
isIosDevice() &&
!event.relatedTarget &&
!focusingAnOption &&
this.hasAutoselect()
) {
const newQuery = this.templateInputValue(options[selected]);
this.$blurInput = setTimeout(() => this.handleComponentBlur({
menuOpen: false,
query: newQuery
}), 200)
} else if (!focusingAnOption) {
const keepMenuOpen = menuOpen && isIosDevice()
const newQuery = isIosDevice() ? query : this.templateInputValue(options[selected])
this.$blurInput = setTimeout(() => this.handleComponentBlur({
Expand Down Expand Up @@ -452,6 +463,7 @@ export default class Autocomplete extends Component {
menuClassName: passedMenuClassName,
optionClassName: passedOptionClassName,
displayMenu,
enterKeyHint,
id,
minLength,
name,
Expand Down Expand Up @@ -531,6 +543,7 @@ export default class Autocomplete extends Component {
)}

<input
enterkeyhint={enterKeyHint || (isIosDevice() && autoselect ? 'done' : '')}
aria-activedescendant={optionFocused ? `${id}__option--${focused}` : false}
aria-owns={`${id}__listbox`}
autoComplete='off'
Expand Down