@steroidsjs/core 3.0.56 → 3.0.59

package/ui/form/Field/Field.js

@@ -43,6 +43,7 @@ var isString_1 = __importDefault(require("lodash-es/isString"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var hooks_1 = require("../../../hooks");
 var Form_1 = require("../Form/Form");
+var enums_1 = require("../../../enums");
 function Field(props) {
     var components = (0, hooks_1.useComponents)();
     // Get model
@@ -58,7 +59,7 @@ function Field(props) {
     var component = props.component
         || fieldModel.searchField
         || fieldModel.field
-        || 'InputField';
+        || enums_1.FieldEnum.INPUT_FIELD;
     var ComponentField = (0, isString_1["default"])(component)
         ? components.ui.getField("form.".concat(component))
         : component;

package/ui/form/Field/fieldWrapper.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="react" />
+import { FieldEnumType } from '@steroidsjs/core/enums';
 export interface IFieldWrapperInputProps {
     /**
      * Префикс, который добавится к аттрибуту (названию) поля в форме
@@ -114,5 +115,5 @@ export interface FieldWrapperComponent<T> {
     displayName: any;
     defaultProps: any;
 }
-export default function fieldWrapper<T = any>(componentId: string, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent<T>;
+export default function fieldWrapper<T = any>(componentId: FieldEnumType, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent<T>;
 export {};

package/ui/form/FieldList/FieldList.js

@@ -48,10 +48,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var react_1 = __importStar(require("react"));
 var isBoolean_1 = __importDefault(require("lodash-es/isBoolean"));
-var range_1 = __importDefault(require("lodash-es/range"));
-var concat_1 = __importDefault(require("lodash-es/concat"));
 var last_1 = __importDefault(require("lodash-es/last"));
+var range_1 = __importDefault(require("lodash-es/range"));
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
+var concat_1 = __importDefault(require("lodash-es/concat"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var react_use_1 = require("react-use");
 var hooks_1 = require("../../../hooks");
@@ -59,6 +59,7 @@ var Form_1 = require("../../form/Form/Form");
 var form_1 = require("../../../actions/form");
 var tableNavigationHandler_1 = __importStar(require("./tableNavigationHandler"));
 var fieldWrapper_1 = __importDefault(require("../../form/Field/fieldWrapper"));
+var enums_1 = require("../../../enums");
 function FieldList(props) {
     var _a;
     var components = (0, hooks_1.useComponents)();
@@ -152,4 +153,4 @@ FieldList.defaultProps = {
     initialRowsCount: 1,
     enableKeyboardNavigation: true
 };
-exports["default"] = (0, fieldWrapper_1["default"])('FieldList', FieldList, { list: true });
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.FIELD_LIST, FieldList, { list: true });

package/ui/form/FileField/FileField.js

@@ -45,6 +45,7 @@ var react_1 = __importStar(require("react"));
 var useFile_1 = __importDefault(require("../../../hooks/useFile"));
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
+var enums_1 = require("../../../enums");
 var FilesLayout;
 (function (FilesLayout) {
     FilesLayout["list"] = "list";
@@ -147,4 +148,4 @@ FileField.defaultProps = {
     },
     multiple: false
 };
-exports["default"] = (0, fieldWrapper_1["default"])('FileField', FileField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.FILE_FIELD, FileField);

package/ui/form/Form/Form.js

@@ -78,6 +78,9 @@ exports.FormContext = void 0;
 var react_1 = __importStar(require("react"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var isUndefined_1 = __importDefault(require("lodash-es/isUndefined"));
+var isNil_1 = __importDefault(require("lodash-es/isNil"));
+var isString_1 = __importDefault(require("lodash-es/isString"));
+var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 var set_1 = __importDefault(require("lodash-es/set"));
 var cloneDeep_1 = __importDefault(require("lodash-es/cloneDeep"));
 var react_use_1 = require("react-use");
@@ -88,6 +91,8 @@ var hooks_1 = require("../../../hooks");
 var form_1 = require("../../../utils/form");
 var validate_1 = __importDefault(require("../validate"));
 var form_2 = require("../../../actions/form");
+var enums_1 = require("../../../enums");
+var _isEmptyString = function (value) { return (0, isString_1["default"])(value) && (0, isEmpty_1["default"])(value); };
 exports.FormContext = react_1["default"].createContext({});
 var getCaptchaToken = function (params) {
     var googleCaptcha = params.googleCaptcha, siteKey = params.siteKey, _a = params.actionName, actionName = _a === void 0 ? 'submit' : _a;
@@ -167,7 +172,7 @@ function Form(props) {
     var onSubmit = (0, react_1.useCallback)(function (e) {
         if (e === void 0) { e = null; }
         return __awaiter(_this, void 0, void 0, function () {
-            var cleanedValues, submitResult, captchaAttribute, googleCaptcha, captchaToken, options, response, requestError_1, data;
+            var cleanedValues, registeredFields, submitResult, captchaAttribute, googleCaptcha, captchaToken, options, response, requestError_1, data;
             var _a;
             var _this = this;
             return __generator(this, function (_b) {
@@ -178,30 +183,40 @@ function Form(props) {
                             e.preventDefault();
                         }
                         cleanedValues = (0, cloneDeep_1["default"])(values);
+                        registeredFields = components.ui.getRegisteredFields(props.formId) || {};
                         // Append non touched fields to values object
-                        if (props.formId) {
-                            Object.keys(components.ui.getRegisteredFields(props.formId) || {})
-                                .forEach(function (key) {
-                                // Don't set null values for keys in empty array items
-                                var keyParts = [];
-                                var arrayKey;
-                                key.split('.').find(function (keyPart) {
-                                    if (keyParts.length > 0 && Array.isArray((0, get_1["default"])(cleanedValues, keyParts))) {
-                                        keyParts.push(keyPart);
-                                        arrayKey = keyParts.join('.');
-                                        return true;
-                                    }
+                        Object.keys(registeredFields)
+                            .forEach(function (key) {
+                            // Don't set null values for keys in empty array items
+                            var keyParts = [];
+                            var arrayKey;
+                            key.split('.').find(function (keyPart) {
+                                if (keyParts.length > 0 && Array.isArray((0, get_1["default"])(cleanedValues, keyParts))) {
                                     keyParts.push(keyPart);
-                                    return false;
-                                });
-                                if (arrayKey && !(0, get_1["default"])(cleanedValues, arrayKey)) {
-                                    return;
-                                }
-                                if ((0, isUndefined_1["default"])((0, get_1["default"])(cleanedValues, key))) {
-                                    (0, set_1["default"])(cleanedValues, key, null);
+                                    arrayKey = keyParts.join('.');
+                                    return true;
                                 }
+                                keyParts.push(keyPart);
+                                return false;
                             });
-                        }
+                            if (arrayKey && !(0, get_1["default"])(cleanedValues, arrayKey)) {
+                                return;
+                            }
+                            if ((0, isUndefined_1["default"])((0, get_1["default"])(cleanedValues, key))) {
+                                (0, set_1["default"])(cleanedValues, key, null);
+                            }
+                        });
+                        // Convert NumberField values to Number
+                        Object.entries(registeredFields).forEach(function (_a) {
+                            var key = _a[0], fieldType = _a[1];
+                            if (fieldType === enums_1.FieldEnum.NUMBER_FIELD) {
+                                var value = (0, get_1["default"])(cleanedValues, key);
+                                if ((0, isNil_1["default"])(value) || _isEmptyString(value)) {
+                                    return;
+                                }
+                                (0, set_1["default"])(cleanedValues, key, Number(value));
+                            }
+                        });
                         // Clean
                         cleanedValues = (0, form_1.cleanEmptyObject)(cleanedValues);
                         // Event onBeforeSubmit
@@ -222,7 +237,7 @@ function Form(props) {
                         captchaAttribute = null;
                         Object.entries(components.ui.getRegisteredFields(props.formId) || {}).forEach(function (_a) {
                             var attribute = _a[0], fieldType = _a[1];
-                            if (fieldType === 'ReCaptchaField') {
+                            if (fieldType === enums_1.FieldEnum.RE_CAPTCHA_FIELD) {
                                 captchaAttribute = attribute;
                             }
                         });

package/ui/form/HtmlField/HtmlField.js

@@ -7,6 +7,7 @@ var react_1 = require("react");
 var merge_1 = __importDefault(require("lodash-es/merge"));
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
+var enums_1 = require("../../../enums");
 function HtmlField(props) {
     var components = (0, hooks_1.useComponents)();
     var onFocus = (0, react_1.useCallback)(function (event) {
@@ -51,4 +52,4 @@ HtmlField.defaultProps = {
     disabled: false,
     className: ''
 };
-exports["default"] = (0, fieldWrapper_1["default"])('HtmlField', HtmlField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.HTML_FIELD, HtmlField);

package/ui/form/ImageField/ImageField.js

@@ -49,6 +49,7 @@ var useDispatch_1 = __importDefault(require("../../../hooks/useDispatch"));
 var useFile_1 = __importDefault(require("../../../hooks/useFile"));
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var modal_1 = require("../../../actions/modal");
+var enums_1 = require("../../../enums");
 function ImageField(props) {
     var _a;
     var components = (0, hooks_1.useComponents)();
@@ -155,4 +156,4 @@ ImageField.defaultProps = {
         outline: true
     }
 };
-exports["default"] = (0, fieldWrapper_1["default"])('ImageField', ImageField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.IMAGE_FIELD, ImageField);

package/ui/form/InputField/InputField.js

@@ -56,6 +56,7 @@ var kit_1 = require("@maskito/kit");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var hooks_1 = require("../../../hooks");
 var useInputFieldWarningByType_1 = require("./hooks/useInputFieldWarningByType");
+var enums_1 = require("../../../enums");
 exports.MASK_PRESETS = {
     date: (0, kit_1.maskitoDateOptionsGenerator)({
         mode: 'dd/mm/yyyy'
@@ -149,4 +150,4 @@ InputField.defaultProps = {
     showClear: false,
     maskOptions: null
 };
-exports["default"] = (0, fieldWrapper_1["default"])('InputField', InputField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.INPUT_FIELD, InputField);

package/ui/form/InputField/hooks/useInputFieldWarningByType.js

@@ -5,23 +5,25 @@ exports.useInputFieldWarningByType = exports.INPUT_TYPES_SUPPORTED_SELECTION = v
 /* eslint-disable max-len */
 /* eslint-disable no-unused-expressions */
 var react_use_1 = require("react-use");
+var enums_1 = require("../../../../enums");
 exports.INPUT_TYPES_SUPPORTED_SELECTION = ['text', 'search', 'tel', 'url', 'password'];
+var BUTTON_COMPONENT = 'Button';
 var INPUT_TYPES_REPLACEMENT_HASH = {
-    email: 'EmailField',
-    date: 'DateField',
-    month: 'DateField',
+    email: enums_1.FieldEnum.EMAIL_FIELD,
+    date: enums_1.FieldEnum.DATE_FIELD,
+    month: enums_1.FieldEnum.DATE_FIELD,
     week: 'CalendarSystem',
-    time: 'DateTimeField',
-    'datetime-local': 'DateField',
-    number: 'NumberField',
-    range: 'SliderField',
-    checkbox: 'CheckboxField',
-    radio: 'RadioField',
-    button: 'Button',
-    file: 'FileField',
-    submit: 'Button',
-    image: 'Button',
-    reset: 'Button'
+    time: enums_1.FieldEnum.DATE_TIME_FIELD,
+    'datetime-local': enums_1.FieldEnum.DATE_FIELD,
+    number: enums_1.FieldEnum.NUMBER_FIELD,
+    range: enums_1.FieldEnum.SLIDER_FIELD,
+    checkbox: enums_1.FieldEnum.CHECKBOX_FIELD,
+    radio: enums_1.FieldEnum.PASSWORD_FIELD,
+    button: BUTTON_COMPONENT,
+    file: enums_1.FieldEnum.FILE_FIELD,
+    submit: BUTTON_COMPONENT,
+    image: BUTTON_COMPONENT,
+    reset: BUTTON_COMPONENT
 };
 var useInputFieldWarningByType = function (type) {
     (0, react_use_1.useMount)(function () {

package/ui/form/NavField/NavField.js

@@ -41,6 +41,7 @@ var react_1 = __importStar(require("react"));
 var Nav_1 = __importDefault(require("../../nav/Nav/Nav"));
 var fieldWrapper_1 = __importDefault(require("../../form/Field/fieldWrapper"));
 var hooks_1 = require("../../../hooks");
+var enums_1 = require("../../../enums");
 function NavField(props) {
     var items = (0, hooks_1.useDataProvider)({
         items: props.items
@@ -62,4 +63,4 @@ NavField.defaultProps = {
         layout: 'button'
     }
 };
-exports["default"] = (0, fieldWrapper_1["default"])('NavField', NavField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.NAV_FIELD, NavField);

package/ui/form/NumberField/NumberField.js

@@ -42,6 +42,7 @@ var react_1 = __importStar(require("react"));
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var useInputTypeNumber_1 = __importDefault(require("./hooks/useInputTypeNumber"));
+var enums_1 = require("../../../enums");
 var DEFAULT_STEP = 1;
 function NumberField(props) {
     var _a;
@@ -69,26 +70,16 @@ function NumberField(props) {
         else {
             newValue = fixToDecimal(currentValue - step);
         }
-        onChange(null, String(newValue));
-    }, [currentInputRef, onChange, props.decimal, step]);
-    var onStepUp = (0, react_1.useCallback)(function () {
-        if (!(Number(currentInputRef.current.value) + step > props.max)) {
-            onStep(true);
-        }
-    }, [currentInputRef, onStep, props.max, step]);
-    var onStepDown = (0, react_1.useCallback)(function () {
-        if (!(Number(currentInputRef.current.value) - step < props.min)) {
-            onStep(false);
-        }
-    }, [currentInputRef, onStep, props.min, step]);
+        onInputChange(null, String(newValue));
+    }, [currentInputRef, onInputChange, props.decimal, step]);
     var onKeyDown = (0, react_1.useCallback)(function (event) {
         if (event.key === 'ArrowUp') {
-            onStepUp();
+            onStep(true);
         }
         else if (event.key === 'ArrowDown') {
-            onStepDown();
+            onStep(false);
         }
-    }, [onStepDown, onStepUp]);
+    }, [onStep]);
     var inputProps = (0, react_1.useMemo)(function () {
         var _a;
         return (__assign(__assign({}, props.inputProps), { name: props.input.name, value: (_a = props.input.value) !== null && _a !== void 0 ? _a : '', onChange: onInputChange, type: 'text', min: props.min, max: props.max, step: props.step, placeholder: props.placeholder, disabled: props.disabled, autoComplete: 'off', onKeyDown: onKeyDown }));
@@ -96,8 +87,8 @@ function NumberField(props) {
     var viewProps = (0, react_1.useMemo)(function () { return ({
         viewProps: props.viewProps,
         inputProps: inputProps,
-        onStepUp: onStepUp,
-        onStepDown: onStepDown,
+        onStepUp: function () { return onStep(true); },
+        onStepDown: function () { return onStep(false); },
         input: props.input,
         inputRef: currentInputRef,
         size: props.size,
@@ -105,7 +96,7 @@ function NumberField(props) {
         className: props.className,
         disabled: props.disabled,
         id: props.id
-    }); }, [currentInputRef, inputProps, onStepDown, onStepUp, props]);
+    }); }, [currentInputRef, inputProps, onStep, props.className, props.disabled, props.errors, props.id, props.input, props.size, props.viewProps]);
     return components.ui.renderView(props.view || 'form.NumberFieldView', viewProps);
 }
 NumberField.defaultProps = {
@@ -113,4 +104,4 @@ NumberField.defaultProps = {
     required: false,
     isCanBeNegative: true
 };
-exports["default"] = (0, fieldWrapper_1["default"])('NumberField', NumberField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.NUMBER_FIELD, NumberField);

package/ui/form/NumberField/hooks/useInputTypeNumber.d.ts

@@ -6,6 +6,6 @@ interface IInputTypeNumberProps {
     required?: boolean;
 }
 declare const useInputTypeNumber: (currentInputRef: React.MutableRefObject<HTMLInputElement>, inputTypeNumberProps: IInputTypeNumberProps, onChange: (event: React.ChangeEvent<HTMLInputElement>, value?: any) => void, decimal: number, isCanBeNegative?: boolean) => {
-    onInputChange: (event: React.ChangeEvent<HTMLInputElement>) => void;
+    onInputChange: (event: React.ChangeEvent<HTMLInputElement>, newValue?: string) => void;
 };
 export default useInputTypeNumber;

package/ui/form/NumberField/hooks/useInputTypeNumber.js

@@ -46,11 +46,20 @@ var useInputTypeNumber = function (currentInputRef, inputTypeNumberProps, onChan
             : new RegExp('^\\d+$');
         return decimal ? numericFloatRegExp.test(value) : numericRegExp.test(value);
     };
-    var onInputChange = function (event) {
+    var onInputChange = function (event, newValue) {
         var _a;
-        var value = (_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value;
+        var value = newValue || ((_a = event === null || event === void 0 ? void 0 : event.target) === null || _a === void 0 ? void 0 : _a.value);
         if (isValueNumeric(value)) {
-            onChange(event);
+            if (value !== '') {
+                var numericValue = Number(value);
+                if (numericValue > inputTypeNumberProps.max) {
+                    value = inputTypeNumberProps.max;
+                }
+                else if (numericValue < inputTypeNumberProps.min) {
+                    value = inputTypeNumberProps.min;
+                }
+            }
+            onChange(event, value);
         }
     };
     return {

package/ui/form/PasswordField/PasswordField.js

@@ -17,6 +17,7 @@ exports.__esModule = true;
 exports.checkPassword = exports.InputType = void 0;
 /* eslint-disable no-unused-expressions */
 var react_1 = require("react");
+var enums_1 = require("../../../enums");
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
 var InputType;
@@ -94,4 +95,4 @@ PasswordField.defaultProps = {
     showSecurityIcon: true,
     required: false
 };
-exports["default"] = (0, fieldWrapper_1["default"])('PasswordField', PasswordField);
+exports["default"] = (0, fieldWrapper_1["default"])(enums_1.FieldEnum.PASSWORD_FIELD, PasswordField);

package/ui/form/RadioField/RadioField.d.ts

@@ -1,31 +1,8 @@
-import React from 'react';
-import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
+/// <reference types="react" />
+import { ICheckboxFieldProps } from '../CheckboxField/CheckboxField';
 /**
  * RadioField
  *
  * Компонент RadioField представляет собой элемент выбора типа "radio". Он позволяет пользователю выбрать один вариант из нескольких предложенных.
  **/
-export interface IRadioFieldProps extends IFieldWrapperInputProps, IUiComponent {
-    /**
-     * Свойства для элемента input
-     * @example {onKeyDown: ...}
-     */
-    inputProps?: any;
-    /**
-     * Флаг определяющий включен ли элемент
-     * @example {'true'}
-     */
-    checked?: boolean;
-    [key: string]: any;
-}
-export interface IRadioFieldViewProps extends IRadioFieldProps, IFieldWrapperOutputProps {
-    inputProps: {
-        name: string;
-        type: string;
-        checked: boolean;
-        onChange: (value: string | React.ChangeEvent) => void;
-        disabled: boolean;
-    };
-}
-declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IRadioFieldProps>;
-export default _default;
+export default function RadioField(props: ICheckboxFieldProps): JSX.Element;

package/ui/form/RadioField/RadioField.js

@@ -10,62 +10,18 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var react_1 = __importStar(require("react"));
-var hooks_1 = require("../../../hooks");
-var fieldWrapper_1 = __importDefault(require("../Field/fieldWrapper"));
+var react_1 = __importDefault(require("react"));
+var CheckboxField_1 = __importDefault(require("../CheckboxField/CheckboxField"));
+/**
+ * RadioField
+ *
+ * Компонент RadioField представляет собой элемент выбора типа "radio". Он позволяет пользователю выбрать один вариант из нескольких предложенных.
+ **/
 function RadioField(props) {
-    var components = (0, hooks_1.useComponents)();
-    var onChangeHandler = react_1["default"].useCallback(function () {
-        props.input.onChange(!props.input.value);
-        if (props.onChange) {
-            props.onChange();
-        }
-    }, [props]);
-    var inputProps = react_1["default"].useMemo(function () { return (__assign({ name: props.input.name, type: 'radio', checked: !!props.input.value, onChange: onChangeHandler, disabled: props.disabled }, props.inputProps)); }, [onChangeHandler, props.disabled, props.input.name, props.input.value, props.inputProps]);
-    var viewProps = (0, react_1.useMemo)(function () { return ({
-        inputProps: inputProps,
-        errors: props.errors,
-        size: props.size,
-        className: props.className,
-        onChange: props.onChange,
-        checked: props.checked,
-        disabled: props.disabled,
-        required: props.required,
-        label: props.label
-    }); }, [inputProps, props.checked, props.className, props.disabled, props.errors, props.label, props.onChange, props.required, props.size]);
-    return components.ui.renderView(props.view || 'form.RadioFieldView', viewProps);
+    return (react_1["default"].createElement(CheckboxField_1["default"], __assign({ multiply: false, view: "form.RadioFieldView" }, props)));
 }
-RadioField.defaultProps = {
-    disabled: false,
-    required: false,
-    className: '',
-    inputProps: {}
-};
-exports["default"] = (0, fieldWrapper_1["default"])('RadioField', RadioField);
+exports["default"] = RadioField;

package/ui/form/RadioListField/RadioListField.d.ts

@@ -1,46 +1,7 @@
-import React from 'react';
-import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../../form/Field/fieldWrapper';
-import { IDataProviderConfig } from '../../../hooks/useDataProvider';
-import { IDataSelectConfig } from '../../../hooks/useDataSelect';
-import { IRadioFieldViewProps } from '../RadioField/RadioField';
+/// <reference types="react" />
+import { ICheckboxListFieldProps } from '../CheckboxListField/CheckboxListField';
 /**
  * RadioListField
  * Список с радиокнопками. Используется в формах для выбора одного значения.
  */
-export interface IRadioListFieldProps extends IFieldWrapperInputProps, IDataProviderConfig, Omit<IDataSelectConfig, 'items'>, IUiComponent {
-    /**
-     * Свойства для элемента input
-     * @example {onKeyDown: ...}
-     */
-    inputProps?: any;
-    /**
-     * Ориентация списка
-     */
-    orientation?: Orientation;
-}
-export interface IRadioListFieldViewProps extends IFieldWrapperOutputProps {
-    inputProps: {
-        name: string;
-        type: string;
-        disabled?: boolean;
-        onChange: (value: string | React.ChangeEvent) => void;
-    };
-    items: {
-        id: number | string | boolean;
-        label?: string;
-        disabled?: boolean;
-        isSelected: boolean;
-        isHovered: boolean;
-        required?: boolean;
-        size?: Size;
-    }[];
-    selectedIds: (PrimaryKey | any)[];
-    className?: CssClassName;
-    orientation?: Orientation;
-    disabled?: boolean;
-    size?: Size;
-    onItemSelect: (id: PrimaryKey | any) => void;
-    renderRadio: (radioProps: IRadioFieldViewProps) => JSX.Element;
-}
-declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IRadioListFieldProps>;
-export default _default;
+export default function RadioListField(props: ICheckboxListFieldProps): JSX.Element;

package/ui/form/RadioListField/RadioListField.js

@@ -10,92 +10,17 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var react_1 = __importStar(require("react"));
-var react_use_1 = require("react-use");
-var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
-var hooks_1 = require("../../../hooks");
-var fieldWrapper_1 = __importDefault(require("../../form/Field/fieldWrapper"));
+var react_1 = __importDefault(require("react"));
+var CheckboxListField_1 = __importDefault(require("../CheckboxListField/CheckboxListField"));
+/**
+ * RadioListField
+ * Список с радиокнопками. Используется в формах для выбора одного значения.
+ */
 function RadioListField(props) {
-    var components = (0, hooks_1.useComponents)();
-    var inputSelectedIds = (0, react_1.useMemo)(function () { return props.selectedIds || [].concat(props.input.value || []); }, [props.input.value, props.selectedIds]);
-    // Data provider
-    var items = (0, hooks_1.useDataProvider)({
-        items: props.items,
-        initialSelectedIds: inputSelectedIds,
-        dataProvider: props.dataProvider
-    }).items;
-    // Data select
-    var _a = (0, hooks_1.useDataSelect)({
-        multiple: props.multiple,
-        selectedIds: inputSelectedIds,
-        selectFirst: props.selectFirst,
-        primaryKey: props.primaryKey,
-        items: items,
-        inputValue: props.input.value
-    }), selectedIds = _a.selectedIds, setSelectedIds = _a.setSelectedIds;
-    var onItemSelect = (0, react_1.useCallback)(function (id) {
-        setSelectedIds(id);
-    }, [setSelectedIds]);
-    var inputProps = (0, react_1.useMemo)(function () { return (__assign(__assign({}, props.inputProps), { type: 'radio', name: props.input.name, disabled: props.disabled, onChange: function (value) { return props.input.onChange(value); } })); }, [props.disabled, props.input, props.inputProps]);
-    // Sync with form
-    var prevSelectedIds = (0, react_use_1.usePrevious)(selectedIds);
-    (0, react_1.useEffect)(function () {
-        if (!(0, isEqual_1["default"])(prevSelectedIds || [], selectedIds)) {
-            props.input.onChange.call(null, selectedIds[0]);
-            if (props.onChange) {
-                props.onChange.call(null, selectedIds[0]);
-            }
-        }
-        // eslint-disable-next-line react-hooks/exhaustive-deps
-    }, [props.input.onChange, selectedIds]);
-    var RadioFieldView = components.ui.getView('form.RadioFieldView');
-    var renderRadio = (0, react_1.useCallback)(function (radioProps) { return react_1["default"].createElement(RadioFieldView, __assign({}, radioProps)); }, [RadioFieldView]);
-    var viewProps = (0, react_1.useMemo)(function () { return ({
-        items: items,
-        inputProps: inputProps,
-        onItemSelect: onItemSelect,
-        selectedIds: selectedIds,
-        renderRadio: renderRadio,
-        orientation: props.orientation,
-        className: props.className,
-        disabled: props.disabled,
-        size: props.size
-    }); }, [inputProps, items, onItemSelect, props.className, props.disabled, props.orientation, props.size, renderRadio, selectedIds]);
-    return components.ui.renderView(props.view || 'form.RadioListFieldView', viewProps);
+    return (react_1["default"].createElement(CheckboxListField_1["default"], __assign({ multiple: false, view: 'form.RadioListFieldView' }, props)));
 }
-RadioListField.defaultProps = {
-    disabled: false,
-    required: false,
-    className: '',
-    multiple: false,
-    errors: null,
-    orientation: 'vertical'
-};
-exports["default"] = (0, fieldWrapper_1["default"])('RadioListField', RadioListField);
+exports["default"] = RadioListField;