Skip to content

[WP6.1.1] AutoComplete: Revert to event.keyCode to fix IME composition issue #45704

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
Mamaduka merged 1 commit into from
Nov 10, 2022
Merged

[WP6.1.1] AutoComplete: Revert to event.keyCode to fix IME composition issue #45704

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
27 changes: 18 additions & 9 deletions packages/components/src/autocomplete/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,15 @@ import {
useRef,
useMemo,
} from '@wordpress/element';
import {
ENTER,
ESCAPE,
UP,
DOWN,
LEFT,
RIGHT,
BACKSPACE,
} from '@wordpress/keycodes';
import { __, _n, sprintf } from '@wordpress/i18n';
import {
useInstanceId,
Expand Down Expand Up @@ -212,7 +221,7 @@ function useAutocomplete( {
}

function handleKeyDown( event ) {
backspacing.current = event.code === 'Backspace';
backspacing.current = event.keyCode === BACKSPACE;

if ( ! autocompleter ) {
return;
Expand All @@ -223,41 +232,41 @@ function useAutocomplete( {
if ( event.defaultPrevented ) {
return;
}
switch ( event.code ) {
case 'ArrowUp':
switch ( event.keyCode ) {
case UP:
setSelectedIndex(
( selectedIndex === 0
? filteredOptions.length
: selectedIndex ) - 1
);
break;

case 'ArrowDown':
case DOWN:
setSelectedIndex(
( selectedIndex + 1 ) % filteredOptions.length
);
break;

case 'Escape':
case ESCAPE:
setAutocompleter( null );
setAutocompleterUI( null );
event.preventDefault();
break;

case 'Enter':
case ENTER:
select( filteredOptions[ selectedIndex ] );
break;

case 'ArrowLeft':
case 'ArrowRight':
case LEFT:
case RIGHT:
reset();
return;

default:
return;
}

// Any handled key should prevent original behavior. This relies on
// Any handled keycode should prevent original behavior. This relies on
// the early return in the default case.
event.preventDefault();
}
Expand Down