Skip to content

Commit 5fcce47

Browse files
fix(gcds-radios): Fix focus when radios has an error (#968)
* fix(gcds-radios): Fix focus when radios has an error * Fix test --------- Co-authored-by: Melanie Boeckmann <[email protected]>
1 parent 2e6b53f commit 5fcce47

File tree

2 files changed

+12
-18
lines changed

2 files changed

+12
-18
lines changed

packages/web/src/components/gcds-radios/gcds-radios.tsx

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -412,11 +412,9 @@ export class GcdsRadios {
412412
) : null}
413413

414414
{errorMessage ? (
415-
<div>
416-
<gcds-error-message id="radios-error" messageId="radios">
417-
{errorMessage}
418-
</gcds-error-message>
419-
</div>
415+
<gcds-error-message id="radios-error" messageId="radios">
416+
{errorMessage}
417+
</gcds-error-message>
420418
) : null}
421419

422420
{this.optionsArr &&
@@ -432,11 +430,10 @@ export class GcdsRadios {
432430

433431
if (radio.hint) {
434432
const hintID = radio.hint ? `hint-${radio.id} ` : '';
435-
attrsInput['aria-describedby'] = `${hintID}${
436-
attrsInput['aria-describedby']
437-
? `${attrsInput['aria-describedby']}`
438-
: ''
439-
}`;
433+
attrsInput['aria-describedby'] = `${hintID}${attrsInput['aria-describedby']
434+
? `${attrsInput['aria-describedby']}`
435+
: ''
436+
}`;
440437
}
441438

442439
if (hasError) {
@@ -446,9 +443,8 @@ export class GcdsRadios {
446443

447444
return (
448445
<div
449-
class={`gcds-radio ${
450-
disabled ? 'gcds-radio--disabled' : ''
451-
} ${hasError ? 'gcds-radio--error' : ''}`}
446+
class={`gcds-radio ${disabled ? 'gcds-radio--disabled' : ''
447+
} ${hasError ? 'gcds-radio--error' : ''}`}
452448
>
453449
<input
454450
id={radio.id}

packages/web/src/components/gcds-radios/test/gcds-radios.spec.tsx

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,9 @@ describe('gcds-radios', () => {
145145
<legend class="gcds-radios__legend" id="radios-legend">
146146
Legend
147147
</legend>
148-
<div>
149-
<gcds-error-message id="radios-error" messageid="radios">
150-
Error message
151-
</gcds-error-message>
152-
</div>
148+
<gcds-error-message id="radios-error" messageid="radios">
149+
Error message
150+
</gcds-error-message>
153151
<div class="gcds-radio gcds-radio--error">
154152
<input aria-description="Error message" aria-invalid="true" id="radio1" name="radio" type="radio" value="radio1">
155153
<gcds-label label="Label 1" label-for="radio1" lang="en"></gcds-label>

0 commit comments

Comments
 (0)