react-hook-form 8.0.0-alpha.3 → 8.0.0-alpha.4

package/dist/index.esm.mjs

@@ -18,9 +18,9 @@ var getEventValue = (event) => isObject(event) && event.target
         : event.target.value
     : event;
 
-var getNodeParentName = (name) => name.substring(0, name.search(/.\d/)) || name;
+var getNodeParentName = (name) => name.substring(0, name.search(/\.\d+(\.|$)/)) || name;
 
-var isNameInFieldArray = (names, name) => [...names].some((current) => getNodeParentName(name) === current);
+var isNameInFieldArray = (names, name) => names.has(getNodeParentName(name));
 
 var compact = (value) => Array.isArray(value) ? value.filter(Boolean) : [];
 
@@ -672,11 +672,13 @@ var validateField = async (field, inputValue, validateAllFieldCriteria, shouldUs
             ...appendErrorsCurry(exceedMax ? maxType : minType, message),
         };
     };
-    if (required &&
-        ((!isRadioOrCheckbox && (isEmpty || isNullOrUndefined(inputValue))) ||
-            (isBoolean(inputValue) && !inputValue) ||
-            (isCheckBox && !getCheckboxValue(refs).isValid) ||
-            (isRadio && !getRadioValue(refs).isValid))) {
+    if (isFieldArray
+        ? Array.isArray(inputValue) && !inputValue.length
+        : required &&
+            ((!isRadioOrCheckbox && (isEmpty || isNullOrUndefined(inputValue))) ||
+                (isBoolean(inputValue) && !inputValue) ||
+                (isCheckBox && !getCheckboxValue(refs).isValid) ||
+                (isRadio && !getRadioValue(refs).isValid))) {
         const { value, message } = isMessage(required)
             ? { value: !!required, message: required }
             : getValueAndMessage(required);
@@ -725,8 +727,8 @@ var validateField = async (field, inputValue, validateAllFieldCriteria, shouldUs
         }
     }
     if ((maxLength || minLength) &&
-        ((!isEmpty && isString(inputValue)) ||
-            (isFieldArray && Array.isArray(inputValue)))) {
+        !isEmpty &&
+        (isString(inputValue) || (isFieldArray && Array.isArray(inputValue)))) {
         const maxLengthOutput = getValueAndMessage(maxLength);
         const minLengthOutput = getValueAndMessage(minLength);
         const exceedMax = !isNullOrUndefined(maxLengthOutput.value) &&
@@ -936,10 +938,9 @@ function useFieldArray(props) {
     _name.current = name;
     _fieldIds.current = fields;
     control._names.array.add(name);
-    if (props.rules) {
+    props.rules &&
         control.register(name, props.rules);
-    }
-    const callback = React.useCallback(({ values, name: fieldArrayName }) => {
+    const callback = React.useCallback(({ values, name: fieldArrayName, }) => {
         if (fieldArrayName === _name.current || !fieldArrayName) {
             const fieldValues = get(values, _name.current, []);
             setFields(fieldValues);
@@ -1059,13 +1060,10 @@ function useFieldArray(props) {
                     control._formState.isSubmitted) &&
                     field &&
                     field._f) {
-                    validateField(field, get(control._formValues, name), control._options.criteriaMode === VALIDATION_MODE.all, control._options.shouldUseNativeValidation, true).then((error) => {
-                        if (!isEmptyObject(error)) {
-                            control._subjects.state.next({
-                                errors: updateFieldArrayRootError(control._formState.errors, error, name),
-                            });
-                        }
-                    });
+                    validateField(field, get(control._formValues, name), control._options.criteriaMode === VALIDATION_MODE.all, control._options.shouldUseNativeValidation, true).then((error) => !isEmptyObject(error) &&
+                        control._subjects.state.next({
+                            errors: updateFieldArrayRootError(control._formState.errors, error, name),
+                        }));
                 }
             }
         }
@@ -1096,7 +1094,7 @@ function useFieldArray(props) {
         replace: React.useCallback(replace, [updateValues, name, control]),
         fields: React.useMemo(() => fields.map((field, index) => ({
             ...field,
-            id: ids.current[index] || generateId(),
+            key: ids.current[index] || generateId(),
         })), [fields]),
     };
 }
@@ -1605,19 +1603,12 @@ function createFormControl(props = {}) {
                             break;
                         }
                     }
-                    if (!shouldOnlyCheckValid) {
-                        if (get(fieldError, _f.name)) {
-                            if (isFieldArrayRoot) {
-                                updateFieldArrayRootError(_formState.errors, fieldError, _f.name);
-                            }
-                            else {
-                                set(_formState.errors, _f.name, fieldError[_f.name]);
-                            }
-                        }
-                        else {
-                            unset(_formState.errors, _f.name);
-                        }
-                    }
+                    !shouldOnlyCheckValid &&
+                        (get(fieldError, _f.name)
+                            ? isFieldArrayRoot
+                                ? updateFieldArrayRootError(_formState.errors, fieldError, _f.name)
+                                : set(_formState.errors, _f.name, fieldError[_f.name])
+                            : unset(_formState.errors, _f.name));
                 }
                 fieldValue &&
                     (await executeBuildInValidation(fieldValue, shouldOnlyCheckValid, context));
@@ -1847,7 +1838,6 @@ function createFormControl(props = {}) {
                 : fieldNames.map((name) => get(values, name));
     };
     const getFieldState = (name, formState) => ({
-        invalid: !!get((formState || _formState).errors, name),
         isDirty: !!get((formState || _formState).dirtyFields, name),
         isTouched: !!get((formState || _formState).touchedFields, name),
         error: get((formState || _formState).errors, name),