@gravity-ui/page-constructor 1.20.4 → 1.21.0

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

@@ -1,11 +1,13 @@
 import React, { useContext } from 'react';
 import Loadable from '../../../Loadable/Loadable';
 import { InnerContext } from '../../../../context/innerContext';
+import { BlockIdContext } from '../../../../context/blockIdContext';
 export const ConstructorLoadable = (props) => {
     const { itemMap } = useContext(InnerContext);
     const { block, blockKey, config, serviceId, params } = props;
     const { type } = block;
     const { fetch, component: ChildComponent } = config;
     const Component = itemMap[type];
-    return (React.createElement(Loadable, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params }));
+    return (React.createElement(BlockIdContext.Provider, { value: blockKey, key: blockKey },
+        React.createElement(Loadable, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params })));
 };

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

@@ -1,9 +1,12 @@
 import React from 'react';
 import { ItemMap } from '../../containers/PageConstructor/PageConstructor';
-import { LoadableConfig } from '../../models';
+import { LoadableConfig, ShouldRenderBlock } from '../../models';
 export interface InnerContextType {
     blockTypes: string[];
+    subBlockTypes: string[];
+    headerBlockTypes: string[];
     itemMap: ItemMap;
     loadables?: LoadableConfig;
+    shouldRenderBlock?: ShouldRenderBlock;
 }
 export declare const InnerContext: React.Context<InnerContextType>;

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

@@ -1,5 +1,7 @@
 import React from 'react';
 export const InnerContext = React.createContext({
     blockTypes: [],
+    subBlockTypes: [],
+    headerBlockTypes: [],
     itemMap: {},
 });

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

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { ButtonSize } from '@gravity-ui/uikit';
 import { BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, Justify, LinkProps, LinkTheme, MediaDirection, MediaProps, MapProps, PreviewItemProps, PreviewRatioMediaContent, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleProps, LegendTableMarkerType, AnchorProps, TitleBaseProps, Animatable, BlockHeaderProps, ImageDeviceProps } from './common';
 import { ThemeSupporting } from '../../utils';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
-import { BannerCardProps, SubBlock } from './sub-blocks';
+import { BannerCardProps, SubBlock, SubBlockModels } from './sub-blocks';
 export declare enum BlockType {
     PromoFeaturesBlock = "promo-features-block",
     ExtendedFeaturesBlock = "extended-features-block",
@@ -26,7 +27,8 @@ export declare enum BlockType {
     CardLayoutBlock = "card-layout-block",
     ContentLayoutBlock = "content-layout-block",
     ShareBlock = "share-block",
-    MapBlock = "map-block"
+    MapBlock = "map-block",
+    FilterBlock = "filter-block"
 }
 export declare const BlockTypes: BlockType[];
 export declare const HeaderBlockTypes: BlockType[];
@@ -251,6 +253,24 @@ export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChi
     description?: string;
     colSizes?: GridColumnSizesType;
 }
+export type FilterTag = {
+    id: string;
+    label: string;
+};
+export type FilterItem = {
+    tags: string[];
+    card: SubBlockModels;
+};
+export interface FilterBlockProps extends Animatable, LoadableChildren {
+    title?: TitleProps | string;
+    description?: string;
+    tags: FilterTag[];
+    items: FilterItem[];
+    tagButtonSize?: ButtonSize;
+    allTag?: boolean | string;
+    colSizes?: GridColumnSizesType;
+    centered?: boolean;
+}
 export interface IconsBlockProps {
     title?: string;
     size?: 's' | 'm' | 'l';
@@ -350,6 +370,9 @@ export type LinkTableBlockModel = {
 export type CardLayoutBlockModel = {
     type: BlockType.CardLayoutBlock;
 } & CardLayoutBlockProps;
+export type FilterBlockModel = {
+    type: BlockType.FilterBlock;
+} & FilterBlockProps;
 export type IconsBlockModel = {
     type: BlockType.IconsBlock;
 } & IconsBlockProps;
@@ -362,6 +385,6 @@ export type ContentLayoutBlockModel = {
 export type ShareBLockModel = {
     type: BlockType.ShareBlock;
 } & ShareBlockProps;
-type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | SecurityBlockModel | TableBlockModel | TabsBlockModel | SimpleBlockModel | LinkTableBlockModel | HeaderBlockModel | PreviewBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel;
+type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | SecurityBlockModel | TableBlockModel | TabsBlockModel | SimpleBlockModel | LinkTableBlockModel | HeaderBlockModel | PreviewBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
 export type Block = BlockModels & BlockBaseProps;
 export {};

package/build/esm/models/constructor-items/blocks.js

@@ -23,6 +23,7 @@ export var BlockType;
     BlockType["ContentLayoutBlock"] = "content-layout-block";
     BlockType["ShareBlock"] = "share-block";
     BlockType["MapBlock"] = "map-block";
+    BlockType["FilterBlock"] = "filter-block";
 })(BlockType || (BlockType = {}));
 export const BlockTypes = Object.values(BlockType);
 export const HeaderBlockTypes = [BlockType.HeaderBlock, BlockType.HeaderSliderBlock];

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

@@ -6,5 +6,6 @@ export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) =
 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 getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;

package/build/esm/utils/blocks.js

@@ -18,6 +18,10 @@ export const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...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 getCustomHeaderTypes = (customBlocks = {}) => {
     const { headers = {} } = customBlocks;
     return Object.keys(headers);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.20.4",
+  "version": "1.21.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

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

@@ -1,8 +1,9 @@
 /// <reference types="react" />
+import { ButtonSize } from '@gravity-ui/uikit';
 import { BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, Justify, LinkProps, LinkTheme, MediaDirection, MediaProps, MapProps, PreviewItemProps, PreviewRatioMediaContent, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleProps, LegendTableMarkerType, AnchorProps, TitleBaseProps, Animatable, BlockHeaderProps, ImageDeviceProps } from './common';
 import { ThemeSupporting } from '../../utils';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
-import { BannerCardProps, SubBlock } from './sub-blocks';
+import { BannerCardProps, SubBlock, SubBlockModels } from './sub-blocks';
 export declare enum BlockType {
     PromoFeaturesBlock = "promo-features-block",
     ExtendedFeaturesBlock = "extended-features-block",
@@ -26,7 +27,8 @@ export declare enum BlockType {
     CardLayoutBlock = "card-layout-block",
     ContentLayoutBlock = "content-layout-block",
     ShareBlock = "share-block",
-    MapBlock = "map-block"
+    MapBlock = "map-block",
+    FilterBlock = "filter-block"
 }
 export declare const BlockTypes: BlockType[];
 export declare const HeaderBlockTypes: BlockType[];
@@ -251,6 +253,24 @@ export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChi
     description?: string;
     colSizes?: GridColumnSizesType;
 }
+export type FilterTag = {
+    id: string;
+    label: string;
+};
+export type FilterItem = {
+    tags: string[];
+    card: SubBlockModels;
+};
+export interface FilterBlockProps extends Animatable, LoadableChildren {
+    title?: TitleProps | string;
+    description?: string;
+    tags: FilterTag[];
+    items: FilterItem[];
+    tagButtonSize?: ButtonSize;
+    allTag?: boolean | string;
+    colSizes?: GridColumnSizesType;
+    centered?: boolean;
+}
 export interface IconsBlockProps {
     title?: string;
     size?: 's' | 'm' | 'l';
@@ -350,6 +370,9 @@ export type LinkTableBlockModel = {
 export type CardLayoutBlockModel = {
     type: BlockType.CardLayoutBlock;
 } & CardLayoutBlockProps;
+export type FilterBlockModel = {
+    type: BlockType.FilterBlock;
+} & FilterBlockProps;
 export type IconsBlockModel = {
     type: BlockType.IconsBlock;
 } & IconsBlockProps;
@@ -362,6 +385,6 @@ export type ContentLayoutBlockModel = {
 export type ShareBLockModel = {
     type: BlockType.ShareBlock;
 } & ShareBlockProps;
-type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | SecurityBlockModel | TableBlockModel | TabsBlockModel | SimpleBlockModel | LinkTableBlockModel | HeaderBlockModel | PreviewBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel;
+type BlockModels = SliderBlockModel | ServiceDemoBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | CalculatorBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | SecurityBlockModel | TableBlockModel | TabsBlockModel | SimpleBlockModel | LinkTableBlockModel | HeaderBlockModel | PreviewBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
 export type Block = BlockModels & BlockBaseProps;
 export {};

package/server/models/constructor-items/blocks.js

@@ -26,6 +26,7 @@ var BlockType;
     BlockType["ContentLayoutBlock"] = "content-layout-block";
     BlockType["ShareBlock"] = "share-block";
     BlockType["MapBlock"] = "map-block";
+    BlockType["FilterBlock"] = "filter-block";
 })(BlockType = exports.BlockType || (exports.BlockType = {}));
 exports.BlockTypes = Object.values(BlockType);
 exports.HeaderBlockTypes = [BlockType.HeaderBlock, BlockType.HeaderSliderBlock];

package/server/utils/blocks.d.ts

@@ -6,5 +6,6 @@ export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) =
 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 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.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
 function getHeaderTag(size) {
     switch (size) {
@@ -25,6 +25,11 @@ const getCustomBlockTypes = ({ blocks = {}, 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);
+};
+exports.getCustomSubBlockTypes = getCustomSubBlockTypes;
 const getCustomHeaderTypes = (customBlocks = {}) => {
     const { headers = {} } = customBlocks;
     return Object.keys(headers);

package/styles/mixins.scss

@@ -481,12 +481,69 @@ unpredictable css rules order in build */
     }
 }
 
-@mixin monochromeButton() {
-    --yc-button-background-color: var(--pc-monochrome-button-background-color);
-    --yc-button-background-color-hover: var(--pc-monochrome-button-background-color-hover);
-    color: var(--pc-monochrome-button-color);
+@mixin button($color, $backgroundColor, $hoverColor: $color, $hoverBackgroundColor) {
+    --yc-button-background-color: #{$backgroundColor};
+    --yc-button-background-color-hover: #{$hoverBackgroundColor};
+
+    &,
+    &:link,
+    &:visited,
+    &:active,
+    &:focus {
+        color: $color;
+    }
 
     &:hover {
-        color: var(--pc-monochrome-button-color);
+        color: $hoverColor;
+    }
+}
+
+@mixin monochrome-button() {
+    @include button(
+        var(--pc-monochrome-button-color),
+        var(--pc-monochrome-button-background-color),
+        $hoverBackgroundColor: var(--pc-monochrome-button-background-color-hover)
+    );
+}
+
+@mixin centerable-title() {
+    &_centered {
+        text-align: center;
+
+        & > * {
+            margin: 0 auto;
+        }
+    }
+}
+
+@mixin tab-panel() {
+    display: flex;
+    flex-wrap: nowrap;
+    justify-content: flex-start;
+    overflow: auto;
+
+    &_centered {
+        display: flex;
+        justify-content: center;
+        flex-wrap: wrap;
+    }
+
+    @media (max-width: map-get($gridBreakpoints, 'md')) {
+        display: flex;
+        flex-wrap: nowrap;
+        justify-content: flex-start;
+        overflow: auto;
+
+        margin-left: -$indentL;
+        margin-right: -$indentL;
+        padding-left: $indentL;
+        padding-right: $indentL - $indentXXXS;
+    }
+
+    @media (max-width: map-get($gridBreakpoints, 'sm')) {
+        margin-left: -$indentSM;
+        margin-right: -$indentSM;
+        padding-left: $indentSM;
+        padding-right: $indentXS;
     }
 }

package/styles/root.scss

@@ -19,6 +19,16 @@
     --pc-text-header-color: var(--yc-color-text-primary);
     --pc-media-card-meta-info-color: var(--yc-color-text-secondary);
 
+    --pc-tab-item-color: var(--yc-color-text-primary);
+    --pc-tab-item-background-color: var(--yc-color-base-generic);
+    --pc-tab-item-background-color-hover: var(--yc-color-base-generic-hover);
+
+    --pc-selected-tab-item-color: var(--pc-monochrome-button-color);
+    --pc-selected-tab-item-background-color: var(--pc-monochrome-button-background-color);
+    --pc-selected-tab-item-background-color-hover: var(
+        --pc-monochrome-button-background-color-hover
+    );
+
     &.yc-root_theme_dark {
         --pc-color-sfx-shadow: var(--yc-color-sfx-shadow);
         --pc-color-line-generic-active-solid: #6c6c70;