Skip to content

Commit d20bfc9

Browse files
authored
Fix broken aria references in table (#3611)
1 parent 67eedf8 commit d20bfc9

File tree

3 files changed

+11
-3
lines changed

3 files changed

+11
-3
lines changed

src/layout/Checkboxes/CheckboxesContainerComponent.tsx

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import React from 'react';
22

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

56
import { ConditionalWrapper } from 'src/app-components/ConditionalWrapper/ConditionalWrapper';
67
import { AltinnSpinner } from 'src/components/AltinnSpinner';
@@ -13,6 +14,7 @@ import { useIsValid } from 'src/features/validation/selectors/isValid';
1314
import classes from 'src/layout/Checkboxes/CheckboxesContainerComponent.module.css';
1415
import { WrappedCheckbox } from 'src/layout/Checkboxes/WrappedCheckbox';
1516
import { ComponentStructureWrapper } from 'src/layout/ComponentStructureWrapper';
17+
import utilClasses from 'src/styles/utils.module.css';
1618
import { shouldUseRowLayout } from 'src/utils/layout';
1719
import { useIndexedId } from 'src/utils/layout/DataModelLocation';
1820
import { useItemWhenType } from 'src/utils/layout/useNodeItem';
@@ -95,7 +97,9 @@ export const CheckboxContainerComponent = ({
9597
<Fieldset.Legend className={classes.legend}>{labelTextGroup}</Fieldset.Legend>
9698
)}
9799
{textResourceBindings?.description && (
98-
<Fieldset.Description>
100+
<Fieldset.Description
101+
className={cn({ [utilClasses.visuallyHidden]: overrideDisplay?.renderLegend === false })}
102+
>
99103
<Lang id={textResourceBindings?.description} />
100104
</Fieldset.Description>
101105
)}

src/layout/Input/InputComponent.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,9 @@ export const InputVariant = ({
133133
id,
134134
'aria-label': langAsString(textResourceBindings?.title),
135135
'aria-describedby':
136-
textResourceBindings?.title && textResourceBindings?.description ? getDescriptionId(id) : undefined,
136+
overrideDisplay?.renderedInTable !== true && textResourceBindings?.title && textResourceBindings?.description
137+
? getDescriptionId(id)
138+
: undefined,
137139
autoComplete: autocomplete,
138140
className: formatting?.align ? classes[`text-align-${formatting.align}`] : '',
139141
readOnly,

src/layout/RadioButtons/ControlledRadioGroup.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,9 @@ export const ControlledRadioGroup = (props: PropsFromGenericComponent<'RadioButt
100100
{labelText}
101101
</Fieldset.Legend>
102102
{textResourceBindings?.description && (
103-
<Fieldset.Description>
103+
<Fieldset.Description
104+
className={cn({ [utilClasses.visuallyHidden]: overrideDisplay?.renderLegend === false })}
105+
>
104106
<Lang id={textResourceBindings?.description} />
105107
</Fieldset.Description>
106108
)}

0 commit comments

Comments
 (0)