🐞 fix react-hook-form#4019 validate function pass processed value (re…

…act-hook-form#4023)
fermion17 · Jan 25, 2021 · 0562212 · 0562212
1 parent ef0f6b2
commit 0562212
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/logic/getFieldValue.ts b/src/logic/getFieldValue.ts
@@ -14,6 +14,7 @@ export default function getFieldValue<TFieldValues extends FieldValues>(
   name: InternalFieldName<TFieldValues>,
   shallowFieldsStateRef?: React.MutableRefObject<Partial<FieldValues>>,
   excludeDisabled?: boolean,
+  shouldKeepRawValue?: boolean,
 ) {
   const field = fieldsRef.current[name]!;
 
@@ -46,7 +47,9 @@ export default function getFieldValue<TFieldValues extends FieldValues>(
       return getCheckboxValue(field.options).value;
     }
 
-    return valueAsNumber
+    return shouldKeepRawValue
+      ? value
+      : valueAsNumber
       ? value === ''
         ? NaN
         : +value

diff --git a/src/logic/validateField.ts b/src/logic/validateField.ts
@@ -178,7 +178,13 @@ export default async <TFieldValues extends FieldValues>(
   }
 
   if (validate) {
-    const fieldValue = getFieldsValue(fieldsRef, name, shallowFieldsStateRef);
+    const fieldValue = getFieldsValue(
+      fieldsRef,
+      name,
+      shallowFieldsStateRef,
+      false,
+      true,
+    );
     const validateRef = isRadioOrCheckbox && options ? options[0].ref : ref;
 
     if (isFunction(validate)) {