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

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

@@ -1,16 +1,53 @@
-import { IDataProviderConfig } from '../../../hooks/useDataProvider';
+import React from 'react';
+import { IAccordionItemViewProps } from 'src/ui/content/Accordion/Accordion';
+import { DataProviderItems, IDataProviderConfig } from '../../../hooks/useDataProvider';
 import { IDataSelectConfig } from '../../../hooks/useDataSelect';
 import { IFieldWrapperInputProps } from '../../form/Field/fieldWrapper';
+export declare const GROUP_CONTENT_TYPE = "group";
+export declare const CHECKBOX_CONTENT_TYPE = "checkbox";
+export declare const RADIO_CONTENT_TYPE = "radio";
+export declare const ICON_CONTENT_TYPE = "icon";
+export declare const IMG_CONTENT_TYPE = "img";
+export type ContentType = 'checkbox' | 'radio' | 'icon' | 'img';
+export type ItemSwitchType = ContentType | 'group' | string;
+export interface IDropDownFieldItem {
+    id: number | string | boolean;
+    label: string;
+    contentType?: ContentType | string;
+    contentSrc?: string | React.ReactElement;
+}
+export interface IDropDownFieldItemViewProps extends IAccordionItemViewProps, Pick<IDropDownFieldProps, 'itemsContent'> {
+    item: IDropDownFieldItem;
+    size: Size;
+    type: ItemSwitchType;
+    selectedIds: (PrimaryKey | any)[];
+    groupAttribute: 'string';
+    primaryKey: PrimaryKey;
+    hoveredId: string;
+    onItemSelect: (id: PrimaryKey | any) => void;
+    onItemHover: (id: PrimaryKey | any) => void;
+    [key: string]: any;
+}
 /**
  * DropDownField
  * Выпадающий список для выбора одного или нескольких значений
  */
-export interface IDropDownFieldProps extends IFieldWrapperInputProps, IDataProviderConfig, Omit<IDataSelectConfig, 'items'> {
+export interface IDropDownFieldProps extends IFieldWrapperInputProps, Omit<IDataProviderConfig, 'items'>, Omit<IDataSelectConfig, 'items'> {
     /**
      * Placeholder подсказка
      * @example Your text...
      */
     searchPlaceholder?: string;
+    /**
+     * Цвет состояния
+     * @example success
+     */
+    color?: ColorName;
+    /**
+    * Включает стиль `outline`, когда у DropDownField остается только `border`, а задний фон становится прозрачным
+    * @example true
+    */
+    outline?: boolean;
     inputProps?: any;
     /**
      * Дополнительный CSS-класс
@@ -20,17 +57,17 @@ export interface IDropDownFieldProps extends IFieldWrapperInputProps, IDataProvi
      * Объект CSS стилей
      * @example {width: '45%'}
      */
-    style?: any;
-    /**
-     * Переопределение view React компонента для кастомизации отображения
-     * @example MyCustomView
-     */
-    view?: any;
+    style?: CustomStyle;
     /**
-     * Показать кнопку для сброса выбранного значения
+     * Показать иконку сброса для выбранных значений
      * @example true
      */
     showReset?: boolean;
+    /**
+     * Переопределение view React компонента для кастомизации отображения
+     * @example MyCustomView
+     */
+    view?: CustomView;
     /**
      * Атрибут, в котором должны лежать дочерние элементы списка (для группировки)
      * Если аттрибут не задан - группировка не производится
@@ -38,15 +75,27 @@ export interface IDropDownFieldProps extends IFieldWrapperInputProps, IDataProvi
      */
     groupAttribute?: string;
     /**
-     * Включает стиль без 'border'
-     * @example true
+     * Свойство, которое устанавливает один type и src контента для всех пунктов
+     * @example {type: 'icon', src: 'user'}
+     */
+    itemsContent?: {
+        type: ContentType | string;
+        src?: string | React.ReactElement;
+    };
+    /**
+     * Элементы вложенные внутрь DropDownField
+     * @example [{id: 1, label: 'Ivan Ivanov', type: 'icon', typeSrc: 'user'}]
+     */
+    items?: IDropDownFieldItem[] | DataProviderItems;
+    /**
+     * Нужно ли использовать троеточие при переполнении DropDownField
+     * @example {'true'}
      */
-    noBorder?: boolean;
+    showEllipses?: boolean;
     [key: string]: any;
 }
-export interface IDropDownFieldViewProps extends Omit<IDropDownFieldProps, 'items'> {
+export interface IDropDownFieldViewProps extends IDropDownFieldProps {
     errors?: string[];
-    items: Record<string, unknown>[];
     selectedItems: Record<string, unknown>[];
     hoveredId: PrimaryKey | any;
     selectedIds: (PrimaryKey | any)[];
@@ -63,13 +112,13 @@ export interface IDropDownFieldViewProps extends Omit<IDropDownFieldProps, 'item
     isOpened?: boolean;
     isLoading?: boolean;
     onReset: () => void;
-    onItemSelect: (id: PrimaryKey | any) => void;
-    onItemHover: (id: PrimaryKey | any) => void;
+    onOpen: () => void;
+    renderItem: (item: IDropDownFieldItem) => JSX.Element;
     onItemRemove: (id: PrimaryKey | any) => void;
-    onClose: () => void;
-    placeholder: string;
     isAutoComplete?: boolean;
     isSearchAutoFocus?: boolean;
+    primaryKey: string;
+    items: IDropDownFieldItem[];
 }
 declare const _default: import("../../form/Field/fieldWrapper").FieldWrapperComponent<IDropDownFieldProps>;
 export default _default;

package/ui/form/DropDownField/DropDownField.js

@@ -10,31 +10,85 @@ 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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var react_1 = require("react");
+exports.IMG_CONTENT_TYPE = exports.ICON_CONTENT_TYPE = exports.RADIO_CONTENT_TYPE = exports.CHECKBOX_CONTENT_TYPE = exports.GROUP_CONTENT_TYPE = void 0;
+var react_1 = __importStar(require("react"));
 var react_use_1 = require("react-use");
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
+var includes_1 = __importDefault(require("lodash-es/includes"));
 var hooks_1 = require("../../../hooks");
 var fieldWrapper_1 = __importDefault(require("../../form/Field/fieldWrapper"));
+exports.GROUP_CONTENT_TYPE = 'group';
+exports.CHECKBOX_CONTENT_TYPE = 'checkbox';
+exports.RADIO_CONTENT_TYPE = 'radio';
+exports.ICON_CONTENT_TYPE = 'icon';
+exports.IMG_CONTENT_TYPE = 'img';
 function DropDownField(props) {
-    var components = hooks_1.useComponents();
+    var components = (0, hooks_1.useComponents)();
     // Query state
-    var _a = react_1.useState(''), query = _a[0], setQuery = _a[1];
-    var inputSelectedIds = react_1.useMemo(function () { return props.selectedIds || [].concat(props.input.value || []); }, [props.input.value, props.selectedIds]);
+    var _a = (0, react_1.useState)(''), query = _a[0], setQuery = _a[1];
+    var hasGroup = !!props.groupAttribute;
+    var _b = react_1["default"].useState([]), selectedAccordionItems = _b[0], setSelectedAccordionItems = _b[1];
+    var toggleCollapse = function (indexSelected) {
+        if (selectedAccordionItems.includes(indexSelected)) {
+            var newState = __spreadArray([], selectedAccordionItems, true);
+            var indexInArray = selectedAccordionItems.indexOf(indexSelected);
+            newState.splice(indexInArray, 1);
+            setSelectedAccordionItems(newState);
+        }
+        else {
+            var newState = __spreadArray([], selectedAccordionItems, true);
+            newState.push(indexSelected);
+            setSelectedAccordionItems(newState);
+        }
+    };
+    var inputSelectedIds = (0, react_1.useMemo)(function () { return props.selectedIds || [].concat(props.input.value || []); }, [props.input.value, props.selectedIds]);
     // Data provider
-    var _b = hooks_1.useDataProvider({
+    var _c = (0, hooks_1.useDataProvider)({
         items: props.items,
         dataProvider: props.dataProvider,
         autoComplete: props.autoComplete,
         autoFetch: props.autoFetch,
         query: query,
         initialSelectedIds: inputSelectedIds
-    }), items = _b.items, isLoading = _b.isLoading, isAutoComplete = _b.isAutoComplete, sourceItems = _b.sourceItems;
+    }), items = _c.items, isLoading = _c.isLoading, isAutoComplete = _c.isAutoComplete, sourceItems = _c.sourceItems;
     // Data select
-    var _c = hooks_1.useDataSelect({
+    var _d = (0, hooks_1.useDataSelect)({
         multiple: props.multiple,
         selectFirst: props.selectFirst,
         selectedIds: inputSelectedIds,
@@ -43,46 +97,46 @@ function DropDownField(props) {
         items: items,
         sourceItems: sourceItems,
         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, selectedItems = _c.selectedItems;
-    var onOpen = react_1.useCallback(function () {
+    }), isOpened = _d.isOpened, setIsOpened = _d.setIsOpened, setIsFocused = _d.setIsFocused, hoveredId = _d.hoveredId, setHoveredId = _d.setHoveredId, selectedIds = _d.selectedIds, setSelectedIds = _d.setSelectedIds, selectedItems = _d.selectedItems;
+    var onOpen = (0, react_1.useCallback)(function () {
         setQuery('');
         setIsFocused(true);
         setIsOpened(true);
         setHoveredId(null);
     }, [setHoveredId, setIsFocused, setIsOpened]);
-    var onItemHover = react_1.useCallback(function (id) {
+    var onItemHover = (0, react_1.useCallback)(function (id) {
         setHoveredId(id);
     }, [setHoveredId]);
-    var onItemSelect = react_1.useCallback(function (id) {
+    var onItemSelect = (0, react_1.useCallback)(function (id) {
         setSelectedIds(id);
     }, [setSelectedIds]);
-    var onItemRemove = react_1.useCallback(function (id) {
+    var onItemRemove = (0, react_1.useCallback)(function (id) {
         setSelectedIds(selectedIds.filter(function (i) { return i !== id; }));
     }, [selectedIds, setSelectedIds]);
-    var onReset = react_1.useCallback(function () {
+    var onReset = (0, react_1.useCallback)(function () {
         setSelectedIds([]);
     }, [setSelectedIds]);
-    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);
+    var forwardedRef = (0, react_1.useRef)(null);
     if (process.env.PLATFORM !== 'mobile') {
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        react_use_1.useClickAway(forwardedRef, onClose);
+        (0, react_use_1.useClickAway)(forwardedRef, onClose);
     }
     // Search input props
-    var searchInputProps = react_1.useMemo(function () { return ({
+    var searchInputProps = (0, react_1.useMemo)(function () { return ({
         type: 'search',
         placeholder: props.searchPlaceholder || __('Начните вводить символы для поиска...'),
         onChange: function (value) { return setQuery(value); },
         tabIndex: -1
     }); }, [props]);
     // Sync with form
-    var prevSelectedIds = react_use_1.usePrevious(selectedIds);
-    react_1.useEffect(function () {
-        if (!isEqual_1["default"](prevSelectedIds || [], selectedIds)) {
+    var prevSelectedIds = (0, react_use_1.usePrevious)(selectedIds);
+    (0, react_1.useEffect)(function () {
+        if (!(0, isEqual_1["default"])(prevSelectedIds || [], selectedIds)) {
             var newValues = props.multiple ? selectedIds : (selectedIds[0] || null);
             props.input.onChange.call(null, newValues);
             if (props.onChange) {
@@ -91,33 +145,50 @@ function DropDownField(props) {
         }
     }, [prevSelectedIds, props.input.onChange, props.multiple, props.onChange, selectedIds]);
     // Reset selected ids on form reset
-    var prevInputValue = react_use_1.usePrevious(props.input.value);
-    react_use_1.useUpdateEffect(function () {
+    var prevInputValue = (0, react_use_1.usePrevious)(props.input.value);
+    (0, react_use_1.useUpdateEffect)(function () {
         // if form reset
         if (prevInputValue && props.input.value === undefined && selectedIds.length > 0) {
             onReset();
         }
     }, [onReset, prevInputValue, props.input.value, selectedIds.length]);
-    return components.ui.renderView(props.view || 'form.DropDownFieldView', __assign(__assign({}, props), { isAutoComplete: isAutoComplete,
-        items: items,
-        hoveredId: hoveredId,
+    var renderItemView = function (item, type, src) { return components.ui.renderView('form.DropDownFieldItemView', {
+        item: __assign(__assign({}, item), { contentSrc: src, contentType: type }),
         selectedIds: selectedIds,
-        forwardedRef: forwardedRef,
-        searchInputProps: searchInputProps,
-        isOpened: isOpened,
-        isLoading: isLoading,
-        onOpen: onOpen,
-        selectedItems: selectedItems,
-        // TODO onFocus
-        // TODO onBlur
+        size: props.size,
+        groupAttribute: props.groupAttribute,
+        hoveredId: hoveredId,
+        primaryKey: props.primaryKey,
+        type: type,
+        itemsContent: props.itemsContent,
         onItemHover: onItemHover,
         onItemSelect: onItemSelect,
-        onItemRemove: onItemRemove,
-        onReset: onReset,
-        onClose: onClose }));
+        isShowMore: (0, includes_1["default"])(selectedAccordionItems || [], item.id),
+        childIndex: item.id,
+        toggleCollapse: toggleCollapse
+    }); };
+    var renderItem = function (item) {
+        if (hasGroup && Array.isArray(item[props.groupAttribute])) {
+            return renderItemView(item, 'group', item[props.groupAttribute]);
+        }
+        if (item.contentType) {
+            return renderItemView(item, item.contentType, item.contentSrc);
+        }
+        if (props.itemsContent) {
+            return renderItemView(item, props.itemsContent.type, props.itemsContent.src);
+        }
+        return renderItemView(item, 'default', null);
+    };
+    return components.ui.renderView(props.view || 'form.DropDownFieldView', __assign(__assign({}, props), { isAutoComplete: isAutoComplete, items: items, hoveredId: hoveredId, selectedIds: selectedIds, forwardedRef: forwardedRef, searchInputProps: searchInputProps, isOpened: isOpened, isLoading: isLoading, onOpen: onOpen, selectedItems: selectedItems, 
+        // TODO onFocus
+        // TODO onBlur
+        onReset: onReset, onClose: onClose, renderItem: renderItem, onItemRemove: onItemRemove, hasGroup: hasGroup }));
 }
 DropDownField.defaultProps = {
     primaryKey: 'id',
+    outline: false,
+    size: 'md',
+    color: 'basic',
     disabled: false,
     required: false,
     className: '',
@@ -126,4 +197,4 @@ DropDownField.defaultProps = {
     multiple: false,
     isSearchAutoFocus: true
 };
-exports["default"] = fieldWrapper_1["default"]('DropDownField', DropDownField);
+exports["default"] = (0, fieldWrapper_1["default"])('DropDownField', DropDownField);

package/ui/form/Field/Field.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];
@@ -40,10 +44,10 @@ var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var hooks_1 = require("../../../hooks");
 var Form_1 = require("../Form/Form");
 function Field(props) {
-    var components = hooks_1.useComponents();
+    var components = (0, hooks_1.useComponents)();
     // Get model
-    var context = react_1.useContext(Form_1.FormContext);
-    var fieldModel = react_1.useMemo(function () {
+    var context = (0, react_1.useContext)(Form_1.FormContext);
+    var fieldModel = (0, react_1.useMemo)(function () {
         var _a;
         var model = props.model || context.model;
         var result = (((_a = components.meta.getModel(model)) === null || _a === void 0 ? void 0 : _a.attributes) || [])
@@ -54,12 +58,12 @@ function Field(props) {
         || fieldModel.searchField
         || fieldModel.field
         || 'InputField';
-    var ComponentField = isString_1["default"](component)
-        ? components.ui.getField("form." + component)
+    var ComponentField = (0, isString_1["default"])(component)
+        ? components.ui.getField("form.".concat(component))
         : component;
     var componentProps = __assign(__assign(__assign(__assign({}, fieldModel), props), fieldModel.fieldProps), fieldModel.searchFieldProps);
     // Render
-    return isFunction_1["default"](ComponentField)
+    return (0, isFunction_1["default"])(ComponentField)
         ? ComponentField(componentProps)
         : React.createElement(ComponentField, __assign({}, componentProps));
 }

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

@@ -41,11 +41,9 @@ export interface IFieldWrapperInputProps {
      */
     placeholder?: string;
     /**
-     * Шаблон для поля, который настраивает его расположение внутри формы.
-     * Если false, то поле будет отрендерено без шаблона.
-     * @example 'horizontal'
+     * Input ID для связи поля с label
      */
-    layout?: FormLayout;
+    id?: string;
     value?: any;
     onChange?: (...args: any[]) => any;
     /**
@@ -62,6 +60,14 @@ export interface IFieldWrapperInputProps {
      * Размер поля
      */
     size?: Size;
+    /**
+     * Дополнительный CSS-класс для обертки FieldLayout
+     */
+    fieldLayoutClassName?: CssClassName;
+    /**
+     * Возможность отрендерить поле без обертки в компонент FieldLayout
+     */
+    isRenderWithoutFieldLayout?: boolean;
     [key: string]: any;
 }
 export interface IFieldWrapperOutputProps {
@@ -85,5 +91,5 @@ export interface FieldWrapperComponent<T> {
     displayName: any;
     defaultProps: any;
 }
-export default function fieldWrapper<T = any>(componentId: any, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent<T>;
+export default function fieldWrapper<T = any>(componentId: string, Component: any, optionsConfig?: IFieldWrapperOptions): FieldWrapperComponent<T>;
 export {};

package/ui/form/Field/fieldWrapper.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,13 +45,13 @@ var form_1 = require("../../../utils/form");
 var Form_1 = require("../Form/Form");
 var FieldLayout_1 = __importDefault(require("../FieldLayout/FieldLayout"));
 var hooks_1 = require("../../../hooks");
-var getKey = function (baseName, attribute) { return baseName + upperFirst_1["default"](attribute || ''); };
+var getKey = function (baseName, attribute) { return baseName + (0, upperFirst_1["default"])(attribute || ''); };
 var createDynamicField = function (componentId, Component, options) {
     var DynamicField = function (props) {
-        var components = hooks_1.useComponents();
+        var components = (0, hooks_1.useComponents)();
         // Get context, formId
         // eslint-disable-next-line react-hooks/rules-of-hooks
-        var context = props.formId !== false ? react_1.useContext(Form_1.FormContext) : null;
+        var context = props.formId !== false ? (0, react_1.useContext)(Form_1.FormContext) : null;
         var formId = props.formId || props.formId === false ? props.formId : ((context === null || context === void 0 ? void 0 : context.formId) || null);
         var model = props.model || (context === null || context === void 0 ? void 0 : context.model) || null;
         // Result wrapper props
@@ -75,7 +79,7 @@ var createDynamicField = function (componentId, Component, options) {
                 value = providerResult.value;
                 setValue = providerResult.setValue;
             }
-            else if (has_1["default"](props, 'value') && has_1["default"](props, 'onChange')) {
+            else if ((0, has_1["default"])(props, 'value') && (0, has_1["default"])(props, 'onChange')) {
                 // Controlled component via props
                 errors = null;
                 value = props.value;
@@ -91,7 +95,7 @@ var createDynamicField = function (componentId, Component, options) {
             // Set errors
             wrapperProps[errorsKey] = errors;
             // Input object
-            wrapperProps[inputKey] = react_1.useMemo(function () { return ({
+            wrapperProps[inputKey] = (0, react_1.useMemo)(function () { return ({
                 name: name,
                 value: value,
                 onChange: setValue
@@ -110,9 +114,9 @@ function fieldWrapper(componentId, Component, optionsConfig) {
     }; }
     var options = __assign(__assign({}, optionsConfig), { attributeSuffixes: optionsConfig.attributeSuffixes || [''] });
     var NewComponent = function (props) {
-        var components = hooks_1.useComponents();
+        var components = (0, hooks_1.useComponents)();
         // Get context, formId
-        var context = react_1.useContext(Form_1.FormContext);
+        var context = (0, react_1.useContext)(Form_1.FormContext);
         var model = props.model || (context === null || context === void 0 ? void 0 : context.model) || null;
         var attributesProps = options.attributeSuffixes.reduce(function (obj, suffix) {
             var attributeKey = getKey('attribute', suffix);
@@ -121,16 +125,16 @@ function fieldWrapper(componentId, Component, optionsConfig) {
         }, {});
         var attribute = Object.values(attributesProps)[0];
         // Get UI props and create Field Class dynamically (for add field props - input, errors, model, ...)
-        var metaProps = react_1.useMemo(function () { return components.ui.getFieldProps(componentId, model, attribute); }, [components.ui, attribute, model]);
+        var metaProps = (0, react_1.useMemo)(function () { return components.ui.getFieldProps(componentId, model, attribute); }, [components.ui, attribute, model]);
         if (!Component.DynamicField) {
             Component.DynamicField = createDynamicField(componentId, Component, options);
         }
-        // Resolve layout
-        var layout = react_1.useMemo(function () { return form_1.mergeLayoutProp(context.layout, props.layout); }, [context.layout, props.layout]);
-        if (layout !== null) {
-            return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { layout: layout, size: props.size || context.size || null, required: has_1["default"](props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : (has_1["default"](props, 'label') ? props.label : metaProps.label), hint: has_1["default"](props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, children: (React.createElement(Component.DynamicField, __assign({}, props))) }));
+        var uniqueId = (0, hooks_1.useUniqueId)('input');
+        var inputId = props.id || uniqueId;
+        if (props.isRenderWithoutFieldLayout) {
+            return components.ui.renderView(Component.DynamicField, props);
         }
-        return components.ui.renderView(Component.DynamicField, props);
+        return components.ui.renderView(FieldLayout_1["default"], __assign(__assign({}, attributesProps), { className: props.fieldLayoutClassName, size: props.size || context.size || null, required: (0, has_1["default"])(props, 'required') ? props.required : metaProps.required, label: options.label === false ? null : ((0, has_1["default"])(props, 'label') ? props.label : metaProps.label), hint: (0, has_1["default"])(props, 'hint') ? props.hint : metaProps.hint, errors: props.errors, id: inputId, children: (React.createElement(Component.DynamicField, __assign({}, props, { id: inputId }))) }));
     };
     NewComponent.WrappedComponent = Component;
     NewComponent.displayName = componentId;

package/ui/form/FieldLayout/FieldLayout.d.ts

@@ -4,13 +4,17 @@ import * as React from 'react';
  * Специальный шаблон для поля, который настраивает его расположение внутри формы, рендерит лейбл, подсказки и ошибки
  */
 export interface IFieldLayoutProps {
+    /**
+     * Дополнительный CSS-класс
+     */
+    className?: CssClassName;
     /**
      * Название поля либо отмена отображение поля (false)
      * @example 'Visible'
      */
     label?: string | boolean | any;
     /**
-     * Подсказка, которая отображается, когда в поле нет ошибок и layout !== 'inline'
+     * Подсказка, которая отображается, когда в поле нет ошибок
      * @example 'Save'
      */
     hint?: string | boolean;
@@ -20,37 +24,33 @@ export interface IFieldLayoutProps {
      * @example true
      */
     required?: boolean;
-    /**
-     * Выбор шаблона для расположения поля. Если false, то поле будет отрендерено без шаблона
-     * @example 'inline'
-     */
-    layout?: FormLayout;
     /**
      * Ошибки в поле
      * @example 'Field is required'
      */
     errors?: string[];
+    /**
+     * Отображать ли состояние successful на поле
+     * @example {'true'}
+     */
+    successful?: boolean;
     /**
      * Переопределение view React компонента для кастомизации отображения
      * @example MyCustomView
      */
-    layoutView?: CustomView;
+    view?: CustomView;
     [key: string]: any;
 }
 export interface IFieldLayoutViewProps {
     label: string | boolean | any;
     required: boolean;
     hint: string | boolean;
-    errors: string | string[];
-    layout?: {
-        layout: FormLayoutName | boolean;
-        className?: string;
-        style?: any;
-        label: boolean;
-        cols: number[];
-        [key: string]: any;
-    };
+    errors: string[];
+    successful: boolean;
+    id: string;
+    size: Size;
     children?: React.ReactNode;
+    className?: string;
 }
 declare function FieldLayout(props: IFieldLayoutProps): JSX.Element;
 declare const _default: React.MemoExoticComponent<typeof FieldLayout>;

package/ui/form/FieldLayout/FieldLayout.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];
@@ -35,23 +39,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 var React = __importStar(require("react"));
 var get_1 = __importDefault(require("lodash-es/get"));
-var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
-var form_1 = require("../../../utils/form");
-var defaultProps = {
-    layout: {
-        layout: 'default',
-        cols: [3, 6]
-    }
-};
 function FieldLayout(props) {
-    var components = hooks_1.useComponents();
+    var components = (0, hooks_1.useComponents)();
     // Error from state
-    var errors = hooks_1.useForm().formSelector(function (state) { return get_1["default"](state, 'errors.' + props.attribute); });
-    var layout = react_1.useMemo(function () { return form_1.mergeLayoutProp(defaultProps.layout, props.layout); }, [props.layout]);
-    if (layout === false) {
-        return props.children;
-    }
-    return components.ui.renderView(props.layoutView || 'form.FieldLayoutView', __assign(__assign({}, props), { errors: props.errors || errors, layout: layout }));
+    var errors = (0, hooks_1.useForm)().formSelector(function (state) { return (0, get_1["default"])(state, 'errors.' + props.attribute); });
+    return components.ui.renderView(props.view || 'form.FieldLayoutView', __assign(__assign({}, props), { errors: props.errors || errors }));
 }
 exports["default"] = React.memo(FieldLayout);