fix: ariaInvalid doesnt work

scaleway · Nov 6, 2023 · c04c57a · c04c57a
1 parent 5704ada
commit c04c57a
Show file tree

Hide file tree

Showing 3 changed files with 2,668 additions and 2,009 deletions.
diff --git a/packages/form/src/components/DateField/index.tsx b/packages/form/src/components/DateField/index.tsx
@@ -88,7 +88,7 @@ export const DateField = <TFieldValues extends FieldValues>({
           locale={locale}
           required={required}
           onChange={(val: DateExtends | null) => {
-            if (val) {
+            if (val && val instanceof Date) {
               onChange?.(val)
               const newDate = parseDate(val)
               if (isEmpty(field.value as Date)) {
@@ -111,21 +111,20 @@ export const DateField = <TFieldValues extends FieldValues>({
           error={getError({ minDate, maxDate, label }, error)}
           disabled={disabled}
           autoFocus={autoFocus}
-      excludeDates={excludeDates}
-      data-testid={dataTestId}
+          excludeDates={excludeDates}
+          data-testid={dataTestId}
           startDate={
-        selectsRange
-          ? (input.value as [Date | null, Date | null])[0]
-          : undefined
-      }
-      endDate={
-        selectsRange
-          ? (input.value as [Date | null, Date | null])[1]
-          : undefined
-      }
+            selectsRange
+              ? (field.value as [Date | null, Date | null])[0]
+              : undefined
+          }
+          endDate={
+            selectsRange
+              ? (field.value as [Date | null, Date | null])[1]
+              : undefined
+          }
         />
       )}
->>>>>>> 3bfea1c6 (refactor(form): migrate to react hook form)
     />
   )
 }
diff --git a/packages/ui/src/components/NumberInput/index.tsx b/packages/ui/src/components/NumberInput/index.tsx
@@ -383,7 +383,6 @@ export const NumberInput = ({
             role="status"
           >
             <StyledInput
-              aria-invalid={!!error}
               disabled={disabled}
               name={name}
               onBlur={handleOnBlur}