react-hook-form 6.9.4 → 6.9.5

package/dist/index.ie11.development.js

@@ -1142,13 +1142,14 @@ function useForm(_a) {
         }
         else if (!isPrimitive(value)) {
             setInternalValues(name, value, config);
-            if (fieldArrayNamesRef.current.has(name) && config.shouldDirty) {
+            if (fieldArrayNamesRef.current.has(name)) {
                 fieldArrayDefaultValuesRef.current[name] = value;
                 resetFieldArrayFunctionRef.current[name]((_a = {},
                     _a[name] = value,
                     _a));
-                if (readFormStateRef.current.isDirty ||
-                    readFormStateRef.current.dirtyFields) {
+                if ((readFormStateRef.current.isDirty ||
+                    readFormStateRef.current.dirtyFields) &&
+                    config.shouldDirty) {
                     set(formStateRef.current.dirtyFields, name, setFieldArrayDirtyFields(value, get(defaultValuesRef.current, name, []), get(formStateRef.current.dirtyFields, name, [])));
                     updateFormState({
                         isDirty: !deepEqual(__assign(__assign({}, getValues()), (_b = {}, _b[name] = value, _b)), defaultValuesRef.current),
@@ -1308,6 +1309,33 @@ function useForm(_a) {
     var removeFieldEventListener = React.useCallback(function (field, forceDelete) {
         return findRemovedFieldAndRemoveListener(fieldsRef, handleChangeRef.current, field, shallowFieldsStateRef, shouldUnregister, forceDelete);
     }, [shouldUnregister]);
+    var updateWatchedValue = function (name) {
+        var e_4, _a;
+        if (isWatchAllRef.current) {
+            updateFormState();
+        }
+        else if (watchFieldsRef) {
+            var shouldRenderUseWatch = true;
+            try {
+                for (var _b = __values(watchFieldsRef.current), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    var watchField = _c.value;
+                    if (watchField.startsWith(name)) {
+                        updateFormState();
+                        shouldRenderUseWatch = false;
+                        break;
+                    }
+                }
+            }
+            catch (e_4_1) { e_4 = { error: e_4_1 }; }
+            finally {
+                try {
+                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
+                }
+                finally { if (e_4) throw e_4.error; }
+            }
+            shouldRenderUseWatch && renderWatchedInputs(name);
+        }
+    };
     var removeFieldEventListenerAndRef = React.useCallback(function (field, forceDelete) {
         if (field) {
             removeFieldEventListener(field, forceDelete);
@@ -1323,6 +1351,7 @@ function useForm(_a) {
                     dirtyFields: formStateRef.current.dirtyFields,
                 });
                 resolverRef.current && validateResolver();
+                updateWatchedValue(field.ref.name);
             }
         }
     }, [validateResolver, removeFieldEventListener]);
@@ -1375,19 +1404,19 @@ function useForm(_a) {
         return watchInternal(fieldNames, defaultValue);
     }
     function unregister(name) {
-        var e_4, _a;
+        var e_5, _a;
         try {
             for (var _b = __values(Array.isArray(name) ? name : [name]), _c = _b.next(); !_c.done; _c = _b.next()) {
                 var fieldName = _c.value;
                 removeFieldEventListenerAndRef(fieldsRef.current[fieldName], true);
             }
         }
-        catch (e_4_1) { e_4 = { error: e_4_1 }; }
+        catch (e_5_1) { e_5 = { error: e_5_1 }; }
         finally {
             try {
                 if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
             }
-            finally { if (e_4) throw e_4.error; }
+            finally { if (e_5) throw e_5.error; }
         }
     }
     function registerFieldRef(ref, validateOptions) {
@@ -1492,8 +1521,8 @@ function useForm(_a) {
         }
     }
     var handleSubmit = React.useCallback(function (onValid, onInvalid) { return function (e) { return __awaiter(_this, void 0, void 0, function () {
-        var fieldErrors, fieldValues, _a, errors, values, _b, _c, field, name_2, fieldError, e_5_1, _d;
-        var e_5, _e;
+        var fieldErrors, fieldValues, _a, errors, values, _b, _c, field, name_2, fieldError, e_6_1, _d;
+        var e_6, _e;
         return __generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
@@ -1503,11 +1532,10 @@ function useForm(_a) {
                     }
                     fieldErrors = {};
                     fieldValues = setFieldArrayDefaultValues(getFieldsValues(fieldsRef, shallowFieldsStateRef, true));
-                    if (readFormStateRef.current.isSubmitting) {
+                    readFormStateRef.current.isSubmitting &&
                         updateFormState({
                             isSubmitting: true,
                         });
-                    }
                     _f.label = 1;
                 case 1:
                     _f.trys.push([1, , 16, 17]);
@@ -1515,8 +1543,7 @@ function useForm(_a) {
                     return [4 /*yield*/, resolverRef.current(fieldValues, contextRef.current, isValidateAllFieldCriteria)];
                 case 2:
                     _a = _f.sent(), errors = _a.errors, values = _a.values;
-                    formStateRef.current.errors = errors;
-                    fieldErrors = errors;
+                    formStateRef.current.errors = fieldErrors = errors;
                     fieldValues = values;
                     return [3 /*break*/, 10];
                 case 3:
@@ -1545,14 +1572,14 @@ function useForm(_a) {
                     return [3 /*break*/, 4];
                 case 7: return [3 /*break*/, 10];
                 case 8:
-                    e_5_1 = _f.sent();
-                    e_5 = { error: e_5_1 };
+                    e_6_1 = _f.sent();
+                    e_6 = { error: e_6_1 };
                     return [3 /*break*/, 10];
                 case 9:
                     try {
                         if (_c && !_c.done && (_e = _b.return)) _e.call(_b);
                     }
-                    finally { if (e_5) throw e_5.error; }
+                    finally { if (e_6) throw e_6.error; }
                     return [7 /*endfinally*/];
                 case 10:
                     if (!(isEmptyObject(fieldErrors) &&
@@ -1613,7 +1640,7 @@ function useForm(_a) {
         });
     };
     var reset = function (values, omitResetState) {
-        var e_6, _a;
+        var e_7, _a;
         if (omitResetState === void 0) { omitResetState = {}; }
         if (isWeb) {
             try {
@@ -1634,23 +1661,21 @@ function useForm(_a) {
                     }
                 }
             }
-            catch (e_6_1) { e_6 = { error: e_6_1 }; }
+            catch (e_7_1) { e_7 = { error: e_7_1 }; }
             finally {
                 try {
                     if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
                 }
-                finally { if (e_6) throw e_6.error; }
+                finally { if (e_7) throw e_7.error; }
             }
         }
         fieldsRef.current = {};
         defaultValuesRef.current = cloneObject(values || defaultValuesRef.current);
-        if (values) {
-            renderWatchedInputs('');
-        }
+        values && renderWatchedInputs('');
+        Object.values(resetFieldArrayFunctionRef.current).forEach(function (resetFieldArray) { return isFunction(resetFieldArray) && resetFieldArray(); });
         shallowFieldsStateRef.current = shouldUnregister
             ? {}
             : cloneObject(values) || {};
-        Object.values(resetFieldArrayFunctionRef.current).forEach(function (resetFieldArray) { return isFunction(resetFieldArray) && resetFieldArray(); });
         resetRefs(omitResetState);
     };
     React.useEffect(function () {
@@ -1681,15 +1706,13 @@ function useForm(_a) {
         register: React.useCallback(register, [defaultValuesRef.current]),
         unregister: React.useCallback(unregister, []),
     };
-    var control = __assign({ renderWatchedInputs: renderWatchedInputs,
+    var control = __assign({ updateWatchedValue: updateWatchedValue,
         shouldUnregister: shouldUnregister,
         removeFieldEventListener: removeFieldEventListener,
         watchInternal: watchInternal, mode: modeRef.current, reValidateMode: {
             isReValidateOnBlur: isReValidateOnBlur,
             isReValidateOnChange: isReValidateOnChange,
         }, fieldsRef: fieldsRef,
-        isWatchAllRef: isWatchAllRef,
-        watchFieldsRef: watchFieldsRef,
         resetFieldArrayFunctionRef: resetFieldArrayFunctionRef,
         useWatchFieldsRef: useWatchFieldsRef,
         useWatchRenderFunctionsRef: useWatchRenderFunctionsRef,
@@ -1817,7 +1840,7 @@ var useFieldArray = function (_a) {
         }
     }
     var focusIndexRef = React.useRef(-1);
-    var _c = control || methods.control, isWatchAllRef = _c.isWatchAllRef, resetFieldArrayFunctionRef = _c.resetFieldArrayFunctionRef, fieldArrayNamesRef = _c.fieldArrayNamesRef, fieldsRef = _c.fieldsRef, defaultValuesRef = _c.defaultValuesRef, removeFieldEventListener = _c.removeFieldEventListener, formStateRef = _c.formStateRef, shallowFieldsStateRef = _c.shallowFieldsStateRef, updateFormState = _c.updateFormState, readFormStateRef = _c.readFormStateRef, watchFieldsRef = _c.watchFieldsRef, validFieldsRef = _c.validFieldsRef, fieldsWithValidationRef = _c.fieldsWithValidationRef, fieldArrayDefaultValuesRef = _c.fieldArrayDefaultValuesRef, validateResolver = _c.validateResolver, renderWatchedInputs = _c.renderWatchedInputs, getValues = _c.getValues, shouldUnregister = _c.shouldUnregister;
+    var _c = control || methods.control, updateWatchedValue = _c.updateWatchedValue, resetFieldArrayFunctionRef = _c.resetFieldArrayFunctionRef, fieldArrayNamesRef = _c.fieldArrayNamesRef, fieldsRef = _c.fieldsRef, defaultValuesRef = _c.defaultValuesRef, removeFieldEventListener = _c.removeFieldEventListener, formStateRef = _c.formStateRef, shallowFieldsStateRef = _c.shallowFieldsStateRef, updateFormState = _c.updateFormState, readFormStateRef = _c.readFormStateRef, validFieldsRef = _c.validFieldsRef, fieldsWithValidationRef = _c.fieldsWithValidationRef, fieldArrayDefaultValuesRef = _c.fieldArrayDefaultValuesRef, validateResolver = _c.validateResolver, getValues = _c.getValues, shouldUnregister = _c.shouldUnregister;
     var fieldArrayParentName = getFieldArrayParentName(name);
     var memoizedDefaultValues = React.useRef(__spread((get(fieldArrayDefaultValuesRef.current, fieldArrayParentName)
         ? get(fieldArrayDefaultValuesRef.current, name, [])
@@ -2015,7 +2038,6 @@ var useFieldArray = function (_a) {
         setFields(mapIds(memoizedDefaultValues.current, keyName));
     };
     React.useEffect(function () {
-        var e_1, _a;
         {
             if (!name) {
                 console.warn('📋 useFieldArray is missing `name` attribute. https://react-hook-form.com/api#useFieldArray');
@@ -2026,30 +2048,7 @@ var useFieldArray = function (_a) {
             defaultValues.pop();
             set(fieldArrayDefaultValuesRef.current, name, defaultValues);
         }
-        if (isWatchAllRef.current) {
-            updateFormState();
-        }
-        else if (watchFieldsRef) {
-            var shouldRenderUseWatch = true;
-            try {
-                for (var _b = __values(watchFieldsRef.current), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var watchField = _c.value;
-                    if (watchField.startsWith(name)) {
-                        updateFormState();
-                        shouldRenderUseWatch = false;
-                        break;
-                    }
-                }
-            }
-            catch (e_1_1) { e_1 = { error: e_1_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_1) throw e_1.error; }
-            }
-            shouldRenderUseWatch && renderWatchedInputs(name);
-        }
+        updateWatchedValue(name);
         if (focusIndexRef.current > -1) {
             for (var key in fieldsRef.current) {
                 var field = fieldsRef.current[key];
@@ -2105,7 +2104,7 @@ function useWatch(_a) {
                 : defaultValuesRef.current
         : defaultValue), 2), value = _c[0], setValue = _c[1];
     var idRef = React.useRef();
-    var defaultValueRef = React.useRef(value);
+    var defaultValueRef = React.useRef(defaultValue);
     var updateWatchValue = React.useCallback(function () {
         var value = watchInternal(name, defaultValueRef.current, idRef.current);
         setValue(isObject(value)