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.

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

Jump to bottom

FormTokenField: Fix duplicate input in IME composition #45607

Merged
merged 5 commits into from
Nov 12, 2022
Merged

FormTokenField: Fix duplicate input in IME composition #45607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
32526c0
FormTokenField: Fix duplicate input in IME composition
t-hamano Nov 8, 2022
918cf39
Update readme
t-hamano Nov 8, 2022
16190d6
Fix wrong event.key case value
t-hamano Nov 9, 2022
df7550c
Add composition session check
t-hamano Nov 9, 2022
3048519
Add workaround for Mac Safari
t-hamano Nov 10, 2022
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
1 change: 1 addition & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

### Bug Fix

- `FormTokenField`: Fix duplicate input in IME composition ([#45607](https://github.com/WordPress/gutenberg/pull/45607)).
- `Autocomplete`: Fix unexpected block insertion during IME composition ([#45510](https://github.com/WordPress/gutenberg/pull/45510)).

### Internal
Expand Down
18 changes: 13 additions & 5 deletions packages/components/src/form-token-field/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,10 +169,18 @@ export function FormTokenField( props: FormTokenFieldProps ) {
function onKeyDown( event: KeyboardEvent ) {
let preventDefault = false;

if ( event.defaultPrevented ) {
if (
event.defaultPrevented ||
// Ignore keydowns from IMEs
event.nativeEvent.isComposing ||
// Workaround for Mac Safari where the final Enter/Backspace of an IME composition
// is `isComposing=false`, even though it's technically still part of the composition.
// These can only be detected by keyCode.
event.keyCode === 229
) {
return;
}
switch ( event.code ) {
switch ( event.key ) {
case 'Backspace':
preventDefault = handleDeleteKey( deleteTokenBeforeInput );
break;
Expand Down Expand Up @@ -213,9 +221,9 @@ export function FormTokenField( props: FormTokenFieldProps ) {

function onKeyPress( event: KeyboardEvent ) {
let preventDefault = false;
// TODO: replace to event.code;
switch ( event.charCode ) {
case 44: // Comma.

switch ( event.key ) {
case ',':
preventDefault = handleCommaKey();
break;
default:
Expand Down