@steroidsjs/core 2.2.25 → 2.2.28

package/actions/form.d.ts

@@ -3,6 +3,7 @@ export declare const FORM_CHANGE = "@form/change";
 export declare const FORM_RESET = "@form/reset";
 export declare const FORM_SET_ERRORS = "@form/set_errors";
 export declare const FORM_SUBMIT = "@form/submit";
+export declare const FORM_SET_SUBMITTING = "@form/set_submitting";
 export declare const FORM_ARRAY_ADD = "@form/array_add";
 export declare const FORM_ARRAY_REMOVE = "@form/array_remove";
 /**
@@ -45,6 +46,16 @@ export declare const formSubmit: (formId: any) => {
     type: string;
     formId: any;
 };
+/**
+ * Установить состояние отправки формы
+ * @param formId
+ * @param isSubmitting
+ */
+export declare const formSetSubmitting: (formId: any, isSubmitting: any) => {
+    type: string;
+    formId: any;
+    isSubmitting: any;
+};
 /**
  * Сброс данных формы к первоначальному состоянию (к initialValues)
  * @param formId

package/actions/form.js

@@ -1,11 +1,12 @@
 "use strict";
 exports.__esModule = true;
-exports.formArrayRemove = exports.formArrayAdd = exports.formReset = exports.formSubmit = exports.formSetErrors = exports.formChange = exports.formInitialize = exports.FORM_ARRAY_REMOVE = exports.FORM_ARRAY_ADD = exports.FORM_SUBMIT = exports.FORM_SET_ERRORS = exports.FORM_RESET = exports.FORM_CHANGE = exports.FORM_INITIALIZE = void 0;
+exports.formArrayRemove = exports.formArrayAdd = 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_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_SET_ERRORS = '@form/set_errors';
 exports.FORM_SUBMIT = '@form/submit';
+exports.FORM_SET_SUBMITTING = '@form/set_submitting';
 exports.FORM_ARRAY_ADD = '@form/array_add';
 exports.FORM_ARRAY_REMOVE = '@form/array_remove';
 /**
@@ -55,6 +56,17 @@ var formSubmit = function (formId) { return ({
     formId: formId
 }); };
 exports.formSubmit = formSubmit;
+/**
+ * Установить состояние отправки формы
+ * @param formId
+ * @param isSubmitting
+ */
+var formSetSubmitting = function (formId, isSubmitting) { return ({
+    type: exports.FORM_SET_SUBMITTING,
+    formId: formId,
+    isSubmitting: isSubmitting
+}); };
+exports.formSetSubmitting = formSetSubmitting;
 /**
  * Сброс данных формы к первоначальному состоянию (к initialValues)
  * @param formId

package/package.json

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

package/reducers/form.js

@@ -49,6 +49,8 @@ function reducerItem(state, action) {
             return dot_prop_immutable_1.set(state, 'errors', action.errors);
         case form_1.FORM_SUBMIT:
             return dot_prop_immutable_1.set(state, 'submitCounter', (state.submitCounter || 0) + 1);
+        case form_1.FORM_SET_SUBMITTING:
+            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_ARRAY_ADD:

package/ui/content/Calendar/Calendar.d.ts

@@ -1,9 +1,10 @@
+import { DayPickerProps } from 'react-day-picker';
 export interface ICalendarProps {
     /**
      * Значение задает выбранные в календаре дату или диапазон дат.
      * Необходимо передать валидную дату в виде строки (массива строк)
      */
-    value: string | string[];
+    value?: string | string[];
     /**
      * Формат даты отправляемый на сервер
      * @example YYYY-MM-DD
@@ -17,7 +18,7 @@ export interface ICalendarProps {
      * Свойства для компонента DayPickerInput
      * @example {dayPickerProps: {showWeekNumbers: true}}
      */
-    pickerProps?: any;
+    pickerProps?: DayPickerProps | any;
     /**
      * Переопределение view React компонента для кастомизации отображения
      * @example MyCustomView

package/ui/content/Calendar/Calendar.js

@@ -38,7 +38,7 @@ function Calendar(props) {
     var onMonthSelect = react_1.useCallback(function (newMonth) {
         setMonth(newMonth);
     }, []);
-    return components.ui.renderView(props.view || 'content.CalendarView', __assign(__assign({}, props.viewProps), { month: month,
+    return components.ui.renderView(props.view || 'content.CalendarView', __assign(__assign(__assign({}, props.viewProps), props.pickerProps), { month: month,
         toYear: toYear,
         fromYear: fromYear,
         onDaySelect: onDaySelect,

package/ui/form/Button/Button.js

@@ -123,6 +123,7 @@ function Button(props) {
         isFailed: isFailed,
         isLoading: isLoading,
         disabled: disabled,
+        submitting: submitting,
         tag: tag, formId: (context === null || context === void 0 ? void 0 : context.formId) || null, url: url || (tag === 'a' ? '#' : null), onClick: !disabled ? onClick : undefined, children: props.label || props.children }));
     if (layout) {
         return (React.createElement(FieldLayout_1["default"], { layout: layout }, button));

package/ui/form/Form/Form.js

@@ -81,6 +81,7 @@ var AutoSaveHelper_1 = __importDefault(require("./AutoSaveHelper"));
 var hooks_1 = require("../../../hooks");
 var form_1 = require("../../../utils/form");
 var validate_1 = __importDefault(require("../validate"));
+var form_2 = require("../../../actions/form");
 exports.FormContext = React.createContext({});
 var getCaptchaToken = function (params) {
     var googleCaptcha = params.googleCaptcha, siteKey = params.siteKey, _a = params.actionName, actionName = _a === void 0 ? 'submit' : _a;
@@ -163,6 +164,7 @@ function Form(props) {
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
+                        dispatch(form_2.formSetSubmitting(props.formId, true));
                         // TODO
                         if (e) {
                             e.preventDefault();
@@ -243,6 +245,7 @@ function Form(props) {
                         _c.label = 7;
                     case 7:
                         response = _a;
+                        dispatch(form_2.formSetSubmitting(props.formId, false));
                         // Skip on 2fa
                         if (response.twoFactor) {
                             return [2 /*return*/, null];
@@ -268,7 +271,7 @@ function Form(props) {
                 }
             });
         });
-    }, [components.api, components.http, components.resource, components.ui, props, setErrors, values]);
+    }, [components.api, components.http, components.resource, components.ui, props, setErrors, values, dispatch]);
     // Manual submit form by reducer action
     var prevSubmitCounter = react_use_1.usePrevious(submitCounter);
     react_use_1.useUpdateEffect(function () {