@steroidsjs/core 3.0.0-beta.1 → 3.0.0-beta.100

package/ui/nav/Router/Router.d.ts

@@ -1,7 +1,6 @@
 import * as React from 'react';
 import { IFetchConfig } from '../../../hooks/useFetch';
 import { IListProps } from '../../list/List/List';
-import { IFetchHocConfigFunc } from '../../../hoc/fetch';
 export declare const ROUTER_ROLE_LOGIN = "login";
 export declare const ROUTER_ROLE_MODAL = "modal";
 export declare const ROUTER_ROLE_404 = "404";
@@ -85,14 +84,7 @@ export interface IRouteItem {
      * Список с ролями, который показывает, кому из пользователей будет доступен просмотр страницы
      * @example ['user', 'admin']
      */
-    roles?: string[];
-    /**
-     * Обработчик, который возвращает конфигурацию для осуществления HTTP-запроса. Запрос происходит каждый раз
-     * перед рендерингом страницы, чтобы получить для неё все необходимые данные
-     * @param {*} props
-     * @return {Object} Например, {url: '/api/v1/some-data', key: 'someData'}
-     */
-    fetch?: IFetchHocConfigFunc;
+    roles?: Array<string | null>;
     /**
      * Вложенные роуты
      */
@@ -146,8 +138,6 @@ export interface IRouterProps {
      */
     children?: React.ReactNode;
 }
-export declare const walkRoutesRecursive: (item: any, defaultItem?: any, parentItem?: any) => any;
-export declare const treeToList: (item: any, isRoot?: boolean) => any;
 declare function Router(props: IRouterProps): JSX.Element;
 declare namespace Router {
     var defaultProps: {

package/ui/nav/Router/Router.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];
@@ -33,100 +37,38 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.treeToList = exports.walkRoutesRecursive = exports.ROUTER_ROLE_404 = exports.ROUTER_ROLE_MODAL = exports.ROUTER_ROLE_LOGIN = void 0;
+exports.ROUTER_ROLE_404 = exports.ROUTER_ROLE_MODAL = exports.ROUTER_ROLE_LOGIN = void 0;
 var React = __importStar(require("react"));
 var react_router_1 = require("react-router");
 var react_router_dom_1 = require("react-router-dom");
 var connected_react_router_1 = require("connected-react-router");
 var get_1 = __importDefault(require("lodash-es/get"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
-var isArray_1 = __importDefault(require("lodash-es/isArray"));
-var isObject_1 = __importDefault(require("lodash-es/isObject"));
 var react_1 = require("react");
 var react_use_1 = require("react-use");
 var modal_1 = require("../../../actions/modal");
 var modal_2 = require("../../../reducers/modal");
 var hooks_1 = require("../../../hooks");
-var hoc_1 = require("../../../hoc");
 var router_1 = require("../../../actions/router");
 var useDispatch_1 = __importDefault(require("../../../hooks/useDispatch"));
 var router_2 = require("../../../reducers/router");
 var SsrProvider_1 = require("../../../providers/SsrProvider");
+var helpers_1 = require("./helpers");
 exports.ROUTER_ROLE_LOGIN = 'login';
 exports.ROUTER_ROLE_MODAL = 'modal';
 exports.ROUTER_ROLE_404 = '404';
-var findRedirectPathRecursive = function (route) {
-    if (!route) {
-        return null;
-    }
-    if (typeof route.redirectTo === 'boolean') {
-        var key = isObject_1["default"](route.items) && !isArray_1["default"](route.items) ? Object.keys(route.items)[0] : '0';
-        return findRedirectPathRecursive(get_1["default"](route, ['items', key]));
-    }
-    if (typeof route.redirectTo === 'string') {
-        return route.redirectTo;
-    }
-    return route.path || route.path === ''
-        ? route.path
-        : null;
-};
-var walkRoutesRecursive = function (item, defaultItem, parentItem) {
-    if (defaultItem === void 0) { defaultItem = {}; }
-    if (parentItem === void 0) { parentItem = {}; }
-    var normalizedItem = __assign(__assign(__assign({}, defaultItem), item), { id: item.id, exact: item.exact, path: item.path && (item.path.indexOf('/') !== 0 && parentItem.path ? parentItem.path + '/' : '') + item.path, label: item.label, title: item.title, isVisible: typeof item.isVisible !== 'undefined'
-            ? item.isVisible
-            : (typeof parentItem.isVisible !== 'undefined'
-                ? parentItem.isVisible
-                : defaultItem.isVisible), isNavVisible: typeof item.isNavVisible !== 'undefined'
-            ? item.isNavVisible
-            : (typeof parentItem.isNavVisible !== 'undefined'
-                ? parentItem.isNavVisible
-                : defaultItem.isNavVisible), layout: item.layout || parentItem.layout || defaultItem.layout || null, roles: item.roles || parentItem.roles || defaultItem.roles || null, component: null, componentProps: null });
-    var items = null;
-    if (isArray_1["default"](item.items)) {
-        items = item.items.map(function (i) { return exports.walkRoutesRecursive(i, defaultItem, normalizedItem); });
-    }
-    else if (isObject_1["default"](item.items)) {
-        items = Object.keys(item.items)
-            .map(function (id) { return exports.walkRoutesRecursive(__assign(__assign({}, item.items[id]), { id: id }), defaultItem, normalizedItem); });
-    }
-    return __assign(__assign({}, normalizedItem), { items: items });
-};
-exports.walkRoutesRecursive = walkRoutesRecursive;
-var treeToList = function (item, isRoot) {
-    if (isRoot === void 0) { isRoot = true; }
-    if (isArray_1["default"](item)) {
-        return item;
-    }
-    if (isRoot && !item.id) {
-        item.id = 'root';
-    }
-    var items = item.path ? [item] : [];
-    if (isArray_1["default"](item.items)) {
-        item.items.forEach(function (sub) {
-            items = items.concat(exports.treeToList(sub, false));
-        });
-    }
-    else if (isObject_1["default"](item.items)) {
-        Object.keys(item.items).forEach(function (id) {
-            items = items.concat(exports.treeToList(__assign(__assign({}, item.items[id]), { id: id }), false));
-        });
-    }
-    return items;
-};
-exports.treeToList = treeToList;
 var renderComponent = function (route, activePath, routeProps) {
     var _a, _b;
-    var routePath = router_2.buildUrl(route.path, (_a = routeProps === null || routeProps === void 0 ? void 0 : routeProps.match) === null || _a === void 0 ? void 0 : _a.params);
+    var routePath = (0, router_2.buildUrl)(route.path, (_a = routeProps === null || routeProps === void 0 ? void 0 : routeProps.match) === null || _a === void 0 ? void 0 : _a.params);
     if (route.redirectTo && routePath === activePath) {
-        var to = findRedirectPathRecursive(route);
+        var to = (0, helpers_1.findRedirectPathRecursive)(route);
         if (to === null) {
             // eslint-disable-next-line no-console
             console.error('Not found path for redirect in route:', route);
             return null;
         }
         // Check already redirected
-        var toPath = router_2.buildUrl(to, (_b = routeProps === null || routeProps === void 0 ? void 0 : routeProps.match) === null || _b === void 0 ? void 0 : _b.params);
+        var toPath = (0, router_2.buildUrl)(to, (_b = routeProps === null || routeProps === void 0 ? void 0 : routeProps.match) === null || _b === void 0 ? void 0 : _b.params);
         if (activePath !== toPath) {
             return (React.createElement(react_router_1.Redirect, __assign({}, routeProps, { to: toPath }, route.componentProps)));
         }
@@ -135,86 +77,84 @@ var renderComponent = function (route, activePath, routeProps) {
         return null;
     }
     var Component = route.component;
-    if (route.fetch) {
-        Component = hoc_1.fetch(route.fetch)(Component);
-    }
     return (React.createElement(Component, __assign({}, routeProps, route.componentProps)));
 };
 function Router(props) {
-    var components = hooks_1.useComponents();
-    var _a = hooks_1.useSelector(function (state) {
+    var components = (0, hooks_1.useComponents)();
+    var routeParams = (0, hooks_1.useSelector)(router_2.getRouteParams);
+    var _a = (0, hooks_1.useSelector)(function (state) {
         var _a, _b;
         return ({
-            isInitialized: router_2.isRouterInitialized(state),
-            pathname: get_1["default"](state, 'router.location.pathname'),
-            route: router_2.getRoute(state),
-            routeParams: state.router.params,
+            isInitialized: (0, router_2.isRouterInitialized)(state),
+            pathname: (0, get_1["default"])(state, 'router.location.pathname'),
+            route: (0, router_2.getRoute)(state),
             activePath: (_b = (_a = state.router) === null || _a === void 0 ? void 0 : _a.location) === null || _b === void 0 ? void 0 : _b.pathname,
-            activeRouteIds: router_2.getActiveRouteIds(state)
+            activeRouteIds: (0, router_2.getActiveRouteIds)(state)
         });
-    }), isInitialized = _a.isInitialized, pathname = _a.pathname, route = _a.route, routeParams = _a.routeParams, activePath = _a.activePath, activeRouteIds = _a.activeRouteIds;
+    }), isInitialized = _a.isInitialized, pathname = _a.pathname, route = _a.route, activePath = _a.activePath, activeRouteIds = _a.activeRouteIds;
     var routeId = (route === null || route === void 0 ? void 0 : route.id) || null;
     // Init routes in redux
-    var dispatch = useDispatch_1["default"]();
-    react_use_1.useEffectOnce(function () {
+    var dispatch = (0, useDispatch_1["default"])();
+    (0, react_use_1.useEffectOnce)(function () {
         if (props.routes) {
-            dispatch(router_1.initRoutes(exports.walkRoutesRecursive(__assign({ id: 'root' }, props.routes), props.defaultRoles ? { roles: props.defaultRoles } : undefined)));
+            dispatch((0, router_1.initRoutes)((0, helpers_1.walkRoutesRecursive)(__assign({ id: 'root' }, props.routes), props.defaultRoles ? { roles: props.defaultRoles } : undefined)));
         }
     });
     // Sync route params with redux
-    var prevRouteParams = react_use_1.usePrevious(routeParams);
-    react_1.useEffect(function () {
-        if (!isEqual_1["default"](prevRouteParams, routeParams)) {
-            dispatch(router_1.initParams(routeParams));
+    var prevRouteParams = (0, react_use_1.usePreviousDistinct)(routeParams);
+    (0, react_1.useEffect)(function () {
+        if (!(0, isEqual_1["default"])(prevRouteParams, routeParams)) {
+            dispatch((0, router_1.initParams)(routeParams));
         }
     }, [dispatch, prevRouteParams, routeParams]);
     // Routes state
-    var _b = react_1.useState(exports.treeToList(props.routes)), routes = _b[0], setRoutes = _b[1];
-    react_use_1.useUpdateEffect(function () {
+    var _b = (0, react_1.useState)((0, helpers_1.treeToList)(props.routes)), routes = _b[0], setRoutes = _b[1];
+    (0, react_use_1.useUpdateEffect)(function () {
         setRoutes(props.routes);
     }, [props.routes]);
     // Fix end slash on switch to base route
-    react_use_1.useUpdateEffect(function () {
+    (0, react_use_1.useUpdateEffect)(function () {
         if (window.history && pathname === '/' && window.location.pathname.match(/\/$/)) {
             window.history.replaceState({}, '', components.store.history.basename);
         }
     }, [components.store.history.basename, pathname]);
     // Auto scroll to top
-    react_use_1.useUpdateEffect(function () {
+    (0, react_use_1.useUpdateEffect)(function () {
         if (props.autoScrollTop && routeId) {
             window.scrollTo(0, 0);
         }
     }, [props.autoScrollTop, routeId]);
     // Check to open/close modals
-    var prevRoute = react_use_1.usePrevious(route);
-    react_use_1.useUpdateEffect(function () {
+    var prevRoute = (0, react_use_1.usePrevious)(route);
+    (0, react_use_1.useUpdateEffect)(function () {
         var _a;
         if ((prevRoute === null || prevRoute === void 0 ? void 0 : prevRoute.id) !== (route === null || route === void 0 ? void 0 : route.id)) {
             if (prevRoute && prevRoute.role === exports.ROUTER_ROLE_MODAL) {
-                dispatch(modal_1.closeModal(prevRoute.id));
+                dispatch((0, modal_1.closeModal)(prevRoute.id));
             }
             if (route && route.role === exports.ROUTER_ROLE_MODAL) {
                 var Component = (_a = routes.find(function (item) { return item.id === route.id; })) === null || _a === void 0 ? void 0 : _a.component;
                 if (Component) {
-                    dispatch(modal_1.openModal(Component, __assign({ modalId: route.id }, routeParams)));
+                    dispatch((0, modal_1.openModal)(Component, __assign({ modalId: route.id }, routeParams)));
                 }
             }
         }
     }, [dispatch, prevRoute, route, routeParams, routes]);
     // Check close modal - go to parent page
-    var openedModals = hooks_1.useSelector(function (state) { return modal_2.getOpened(state); });
-    var openedModalIds = react_1.useMemo(function () { return (openedModals || []).map(function (modal) { return modal.id; }); }, [openedModals]);
-    var prevOpenedModalIds = react_use_1.usePrevious(openedModalIds);
-    react_1.useEffect(function () {
-        if (prevOpenedModalIds !== openedModalIds && route && !openedModalIds.includes(route.id)
-            && route.role === exports.ROUTER_ROLE_MODAL) {
+    var openedModals = (0, hooks_1.useSelector)(function (state) { return (0, modal_2.getOpened)(state); });
+    var openedModalIds = (0, react_1.useMemo)(function () { return (openedModals || []).map(function (modal) { return modal.id; }); }, [openedModals]);
+    var prevOpenedModalIds = (0, react_use_1.usePrevious)(openedModalIds);
+    (0, react_1.useEffect)(function () {
+        if (prevOpenedModalIds !== openedModalIds
+            && route
+            && !openedModalIds.includes(route.id)
+            && (prevRoute === null || prevRoute === void 0 ? void 0 : prevRoute.role) === exports.ROUTER_ROLE_MODAL) {
             var parentRouteId = activeRouteIds.find(function (activeRouteId) {
                 var activeRoute = routes.find(function (routeItem) { return routeItem.id === activeRouteId; });
                 return activeRoute && activeRoute.role !== exports.ROUTER_ROLE_MODAL;
             });
             if (parentRouteId) {
-                // TODO route params?..
-                dispatch(router_1.goToRoute(parentRouteId));
+                dispatch((0, router_1.goToRoute)(parentRouteId, prevRouteParams));
             }
         }
     });

package/ui/nav/Router/helpers.d.ts

@@ -0,0 +1,4 @@
+import { IRouteItem } from './Router';
+export declare const findRedirectPathRecursive: (route: IRouteItem) => any;
+export declare const walkRoutesRecursive: (item: IRouteItem | Record<string, any>, defaultItem?: any, parentItem?: any) => any;
+export declare const treeToList: (item: IRouteItem | Record<string, any>, isRoot?: boolean) => Record<string, any>;

package/ui/nav/Router/helpers.js

@@ -0,0 +1,81 @@
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+exports.__esModule = true;
+exports.treeToList = exports.walkRoutesRecursive = exports.findRedirectPathRecursive = void 0;
+var get_1 = __importDefault(require("lodash-es/get"));
+var isArray_1 = __importDefault(require("lodash-es/isArray"));
+var isObject_1 = __importDefault(require("lodash-es/isObject"));
+var findRedirectPathRecursive = function (route) {
+    if (!route) {
+        return null;
+    }
+    if (typeof route.redirectTo === 'boolean') {
+        var key = (0, isObject_1["default"])(route.items) && !(0, isArray_1["default"])(route.items) ? Object.keys(route.items)[0] : '0';
+        return (0, exports.findRedirectPathRecursive)((0, get_1["default"])(route, ['items', key]));
+    }
+    if (typeof route.redirectTo === 'string') {
+        return route.redirectTo;
+    }
+    return route.path || route.path === ''
+        ? route.path
+        : null;
+};
+exports.findRedirectPathRecursive = findRedirectPathRecursive;
+var walkRoutesRecursive = function (item, defaultItem, parentItem) {
+    if (defaultItem === void 0) { defaultItem = {}; }
+    if (parentItem === void 0) { parentItem = {}; }
+    var normalizedItem = __assign(__assign(__assign({}, defaultItem), item), { id: item.id, exact: item.exact, path: item.path && (item.path.indexOf('/') !== 0 && parentItem.path ? parentItem.path + '/' : '') + item.path, label: item.label, title: item.title, isVisible: typeof item.isVisible !== 'undefined'
+            ? item.isVisible
+            : (typeof parentItem.isVisible !== 'undefined'
+                ? parentItem.isVisible
+                : defaultItem.isVisible), isNavVisible: typeof item.isNavVisible !== 'undefined'
+            ? item.isNavVisible
+            : (typeof parentItem.isNavVisible !== 'undefined'
+                ? parentItem.isNavVisible
+                : defaultItem.isNavVisible), layout: item.layout || parentItem.layout || defaultItem.layout || null, roles: item.roles || parentItem.roles || defaultItem.roles || null, component: null, componentProps: null });
+    var items = null;
+    if ((0, isArray_1["default"])(item.items)) {
+        items = item.items.map(function (subItem) { return (0, exports.walkRoutesRecursive)(subItem, defaultItem, normalizedItem); });
+    }
+    else if ((0, isObject_1["default"])(item.items)) {
+        items = Object.keys(item.items)
+            .map(function (id) { return (0, exports.walkRoutesRecursive)(__assign(__assign({}, item.items[id]), { id: id }), defaultItem, normalizedItem); });
+    }
+    return __assign(__assign({}, normalizedItem), { items: items });
+};
+exports.walkRoutesRecursive = walkRoutesRecursive;
+var treeToList = function (item, isRoot) {
+    if (isRoot === void 0) { isRoot = true; }
+    if ((0, isArray_1["default"])(item)) {
+        return item;
+    }
+    if (isRoot && !item.id) {
+        item.id = 'root';
+    }
+    var items = item.path ? [item] : [];
+    if ((0, isArray_1["default"])(item.items)) {
+        item.items.forEach(function (subItem) {
+            items = items.concat((0, exports.treeToList)(subItem, false));
+        });
+    }
+    else if ((0, isObject_1["default"])(item.items)) {
+        Object.keys(item.items).forEach(function (id) {
+            items = items.concat((0, exports.treeToList)(__assign(__assign({}, item.items[id]), { id: id }), false));
+        });
+    }
+    return items;
+};
+exports.treeToList = treeToList;

package/ui/nav/Tree/Tree.d.ts

@@ -7,7 +7,7 @@ export interface ITreeItem extends IButtonProps {
     id?: string | number;
     /**
      * Вложенные элементы
-     * [{id: 2, label: 'Nested element', items: [...]}]
+     * @example [{id: 2, label: 'Nested element', items: [...]}]
      */
     items?: any[];
     /**
@@ -55,7 +55,7 @@ export interface ITreeProps {
      * Переопределение view React компонента для кастомизации отображения элемента
      * @example MyCustomView
      */
-    view?: any;
+    view?: CustomView;
     /**
      * Максимальный уровень вложенности, до которого все узлы будут отображаться в развёрнутом виде
      * @example 1
@@ -71,6 +71,11 @@ export interface ITreeProps {
      * @example true
      */
     autoSave?: boolean;
+    /**
+    *  Используется для управления раскрытием всех элементов в дереве
+    * @example: true
+    */
+    alwaysOpened?: boolean;
     [key: string]: any;
 }
 export interface ITreeViewProps extends ITreeProps {
@@ -86,7 +91,7 @@ export interface ITreeViewProps extends ITreeProps {
     })[];
     levelPadding?: number;
 }
-declare function Tree(props: ITreeProps): any;
+declare function Tree(props: ITreeProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 declare namespace Tree {
     var defaultProps: {
         itemsKey: string;

package/ui/nav/Tree/Tree.js

@@ -10,40 +10,63 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
+var React = __importStar(require("react"));
 var isString_1 = __importDefault(require("lodash-es/isString"));
 var omit_1 = __importDefault(require("lodash-es/omit"));
 var isEqual_1 = __importDefault(require("lodash-es/isEqual"));
 var keys_1 = __importDefault(require("lodash-es/keys"));
-var react_use_1 = require("react-use");
 var react_1 = require("react");
+var list_1 = require("../../../utils/list");
 var hooks_1 = require("../../../hooks");
 var router_1 = require("../../../reducers/router");
-var resolveId = function (item, index, parentId) { return (parentId ? parentId + '.' : '') + String(item.id || index); };
 function Tree(props) {
-    var components = hooks_1.useComponents();
+    var components = (0, hooks_1.useComponents)();
     var STORAGE_KEY_PREFIX = 'tree_';
     //State
-    var _a = react_1.useState(null), selectedUniqId = _a[0], setSelectedUniqId = _a[1];
-    var _b = react_1.useState({}), openedItems = _b[0], setOpenedItems = _b[1];
+    var _a = (0, react_1.useState)(null), selectedUniqId = _a[0], setSelectedUniqId = _a[1];
+    var _b = (0, react_1.useState)({}), openedItems = _b[0], setOpenedItems = _b[1];
     //Redux connection
-    var _c = hooks_1.useSelector(function (state) { return ({
-        routes: isString_1["default"](props.items) ? router_1.getNavItems(state, props.items) : null,
-        selectedItemId: isString_1["default"](props.items) ? router_1.getRouteId(state) : props.selectedItemId,
-        activeRouteIds: router_1.getActiveRouteIds(state),
-        routerParams: router_1.getRouterParams(state)
+    var _c = (0, hooks_1.useSelector)(function (state) { return ({
+        routes: (0, isString_1["default"])(props.items) ? (0, router_1.getNavItems)(state, props.items) : null,
+        selectedItemId: (0, isString_1["default"])(props.items) ? (0, router_1.getRouteId)(state) : props.selectedItemId,
+        activeRouteIds: (0, router_1.getActiveRouteIds)(state),
+        routerParams: (0, router_1.getRouterParams)(state)
     }); }), routes = _c.routes, selectedItemId = _c.selectedItemId, activeRouteIds = _c.activeRouteIds, routerParams = _c.routerParams;
-    var items = react_1.useMemo(function () {
+    var items = (0, react_1.useMemo)(function () {
         if (routes) {
             var routeToItem_1 = function (route) {
                 var routeItems = (Array.isArray(route.items)
                     ? route.items.map(function (r) { return routeToItem_1(r); })
                     : Object.keys(route.items || {}).map(function (id) { return routeToItem_1(route.items[id]); })).filter(function (r) { return r.visible; });
                 return {
-                    id: route.id,
+                    id: route.id.toLowerCase(),
                     label: route.label || route.title,
                     visible: route.isNavVisible !== false,
                     toRoute: routeItems.length === 0 ? route.id : null,
@@ -62,28 +85,27 @@ function Tree(props) {
     var findChildById = function (sourceItems, itemId, parentId, level) {
         if (parentId === void 0) { parentId = ''; }
         if (level === void 0) { level = 1; }
-        var finedItem = null;
-        if (isString_1["default"](sourceItems)) {
+        var foundItem = null;
+        if ((0, isString_1["default"])(sourceItems)) {
             return null;
         }
         (sourceItems || []).forEach(function (item, index) {
-            var uniqId = resolveId(item, index, parentId);
-            if (!finedItem && (item.id === itemId || uniqId === itemId)) {
-                finedItem = __assign(__assign({}, item), { uniqId: uniqId,
-                    level: level });
+            var uniqId = (0, list_1.getTreeItemUniqId)(item, index, parentId);
+            if (!foundItem && (item.id === itemId || uniqId === itemId)) {
+                foundItem = __assign(__assign({}, item), { uniqId: uniqId, level: level });
             }
-            if (!finedItem) {
-                finedItem = findChildById(item[props.itemsKey], itemId, uniqId, level + 1);
+            if (!foundItem) {
+                foundItem = findChildById(item[props.itemsKey], itemId, uniqId, level + 1);
             }
         });
-        return finedItem;
+        return foundItem;
     };
     var autoOpen = function (sourceItems, parentId, level) {
         if (parentId === void 0) { parentId = ''; }
         if (level === void 0) { level = 1; }
         var opened = {};
         (sourceItems || []).forEach(function (item, index) {
-            var uniqId = resolveId(item, index, parentId);
+            var uniqId = (0, list_1.getTreeItemUniqId)(item, index, parentId);
             if (props.autoOpenLevels >= level) {
                 opened[uniqId] = true;
             }
@@ -101,18 +123,18 @@ function Tree(props) {
         return opened;
     };
     // Initial opened items
-    react_use_1.useEffectOnce(function () {
+    React.useEffect(function () {
         // TODO add  clientStorage
         // const key = STORAGE_KEY_PREFIX + props.id;
         // const opened = !this.state && this.props.clientStorage.get(key) && this.props.autoSave
         //     ? JSON.parse(this.props.clientStorage.get(key))
         //     : this._autoOpen(this.props._items);
         var opened = autoOpen(items);
-        var selectedItem = findChildById(items, selectedItemId);
         setOpenedItems(opened);
-        setSelectedUniqId(selectedItem ? selectedItemId.uniqId : null);
-    });
-    var onItemClick = react_1.useCallback(function (e, uniqId, item) {
+        var selectedItem = findChildById(items, selectedItemId);
+        setSelectedUniqId(selectedItem ? selectedItem.uniqId : null);
+    }, [items]);
+    var onItemClick = (0, react_1.useCallback)(function (e, uniqId, item) {
         var _a;
         var _b;
         e.preventDefault();
@@ -128,7 +150,7 @@ function Tree(props) {
             // this.props.clientStorage.set(key, JSON.stringify(this.state.opened));
         }
     }, [openedItems, props.onItemClick, selectedUniqId]);
-    var resultItems = react_1.useMemo(function () {
+    var resultItems = (0, react_1.useMemo)(function () {
         var getItems = function (sourceItems, parentId, level) {
             if (parentId === void 0) { parentId = ''; }
             if (level === void 0) { level = 0; }
@@ -137,18 +159,15 @@ function Tree(props) {
                 return [];
             }
             (sourceItems || []).forEach(function (item, index) {
-                var uniqId = resolveId(item, index, parentId);
-                var isOpened = !!openedItems[uniqId];
+                var uniqId = (0, list_1.getTreeItemUniqId)(item, index, parentId);
+                var isOpened = props.alwaysOpened || !!openedItems[uniqId];
                 var hasItems = item[props.itemsKey] && item[props.itemsKey].length > 0;
                 if (props.level && (level === props.level - 1)) {
                     hasItems = false;
                 }
-                result.push(__assign(__assign({}, item), { uniqId: uniqId,
-                    index: index,
-                    level: level,
-                    isOpened: isOpened, isSelected: selectedUniqId === uniqId
+                result.push(__assign(__assign({}, item), { uniqId: uniqId, index: index, level: level, isOpened: isOpened, isSelected: selectedUniqId === uniqId
                         || (activeRouteIds.includes(item.toRoute)
-                            && isEqual_1["default"](item.toRouteParams || {}, omit_1["default"](routerParams, keys_1["default"](item.toRouteParams)))), hasItems: hasItems, onClick: function (e) { return onItemClick(e, uniqId, item); } }));
+                            && (0, isEqual_1["default"])(item.toRouteParams || {}, (0, omit_1["default"])(routerParams, (0, keys_1["default"])(item.toRouteParams)))), hasItems: hasItems, onClick: function (e) { return onItemClick(e, uniqId, item); } }));
                 if (isOpened) {
                     result = result.concat(getItems(item[props.itemsKey], uniqId, level + 1)).filter(Boolean);
                 }
@@ -156,7 +175,7 @@ function Tree(props) {
             return result;
         };
         return getItems(items);
-    }, [activeRouteIds, items, onItemClick, openedItems, props.itemsKey, props.level, routerParams, selectedUniqId]);
+    }, [activeRouteIds, items, onItemClick, openedItems, props.alwaysOpened, props.itemsKey, props.level, routerParams, selectedUniqId]);
     return components.ui.renderView(props.view || 'nav.TreeView', __assign(__assign({}, props), { items: resultItems }));
 }
 Tree.defaultProps = {

package/ui/nav/index.d.ts

@@ -2,4 +2,5 @@ import Nav from './Nav';
 import Router from './Router';
 import Link from './Link';
 import Breadcrumbs from './Breadcrumbs';
-export { Nav, Router, Link, Breadcrumbs };
+import ButtonGroup from './ButtonGroup';
+export { Nav, Router, Link, Breadcrumbs, ButtonGroup };

package/ui/nav/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.Breadcrumbs = exports.Link = exports.Router = exports.Nav = void 0;
+exports.ButtonGroup = exports.Breadcrumbs = exports.Link = exports.Router = exports.Nav = void 0;
 var Nav_1 = __importDefault(require("./Nav"));
 exports.Nav = Nav_1["default"];
 var Router_1 = __importDefault(require("./Router"));
@@ -12,3 +12,5 @@ var Link_1 = __importDefault(require("./Link"));
 exports.Link = Link_1["default"];
 var Breadcrumbs_1 = __importDefault(require("./Breadcrumbs"));
 exports.Breadcrumbs = Breadcrumbs_1["default"];
+var ButtonGroup_1 = __importDefault(require("./ButtonGroup"));
+exports.ButtonGroup = ButtonGroup_1["default"];

package/ui/typography/Text/Text.d.ts

@@ -0,0 +1,38 @@
+import React from 'react';
+/**
+* Text
+*
+* Компонент для вывода текстового содержимого, с возможностью настройки тэгов, цвета и типа
+*/
+export interface ITextProps extends IUiComponent {
+    /**
+    * Дочерние элементы
+    */
+    children?: React.ReactNode;
+    /**
+     * Тип текста
+     * @example 'body'
+     */
+    type?: 'body' | 'body2' | 'span' | 'boldSpan' | string;
+    /** HTML тег
+     * @example 'span'
+     */
+    tag?: 'p' | 'span' | string;
+    /**
+     * Цвет текста
+     * @example 'primary'
+     */
+    color?: ColorName;
+    /** Текст
+     * @example 'Simple text'
+     */
+    content?: string;
+}
+export type ITextViewProps = ITextProps;
+declare function Text(props: ITextProps): JSX.Element;
+declare namespace Text {
+    var defaultProps: {
+        type: string;
+    };
+}
+export default Text;