@steroidsjs/core 2.1.0-beta.6 → 2.1.1

package/ui/nav/Router/Router.js

@@ -33,7 +33,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.treeToList = exports.walkRoutesRecursive = void 0;
+exports.treeToList = exports.walkRoutesRecursive = 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");
@@ -44,12 +44,17 @@ 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("./SsrProvider");
+var SsrProvider_1 = require("../../../providers/SsrProvider");
+exports.ROUTER_ROLE_LOGIN = 'login';
+exports.ROUTER_ROLE_MODAL = 'modal';
+exports.ROUTER_ROLE_404 = '404';
 var findRedirectPathRecursive = function (route) {
     if (!route) {
         return null;
@@ -132,7 +137,6 @@ var renderComponent = function (route, activePath, routeProps) {
     }
     return (React.createElement(Component, __assign({}, routeProps, route.componentProps)));
 };
-// TODO @navigationHoc()
 function Router(props) {
     var components = hooks_1.useComponents();
     var _a = hooks_1.useSelector(function (state) {
@@ -178,6 +182,39 @@ function Router(props) {
             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 _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));
+            }
+            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, 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 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));
+            }
+        }
+    });
     var renderItem = function (routeItem, routeProps) {
         var children = null;
         activeRouteIds.find(function (activeRouteId) {
@@ -209,7 +246,6 @@ function Router(props) {
     if (!isInitialized) {
         return null;
     }
-    // TODO double render!!..
     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())); }));
     }

package/utils/calendar.d.ts

@@ -1,4 +1,4 @@
-export declare const convertDate: (date: string | Date, fromFormats: string | string[], toFormat?: string) => any;
+export declare const convertDate: (date: string | Date, fromFormats: string | string[], toFormat?: string, utc?: boolean) => any;
 /**
  * Регулярка проверяет соответствие введенной строки формату 'hh:mm'
  * Максимальная величина - 23:59

package/utils/calendar.js

@@ -5,8 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 exports.__esModule = true;
 exports.convertDate = void 0;
 var moment_1 = __importDefault(require("moment"));
-var convertDate = function (date, fromFormats, toFormat) {
+var convertDate = function (date, fromFormats, toFormat, utc) {
     if (toFormat === void 0) { toFormat = null; }
+    if (utc === void 0) { utc = false; }
     if (!date) {
         return null;
     }
@@ -26,6 +27,12 @@ var convertDate = function (date, fromFormats, toFormat) {
     if (!momentDate) {
         return null;
     }
+    if (utc) {
+        momentDate = momentDate.utc();
+    }
+    else {
+        momentDate = momentDate.utc(true).local();
+    }
     return toFormat ? momentDate.format(toFormat) : momentDate.toDate();
 };
 exports.convertDate = convertDate;

package/utils/form.d.ts

@@ -7,16 +7,11 @@ export declare const providers: {
     redux: {
         useForm: (formId: any, initialValues: any) => any;
         useField: (formId: any, name: any, isList: any) => {
-            setValue: (value: any) => {
-                type: string;
-                formId: any;
-                name: any;
-                value: any;
-            };
+            setValue: (value: any) => any;
             errors: any;
             value: any;
         };
-        useDispatch: () => import("redux").Dispatch<any>;
+        useDispatch: () => any;
         select: (formId: any, selector: any) => any;
     };
     reducer: {

package/components/social/index.d.ts

@@ -1,11 +0,0 @@
-import facebook from './FacebookProvider';
-import google from './GoogleProvider';
-import steam from './SteamProvider';
-import vk from './VkProvider';
-declare const _default: {
-    facebook: typeof facebook;
-    google: typeof google;
-    steam: typeof steam;
-    vk: typeof vk;
-};
-export default _default;

package/components/social/index.js

@@ -1,15 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-exports.__esModule = true;
-var FacebookProvider_1 = __importDefault(require("./FacebookProvider"));
-var GoogleProvider_1 = __importDefault(require("./GoogleProvider"));
-var SteamProvider_1 = __importDefault(require("./SteamProvider"));
-var VkProvider_1 = __importDefault(require("./VkProvider"));
-exports["default"] = {
-    facebook: FacebookProvider_1["default"],
-    google: GoogleProvider_1["default"],
-    steam: SteamProvider_1["default"],
-    vk: VkProvider_1["default"]
-};

package/ui/content/Avatar/SizeContext.d.ts

@@ -1 +0,0 @@
-export {};

package/ui/content/Avatar/SizeContext.js

@@ -1,14 +0,0 @@
-"use strict";
-exports.__esModule = true;
-// const SizeContext = React.createContext<Size>('medium');
-// export interface SizeContextProps {
-//     size?: Size 
-// }
-// export const SizeContextProvider = ({ children, size }) => (
-//     <SizeContext.Consumer>
-//       {originSize => (
-//         <SizeContext.Provider value={size || originSize}>{children}</SizeContext.Provider>
-//       )}
-//     </SizeContext.Consumer>
-//   );
-// export default SizeContext;

package/ui/form/Form/SyncAddressBarHelper.d.ts

@@ -1,13 +0,0 @@
-export default class SyncAddressBarHelper {
-    static restore(initialValues: any, customizer?: any): any;
-    /**
-     * WARNING
-     * Method incorrectly saves nested objects (e.g. {foo: [{bar: 1}]}
-     *
-     * @param {object} store
-     * @param {object} values
-     * @param {boolean} useHash
-     */
-    static save(store: any, values: any, useHash?: boolean): void;
-    static cleanValues(values?: {}): {};
-}

package/ui/form/Form/SyncAddressBarHelper.js

@@ -1,119 +0,0 @@
-"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 __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]; } });
-}) : (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 path_to_regexp_1 = require("path-to-regexp");
-var queryString = __importStar(require("qs"));
-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 isEmpty_1 = __importDefault(require("lodash-es/isEmpty"));
-var isFunction_1 = __importDefault(require("lodash-es/isFunction"));
-var connected_react_router_1 = require("connected-react-router");
-var router_1 = require("../../../reducers/router");
-var SyncAddressBarHelper = /** @class */ (function () {
-    function SyncAddressBarHelper() {
-    }
-    SyncAddressBarHelper.restore = function (initialValues, customizer) {
-        if (customizer === void 0) { customizer = null; }
-        var newValues = __assign(__assign({}, initialValues), queryString.parse(window.location.hash));
-        if (customizer && isFunction_1["default"](customizer)) {
-            newValues = customizer(initialValues, queryString.parse(location.hash));
-        }
-        return newValues;
-    };
-    /**
-     * WARNING
-     * Method incorrectly saves nested objects (e.g. {foo: [{bar: 1}]}
-     *
-     * @param {object} store
-     * @param {object} values
-     * @param {boolean} useHash
-     */
-    SyncAddressBarHelper.save = function (store, values, useHash) {
-        if (useHash === void 0) { useHash = true; }
-        values = __assign({}, values);
-        Object.keys(values).map(function (key) {
-            var value = values[key];
-            if (isObject_1["default"](value) && !isArray_1["default"](value)) {
-                delete values[key];
-            }
-            else if (isArray_1["default"](value)) {
-                values[key] = value.join(',');
-            }
-            else if (isBoolean_1["default"](value)) {
-                if (!value) {
-                    delete values[key];
-                }
-                else {
-                    values[key] = 1;
-                }
-            }
-            else if (value === null) {
-                delete values[key];
-            }
-        });
-        var querySeparator = useHash ? '#' : '?';
-        var currentRoute = router_1.getRoute(store.getState() || {});
-        var params = router_1.getRouteParams(store.getState() || {});
-        if (isEmpty_1["default"](values)) {
-            if (currentRoute) {
-                store.dispatch(connected_react_router_1.push(path_to_regexp_1.compile(currentRoute.path)(params)));
-            }
-            else {
-                location.hash = null;
-            }
-        }
-        else if (currentRoute) {
-            store.dispatch(connected_react_router_1.push(path_to_regexp_1.compile(currentRoute.path)(params)
-                + querySeparator
-                + queryString.stringify(values)));
-        }
-        else {
-            location.hash = querySeparator + queryString.stringify(values);
-        }
-    };
-    SyncAddressBarHelper.cleanValues = function (values) {
-        if (values === void 0) { values = {}; }
-        var obj = __assign({}, values);
-        Object.keys(obj).forEach(function (key) {
-            if (!obj[key] || (isArray_1["default"](obj[key]) && !obj[key].length)) {
-                delete obj[key];
-            }
-        });
-        return obj;
-    };
-    return SyncAddressBarHelper;
-}());
-exports["default"] = SyncAddressBarHelper;

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

@@ -1,15 +0,0 @@
-import * as React from 'react';
-interface ISsrProviderContext {
-    history?: any;
-    staticContext?: any;
-}
-export declare const SsrProviderContext: React.Context<ISsrProviderContext>;
-interface ISsrProviderProps {
-    history?: any;
-    store?: any;
-    staticContext?: any;
-}
-export default class SsrProvider extends React.PureComponent<ISsrProviderProps> {
-    render(): JSX.Element;
-}
-export {};

package/ui/nav/Router/SsrProvider.js

@@ -1,55 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-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]; } });
-}) : (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;
-};
-exports.__esModule = true;
-exports.SsrProviderContext = void 0;
-var React = __importStar(require("react"));
-var react_redux_1 = require("react-redux");
-exports.SsrProviderContext = React.createContext(null);
-var SsrProvider = /** @class */ (function (_super) {
-    __extends(SsrProvider, _super);
-    function SsrProvider() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    SsrProvider.prototype.render = function () {
-        return (React.createElement(exports.SsrProviderContext.Provider, { value: {
-                history: this.props.history,
-                staticContext: this.props.staticContext
-            } },
-            React.createElement(react_redux_1.Provider, { store: this.props.store }, this.props.children)));
-    };
-    return SsrProvider;
-}(React.PureComponent));
-exports["default"] = SsrProvider;

package/utils/query.d.ts

@@ -1 +0,0 @@
-export declare const queryConfig: (config: any, defaultConfig?: any) => any;

package/utils/query.js

@@ -1,46 +0,0 @@
-"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.queryConfig = void 0;
-var get_1 = __importDefault(require("lodash-es/get"));
-var isObject_1 = __importDefault(require("lodash-es/isObject"));
-var isString_1 = __importDefault(require("lodash-es/isString"));
-var groupBy_1 = __importDefault(require("lodash-es/groupBy"));
-var cloneDeep_1 = __importDefault(require("lodash-es/cloneDeep"));
-var queryConfig = function (config, defaultConfig) {
-    if (defaultConfig === void 0) { defaultConfig = null; }
-    config = isObject_1["default"](config) ? config : {};
-    defaultConfig = defaultConfig ? exports.queryConfig(defaultConfig) : {};
-    config = cloneDeep_1["default"](__assign({ useHash: false, attributes: [] }, config));
-    var defaults = groupBy_1["default"](defaultConfig.attributes, 'attribute');
-    Object.keys(defaults).forEach(function (attribute) {
-        if (!config.attributes.find(function (item) { return item === attribute || item.attribute === attribute; })) {
-            config.attributes.push(attribute);
-        }
-    });
-    // Normalize attributes
-    config.attributes = config.attributes
-        .map(function (item) {
-        if (isString_1["default"](item)) {
-            item = { attribute: item };
-        }
-        item = __assign(__assign({ type: 'string', attribute: null, defaultValue: null, toFormConverter: null, toQueryConverter: null }, get_1["default"](defaults, [item.attribute, 0])), item);
-        return item;
-    })
-        .filter(function (item) { return !!item.attribute; });
-    return config;
-};
-exports.queryConfig = queryConfig;