@gravity-ui/page-constructor 1.14.1 → 1.14.3

package/build/esm/constructor-items.js

@@ -1,5 +1,5 @@
 import { BlockType, SubBlockType } from './models';
-import { Partner, PriceDetailed, MediaCard, NewsCard, TutorialCard, CardWithImage, BackgroundCard, Content, Quote, Divider, BannerCard, BasicCard, } from './sub-blocks';
+import { Partner, PriceDetailed, MediaCard, NewsCard, TutorialCard, CardWithImage, LayoutItem, BackgroundCard, Content, Quote, Divider, BannerCard, BasicCard, } from './sub-blocks';
 import { BannerBlock, CompaniesBlock, SimpleBlock, MediaBlock, PreviewBlock, InfoBlock, SecurityBlock, SliderBlock, ExtendedFeaturesBlock, PromoFeaturesBlock, QuestionsBlock, TableBlock, TabsBlock, LinkTableBlock, HeaderBlock, IconsBlock, HeaderSliderBlock, CardLayoutBlock, ContentLayoutBlock, ShareBlock, } from './blocks';
 export const blockMap = {
     [BlockType.SliderBlock]: SliderBlock,
@@ -37,6 +37,10 @@ export const subBlockMap = {
     [SubBlockType.MediaCard]: MediaCard,
     [SubBlockType.BannerCard]: BannerCard,
     [SubBlockType.NewsCard]: NewsCard,
+    [SubBlockType.LayoutItem]: LayoutItem,
+    /**
+     * @deprecated Use LayoutItem
+     */
     [SubBlockType.CardWithImage]: CardWithImage,
     [SubBlockType.BackgroundCard]: BackgroundCard,
     [SubBlockType.BasicCard]: BasicCard,

package/build/esm/containers/PageConstructor/PageConstructor.css

@@ -18,6 +18,7 @@ unpredictable css rules order in build */
   --pc-monochrome-button-background-color-hover: #393939;
   --pc-monochrome-button-color: var(--yc-color-text-light-primary);
   --pc-text-header-color: var(--yc-color-text-primary);
+  --pc-media-card-meta-info-color: var(--yc-color-text-secondary);
 }
 .yc-root.yc-root_theme_dark {
   --pc-color-sfx-shadow: var(--yc-color-sfx-shadow);

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

@@ -172,6 +172,7 @@ export interface MediaComponentVideoProps {
 export interface MediaComponentYoutubeProps {
     youtube: string;
     previewImg?: string;
+    fullScreen?: boolean;
 }
 export interface MediaComponentImageProps {
     image: ImageProps | ImageProps[] | ImageDeviceProps;
@@ -243,27 +244,10 @@ export interface TitleBaseProps {
     custom?: string | ReactNode;
     onClick?: () => void;
 }
-export interface CardData {
-    header?: CardHeader;
-    text?: string;
-    title?: string;
-    link?: LinkProps;
-    footer?: string;
-    url?: string;
-    service?: {
-        slug: string;
-        name: string;
-    };
-    links?: LinkProps[];
-}
 export type CardBorder = 'shadow' | 'line' | 'none';
 export interface CardBaseProps {
     border?: CardBorder;
 }
-export interface CardHeader {
-    title?: string;
-    image?: ImageProps;
-}
 export interface PriceDescriptionProps {
     title: string;
     detailedTitle?: string;

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

@@ -19,7 +19,11 @@ export declare enum SubBlockType {
      * @deprecated Will be moved to params use BasicCard instead
      */
     TutorialCard = "tutoral-card",
+    /**
+     * @deprecated Use LayoutItem
+     */
     CardWithImage = "card-with-image",
+    LayoutItem = "layout-item",
     BackgroundCard = "background-card",
     BasicCard = "basic-card",
     Content = "content",
@@ -125,6 +129,13 @@ export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockPro
     fullScreen?: boolean;
     links?: CardWithImageLinkProps[];
 }
+export interface LayoutItemProps extends ClassNameProps {
+    content: Omit<ContentBlockProps, 'colSizes' | 'centered' | 'size'>;
+    media: MediaProps;
+    metaInfo?: string[];
+    border?: boolean;
+    fullScreen?: boolean;
+}
 export type DividerModel = {
     type: SubBlockType.Divider;
 } & DividerProps;
@@ -137,6 +148,9 @@ export type NewsCardModel = {
 export type CardWithImageModel = {
     type: SubBlockType.CardWithImage;
 } & CardWithImageProps;
+export type LayoutItemModel = {
+    type: SubBlockType.CardWithImage;
+} & LayoutItemProps;
 export type TutorialCardModel = {
     type: SubBlockType.TutorialCard;
 } & TutorialCardProps;

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

@@ -14,7 +14,11 @@ export var SubBlockType;
      * @deprecated Will be moved to params use BasicCard instead
      */
     SubBlockType["TutorialCard"] = "tutoral-card";
+    /**
+     * @deprecated Use LayoutItem
+     */
     SubBlockType["CardWithImage"] = "card-with-image";
+    SubBlockType["LayoutItem"] = "layout-item";
     SubBlockType["BackgroundCard"] = "background-card";
     SubBlockType["BasicCard"] = "basic-card";
     SubBlockType["Content"] = "content";

package/build/esm/schema/index.js

@@ -50,6 +50,7 @@ export function generateDefaultSchema(config) {
         'card-with-image',
         'quote',
         'basic-card',
+        'layout-item',
     ];
     const configBlockSchemaNames = Object.keys(blocks).filter((item) => !constructorBlockSchemaNames.includes(item));
     const configCardSchemaNames = Object.keys(cards).filter((item) => !constructorCardSchemaNames.includes(item));

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

@@ -6,6 +6,7 @@ export * from '../../sub-blocks/NewsCard/schema';
 export * from '../../sub-blocks/Partner/schema';
 export * from '../../sub-blocks/TutorialCard/schema';
 export * from '../../sub-blocks/CardWithImage/schema';
+export * from '../../sub-blocks/LayoutItem/schema';
 export * from '../../sub-blocks/Quote/schema';
 export * from '../../sub-blocks/Divider/schema';
 export * from '../../sub-blocks/BasicCard/schema';

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

@@ -6,6 +6,7 @@ export * from '../../sub-blocks/NewsCard/schema';
 export * from '../../sub-blocks/Partner/schema';
 export * from '../../sub-blocks/TutorialCard/schema';
 export * from '../../sub-blocks/CardWithImage/schema';
+export * from '../../sub-blocks/LayoutItem/schema';
 export * from '../../sub-blocks/Quote/schema';
 export * from '../../sub-blocks/Divider/schema';
 export * from '../../sub-blocks/BasicCard/schema';

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

@@ -46,7 +46,7 @@ unpredictable css rules order in build */
   color: var(--yc-color-text-primary);
   background-color: transparent;
   border: 1px solid var(--yc-color-line-generic);
-  border-radius: 6px;
+  border-radius: var(--yc-border-radius-l);
 }
 .pc-hubspot-form .hs-form-field .input input[type=text]:hover,
 .pc-hubspot-form .hs-form-field .input input[type=number]:hover,
@@ -276,7 +276,7 @@ unpredictable css rules order in build */
   box-sizing: border-box;
   height: 44px;
   padding: 0 20px;
-  border-radius: 8px;
+  border-radius: var(--yc-border-radius-xl);
   background-color: var(--yc-color-base-special);
   color: var(--yc-my-color-brand-text-contrast);
   line-height: 44px;

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

@@ -0,0 +1,16 @@
+/* use this for style redefinitions to awoid problems with
+unpredictable css rules order in build */
+.pc-layout-item__media {
+  width: 100%;
+  display: block;
+  border-radius: var(--pc-border-radius);
+}
+.pc-layout-item__media_border {
+  border: 1px solid var(--yc-color-line-generic);
+}
+.pc-layout-item__meta-info {
+  margin: 16px 0 -8px 0;
+}
+.pc-layout-item__content {
+  margin: 16px 16px 0 0;
+}

package/build/esm/sub-blocks/LayoutItem/LayoutItem.d.ts

@@ -0,0 +1,4 @@
+import { LayoutItemProps } from '../../models';
+import './LayoutItem.css';
+declare const LayoutItem: ({ content: { links, ...content }, metaInfo, media, border, fullScreen, className, }: LayoutItemProps) => JSX.Element;
+export default LayoutItem;

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

@@ -0,0 +1,20 @@
+import { __rest } from "tslib";
+import React from 'react';
+import { block } from '../../utils';
+import { FullScreenMedia, Media, MetaInfo } from '../../components';
+import { getLayoutItemLinks, hasFullScreen, showFullScreenIcon } from './utils';
+import { Content } from '..';
+import './LayoutItem.css';
+const b = block('layout-item');
+const LayoutItem = (_a) => {
+    var _b = _a.content, { links } = _b, content = __rest(_b, ["links"]), { metaInfo, media, border, fullScreen, className } = _a;
+    return (React.createElement("div", { className: b(null, className) },
+        fullScreen && hasFullScreen(media) ? (React.createElement(FullScreenMedia, { showFullScreenIcon: showFullScreenIcon(media) }, (_a = {}) => {
+            var { className: mediaClassName } = _a, fullScreenMediaProps = __rest(_a, ["className"]);
+            return (React.createElement(Media, Object.assign({}, media, fullScreenMediaProps, { className: b('media', { border }, mediaClassName) })));
+        })) : (React.createElement(Media, Object.assign({}, media, { className: b('media', { border }) }))),
+        metaInfo && React.createElement(MetaInfo, { items: metaInfo, className: b('meta-info') }),
+        React.createElement("div", { className: b('content') },
+            React.createElement(Content, Object.assign({}, content, { links: getLayoutItemLinks(links), size: "s", colSizes: { all: 12, md: 12 } })))));
+};
+export default LayoutItem;

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

@@ -0,0 +1,218 @@
+export declare const LayoutItem: {
+    type: string;
+    additionalProperties: boolean;
+    required: string[];
+    properties: {
+        media: {
+            color: {
+                type: string;
+            };
+            image: {
+                anyOf: ({
+                    oneOf: ({
+                        type: string;
+                        properties: {
+                            when: {
+                                type: string;
+                            };
+                        };
+                    } | {
+                        type: string;
+                        pattern: string;
+                    })[];
+                } | {
+                    type: string;
+                    items: {
+                        oneOf: ({
+                            type: string;
+                            properties: {
+                                when: {
+                                    type: string;
+                                };
+                            };
+                        } | {
+                            type: string;
+                            pattern: string;
+                        })[];
+                    };
+                })[];
+            };
+            video: {
+                type: string;
+                additionalProperties: boolean;
+                required: string[];
+                properties: {
+                    src: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                    };
+                    loop: {
+                        anyOf: ({
+                            type: string;
+                            additionalProperties: boolean;
+                            required: string[];
+                            properties: {
+                                start: {
+                                    type: string;
+                                };
+                                end: {
+                                    type: string;
+                                };
+                            };
+                        } | {
+                            type: string;
+                        })[];
+                    };
+                    type: {
+                        type: string;
+                        enum: string[];
+                    };
+                    muted: {
+                        type: string;
+                    };
+                    playing: {
+                        type: string;
+                    };
+                    elapsedTime: {
+                        type: string;
+                    };
+                    playIcon: {
+                        type: string;
+                        additionalProperties: boolean;
+                        properties: {
+                            type: {
+                                type: string;
+                                enum: string[];
+                            };
+                            theme: {
+                                type: string;
+                                enum: string[];
+                            };
+                            text: {
+                                type: string;
+                                contentType: string;
+                            };
+                        };
+                    };
+                    controls: {
+                        type: string;
+                        enum: string[];
+                    };
+                };
+            };
+            youtube: {
+                type: string;
+            };
+            parallax: {
+                type: string;
+            };
+            height: {
+                type: string;
+            };
+            previewImg: {
+                type: string;
+            };
+            dataLens: {
+                oneOf: ({
+                    type: string;
+                    additionalProperties: boolean;
+                    required: string[];
+                    properties: {
+                        id: {
+                            type: string;
+                        };
+                        theme: {
+                            type: string;
+                            enum: string[];
+                        };
+                    };
+                } | {
+                    type: string;
+                })[];
+            };
+        };
+        content: Partial<{
+            title: {
+                oneOf: ({
+                    type: string;
+                    additionalProperties: boolean;
+                    required: string[];
+                    properties: {
+                        text: {
+                            type: string;
+                            contentType: string;
+                        };
+                        textSize: {
+                            type: string;
+                            enum: string[];
+                        };
+                        url: {
+                            type: string;
+                        };
+                        resetMargin: {
+                            type: string;
+                        };
+                    };
+                } | {
+                    type: string;
+                    contentType: string;
+                })[];
+            };
+            text: {
+                type: string;
+                contentType: string;
+            };
+            additionalInfo: {
+                type: string;
+                contentType: string;
+            };
+            size: {
+                type: string;
+                enum: string[];
+            };
+            links: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        when: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+            buttons: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        when: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+            theme: {
+                type: string;
+                enum: string[];
+            };
+        }>;
+        metaInfo: {
+            type: string;
+            items: {
+                type: string;
+                contentType: string;
+            };
+        };
+        border: {
+            type: string;
+        };
+        fullScreen: {
+            type: string;
+        };
+        type: {};
+        when: {};
+    };
+};

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

@@ -0,0 +1,14 @@
+import { omit } from 'lodash';
+import { BaseProps, MediaProps } from '../../schema/validators/common';
+import { ContentBase } from '../../sub-blocks/Content/schema';
+import metaInfo from '../../components/MetaInfo/schema';
+export const LayoutItem = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['content', 'media'],
+    properties: Object.assign(Object.assign({}, BaseProps), { media: MediaProps, content: omit(ContentBase, ['colSize', 'size', 'centered']), metaInfo: metaInfo, border: {
+            type: 'boolean',
+        }, fullScreen: {
+            type: 'boolean',
+        } }),
+};

package/build/esm/sub-blocks/LayoutItem/utils.d.ts

@@ -0,0 +1,15 @@
+import { LayoutItemProps, LinkTheme, MediaProps } from '../../models';
+export declare const getLayoutItemLinks: (links: LayoutItemProps['content']['links']) => {
+    url: string;
+    text?: string | undefined;
+    textSize?: import("../../models").TextSize | undefined;
+    theme: LinkTheme;
+    colorTheme?: import("../../models").TextTheme | undefined;
+    arrow?: boolean | undefined;
+    target?: string | undefined;
+    metrikaGoals?: import("../../models").MetrikaGoal | undefined;
+    pixelEvents?: import("../../models").ButtonPixel | undefined;
+    className?: string | undefined;
+}[] | undefined;
+export declare const hasFullScreen: ({ dataLens, image }: MediaProps) => boolean;
+export declare const showFullScreenIcon: ({ youtube }: MediaProps) => boolean;

package/build/esm/sub-blocks/LayoutItem/utils.js

@@ -0,0 +1,6 @@
+export const getLayoutItemLinks = (links) => links === null || links === void 0 ? void 0 : links.map((link) => (Object.assign({ theme: 'normal' }, link)));
+export const hasFullScreen = ({ dataLens, image }) => {
+    // datalens and slider media card don't support fullScreen mode
+    return !(dataLens || Array.isArray(image));
+};
+export const showFullScreenIcon = ({ youtube }) => !youtube;

package/build/esm/sub-blocks/index.d.ts

@@ -7,6 +7,7 @@ export { default as MediaCard } from './MediaCard/MediaCard';
 export { default as BannerCard } from './BannerCard/BannerCard';
 export { default as TutorialCard } from './TutorialCard/TutorialCard';
 export { default as CardWithImage } from './CardWithImage/CardWithImage';
+export { default as LayoutItem } from './LayoutItem/LayoutItem';
 export { default as BackgroundCard } from './BackgroundCard/BackgroundCard';
 export { default as BasicCard } from './BasicCard/BasicCard';
 export { default as Content } from './Content/Content';

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

@@ -7,6 +7,7 @@ export { default as MediaCard } from './MediaCard/MediaCard';
 export { default as BannerCard } from './BannerCard/BannerCard';
 export { default as TutorialCard } from './TutorialCard/TutorialCard';
 export { default as CardWithImage } from './CardWithImage/CardWithImage';
+export { default as LayoutItem } from './LayoutItem/LayoutItem';
 export { default as BackgroundCard } from './BackgroundCard/BackgroundCard';
 export { default as BasicCard } from './BasicCard/BasicCard';
 export { default as Content } from './Content/Content';

package/build/esm/text-transform/blocks.js

@@ -138,6 +138,23 @@ const config = {
             transformer: typografTransformer,
         },
     ],
+    [SubBlockType.LayoutItem]: [
+        {
+            fields: ['content'],
+            parser: parseContentLayout,
+            transformer: yfmTransformer,
+        },
+        {
+            fields: ['content'],
+            parser: parseContentLayoutTitle,
+            transformer: typografTransformer,
+        },
+        {
+            fields: ['metaInfo'],
+            parser: createItemsParser([]),
+            transformer: typografTransformer,
+        },
+    ],
     [SubBlockType.Quote]: {
         fields: ['text'],
         transformer: typografTransformer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.14.1",
+  "version": "1.14.3",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -56,7 +56,8 @@
     "react-waypoint": "^10.1.0",
     "sanitize-html": "^2.6.1",
     "snakecase-keys": "^5.1.0",
-    "typograf": "^6.14.0"
+    "typograf": "^6.14.0",
+    "uuid": "^9.0.0"
   },
   "peerDependencies": {
     "react": "^16.0.0 || ^17.0.0",
@@ -87,6 +88,7 @@
     "@types/react-slick": "^0.23.7",
     "@types/react-transition-group": "^4.4.4",
     "@types/sanitize-html": "^2.6.0",
+    "@types/uuid": "^9.0.0",
     "eslint": "^7.32.0",
     "eslint-plugin-local": "./eslint-plugin-local",
     "eslint-plugin-testing-library": "^5.9.1",

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

@@ -172,6 +172,7 @@ export interface MediaComponentVideoProps {
 export interface MediaComponentYoutubeProps {
     youtube: string;
     previewImg?: string;
+    fullScreen?: boolean;
 }
 export interface MediaComponentImageProps {
     image: ImageProps | ImageProps[] | ImageDeviceProps;
@@ -243,27 +244,10 @@ export interface TitleBaseProps {
     custom?: string | ReactNode;
     onClick?: () => void;
 }
-export interface CardData {
-    header?: CardHeader;
-    text?: string;
-    title?: string;
-    link?: LinkProps;
-    footer?: string;
-    url?: string;
-    service?: {
-        slug: string;
-        name: string;
-    };
-    links?: LinkProps[];
-}
 export type CardBorder = 'shadow' | 'line' | 'none';
 export interface CardBaseProps {
     border?: CardBorder;
 }
-export interface CardHeader {
-    title?: string;
-    image?: ImageProps;
-}
 export interface PriceDescriptionProps {
     title: string;
     detailedTitle?: string;

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

@@ -19,7 +19,11 @@ export declare enum SubBlockType {
      * @deprecated Will be moved to params use BasicCard instead
      */
     TutorialCard = "tutoral-card",
+    /**
+     * @deprecated Use LayoutItem
+     */
     CardWithImage = "card-with-image",
+    LayoutItem = "layout-item",
     BackgroundCard = "background-card",
     BasicCard = "basic-card",
     Content = "content",
@@ -125,6 +129,13 @@ export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockPro
     fullScreen?: boolean;
     links?: CardWithImageLinkProps[];
 }
+export interface LayoutItemProps extends ClassNameProps {
+    content: Omit<ContentBlockProps, 'colSizes' | 'centered' | 'size'>;
+    media: MediaProps;
+    metaInfo?: string[];
+    border?: boolean;
+    fullScreen?: boolean;
+}
 export type DividerModel = {
     type: SubBlockType.Divider;
 } & DividerProps;
@@ -137,6 +148,9 @@ export type NewsCardModel = {
 export type CardWithImageModel = {
     type: SubBlockType.CardWithImage;
 } & CardWithImageProps;
+export type LayoutItemModel = {
+    type: SubBlockType.CardWithImage;
+} & LayoutItemProps;
 export type TutorialCardModel = {
     type: SubBlockType.TutorialCard;
 } & TutorialCardProps;

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

@@ -17,7 +17,11 @@ var SubBlockType;
      * @deprecated Will be moved to params use BasicCard instead
      */
     SubBlockType["TutorialCard"] = "tutoral-card";
+    /**
+     * @deprecated Use LayoutItem
+     */
     SubBlockType["CardWithImage"] = "card-with-image";
+    SubBlockType["LayoutItem"] = "layout-item";
     SubBlockType["BackgroundCard"] = "background-card";
     SubBlockType["BasicCard"] = "basic-card";
     SubBlockType["Content"] = "content";

package/server/text-transform/blocks.js

@@ -157,6 +157,23 @@ const config = {
             transformer: typografTransformer,
         },
     ],
+    [models_1.SubBlockType.LayoutItem]: [
+        {
+            fields: ['content'],
+            parser: parseContentLayout,
+            transformer: yfmTransformer,
+        },
+        {
+            fields: ['content'],
+            parser: parseContentLayoutTitle,
+            transformer: typografTransformer,
+        },
+        {
+            fields: ['metaInfo'],
+            parser: (0, exports.createItemsParser)([]),
+            transformer: typografTransformer,
+        },
+    ],
     [models_1.SubBlockType.Quote]: {
         fields: ['text'],
         transformer: typografTransformer,

package/styles/root.scss

@@ -17,6 +17,7 @@
     --pc-monochrome-button-background-color-hover: #393939;
     --pc-monochrome-button-color: var(--yc-color-text-light-primary);
     --pc-text-header-color: var(--yc-color-text-primary);
+    --pc-media-card-meta-info-color: var(--yc-color-text-secondary);
 
     &.yc-root_theme_dark {
         --pc-color-sfx-shadow: var(--yc-color-sfx-shadow);