Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion src/layout/Checkboxes/CheckboxesContainerComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React from 'react';

import { Fieldset, useCheckboxGroup } from '@digdir/designsystemet-react';
import cn from 'classnames';

import { ConditionalWrapper } from 'src/app-components/ConditionalWrapper/ConditionalWrapper';
import { AltinnSpinner } from 'src/components/AltinnSpinner';
Expand All @@ -13,6 +14,7 @@ import { useIsValid } from 'src/features/validation/selectors/isValid';
import classes from 'src/layout/Checkboxes/CheckboxesContainerComponent.module.css';
import { WrappedCheckbox } from 'src/layout/Checkboxes/WrappedCheckbox';
import { ComponentStructureWrapper } from 'src/layout/ComponentStructureWrapper';
import utilClasses from 'src/styles/utils.module.css';
import { shouldUseRowLayout } from 'src/utils/layout';
import { useIndexedId } from 'src/utils/layout/DataModelLocation';
import { useItemWhenType } from 'src/utils/layout/useNodeItem';
Expand Down Expand Up @@ -95,7 +97,9 @@ export const CheckboxContainerComponent = ({
<Fieldset.Legend className={classes.legend}>{labelTextGroup}</Fieldset.Legend>
)}
{textResourceBindings?.description && (
<Fieldset.Description>
<Fieldset.Description
className={cn({ [utilClasses.visuallyHidden]: overrideDisplay?.renderLegend === false })}
>
<Lang id={textResourceBindings?.description} />
</Fieldset.Description>
)}
Expand Down
4 changes: 3 additions & 1 deletion src/layout/Input/InputComponent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,9 @@ export const InputVariant = ({
id,
'aria-label': langAsString(textResourceBindings?.title),
'aria-describedby':
textResourceBindings?.title && textResourceBindings?.description ? getDescriptionId(id) : undefined,
overrideDisplay?.renderedInTable !== true && textResourceBindings?.title && textResourceBindings?.description
? getDescriptionId(id)
: undefined,
autoComplete: autocomplete,
className: formatting?.align ? classes[`text-align-${formatting.align}`] : '',
readOnly,
Expand Down
4 changes: 3 additions & 1 deletion src/layout/RadioButtons/ControlledRadioGroup.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@ export const ControlledRadioGroup = (props: PropsFromGenericComponent<'RadioButt
{labelText}
</Fieldset.Legend>
{textResourceBindings?.description && (
<Fieldset.Description>
<Fieldset.Description
className={cn({ [utilClasses.visuallyHidden]: overrideDisplay?.renderLegend === false })}
>
<Lang id={textResourceBindings?.description} />
</Fieldset.Description>
)}
Expand Down
Loading