Skip to content

fix: [One-Time Password Field] focus otp's first input when autoFocus props is true. #3547

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

Open
nayounsang wants to merge 3 commits into
base: main
Choose a base branch
from
Open

fix: [One-Time Password Field] focus otp's first input when autoFocus props is true. #3547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e2242a1
test: add test for autofocus
nayounsang May 17, 2025
376d1b2
fix: first input auto focus
nayounsang May 17, 2025
83cab0c
chore: add changeset
nayounsang May 17, 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
5 changes: 5 additions & 0 deletions .changeset/forty-taxis-train.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@radix-ui/react-one-time-password-field': patch
---

fix: focus 1st input when autoFocus is true
19 changes: 19 additions & 0 deletions packages/react/one-time-password-field/src/one-time-password-field.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,25 @@ describe('given a default OneTimePasswordField', () => {
expect(hiddenInput.value).toBe('1');
});

it('should focus on first input when autoFocus is true', () => {
rendered.rerender(
<OneTimePasswordField.Root autoFocus>
<OneTimePasswordField.Input />
<OneTimePasswordField.Input />
<OneTimePasswordField.Input />
<OneTimePasswordField.Input />
<OneTimePasswordField.Input />
<OneTimePasswordField.Input />
<OneTimePasswordField.HiddenInput name="code" />
</OneTimePasswordField.Root>
);

const firstInput = rendered.container.querySelector(
'input:not([type="hidden"])'
) as HTMLInputElement;
expect(document.activeElement).toBe(firstInput);
});

// TODO: userEvent paste not behaving as expected. Debug and unskip.
// Replicated in storybook for now.
it.todo('pastes the code into the input', async () => {
Expand Down
6 changes: 6 additions & 0 deletions packages/react/one-time-password-field/src/one-time-password-field.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,12 @@ const OneTimePasswordField = React.forwardRef<HTMLDivElement, OneTimePasswordFie
formElement?.requestSubmit();
}, [locateForm]);

React.useEffect(() => {
if (autoFocus && firstInput) {
firstInput.focus();
}
}, [autoFocus, firstInput]);

React.useEffect(() => {
const form = locateForm();
if (form) {
Expand Down