@steroidsjs/core 3.0.0-beta.4 → 3.0.0-beta.41

package/ui/crud/Crud/Crud.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -50,11 +54,11 @@ var useDispatch_1 = __importDefault(require("../../../hooks/useDispatch"));
 var MODE_PAGE = 'page';
 var MODE_MODAL = 'modal';
 function Crud(props) {
-    var components = hooks_1.useComponents();
-    var dispatch = useDispatch_1["default"]();
-    var _a = hooks_1.useSelector(function (state) { return utils_1.routeInfoSelector(state, props.queryKey); }), routeId = _a.routeId, routeTitle = _a.routeTitle, routeAction = _a.routeAction, routeParams = _a.routeParams, recordId = _a.recordId;
+    var components = (0, hooks_1.useComponents)();
+    var dispatch = (0, useDispatch_1["default"])();
+    var _a = (0, hooks_1.useSelector)(function (state) { return (0, utils_1.routeInfoSelector)(state, props.queryKey); }), routeId = _a.routeId, routeTitle = _a.routeTitle, routeAction = _a.routeAction, routeParams = _a.routeParams, recordId = _a.recordId;
     // Normalize items
-    var items = react_1.useMemo(function () { return utils_1.normalizeItems(props.items, {
+    var items = (0, react_1.useMemo)(function () { return (0, utils_1.normalizeItems)(props.items, {
         index: props.index || props.grid,
         create: props.create || props.form,
         update: props.update || props.form,
@@ -63,25 +67,21 @@ function Crud(props) {
     }); }, [props.create, props["delete"], props.form, props.grid, props.index, props.items, props.update, props.view]);
     // Get crud id and mode
     var crudId = props.crudId || routeId;
-    var mode = get_1["default"](items.find(function (item) { return item.actionName === routeAction; }), 'mode') || props.mode;
-    var goToAction = react_1.useCallback(function (nextAction) {
+    var mode = (0, get_1["default"])(items.find(function (item) { return item.actionName === routeAction; }), 'mode') || props.mode;
+    var goToAction = (0, react_1.useCallback)(function (nextAction) {
         var _a;
         if (nextAction === utils_1.CRUD_ACTION_INDEX) {
-            //TODO remove @ts-ignore
-            //@ts-ignore
-            dispatch(list_1.listRefresh(crudId));
+            dispatch((0, list_1.listRefresh)(crudId));
         }
         if (routeAction !== nextAction) {
             if (mode === MODE_MODAL) {
-                dispatch(modal_1.closeModal(crudId));
+                dispatch((0, modal_1.closeModal)(crudId));
             }
-            //TODO remove @ts-ignore
-            //@ts-ignore
-            dispatch(router_1.goToRoute(routeId, __assign(__assign({}, routeParams), (_a = {}, _a[props.queryKey] = null, _a[props.queryKey + 'Action'] = null, _a))));
+            dispatch((0, router_1.goToRoute)(routeId, __assign(__assign({}, routeParams), (_a = {}, _a[props.queryKey] = null, _a[props.queryKey + 'Action'] = null, _a))));
         }
     }, [crudId, dispatch, mode, props.queryKey, routeAction, routeId, routeParams]);
     // Fetch record
-    var _b = useFetch_1["default"](react_1.useMemo(function () {
+    var _b = (0, useFetch_1["default"])((0, react_1.useMemo)(function () {
         var _a;
         var _b;
         if (recordId && props.restUrl) {
@@ -103,7 +103,7 @@ function Crud(props) {
         return null;
     }, [recordId, props.restUrl, props.restApi, props.primaryKey, crudId])), record = _b.data, isLoading = _b.isLoading;
     // Props for click/confirm handlers
-    var clickProps = react_1.useMemo(function () { return ({
+    var clickProps = (0, react_1.useMemo)(function () { return ({
         crudId: props.crudId,
         mode: props.mode,
         restUrl: props.restUrl,
@@ -121,10 +121,10 @@ function Crud(props) {
     }); }, [components, goToAction, props.crudId, props.mode, props.primaryKey, props.queryKey,
         props.restApi, props.restUrl, record, recordId, routeAction, routeId, routeParams]);
     // Handler for convert control item to props for button
-    var itemsToControls = react_1.useCallback(function (localRecord, localRecordId, sourceItems) { return (sourceItems || [])
+    var itemsToControls = (0, react_1.useCallback)(function (localRecord, localRecordId, sourceItems) { return (sourceItems || [])
         .map(function (crudItem) {
         var _a;
-        var button = __assign(__assign({}, omit_1["default"](crudItem, ['actionName', 'pkRequired', 'component', 'componentProps', 'visible', 'onClick'])), { confirm: typeof crudItem.confirm === 'string' ? crudItem.confirm : null });
+        var button = __assign(__assign({}, (0, omit_1["default"])(crudItem, ['actionName', 'pkRequired', 'component', 'componentProps', 'visible', 'onClick'])), { confirm: typeof crudItem.confirm === 'string' ? crudItem.confirm : null });
         var localClickProps = __assign(__assign({}, localRecord), { record: localRecord || clickProps.record, recordId: localRecordId || clickProps.recordId });
         if (crudItem.onClick) {
             button.onClick = function (e) {
@@ -148,7 +148,7 @@ function Crud(props) {
         return button;
     }); }, [clickProps, props.queryKey, routeId, routeParams]);
     // Props for CrudContent component
-    var contentProps = react_1.useMemo(function () { return ({
+    var contentProps = (0, react_1.useMemo)(function () { return ({
         crudId: crudId,
         queryKey: props.queryKey,
         primaryKey: props.primaryKey,
@@ -165,20 +165,20 @@ function Crud(props) {
     }); }, [crudId, props.queryKey, props.primaryKey, props.model, props.restUrl, props.restApi, props.grid,
         props.form, goToAction, items, itemsToControls, record, recordId]);
     // Open modal on route change
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         if (mode === MODE_MODAL && routeAction !== utils_1.CRUD_ACTION_INDEX) {
-            dispatch(modal_1.openModal(CrudModal_1["default"], __assign({ modalId: crudId, action: routeAction }, contentProps)));
+            dispatch((0, modal_1.openModal)(CrudModal_1["default"], __assign({ modalId: crudId, action: routeAction }, contentProps)));
         }
     }, [contentProps, crudId, dispatch, mode, routeAction]);
     // Close modal on change mode
-    react_use_1.useUpdateEffect(function () {
+    (0, react_use_1.useUpdateEffect)(function () {
         if (mode !== MODE_MODAL) {
-            dispatch(modal_1.closeModal(crudId));
+            dispatch((0, modal_1.closeModal)(crudId));
         }
     }, [crudId, dispatch, mode]);
     // Get page controls
     var controlsAction = mode === MODE_MODAL ? utils_1.CRUD_ACTION_INDEX : routeAction;
-    var controls = react_1.useMemo(function () { return itemsToControls(record, recordId, items
+    var controls = (0, react_1.useMemo)(function () { return itemsToControls(record, recordId, items
         .filter(function (crudItem) { return crudItem.visible !== false; })
         .filter(function (crudItem) { return utils_1.pageControlsMap[controlsAction]
         ? utils_1.pageControlsMap[controlsAction].includes(crudItem.actionName)
@@ -186,7 +186,9 @@ function Crud(props) {
     return components.ui.renderView(props.crudView || 'crud.CrudView', {
         title: routeTitle,
         controls: controls,
-        children: (controlsAction === utils_1.CRUD_ACTION_INDEX || !isLoading) && (React.createElement(CrudContent_1["default"], __assign({}, contentProps, { action: controlsAction })))
+        children: (controlsAction === utils_1.CRUD_ACTION_INDEX || !isLoading) && (
+        //@ts-ignore
+        React.createElement(CrudContent_1["default"], __assign({}, contentProps, { action: controlsAction })))
     });
 }
 Crud.defaultProps = {

package/ui/crud/Crud/CrudContent.d.ts

@@ -1,4 +1,4 @@
-import * as React from 'react';
+/// <reference types="react" />
 import { IGridProps } from '../../list/Grid/Grid';
 import { IFormProps } from '../../form/Form/Form';
 import { ICrudItem } from './Crud';
@@ -16,7 +16,7 @@ export interface ICrudContentProps {
     record?: Record<string, unknown>;
     recordId?: PrimaryKey;
     action?: string;
-    grid?: IGridProps | React.ReactNode;
-    form?: IFormProps | React.ReactNode;
+    grid?: IGridProps;
+    form?: IFormProps;
 }
 export default function CrudContent(props: ICrudContentProps): JSX.Element;

package/ui/crud/Crud/CrudContent.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -41,25 +45,23 @@ var useDispatch_1 = __importDefault(require("../../../hooks/useDispatch"));
 var Grid_1 = __importDefault(require("../../../ui/list/Grid"));
 var Form_1 = __importDefault(require("../../../ui/form/Form"));
 function CrudContent(props) {
-    var dispatch = useDispatch_1["default"]();
+    var dispatch = (0, useDispatch_1["default"])();
     // Resolve ids
     var formId = [props.crudId, 'form', props.recordId].filter(Boolean).join('_');
     // Get current crud item
     var crudItem = props.items.find(function (item) { return item.actionName === props.action; });
-    var controlsGetter = react_1.useCallback(function (record, primaryKey) { return props.itemsToControls.call(null, record, record[primaryKey] || null, props.action === utils_1.CRUD_ACTION_INDEX
+    var controlsGetter = (0, react_1.useCallback)(function (record, primaryKey) { return props.itemsToControls.call(null, record, record[primaryKey] || null, props.action === utils_1.CRUD_ACTION_INDEX
         ? props.items.filter(function (item) { return item.visible !== false && item.pkRequired; })
         : []); }, [props.action, props.items, props.itemsToControls]);
-    var formInitialValues = react_1.useMemo(function () {
+    var formInitialValues = (0, react_1.useMemo)(function () {
         var _a;
         var _b;
         return props.action === utils_1.CRUD_ACTION_UPDATE
             ? __assign(__assign({}, props.record), (_a = {}, _a[props.primaryKey] = ((_b = props.record) === null || _b === void 0 ? void 0 : _b[props.primaryKey]) || props.recordId, _a)) : undefined;
     }, [props.action, props.primaryKey, props.record, props.recordId]);
-    var onFormComplete = react_1.useCallback(function () {
+    var onFormComplete = (0, react_1.useCallback)(function () {
         window.scrollTo(0, 0);
-        //TODO remove @ts-ignore
-        //@ts-ignore
-        dispatch(notifications_1.showNotification(__('Запись успешно обновлена.')));
+        dispatch((0, notifications_1.showNotification)(__('Запись успешно обновлена.')));
         props.goToAction.call(null, utils_1.CRUD_ACTION_INDEX);
     }, [dispatch, props.goToAction]);
     // Render content by action

package/ui/crud/Crud/CrudModal.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -42,7 +46,7 @@ function CrudModal(props) {
     // Get current item
     var crudItem = props.items.find(function (item) { return item.actionName === props.action; });
     // Close handler
-    var onModalClose = react_1.useCallback(function () {
+    var onModalClose = (0, react_1.useCallback)(function () {
         props.goToAction.call(null, utils_1.CRUD_ACTION_INDEX);
     }, [props.goToAction]);
     return (React.createElement(Modal_1["default"], { size: 'lg', title: crudItem.title || crudItem.label || null, onClose: onModalClose },

package/ui/crud/Crud/utils.js

@@ -25,7 +25,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -105,7 +105,7 @@ var normalizeItems = function (sourceItems, fromProps) {
                             return [2 /*return*/];
                         case 2:
                             if (!props.restUrl) return [3 /*break*/, 4];
-                            return [4 /*yield*/, props.components.http["delete"](props.restUrl + "/" + props.recordId)
+                            return [4 /*yield*/, props.components.http["delete"]("".concat(props.restUrl, "/").concat(props.recordId))
                                     .then(function () { return props.goToAction(exports.CRUD_ACTION_INDEX); })["catch"](function (error) {
                                     if (props.errorHandler) {
                                         props.errorHandler(error, props.components.store.dispatch);
@@ -156,7 +156,7 @@ var routeInfoSelector = function (state, queryKey, mode) {
     if (!queryKey) {
         queryKey = exports.DEFAULT_QUERY_KEY;
     }
-    var routeParams = router_1.getRouteParams(state);
+    var routeParams = (0, router_1.getRouteParams)(state);
     //const isModal = !!props.modalId;
     //let action = routeAction;
     //const crudItem = items.find(item => item.actionName === action);
@@ -166,13 +166,13 @@ var routeInfoSelector = function (state, queryKey, mode) {
         recordId = null;
     }*/
     return {
-        routeId: router_1.getRouteId(state),
-        routeTitle: router_1.getRouteProp(state, null, 'title') || router_1.getRouteProp(state, null, 'label'),
-        routeAction: get_1["default"](routeParams, queryKey + 'Action') || get_1["default"](routeParams, queryKey) || exports.CRUD_ACTION_INDEX,
+        routeId: (0, router_1.getRouteId)(state),
+        routeTitle: (0, router_1.getRouteProp)(state, null, 'title') || (0, router_1.getRouteProp)(state, null, 'label'),
+        routeAction: (0, get_1["default"])(routeParams, queryKey + 'Action') || (0, get_1["default"])(routeParams, queryKey) || exports.CRUD_ACTION_INDEX,
         routeParams: routeParams,
         //action,
-        recordId: get_1["default"](routeParams, queryKey + 'Action') ? get_1["default"](routeParams, queryKey) : null,
-        hasModal: !isEmpty_1["default"](modal_1.getOpened(state))
+        recordId: (0, get_1["default"])(routeParams, queryKey + 'Action') ? (0, get_1["default"])(routeParams, queryKey) : null,
+        hasModal: !(0, isEmpty_1["default"])((0, modal_1.getOpened)(state))
     };
 };
 exports.routeInfoSelector = routeInfoSelector;

package/ui/crud/index.d.ts

@@ -28,7 +28,6 @@ export declare const generateCrud: (routeId: string, props: ICrudGeneratorProps)
     enums: string | string[];
     role?: string;
     roles?: string[];
-    fetch?: import("../../hoc/fetch").IFetchHocConfigFunc;
     items?: IRouteItem[] | {
         [key: string]: IRouteItem;
     };

package/ui/crud/index.js

@@ -21,7 +21,7 @@ exports.Crud = Crud_1["default"];
 var utils_1 = require("./Crud/utils");
 var generateCrud = function (routeId, props) {
     var queryKey = props.queryKey || utils_1.DEFAULT_QUERY_KEY;
-    return __assign(__assign({ id: routeId, path: trimEnd_1["default"](props.path, '/') + ("/:" + queryKey + "?/:" + queryKey + "Action?"), label: props.label, models: [
+    return __assign(__assign({ id: routeId, path: (0, trimEnd_1["default"])(props.path, '/') + "/:".concat(queryKey, "?/:").concat(queryKey, "Action?"), label: props.label, models: [
             props.model,
             props.searchModel,
         ].filter(Boolean).concat(props.models || []), enums: props.enums, component: Crud_1["default"] }, props.route), { componentProps: props });

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

@@ -1,21 +1,31 @@
 import * as React from 'react';
 import { IDataProviderConfig } from '../../../hooks/useDataProvider';
 import { IDataSelectConfig } from '../../../hooks/useDataSelect';
-import { IInputFieldProps } from '../InputField/InputField';
+import { IBaseFieldProps } from '../InputField/InputField';
+export interface IAutoCompleteItem {
+    id: number | string | boolean;
+    label?: string;
+    additional?: {
+        icon: string;
+        text: string;
+    };
+    category?: string;
+    [key: string]: unknown;
+}
 /**
  * AutoComplete
  * Поле ввода текста с подсказками (auto-complete)
  */
-export interface IAutoCompleteFieldProps extends IInputFieldProps, IDataProviderConfig, Omit<IDataSelectConfig, 'items'> {
+export interface IAutoCompleteFieldProps extends IBaseFieldProps, IDataProviderConfig, Omit<IDataSelectConfig, 'items'> {
     /**
      * При фокусировке на поле ввода будет запускаться поиск
      * @example true
      */
     searchOnFocus?: boolean;
-    [key: string]: any;
 }
 export interface IAutoCompleteFieldViewProps extends Omit<IAutoCompleteFieldProps, 'items'> {
-    items: Record<string, unknown>[];
+    items: IAutoCompleteItem[];
+    categories: string[];
     hoveredId: PrimaryKey | any;
     selectedIds: (PrimaryKey | any)[];
     forwardedRef: any;

package/ui/form/AutoCompleteField/AutoCompleteField.js

@@ -19,12 +19,23 @@ var react_use_1 = require("react-use");
 var useComponents_1 = __importDefault(require("../../../hooks/useComponents"));
 var fieldWrapper_1 = __importDefault(require("../../../ui/form/Field/fieldWrapper"));
 var hooks_1 = require("../../../hooks");
+var getCategories = function (items) {
+    if (!items) {
+        return [];
+    }
+    return items.reduce(function (allCategories, item) {
+        if (item.category && !allCategories.includes(item.category)) {
+            allCategories.push(item.category);
+        }
+        return allCategories;
+    }, []);
+};
 function AutoCompleteField(props) {
-    var components = useComponents_1["default"]();
+    var components = (0, useComponents_1["default"])();
     // Query state
-    var _a = react_1.useState(''), query = _a[0], setQuery = _a[1];
+    var _a = (0, react_1.useState)(''), query = _a[0], setQuery = _a[1];
     // Data provider
-    var _b = hooks_1.useDataProvider({
+    var _b = (0, hooks_1.useDataProvider)({
         items: props.items,
         dataProvider: props.dataProvider,
         autoComplete: props.autoComplete,
@@ -32,32 +43,32 @@ function AutoCompleteField(props) {
         query: query
     }), items = _b.items, isLoading = _b.isLoading;
     // Data select
-    var _c = hooks_1.useDataSelect({
+    var _c = (0, hooks_1.useDataSelect)({
         selectedIds: props.selectedIds,
         primaryKey: props.primaryKey,
         items: items,
         inputValue: props.input.value
     }), isOpened = _c.isOpened, setIsOpened = _c.setIsOpened, setIsFocused = _c.setIsFocused, hoveredId = _c.hoveredId, setHoveredId = _c.setHoveredId, selectedIds = _c.selectedIds, setSelectedIds = _c.setSelectedIds;
-    var onOpen = react_1.useCallback(function () {
+    var onOpen = (0, react_1.useCallback)(function () {
         setQuery('');
         setIsFocused(true);
         setIsOpened(true);
         setHoveredId(null);
     }, [setHoveredId, setIsFocused, setIsOpened]);
-    var onItemSelect = react_1.useCallback(function (id) {
+    var onItemSelect = (0, react_1.useCallback)(function (id) {
         setSelectedIds(id);
     }, [setSelectedIds]);
-    var onItemHover = react_1.useCallback(function (id) {
+    var onItemHover = (0, react_1.useCallback)(function (id) {
         setHoveredId(id);
     }, [setHoveredId]);
-    var onClose = react_1.useCallback(function () {
+    var onClose = (0, react_1.useCallback)(function () {
         setIsFocused(false);
         setIsOpened(false);
     }, [setIsFocused, setIsOpened]);
     // Outside click -> close
-    var forwardedRef = react_1.useRef(null);
-    react_use_1.useClickAway(forwardedRef, onClose);
-    var onChange = react_1.useCallback(function (value) {
+    var forwardedRef = (0, react_1.useRef)(null);
+    (0, react_use_1.useClickAway)(forwardedRef, onClose);
+    var onChange = (0, react_1.useCallback)(function (value) {
         setQuery(value);
         props.input.onChange.call(null, value);
     }, [props.input.onChange]);
@@ -71,7 +82,7 @@ function AutoCompleteField(props) {
             props.inputProps.onFocus(e);
         }
     };
-    var onBlur = react_1.useCallback(function (e) {
+    var onBlur = (0, react_1.useCallback)(function (e) {
         setTimeout(function () {
             if (props.isOpened) {
                 onClose();
@@ -81,23 +92,12 @@ function AutoCompleteField(props) {
             props.inputProps.onBlur(e);
         }
     }, [onClose, props.inputProps, props.isOpened]);
-    var inputProps = react_1.useMemo(function () { return (__assign(__assign({}, props.inputProps), { type: 'text', name: props.input.name, value: props.input.value || '', placeholder: props.placeholder, disabled: props.disabled, onChange: onChange,
-        onBlur: onBlur })); }, [onBlur, onChange, props.disabled, props.input.name, props.input.value, props.inputProps, props.placeholder]);
+    var inputProps = (0, react_1.useMemo)(function () { return (__assign(__assign({}, props.inputProps), { type: 'text', name: props.input.name, value: props.input.value || '', placeholder: props.placeholder, disabled: props.disabled, onChange: onChange, onBlur: onBlur })); }, [onBlur, onChange, props.disabled, props.input.name, props.input.value, props.inputProps, props.placeholder]);
     //Sync with form
-    react_1.useEffect(function () {
+    (0, react_1.useEffect)(function () {
         props.input.onChange.call(null, selectedIds[0] || null);
     }, [props.input.onChange, selectedIds]);
-    return components.ui.renderView(props.view || 'form.AutoCompleteFieldView', __assign(__assign({}, props), { inputProps: inputProps,
-        items: items,
-        isLoading: isLoading,
-        hoveredId: hoveredId,
-        selectedIds: selectedIds,
-        onOpen: onOpen,
-        isOpened: isOpened,
-        onClose: onClose,
-        forwardedRef: forwardedRef,
-        onItemHover: onItemHover,
-        onItemSelect: onItemSelect }));
+    return components.ui.renderView(props.view || 'form.AutoCompleteFieldView', __assign(__assign({}, props), { inputProps: inputProps, items: items, isLoading: isLoading, hoveredId: hoveredId, selectedIds: selectedIds, onOpen: onOpen, isOpened: isOpened, onClose: onClose, forwardedRef: forwardedRef, onItemHover: onItemHover, onItemSelect: onItemSelect, categories: getCategories(props.items) }));
 }
 AutoCompleteField.defaultProps = {
     primaryKey: 'label',
@@ -105,6 +105,6 @@ AutoCompleteField.defaultProps = {
     multiple: false,
     disabled: false,
     required: false,
-    className: ''
+    size: 'md'
 };
-exports["default"] = fieldWrapper_1["default"]('AutoCompleteField', AutoCompleteField);
+exports["default"] = (0, fieldWrapper_1["default"])('AutoCompleteField', AutoCompleteField);

package/ui/form/BlankField/BlankField.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -28,4 +32,4 @@ function BlankField(props) {
     var _a;
     return React.createElement("span", null, props.text || props.children || ((_a = props.input) === null || _a === void 0 ? void 0 : _a.value));
 }
-exports["default"] = fieldWrapper_1["default"]('BlankField', BlankField);
+exports["default"] = (0, fieldWrapper_1["default"])('BlankField', BlankField);

package/ui/form/Button/Button.d.ts

@@ -1,5 +1,5 @@
 import * as React from 'react';
-interface IButtonBadge {
+export interface IButtonBadge {
     enable?: boolean;
     value?: number;
     color?: ColorName;
@@ -21,11 +21,6 @@ export interface IButtonProps {
      * @example Save
      */
     hint?: string | any;
-    /**
-     * Должна ли показываться надпись на кнопке в состоянии загрузки
-     * @example true
-     */
-    showLabelOnLoading?: boolean;
     /**
      * HTML Тип
      * @example submit
@@ -105,7 +100,7 @@ export interface IButtonProps {
      * Объект CSS стилей
      * @example {width: '45%'}
      */
-    style?: any;
+    style?: CustomStyle;
     /**
      * Дополнительный CSS-класс для кнопки или ссылки
      */
@@ -114,7 +109,11 @@ export interface IButtonProps {
      * Переопределение view React компонента для кастомизации отображения
      * @example MyCustomView
      */
-    view?: React.ComponentType;
+    view?: CustomView;
+    /**
+     * Вложенные элементы
+     */
+    children?: string | any;
     /**
      * ID роута, на который необходимо перейти, указанный в дереве `steroids` роутинга. Для передачи параметров
      * используйте свойство `toRouteParams`
@@ -126,14 +125,6 @@ export interface IButtonProps {
      * @example {userId: 52}
      */
     toRouteParams?: Record<string, unknown>;
-    /**
-     * Выбор макета для распложения кнопки в форме. Если кнопка находится внутри `<Form>...</Form>`, то `layout` будет
-     * взят из контекста формы и автоматически применен при отораженн. Для его отключения укажите `false`.
-     * Данное свойство так же может принимать объект, если нужно прокинуть дополнительные свойства в шаблон макета.
-     * Пример: `{layout: 'horizontal', cols: [2,6]}`
-     * @example horizontal
-     */
-    layout?: FormLayout;
     /**
      * ID формы, для которой кнопка выполняет submit. При указании ID формы кнопка будет показывать состояние загрузки
      * при отправке формы.
@@ -162,11 +153,9 @@ export interface IButtonViewProps extends IButtonProps {
     badge?: IButtonBadge;
     url?: string;
     formId?: string;
-    layout?: string;
     disabled?: boolean;
     onClick?: any;
     submitting?: boolean;
-    showLabelOnLoading: boolean;
 }
 declare function Button(props: IButtonProps): JSX.Element;
 declare namespace Button {
@@ -180,7 +169,6 @@ declare namespace Button {
         size: string;
         className: string;
         resetFailedMs: number;
-        showLabelOnLoading: boolean;
         badge: {
             enable: boolean;
             value: number;

package/ui/form/Button/Button.js

@@ -12,7 +12,11 @@ var __assign = (this && this.__assign) || function () {
 };
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];
@@ -29,45 +33,41 @@ var __importStar = (this && this.__importStar) || function (mod) {
     __setModuleDefault(result, mod);
     return result;
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var react_redux_1 = require("react-redux");
 var react_1 = require("react");
-var react_use_1 = require("react-use");
-var FieldLayout_1 = __importDefault(require("../FieldLayout"));
 var router_1 = require("../../../actions/router");
 var router_2 = require("../../../reducers/router");
 var hooks_1 = require("../../../hooks");
 var Form_1 = require("../Form/Form");
-var form_1 = require("../../../utils/form");
 function Button(props) {
-    var components = hooks_1.useComponents();
-    var dispatch = react_redux_1.useDispatch();
+    var components = (0, hooks_1.useComponents)();
+    var dispatch = (0, react_redux_1.useDispatch)();
     // Badge
-    var badge = react_1.useMemo(function () { return (__assign(__assign(__assign({}, Button.defaultProps.badge), { enable: !!props.badge || props.badge === 0 }), (typeof props.badge === 'object' ? props.badge : { value: props.badge }))); }, [props.badge]);
+    var badge = (0, react_1.useMemo)(function () { return (__assign(__assign(__assign({}, Button.defaultProps.badge), { enable: !!props.badge || props.badge === 0 }), (typeof props.badge === 'object' ? props.badge : { value: props.badge }))); }, [props.badge]);
     // Route -> url
-    var routePath = react_redux_1.useSelector(function (state) { return props.toRoute ? router_2.getRouteProp(state, props.toRoute, 'path') : null; });
+    var routePath = (0, react_redux_1.useSelector)(function (state) { return props.toRoute ? (0, router_2.getRouteProp)(state, props.toRoute, 'path') : null; });
     var url = typeof props.url !== 'undefined'
         ? props.url
-        : (routePath ? router_2.buildUrl(routePath, props.toRouteParams) : null);
+        : (routePath ? (0, router_2.buildUrl)(routePath, props.toRouteParams) : null);
     // Flags: isLoading, isFailed
-    var _a = react_1.useState({ isLoading: false, isFailed: false }), _b = _a[0], isLoading = _b.isLoading, isFailed = _b.isFailed, setStateFlags = _a[1];
-    react_use_1.useUpdateEffect(function () { return setStateFlags({ isLoading: props.isLoading, isFailed: props.isFailed }); }, [props.isLoading, props.isFailed]);
+    var _a = (0, react_1.useState)({ isLoading: false, isFailed: false }), _b = _a[0], isLoading = _b.isLoading, isFailed = _b.isFailed, setStateFlags = _a[1];
+    React.useEffect(function () {
+        setStateFlags({ isLoading: props.isLoading, isFailed: props.isFailed });
+    }, [props.isLoading, props.isFailed]);
     // Form submitting
-    var context = react_1.useContext(Form_1.FormContext);
-    var form = hooks_1.useForm();
+    var context = (0, react_1.useContext)(Form_1.FormContext);
+    var form = (0, hooks_1.useForm)();
+    // eslint-disable-next-line react/prop-types
     var submitting = !!props.submitting;
     if (form) {
         submitting = form.formSelector(function (state) { return state.isSubmitting; });
     }
-    var disabled = submitting || props.disabled || isLoading;
+    var disabled = submitting || props.disabled;
     var tag = props.tag || (props.link || url ? 'a' : 'button');
-    var layout = react_1.useMemo(function () { return form_1.mergeLayoutProp(context.layout, props.layout); }, [context.layout, props.layout]);
-    var failedTimer = react_1.useRef(null);
-    var onClick = react_1.useCallback(function (e) {
+    var failedTimer = (0, react_1.useRef)(null);
+    var onClick = (0, react_1.useCallback)(function (e) {
         e.stopPropagation();
         if (process.env.IS_WEB && props.confirm && !window.confirm(props.confirm)) {
             e.preventDefault();
@@ -81,7 +81,7 @@ function Button(props) {
         if (props.toRoute) {
             //TODO remove @ts-ignore
             //@ts-ignore
-            dispatch(router_1.goToRoute(props.toRoute, props.toRouteParams));
+            dispatch((0, router_1.goToRoute)(props.toRoute, props.toRouteParams));
         }
         if (props.onClick) {
             var result = props.onClick(e);
@@ -120,16 +120,7 @@ function Button(props) {
             }
         }
     }, [dispatch, props, tag]);
-    var button = components.ui.renderView(props.view || 'form.ButtonView', __assign(__assign({}, props), { badge: badge,
-        layout: layout,
-        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));
-    }
+    var button = components.ui.renderView(props.view || 'form.ButtonView', __assign(__assign({}, props), { badge: badge, 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 }));
     return button;
 }
 Button.defaultProps = {
@@ -142,7 +133,6 @@ Button.defaultProps = {
     size: 'md',
     className: '',
     resetFailedMs: 2000,
-    showLabelOnLoading: true,
     badge: {
         enable: false,
         value: 0,

package/ui/form/Button/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];