@gravity-ui/page-constructor 1.16.3 → 1.17.0

package/build/esm/navigation/components/NavigationItem/components/NavigationLink/NavigationLink.js

@@ -0,0 +1,27 @@
+import { __rest } from "tslib";
+import React, { Fragment, useContext } from 'react';
+import { ContentWrapper } from '../ContentWrapper/ContentWrapper';
+import { NavigationArrow } from '../../../../../icons';
+import { RouterLink } from '../../../../../components';
+import { block, getLinkProps } from '../../../../../utils';
+import { getMediaImage } from '../../../../../components/Media/Image/utils';
+import { LocationContext } from '../../../../../context/locationContext';
+import './NavigationLink.css';
+const b = block('navigation-link');
+export const NavigationLink = (props) => {
+    const { hostname, Link } = useContext(LocationContext);
+    const { url, text, icon, arrow, target, className } = props, rest = __rest(props, ["url", "text", "icon", "arrow", "target", "className"]);
+    const linkExtraProps = getLinkProps(url, hostname, target);
+    const iconData = icon && getMediaImage(icon);
+    const classes = b(null, className);
+    const content = (React.createElement(Fragment, null,
+        React.createElement(ContentWrapper, { text: text, icon: iconData }),
+        arrow && React.createElement(NavigationArrow, { className: b('arrow') })));
+    if ((linkExtraProps === null || linkExtraProps === void 0 ? void 0 : linkExtraProps.target) || !Link) {
+        return (React.createElement("a", Object.assign({ href: url, title: text, className: classes }, rest, linkExtraProps), content));
+    }
+    else {
+        return (React.createElement(RouterLink, { href: url, passHref: true },
+            React.createElement("a", Object.assign({}, rest, { className: classes }), content)));
+    }
+};

package/build/esm/sub-blocks/BasicCard/BasicCard.js

@@ -1,3 +1,4 @@
+import { __rest } from "tslib";
 import React from 'react';
 import { block } from '../../utils';
 import CardBase from '../../components/CardBase/CardBase';
@@ -7,9 +8,9 @@ import { getMediaImage } from '../../components/Media/Image/utils';
 import './BasicCard.css';
 const b = block('basic-card');
 const BasicCard = (props) => {
-    const { url, title, text, border, icon, additionalInfo, links, buttons } = props;
+    const { title, text, icon, additionalInfo, links, buttons } = props, cardParams = __rest(props, ["title", "text", "icon", "additionalInfo", "links", "buttons"]);
     const iconProps = icon && getMediaImage(icon);
-    return (React.createElement(CardBase, { className: b(), url: url, border: border },
+    return (React.createElement(CardBase, Object.assign({ className: b() }, cardParams),
         React.createElement(CardBase.Content, null,
             iconProps && React.createElement(Image, Object.assign({}, iconProps, { className: b('icon') })),
             React.createElement(Content, { title: title, text: text, additionalInfo: additionalInfo, links: links, buttons: buttons, colSizes: { all: 12, md: 12 }, size: "s" }))));

package/build/esm/sub-blocks/BasicCard/schema.d.ts

@@ -19,6 +19,10 @@ export declare const BasicCard: {
                     pattern: string;
                 })[];
             };
+            target: {
+                type: string;
+                enum: string[];
+            };
             title: {
                 oneOf: ({
                     type: string;

package/build/esm/sub-blocks/BasicCard/schema.js

@@ -9,6 +9,9 @@ export const BasicCard = {
         required: ['url'],
         properties: Object.assign(Object.assign(Object.assign(Object.assign({}, BaseProps), CardBase), BasicCardContentProps), { url: {
                 type: 'string',
-            }, icon: ImageProps }),
+            }, icon: ImageProps, target: {
+                type: 'string',
+                enum: ['_blank', '_parent', '_top', '_self'],
+            } }),
     },
 };

package/build/esm/utils/url.d.ts

@@ -6,6 +6,7 @@ export declare const EXTERNAL_LINK_PROPS: {
 export declare function getLinkProps(url: string, hostname?: string, target?: string): {
     target: string | undefined;
 };
+export declare function isAbsoluteUrl(url: string | URL): boolean;
 export declare function isLinkExternal(url: string, routerHostname?: string): boolean;
 export declare function getNonLocaleHostName(hostname: string): string;
 export declare function setUrlTld(url: string, tld?: string): string;

package/build/esm/utils/url.js

@@ -1,21 +1,23 @@
 import { parse, format } from 'url';
+const EXAMPLE_URL = 'https://example.org';
 export const EXTERNAL_LINK_PROPS = { target: '_blank', rel: 'noopener noreferrer' };
 export function getLinkProps(url, hostname, target) {
     let linkProps = { target };
-    if (target === '_blank' || isLinkExternal(url, hostname)) {
+    if (isLinkExternal(url, hostname)) {
         linkProps = Object.assign(Object.assign({}, linkProps), EXTERNAL_LINK_PROPS);
     }
     return linkProps;
 }
+export function isAbsoluteUrl(url) {
+    // Using example URL as base for relative links
+    const urlObj = new URL(url, EXAMPLE_URL);
+    return (
+    // Compare url origin with example and check that original url was not example one
+    urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL)));
+}
 export function isLinkExternal(url, routerHostname) {
-    if (!routerHostname) {
-        return true;
-    }
-    const { hostname } = parse(url);
-    if (!hostname) {
-        return false;
-    }
-    return getNonLocaleHostName(hostname) !== getNonLocaleHostName(routerHostname);
+    return (isAbsoluteUrl(url) &&
+        getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname !== null && routerHostname !== void 0 ? routerHostname : ''));
 }
 export function getNonLocaleHostName(hostname) {
     return hostname.replace(/\.(ru|com)$/, '');

package/build/esm/utils/url.test.d.ts

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

package/build/esm/utils/url.test.js

@@ -0,0 +1,74 @@
+import { getLinkProps, isAbsoluteUrl, isLinkExternal } from './url';
+describe('URL utils check', () => {
+    test.each([
+        ['https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash', true],
+        ['http://example.net/path', true],
+        ['/p/a/t/h?query=string&query2=1#hash', false],
+        ['/path', false],
+        ['path', false],
+    ])("isAbsoluteUrl('%s') should return '%s'", (url, result) => {
+        expect(isAbsoluteUrl(url)).toEqual(result);
+    });
+    test.each([
+        [
+            'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',
+            'example.net',
+            true,
+        ],
+        [
+            'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',
+            'sub.example.com',
+            false,
+        ],
+        [
+            'https://user:pass@sub.example.com:8080/p/a/t/h?query=string&query2=1#hash',
+            undefined,
+            true,
+        ],
+        ['http://example.net/path', 'example.net', false],
+        ['http://example.net/path', 'sub.example.com', true],
+        ['http://example.net/path', undefined, true],
+        ['/p/a/t/h?query=string&query2=1#hash', 'example.net', false],
+        ['/p/a/t/h?query=string&query2=1#hash', undefined, false],
+        ['/path', 'example.net', false],
+        ['/path', undefined, false],
+        ['path', 'example.net', false],
+        ['path', undefined, false],
+    ])("isLinkExternal('%s', '%s') should return '%s'", (url, hostname, result) => {
+        expect(isLinkExternal(url, hostname)).toEqual(result);
+    });
+    test.each([
+        ['http://example.net/path', 'example.net', '_blank', { target: '_blank' }],
+        ['http://example.net/path', 'example.net', undefined, {}],
+        [
+            'http://example.net/path',
+            'example.com',
+            '_blank',
+            { target: '_blank', rel: 'noopener noreferrer' },
+        ],
+        [
+            'http://example.net/path',
+            'example.com',
+            undefined,
+            { target: '_blank', rel: 'noopener noreferrer' },
+        ],
+        [
+            'http://example.net/path',
+            undefined,
+            '_blank',
+            { target: '_blank', rel: 'noopener noreferrer' },
+        ],
+        [
+            'http://example.net/path',
+            undefined,
+            undefined,
+            { target: '_blank', rel: 'noopener noreferrer' },
+        ],
+        ['/path', 'example.net', '_blank', { target: '_blank' }],
+        ['/path', 'example.net', undefined, {}],
+        ['/path', undefined, '_blank', { target: '_blank' }],
+        ['/path', undefined, undefined, {}],
+    ])("getLinkProps('%s', '%s', '%s') should return '%s'", (url, hostname, target, result) => {
+        expect(getLinkProps(url, hostname, target)).toEqual(result);
+    });
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.16.3",
+  "version": "1.17.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -49,6 +49,7 @@
     "@gravity-ui/i18n": "^1.0.0",
     "bem-cn-lite": "^4.0.0",
     "lodash": "^4.17.21",
+    "react-github-btn": "^1.4.0",
     "react-player": "^2.9.0",
     "react-slick": "^0.28.1",
     "react-spring": "^9.3.0",

package/server/models/constructor-items/sub-blocks.d.ts

@@ -106,6 +106,7 @@ export interface BackgroundCardProps extends CardBaseProps, Omit<ContentBlockPro
 export interface BasicCardProps extends CardBaseProps, Omit<ContentBlockProps, 'colSizes' | 'centered' | 'size' | 'theme'> {
     url: string;
     icon?: ImageProps;
+    target?: string;
 }
 export interface BannerCardProps {
     title: string;

package/server/models/navigation.d.ts

@@ -4,13 +4,19 @@ export declare enum NavigationItemType {
     Link = "link",
     Dropdown = "dropdown",
     Button = "button",
-    Social = "social"
+    Social = "social",
+    GithubStars = "github-stars"
 }
 export interface NavigationItemBase {
     text: string;
     icon?: ImageProps;
     url?: string;
 }
+export interface NavigationGithubButton extends Omit<NavigationItemBase, 'icon'> {
+    type: NavigationItemType.GithubStars;
+    url: string;
+    label?: string;
+}
 export interface NavigationLinkItem extends Omit<NavigationItemBase, 'url'> {
     type: NavigationItemType.Link;
     url: string;
@@ -29,8 +35,8 @@ export interface NavigationSocialItem extends Omit<NavigationItemBase, 'text'> {
     icon: ImageProps;
     url: string;
 }
-export type NavigationItemModel = NavigationLinkItem | NavigationButtonItem | NavigationDropdownItem;
-export type NavigationItemData = NavigationLinkItem | NavigationButtonItem | NavigationSocialItem | DropdownItemData;
+export type NavigationItemModel = NavigationLinkItem | NavigationButtonItem | NavigationDropdownItem | NavigationGithubButton;
+export type NavigationItemData = NavigationLinkItem | NavigationButtonItem | NavigationSocialItem | DropdownItemData | NavigationGithubButton;
 export type DropdownItemData = Omit<NavigationDropdownItem, 'items'>;
 export interface NavigationLogoData {
     icon: ImageProps;

package/server/models/navigation.js

@@ -7,4 +7,5 @@ var NavigationItemType;
     NavigationItemType["Dropdown"] = "dropdown";
     NavigationItemType["Button"] = "button";
     NavigationItemType["Social"] = "social";
+    NavigationItemType["GithubStars"] = "github-stars";
 })(NavigationItemType = exports.NavigationItemType || (exports.NavigationItemType = {}));

package/server/utils/url.d.ts

@@ -6,6 +6,7 @@ export declare const EXTERNAL_LINK_PROPS: {
 export declare function getLinkProps(url: string, hostname?: string, target?: string): {
     target: string | undefined;
 };
+export declare function isAbsoluteUrl(url: string | URL): boolean;
 export declare function isLinkExternal(url: string, routerHostname?: string): boolean;
 export declare function getNonLocaleHostName(hostname: string): string;
 export declare function setUrlTld(url: string, tld?: string): string;

package/server/utils/url.js

@@ -1,25 +1,28 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAbsolutePath = exports.getPageSearchParams = exports.setUrlTld = exports.getNonLocaleHostName = exports.isLinkExternal = exports.getLinkProps = exports.EXTERNAL_LINK_PROPS = void 0;
+exports.getAbsolutePath = exports.getPageSearchParams = exports.setUrlTld = exports.getNonLocaleHostName = exports.isLinkExternal = exports.isAbsoluteUrl = exports.getLinkProps = exports.EXTERNAL_LINK_PROPS = void 0;
 const url_1 = require("url");
+const EXAMPLE_URL = 'https://example.org';
 exports.EXTERNAL_LINK_PROPS = { target: '_blank', rel: 'noopener noreferrer' };
 function getLinkProps(url, hostname, target) {
     let linkProps = { target };
-    if (target === '_blank' || isLinkExternal(url, hostname)) {
+    if (isLinkExternal(url, hostname)) {
         linkProps = Object.assign(Object.assign({}, linkProps), exports.EXTERNAL_LINK_PROPS);
     }
     return linkProps;
 }
 exports.getLinkProps = getLinkProps;
+function isAbsoluteUrl(url) {
+    // Using example URL as base for relative links
+    const urlObj = new URL(url, EXAMPLE_URL);
+    return (
+    // Compare url origin with example and check that original url was not example one
+    urlObj.origin !== EXAMPLE_URL || (typeof url === 'string' && url.startsWith(EXAMPLE_URL)));
+}
+exports.isAbsoluteUrl = isAbsoluteUrl;
 function isLinkExternal(url, routerHostname) {
-    if (!routerHostname) {
-        return true;
-    }
-    const { hostname } = (0, url_1.parse)(url);
-    if (!hostname) {
-        return false;
-    }
-    return getNonLocaleHostName(hostname) !== getNonLocaleHostName(routerHostname);
+    return (isAbsoluteUrl(url) &&
+        getNonLocaleHostName(new URL(url).hostname) !== getNonLocaleHostName(routerHostname !== null && routerHostname !== void 0 ? routerHostname : ''));
 }
 exports.isLinkExternal = isLinkExternal;
 function getNonLocaleHostName(hostname) {