@steroidsjs/core 3.0.26 → 3.0.27

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@steroidsjs/core",
-    "version": "3.0.26",
+    "version": "3.0.27",
     "description": "",
     "author": "Vladimir Kozhin <hello@kozhindev.com>",
     "repository": {

package/utils/form.js

@@ -18,11 +18,11 @@ exports.providers = exports.clearErrors = exports.cleanEmptyObject = exports.set
 var isPlainObject_1 = __importDefault(require("lodash-es/isPlainObject"));
 var isArray_1 = __importDefault(require("lodash-es/isArray"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
+var cloneDeep_1 = __importDefault(require("lodash-es/cloneDeep"));
 var get_1 = __importDefault(require("lodash-es/get"));
-var differenceWith_1 = __importDefault(require("lodash-es/differenceWith"));
-var toPairs_1 = __importDefault(require("lodash-es/toPairs"));
-var omit_1 = __importDefault(require("lodash-es/omit"));
+var isObject_1 = __importDefault(require("lodash-es/isObject"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
+var unset_1 = __importDefault(require("lodash-es/unset"));
 var react_1 = require("react");
 var react_use_1 = require("react-use");
 var useDispatch_1 = __importDefault(require("../hooks/useDispatch"));
@@ -81,12 +81,34 @@ var cleanEmptyObject = function (object) {
 exports.cleanEmptyObject = cleanEmptyObject;
 var clearErrors = function (values, prevValues, errors, setErrors) {
     if (!(0, isEmpty_1["default"])(errors) && !(0, isEqual_1["default"])(prevValues || {}, values)) {
-        // compare arrays of key-value pairs in previous and new field objects to identify the changed field
-        var changedField = (0, differenceWith_1["default"])((0, toPairs_1["default"])(values), (0, toPairs_1["default"])(prevValues), isEqual_1["default"]);
-        if (!(0, isEmpty_1["default"])(changedField)) {
-            var cleanedErrors = (0, omit_1["default"])(errors, changedField[0]);
-            setErrors((0, isEmpty_1["default"])(cleanedErrors) ? null : cleanedErrors);
-        }
+        var cleanedErrors_1 = (0, cloneDeep_1["default"])(errors);
+        var clearFieldErrors_1 = function (errorsPath, currentValue, currentPrevValue) {
+            if (!(0, isEqual_1["default"])(currentValue, currentPrevValue)) {
+                (0, unset_1["default"])(cleanedErrors_1, errorsPath);
+            }
+        };
+        var iterateErrors_1 = function (currentErrors, currentValues, currentPrevValues, path) {
+            if (path === void 0) { path = ''; }
+            Object.keys(currentErrors).forEach(function (key) {
+                var errorValue = currentErrors[key];
+                var newPath = path
+                    ? [path, key].join('.')
+                    : key;
+                if ((0, isObject_1["default"])(errorValue)
+                    && !(0, isArray_1["default"])(errorValue)) {
+                    // Если текущее значение ошибки - объект (но не массив), рекурсивно обрабатываем его
+                    iterateErrors_1(errorValue, (0, get_1["default"])(currentValues, key, {}), (0, get_1["default"])(currentPrevValues, key, {}), newPath);
+                }
+                else {
+                    // Если текущее значение ошибки не объект, проверяем изменение значения
+                    clearFieldErrors_1(newPath, (0, get_1["default"])(currentValues, key), (0, get_1["default"])(currentPrevValues, key));
+                }
+            });
+        };
+        iterateErrors_1(errors, values, prevValues);
+        setErrors((0, isEmpty_1["default"])(cleanedErrors_1)
+            ? null
+            : cleanedErrors_1);
     }
 };
 exports.clearErrors = clearErrors;