@steroidsjs/core 3.0.0 → 3.0.2

package/ui/nav/Nav/Nav.js

@@ -37,12 +37,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-var React = __importStar(require("react"));
+var react_1 = __importStar(require("react"));
 var get_1 = __importDefault(require("lodash-es/get"));
 var has_1 = __importDefault(require("lodash-es/has"));
 var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
 var isObject_1 = __importDefault(require("lodash-es/isObject"));
-var react_1 = require("react");
 var isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
 var hooks_1 = require("../../../hooks");
 var router_1 = require("../../../reducers/router");
@@ -67,7 +66,7 @@ function Nav(props) {
             setActiveTab(props.activeTab);
         }
     }, [props.activeTab]);
-    var renderContent = function () {
+    var renderContent = (0, react_1.useCallback)(function () {
         var items = Array.isArray(props.items) ? props.items : [];
         var activeItem = items.find(function (item, index) { return activeTab === ((0, has_1["default"])(item, 'id') ? item.id : index); });
         if (!activeItem || !activeItem.content) {
@@ -75,10 +74,10 @@ function Nav(props) {
         }
         if ((0, isFunction_1["default"])(activeItem.content) || (0, isObject_1["default"])(activeItem.content)) {
             var ContentComponent = activeItem.content;
-            return (React.createElement(ContentComponent, __assign({}, activeItem, activeItem.contentProps)));
+            return (react_1["default"].createElement(ContentComponent, __assign({}, activeItem, activeItem.contentProps)));
         }
         return activeItem.content;
-    };
+    }, [activeTab, props.items]);
     var onClick = (0, react_1.useCallback)(function (item, index) {
         var newActiveTab = (0, has_1["default"])(item, 'id') ? item.id : index;
         setActiveTab(newActiveTab);
@@ -86,7 +85,7 @@ function Nav(props) {
             props.onChange.call(null, newActiveTab);
         }
     }, [props.onChange]);
-    var formatItems = React.useCallback(function (items) {
+    var formatItems = (0, react_1.useCallback)(function (items) {
         if (items === void 0) { items = props.items; }
         if (Array.isArray(items)) {
             return items.map(function (item, index) {
@@ -111,7 +110,17 @@ function Nav(props) {
             .filter(function (item) { return item.visible !== false; });
     }, [activeRouteIds, activeTab, props.items, routerParams, routes]);
     var items = (0, react_1.useMemo)(function () { return formatItems(); }, [formatItems]);
-    return components.ui.renderView(props.view || defaultViewMap[props.layout], __assign(__assign({}, props), { items: items, onClick: onClick, disabled: props.disabled, children: renderContent() }));
+    var viewProps = (0, react_1.useMemo)(function () { return ({
+        items: items,
+        onClick: onClick,
+        disabled: props.disabled,
+        size: props.size,
+        icon: props.icon,
+        className: props.className,
+        navClassName: props.navClassName,
+        children: renderContent()
+    }); }, [items, onClick, props.className, props.disabled, props.icon, props.navClassName, props.size, renderContent]);
+    return components.ui.renderView(props.view || defaultViewMap[props.layout], viewProps);
 }
 Nav.defaultProps = {
     layout: 'button',

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

@@ -1,4 +1,4 @@
-import * as React from 'react';
+import React from 'react';
 import { IFetchConfig } from '../../../hooks/useFetch';
 import { IListProps } from '../../list/List/List';
 export declare const ROUTER_ROLE_LOGIN = "login";
@@ -128,7 +128,7 @@ export interface IRouterProps {
      * Дерево роутов
      * @example {id: 'root', path: '/', component: IndexPage, items: [...]}
      */
-    routes: IRouteItem[] | {
+    routes: IRouteItem[] | IRouteItem | {
         [key: string]: IRouteItem;
     };
     /**

package/ui/nav/Router/Router.js

@@ -38,13 +38,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 exports.__esModule = true;
 exports.ROUTER_ROLE_404 = exports.ROUTER_ROLE_MODAL = exports.ROUTER_ROLE_LOGIN = void 0;
-var React = __importStar(require("react"));
+var react_1 = __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 react_1 = require("react");
 var react_use_1 = require("react-use");
 var modal_1 = require("../../../actions/modal");
 var modal_2 = require("../../../reducers/modal");
@@ -57,27 +56,29 @@ var helpers_1 = require("./helpers");
 exports.ROUTER_ROLE_LOGIN = 'login';
 exports.ROUTER_ROLE_MODAL = 'modal';
 exports.ROUTER_ROLE_404 = '404';
-var renderComponent = function (route, activePath, routeProps) {
+var renderComponent = function (route, activePath, routeProps, alwaysAppendParentRoutePath) {
     var _a, _b;
     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 = (0, helpers_1.findRedirectPathRecursive)(route);
-        if (to === null) {
+        var redirectPath = alwaysAppendParentRoutePath
+            ? (0, helpers_1.findRedirectPathRecursive)(route, activePath)
+            : (0, helpers_1.findRedirectPathRecursive)(route);
+        if (redirectPath === null) {
             // eslint-disable-next-line no-console
             console.error('Not found path for redirect in route:', route);
             return null;
         }
         // Check already redirected
-        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);
+        var toPath = (0, router_2.buildUrl)(redirectPath, (_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)));
+            return (react_1["default"].createElement(react_router_1.Redirect, __assign({}, routeProps, { to: toPath }, route.componentProps)));
         }
     }
     if (!route.component) {
         return null;
     }
     var Component = route.component;
-    return (React.createElement(Component, __assign({}, routeProps, route.componentProps)));
+    return (react_1["default"].createElement(Component, __assign({}, routeProps, route.componentProps)));
 };
 function Router(props) {
     var _a;
@@ -167,14 +168,14 @@ function Router(props) {
                 return true;
             }
             var activeRoute = routes.find(function (r) { return r.id === activeRouteId; });
-            children = renderComponent(activeRoute, activePath, __assign(__assign({}, routeProps), { children: children })) || children;
+            children = renderComponent(activeRoute, activePath, __assign(__assign({}, routeProps), { children: children }), props.alwaysAppendParentRoutePath) || children;
             // Stop, if route is exact
             if (activeRoute.exact) {
                 return true;
             }
             return false;
         });
-        var result = renderComponent(routeItem, activePath, __assign(__assign({}, routeProps), { children: children }));
+        var result = renderComponent(routeItem, activePath, __assign(__assign({}, routeProps), { children: children }), props.alwaysAppendParentRoutePath);
         if (!result) {
             if (children) {
                 return children;
@@ -186,11 +187,11 @@ function Router(props) {
     };
     var renderContent = function () {
         var WrapperComponent = props.wrapperView;
-        var routeNodes = (React.createElement(react_router_1.Switch, null,
-            routes.map(function (routeItem, index) { return (React.createElement(react_router_1.Route, __assign({ key: index, render: function (routeProps) { return renderItem(routeItem, routeProps); } }, routeItem, { component: null }))); }),
+        var routeNodes = (react_1["default"].createElement(react_router_1.Switch, null,
+            routes.map(function (routeItem, index) { return (react_1["default"].createElement(react_router_1.Route, __assign({ key: index, render: function (routeProps) { return renderItem(routeItem, routeProps); } }, routeItem, { component: null }))); }),
             props.children));
         if (WrapperComponent) {
-            return (React.createElement(WrapperComponent, __assign({}, props.wrapperProps), routeNodes));
+            return (react_1["default"].createElement(WrapperComponent, __assign({}, props.wrapperProps), routeNodes));
         }
         return routeNodes;
     };
@@ -198,12 +199,12 @@ function Router(props) {
         return null;
     }
     if (process.env.IS_SSR) {
-        return (React.createElement(SsrProvider_1.SsrProviderContext.Consumer, null, function (context) { return (React.createElement(react_router_1.StaticRouter, { location: components.store.history.location, context: context.staticContext }, renderContent())); }));
+        return (react_1["default"].createElement(SsrProvider_1.SsrProviderContext.Consumer, null, function (context) { return (react_1["default"].createElement(react_router_1.StaticRouter, { location: components.store.history.location, context: context.staticContext }, renderContent())); }));
     }
     if (window.location.protocol === 'file:') {
-        return (React.createElement(react_router_dom_1.HashRouter, null, renderContent()));
+        return (react_1["default"].createElement(react_router_dom_1.HashRouter, null, renderContent()));
     }
-    return (React.createElement(connected_react_router_1.ConnectedRouter, { history: components.store.history }, renderContent()));
+    return (react_1["default"].createElement(connected_react_router_1.ConnectedRouter, { history: components.store.history }, renderContent()));
 }
 Router.defaultProps = {
     autoScrollTop: true,

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

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

package/ui/nav/Router/helpers.js

@@ -18,23 +18,9 @@ exports.treeToList = exports.walkRoutesRecursive = exports.findRedirectPathRecur
 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 isBoolean_1 = __importDefault(require("lodash-es/isBoolean"));
+var isString_1 = __importDefault(require("lodash-es/isString"));
 var SLASH = '/';
-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 addSlashIfNotPresent = function (path) {
     if (path === void 0) { path = ''; }
     return path.startsWith(SLASH) ? path : (SLASH + path);
@@ -58,6 +44,23 @@ var appendChildIfNoSlash = function (path, parentPath) {
     }
     return path;
 };
+var findRedirectPathRecursive = function (route, parentPath) {
+    if (parentPath === void 0) { parentPath = ''; }
+    if (!route) {
+        return null;
+    }
+    if ((0, isBoolean_1["default"])(route.redirectTo)) {
+        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]), parentPath);
+    }
+    if ((0, isString_1["default"])(route.redirectTo)) {
+        return route.redirectTo;
+    }
+    return route.path || route.path === ''
+        ? joinChildAndParentPaths(route.path, parentPath)
+        : null;
+};
+exports.findRedirectPathRecursive = findRedirectPathRecursive;
 var walkRoutesRecursive = function (item, defaultItem, parentItem, alwaysAppendParentRoutePath) {
     if (defaultItem === void 0) { defaultItem = {}; }
     if (parentItem === void 0) { parentItem = {}; }

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

@@ -42,10 +42,10 @@ export interface ITreeProps extends Omit<ITreeConfig, 'currentPage' | 'itemsOnPa
      */
     levelPadding?: number;
     /**
-     * Показать иконку c лева от элемента
+     * Скрыть иконку c лева от элемента
      * @example true
      */
-    showIcon?: boolean;
+    hideIcon?: boolean;
     /**
      * Кастомная иконка, заменяющая иконку раскрытия по умолчанию
      */
@@ -67,7 +67,7 @@ declare namespace Tree {
         levelPadding: number;
         hasIconExpandOnly: boolean;
         useSameSelectedItemId: boolean;
-        showIcon: boolean;
+        hideIcon: boolean;
     };
 }
 export default Tree;

package/ui/nav/Tree/Tree.js

@@ -1,16 +1,6 @@
 "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);
-};
 exports.__esModule = true;
+var react_1 = require("react");
 var hooks_1 = require("../../../hooks");
 function Tree(props) {
     var components = (0, hooks_1.useComponents)();
@@ -25,7 +15,15 @@ function Tree(props) {
         alwaysOpened: props.alwaysOpened,
         useSameSelectedItemId: props.useSameSelectedItemId
     }).treeItems;
-    return components.ui.renderView(props.view || 'nav.TreeView', __assign(__assign({}, props), { items: treeItems }));
+    var viewProps = (0, react_1.useMemo)(function () { return ({
+        items: treeItems,
+        levelPadding: props.levelPadding,
+        className: props.className,
+        hideIcon: props.hideIcon,
+        customIcon: props.customIcon,
+        hasIconExpandOnly: props.hasIconExpandOnly
+    }); }, [props.className, props.customIcon, props.hasIconExpandOnly, props.hideIcon, props.levelPadding, treeItems]);
+    return components.ui.renderView(props.view || 'nav.TreeView', viewProps);
 }
 exports["default"] = Tree;
 Tree.defaultProps = {
@@ -36,5 +34,5 @@ Tree.defaultProps = {
     levelPadding: 32,
     hasIconExpandOnly: false,
     useSameSelectedItemId: true,
-    showIcon: true
+    hideIcon: false
 };