Skip to content

FormTokenField: Fix focus lost on tab when __experimentalExpandOnFocus is set #70591

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
merged 4 commits into from
Jul 4, 2025
Merged

FormTokenField: Fix focus lost on tab when __experimentalExpandOnFocus is set #70591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1b7dcd8
fix: focus lost on tab over token input
yogeshbhutkar Jul 2, 2025
944b1f2
chore: update `CHANGELOG`
yogeshbhutkar Jul 2, 2025
bd1aadf
chore: replace `Tab` with `Space` in `CHANGELOG`
yogeshbhutkar Jul 2, 2025
f342144
chore: code refactor
yogeshbhutkar Jul 3, 2025
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
4 changes: 4 additions & 0 deletions packages/components/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@

## Unreleased

### Bug Fixes

- `FormTokenField`: Fix focus lost on tab when `__experimentalExpandOnFocus` is set ([#70591](https://github.com/WordPress/gutenberg/pull/70591)).

## 29.12.0 (2025-06-25)

### Bug Fixes
Expand Down
13 changes: 12 additions & 1 deletion 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 @@ -241,6 +241,9 @@ export function FormTokenField( props: FormTokenFieldProps ) {
case 'Escape':
preventDefault = handleEscapeKey( event );
break;
case 'Tab':
preventDefault = handleTabKey( event );
break;
default:
break;
}
Expand Down Expand Up @@ -372,17 +375,25 @@ export function FormTokenField( props: FormTokenFieldProps ) {
return true; // PreventDefault.
}

function handleEscapeKey( event: KeyboardEvent ) {
function collapseSuggestionsList( event: KeyboardEvent ) {
if ( event.target instanceof HTMLInputElement ) {
setIncompleteTokenValue( event.target.value );
setIsExpanded( false );
setSelectedSuggestionIndex( -1 );
setSelectedSuggestionScroll( false );
}
}

function handleEscapeKey( event: KeyboardEvent ) {
collapseSuggestionsList( event );
return true; // PreventDefault.
}

function handleTabKey( event: KeyboardEvent ) {
collapseSuggestionsList( event );
return false; // Do not prevent the default behavior.
}

function handleCommaKey() {
if ( inputHasValidValue() ) {
addNewToken( incompleteTokenValue );
Expand Down
Loading