Skip to content

Prevent focus reset on date/time input clicks in Safari #7189

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
Nov 14, 2025
Merged

Prevent focus reset on date/time input clicks in Safari #7189

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
289dd67
fix focus and playground story onchange
liuliu-dev Nov 12, 2025
6cd8b47
changeset
liuliu-dev Nov 12, 2025
8d32196
only applies to date picker, otherwise would break onblur in autocomp…
liuliu-dev Nov 12, 2025
b3a057e
,->.
liuliu-dev Nov 13, 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/eleven-apes-prove.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@primer/react': patch
---

Prevent focus reset on date/time input clicks in Safari.
2 changes: 1 addition & 1 deletion packages/react/src/TextInput/TextInput.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export const Playground = (args: FormControlArgs<TextInputProps>) => {
<form className={classes.Container}>
<FormControl {...parentArgs}>
<FormControl.Label {...labelArgs} />
<TextInput value={value} onChange={handleChange} {...args} />
<TextInput value={value} onChange={handleChange} onInput={handleChange} {...args} />
{captionArgs.children && <FormControl.Caption {...captionArgs} />}
{validationArgs.children && validationArgs.variant && (
<FormControl.Validation {...validationArgs} variant={validationArgs.variant} />
Expand Down
11 changes: 9 additions & 2 deletions packages/react/src/TextInput/TextInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,15 @@ const TextInput = React.forwardRef<HTMLInputElement, TextInputProps>(
loading && (loaderPosition === 'leading' || Boolean(LeadingVisual && loaderPosition !== 'trailing'))
const showTrailingLoadingIndicator =
loading && (loaderPosition === 'trailing' || Boolean(loaderPosition === 'auto' && !LeadingVisual))
const focusInput: MouseEventHandler = () => {
inputRef.current?.focus()

// Date/time input types that have segment-based focus
const isSegmentedInputType = type === 'date' || type === 'time' || type === 'datetime-local'

const focusInput: MouseEventHandler = e => {
// Don't call focus() if the input itself was clicked on date/time inputs.
if (e.target !== inputRef.current || !isSegmentedInputType) {
inputRef.current?.focus()
}
}
const leadingVisualId = useId()
const trailingVisualId = useId()
Expand Down
Loading