@gravity-ui/page-constructor 4.3.0 → 4.5.0

package/build/esm/components/YFMWrapper/YFMWrapper.d.ts

@@ -1,9 +1,9 @@
 import { ClassNameProps, Modifiers } from '../../models';
-export interface YFMWrapperProps {
-    className?: string;
+export interface YFMWrapperProps extends ClassNameProps {
     content: string;
     modifiers?: Modifiers;
     itemProp?: string;
+    id?: string;
 }
-declare const YFMWrapper: ({ content, modifiers, className, itemProp, }: YFMWrapperProps & ClassNameProps) => JSX.Element;
+declare const YFMWrapper: ({ content, modifiers, className, itemProp, id }: YFMWrapperProps) => JSX.Element;
 export default YFMWrapper;

package/build/esm/components/YFMWrapper/YFMWrapper.js

@@ -5,5 +5,5 @@ import block from 'bem-cn-lite';
 import toSnakeCase from 'snakecase-keys';
 import { HTML } from '../../components';
 const yfm = block('yfm');
-const YFMWrapper = ({ content, modifiers, className, itemProp, }) => (React.createElement(HTML, { className: yfm(modifiers ? toSnakeCase(modifiers) : {}, className), itemProp: itemProp }, content));
+const YFMWrapper = ({ content, modifiers, className, itemProp, id }) => (React.createElement(HTML, { className: yfm(modifiers ? toSnakeCase(modifiers) : {}, className), itemProp: itemProp, id: id }, content));
 export default YFMWrapper;

package/build/esm/constructor-items.d.ts

@@ -29,3 +29,10 @@ export declare const subBlockMap: {
     content: (props: import("./models").ContentBlockProps & import("./models").ClassNameProps) => JSX.Element;
     quote: (props: import("./models").QuoteProps) => JSX.Element;
 };
+export declare const navItemMap: {
+    button: import("react").FC<Pick<import("./navigation/models").NavigationItemProps, "className"> & import("./models").ButtonProps>;
+    social: import("react").FC<import("./navigation/components/SocialIcon/SocialIcon").NavigationSocialItemOwnProps>;
+    dropdown: ({ text, icon, className, iconSize, hidePopup, items, isActive, ...props }: import("./navigation/models").NavigationItemProps & import("./models").NavigationDropdownItem) => JSX.Element;
+    link: import("react").FC<import("./navigation/models").NavigationItemProps & import("./models").NavigationLinkItem>;
+    "github-button": ({ text, url, className, label, size, icon, }: import("./navigation/models").NavigationItemProps & import("./models").NavigationGithubButton) => JSX.Element;
+};

package/build/esm/constructor-items.js

@@ -1,5 +1,7 @@
 import { BannerBlock, CardLayoutBlock, CompaniesBlock, ContentLayoutBlock, ExtendedFeaturesBlock, FilterBlock, HeaderBlock, HeaderSliderBlock, IconsBlock, InfoBlock, MapBlock, MediaBlock, PromoFeaturesBlock, QuestionsBlock, ShareBlock, SliderBlock, TableBlock, TabsBlock, } from './blocks';
-import { BlockType, SubBlockType } from './models';
+import { BlockType, NavigationItemType, SubBlockType } from './models';
+import { GithubButton, NavigationButton, NavigationDropdown, NavigationLink, } from './navigation/components/NavigationItem';
+import SocialIcon from './navigation/components/SocialIcon/SocialIcon';
 import { BackgroundCard, BannerCard, BasicCard, Content, Divider, LayoutItem, MediaCard, PriceDetailed, Quote, } from './sub-blocks';
 export const blockMap = {
     [BlockType.SliderBlock]: SliderBlock,
@@ -32,3 +34,10 @@ export const subBlockMap = {
     [SubBlockType.Content]: Content,
     [SubBlockType.Quote]: Quote,
 };
+export const navItemMap = {
+    [NavigationItemType.Button]: NavigationButton,
+    [NavigationItemType.Social]: SocialIcon,
+    [NavigationItemType.Dropdown]: NavigationDropdown,
+    [NavigationItemType.Link]: NavigationLink,
+    [NavigationItemType.GithubButton]: GithubButton,
+};

package/build/esm/containers/PageConstructor/PageConstructor.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
 import '@doc-tools/transform/dist/js/yfm';
-import { blockMap, subBlockMap } from '../../constructor-items';
+import { blockMap, navItemMap, subBlockMap } from '../../constructor-items';
 import { CustomConfig, CustomItems, NavigationData, PageContent, ShouldRenderBlock } from '../../models';
 import './PageConstructor.css';
 export type ItemMap = typeof blockMap & typeof subBlockMap & CustomItems;
+export type NavItemMap = typeof navItemMap & CustomItems;
 export interface PageConstructorProps {
     content?: PageContent;
     shouldRenderBlock?: ShouldRenderBlock;

package/build/esm/containers/PageConstructor/PageConstructor.js

@@ -4,14 +4,14 @@ import '@doc-tools/transform/dist/js/yfm';
 import blockOrigin from 'bem-cn-lite';
 import BackgroundMedia from '../../components/BackgroundMedia/BackgroundMedia';
 import { UIKIT_ROOT_CLASS } from '../../components/constants';
-import { blockMap, subBlockMap } from '../../constructor-items';
+import { blockMap, navItemMap, subBlockMap } from '../../constructor-items';
 import { AnimateContext } from '../../context/animateContext';
 import { InnerContext } from '../../context/innerContext';
 import { useTheme } from '../../context/theme';
 import { Grid } from '../../grid';
-import { BlockType, BlockTypes, HeaderBlockTypes, SubBlockTypes, } from '../../models';
+import { BlockType, BlockTypes, HeaderBlockTypes, NavigationItemTypes, SubBlockTypes, } from '../../models';
 import Layout from '../../navigation/containers/Layout/Layout';
-import { block as cnBlock, getCustomBlockTypes, getCustomHeaderTypes, getCustomItems, getCustomSubBlockTypes, getHeaderBlock, getOrderedBlocks, getThemedValue, } from '../../utils';
+import { block as cnBlock, getCustomItems, getCustomTypes, getHeaderBlock, getOrderedBlocks, getThemedValue, } from '../../utils';
 import { ConstructorBlocks } from './components/ConstructorBlocks';
 import { ConstructorHeader } from './components/ConstructorItem';
 import { ConstructorRow } from './components/ConstructorRow';
@@ -22,10 +22,15 @@ export const Constructor = (props) => {
     const { content: { blocks = [], background = {} } = {}, renderMenu, shouldRenderBlock, navigation, custom, } = props;
     const { context } = useMemo(() => ({
         context: {
-            blockTypes: [...BlockTypes, ...getCustomBlockTypes(custom)],
-            subBlockTypes: [...SubBlockTypes, ...getCustomSubBlockTypes(custom)],
-            headerBlockTypes: [...HeaderBlockTypes, ...getCustomHeaderTypes(custom)],
-            itemMap: Object.assign(Object.assign(Object.assign({}, blockMap), subBlockMap), getCustomItems(custom)),
+            blockTypes: [...BlockTypes, ...getCustomTypes(['blocks', 'headers'], custom)],
+            subBlockTypes: [...SubBlockTypes, ...getCustomTypes(['subBlocks'], custom)],
+            headerBlockTypes: [...HeaderBlockTypes, ...getCustomTypes(['headers'], custom)],
+            navigationBlockTypes: [
+                ...NavigationItemTypes,
+                ...getCustomTypes(['navigation'], custom),
+            ],
+            itemMap: Object.assign(Object.assign(Object.assign({}, blockMap), subBlockMap), getCustomItems(['blocks', 'headers', 'subBlocks'], custom)),
+            navItemMap: Object.assign(Object.assign({}, navItemMap), getCustomItems(['navigation'], custom)),
             loadables: custom === null || custom === void 0 ? void 0 : custom.loadable,
             shouldRenderBlock,
             customization: {

package/build/esm/context/innerContext/InnerContext.d.ts

@@ -1,11 +1,13 @@
 import React from 'react';
-import { ItemMap } from '../../containers/PageConstructor/PageConstructor';
+import { ItemMap, NavItemMap } from '../../containers/PageConstructor/PageConstructor';
 import { CustomConfig, LoadableConfig, ShouldRenderBlock } from '../../models';
 export interface InnerContextType {
     blockTypes: string[];
     subBlockTypes: string[];
     headerBlockTypes: string[];
+    navigationBlockTypes: string[];
     itemMap: ItemMap;
+    navItemMap: NavItemMap;
     loadables?: LoadableConfig;
     shouldRenderBlock?: ShouldRenderBlock;
     customization?: Pick<CustomConfig, 'decorators'>;

package/build/esm/context/innerContext/InnerContext.js

@@ -3,5 +3,7 @@ export const InnerContext = React.createContext({
     blockTypes: [],
     subBlockTypes: [],
     headerBlockTypes: [],
+    navigationBlockTypes: [],
     itemMap: {},
+    navItemMap: {},
 });

package/build/esm/editor/store/index.js

@@ -2,7 +2,7 @@ import { __rest } from "tslib";
 import { useMemo, useReducer } from 'react';
 import { DEFAULT_THEME } from '../../components/constants';
 import { HeaderBlockTypes } from '../../models';
-import { getCustomHeaderTypes, getHeaderBlock } from '../../utils';
+import { getCustomTypes, getHeaderBlock } from '../../utils';
 import { EditBlockControls } from '../components/EditBlock/EditBlock';
 import { ViewModeItem } from '../types';
 import { ADD_BLOCK, COPY_BLOCK, DELETE_BLOCK, ORDER_BLOCK, SELECT_BLOCK, UPDATE_CONTENT, UPDATE_THEME, UPDATE_VIEW_MODE, reducer, } from './reducer';
@@ -16,7 +16,7 @@ export function useEditorState({ content: intialContent, custom }) {
         theme: DEFAULT_THEME,
     });
     return useMemo(() => {
-        const headerBlockTypes = [...HeaderBlockTypes, ...getCustomHeaderTypes(custom)];
+        const headerBlockTypes = [...HeaderBlockTypes, ...getCustomTypes(['headers'], custom)];
         const contentHasHeader = Boolean(getHeaderBlock(content.blocks, headerBlockTypes));
         const checkIsHeader = (type) => headerBlockTypes.includes(type);
         const onAdd = (block) => {

package/build/esm/editor/utils/index.d.ts

@@ -8,6 +8,7 @@ export declare const addCustomDecorator: (decorators: BlockDecorator[], custom?:
     blocks?: import("../../models").CustomItems | undefined;
     subBlocks?: import("../../models").CustomItems | undefined;
     headers?: import("../../models").CustomItems | undefined;
+    navigation?: import("../../models").CustomItems | undefined;
     loadable?: import("../../models").LoadableConfig | undefined;
 };
 export declare const getBlockId: ({ index, type }: BlockDecorationProps) => string;

package/build/esm/grid/Col/Col.d.ts

@@ -1,10 +1,8 @@
 import React, { CSSProperties } from 'react';
-import { QAProps, Refable } from '../../models/common';
-import { WithChildren } from '../../models/react';
+import { QAProps, Refable, Roleable, WithChildren } from '../../models';
 import { GridColumnClassParams } from '../types';
-export interface GridColumnProps extends GridColumnClassParams, Refable<HTMLDivElement>, QAProps {
+export interface GridColumnProps extends GridColumnClassParams, Refable<HTMLDivElement>, QAProps, Roleable {
     style?: CSSProperties;
     children?: React.ReactNode;
-    role?: React.AriaRole;
 }
 export declare const Col: React.ForwardRefExoticComponent<Pick<WithChildren<GridColumnProps>, "style" | "children" | "sizes" | "className" | "hidden" | "role" | "qa" | "reset" | "visible" | "offsets" | "orders" | "alignSelf" | "justifyContent"> & React.RefAttributes<HTMLDivElement>>;

package/build/esm/models/constructor-items/blocks.d.ts

@@ -189,6 +189,10 @@ export interface TableProps {
     legend?: string[];
     justify?: Justify[];
     marker?: LegendTableMarkerType;
+    /**
+     * Only as accessible name, not displayed explicitly
+     */
+    caption?: string;
 }
 export interface TableBlockProps {
     title: string;

package/build/esm/models/constructor-items/common.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, ReactNode } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
 import { ThemeSupporting } from '../../utils';
 import { AnalyticsEventsBase, ClassNameProps, PixelEventType, QAProps } from '../common';
@@ -64,6 +64,9 @@ export interface Animatable {
 export interface Tabbable {
     tabIndex?: number;
 }
+export interface Roleable {
+    role?: React.AriaRole;
+}
 export interface Background {
     image?: string;
     color?: string;
@@ -129,7 +132,7 @@ export interface FileLinkProps extends ClassNameProps, Tabbable {
     onClick?: () => void;
 }
 export type ButtonTheme = ButtonView | 'github' | 'app-store' | 'google-play' | 'scale' | 'monochrome';
-export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width'> {
+export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width' | 'extraProps'> {
     text: string;
     url: string;
     primary?: boolean;

package/build/esm/models/constructor.d.ts

@@ -39,6 +39,7 @@ export interface CustomConfig {
     blocks?: CustomItems;
     subBlocks?: CustomItems;
     headers?: CustomItems;
+    navigation?: CustomItems;
     loadable?: LoadableConfig;
     decorators?: {
         block?: ((props: BlockDecorationProps) => React.ReactElement)[];

package/build/esm/models/navigation.d.ts

@@ -7,6 +7,7 @@ export declare enum NavigationItemType {
     Social = "social",
     GithubButton = "github-button"
 }
+export declare const NavigationItemTypes: NavigationItemType[];
 export interface NavigationItemBase {
     text: string;
     icon?: ImageProps;

package/build/esm/models/navigation.js

@@ -6,6 +6,7 @@ export var NavigationItemType;
     NavigationItemType["Social"] = "social";
     NavigationItemType["GithubButton"] = "github-button";
 })(NavigationItemType || (NavigationItemType = {}));
+export const NavigationItemTypes = Object.values(NavigationItemType);
 export var NavigationGithubButtonIcon;
 (function (NavigationGithubButtonIcon) {
     NavigationGithubButtonIcon["heart"] = "octicon-heart";

package/build/esm/navigation/components/MobileMenuButton/MobileMenuButton.js

@@ -7,5 +7,6 @@ const b = block('mobile-menu-button');
 const ICON_SIZE = 36;
 export const MobileMenuButton = ({ isSidebarOpened, onSidebarOpenedChange, }) => (React.createElement(Control, { className: b(), onClick: (e) => {
         e.stopPropagation();
+        e.nativeEvent.stopImmediatePropagation();
         onSidebarOpenedChange(!isSidebarOpened);
     }, size: "l", icon: isSidebarOpened ? NavigationClose : NavigationOpen, iconSize: ICON_SIZE }));

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

@@ -1,30 +1,18 @@
 import { __rest } from "tslib";
-import React, { useMemo } from 'react';
+import React, { useContext, useMemo } from 'react';
 import { omit } from 'lodash';
 import { BlockIdContext } from '../../../context/blockIdContext';
+import { InnerContext } from '../../../context/innerContext';
 import { NavigationItemType } from '../../../models';
 import { block } from '../../../utils';
-import SocialIcon from '../SocialIcon/SocialIcon';
-import { GithubButton } from './components/GithubButton/GithubButton';
-import { NavigationButton } from './components/NavigationButton/NavigationButton';
-import { NavigationDropdown } from './components/NavigationDropdown/NavigationDropdown';
-import { NavigationLink } from './components/NavigationLink/NavigationLink';
 import './NavigationItem.css';
 const b = block('navigation-item');
 const ANALYTICS_ID = 'navigation';
-//todo: add types support form component in map
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-const NavigationItemsMap = {
-    [NavigationItemType.Button]: NavigationButton,
-    [NavigationItemType.Social]: SocialIcon,
-    [NavigationItemType.Dropdown]: NavigationDropdown,
-    [NavigationItemType.Link]: NavigationLink,
-    [NavigationItemType.GithubButton]: GithubButton,
-};
 const NavigationItem = (_a) => {
     var { data, className, menuLayout } = _a, props = __rest(_a, ["data", "className", "menuLayout"]);
     const { type = NavigationItemType.Link } = data;
-    const Component = NavigationItemsMap[type];
+    const { navItemMap } = useContext(InnerContext);
+    const Component = navItemMap[type];
     const componentProps = useMemo(() => {
         const componentProperties = Object.assign(Object.assign({}, data), props);
         if (type !== NavigationItemType.Dropdown) {

package/build/esm/navigation/components/NavigationItem/index.d.ts

@@ -0,0 +1,6 @@
+export { GithubButton } from './components/GithubButton/GithubButton';
+export { NavigationButton } from './components/NavigationButton/NavigationButton';
+export { NavigationDropdown } from './components/NavigationDropdown/NavigationDropdown';
+export { NavigationLink } from './components/NavigationLink/NavigationLink';
+import NavigationItem from './NavigationItem';
+export default NavigationItem;

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

@@ -0,0 +1,6 @@
+export { GithubButton } from './components/GithubButton/GithubButton';
+export { NavigationButton } from './components/NavigationButton/NavigationButton';
+export { NavigationDropdown } from './components/NavigationDropdown/NavigationDropdown';
+export { NavigationLink } from './components/NavigationLink/NavigationLink';
+import NavigationItem from './NavigationItem';
+export default NavigationItem;

package/build/esm/navigation/components/NavigationListItem/NavigationListItem.js

@@ -1,7 +1,7 @@
 import { __rest } from "tslib";
 import React from 'react';
 import { getItemClickHandler } from '../../utils';
-import NavigationItem from '../NavigationItem/NavigationItem';
+import NavigationItem from '../NavigationItem';
 const NavigationListItem = (_a) => {
     var { column, index, activeItemId, onActiveItemChange } = _a, props = __rest(_a, ["column", "index", "activeItemId", "onActiveItemChange"]);
     const id = `${column}-${index}`;

package/build/esm/navigation/components/NavigationPopup/NavigationPopup.js

@@ -2,7 +2,7 @@ import React from 'react';
 import { Popup } from '@gravity-ui/uikit';
 import { block } from '../../../utils';
 import { NavigationLayout } from '../../models';
-import NavigationItem from '../NavigationItem/NavigationItem';
+import NavigationItem from '../NavigationItem';
 import './NavigationPopup.css';
 const b = block('navigation-popup');
 const OFFSET_RESET = [0, 0];

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

@@ -9,9 +9,8 @@ const BackgroundCard = (props) => {
     const { url, title, text, border, background, paddingBottom, backgroundColor, additionalInfo, theme: cardTheme = 'default', links, buttons, } = props;
     const theme = useTheme();
     const hasBackgroundColor = backgroundColor || cardTheme !== 'default';
-    const link = hasBackgroundColor || border === 'line' ? undefined : url;
     const borderType = hasBackgroundColor ? 'none' : border;
-    return (React.createElement(CardBase, { className: b({ padding: paddingBottom, theme: cardTheme }), url: link, border: borderType },
+    return (React.createElement(CardBase, { className: b({ padding: paddingBottom, theme: cardTheme }), url: url, border: borderType },
         React.createElement(CardBase.Content, null,
             React.createElement(BackgroundImage, Object.assign({ className: b('image') }, getThemedValue(background, theme), { style: { backgroundColor } })),
             React.createElement(Content, { title: title, text: text, additionalInfo: additionalInfo, size: "s", theme: cardTheme, links: links, buttons: buttons, colSizes: { all: 12, md: 12 } }))));

package/build/esm/sub-blocks/Quote/Quote.css

@@ -31,9 +31,6 @@ unpredictable css rules order in build */
 .pc-quote_border_line {
   border: 1px solid var(--g-color-line-generic);
 }
-.pc-quote_border_line, .pc-quote_border_none {
-  cursor: default;
-}
 @media (min-width: 577px) {
   .slick-slide:not(.slick-active) .pc-quote {
     box-shadow: none;

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

@@ -2,12 +2,8 @@ import { ConstructorBlock, CustomConfig, PCShareSocialNetwork, TextSize } from '
 export declare function getHeaderTag(size: TextSize): "h1" | "h2" | "h3" | "h4";
 export declare function hasBlockTag(content: string): boolean;
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
-export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
-export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
-    [x: string]: any;
-};
-export declare const getCustomSubBlockTypes: (customBlocks?: CustomConfig) => string[];
-export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
+export declare const getCustomItems: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => {};
+export declare const getCustomTypes: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => string[];
 export declare const getOrderedBlocks: (blocks: ConstructorBlock[], headerBlockTypes?: string[]) => ConstructorBlock[];
 export declare const getHeaderBlock: (blocks: ConstructorBlock[], headerBlockTypes?: string[]) => ConstructorBlock | undefined;
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;

package/build/esm/utils/blocks.js

@@ -56,18 +56,15 @@ export function hasBlockTag(content) {
 export function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
-export const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
-    ...Object.keys(blocks),
-    ...Object.keys(headers),
-];
-export const getCustomItems = ({ blocks = {}, headers = {}, subBlocks = {} } = {}) => (Object.assign(Object.assign(Object.assign({}, blocks), headers), subBlocks));
-export const getCustomSubBlockTypes = (customBlocks = {}) => {
-    const { subBlocks = {} } = customBlocks;
-    return Object.keys(subBlocks);
+export const getCustomItems = (types, customBlocks = {}) => {
+    return types.reduce((result, type) => {
+        return Object.assign(result, customBlocks[type] || {});
+    }, {});
 };
-export const getCustomHeaderTypes = (customBlocks = {}) => {
-    const { headers = {} } = customBlocks;
-    return Object.keys(headers);
+export const getCustomTypes = (types, customBlocks = {}) => {
+    return types.reduce((result, type) => {
+        return result.concat(Object.keys(customBlocks[type] || {}));
+    }, []);
 };
 const getShareUrlWithParams = (url, params = {}) => {
     const result = new URL(url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "4.3.0",
+  "version": "4.5.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -99,6 +99,7 @@
     "sanitize-html": "2.6.1",
     "snakecase-keys": "^5.1.0",
     "typograf": "^6.14.0",
+    "utility-types": "^3.10.0",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {

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

@@ -189,6 +189,10 @@ export interface TableProps {
     legend?: string[];
     justify?: Justify[];
     marker?: LegendTableMarkerType;
+    /**
+     * Only as accessible name, not displayed explicitly
+     */
+    caption?: string;
 }
 export interface TableBlockProps {
     title: string;

package/server/models/constructor-items/common.d.ts

@@ -1,4 +1,4 @@
-import { CSSProperties, ReactNode } from 'react';
+import React, { CSSProperties, ReactNode } from 'react';
 import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
 import { ThemeSupporting } from '../../utils';
 import { AnalyticsEventsBase, ClassNameProps, PixelEventType, QAProps } from '../common';
@@ -64,6 +64,9 @@ export interface Animatable {
 export interface Tabbable {
     tabIndex?: number;
 }
+export interface Roleable {
+    role?: React.AriaRole;
+}
 export interface Background {
     image?: string;
     color?: string;
@@ -129,7 +132,7 @@ export interface FileLinkProps extends ClassNameProps, Tabbable {
     onClick?: () => void;
 }
 export type ButtonTheme = ButtonView | 'github' | 'app-store' | 'google-play' | 'scale' | 'monochrome';
-export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width'> {
+export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width' | 'extraProps'> {
     text: string;
     url: string;
     primary?: boolean;

package/server/models/constructor.d.ts

@@ -39,6 +39,7 @@ export interface CustomConfig {
     blocks?: CustomItems;
     subBlocks?: CustomItems;
     headers?: CustomItems;
+    navigation?: CustomItems;
     loadable?: LoadableConfig;
     decorators?: {
         block?: ((props: BlockDecorationProps) => React.ReactElement)[];

package/server/models/navigation.d.ts

@@ -7,6 +7,7 @@ export declare enum NavigationItemType {
     Social = "social",
     GithubButton = "github-button"
 }
+export declare const NavigationItemTypes: NavigationItemType[];
 export interface NavigationItemBase {
     text: string;
     icon?: ImageProps;

package/server/models/navigation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavigationGithubButtonIcon = exports.NavigationItemType = void 0;
+exports.NavigationGithubButtonIcon = exports.NavigationItemTypes = exports.NavigationItemType = void 0;
 var NavigationItemType;
 (function (NavigationItemType) {
     NavigationItemType["Link"] = "link";
@@ -9,6 +9,7 @@ var NavigationItemType;
     NavigationItemType["Social"] = "social";
     NavigationItemType["GithubButton"] = "github-button";
 })(NavigationItemType = exports.NavigationItemType || (exports.NavigationItemType = {}));
+exports.NavigationItemTypes = Object.values(NavigationItemType);
 var NavigationGithubButtonIcon;
 (function (NavigationGithubButtonIcon) {
     NavigationGithubButtonIcon["heart"] = "octicon-heart";

package/server/utils/blocks.d.ts

@@ -2,12 +2,8 @@ import { ConstructorBlock, CustomConfig, PCShareSocialNetwork, TextSize } from '
 export declare function getHeaderTag(size: TextSize): "h1" | "h2" | "h3" | "h4";
 export declare function hasBlockTag(content: string): boolean;
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
-export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
-export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
-    [x: string]: any;
-};
-export declare const getCustomSubBlockTypes: (customBlocks?: CustomConfig) => string[];
-export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
+export declare const getCustomItems: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => {};
+export declare const getCustomTypes: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => string[];
 export declare const getOrderedBlocks: (blocks: ConstructorBlock[], headerBlockTypes?: string[]) => ConstructorBlock[];
 export declare const getHeaderBlock: (blocks: ConstructorBlock[], headerBlockTypes?: string[]) => ConstructorBlock | undefined;
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;

package/server/utils/blocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.hasBlockTag = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomTypes = exports.getCustomItems = exports.getBlockKey = exports.hasBlockTag = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
 const BLOCK_ELEMENTS = [
     'div',
@@ -62,23 +62,18 @@ function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
 exports.getBlockKey = getBlockKey;
-const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
-    ...Object.keys(blocks),
-    ...Object.keys(headers),
-];
-exports.getCustomBlockTypes = getCustomBlockTypes;
-const getCustomItems = ({ blocks = {}, headers = {}, subBlocks = {} } = {}) => (Object.assign(Object.assign(Object.assign({}, blocks), headers), subBlocks));
-exports.getCustomItems = getCustomItems;
-const getCustomSubBlockTypes = (customBlocks = {}) => {
-    const { subBlocks = {} } = customBlocks;
-    return Object.keys(subBlocks);
+const getCustomItems = (types, customBlocks = {}) => {
+    return types.reduce((result, type) => {
+        return Object.assign(result, customBlocks[type] || {});
+    }, {});
 };
-exports.getCustomSubBlockTypes = getCustomSubBlockTypes;
-const getCustomHeaderTypes = (customBlocks = {}) => {
-    const { headers = {} } = customBlocks;
-    return Object.keys(headers);
+exports.getCustomItems = getCustomItems;
+const getCustomTypes = (types, customBlocks = {}) => {
+    return types.reduce((result, type) => {
+        return result.concat(Object.keys(customBlocks[type] || {}));
+    }, []);
 };
-exports.getCustomHeaderTypes = getCustomHeaderTypes;
+exports.getCustomTypes = getCustomTypes;
 const getShareUrlWithParams = (url, params = {}) => {
     const result = new URL(url);
     Object.entries(params).forEach(([name, value]) => {

package/styles/mixins.scss

@@ -246,7 +246,9 @@
 
     &_border_line,
     &_border_none {
-        cursor: default;
+        @if $hover {
+            @include card-hover();
+        }
     }
 
     &_border_shadow {