@steroidsjs/core 2.1.0-beta.6 → 2.1.1

package/components/social/GitlabProvider.js

@@ -0,0 +1,98 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (_) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
+exports.__esModule = true;
+var GitlabProvider = /** @class */ (function () {
+    function GitlabProvider(components, config) {
+        this._components = components;
+        this.url = config.url || '';
+        this.redirectUrl = config.redirectUrl || this._components.http.getUrl('/api/v1/auth/social/proxy');
+    }
+    GitlabProvider.prototype.init = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                return [2 /*return*/, Promise.resolve()];
+            });
+        });
+    };
+    GitlabProvider.prototype.start = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                return [2 /*return*/, new Promise(function (resolve, reject) {
+                        // Open popup auth window
+                        var width = 600;
+                        var height = 400;
+                        var params = {
+                            toolbar: 'no',
+                            location: 'no',
+                            directories: 'no',
+                            status: 'no',
+                            menubar: 'no',
+                            scrollbars: 'no',
+                            resizable: 'no',
+                            width: width,
+                            height: height,
+                            left: window.screen.width / 2 - width / 2,
+                            top: window.screen.height / 2 - height / 2
+                        };
+                        var popup = window.open(_this.url, __('Авторизация через Gitlab'), Object.entries(params)
+                            .map(function (_a) {
+                            var key = _a[0], value = _a[1];
+                            return key + '=' + value;
+                        })
+                            .join(','));
+                        popup.onbeforeunload = function () { return reject(); };
+                        // This is a handler which is used by child window to pass auth result
+                        window.authCallback = function (link) {
+                            // link: http://127.0.0.1:9424/api/v1/auth/social/proxy
+                            // ?provider=gitlab_kozhindev#access_token=7b87e3de0...5518198d885d&token_type=Bearer
+                            var token = (/access_token=(\w+)/.exec(link) || [])[1];
+                            if (token) {
+                                resolve({ token: token });
+                            }
+                            else {
+                                reject();
+                            }
+                        };
+                    })];
+            });
+        });
+    };
+    return GitlabProvider;
+}());
+exports["default"] = GitlabProvider;

package/components/social/GoogleProvider.d.ts

@@ -1,7 +1,7 @@
 export default class GoogleProvider {
     _components: any;
     clientId: string;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<any>;
     start(): Promise<{
         token: any;

package/components/social/GoogleProvider.js

@@ -37,9 +37,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 };
 exports.__esModule = true;
 var GoogleProvider = /** @class */ (function () {
-    function GoogleProvider(components) {
+    function GoogleProvider(components, config) {
         this._components = components;
-        this.clientId = '';
+        this.clientId = config.clientId;
     }
     GoogleProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {

package/components/social/SteamProvider.d.ts

@@ -1,7 +1,7 @@
 export default class Vk {
     _components: any;
     clientId: string;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<void>;
     start(): Promise<unknown>;
 }

package/components/social/SteamProvider.js

@@ -57,9 +57,9 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var queryString = __importStar(require("qs"));
 var Vk = /** @class */ (function () {
-    function Vk(components) {
+    function Vk(components, config) {
         this._components = components;
-        this.clientId = '';
+        this.clientId = config.clientId;
     }
     Vk.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -74,14 +74,14 @@ var Vk = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         // Generate url
-                        var url = 'https://steamcommunity.com/openid/login?' +
-                            queryString.stringify({
+                        var url = 'https://steamcommunity.com/openid/login?'
+                            + queryString.stringify({
                                 'openid.mode': 'checkid_setup',
                                 'openid.ns': 'http://specs.openid.net/auth/2.0',
                                 'openid.identity': 'http://specs.openid.net/auth/2.0/identifier_select',
                                 'openid.claimed_id': 'http://specs.openid.net/auth/2.0/identifier_select',
                                 'openid.return_to': _this._components.http.getUrl('/api/v1/auth/social/proxy'),
-                                'openid.realm': location.origin
+                                'openid.realm': window.location.origin
                             });
                         // Open popup auth window
                         var width = 900;
@@ -107,14 +107,13 @@ var Vk = /** @class */ (function () {
                             .join(','));
                         popup.onbeforeunload = function () { return reject(); };
                         // This is a handler which is used by child window to pass auth result
-                        // @ts-ignore
                         window.authCallback = function (link) {
-                            var params = queryString.parse(new URL(link).search);
-                            if (!params['openid.mode']) {
+                            var query = queryString.parse(new URL(link).search);
+                            if (!query['openid.mode']) {
                                 reject();
                             }
                             else {
-                                resolve(params);
+                                resolve(query);
                             }
                         };
                     })];

package/components/social/VkProvider.d.ts

@@ -2,7 +2,7 @@ export default class VkProvider {
     _components: any;
     clientId: string;
     redirectUrl: any;
-    constructor(components: any);
+    constructor(components: any, config: any);
     init(): Promise<void>;
     start(): Promise<unknown>;
 }

package/components/social/VkProvider.js

@@ -57,10 +57,10 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 exports.__esModule = true;
 var queryString = __importStar(require("qs"));
 var VkProvider = /** @class */ (function () {
-    function VkProvider(components) {
+    function VkProvider(components, config) {
         this._components = components;
-        this.clientId = '';
-        this.redirectUrl = this._components.http.getUrl('/api/v1/auth/social/proxy');
+        this.clientId = config.clientId;
+        this.redirectUrl = config.redirectUrl || this._components.http.getUrl('/api/v1/auth/social/proxy');
     }
     VkProvider.prototype.init = function () {
         return __awaiter(this, void 0, void 0, function () {
@@ -75,8 +75,8 @@ var VkProvider = /** @class */ (function () {
             return __generator(this, function (_a) {
                 return [2 /*return*/, new Promise(function (resolve, reject) {
                         // Generate url
-                        var url = 'https://oauth.vk.com/authorize/?' +
-                            queryString.stringify({
+                        var url = 'https://oauth.vk.com/authorize/?'
+                            + queryString.stringify({
                                 client_id: _this.clientId,
                                 redirect_uri: _this.redirectUrl,
                                 scope: 'offline,public_profile',
@@ -106,16 +106,15 @@ var VkProvider = /** @class */ (function () {
                             .join(','));
                         popup.onbeforeunload = function () { return reject(); };
                         // This is a handler which is used by child window to pass auth result
-                        // @ts-ignore
                         window.authCallback = function (link) {
-                            var params = new URL(link).searchParams;
-                            var error = params.get('error');
+                            var query = new URL(link).searchParams;
+                            var error = query.get('error');
                             if (error) {
                                 reject(error);
                             }
                             else {
                                 resolve({
-                                    token: params.get('code')
+                                    token: query.get('code')
                                 });
                             }
                         };

package/hoc/components.d.ts

@@ -1,4 +1,4 @@
-import { IComponents } from '../hooks/useComponents';
+import { IComponents } from '../providers/ComponentsProvider';
 export interface IComponentsHocOutput extends IComponents {
     components?: IComponents;
 }

package/hoc/components.js

@@ -36,7 +36,7 @@ var exportComponents = function (components, names) {
     var props = {};
     names.forEach(function (items) {
         [].concat(items).forEach(function (name) {
-            props[name] = window.SteroidsComponents[name];
+            props[name] = components[name];
         });
     });
     return props;

package/hoc/file.d.ts

@@ -18,6 +18,7 @@ export interface IFileHocOutput {
     files?: any[];
     onBrowse?: any;
     onRemove?: any;
+    onAdd?: any;
 }
 declare const _default: () => any;
 export default _default;

package/hoc/layout.d.ts

@@ -1,4 +1,3 @@
-import { IRoute } from '../reducers/router';
 import { IComponentsHocOutput } from './components';
 import { IRouteItem } from '../ui/nav/Router/Router';
 /**
@@ -8,7 +7,7 @@ import { IRouteItem } from '../ui/nav/Router/Router';
  * авторизации (первая загрузка страницы, логин/регистация и выход).
  */
 export interface ILayoutHocInput {
-    route?: IRoute;
+    route?: IRouteItem;
     user?: {
         role: string;
     };

package/hooks/index.d.ts

@@ -4,4 +4,5 @@ import useDataProvider from './useDataProvider';
 import useDataSelect from './useDataSelect';
 import useSelector from './useSelector';
 import useForm from './useForm';
-export { useBem, useComponents, useDataProvider, useDataSelect, useSelector, useForm, };
+import useSsr from './useSsr';
+export { useBem, useComponents, useDataProvider, useDataSelect, useSelector, useForm, useSsr, };

package/hooks/index.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 exports.__esModule = true;
-exports.useForm = exports.useSelector = exports.useDataSelect = exports.useDataProvider = exports.useComponents = exports.useBem = void 0;
+exports.useSsr = exports.useForm = exports.useSelector = exports.useDataSelect = exports.useDataProvider = exports.useComponents = exports.useBem = void 0;
 var useBem_1 = __importDefault(require("./useBem"));
 exports.useBem = useBem_1["default"];
 var useComponents_1 = __importDefault(require("./useComponents"));
@@ -16,3 +16,5 @@ var useSelector_1 = __importDefault(require("./useSelector"));
 exports.useSelector = useSelector_1["default"];
 var useForm_1 = __importDefault(require("./useForm"));
 exports.useForm = useForm_1["default"];
+var useSsr_1 = __importDefault(require("./useSsr"));
+exports.useSsr = useSsr_1["default"];

package/hooks/useAbsolutePositioning.d.ts

@@ -10,6 +10,11 @@ interface IStyleObj {
  */
 declare type Position = 'top' | 'topLeft' | 'topRight' | 'bottom' | 'bottomLeft' | 'bottomRight' | 'left' | 'leftTop' | 'leftBottom' | 'right' | 'rightTop' | 'rightBottom' | string;
 export interface IAbsolutePositioningInputProps {
+    /**
+     * Включает "умное" позиционирование - если компонент не может быть помещен в промежуток между целевым компонентом
+     * и краем viewport, тогда он будет показан в противоположном направлении от заданного в свойстве position.
+     */
+    autoPositioning?: boolean;
     /**
      * Дочерние элементы
      */

package/hooks/useAbsolutePositioning.js

@@ -12,11 +12,11 @@ function useAbsolutePositioning(props) {
     }), style = _d[0], setStyle = _d[1];
     var timerRef = react_1.useRef(null);
     var calculateAbsolutePosition = react_1.useCallback(function (newPosition, childRef, componentSize) {
-        if (newPosition === void 0) { newPosition = 'pos'; }
         var newStyle = { left: null, right: null, top: null };
         var _a = childRef.getBoundingClientRect(), top = _a.top, right = _a.right, left = _a.left, width = _a.width, height = _a.height;
         var parentDimensions = { top: top, right: right, left: left, width: width, height: height };
         parentDimensions.top += window.scrollY;
+        var useAutoPositioning = props.autoPositioning;
         // eslint-disable-next-line default-case
         switch (newPosition) {
             case 'top':
@@ -24,7 +24,7 @@ function useAbsolutePositioning(props) {
             case 'topRight':
                 // Проверка - выходит ли tooltip за верхний край страницы?
                 // Если да - меняем позицию на bottom
-                if ((parentDimensions.top - window.scrollY) <= Math.round(componentSize.height + props.gap)) {
+                if (useAutoPositioning && ((parentDimensions.top - window.scrollY) <= Math.round(componentSize.height + props.gap))) {
                     newStyle.top = parentDimensions.top + parentDimensions.height;
                     newPosition = newPosition.replace('top', 'bottom');
                 }
@@ -35,9 +35,9 @@ function useAbsolutePositioning(props) {
             case 'bottom':
             case 'bottomLeft':
             case 'bottomRight':
-                /// Проверка - выходит ли tooltip за нижний край страницы?
+                // Проверка - выходит ли tooltip за нижний край страницы?
                 // Если да - меняем позицию на top
-                if ((window.innerHeight - (parentDimensions.top + parentDimensions.height - window.scrollY))
+                if (useAutoPositioning && ((window.innerHeight - (parentDimensions.top + parentDimensions.height - window.scrollY)))
                     <= Math.round(componentSize.height + props.gap)) {
                     newStyle.top = parentDimensions.top - componentSize.height;
                     newPosition = newPosition.replace('bottom', 'top');
@@ -51,7 +51,7 @@ function useAbsolutePositioning(props) {
             case 'leftBottom':
                 // Проверка - выходит ли tooltip за левый край страницы?
                 // Если да - меняем позицию на right
-                if (parentDimensions.left <= Math.round(componentSize.width + props.gap)) {
+                if (useAutoPositioning && (parentDimensions.left <= Math.round(componentSize.width + props.gap))) {
                     newStyle.left = parentDimensions.right;
                     newPosition = newPosition.replace('left', 'right');
                 }
@@ -64,7 +64,7 @@ function useAbsolutePositioning(props) {
             case 'rightBottom':
                 // Проверка - выходит ли tooltip за правый край страницы?
                 // Если да - меняем позицию на left
-                if (document.body.clientWidth - parentDimensions.right <= Math.round(componentSize.width + props.gap)) {
+                if (useAutoPositioning && (document.body.clientWidth - parentDimensions.right <= Math.round(componentSize.width + props.gap))) {
                     newStyle.left = parentDimensions.left - componentSize.width;
                     newPosition = newPosition.replace('right', 'left');
                 }

package/hooks/useAddressBar.js

@@ -8,6 +8,7 @@ var get_1 = __importDefault(require("lodash-es/get"));
 var query_string_1 = __importDefault(require("query-string"));
 var connected_react_router_1 = require("connected-react-router");
 var toInteger_1 = __importDefault(require("lodash-es/toInteger"));
+var has_1 = __importDefault(require("lodash-es/has"));
 var react_1 = require("react");
 var useSelector_1 = __importDefault(require("../hooks/useSelector"));
 var useDispatch_1 = __importDefault(require("../hooks/useDispatch"));
@@ -15,13 +16,14 @@ var defaultProps = {
     enable: false,
     useHash: false
 };
+var ARRAY_VALUE_SEPARATOR = '_';
 var defaultFromStringConverter = function (value, type, item) {
     type = type || '';
     // Array
     if (type.substr(-2) === '[]') {
         var subType_1 = type.substr(0, type.length - 2);
         return value
-            ? value.split(',').map(function (v) { return exports.defaultFromStringConverter(v, subType_1, item); })
+            ? value.split(ARRAY_VALUE_SEPARATOR).map(function (v) { return exports.defaultFromStringConverter(v, subType_1, item); })
             : null;
     }
     // Single
@@ -41,7 +43,7 @@ var defaultToStringConverter = function (value, type, item) {
     // Array
     if (type.substr(-2) === '[]') {
         return value
-            ? value.join(',')
+            ? value.join(ARRAY_VALUE_SEPARATOR)
             : null;
     }
     // Single
@@ -58,13 +60,16 @@ exports.defaultToStringConverter = defaultToStringConverter;
 var queryRestore = function (model, location, useHash) {
     var values = query_string_1["default"].parse(useHash ? location.hash : location.search);
     var result = {};
-    model.attributes.forEach(function (item) {
-        if (typeof item !== 'string') {
-            var converter = item.fromStringConverter || exports.defaultFromStringConverter;
-            var value = converter(values[item.attribute], item.type, item);
-            if (value !== null || item.defaultValue !== null) {
-                result[item.attribute] = value !== null ? value : item.defaultValue;
-            }
+    var attributes = (model === null || model === void 0 ? void 0 : model.attributes) || Object.keys(values);
+    attributes.forEach(function (item) {
+        if (typeof item === 'string') {
+            item = { attribute: item };
+        }
+        var defaultValue = has_1["default"](item, 'defaultValue') ? item.defaultValue : null;
+        var converter = item.fromStringConverter || exports.defaultFromStringConverter;
+        var value = converter(values[item.attribute], item.type || 'string', item);
+        if (value !== null || defaultValue !== null) {
+            result[item.attribute] = value !== null ? value : defaultValue;
         }
     });
     return result;
@@ -78,10 +83,15 @@ exports.queryRestore = queryRestore;
  */
 var queryReplace = function (model, location, values, useHash) {
     var result = {};
-    model.attributes.forEach(function (item) {
-        if (typeof item !== 'string' && (values === null || values === void 0 ? void 0 : values[item.attribute]) !== item.defaultValue) {
+    var attributes = (model === null || model === void 0 ? void 0 : model.attributes) || Object.keys(values);
+    attributes.forEach(function (item) {
+        if (typeof item === 'string') {
+            item = { attribute: item };
+        }
+        var defaultValue = has_1["default"](item, 'defaultValue') ? item.defaultValue : null;
+        if ((values === null || values === void 0 ? void 0 : values[item.attribute]) !== defaultValue) {
             var converter = item.toStringConverter || exports.defaultToStringConverter;
-            var value = converter(values === null || values === void 0 ? void 0 : values[item.attribute], item.type, item);
+            var value = converter(values === null || values === void 0 ? void 0 : values[item.attribute], item.type || 'string', item);
             if (value !== null) {
                 result[item.attribute] = value;
             }
@@ -108,7 +118,7 @@ function useAddressBar(config) {
     var location = useSelector_1["default"](function (state) { return get_1["default"](state, 'router.location') || null; });
     // Initial query
     var initialQueryRef = react_1.useRef(null);
-    if (!initialQueryRef.current) {
+    if (!initialQueryRef.current && config.enable) {
         initialQueryRef.current = exports.queryRestore(config.model, location, config.useHash);
     }
     // Update handler

package/hooks/useApplication.d.ts

@@ -1,29 +1,13 @@
-import * as React from 'react';
-import { PropsWithChildren } from 'react';
-import { IComponents } from './useComponents';
+/// <reference types="react" />
+import ClientStorageComponent from '../components/ClientStorageComponent';
+import HtmlComponent from '../components/HtmlComponent';
+import StoreComponent from '../components/StoreComponent';
+import UiComponent from '../components/UiComponent';
+import MetaComponent from '../components/MetaComponent';
+import { IComponents } from '../providers/ComponentsProvider';
 import { IRouteItem } from '../ui/nav/Router/Router';
-export interface IScreen {
-    width: number;
-    media: Record<string, any>;
-    setMedia: any;
-    isPhone: () => boolean;
-    isTablet: () => boolean;
-    isDesktop: () => boolean;
-    getDeviceType: () => string;
-}
-export declare const ScreenContext: React.Context<IScreen>;
-export interface IScreenProviderProps extends PropsWithChildren<any> {
-    media?: Record<string, any>;
-    skipTimeout?: boolean;
-}
-export declare const SCREEN_PHONE = "phone";
-export declare const SCREEN_TABLET = "tablet";
-export declare const SCREEN_DESKTOP = "desktop";
-declare global {
-    interface Window {
-        SteroidsComponents: IComponents;
-    }
-}
+import MetricsComponent from '../components/MetricsComponent';
+import { IScreenProviderProps } from '../providers/ScreenProvider';
 /**
  * Application HOC
  * Обертка над корневым компонентом приложения, используется только в `Application.tsx`. Добавляет через React Context
@@ -48,5 +32,24 @@ export interface IApplicationHookResult {
     renderApplication: (children?: any) => JSX.Element;
     components: IComponents;
 }
-export declare const ComponentsContext: React.Context<IComponents>;
+export declare const defaultComponents: {
+    clientStorage: {
+        className: typeof ClientStorageComponent;
+    };
+    html: {
+        className: typeof HtmlComponent;
+    };
+    meta: {
+        className: typeof MetaComponent;
+    };
+    store: {
+        className: typeof StoreComponent;
+    };
+    ui: {
+        className: typeof UiComponent;
+    };
+    metrics: {
+        className: typeof MetricsComponent;
+    };
+};
 export default function useApplication(config?: IApplicationHookConfig): IApplicationHookResult;