Skip to content

fix: prevent focus visible on label (checkbox, switch, radio) #7832

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
Feb 26, 2025
Merged

fix: prevent focus visible on label (checkbox, switch, radio) #7832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
99c080d
add prevent default to onclick in usetoggle
yihuiliao Feb 26, 2025
632085d
add prevent defualt to onclick in useradio
yihuiliao Feb 26, 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
8 changes: 6 additions & 2 deletions packages/@react-aria/radio/src/useRadio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,11 @@ export function useRadio(props: AriaRadioProps, state: RadioGroupState, ref: Ref

// Handle press state on the label.
let {pressProps: labelProps, isPressed: isLabelPressed} = usePress({
isDisabled
isDisabled,
onPress() {
state.setSelectedValue(value);
ref.current?.focus();
}
});

let {focusableProps} = useFocusable(mergeProps(props, {
Expand All @@ -94,7 +98,7 @@ export function useRadio(props: AriaRadioProps, state: RadioGroupState, ref: Ref
useFormValidation({validationBehavior}, state, ref);

return {
labelProps,
labelProps: mergeProps(labelProps, {onClick: e => e.preventDefault()}),
inputProps: mergeProps(domProps, {
...interactions,
type: 'radio',
Expand Down
6 changes: 5 additions & 1 deletion packages/@react-aria/toggle/src/useToggle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ export function useToggle(props: AriaToggleProps, state: ToggleState, ref: RefOb

// Handle press state on the label.
let {pressProps: labelProps, isPressed: isLabelPressed} = usePress({
onPress() {
state.toggle();
ref.current?.focus();
},
isDisabled: isDisabled || isReadOnly
});

Expand All @@ -80,7 +84,7 @@ export function useToggle(props: AriaToggleProps, state: ToggleState, ref: RefOb
useFormReset(ref, state.isSelected, state.setSelected);

return {
labelProps,
labelProps: mergeProps(labelProps, {onClick: e => e.preventDefault()}),
inputProps: mergeProps(domProps, {
'aria-invalid': isInvalid || validationState === 'invalid' || undefined,
'aria-errormessage': props['aria-errormessage'],
Expand Down