adding _error passed into entryWrapper and removing ariaDescribedBy

CDCgov · Oct 24, 2024 · 3946f8b · 3946f8b
1 parent 43172e5
commit 3946f8b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/apps/modernization-ui/src/components/FormInputs/DatePickerInput.tsx b/apps/modernization-ui/src/components/FormInputs/DatePickerInput.tsx
@@ -71,9 +71,9 @@ export const DatePickerInput = (props: DatePickerProps) => {
             required={props.required}
             error={_error}>
             {props.defaultValue && (
-                <InternalDatePicker {...props} onBlur={checkValidity} defaultValue={intialDefault} />
+                <InternalDatePicker {...props} error={_error} onBlur={checkValidity} defaultValue={intialDefault} />
             )}
-            {!props.defaultValue && <InternalDatePicker {...props} onBlur={checkValidity} />}
+            {!props.defaultValue && <InternalDatePicker {...props} error={_error} onBlur={checkValidity} />}
         </EntryWrapper>
     );
 };
@@ -87,7 +87,7 @@ const InternalDatePicker = ({
     disabled = false,
     disableFutureDates = false,
     label,
-    errorMessage
+    error
 }: DatePickerProps) => {
     const toggleCalendar = label ? `${label} toggle calendar` : EN_US.toggleCalendar;
     const getCurrentLocalDate = () => {
@@ -111,8 +111,7 @@ const InternalDatePicker = ({
             onKeyDown={handleKeyDown}
             onChange={handleOnChange(onChange)}
             className={classNames(className)}
-            validationStatus={errorMessage ? 'error' : undefined}
-            aria-describedby={errorMessage ? `${errorMessage}-message` : undefined}
+            validationStatus={error ? 'error' : undefined}
             name={name}
             disabled={disabled}
             defaultValue={defaultValue || undefined}

diff --git a/apps/modernization-ui/src/design-system/select/single/SingleSelect.tsx b/apps/modernization-ui/src/design-system/select/single/SingleSelect.tsx
@@ -54,7 +54,6 @@ const SingleSelect = ({
             {...inputProps}
             id={id}
             validationStatus={error ? 'error' : undefined}
-            aria-describedby={error ? `${error}-message` : undefined}
             name={inputProps.name ?? id}
             defaultValue={value?.value}
             placeholder="-Select-"