@gravity-ui/page-constructor 1.2.3-alpha.3 → 1.2.4

package/build/cjs/blocks/Header/schema.js

@@ -3,7 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HeaderBlock = exports.HeaderProperties = void 0;
 const common_1 = require("../../schema/validators/common");
 const utils_1 = require("../../schema/validators/utils");
-const schema_1 = require("../../components/Image/schema");
+const HeaderMedia = {
+    type: 'object',
+    additionalProperties: false,
+    required: [],
+    properties: Object.assign(Object.assign({}, common_1.MediaProps), { fullWidth: { type: 'boolean' } }),
+};
 exports.HeaderProperties = {
     title: {
         type: 'string',
@@ -23,7 +28,7 @@ exports.HeaderProperties = {
         type: 'string',
         enum: ['default', 'large'],
     },
-    image: (0, common_1.withTheme)(schema_1.ImageProps),
+    image: (0, common_1.withTheme)(common_1.ImageProps),
     video: (0, common_1.withTheme)(common_1.VideoProps),
     backLink: {
         type: 'object',
@@ -45,7 +50,22 @@ exports.HeaderProperties = {
         type: 'string',
         enum: ['s', 'm', 'l', 'xl'],
     },
-    background: (0, common_1.withTheme)(Object.assign(Object.assign({}, common_1.MediaProps), { fullWidth: { type: 'boolean' }, fullWidthMedia: { type: 'boolean' } })),
+    background: (0, common_1.withTheme)({
+        oneOf: [
+            HeaderMedia,
+            {
+                type: 'object',
+                additionalProperties: false,
+                properties: {
+                    color: { type: 'string' },
+                    url: { type: 'string' },
+                    disableCompress: { type: 'boolean' },
+                    fullWidth: { type: 'boolean' },
+                    fullWidthMedia: { type: 'boolean' },
+                },
+            },
+        ],
+    }),
     theme: {
         type: 'string',
         enum: ['default', 'dark'],

package/build/cjs/blocks/HeaderSlider/schema.d.ts

@@ -151,139 +151,163 @@ export declare const HeaderSliderBlock: {
                         };
                         background: {
                             oneOf: ({
-                                fullWidth: {
-                                    type: string;
-                                };
-                                fullWidthMedia: {
-                                    type: string;
-                                };
-                                color: {
+                                oneOf: ({
                                     type: string;
-                                };
-                                image: {
-                                    anyOf: ({
-                                        oneOf: ({
+                                    additionalProperties: boolean;
+                                    required: never[];
+                                    properties: {
+                                        fullWidth: {
                                             type: string;
-                                            properties: {
-                                                when: {
-                                                    type: string;
-                                                };
-                                            };
-                                        } | {
+                                        };
+                                        color: {
                                             type: string;
-                                            pattern: string;
-                                        })[];
-                                    } | {
-                                        type: string;
-                                        items: {
-                                            oneOf: ({
-                                                type: string;
-                                                properties: {
-                                                    when: {
-                                                        type: string;
+                                        };
+                                        image: {
+                                            anyOf: ({
+                                                oneOf: ({
+                                                    type: string;
+                                                    properties: {
+                                                        when: {
+                                                            type: string;
+                                                        };
                                                     };
-                                                };
+                                                } | {
+                                                    type: string;
+                                                    pattern: string;
+                                                })[];
                                             } | {
                                                 type: string;
-                                                pattern: string;
+                                                items: {
+                                                    oneOf: ({
+                                                        type: string;
+                                                        properties: {
+                                                            when: {
+                                                                type: string;
+                                                            };
+                                                        };
+                                                    } | {
+                                                        type: string;
+                                                        pattern: string;
+                                                    })[];
+                                                };
                                             })[];
                                         };
-                                    })[];
-                                };
-                                video: {
-                                    type: string;
-                                    additionalProperties: boolean;
-                                    required: string[];
-                                    properties: {
-                                        src: {
+                                        video: {
                                             type: string;
-                                            items: {
-                                                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;
+                                                        };
+                                                    };
+                                                };
+                                                controls: {
+                                                    type: string;
+                                                    enum: string[];
+                                                };
                                             };
                                         };
-                                        loop: {
-                                            anyOf: ({
+                                        youtube: {
+                                            type: string;
+                                        };
+                                        parallax: {
+                                            type: string;
+                                        };
+                                        height: {
+                                            type: string;
+                                        };
+                                        previewImg: {
+                                            type: string;
+                                        };
+                                        dataLens: {
+                                            oneOf: ({
                                                 type: string;
                                                 additionalProperties: boolean;
                                                 required: string[];
                                                 properties: {
-                                                    start: {
+                                                    id: {
                                                         type: string;
                                                     };
-                                                    end: {
+                                                    theme: {
                                                         type: string;
+                                                        enum: string[];
                                                     };
                                                 };
                                             } | {
                                                 type: string;
                                             })[];
                                         };
-                                        type: {
-                                            type: string;
-                                            enum: string[];
-                                        };
-                                        muted: {
+                                    };
+                                } | {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                    properties: {
+                                        color: {
                                             type: string;
                                         };
-                                        playing: {
+                                        url: {
                                             type: string;
                                         };
-                                        elapsedTime: {
+                                        disableCompress: {
                                             type: string;
                                         };
-                                        playIcon: {
+                                        fullWidth: {
                                             type: string;
-                                            additionalProperties: boolean;
-                                            properties: {
-                                                type: {
-                                                    type: string;
-                                                    enum: string[];
-                                                };
-                                                theme: {
-                                                    type: string;
-                                                    enum: string[];
-                                                };
-                                                text: {
-                                                    type: string;
-                                                };
-                                            };
                                         };
-                                        controls: {
+                                        fullWidthMedia: {
                                             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;
-                                    })[];
-                                };
+                                })[];
                             } | {
                                 type: string;
                                 additionalProperties: boolean;

package/build/cjs/blocks/Tabs/Tabs.js

@@ -13,7 +13,6 @@ const FullscreenImage_1 = (0, tslib_1.__importDefault)(require("../../components
 const Media_1 = (0, tslib_1.__importDefault)(require("../../components/Media/Media"));
 const Links_1 = (0, tslib_1.__importDefault)(require("../../components/Link/Links"));
 const ThemeValueContext_1 = require("../../context/theme/ThemeValueContext");
-const utils_2 = require("../../components/Media/Image/utils");
 const b = (0, utils_1.block)('TabsBlock');
 const TabsBlock = ({ items, title, description, animated }) => {
     const [activeTab, setActiveTab] = (0, react_1.useState)(items[0].tabName);
@@ -24,7 +23,7 @@ const TabsBlock = ({ items, title, description, animated }) => {
     let imageProps;
     if (activeTabData) {
         const themedImage = (0, utils_1.getThemedValue)(activeTabData.image, theme);
-        imageProps = themedImage && (0, utils_2.getMediaImage)(themedImage);
+        imageProps = typeof themedImage === 'string' ? { src: themedImage } : themedImage;
     }
     const showMedia = Boolean((activeTabData === null || activeTabData === void 0 ? void 0 : activeTabData.media) || imageProps);
     return (react_1.default.createElement(AnimateBlock_1.default, { className: b(), onScroll: () => setPlay(true), animate: animated },
@@ -37,7 +36,7 @@ const TabsBlock = ({ items, title, description, animated }) => {
                 } },
                 (activeTabData === null || activeTabData === void 0 ? void 0 : activeTabData.media) && (react_1.default.createElement(Media_1.default, Object.assign({}, (0, utils_1.getThemedValue)(activeTabData.media, theme), { key: activeTab, className: b('media'), playVideo: play }))),
                 imageProps && (react_1.default.createElement(react_1.Fragment, null,
-                    react_1.default.createElement(FullscreenImage_1.default, Object.assign({}, imageProps, { imageClassName: b('image') })),
+                    react_1.default.createElement(FullscreenImage_1.default, { imageClassName: b('image'), src: (imageProps && imageProps.src) || 'default_image', alt: imageProps && imageProps.alt, disableCompress: imageProps === null || imageProps === void 0 ? void 0 : imageProps.disableCompress }),
                     activeTabData && (react_1.default.createElement("p", { className: b('caption') }, activeTabData.caption)))))),
             react_1.default.createElement(grid_1.Col, { sizes: { all: 12, md: showMedia ? 4 : 8 }, className: b('content') },
                 react_1.default.createElement("div", { className: b('content-wrapper', {

package/build/cjs/blocks/Tabs/schema.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.TabsBlock = exports.tabsItem = void 0;
 const utils_1 = require("../../schema/validators/utils");
 const common_1 = require("../../schema/validators/common");
-const schema_1 = require("../../components/Image/schema");
 exports.tabsItem = {
     type: 'object',
     additionalProperties: false,
@@ -28,7 +27,7 @@ exports.tabsItem = {
         //TODO deprecated
         link: common_1.LinkProps,
         links: (0, utils_1.filteredArray)(common_1.LinkProps),
-        image: (0, common_1.withTheme)(schema_1.ImageProps),
+        image: (0, common_1.withTheme)(common_1.ImageProps),
     },
 };
 exports.TabsBlock = {

package/build/cjs/components/BackgroundImage/BackgroundImage.js

@@ -6,9 +6,9 @@ const utils_1 = require("../../utils");
 const Image_1 = (0, tslib_1.__importDefault)(require("../Image/Image"));
 const b = (0, utils_1.block)('storage-background-image');
 const BackgroundImage = (props) => {
-    const { children, src, desktop, className, imageClassName, style, hide } = props;
+    const { children, src, alt, disableCompress, className, imageClassName, style, hide } = props;
     return (react_1.default.createElement("div", { className: b(null, className), style: style },
-        (src || desktop) && !hide && react_1.default.createElement(Image_1.default, Object.assign({}, props, { className: b('img', imageClassName) })),
+        src && !hide && (react_1.default.createElement(Image_1.default, { className: b('img', imageClassName), src: src, alt: alt, disableCompress: disableCompress })),
         children && react_1.default.createElement("div", { className: b('container') }, children)));
 };
 exports.default = BackgroundImage;

package/build/cjs/components/FullscreenImage/FullscreenImage.d.ts

@@ -1,6 +1,6 @@
 import { CSSProperties } from 'react';
-import { ImageOwnProps } from '../Image/Image';
-export interface FullScreenImageProps extends ImageOwnProps {
+import { ImageProps } from '../Image/Image';
+export interface FullScreenImageProps extends ImageProps {
     imageClassName?: string;
     modalImageClass?: string;
     imageStyle?: CSSProperties;

package/build/cjs/components/Image/Image.d.ts

@@ -1,9 +1,11 @@
 import { CSSProperties, MouseEventHandler } from 'react';
-import { ImageDeviceProps, ImageObjectProps } from '../../models';
-export interface ImageOwnProps extends Partial<ImageObjectProps>, Partial<ImageDeviceProps> {
+export interface ImageProps {
+    src: string;
+    alt?: string;
+    disableCompress?: boolean;
     style?: CSSProperties;
     className?: string;
     onClick?: MouseEventHandler;
 }
-declare const Image: (props: ImageOwnProps) => JSX.Element | null;
+declare const Image: (props: ImageProps) => JSX.Element | null;
 export default Image;

package/build/cjs/components/Image/Image.js

@@ -3,25 +3,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const react_1 = (0, tslib_1.__importStar)(require("react"));
 const projectSettingsContext_1 = require("../../context/projectSettingsContext");
-const constants_1 = require("../../constants");
 const Image = (props) => {
     const projectSettings = (0, react_1.useContext)(projectSettingsContext_1.ProjectSettingsContext);
-    const { src, alt, disableCompress, tablet, desktop, mobile, style, className, onClick } = props;
+    const { src, alt, disableCompress, style, className, onClick } = props;
     const [imgLoadingError, setImgLoadingError] = (0, react_1.useState)(false);
-    const imageSrc = src || desktop;
-    if (!imageSrc) {
+    if (!src) {
         return null;
     }
     // TODO: Temporary solution for .svg images
     const disableWebp = projectSettings.disableCompress ||
         disableCompress ||
-        imageSrc.endsWith('.svg') ||
+        src.endsWith('.svg') ||
         imgLoadingError;
-    const webp = imageSrc.endsWith('.webp') ? src : src + '.webp';
+    const webp = src.endsWith('.webp') ? src : src + '.webp';
     return (react_1.default.createElement("picture", null,
         disableWebp ? null : react_1.default.createElement("source", { srcSet: webp, type: "image/webp" }),
-        mobile && react_1.default.createElement("source", { srcSet: mobile, media: `(max-width: ${constants_1.BREAKPOINTS.sm}px)` }),
-        tablet && react_1.default.createElement("source", { srcSet: tablet, media: `(max-width: ${constants_1.BREAKPOINTS.md}px)` }),
-        react_1.default.createElement("img", { className: className, src: imageSrc, alt: alt, style: style, onClick: onClick, onError: () => setImgLoadingError(true) })));
+        react_1.default.createElement("img", { className: className, src: src, alt: alt, style: style, onClick: onClick, onError: () => setImgLoadingError(true) })));
 };
 exports.default = Image;

package/build/cjs/components/Media/Image/Image.js

@@ -36,16 +36,16 @@ const Image = (props) => {
     const imageClass = b('item', { withVideo: Boolean(video) && !hasVideoFallback }, imageClassName);
     const imageSlider = (imageArray) => (react_1.default.createElement(Slider_1.default, { slidesToShow: 1, type: models_1.SliderType.MediaCard }, imageArray.map((item) => {
         const itemData = (0, utils_1.getMediaImage)(item);
-        return (react_1.default.createElement(FullscreenImage_1.default, Object.assign({ key: itemData.alt }, itemData, { imageClassName: imageClass, imageStyle: { height } })));
+        return (react_1.default.createElement(FullscreenImage_1.default, { key: itemData.src, src: itemData.src, alt: itemData.alt, imageClassName: imageClass, imageStyle: { height } }));
     })));
     const imageBackground = (oneImage) => {
         const imageData = (0, utils_1.getMediaImage)(oneImage);
         return (react_1.default.createElement(react_spring_1.animated.div, { style: { transform: parallaxInterpolate } },
-            react_1.default.createElement(BackgroundImage_1.default, Object.assign({}, imageData, { className: imageClass, style: { height } }))));
+            react_1.default.createElement(BackgroundImage_1.default, { className: imageClass, src: imageData.src, style: { height }, disableCompress: imageData.disableCompress })));
     };
     const imageOnly = (oneImage) => {
         const imageData = (0, utils_1.getMediaImage)(oneImage);
-        return react_1.default.createElement(Image_1.default, Object.assign({}, imageData, { className: imageClass, style: { height } }));
+        return (react_1.default.createElement(Image_1.default, { className: imageClass, src: imageData.src, alt: imageData.alt, style: { height }, disableCompress: imageData.disableCompress }));
     };
     if (Array.isArray(image)) {
         return imageSlider(image);

package/build/cjs/components/Media/Image/utils.d.ts

@@ -1,2 +1,2 @@
-import { ImageProps } from '../../../models';
-export declare function getMediaImage(image: ImageProps): import("../../../models").ImageObjectProps | import("../../../models").ImageDeviceProps;
+import { ImageObjectProps, ImageProps } from '../../../models';
+export declare function getMediaImage(image: ImageProps): ImageObjectProps;

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

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, Justify, LinkProps, LinkTheme, MediaDirection, MediaProps, PreviewItemProps, PreviewRatioMediaContent, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleProps, LegendTableMarkerType, AnchorProps, TitleBaseProps, Animatable, BlockHeaderProps, ImageDeviceProps, ImageProps } from './common';
+import { BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, Justify, LinkProps, LinkTheme, MediaDirection, MediaProps, PreviewItemProps, PreviewRatioMediaContent, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleProps, LegendTableMarkerType, AnchorProps, TitleBaseProps, Animatable, BlockHeaderProps } from './common';
 import { ThemeSupporting } from '../../utils';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
 import { BannerCardProps, SubBlock } from './sub-blocks';
@@ -78,9 +78,8 @@ export interface HeaderSliderBlockProps extends Omit<SliderProps, 'title' | 'des
     items: HeaderBlockProps[];
 }
 interface HeaderBackgroundProps {
-    /** @deprecated replaced by Media Props image */
-    url?: ImageProps;
-    /** @deprecated replaced by Media Props image */
+    color?: string;
+    url?: string;
     disableCompress?: boolean;
 }
 export interface HeaderBlockBackground extends Partial<HeaderBackgroundProps>, Partial<MediaProps> {
@@ -152,7 +151,12 @@ export interface BannerBlockProps extends BannerCardProps, Animatable {
 }
 export interface CompaniesBlockProps extends Animatable {
     title: string;
-    images: ThemeSupporting<ImageDeviceProps>;
+    images: ThemeSupporting<{
+        desktop: string;
+        tablet: string;
+        mobile: string;
+        alt?: string;
+    }>;
 }
 export interface MediaContentProps {
     title: string;

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

@@ -81,21 +81,17 @@ interface LoopProps {
     start: number;
     end?: number;
 }
-export interface ImageInfoProps {
+export interface ImageObjectProps {
+    src: string;
     alt?: string;
     disableCompress?: boolean;
 }
-export interface ImageObjectProps extends ImageInfoProps {
-    src: string;
-}
-export interface ImageDeviceProps extends ImageInfoProps {
-    desktop: string;
-    mobile: string;
-    tablet?: string;
-}
-export declare type ImageProps = string | ImageObjectProps | ImageDeviceProps;
+export declare type ImageProps = string | ImageObjectProps;
 export declare type ThemedImage = ThemeSupporting<ImageProps>;
-export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement>, Partial<ImageDeviceProps>, Partial<ImageObjectProps> {
+export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement> {
+    src?: string;
+    alt?: string;
+    disableCompress?: boolean;
     style?: CSSProperties;
     imageClassName?: string;
     hide?: boolean;

package/build/cjs/models/guards.d.ts

@@ -1,4 +1,5 @@
-import { Block, ConstructorItem } from './';
-import { MetrikaGoal, NewMetrikaGoal } from './index';
+import { Block, ConstructorItem, HeaderBlockBackground } from './';
+import { MediaProps, MetrikaGoal, NewMetrikaGoal } from './index';
 export declare function isBlock(block: ConstructorItem): block is Block;
 export declare function isNewMetrikaFormat(metrika: MetrikaGoal): metrika is NewMetrikaGoal[];
+export declare function headerHasMediaBackground(background: HeaderBlockBackground): background is MediaProps;

package/build/cjs/models/guards.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isNewMetrikaFormat = exports.isBlock = void 0;
+exports.headerHasMediaBackground = exports.isNewMetrikaFormat = exports.isBlock = void 0;
 const _1 = require("./");
 function isBlock(block) {
     return block.type in _1.BlockTypes;
@@ -10,3 +10,7 @@ function isNewMetrikaFormat(metrika) {
     return Boolean(Array.isArray(metrika) && metrika.length && typeof metrika[0] === 'object');
 }
 exports.isNewMetrikaFormat = isNewMetrikaFormat;
+function headerHasMediaBackground(background) {
+    return 'image' in background || 'video' in background || 'youtube' in background;
+}
+exports.headerHasMediaBackground = headerHasMediaBackground;

package/build/cjs/schema/validators/common.d.ts

@@ -19,6 +19,7 @@ export declare const sizeNumber: {
     minimum: number;
 };
 export declare const contentThemes: string[];
+export declare const urlPattern = "^((http[s]?|ftp):\\/)?\\/?([^:\\/\\s]+)((\\/\\w+)*\\/)([\\w\\-\\.]+[^#?\\s]+)(.*)?(#[\\w\\-]+)?$";
 export declare const BaseProps: {
     type: {};
     when: {};
@@ -158,6 +159,36 @@ export declare const JustifyProps: {
     type: string;
     enum: string[];
 };
+export declare const ImageObjectProps: {
+    type: string;
+    additionalProperties: boolean;
+    required: string[];
+    properties: {
+        src: {
+            type: string;
+            pattern: string;
+        };
+        alt: {
+            type: string;
+        };
+        disableCompress: {
+            type: string;
+        };
+    };
+};
+export declare const ImageProps: {
+    oneOf: ({
+        type: string;
+        properties: {
+            when: {
+                type: string;
+            };
+        };
+    } | {
+        type: string;
+        pattern: string;
+    })[];
+};
 export declare const DataLensObjectProps: {
     type: string;
     additionalProperties: boolean;