@steroidsjs/core 2.2.61 → 2.2.65

package/actions/form.d.ts

@@ -1,6 +1,7 @@
 export declare const FORM_INITIALIZE = "@form/initialize";
 export declare const FORM_CHANGE = "@form/change";
 export declare const FORM_RESET = "@form/reset";
+export declare const FORM_HARD_RESET = "@form/hard_reset";
 export declare const FORM_DESTROY = "@form/destroy";
 export declare const FORM_SET_ERRORS = "@form/set_errors";
 export declare const FORM_SUBMIT = "@form/submit";
@@ -65,6 +66,14 @@ export declare const formReset: (formId: any) => {
     type: string;
     formId: any;
 };
+/**
+ * Сброс данных формы, включая первоначальное состояние (initialValues)
+ * @param formId
+ */
+export declare const formHardReset: (formId: any) => {
+    type: string;
+    formId: any;
+};
 /**
  * Удаление данных формы из redux хранилища
  * @param formId

package/actions/form.js

@@ -1,9 +1,10 @@
 "use strict";
 exports.__esModule = true;
-exports.formArrayRemove = exports.formArrayAdd = exports.formDestroy = exports.formReset = exports.formSetSubmitting = exports.formSubmit = exports.formSetErrors = exports.formChange = exports.formInitialize = exports.FORM_ARRAY_REMOVE = exports.FORM_ARRAY_ADD = exports.FORM_SET_SUBMITTING = exports.FORM_SUBMIT = exports.FORM_SET_ERRORS = exports.FORM_DESTROY = exports.FORM_RESET = exports.FORM_CHANGE = exports.FORM_INITIALIZE = void 0;
+exports.formArrayRemove = exports.formArrayAdd = exports.formDestroy = exports.formHardReset = exports.formReset = exports.formSetSubmitting = exports.formSubmit = exports.formSetErrors = exports.formChange = exports.formInitialize = exports.FORM_ARRAY_REMOVE = exports.FORM_ARRAY_ADD = exports.FORM_SET_SUBMITTING = exports.FORM_SUBMIT = exports.FORM_SET_ERRORS = exports.FORM_DESTROY = exports.FORM_HARD_RESET = exports.FORM_RESET = exports.FORM_CHANGE = exports.FORM_INITIALIZE = void 0;
 exports.FORM_INITIALIZE = '@form/initialize';
 exports.FORM_CHANGE = '@form/change';
 exports.FORM_RESET = '@form/reset';
+exports.FORM_HARD_RESET = '@form/hard_reset';
 exports.FORM_DESTROY = '@form/destroy';
 exports.FORM_SET_ERRORS = '@form/set_errors';
 exports.FORM_SUBMIT = '@form/submit';
@@ -77,6 +78,15 @@ var formReset = function (formId) { return ({
     formId: formId
 }); };
 exports.formReset = formReset;
+/**
+ * Сброс данных формы, включая первоначальное состояние (initialValues)
+ * @param formId
+ */
+var formHardReset = function (formId) { return ({
+    type: exports.FORM_HARD_RESET,
+    formId: formId
+}); };
+exports.formHardReset = formHardReset;
 /**
  * Удаление данных формы из redux хранилища
  * @param formId

package/hooks/useAddressBar.js

@@ -5,6 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.queryReplace = exports.queryRestore = exports.defaultToStringConverter = exports.defaultFromStringConverter = void 0;
 var get_1 = __importDefault(require("lodash-es/get"));
+var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 var query_string_1 = __importDefault(require("query-string"));
 var connected_react_router_1 = require("connected-react-router");
 var toInteger_1 = __importDefault(require("lodash-es/toInteger"));
@@ -123,14 +124,14 @@ function useAddressBar(config) {
     var updateQuery = react_1.useCallback(function (values) {
         if (config.enable) {
             var normalizedValues = Object.keys(values).reduce(function (obj, key) {
-                if (values[key] !== undefined) {
+                if (values[key] !== undefined && !isEmpty_1["default"](values[key])) {
                     obj[key] = values[key];
                 }
                 return obj;
             }, {});
             if (!isEqual_1["default"](initialQueryRef.current, normalizedValues)) {
                 initialQueryRef.current = normalizedValues;
-                dispatch(exports.queryReplace(config.model, location, values, config.useHash));
+                dispatch(exports.queryReplace(config.model, location, normalizedValues, config.useHash));
             }
         }
     }, [config.enable, config.model, config.useHash, dispatch, location]);

package/package.json

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

package/reducers/form.js

@@ -53,6 +53,8 @@ function reducerItem(state, action) {
             return dot_prop_immutable_1.set(state, 'isSubmitting', action.isSubmitting);
         case form_1.FORM_RESET:
             return __assign(__assign({}, state), { values: cloneDeep_1["default"](state.initialValues || {}) });
+        case form_1.FORM_HARD_RESET:
+            return __assign(__assign({}, state), { initialValues: null, values: {}, errors: {}, isInvalid: false, isSubmitting: false });
         case form_1.FORM_DESTROY:
             return null;
         case form_1.FORM_ARRAY_ADD:

package/ui/modal/Modal/Modal.d.ts

@@ -25,12 +25,16 @@ export interface IModalProps {
      */
     controls?: IControlItem[];
     /**
-     * Время, через которое произойдет закрытие Modal.
-     * В этот отрезок времени должны происходить все анимации закрытия компонента.
+     * Время, в течение которого будет происходить анимация закрытия Modal.
      * Переопределяет отрезок времени, заданный в ModalPortal
      * @example 300
      */
     closeTimeoutMs?: number;
+    /**
+     * Время в миллисекундах, через которое автоматически произойдет закрытие Modal.
+     * @example 1000
+     */
+    closeAfterMs?: number;
     /**
      * Группа Modal
      * @example 'modal'

package/ui/modal/Modal/Modal.js

@@ -36,6 +36,11 @@ function Modal(props) {
     var components = hooks_1.useComponents();
     var ModalView = props.view || components.ui.getView('modal.ModalView');
     var ContentComponent = props.component;
+    React.useEffect(function () {
+        if (props.closeAfterMs) {
+            setTimeout(function () { return props.onClose(); }, props.closeAfterMs);
+        }
+    }, []);
     return (React.createElement(ModalView, __assign({}, props), (ContentComponent && (React.createElement(ContentComponent, __assign({}, props, props.componentProps)))) || (props.children)));
 }
 Modal.defaultProps = {