Skip to content

fix: restore focus after closing dropdown via Esc in CSS Value input #5002

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 2 commits into from
Mar 15, 2025
Merged

fix: restore focus after closing dropdown via Esc in CSS Value input #5002

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8cc0d87
restore focus after closing dropdown via Esc
kof Mar 14, 2025
bb0d12b
lint
kof Mar 14, 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
16 changes: 15 additions & 1 deletion apps/builder/app/builder/features/style-panel/shared/css-value-input/css-value-input.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -929,7 +929,21 @@ export const CssValueInput = ({
}, [inputRef]);

const inputPropsHandleKeyDown = composeEventHandlers(
[handleUpDownNumeric, inputProps.onKeyDown, handleEnter, handleDelete],
[
handleUpDownNumeric,
inputProps.onKeyDown,
handleEnter,
handleDelete,
(event: KeyboardEvent) => {
// When dropdown is open - we are loosing focus to the combobox.
// When menu gets closed via Escape - we want to restore the focus.
if (event.key === "Escape" && isOpen) {
requestAnimationFrame(() => {
inputRef.current?.focus();
});
}
},
],
{
// Pass prevented events to the combobox (e.g., the Escape key doesn't work otherwise, as it's blocked by Radix)
checkForDefaultPrevented: false,
Expand Down