Skip to content

fix: update CheckboxOrRadioGroup to spread empty object instead of false-y value #5764

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 3 commits into from
Mar 14, 2025
Merged

fix: update CheckboxOrRadioGroup to spread empty object instead of false-y value #5764

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
ecdc51e
Update CheckboxOrRadioGroup.tsx
joshblack Mar 11, 2025
35502f6
chore: format files
joshblack Mar 11, 2025
7a0475c
Create perfect-plants-trade.md
joshblack Mar 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/perfect-plants-trade.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

Update base component for Checkbox and Radio to pass along correct prop type in React 19
72 changes: 42 additions & 30 deletions packages/react/src/internal/components/CheckboxOrRadioGroup/CheckboxOrRadioGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
<Box
className={clsx(className, classes.GroupFieldset)}
data-validation={validationChild ? '' : undefined}
{...(labelChild && {
as: 'fieldset',
disabled,
})}
{...(labelChild
? {
as: 'fieldset',
disabled,
}
: {})}
sx={sx}
>
{labelChild ? (
Expand All @@ -138,12 +140,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou

<Body
className={classes.Body}
{...(!labelChild && {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
})}
{...(!labelChild
? {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
}
: {})}
>
{React.Children.toArray(rest).filter(child => React.isValidElement(child))}
</Body>
Expand Down Expand Up @@ -174,10 +178,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
<fieldset
className={clsx(className, classes.GroupFieldset)}
data-validation={validationChild ? '' : undefined}
{...(labelChild && {
as: 'fieldset',
disabled,
})}
{...(labelChild
? {
as: 'fieldset',
disabled,
}
: {})}
>
{labelChild ? (
/*
Expand All @@ -203,12 +209,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou

<Body
className={classes.Body}
{...(!labelChild && {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
})}
{...(!labelChild
? {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
}
: {})}
>
{React.Children.toArray(rest).filter(child => React.isValidElement(child))}
</Body>
Expand Down Expand Up @@ -242,10 +250,12 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
margin={0}
mb={validationChild ? 2 : undefined}
padding={0}
{...(labelChild && {
as: 'fieldset',
disabled,
})}
{...(labelChild
? {
as: 'fieldset',
disabled,
}
: {})}
className={className}
sx={sx}
>
Expand All @@ -272,12 +282,14 @@ const CheckboxOrRadioGroup: React.FC<React.PropsWithChildren<CheckboxOrRadioGrou
)}

<Body
{...(!labelChild && {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
})}
{...(!labelChild
? {
['aria-labelledby']: ariaLabelledby,
['aria-describedby']: [validationMessageId, captionId].filter(Boolean).join(' '),
as: 'div',
role: 'group',
}
: {})}
>
{React.Children.toArray(rest).filter(child => React.isValidElement(child))}
</Body>
Expand Down
Loading