Skip to content
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

Jump to bottom

[@mantine/core] Radio: Respect Radio's size parameter over context. #2913

Merged
merged 1 commit into from Nov 12, 2022
Merged

[@mantine/core] Radio: Respect Radio's size parameter over context. #2913

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
34 changes: 32 additions & 2 deletions src/mantine-core/src/Radio/Radio.story.tsx
View file
Open in desktop
Expand Up @@ -30,13 +30,43 @@ export function RadioGroup() {

export function Sizes() {
const items = MANTINE_SIZES.map((size) => (
<Radio.Group defaultValue="ng" key={size} size={size} mt="xl">
<Radio.Group defaultValue="ng" key={size} size={size}>
<Radio label="React" value="react" />
<Radio label="Angular" value="ng" />
<Radio label="Svelte" value="sv" disabled />
</Radio.Group>
));
return <div style={{ padding: 20 }}>{items}</div>;

return (
<div style={{ padding: 20 }}>
<Stack>
<div>
Independent Radio buttons:
<Radio label="React" value="react" size="xs" />
<Radio label="React" value="react" size="sm" />
<Radio label="React" value="react" size="md" />
<Radio label="React" value="react" size="lg" />
<Radio label="React" value="react" size="xl" />
</div>
<div>
Radio Group:
{items}
</div>
<div>
Override size of specific radio button in group:
<Radio.Group size="sm">
<Radio label="default" value="def1" />
<Radio label="xs" value="xs" size="xs" />
<Radio label="sm" value="sm" size="sm" />
<Radio label="md" value="md" size="md" />
<Radio label="lg" value="lg" size="lg" />
<Radio label="xl" value="xl" size="xl" />
<Radio label="default" value="def2" />
</Radio.Group>
</div>
</Stack>
</div>
);
}

export function ComparedToCheckbox() {
Expand Down
7 changes: 5 additions & 2 deletions src/mantine-core/src/Radio/Radio.tsx
View file
Open in desktop
Expand Up @@ -84,8 +84,11 @@ export const Radio: RadioComponent = forwardRef<HTMLInputElement, RadioProps>((p
} = useComponentDefaultProps('Radio', defaultProps, props);
const ctx = useRadioGroupContext();

const contextSize = ctx?.size ?? size;
const componentSize = props.size ? size : contextSize;

const { classes } = useStyles(
{ color, size: ctx?.size || size, transitionDuration, labelPosition, error: !!error },
{ color, size: componentSize, transitionDuration, labelPosition, error: !!error },
{ classNames, styles, unstyled, name: 'Radio' }
);

Expand All @@ -106,7 +109,7 @@ export const Radio: RadioComponent = forwardRef<HTMLInputElement, RadioProps>((p
sx={sx}
style={style}
id={uuid}
size={ctx?.size || size}
size={componentSize}
labelPosition={labelPosition}
label={label}
description={description}
Expand Down