@steroidsjs/core 2.1.0-beta.15 → 2.1.0-beta.19

package/hooks/useComponents.js

@@ -1,12 +1,12 @@
 "use strict";
-//import {useContext} from 'react';
 exports.__esModule = true;
+var react_1 = require("react");
+var ComponentsProvider_1 = require("../providers/ComponentsProvider");
 function useComponents() {
-    if (typeof window !== 'undefined' && window.SteroidsComponents) {
+    var components = react_1.useContext(ComponentsProvider_1.ComponentsContext);
+    if (!process.env.IS_SSR) {
         return window.SteroidsComponents;
     }
-    // TODO Get components from context
-    //return useContext(ComponentsContext);
-    return null;
+    return components;
 }
 exports["default"] = useComponents;

package/hooks/useFetch.d.ts

@@ -1,5 +1,10 @@
-import { IComponents } from './useComponents';
+import { IComponents } from '../providers/ComponentsProvider';
 import { IApiMethod } from '../components/ApiComponent';
+declare global {
+    interface Window {
+        APP_PRELOADED_DATA: any;
+    }
+}
 export interface IFetchConfig {
     id?: string | number;
     url?: string | IApiMethod;
@@ -18,6 +23,10 @@ export interface IFetchResult {
     isLoading: boolean;
     fetch?: (newParams?: Record<string, unknown>) => void;
 }
+export declare const normalizeConfig: (config: any) => any;
+export declare const getConfigId: (config: any) => any;
+export declare const defaultFetchHandler: (config: any, components: any, addCancelToken: any) => any;
+export declare const fetchData: (config: any, components: any, addCancelToken: any) => any;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -25,7 +34,6 @@ export interface IFetchResult {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 export default function useFetch(rawConfig?: IFetchConfig): IFetchResult;

package/hooks/useFetch.js

@@ -50,12 +50,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+exports.fetchData = exports.defaultFetchHandler = exports.getConfigId = exports.normalizeConfig = void 0;
 var react_1 = require("react");
 var react_use_1 = require("react-use");
+var trim_1 = __importDefault(require("lodash-es/trim"));
 var axios_1 = __importDefault(require("axios"));
 var index_1 = require("./index");
 var normalizeConfig = function (config) { return (config
     ? __assign({ id: null, url: '', method: 'get', params: {}, options: null, onFetch: null }, config) : null); };
+exports.normalizeConfig = normalizeConfig;
+var getConfigId = function (config) {
+    var result = trim_1["default"](config.id || config.url, '/');
+    if (!result) {
+        // eslint-disable-next-line no-console
+        console.warn('Please set id for fetch config, it`s necessary for SSR to work properly');
+    }
+    return result;
+};
+exports.getConfigId = getConfigId;
 var defaultFetchHandler = function (config, components, addCancelToken) {
     var cancelToken = new axios_1["default"].CancelToken(function (cancel) {
         addCancelToken(cancel);
@@ -67,6 +79,9 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
         .send(config.method, config.url, config.params, __assign(__assign({}, config.options), { cancelToken: cancelToken }))
         .then(function (result) { return result.data; });
 };
+exports.defaultFetchHandler = defaultFetchHandler;
+var fetchData = function (config, components, addCancelToken) { return ((config.onFetch || exports.defaultFetchHandler).call(null, config, components, addCancelToken)); };
+exports.fetchData = fetchData;
 /**
  * Fetch
  * Используется для подгрузки данных с бекенда перед рендером компонента, на котором он применяется.
@@ -74,26 +89,26 @@ var defaultFetchHandler = function (config, components, addCancelToken) {
  * которые описывают откуда нужно подтянуть данные.
  *
  * В процесс загрузки HOC будет отображать "Загрузка...", а после уже отрендерит компонент, передав данные в указанный
- * ключ `key`. Все данные сохраняются в Redux Store, что позволяет избежать дополнительных запросов при использовании
- * SSR.
+ * ключ `key`.
  */
 function useFetch(rawConfig) {
     var _this = this;
     if (rawConfig === void 0) { rawConfig = null; }
     var components = index_1.useComponents();
     // Store config in state
-    var _a = react_1.useState(normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
+    var _a = react_1.useState(exports.normalizeConfig(rawConfig)), config = _a[0], setConfig = _a[1];
     // Update config in state on raw config updated
     react_use_1.useUpdateEffect(function () {
         setConfig(rawConfig);
     }, [rawConfig]);
-    // Resolve config id
-    // TODO Get initial state from HttpComponent (for SSR) by configId
-    //const idRef = useRef(_uniqueId('fetch'));
-    //const configId = config ? _trim(config.id || config.url || idRef.current, '/') : null;
+    // Get preloaded data
+    var configId = exports.getConfigId(config);
+    var ssrValueContext = index_1.useSsr();
+    var preloadedData = process.env.IS_SSR ? ssrValueContext.preloadedData : window.APP_PRELOADED_DATA;
+    var preloadedDataByConfigId = (preloadedData && configId) ? preloadedData[configId] : null;
     // State for data and loading flag
-    var _b = react_1.useState(null), data = _b[0], setData = _b[1];
-    var _c = react_1.useState(!!config), isLoading = _c[0], setIsLoading = _c[1];
+    var _b = react_1.useState(preloadedDataByConfigId || null), data = _b[0], setData = _b[1];
+    var _c = react_1.useState(!!config && !data), isLoading = _c[0], setIsLoading = _c[1];
     // Cancel tokens
     var cancelTokens = react_1.useRef([]);
     var addCancelToken = function (token) { return cancelTokens.current.push(token); };
@@ -109,10 +124,11 @@ function useFetch(rawConfig) {
                         if (newConfig) {
                             setConfig(__assign(__assign(__assign({}, config), newConfig), { params: __assign(__assign({}, config === null || config === void 0 ? void 0 : config.params), newConfig === null || newConfig === void 0 ? void 0 : newConfig.params) }));
                         }
+                        setData(null);
                         if (!config) return [3 /*break*/, 2];
                         setIsLoading(true);
                         _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
+                        return [4 /*yield*/, exports.fetchData(config, components, addCancelToken)];
                     case 1:
                         _a.apply(void 0, [_b.sent()]);
                         setIsLoading(false);
@@ -122,28 +138,15 @@ function useFetch(rawConfig) {
             });
         });
     }, [components, config]);
+    react_use_1.useEffectOnce(function () {
+        if (!data) {
+            fetch();
+        }
+    });
     // Fetch data on config update
-    react_1.useLayoutEffect(function () {
-        var fetchData = function () { return __awaiter(_this, void 0, void 0, function () {
-            var _a;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        setData(null);
-                        if (!config) return [3 /*break*/, 2];
-                        setIsLoading(true);
-                        _a = setData;
-                        return [4 /*yield*/, (config.onFetch || defaultFetchHandler).call(null, config, components, addCancelToken)];
-                    case 1:
-                        _a.apply(void 0, [_b.sent()]);
-                        setIsLoading(false);
-                        _b.label = 2;
-                    case 2: return [2 /*return*/];
-                }
-            });
-        }); };
-        fetchData();
-    }, [components, config]);
+    react_use_1.useUpdateEffect(function () {
+        fetch();
+    }, [fetch]);
     return { data: data, isLoading: isLoading, fetch: fetch };
 }
 exports["default"] = useFetch;

package/hooks/useLayout.d.ts

@@ -1,3 +1,5 @@
+import { Dispatch } from 'redux';
+import { IComponents } from '../providers/ComponentsProvider';
 export interface ILayout {
     status?: string;
     error?: any;
@@ -9,4 +11,11 @@ export declare const STATUS_RENDER_ERROR = "render_error";
 export declare const STATUS_HTTP_ERROR = "render_error";
 export declare const STATUS_ACCESS_DENIED = "access_denied";
 export declare const STATUS_OK = "ok";
+export declare const HTTP_STATUS_CODES: {
+    not_found: number;
+    access_denied: number;
+    ok: number;
+    render_error: number;
+};
+export declare const runInitAction: (initAction: (...args: any[]) => Promise<any>, components: IComponents, dispatch: Dispatch<any>) => Promise<void>;
 export default function useLayout(initAction?: any): ILayout;

package/hooks/useLayout.js

@@ -2,8 +2,9 @@
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _a;
 exports.__esModule = true;
-exports.STATUS_OK = exports.STATUS_ACCESS_DENIED = exports.STATUS_HTTP_ERROR = exports.STATUS_RENDER_ERROR = exports.STATUS_NOT_FOUND = exports.STATUS_LOADING = void 0;
+exports.runInitAction = exports.HTTP_STATUS_CODES = exports.STATUS_OK = exports.STATUS_ACCESS_DENIED = exports.STATUS_HTTP_ERROR = exports.STATUS_RENDER_ERROR = exports.STATUS_NOT_FOUND = exports.STATUS_LOADING = void 0;
 var react_1 = require("react");
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
@@ -11,6 +12,7 @@ var upperFirst_1 = __importDefault(require("lodash-es/upperFirst"));
 var merge_1 = __importDefault(require("lodash-es/merge"));
 var intersection_1 = __importDefault(require("lodash-es/intersection"));
 var react_use_1 = require("react-use");
+var useSsr_1 = __importDefault(require("./useSsr"));
 var useComponents_1 = __importDefault(require("./useComponents"));
 var router_1 = require("../reducers/router");
 var auth_1 = require("../reducers/auth");
@@ -25,6 +27,58 @@ exports.STATUS_RENDER_ERROR = 'render_error';
 exports.STATUS_HTTP_ERROR = 'render_error';
 exports.STATUS_ACCESS_DENIED = 'access_denied';
 exports.STATUS_OK = 'ok';
+exports.HTTP_STATUS_CODES = (_a = {},
+    _a[exports.STATUS_NOT_FOUND] = 404,
+    _a[exports.STATUS_ACCESS_DENIED] = 403,
+    _a[exports.STATUS_OK] = 200,
+    _a[exports.STATUS_RENDER_ERROR] = 500,
+    _a[exports.STATUS_HTTP_ERROR] = 500,
+    _a);
+var runInitAction = function (initAction, components, dispatch) { return (initAction(null, dispatch, components)
+    .then(function (result) {
+    // Configure components
+    if (isObject_1["default"](result.config)) {
+        Object.keys(result.config).forEach(function (name) {
+            if (!components[name]) {
+                return;
+            }
+            Object.keys(result.config[name]).forEach(function (key) {
+                var value = result.config[name][key];
+                var setter = 'set' + upperFirst_1["default"](key);
+                if (isFunction_1["default"](components[name][setter])) {
+                    components[name][setter](value);
+                }
+                else if (isObject_1["default"](components[name][key])
+                    && isObject_1["default"](value)) {
+                    merge_1["default"](components[name][key], value);
+                }
+                else {
+                    components[name][key] = value;
+                }
+            });
+        });
+    }
+    var resultMeta = result.meta;
+    var resultUser = result.user;
+    delete result.user;
+    delete result.meta;
+    if (resultMeta) {
+        Object.keys(resultMeta).forEach(function (modelName) {
+            if (resultMeta[modelName].attributes) {
+                components.meta.setModel(modelName, resultMeta[modelName]);
+            }
+        });
+    }
+    dispatch([
+        // Meta models & enums
+        Boolean(resultMeta) && fields_1.setMeta(resultMeta),
+        // User auth
+        auth_2.setData(result),
+        // User auth
+        auth_2.setUser(resultUser),
+    ].filter(Boolean));
+})); };
+exports.runInitAction = runInitAction;
 function useLayout(initAction) {
     if (initAction === void 0) { initAction = null; }
     var _a = useSelector_1["default"](function (state) { return ({
@@ -52,50 +106,11 @@ function useLayout(initAction) {
         if (!isFunction_1["default"](initAction) || initializeCounter <= initializeCounterPrev) {
             return;
         }
-        initAction(null, dispatch)
-            .then(function (result) {
-            // Configure components
-            if (isObject_1["default"](result.config)) {
-                Object.keys(result.config).forEach(function (name) {
-                    if (!components[name]) {
-                        return;
-                    }
-                    Object.keys(result.config[name]).forEach(function (key) {
-                        var value = result.config[name][key];
-                        var setter = 'set' + upperFirst_1["default"](key);
-                        if (isFunction_1["default"](components[name][setter])) {
-                            components[name][setter](value);
-                        }
-                        else if (isObject_1["default"](components[name][key])
-                            && isObject_1["default"](value)) {
-                            merge_1["default"](components[name][key], value);
-                        }
-                        else {
-                            components[name][key] = value;
-                        }
-                    });
-                });
+        exports.runInitAction(initAction, components, dispatch)
+            .then(function () {
+            if (redirectPageId) {
+                dispatch(router_2.goToRoute(redirectPageId));
             }
-            var resultMeta = result.meta;
-            var resultUser = result.user;
-            delete result.user;
-            delete result.meta;
-            if (resultMeta) {
-                Object.keys(resultMeta).forEach(function (modelName) {
-                    if (resultMeta[modelName].attributes) {
-                        components.meta.setModel(modelName, resultMeta[modelName]);
-                    }
-                });
-            }
-            dispatch([
-                // Meta models & enums
-                Boolean(resultMeta) && fields_1.setMeta(resultMeta),
-                // User auth
-                auth_2.setData(result),
-                // User auth
-                auth_2.setUser(resultUser),
-                redirectPageId && router_2.goToRoute(redirectPageId),
-            ].filter(Boolean));
         })["catch"](function (e) {
             setError(e);
             throw e;
@@ -125,6 +140,11 @@ function useLayout(initAction) {
             }
         }
     }
+    //save status code for ssr
+    var ssrContextValue = useSsr_1["default"]();
+    if (process.env.IS_SSR) {
+        ssrContextValue.staticContext.statusCode = exports.HTTP_STATUS_CODES[status];
+    }
     return {
         status: status,
         error: error,

package/hooks/useList.d.ts

@@ -145,6 +145,51 @@ export interface IListOutput {
     onFetch: (params?: Record<string, unknown>) => void;
     onSort: (value: any) => void;
 }
+export declare const defaultConfig: {
+    actionMethod: string;
+    primaryKey: string;
+    autoDestroy: boolean;
+    sort: {
+        enable: boolean;
+        attribute: string;
+        defaultValue: any;
+    };
+    addressBar: {
+        enable: boolean;
+        useHash: boolean;
+    };
+};
+export declare const normalizeSortProps: (props: IListConfig['sort']) => {
+    enable: boolean;
+    attribute: string;
+    defaultValue: any;
+};
+export declare const getDefaultSearchModel: ({ paginationProps, paginationSizeProps, sort, layoutNamesProps, }: {
+    paginationProps: any;
+    paginationSizeProps: any;
+    sort: any;
+    layoutNamesProps: any;
+}) => {
+    attributes: ({
+        type: string;
+        attribute: any;
+        defaultValue: any;
+        jsType?: undefined;
+    } | {
+        type: string;
+        jsType: string;
+        attribute: any;
+        defaultValue: any;
+    })[];
+};
+export declare const createInitialValues: ({ paginationProps, paginationSizeProps, sort, layoutNamesProps, initialQuery, configQuery, }: {
+    paginationProps: any;
+    paginationSizeProps: any;
+    sort: any;
+    layoutNamesProps: any;
+    initialQuery: any;
+    configQuery: any;
+}) => any;
 /**
  * useList
  * Добавляет массу возможностей для взаимодействия с коллекциями. Коллекции можно получать как с бекенда,

package/hooks/useList.js

@@ -33,6 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+exports.createInitialValues = exports.getDefaultSearchModel = exports.normalizeSortProps = exports.defaultConfig = void 0;
 var react_1 = require("react");
 var get_1 = __importDefault(require("lodash-es/get"));
 var union_1 = __importDefault(require("lodash-es/union"));
@@ -52,8 +53,7 @@ var useInitial_1 = __importDefault(require("../hooks/useInitial"));
 var Pagination_1 = require("../ui/list/Pagination/Pagination");
 var PaginationSize_1 = require("../ui/list/PaginationSize/PaginationSize");
 var Empty_1 = require("../ui/list/Empty/Empty");
-var index_1 = require("../hooks/index");
-var defaultConfig = {
+exports.defaultConfig = {
     actionMethod: 'get',
     primaryKey: 'id',
     autoDestroy: true,
@@ -67,6 +67,43 @@ var defaultConfig = {
         useHash: false
     }
 };
+var normalizeSortProps = function (props) { return (__assign(__assign(__assign({}, exports.defaultConfig.sort), { enable: !!props }), (typeof props === 'boolean' ? { enable: props } : props))); };
+exports.normalizeSortProps = normalizeSortProps;
+var getDefaultSearchModel = function (_a) {
+    var paginationProps = _a.paginationProps, paginationSizeProps = _a.paginationSizeProps, sort = _a.sort, layoutNamesProps = _a.layoutNamesProps;
+    return ({
+        attributes: [
+            paginationProps.enable && {
+                type: 'number',
+                attribute: paginationProps.attribute,
+                defaultValue: paginationProps.defaultValue
+            },
+            paginationSizeProps.enable && {
+                type: 'number',
+                attribute: paginationSizeProps.attribute,
+                defaultValue: paginationSizeProps.defaultValue
+            },
+            sort.enable && {
+                type: 'string',
+                jsType: 'string[]',
+                attribute: sort.attribute,
+                defaultValue: sort.defaultValue
+            },
+            layoutNamesProps.enable && {
+                type: 'string',
+                attribute: layoutNamesProps.attribute,
+                defaultValue: layoutNamesProps.defaultValue
+            },
+        ].filter(Boolean)
+    });
+};
+exports.getDefaultSearchModel = getDefaultSearchModel;
+var createInitialValues = function (_a) {
+    var _b;
+    var paginationProps = _a.paginationProps, paginationSizeProps = _a.paginationSizeProps, sort = _a.sort, layoutNamesProps = _a.layoutNamesProps, initialQuery = _a.initialQuery, configQuery = _a.configQuery;
+    return (__assign(__assign((_b = {}, _b[paginationProps.attribute] = paginationProps.defaultValue, _b[paginationSizeProps.attribute] = paginationSizeProps.defaultValue, _b[sort.attribute] = sort.defaultValue, _b[layoutNamesProps.attribute] = layoutNamesProps.defaultValue, _b), initialQuery), configQuery));
+};
+exports.createInitialValues = createInitialValues;
 /**
  * useList
  * Добавляет массу возможностей для взаимодействия с коллекциями. Коллекции можно получать как с бекенда,
@@ -75,11 +112,10 @@ var defaultConfig = {
  */
 function useList(config) {
     var _a, _b;
-    var components = index_1.useComponents();
     // Get list from redux state
     var list = useSelector_1["default"](function (state) { return list_1.getList(state, config.listId); });
     // Normalize sort config
-    var sort = react_1.useMemo(function () { return (__assign(__assign(__assign({}, defaultConfig.sort), { enable: !!config.sort }), (typeof config.sort === 'boolean' ? { enable: config.sort } : config.sort))); }, [config.sort]);
+    var sort = exports.normalizeSortProps(config.sort);
     // Empty
     var Empty = require('../ui/list/Empty')["default"];
     var emptyProps = Empty_1.normalizeEmptyProps(config.empty);
@@ -107,32 +143,14 @@ function useList(config) {
     var layoutNamesProps = LayoutNames_1.normalizeLayoutNamesProps(config.layout);
     var renderLayoutNames = function () { return React.createElement(LayoutNames, __assign({ list: list }, layoutNamesProps)); };
     // Models
+    var defaultSearchModel = react_1.useMemo(function () { return exports.getDefaultSearchModel({
+        paginationProps: paginationProps,
+        paginationSizeProps: paginationSizeProps,
+        sort: sort,
+        layoutNamesProps: layoutNamesProps
+    }); }, [layoutNamesProps, paginationProps, paginationSizeProps, sort]);
     var model = useModel_1["default"](config.model);
-    var searchModel = useModel_1["default"](config.searchModel || ((_a = config.searchForm) === null || _a === void 0 ? void 0 : _a.model), {
-        attributes: [
-            paginationProps.enable && {
-                type: 'number',
-                attribute: paginationProps.attribute,
-                defaultValue: paginationProps.defaultValue
-            },
-            paginationSizeProps.enable && {
-                type: 'number',
-                attribute: paginationSizeProps.attribute,
-                defaultValue: paginationSizeProps.defaultValue
-            },
-            sort.enable && {
-                type: 'string',
-                jsType: 'string[]',
-                attribute: sort.attribute,
-                defaultValue: sort.defaultValue
-            },
-            layoutNamesProps.enable && {
-                type: 'string',
-                attribute: layoutNamesProps.attribute,
-                defaultValue: layoutNamesProps.defaultValue
-            },
-        ].filter(Boolean)
-    });
+    var searchModel = useModel_1["default"](config.searchModel || ((_a = config.searchForm) === null || _a === void 0 ? void 0 : _a.model), defaultSearchModel);
     // Address bar synchronization
     var _c = useAddressBar_1["default"](__assign({ enable: !!config.addressBar, model: searchModel }, (typeof config.addressBar === 'boolean' ? { enable: config.addressBar } : config.addressBar))), initialQuery = _c.initialQuery, updateQuery = _c.updateQuery;
     // Outside search form
@@ -149,34 +167,46 @@ function useList(config) {
     var formId = get_1["default"](config, 'searchForm.formId') || config.listId;
     var dispatch = useDispatch_1["default"]();
     // List wrapper (form context)
-    var initialValues = useInitial_1["default"](function () {
-        var _a;
-        return (__assign(__assign((_a = {}, _a[paginationProps.attribute] = paginationProps.defaultValue, _a[paginationSizeProps.attribute] = paginationSizeProps.defaultValue, _a[sort.attribute] = sort.defaultValue, _a[layoutNamesProps.attribute] = layoutNamesProps.defaultValue, _a), initialQuery), config.query));
-    });
+    var _initialValues = react_1.useMemo(function () { return exports.createInitialValues({
+        paginationProps: paginationProps,
+        paginationSizeProps: paginationSizeProps,
+        sort: sort,
+        layoutNamesProps: layoutNamesProps,
+        initialQuery: initialQuery,
+        configQuery: config.query
+    }); }, [config.query, initialQuery, layoutNamesProps, paginationProps, paginationSizeProps, sort]);
+    var initialValues = useInitial_1["default"](function () { return _initialValues; });
     var renderList = react_1.useCallback(function (children) {
         var Form = require('../ui/form/Form')["default"];
         return (React.createElement(Form, { formId: formId, initialValues: initialValues, view: false, useRedux: true }, children));
     }, [formId, initialValues]);
     // Init list in redux store
     react_use_1.useMount(function () {
-        dispatch(list_2.listInit(config.listId, {
-            listId: config.listId,
-            action: config.action || config.action === '' ? config.action : null,
-            actionMethod: config.actionMethod || defaultConfig.actionMethod,
-            onFetch: config.onFetch,
-            condition: config.condition,
-            scope: config.scope,
-            items: null,
-            sourceItems: config.items || null,
-            isRemote: !config.items,
-            primaryKey: config.primaryKey || defaultConfig.primaryKey,
-            formId: formId,
-            loadMore: paginationProps.loadMore,
-            pageAttribute: paginationProps.attribute || null,
-            pageSizeAttribute: paginationSizeProps.attribute || null,
-            sortAttribute: sort.attribute || null,
-            layoutAttribute: layoutNamesProps.attribute || null
-        }));
+        if (!list) {
+            var toDispatch = [
+                list_2.listInit(config.listId, {
+                    listId: config.listId,
+                    action: config.action || config.action === '' ? config.action : null,
+                    actionMethod: config.actionMethod || exports.defaultConfig.actionMethod,
+                    onFetch: config.onFetch,
+                    condition: config.condition,
+                    scope: config.scope,
+                    items: null,
+                    sourceItems: config.items || null,
+                    isRemote: !config.items,
+                    primaryKey: config.primaryKey || exports.defaultConfig.primaryKey,
+                    formId: formId,
+                    loadMore: paginationProps.loadMore,
+                    pageAttribute: paginationProps.attribute || null,
+                    pageSizeAttribute: paginationSizeProps.attribute || null,
+                    sortAttribute: sort.attribute || null,
+                    layoutAttribute: layoutNamesProps.attribute || null
+                }),
+                list_2.listSetItems(config.listId, config.items),
+                list_2.listLazyFetch(config.listId),
+            ];
+            dispatch(toDispatch);
+        }
     });
     // Check form values change
     var formValues = useSelector_1["default"](function (state) { return form_2.formSelector(state, formId, function (_a) {
@@ -210,7 +240,7 @@ function useList(config) {
         });
     }, [formId, prevQuery, config.query, dispatch]);
     // Check change items
-    react_1.useEffect(function () {
+    react_use_1.useUpdateEffect(function () {
         dispatch([
             list_2.listSetItems(config.listId, config.items),
             list_2.listLazyFetch(config.listId),
@@ -218,7 +248,7 @@ function useList(config) {
     }, [dispatch, config.items, config.listId]);
     // Destroy
     react_use_1.useUnmount(function () {
-        var autoDestroy = typeof config.autoDestroy === 'boolean' ? config.autoDestroy : defaultConfig.autoDestroy;
+        var autoDestroy = typeof config.autoDestroy === 'boolean' ? config.autoDestroy : exports.defaultConfig.autoDestroy;
         if (autoDestroy) {
             dispatch(list_2.listDestroy(config.listId));
         }

package/hooks/useModel.js

@@ -8,6 +8,6 @@ var useComponents_1 = __importDefault(require("./useComponents"));
 function useModel(model, defaultModel) {
     if (defaultModel === void 0) { defaultModel = null; }
     var components = useComponents_1["default"]();
-    return react_1.useMemo(function () { return components.meta.normalizeModel(components.meta.getModel(model), defaultModel); }, [components.meta, defaultModel, model]);
+    return react_1.useMemo(function () { return components.meta.normalizeModel(typeof model === 'string' ? components.meta.getModel(model) : model, defaultModel); }, [components.meta, defaultModel, model]);
 }
 exports["default"] = useModel;

package/hooks/useScreen.d.ts

@@ -1,2 +1,2 @@
-import { IScreen } from './useApplication';
+import { IScreen } from '../providers/ScreenProvider';
 export default function useScreen(): IScreen;

package/hooks/useScreen.js

@@ -1,8 +1,8 @@
 "use strict";
 exports.__esModule = true;
 var react_1 = require("react");
-var useApplication_1 = require("../hooks/useApplication");
+var ScreenProvider_1 = require("../providers/ScreenProvider");
 function useScreen() {
-    return react_1.useContext(useApplication_1.ScreenContext);
+    return react_1.useContext(ScreenProvider_1.ScreenContext);
 }
 exports["default"] = useScreen;

package/hooks/useSsr.d.ts

@@ -0,0 +1,2 @@
+import { ISsr } from '../providers/SsrProvider';
+export default function useSsr(): ISsr;

package/hooks/useSsr.js

@@ -0,0 +1,8 @@
+"use strict";
+exports.__esModule = true;
+var react_1 = require("react");
+var SsrProvider_1 = require("../providers/SsrProvider");
+function useSsr() {
+    return react_1.useContext(SsrProvider_1.SsrProviderContext) || {};
+}
+exports["default"] = useSsr;

package/index.d.ts

@@ -26,7 +26,7 @@ declare function __(phrase: string, params?: any): string;
  * Название цвета, соответствующее ему состоянию
  */
 declare type ColorName =
-    'primary'
+    | 'primary'
     | 'secondary'
     | 'success'
     | 'info'
@@ -44,7 +44,7 @@ declare type PrimaryKey = number | string;
 /**
  * Размер элемента
  */
-declare type Size = 'sm' | 'md' | 'lg' | string;
+declare type Size = 'small' | 'middle' | 'large' | string;
 
 /**
  * Макет формы или ее части, влияющий на расположение полей
@@ -78,6 +78,12 @@ declare type FormInputType = {
  */
 declare type CssClassName = string;
 
+/**
+ * Дополнительные стили
+ * @example my-block
+ */
+declare type CustomStyle = React.CSSProperties;
+
 /**
  * Переопределение view React компонента для кастомизации отображения
  * @example MyCustomView