@steroidsjs/core 2.2.38 → 2.2.41

package/hooks/useForm.d.ts

@@ -2,6 +2,7 @@ export default function useForm(): {
     formId: string;
     model: any;
     prefix: string | boolean;
+    size: string;
     layout: FormLayout;
     formDispatch: any;
     formSelector: (selector: (state: any, setValue: any) => any) => any;

package/hooks/useForm.js

@@ -9,6 +9,7 @@ function useForm() {
             formId: context.formId,
             model: context.model,
             prefix: context.prefix,
+            size: context.size,
             layout: context.layout,
             formDispatch: context === null || context === void 0 ? void 0 : context.dispatch,
             formSelector: function (selector) { var _a; return (_a = context === null || context === void 0 ? void 0 : context.provider) === null || _a === void 0 ? void 0 : _a.select(context.formId, selector); }

package/package.json

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

package/ui/form/DateField/DateField.js

@@ -40,7 +40,7 @@ function DateField(props) {
         onClose: onClose,
         isOpened: isOpened,
         inputProps: inputProps,
-        calendarProps: calendarProps, size: props.size, icon: props.icon, errors: props.errors, disabled: props.disabled, className: props.className, showRemove: props.showRemove }));
+        calendarProps: calendarProps, size: props.size, icon: props.icon, errors: props.errors, label: props.label, disabled: props.disabled, className: props.className, showRemove: props.showRemove }));
 }
 DateField.defaultProps = {
     disabled: false,

package/ui/form/DateTimeField/DateTimeField.js

@@ -62,7 +62,7 @@ function DateTimeField(props) {
         onClose: onClose,
         inputProps: inputProps,
         calendarProps: calendarProps,
-        timePanelViewProps: timePanelViewProps, size: props.size, icon: props.icon, errors: props.errors, className: props.className, showRemove: props.showRemove, isInvalid: props.isInvalid, disabled: props.disabled }));
+        timePanelViewProps: timePanelViewProps, size: props.size, icon: props.icon, label: props.label, errors: props.errors, className: props.className, showRemove: props.showRemove, isInvalid: props.isInvalid, disabled: props.disabled }));
 }
 DateTimeField.defaultProps = {
     disabled: false,

package/ui/form/Field/fieldWrapper.js

@@ -128,7 +128,7 @@ function fieldWrapper(componentId, Component, optionsConfig) {
         // Resolve layout
         var layout = react_1.useMemo(function () { return form_1.mergeLayoutProp(context.layout, props.layout); }, [context.layout, props.layout]);
         if (layout !== null) {
-            return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { layout: layout, required: has_1["default"](props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : (has_1["default"](props, 'label') ? props.label : metaProps.label), hint: has_1["default"](props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, children: (React.createElement(Component.DynamicField, __assign({}, props))) }));
+            return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { layout: layout, size: props.size || context.size || null, required: has_1["default"](props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : (has_1["default"](props, 'label') ? props.label : metaProps.label), hint: has_1["default"](props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, children: (React.createElement(Component.DynamicField, __assign({}, props))) }));
         }
         return components.ui.renderView(Component.DynamicField, props);
     };

package/ui/form/FieldList/FieldList.js

@@ -85,10 +85,11 @@ function FieldList(props) {
         formId: props.formId,
         model: props.model,
         prefix: props.prefix,
+        size: props.size,
         layout: props.layout,
         provider: context.provider,
         reducer: context.reducer
-    }); }, [context.provider, context.reducer, props.formId, props.layout, props.model, props.prefix]);
+    }); }, [context.provider, context.reducer, props.formId, props.layout, props.model, props.prefix, props.size]);
     var commonProps = {
         showAdd: props.showAdd,
         showRemove: props.showRemove,

package/ui/form/FieldSet/FieldSet.js

@@ -48,10 +48,12 @@ function FieldSet(props) {
         prefix: [context.prefix, props.prefix]
             .filter(Boolean)
             .join('.'),
+        size: props.size || context.size,
         layout: form_1.mergeLayoutProp(context.layout, props.layout),
         provider: context.provider,
         reducer: context.reducer
-    }); }, [context.provider, context.reducer, props.formId, props.layout, props.model, props.prefix]);
+    }); }, [context.formId, context.layout, context.model, context.prefix, context.provider, context.reducer,
+        context.size, props.formId, props.layout, props.model, props.prefix, props.size]);
     var FieldSetView = props.view || components.ui.getView('form.FieldSetView');
     return (react_1["default"].createElement(Form_1.FormContext.Provider, { value: contextValue },
         react_1["default"].createElement(FieldSetView, __assign({ className: props.className, label: props.label }, props),

package/ui/form/Form/Form.d.ts

@@ -29,7 +29,7 @@ export interface IFormProps {
      */
     actionMethod?: string;
     /**
-     * Текст ошибки при неудачной отправке данных. По-умолчанию: "Не удалось отправить данные"
+     * Текст ошибки при неудачной отправке данных. По-умолчанию: "Ошибка сервера"
      * @example Упс, что-то пошло не так
      */
     submitErrorMessage?: string;
@@ -175,6 +175,7 @@ export interface IFormContext {
     model?: any;
     prefix?: string | boolean;
     layout?: FormLayout;
+    size?: Size;
     provider?: any;
     reducer?: {
         dispatch: React.Dispatch<any>;

package/ui/form/Form/Form.js

@@ -266,10 +266,9 @@ function Form(props) {
                         requestError_1 = _c.sent();
                         console.error(requestError_1); // eslint-disable-line no-console
                         dispatch(form_2.formSetSubmitting(props.formId, false));
-                        reduxDispatch(notifications_1.showNotification(props.submitErrorMessage || __('Не удалось отправить данные'), 'danger'));
+                        reduxDispatch(notifications_1.showNotification(props.submitErrorMessage || __('Ошибка сервера'), 'danger'));
                         return [2 /*return*/, null];
                     case 12:
-                        dispatch(form_2.formSetSubmitting(props.formId, false));
                         // Skip on 2fa
                         if (response.twoFactor) {
                             dispatch(form_2.formSetSubmitting(props.formId, false));
@@ -286,6 +285,8 @@ function Form(props) {
                             setErrors(data.errors);
                             return [2 /*return*/, null];
                         }
+                        // Clean errors
+                        setErrors(null);
                         if (props.onComplete) {
                             props.onComplete.call(null, cleanedValues, data, response);
                         }
@@ -299,7 +300,8 @@ function Form(props) {
                 }
             });
         });
-    }, [dispatch, props, values, components.ui, components.resource, components.http, components.api, reduxDispatch, setErrors]);
+    }, [dispatch, props, values, components.ui, components.resource,
+        components.http, components.api, reduxDispatch, setErrors]);
     // Manual submit form by reducer action
     var prevSubmitCounter = react_use_1.usePrevious(submitCounter);
     react_use_1.useUpdateEffect(function () {
@@ -311,11 +313,12 @@ function Form(props) {
         formId: props.formId,
         model: props.model,
         prefix: props.prefix,
+        size: props.size,
         layout: props.layout,
         provider: provider,
         reducer: reducer,
         dispatch: dispatch
-    }); }, [dispatch, props.formId, props.layout, props.model, props.prefix, provider, reducer]);
+    }); }, [dispatch, props.formId, props.layout, props.model, props.prefix, props.size, provider, reducer]);
     // Wait initialization (only for redux)
     if (values === undefined) {
         return null;

package/ui/list/List/List.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+/// <reference types="react" />
 import { IListConfig, IListOutput } from '../../../hooks/useList';
 /**
  * List
@@ -18,7 +18,7 @@ export interface IListProps extends IListConfig {
      * Переопределение view React компонента для кастомизации отображения
      * @example MyCustomView
      */
-    view?: React.ComponentType;
+    view?: CustomView;
     /**
      * Дополнительный CSS-класс для элемента отображения
      */