Skip to content

[checkbox] Ignore focus while disabled #4998

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
atomiks merged 2 commits into from
Jun 11, 2026
+17 −1
Merged

[checkbox] Ignore focus while disabled #4998

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
3891e5e
[checkbox] Ignore focus while disabled
atomiks Jun 9, 2026
ae06ac7
Merge branch 'master' into codex/checkbox-disabled-focus-guard
atomiks Jun 11, 2026
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
14 changes: 14 additions & 0 deletions packages/react/src/checkbox/root/CheckboxRoot.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1174,6 +1174,20 @@ describe('<Checkbox.Root />', () => {
expect(button).not.toHaveAttribute('data-focused');
});

it('does not set [data-focused] when disabled', async () => {
await render(
<Field.Root>
<Checkbox.Root disabled data-testid="button" />
</Field.Root>,
);

const button = screen.getByTestId('button');

fireEvent.focus(button);

expect(button).not.toHaveAttribute('data-focused');
});

it('[data-invalid]', async () => {
await render(
<Field.Root invalid>
Expand Down
4 changes: 3 additions & 1 deletion packages/react/src/checkbox/root/CheckboxRoot.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,9 @@ export const CheckboxRoot = React.forwardRef(function CheckboxRoot(
'aria-labelledby': ariaLabelledBy,
[PARENT_CHECKBOX as string]: parent ? '' : undefined,
onFocus() {
setFocused(true);
if (!disabled) {
setFocused(true);
}
},
onBlur() {
const inputEl = inputRef.current;
Expand Down
Loading