@steroidsjs/core 3.0.26 → 3.0.28

package/docs-autogen-result.json

@@ -19027,6 +19027,24 @@
                             "example": null
                         }
                     ]
+                },
+                {
+                    "name": "onClose",
+                    "decorators": [],
+                    "description": "Callback-функция, которая вызывается при закрытии DropDown",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": [
+                        {
+                            "name": "selectedIds",
+                            "decorators": [],
+                            "description": "",
+                            "required": true,
+                            "type": "PrimaryKey[]",
+                            "example": null
+                        }
+                    ]
                 }
             ]
         },
@@ -19445,6 +19463,24 @@
                         }
                     ]
                 },
+                {
+                    "name": "onClose",
+                    "decorators": [],
+                    "description": "Callback-функция, которая вызывается при закрытии DropDown",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": [
+                        {
+                            "name": "selectedIds",
+                            "decorators": [],
+                            "description": "",
+                            "required": true,
+                            "type": "PrimaryKey[]",
+                            "example": null
+                        }
+                    ]
+                },
                 {
                     "name": "onItemRemove",
                     "decorators": [],
@@ -20663,6 +20699,15 @@
                 }
             ],
             "methods": [
+                {
+                    "name": "onAdd",
+                    "decorators": [],
+                    "description": "",
+                    "required": false,
+                    "type": "void",
+                    "example": null,
+                    "parameters": []
+                },
                 {
                     "name": "onRemove",
                     "decorators": [],

package/package.json

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

package/ui/form/DropDownField/DropDownField.d.ts

@@ -130,6 +130,10 @@ export interface IDropDownFieldProps extends IFieldWrapperInputProps, Omit<IData
      * Кастомная вьюшка для элемента
      */
     itemView?: CustomView;
+    /**
+     * Callback-функция, которая вызывается при закрытии DropDown
+     */
+    onClose?: (selectedIds: PrimaryKey[]) => void;
     [key: string]: any;
 }
 export interface IDropDownFieldViewProps extends IDropDownFieldProps {

package/ui/form/DropDownField/DropDownField.js

@@ -135,9 +135,14 @@ function DropDownField(props) {
         setSelectedIds([]);
     }, [setSelectedIds]);
     var onClose = (0, react_1.useCallback)(function () {
-        setIsFocused(false);
-        setIsOpened(false);
-    }, [setIsFocused, setIsOpened]);
+        if (isOpened) {
+            setIsFocused(false);
+            setIsOpened(false);
+            if (props.onClose) {
+                props.onClose(selectedIds);
+            }
+        }
+    }, [isOpened, props, selectedIds, setIsFocused, setIsOpened]);
     // Outside click -> close
     var forwardedRef = (0, react_1.useRef)(null);
     if (process.env.PLATFORM !== 'mobile') {

package/ui/form/FieldList/FieldList.d.ts

@@ -136,6 +136,7 @@ export interface IFieldListItemViewProps extends IFieldWrapperOutputProps {
     required?: boolean;
     rowIndex: number;
     showRemove: boolean;
+    onAdd?: () => void;
 }
 declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IFieldListProps>;
 export default _default;

package/ui/form/FieldList/FieldList.js

@@ -131,9 +131,10 @@ function FieldList(props) {
         required: props.required,
         className: props.className,
         tableClassName: props.tableClassName,
-        items: items
-    }); }, [items, props.className, props.disabled, props.required, props.showAdd, props.showRemove, props.size, props.tableClassName]);
-    var viewProps = (0, react_1.useMemo)(function () { return (__assign(__assign(__assign({}, commonProps), props.viewProps), { forwardedRef: nodeRef, onAdd: onAdd, hasAlternatingColors: props.hasAlternatingColors, style: props.style, children: props.children })); }, [commonProps, onAdd, props.children, props.hasAlternatingColors, props.style, props.viewProps]);
+        items: items,
+        onAdd: onAdd
+    }); }, [items, onAdd, props.className, props.disabled, props.required, props.showAdd, props.showRemove, props.size, props.tableClassName]);
+    var viewProps = (0, react_1.useMemo)(function () { return (__assign(__assign(__assign({}, commonProps), props.viewProps), { forwardedRef: nodeRef, hasAlternatingColors: props.hasAlternatingColors, style: props.style, children: props.children })); }, [commonProps, props.children, props.hasAlternatingColors, props.style, props.viewProps]);
     var itemViewProps = (0, react_1.useMemo)(function () { return (__assign(__assign(__assign({}, commonProps), props.itemViewProps), { onRemove: onRemove })); }, [commonProps, onRemove, props.itemViewProps]);
     var FieldListView = props.view || components.ui.getView('form.FieldListView');
     var FieldListItemView = props.itemView || components.ui.getView('form.FieldListItemView');

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;