From fa1064b00dc1dcf22a8661b58572f54c60fed1ba Mon Sep 17 00:00:00 2001
From: Patrick Sletvold <patrick.sletvold@sikt.no>
Date: Wed, 26 Mar 2025 14:07:59 +0100
Subject: [PATCH 1/2] fix(select): avoid invalid aria-describedby when no help
text
---
packages/select/src/Select.tsx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/packages/select/src/Select.tsx b/packages/select/src/Select.tsx
index eb82af7e9..eaed9716b 100644
--- a/packages/select/src/Select.tsx
+++ b/packages/select/src/Select.tsx
@@ -71,8 +71,9 @@ export const Select = forwardRef<HTMLSelectElement, SelectProps>(
id={id}
className="sds-select__select-input"
aria-labelledby={ariaLabelledBy}
- aria-describedby={helpTextId}
+ aria-describedby={(errorText ?? helpText) ? helpTextId : undefined}
aria-invalid={Boolean(errorText) && true}
+ aria-errormessage={errorText ? helpTextId : undefined}
onChange={(e) => {
onChange?.(e);
}}
--
GitLab
From 39030e1d7ad367c02d83532c566efa4b17fe7459 Mon Sep 17 00:00:00 2001
From: Patrick Sletvold <patrick.sletvold@sikt.no>
Date: Wed, 26 Mar 2025 14:08:56 +0100
Subject: [PATCH 2/2] fix(input-datepicker): avoid invalid aria-describedby
when no help text
---
packages/input-datepicker/src/InputDatepicker.tsx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/packages/input-datepicker/src/InputDatepicker.tsx b/packages/input-datepicker/src/InputDatepicker.tsx
index de2b5bc22..235cd2268 100644
--- a/packages/input-datepicker/src/InputDatepicker.tsx
+++ b/packages/input-datepicker/src/InputDatepicker.tsx
@@ -143,8 +143,8 @@ export const InputDatepicker = forwardRef<HTMLDivElement, InputDatepickerProps>(
value={value}
isInvalid={Boolean(errorText)}
aria-labelledby={ariaLabelledBy}
- aria-describedby={helpTextId}
- aria-errormessage={errorText && helpTextId}
+ aria-describedby={(errorText ?? helpText) ? helpTextId : undefined}
+ aria-errormessage={errorText ? helpTextId : undefined}
className={clsx(
"sds-input",
errorText && "sds-input--error",
--
GitLab