Skip to content

Fix 1413 - Remove readonly from radio and checkboxes. Use aria-readonly instead. #1414

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 5 commits into from
Dec 23, 2020
Merged

Fix 1413 - Remove readonly from radio and checkboxes. Use aria-readonly instead. #1414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
65e0265
fix 1413 - remove readonly and add aria-readonly on input type radio …
intergalacticspacehighway Dec 21, 2020
2e0b3e2
fix 1413 - updated test cases on useCheckboxGroup
intergalacticspacehighway Dec 21, 2020
1472fb5
Merge branch 'main' into fix-1413
intergalacticspacehighway Dec 21, 2020
88ba0eb
fix 1413 - Fix lint issue and failing test cases
intergalacticspacehighway Dec 21, 2020
3ea2804
Fix 1413 - aria-readonly should default to undefined
intergalacticspacehighway Dec 23, 2020
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: 4 additions & 4 deletions packages/@react-aria/checkbox/test/useCheckboxGroup.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ describe('useCheckboxGroup', () => {
expect(checkboxes[0]).not.toHaveAttribute('disabled');
});

it('sets readOnly on each checkbox', () => {
it('sets aria-readonly="true" on each checkbox', () => {
let {getAllByRole} = render(
<CheckboxGroup
groupProps={{label: 'Favorite Pet', isReadOnly: true}}
Expand All @@ -230,9 +230,9 @@ describe('useCheckboxGroup', () => {
);

let checkboxes = getAllByRole('checkbox') as HTMLInputElement[];
expect(checkboxes[0]).toHaveAttribute('readonly');
expect(checkboxes[0]).toHaveAttribute('readonly');
expect(checkboxes[0]).toHaveAttribute('readonly');
expect(checkboxes[0]).toHaveAttribute('aria-readonly', 'true');
expect(checkboxes[1]).toHaveAttribute('aria-readonly', 'true');
expect(checkboxes[2]).toHaveAttribute('aria-readonly', 'true');
});

it('should not update state for readonly checkbox', () => {
Expand Down
2 changes: 1 addition & 1 deletion packages/@react-aria/radio/src/useRadio.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export function useRadio(props: RadioAriaProps, state: RadioGroupState, ref: Ref
name: radioGroupNames.get(state),
tabIndex,
disabled: isDisabled,
readOnly: isReadOnly,
'aria-readonly': isReadOnly || undefined,
required: isRequired,
checked,
value,
Expand Down
2 changes: 1 addition & 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 @@ -67,10 +67,10 @@ export function useToggle(props: AriaToggleProps, state: ToggleState, ref: RefOb
'aria-invalid': validationState === 'invalid' || undefined,
'aria-errormessage': props['aria-errormessage'],
'aria-controls': props['aria-controls'],
'aria-readonly': isReadOnly || undefined,
onChange,
disabled: isDisabled,
required: isRequired,
readOnly: isReadOnly,
value,
name,
type: 'checkbox',
Expand Down
8 changes: 4 additions & 4 deletions packages/@react-spectrum/checkbox/test/CheckboxGroup.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ describe('CheckboxGroup', () => {
expect(checkboxes[2]).not.toHaveAttribute('disabled');
});

it('sets readOnly on each checkbox', () => {
it('sets aria-readonly="true" on each checkbox', () => {
let {getAllByRole} = render(
<Provider theme={theme}>
<CheckboxGroup label="Favorite Pet" isReadOnly>
Expand All @@ -209,9 +209,9 @@ describe('CheckboxGroup', () => {
);

let checkboxes = getAllByRole('checkbox');
expect(checkboxes[0]).toHaveAttribute('readonly');
expect(checkboxes[1]).toHaveAttribute('readonly');
expect(checkboxes[2]).toHaveAttribute('readonly');
expect(checkboxes[0]).toHaveAttribute('aria-readonly', 'true');
expect(checkboxes[1]).toHaveAttribute('aria-readonly', 'true');
expect(checkboxes[2]).toHaveAttribute('aria-readonly', 'true');
});

it('should not update state for readonly checkbox', () => {
Expand Down
4 changes: 2 additions & 2 deletions packages/@react-spectrum/provider/test/Provider.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ describe('Provider', () => {
let checkbox = getByLabelText('Test Checkbox');
let switchComponent = getByLabelText('Test Switch');

expect(switchComponent).toHaveAttribute('readonly');
expect(checkbox).toHaveAttribute('readonly');
expect(switchComponent).toHaveAttribute('aria-readonly', 'true');
expect(checkbox).toHaveAttribute('aria-readonly', 'true');

act(() => {
userEvent.click(checkbox);
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-spectrum/radio/test/Radio.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -272,9 +272,9 @@ describe('Radios', function () {
let radios = getAllByRole('radio');
expect(radioGroup).toBeTruthy();
expect(radios.length).toBe(3);
expect(radios[0]).toHaveAttribute('readonly');
expect(radios[1]).toHaveAttribute('readonly');
expect(radios[2]).toHaveAttribute('readonly');
expect(radios[0]).toHaveAttribute('aria-readonly', 'true');
expect(radios[1]).toHaveAttribute('aria-readonly', 'true');
expect(radios[2]).toHaveAttribute('aria-readonly', 'true');

let cats = getByLabelText('Cats');
userEvent.click(cats);
Expand Down