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

Fix issues in new CheckBox component + fix styling RadioButtonGroup #1551

Merged
merged 4 commits into from
Oct 9, 2023
Merged

Fix issues in new CheckBox component + fix styling RadioButtonGroup #1551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3175327
sr-only in table + fix hideLegend
lassopicasso Oct 9, 2023
02dea48
fix hide group legend in table
lassopicasso Oct 9, 2023
d2698ea
Fix styling of radioButtonGroup - use hideLegend
lassopicasso Oct 9, 2023
c4bee4c
use the classNames package
lassopicasso Oct 9, 2023
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
12 changes: 6 additions & 6 deletions src/layout/Checkboxes/CheckboxesContainerComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ export const CheckboxContainerComponent = ({
}
};

const labelText = (
const labelTextGroup = (
<span className={classes.checkBoxLabelContainer}>
{lang(node.item.textResourceBindings?.title)}
<RequiredIndicator required={required} />
Expand Down Expand Up @@ -91,11 +91,11 @@ export const CheckboxContainerComponent = ({
>
<Checkbox.Group
className={cn({ [classes.horizontal]: horizontal })}
legend={labelText}
legend={labelTextGroup}
description={lang(textResourceBindings?.description)}
disabled={readOnly}
onChange={(values) => handleChange(values)}
hideLegend={overrideDisplay?.renderLegend}
hideLegend={overrideDisplay?.renderLegend === false}
error={!isValid}
aria-label={ariaLabel}
value={selected}
Expand All @@ -110,14 +110,14 @@ export const CheckboxContainerComponent = ({
checked={selected.includes(option.value)}
size='small'
>
{hideLabel ? null : (
<span className={classes.checkBoxLabelContainer}>
{
<span className={cn({ 'sr-only': hideLabel }, classes.checkBoxLabelContainer)}>
{langAsString(option.label)}
{option.helpText && (
<HelpText title={getPlainTextFromNode(option.helpText)}>{lang(option.helpText)}</HelpText>
)}
</span>
)}
}
</Checkbox>
))}
</Checkbox.Group>
Expand Down
19 changes: 9 additions & 10 deletions src/layout/RadioButtons/ControlledRadioGroup.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,16 @@ export const ControlledRadioGroup = (props: IControlledRadioGroupProps) => {
>
<Radio.Group
legend={
overrideDisplay?.renderLegend === false ? null : (
<span className={classes.label}>
{labelText}
{textResourceBindings?.help ? (
<HelpText title={langAsString(textResourceBindings?.help)}>
{lang(textResourceBindings?.help)}
</HelpText>
) : null}
</span>
)
<span className={classes.label}>
{labelText}
{textResourceBindings?.help ? (
<HelpText title={langAsString(textResourceBindings?.help)}>
{lang(textResourceBindings?.help)}
</HelpText>
) : null}
</span>
}
hideLegend={overrideDisplay?.renderLegend === false}
description={lang(textResourceBindings?.description)}
error={!isValid}
disabled={readOnly}
Expand Down