Skip to content

Autocomplete: Fix keyboard navigation with source object #1792

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

Closed
wants to merge 1 commit into from
Closed

Autocomplete: Fix keyboard navigation with source object #1792

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
29 changes: 29 additions & 0 deletions tests/unit/autocomplete/core.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -429,4 +429,33 @@ QUnit.test( "Close on click outside when focus remains", function( assert ) {
} );
} );

QUnit.test( "Use source label on keyboard navigation (#15130)", function( assert ) {
var ready = assert.async();
assert.expect( 3 );
var element = $( "#autocomplete" ).autocomplete( {
source: [
{ label: "ActionScript", value: 123 },
{ label: "AppleScript", value: 456 },
{ label: "Javascript", value: 789 }
],
delay: 0
} );

element.autocomplete( "search", "a" );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
setTimeout( function() {
assert.equal( element.val(), "ActionScript", "Keydown input value matches source label" );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
setTimeout( function() {
assert.equal( element.val(), "AppleScript", "Keydown input value matches next source label" );
element.simulate( "keydown", { keyCode: $.ui.keyCode.DOWN } );
element.simulate( "keydown", { keyCode: $.ui.keyCode.ENTER } );
setTimeout( function() {
assert.equal( element.val(), "Javascript", "Enter key value matches source label" );
ready();
} );
} );
} );
} );

} );
6 changes: 3 additions & 3 deletions ui/widgets/autocomplete.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,16 +253,16 @@ $.widget( "ui.autocomplete", {
}

item = ui.item.data( "ui-autocomplete-item" );
label = ui.item.attr( "aria-label" ) || item.label || item.value;
if ( false !== this._trigger( "focus", event, { item: item } ) ) {

// use value to match what will end up in the input, if it was a key event
if ( event.originalEvent && /^key/.test( event.originalEvent.type ) ) {
this._value( item.value );
this._value( label );
}
}

// Announce the value in the liveRegion
label = ui.item.attr( "aria-label" ) || item.value;
if ( label && $.trim( label ).length ) {
this.liveRegion.children().hide();
$( "<div>" ).text( label ).appendTo( this.liveRegion );
Expand All @@ -287,7 +287,7 @@ $.widget( "ui.autocomplete", {
}

if ( false !== this._trigger( "select", event, { item: item } ) ) {
this._value( item.value );
this._value( ui.item.attr( "aria-label" ) || item.label || item.value );
}

// reset the term after the select event
Expand Down