@steroidsjs/core 2.1.0-beta.28 → 2.1.0-beta.32

package/hooks/useDataProvider.d.ts

@@ -22,6 +22,7 @@ export declare type DataProviderItems = string | ({
 }) | (string | number | {
     id: string | number | boolean;
     label: string | any;
+    [key: string]: any;
 })[];
 export interface IDataProviderConfig {
     /**

package/hooks/useDataProvider.js

@@ -54,11 +54,11 @@ var react_redux_1 = require("react-redux");
 var isString_1 = __importDefault(require("lodash-es/isString"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var react_1 = require("react");
+var react_use_1 = require("react-use");
 var data_1 = require("../utils/data");
 var index_1 = require("./index");
 var fields_1 = require("../reducers/fields");
 var text_1 = require("../utils/text");
-var react_use_1 = require("react-use");
 var defaultProps = {
     autoComplete: {
         enable: false,
@@ -137,8 +137,8 @@ function useDataProvider(config) {
                 delayTimerRef.current = setTimeout(fetchRemote, autoComplete.delay);
             }
         }
-    }, [autoComplete, components.api, components.http, config.autoFetch, config.dataProvider, config.query,
-        dataProvider, dataProvider.action, dataProvider.onSearch, sourceItems]);
+    }, [autoComplete, components.api, components.http, config.autoFetch, config.dataProvider,
+        config.query, dataProvider, dataProvider.action, dataProvider.onSearch, prevQuery, sourceItems]);
     return {
         sourceItems: sourceItems,
         items: items,

package/hooks/useDataSelect.d.ts

@@ -13,7 +13,7 @@ export interface IDataSelectConfig {
      * Список с видимыми элементами
      * @example [{id: 1, label: 'Krasnoyarsk'}, {id: 2, label: 'Moscow'}]
      */
-    items: IDataSelectItem[];
+    items?: IDataSelectItem[];
     /**
      * Сделать активным первый элемент в списке
      * @example true
@@ -23,7 +23,7 @@ export interface IDataSelectConfig {
      * Список с идентификаторами выбранных элементов
      * @example [1, 4]
      */
-    selectedIds: any;
+    selectedIds?: any;
     /**
      * Первичный ключ для item
      * @example id
@@ -32,7 +32,7 @@ export interface IDataSelectConfig {
     /**
      * Значение поля в форме
      */
-    inputValue: any;
+    inputValue?: any;
     /**
      *  Список со всеми элементами
      */

package/hooks/useDataSelect.js

@@ -51,7 +51,7 @@ function useDataSelect(config) {
             if (!config.multiple && ids.length > 1) {
                 ids = [ids[0]];
             }
-            setSelectedIdsInternal(ids);
+            setSelectedIdsInternal(ids.sort());
         }
         else {
             var id_1 = ids;
@@ -61,11 +61,11 @@ function useDataSelect(config) {
             else if (config.multiple) {
                 if (selectedIds.indexOf(id_1) !== -1) {
                     if (!skipToggle) {
-                        setSelectedIdsInternal(selectedIds.filter(function (itemValue) { return itemValue !== id_1; }));
+                        setSelectedIdsInternal(selectedIds.filter(function (itemValue) { return itemValue !== id_1; }).sort());
                     }
                 }
                 else {
-                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds), [id_1]));
+                    setSelectedIdsInternal(__spreadArray(__spreadArray([], selectedIds), [id_1]).sort());
                 }
             }
             else {
@@ -119,16 +119,19 @@ function useDataSelect(config) {
                 newSelectedIds.push(selectedItem.id);
             }
         });
-        if (!isEqual_1["default"](prevConfigSelectedIds, newSelectedIds) && newSelectedIds.length !== 0) {
+        if (!isEqual_1["default"](prevConfigSelectedIds.sort(), newSelectedIds.sort())
+            && !isEqual_1["default"](selectedIds.sort(), newSelectedIds.sort()) && newSelectedIds.length !== 0) {
             setSelectedIdsInternal(newSelectedIds);
         }
-    }, [config.items, config.selectedIds, primaryKey, prevConfigSelectedIds, selectedItems, config.sourceItems]);
+    }, [config.items, config.selectedIds, primaryKey, prevConfigSelectedIds,
+        selectedItems, config.sourceItems, selectedIds]);
     // Global key down handler for navigate on items
     // Support keys:
     // - tab
     // - esc
     // - enter
     // - up/down arrows
+    // - space
     var onKeyDown = react_1.useCallback(function (e) {
         // Skip no active
         if (!isFocused && !isOpened) {
@@ -138,9 +141,8 @@ function useDataSelect(config) {
         if ([9, 27].includes(e.which)) {
             e.preventDefault();
             setIsOpened(false);
-            return;
         }
-        // Keys: enter
+        // Keys: enter (select and close)
         if (e.which === 13 && isOpened) {
             e.preventDefault();
             if (hoveredId) {
@@ -155,6 +157,15 @@ function useDataSelect(config) {
                 // Select first result
                 setSelectedIds(config.items[0], true);
             }
+            setIsOpened(false);
+        }
+        // Keys: space (toggle select)
+        if (e.which === 32 && isOpened) {
+            e.preventDefault();
+            if (hoveredId) {
+                // Select hovered
+                setSelectedIds(hoveredId);
+            }
         }
         // Keys: arrow up, arrow down
         if ([38, 40].includes(e.which)) {

package/hooks/useDispatch.d.ts

@@ -1 +1 @@
-export default function useDispatch(): import("redux").Dispatch<any>;
+export default function useDispatch(): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@steroidsjs/core",
-  "version": "2.1.0-beta.28",
+  "version": "2.1.0-beta.32",
   "description": "",
   "author": "Vladimir Kozhin <hello@kozhindev.com>",
   "repository": {
@@ -46,7 +46,7 @@
     "react-helmet": "^6.1.0",
     "react-image-crop": "^9.0.2",
     "react-input-mask": "^3.0.0-alpha.2",
-    "react-redux": "^7.1.1",
+    "react-redux": "7.1.1",
     "react-router": "^5.2.0",
     "react-router-dom": "^5.2.0",
     "react-use": "^17.1.0",

package/ui/form/AutoCompleteField/AutoCompleteField.d.ts

@@ -35,10 +35,5 @@ export interface IAutoCompleteFieldViewProps extends Omit<IAutoCompleteFieldProp
     onItemSelect: (id: PrimaryKey | any) => void;
     onItemHover: (id: PrimaryKey | any) => void;
 }
-declare const _default: {
-    (props: import("../../../ui/form/Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../../ui/form/Field/fieldWrapper").FieldWrapperComponent<IAutoCompleteFieldProps>;
 export default _default;

package/ui/form/BlankField/BlankField.d.ts

@@ -4,10 +4,5 @@ export interface IBlankFieldProps extends IFieldWrapperInputProps {
     text?: string | React.ReactNode;
     children?: React.ReactNode;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IBlankFieldProps>;
 export default _default;

package/ui/form/CheckboxField/CheckboxField.d.ts

@@ -30,10 +30,5 @@ export interface ICheckboxFieldViewProps extends ICheckboxFieldProps, IFieldWrap
         disabled: boolean;
     };
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<ICheckboxFieldProps>;
 export default _default;

package/ui/form/CheckboxListField/CheckboxListField.d.ts

@@ -40,10 +40,5 @@ export interface ICheckboxListFieldViewProps extends IFieldWrapperOutputProps {
     onItemSelect: (id: PrimaryKey | any) => void;
     onItemHover: (id: PrimaryKey | any) => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../../ui/form/Field/fieldWrapper").FieldWrapperComponent<ICheckboxListFieldProps>;
 export default _default;

package/ui/form/DateField/DateField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ICalendarProps } from '../../content/Calendar/Calendar';
 import { IDateInputStateInput, IDateInputStateOutput } from './useDateInputState';
 export interface IDateFieldProps extends IDateInputStateInput {
@@ -29,10 +28,5 @@ export interface IDateFieldProps extends IDateInputStateInput {
 export interface IDateFieldViewProps extends IDateInputStateOutput, Pick<IDateFieldProps, 'size' | 'icon' | 'errors' | 'showRemove' | 'className' | 'calendarProps'> {
     [key: string]: any;
 }
-declare const _default: {
-    (props: import("../../form/Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDateFieldProps>;
 export default _default;

package/ui/form/DateField/useDateTime.js

@@ -18,11 +18,11 @@ function useDateTime(props) {
     // Handler for calendar and time picker changes
     var onDateSelect = react_1.useCallback(function (date) {
         var result = date + props.dateTimeSeparator + (timeValue || '00:00');
-        props.input.onChange.call(null, calendar_1.convertDate(result, props.valueFormat, props.valueFormat, true));
+        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, true));
     }, [props.dateTimeSeparator, props.input.onChange, props.valueFormat, timeValue]);
     var onTimeSelect = react_1.useCallback(function (time) {
         var result = (dateValue || moment_1["default"]().format(dateValueFormat)) + props.dateTimeSeparator + time;
-        props.input.onChange.call(null, calendar_1.convertDate(result, props.valueFormat, props.valueFormat, true));
+        props.input.onChange.call(null, calendar_1.convertDate(result, [props.valueFormat, 'YYYY-MM-DD HH:mm'], props.valueFormat, true));
     }, [dateValue, dateValueFormat, props.dateTimeSeparator, props.input.onChange, props.valueFormat]);
     return {
         dateValue: dateValue,

package/ui/form/DateRangeField/DateRangeField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ICalendarProps } from '../../content/Calendar/Calendar';
 import { IDateInputStateInput, IDateInputStateOutput } from '../DateField/useDateInputState';
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../../form/Field/fieldWrapper';
@@ -80,10 +79,5 @@ export interface IDateRangeFieldViewProps extends IDateInputStateOutput, Omit<IF
     errorsFrom?: string[];
     errorsTo?: string[];
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDateRangeFieldProps>;
 export default _default;

package/ui/form/DateRangeField/DateRangeField.js

@@ -71,7 +71,8 @@ function DateRangeField(props) {
         valueFormat: props.valueFormat,
         numberOfMonths: 2,
         showFooter: false
-    }); }, [focus, props.inputFrom.onChange, props.inputFrom.value, props.inputTo.onChange, props.inputTo.value, props.valueFormat]);
+    }); }, [focus, props.inputFrom.onChange, props.inputFrom.value, props.inputTo.onChange,
+        props.inputTo.value, props.valueFormat]);
     return components.ui.renderView(props.view || 'form.DateRangeFieldView', __assign(__assign({}, props.viewProps), { onClear: onClear,
         onClose: onClose,
         calendarProps: calendarProps, icon: props.icon, size: props.size, errorsTo: props.errorsTo, disabled: props.disabled, noBorder: props.noBorder, className: props.className, showRemove: props.showRemove, errorsFrom: props.errorsFrom, inputPropsTo: extendedInputPropsTo, inputPropsFrom: extendedInputPropsFrom, isOpened: focus === 'from' ? isOpenedFrom : isOpenedTo }));

package/ui/form/DateTimeField/DateTimeField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ICalendarProps } from '../../content/Calendar/Calendar';
 import { IDateInputStateInput, IDateInputStateOutput } from '../../form/DateField/useDateInputState';
 export interface IDateTimeFieldProps extends IDateInputStateInput {
@@ -29,10 +28,5 @@ export interface IDateTimeFieldProps extends IDateInputStateInput {
 export interface IDateTimeFieldViewProps extends IDateInputStateOutput, Pick<IDateTimeFieldProps, 'size' | 'errors' | 'showRemove' | 'calendarProps' | 'className' | 'timePanelViewProps'> {
     [key: string]: any;
 }
-declare const _default: {
-    (props: import("../../form/Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDateTimeFieldProps>;
 export default _default;

package/ui/form/DateTimeRangeField/DateTimeRangeField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { ICalendarProps } from '../../content/Calendar/Calendar';
 import { IDateRangeFieldProps } from '../../form/DateRangeField/DateRangeField';
 import { IDateInputStateInput, IDateInputStateOutput } from '../../form/DateField/useDateInputState';
@@ -68,10 +67,5 @@ export interface IDateTimeRangeFieldViewProps extends IDateInputStateOutput, Omi
     errorsFrom?: any;
     errorsTo?: any;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDateTimeRangeFieldProps>;
 export default _default;

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

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IDataProviderConfig } from '../../../hooks/useDataProvider';
 import { IDataSelectConfig } from '../../../hooks/useDataSelect';
 import { IFieldWrapperInputProps } from '../../form/Field/fieldWrapper';
@@ -64,12 +63,7 @@ export interface IDropDownFieldViewProps extends Omit<IDropDownFieldProps, 'item
     onClose: () => void;
     placeholder: string;
     isAutoComplete?: boolean;
-    searchAutoFocus?: any;
+    isSearchAutoFocus?: boolean;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDropDownFieldProps>;
 export default _default;

package/ui/form/DropDownField/DropDownField.js

@@ -88,13 +88,14 @@ function DropDownField(props) {
             }
         }
     }, [prevSelectedIds, props.input.onChange, props.multiple, props.onChange, selectedIds]);
-    // form reset
-    react_1.useEffect(function () {
-        //if form reset
-        if (props.input.value === undefined && selectedIds.length > 0) {
+    // Reset selected ids on form reset
+    var prevInputValue = react_use_1.usePrevious(props.input.value);
+    react_use_1.useUpdateEffect(function () {
+        // if form reset
+        if (prevInputValue && props.input.value === undefined && selectedIds.length > 0) {
             onReset();
         }
-    }, [onReset, props.input.value, selectedIds.length]);
+    }, [onReset, prevInputValue, props.input.value, selectedIds.length]);
     return components.ui.renderView(props.view || 'form.DropDownFieldView', __assign(__assign({}, props), { isAutoComplete: isAutoComplete,
         items: items,
         hoveredId: hoveredId,
@@ -120,6 +121,7 @@ DropDownField.defaultProps = {
     className: '',
     autoComplete: false,
     showReset: false,
-    multiple: false
+    multiple: false,
+    isSearchAutoFocus: true
 };
 exports["default"] = fieldWrapper_1["default"]('DropDownField', DropDownField);

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

@@ -78,11 +78,11 @@ interface IFieldWrapperOptions {
     list?: boolean;
     attributeSuffixes?: string[];
 }
-declare type FieldWrapperComponent = {
-    (props: IFieldWrapperInputProps): JSX.Element;
+export interface FieldWrapperComponent<T> {
+    (props: IFieldWrapperInputProps & T): JSX.Element;
     WrappedComponent: any;
     displayName: any;
     defaultProps: any;
-};
-export default function fieldWrapper(componentId: any, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent;
+}
+export default function fieldWrapper<T = any>(componentId: any, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent<T>;
 export {};

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

@@ -118,10 +118,5 @@ export interface IFieldListItemViewProps extends IFieldWrapperOutputProps {
     rowIndex: number;
     showRemove: boolean;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IFieldListProps>;
 export default _default;

package/ui/form/FileField/FileField.d.ts

@@ -87,10 +87,5 @@ export interface IFileFieldViewProps extends IFileFieldProps {
     itemView?: React.ReactNode | any;
     items: IFileFieldItemViewProps[];
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IFileFieldProps>;
 export default _default;

package/ui/form/Form/Form.js

@@ -306,7 +306,7 @@ function Form(props) {
         ? components.ui.renderView(props.view || 'form.FormView', __assign(__assign({}, props.viewProps), { isInvalid: isInvalid,
             isSubmitting: isSubmitting,
             layout: layout,
-            onSubmit: onSubmit, submitLabel: props.submitLabel, fields: props.fields, children: props.children, isBordered: props.isBordered, className: props.className }))
+            onSubmit: onSubmit, submitLabel: props.submitLabel, fields: props.fields, children: props.children, isBordered: props.isBordered, className: props.className, style: props.style }))
         : props.children));
 }
 Form.defaultProps = {

package/ui/form/HtmlField/HtmlField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 /**
  * HtmlField
@@ -44,10 +43,5 @@ export interface IHtmlFieldProps extends IFieldWrapperInputProps, IFieldWrapperO
 export interface IHtmlFieldViewProps extends IHtmlFieldProps {
     onChange: (event: any, editor: any) => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IHtmlFieldProps>;
 export default _default;

package/ui/form/ImageField/ImageField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import ReactCropProps, { Crop } from 'react-image-crop';
 import { IModalProps } from '../../modal/Modal/Modal';
 import { IFieldWrapperInputProps } from '../Field/fieldWrapper';
@@ -78,10 +77,5 @@ export interface IImageFieldViewProps extends IImageFieldProps {
     };
     onClick: () => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IImageFieldProps>;
 export default _default;

package/ui/form/ImageField/ImageField.js

@@ -55,7 +55,7 @@ function ImageField(props) {
         var data = null;
         try {
             data = JSON.parse(text);
-            dispatch(modal_1.openModal(ImageFieldModalVIew, __assign(__assign({ modalId: modalId }, props.modalProps), { crop: __assign(__assign({}, props.crop), { onSubmit: function (crop, imageId) { return setCroppedImage(__assign(__assign({}, crop), { id: imageId })); } }), image: first_1["default"](data) })));
+            dispatch(modal_1.openModal(ImageFieldModalVIew, __assign(__assign({ modalId: modalId }, props.modalProps), { crop: __assign(__assign({}, props.crop), { onSubmit: function (crop, imageId) { return setCroppedImage(__assign(__assign({}, crop), { id: imageId })); } }), image: first_1["default"](data) || data })));
             // eslint-disable-next-line no-empty
         }
         catch (e) { }
@@ -63,7 +63,7 @@ function ImageField(props) {
     }, [ImageFieldModalVIew, modalId, dispatch, props.crop, props.modalProps]);
     var _b = useFile_1["default"](__assign(__assign({}, props), { multiple: false, imagesOnly: true, uploader: __assign({ uploaderConfigs: {
                 xhr: {
-                    responseParser: responseParser
+                    responseParser: props.crop ? responseParser : null
                 }
             } }, props.uploader) })), files = _b.files, onBrowse = _b.onBrowse, onRemove = _b.onRemove, onAdd = _b.onAdd;
     // Fetch cropped image

package/ui/form/InputField/InputField.d.ts

@@ -95,10 +95,5 @@ export interface IInputFieldViewProps extends IInputFieldProps, IFieldWrapperOut
     onBlur?: (e: Event | React.FocusEvent) => void;
     onMouseDown?: (e: Event | React.MouseEvent) => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IInputFieldProps>;
 export default _default;

package/ui/form/NavField/NavField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { INavProps } from '../../nav/Nav/Nav';
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../../form/Field/fieldWrapper';
 import { IDataProviderConfig } from '../../../hooks/useDataProvider';
@@ -10,13 +9,8 @@ export interface INavFieldProps extends IFieldWrapperInputProps, IFieldWrapperOu
     /**
      * Свойства для компонента Nav
      */
-    navProps: INavProps;
+    navProps?: INavProps;
     [key: string]: any;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<INavFieldProps>;
 export default _default;

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

@@ -36,10 +36,5 @@ export interface INumberFieldViewProps extends INumberFieldProps, IFieldWrapperO
         step: string | number;
     };
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<INumberFieldProps>;
 export default _default;

package/ui/form/PasswordField/PasswordField.d.ts

@@ -30,10 +30,5 @@ export interface IPasswordFieldViewProps extends IPasswordFieldProps, IFieldWrap
     onHidePassword: () => void;
 }
 export declare const checkPassword: (password: any) => "success" | "warning" | "danger";
-declare const _default: {
-    (props: import("../Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IPasswordFieldProps>;
 export default _default;

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

@@ -38,10 +38,5 @@ export interface IRadioListFieldViewProps extends IFieldWrapperOutputProps {
     selectedIds: (PrimaryKey | any)[];
     onItemSelect: (id: PrimaryKey | any) => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IRadioListFieldProps>;
 export default _default;

package/ui/form/RateField/RateField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 /**
  * RateField
@@ -33,7 +32,7 @@ export interface IRateFieldProps extends IFieldWrapperInputProps {
      * Дополнительный CSS-класс для элемента отображения
      */
     className?: CssClassName;
-    inputProps: {
+    inputProps?: {
         [key: string]: any;
     };
 }
@@ -44,10 +43,5 @@ export interface IRateFieldViewProps extends IRateFieldProps, IFieldWrapperOutpu
     value: number;
     onItemClick: (item: IRateFieldItem) => void;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IRateFieldProps>;
 export default _default;

package/ui/form/ReCaptchaField/ReCaptchaField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 /**
  * ReCaptchaField
@@ -21,10 +20,5 @@ export interface IReCaptchaFieldProps extends IFieldWrapperInputProps {
 }
 export interface IReCaptchaFieldViewProps extends IReCaptchaFieldProps, IFieldWrapperOutputProps {
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<IReCaptchaFieldProps>;
 export default _default;

package/ui/form/SliderField/SliderField.d.ts

@@ -54,14 +54,12 @@ export interface ISliderFieldProps extends IFieldWrapperInputProps {
      * содержащий свойства style и label.
      * @example { min: 20, 40: 40, max: 100 }
      */
-    marks?: {
-        number: React.ReactNode;
-    } | {
-        number: {
+    marks?: Record<string, {
+        string: {
             style: any;
             label: any;
         };
-    };
+    } | React.ReactNode | string>;
     /**
      * Функция, вызываемая после отпускания tip'а у слайдера (при событии onmouseup)
      * @see https://github.com/schrodinger/rc-slider
@@ -74,10 +72,5 @@ export interface ISliderFieldViewProps extends ISliderFieldProps, IFieldWrapperO
     sliderDefaultValue?: number;
     rangeDefaultValue?: number[];
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<ISliderFieldProps>;
 export default _default;

package/ui/form/SliderField/demo/marks.js

@@ -21,7 +21,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _a;
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var SliderField_1 = __importDefault(require("../SliderField"));
@@ -30,18 +29,17 @@ var SliderField_1 = __importDefault(require("../SliderField"));
  * @order 7
  * @col 4
  */
-var marks = (_a = {},
-    _a[-10] = '-10°C',
-    _a[0] = React.createElement("strong", null, "0\u00B0C"),
-    _a[26] = '26°C',
-    _a[37] = '37°C',
-    _a[50] = '50°C',
-    _a[80] = {
+var marks = {
+    0: React.createElement("strong", null, "0\u00B0C"),
+    26: '26°C',
+    37: '37°C',
+    50: '50°C',
+    80: {
         style: {
             color: 'red'
         },
         label: React.createElement("strong", null, "80\u00B0C")
-    },
-    _a);
+    }
+};
 exports["default"] = (function () { return (React.createElement("div", { style: { padding: '20px 30px' } },
     React.createElement(SliderField_1["default"], { min: -10, max: 80, marks: marks }))); });

package/ui/form/SwitcherField/SwitcherField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IFieldWrapperInputProps, IFieldWrapperOutputProps } from '../Field/fieldWrapper';
 import { IDataProviderConfig } from '../../../hooks/useDataProvider';
 import { IDataSelectConfig } from '../../../hooks/useDataSelect';
@@ -30,10 +29,5 @@ export interface ISwitcherFieldViewProps extends IFieldWrapperOutputProps, Omit<
     onItemHover: (id: PrimaryKey | any) => void;
     buttonProps?: any;
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<ISwitcherFieldProps>;
 export default _default;

package/ui/form/TextField/TextField.d.ts

@@ -42,10 +42,5 @@ export interface ITextFieldViewProps extends ITextFieldProps, IFieldWrapperOutpu
         disabled: boolean;
     };
 }
-declare const _default: {
-    (props: IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<ITextFieldProps>;
 export default _default;

package/ui/form/TimeField/TimeField.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { IDateInputStateInput, IDateInputStateOutput } from '../../form/DateField/useDateInputState';
 export interface ITimePanelViewProps extends Pick<ITimeFieldViewProps, 'value' | 'onClose' | 'onNow' | 'onSelect' | 'className'> {
     showHeader?: boolean;
@@ -41,10 +40,5 @@ export interface ITimeFieldProps extends IDateInputStateInput {
 export interface ITimeFieldViewProps extends IDateInputStateOutput, Pick<ITimeFieldProps, 'size' | 'errors' | 'showRemove' | 'noBorder' | 'className' | 'timePanelViewProps'> {
     [key: string]: any;
 }
-declare const _default: {
-    (props: import("../Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-    WrappedComponent: any;
-    displayName: any;
-    defaultProps: any;
-};
+declare const _default: import("../Field/fieldWrapper").FieldWrapperComponent<ITimeFieldProps>;
 export default _default;

package/ui/form/index.d.ts

@@ -28,142 +28,32 @@ import TextField from './TextField';
 import TimeField from './TimeField';
 export { AutoCompleteField, BlankField, Button, CheckboxField, CheckboxListField, DateField, DateRangeField, DateTimeField, DateTimeRangeField, DropDownField, Field, FieldLayout, FieldList, FieldSet, FileField, Form, HtmlField, InputField, NavField, NumberField, PasswordField, RadioListField, ReCaptchaField, SliderField, SwitcherField, TextField, TimeField, };
 declare const _default: {
-    AutoCompleteField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    BlankField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
+    AutoCompleteField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./AutoCompleteField/AutoCompleteField").IAutoCompleteFieldProps>;
+    BlankField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./BlankField/BlankField").IBlankFieldProps>;
     Button: typeof Button;
-    CheckboxField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    CheckboxListField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    DateField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    DateRangeField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    DateTimeField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    DateTimeRangeField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    DropDownField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
+    CheckboxField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./CheckboxField/CheckboxField").ICheckboxFieldProps>;
+    CheckboxListField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./CheckboxListField/CheckboxListField").ICheckboxListFieldProps>;
+    DateField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./DateField/DateField").IDateFieldProps>;
+    DateRangeField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./DateRangeField/DateRangeField").IDateRangeFieldProps>;
+    DateTimeField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./DateTimeField/DateTimeField").IDateTimeFieldProps>;
+    DateTimeRangeField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./DateTimeRangeField/DateTimeRangeField").IDateTimeRangeFieldProps>;
+    DropDownField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./DropDownField/DropDownField").IDropDownFieldProps>;
     Field: import("react").MemoExoticComponent<(props: import("./Field/Field").IFieldProps) => JSX.Element>;
     FieldLayout: import("react").MemoExoticComponent<(props: import("./FieldLayout/FieldLayout").IFieldLayoutProps) => JSX.Element>;
-    FieldList: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
+    FieldList: import("./Field/fieldWrapper").FieldWrapperComponent<import("./FieldList/FieldList").IFieldListProps>;
     FieldSet: typeof FieldSet;
-    FileField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
+    FileField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./FileField/FileField").IFileFieldProps>;
     Form: typeof Form;
-    HtmlField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    InputField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    NavField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    NumberField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    PasswordField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    RadioListField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    ReCaptchaField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    SliderField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    SwitcherField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    TextField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
-    TimeField: {
-        (props: import("./Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-        WrappedComponent: any;
-        displayName: any;
-        defaultProps: any;
-    };
+    HtmlField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./HtmlField/HtmlField").IHtmlFieldProps>;
+    InputField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./InputField/InputField").IInputFieldProps>;
+    NavField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./NavField/NavField").INavFieldProps>;
+    NumberField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./NumberField/NumberField").INumberFieldProps>;
+    PasswordField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./PasswordField/PasswordField").IPasswordFieldProps>;
+    RadioListField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./RadioListField/RadioListField").IRadioListFieldProps>;
+    ReCaptchaField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./ReCaptchaField/ReCaptchaField").IReCaptchaFieldProps>;
+    SliderField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./SliderField/SliderField").ISliderFieldProps>;
+    SwitcherField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./SwitcherField/SwitcherField").ISwitcherFieldProps>;
+    TextField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./TextField/TextField").ITextFieldProps>;
+    TimeField: import("./Field/fieldWrapper").FieldWrapperComponent<import("./TimeField/TimeField").ITimeFieldProps>;
 };
 export default _default;

package/ui/format/EnumFormatter/EnumFormatter.js

@@ -28,7 +28,7 @@ var getLabel = function (items, id) {
 exports.getLabel = getLabel;
 function EnumFormatter(props) {
     var components = hooks_1.useComponents();
-    var items = hooks_1.useDataProvider({ items: props.items });
+    var items = hooks_1.useDataProvider({ items: props.items }).items;
     return components.ui.renderView(props.view || 'format.DefaultFormatterView', {
         value: exports.getLabel(items, props.value)
     });

package/ui/list/Grid/demo/inner-search-form.d.ts

@@ -4,12 +4,7 @@ export declare const searchForm: {
     fields: {
         label: string;
         attribute: string;
-        component: {
-            (props: import("../../../form/Field/fieldWrapper").IFieldWrapperInputProps): JSX.Element;
-            WrappedComponent: any;
-            displayName: any;
-            defaultProps: any;
-        };
+        component: import("../../../form/Field/fieldWrapper").FieldWrapperComponent<import("../../../form/InputField/InputField").IInputFieldProps>;
     }[];
 };
 declare const _default: () => JSX.Element;

package/utils/form.d.ts

@@ -7,16 +7,11 @@ export declare const providers: {
     redux: {
         useForm: (formId: any, initialValues: any) => any;
         useField: (formId: any, name: any, isList: any) => {
-            setValue: (value: any) => {
-                type: string;
-                formId: any;
-                name: any;
-                value: any;
-            };
+            setValue: (value: any) => any;
             errors: any;
             value: any;
         };
-        useDispatch: () => import("redux").Dispatch<any>;
+        useDispatch: () => any;
         select: (formId: any, selector: any) => any;
     };
     reducer: {