@gravity-ui/page-constructor 1.2.5 → 1.3.0

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

@@ -1,10 +1,11 @@
-import { ImageProps, VideoProps, withTheme, BlockBaseProps, ButtonBlock, MediaProps, } from '../../schema/validators/common';
+import { VideoProps, withTheme, BlockBaseProps, ButtonBlock, MediaProps, } from '../../schema/validators/common';
 import { filteredArray } from '../../schema/validators/utils';
-const HeaderMedia = {
+import { ImageProps } from '../../components/Image/schema';
+export const HeaderBackgroundProps = {
     type: 'object',
     additionalProperties: false,
     required: [],
-    properties: Object.assign(Object.assign({}, MediaProps), { fullWidth: { type: 'boolean' } }),
+    properties: Object.assign(Object.assign({}, MediaProps), { fullWidth: { type: 'boolean' }, fullWidthMedia: { type: 'boolean' } }),
 };
 export const HeaderProperties = {
     title: {
@@ -47,22 +48,7 @@ export const HeaderProperties = {
         type: 'string',
         enum: ['s', 'm', 'l', 'xl'],
     },
-    background: withTheme({
-        oneOf: [
-            HeaderMedia,
-            {
-                type: 'object',
-                additionalProperties: false,
-                properties: {
-                    color: { type: 'string' },
-                    url: { type: 'string' },
-                    disableCompress: { type: 'boolean' },
-                    fullWidth: { type: 'boolean' },
-                    fullWidthMedia: { type: 'boolean' },
-                },
-            },
-        ],
-    }),
+    background: withTheme(HeaderBackgroundProps),
     theme: {
         type: 'string',
         enum: ['default', 'dark'],

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

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

package/build/esm/blocks/Tabs/Tabs.js

@@ -9,6 +9,7 @@ import FullScreenImage from '../../components/FullscreenImage/FullscreenImage';
 import Media from '../../components/Media/Media';
 import Links from '../../components/Link/Links';
 import { ThemeValueContext } from '../../context/theme/ThemeValueContext';
+import { getMediaImage } from '../../components/Media/Image/utils';
 import './Tabs.css';
 const b = block('TabsBlock');
 export const TabsBlock = ({ items, title, description, animated }) => {
@@ -20,7 +21,7 @@ export const TabsBlock = ({ items, title, description, animated }) => {
     let imageProps;
     if (activeTabData) {
         const themedImage = getThemedValue(activeTabData.image, theme);
-        imageProps = typeof themedImage === 'string' ? { src: themedImage } : themedImage;
+        imageProps = themedImage && getMediaImage(themedImage);
     }
     const showMedia = Boolean((activeTabData === null || activeTabData === void 0 ? void 0 : activeTabData.media) || imageProps);
     return (React.createElement(AnimateBlock, { className: b(), onScroll: () => setPlay(true), animate: animated },
@@ -33,7 +34,7 @@ export const TabsBlock = ({ items, title, description, animated }) => {
                 } },
                 (activeTabData === null || activeTabData === void 0 ? void 0 : activeTabData.media) && (React.createElement(Media, Object.assign({}, getThemedValue(activeTabData.media, theme), { key: activeTab, className: b('media'), playVideo: play }))),
                 imageProps && (React.createElement(Fragment, null,
-                    React.createElement(FullScreenImage, { imageClassName: b('image'), src: (imageProps && imageProps.src) || 'default_image', alt: imageProps && imageProps.alt, disableCompress: imageProps === null || imageProps === void 0 ? void 0 : imageProps.disableCompress }),
+                    React.createElement(FullScreenImage, Object.assign({}, imageProps, { imageClassName: b('image') })),
                     activeTabData && (React.createElement("p", { className: b('caption') }, activeTabData.caption)))))),
             React.createElement(Col, { sizes: { all: 12, md: showMedia ? 4 : 8 }, className: b('content') },
                 React.createElement("div", { className: b('content-wrapper', {

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

@@ -1,5 +1,6 @@
 import { filteredArray } from '../../schema/validators/utils';
-import { ImageProps, LinkProps, withTheme, BlockBaseProps, TitleProps, MediaProps, } from '../../schema/validators/common';
+import { LinkProps, withTheme, BlockBaseProps, TitleProps, MediaProps, } from '../../schema/validators/common';
+import { ImageProps } from '../../components/Image/schema';
 export const tabsItem = {
     type: 'object',
     additionalProperties: false,

package/build/esm/components/BackgroundImage/BackgroundImage.js

@@ -4,9 +4,9 @@ import Image from '../Image/Image';
 import './BackgroundImage.css';
 const b = block('storage-background-image');
 const BackgroundImage = (props) => {
-    const { children, src, alt, disableCompress, className, imageClassName, style, hide } = props;
+    const { children, src, desktop, className, imageClassName, style, hide } = props;
     return (React.createElement("div", { className: b(null, className), style: style },
-        src && !hide && (React.createElement(Image, { className: b('img', imageClassName), src: src, alt: alt, disableCompress: disableCompress })),
+        (src || desktop) && !hide && React.createElement(Image, Object.assign({}, props, { className: b('img', imageClassName) })),
         children && React.createElement("div", { className: b('container') }, children)));
 };
 export default BackgroundImage;

package/build/esm/components/BackgroundMedia/BackgroundMedia.css

@@ -10,6 +10,7 @@ unpredictable css rules order in build */
   margin: 0 auto;
   max-width: 1440px;
   text-align: center;
+  height: 100%;
 }
 .pc-BackgroundMedia__image {
   height: 100%;
@@ -17,6 +18,7 @@ unpredictable css rules order in build */
 }
 .pc-BackgroundMedia__video {
   position: relative;
+  height: 100%;
 }
 .pc-BackgroundMedia__video video {
   position: absolute;

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

@@ -1,8 +1,6 @@
 import { CSSProperties, MouseEventHandler } from 'react';
-export interface ImageProps {
-    src: string;
-    alt?: string;
-    disableCompress?: boolean;
+import { ImageDeviceProps, ImageObjectProps } from '../../models';
+export interface ImageProps extends Partial<ImageObjectProps>, Partial<ImageDeviceProps> {
     style?: CSSProperties;
     className?: string;
     onClick?: MouseEventHandler;

package/build/esm/components/Image/Image.js

@@ -1,20 +1,30 @@
-import React, { useContext, useState } from 'react';
+import React, { useContext, useState, Fragment } from 'react';
 import { ProjectSettingsContext } from '../../context/projectSettingsContext';
+import { BREAKPOINTS } from '../../constants';
+const checkWebP = (src) => {
+    return src.endsWith('.webp') ? src : src + '.webp';
+};
 const Image = (props) => {
     const projectSettings = useContext(ProjectSettingsContext);
-    const { src, alt, disableCompress, style, className, onClick } = props;
+    const { src, alt, disableCompress, tablet, desktop, mobile, style, className, onClick } = props;
     const [imgLoadingError, setImgLoadingError] = useState(false);
-    if (!src) {
+    const imageSrc = src || desktop;
+    if (!imageSrc) {
         return null;
     }
     // TODO: Temporary solution for .svg images
     const disableWebp = projectSettings.disableCompress ||
         disableCompress ||
-        src.endsWith('.svg') ||
+        imageSrc.endsWith('.svg') ||
         imgLoadingError;
-    const webp = src.endsWith('.webp') ? src : src + '.webp';
     return (React.createElement("picture", null,
-        disableWebp ? null : React.createElement("source", { srcSet: webp, type: "image/webp" }),
-        React.createElement("img", { className: className, src: src, alt: alt, style: style, onClick: onClick, onError: () => setImgLoadingError(true) })));
+        mobile && (React.createElement(Fragment, null,
+            !disableWebp && (React.createElement("source", { srcSet: checkWebP(mobile), type: "image/webp", media: `(max-width: ${BREAKPOINTS.sm}px)` })),
+            React.createElement("source", { srcSet: mobile, media: `(max-width: ${BREAKPOINTS.sm}px)` }))),
+        tablet && (React.createElement(Fragment, null,
+            !disableWebp && (React.createElement("source", { srcSet: checkWebP(tablet), type: "image/webp", media: `(max-width: ${BREAKPOINTS.md}px)` })),
+            React.createElement("source", { srcSet: tablet, media: `(max-width: ${BREAKPOINTS.md}px)` }))),
+        desktop && !disableWebp && React.createElement("source", { srcSet: checkWebP(imageSrc), type: "image/webp" }),
+        React.createElement("img", { className: className, src: imageSrc, alt: alt, style: style, onClick: onClick, onError: () => setImgLoadingError(true) })));
 };
 export default Image;

package/build/esm/components/Image/schema.d.ts

@@ -0,0 +1,56 @@
+export declare const urlPattern = "^((http[s]?|ftp):\\/)?\\/?([^:\\/\\s]+)((\\/\\w+)*\\/)([\\w\\-\\.]+[^#?\\s]+)(.*)?(#[\\w\\-]+)?$";
+export declare const ImageDeviceProps: {
+    type: string;
+    additionalProperties: boolean;
+    required: string[];
+    properties: {
+        desktop: {
+            type: string;
+            pattern: string;
+        };
+        tablet: {
+            type: string;
+            pattern: string;
+        };
+        mobile: {
+            type: string;
+            pattern: string;
+        };
+        alt: {
+            type: string;
+        };
+        disableCompress: {
+            type: 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;
+    })[];
+};

package/build/esm/components/Image/schema.js

@@ -0,0 +1,51 @@
+import { filteredItem } from '../../schema/validators/utils';
+export const urlPattern = '^((http[s]?|ftp):\\/)?\\/?([^:\\/\\s]+)((\\/\\w+)*\\/)([\\w\\-\\.]+[^#?\\s]+)(.*)?(#[\\w\\-]+)?$';
+export const ImageDeviceProps = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['desktop', 'mobile'],
+    properties: {
+        desktop: { type: 'string', pattern: urlPattern },
+        tablet: {
+            type: 'string',
+            pattern: urlPattern,
+        },
+        mobile: {
+            type: 'string',
+            pattern: urlPattern,
+        },
+        alt: {
+            type: 'string',
+        },
+        disableCompress: {
+            type: 'boolean',
+        },
+    },
+};
+export const ImageObjectProps = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['src'],
+    properties: {
+        src: {
+            type: 'string',
+            pattern: urlPattern,
+        },
+        alt: {
+            type: 'string',
+        },
+        disableCompress: {
+            type: 'boolean',
+        },
+    },
+};
+export const ImageProps = {
+    oneOf: [
+        {
+            type: 'string',
+            pattern: urlPattern,
+        },
+        filteredItem(Object.assign({}, ImageObjectProps)),
+        filteredItem(Object.assign({}, ImageDeviceProps)),
+    ],
+};

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

@@ -34,16 +34,16 @@ const Image = (props) => {
     const imageClass = b('item', { withVideo: Boolean(video) && !hasVideoFallback }, imageClassName);
     const imageSlider = (imageArray) => (React.createElement(SliderBlock, { slidesToShow: 1, type: SliderType.MediaCard }, imageArray.map((item) => {
         const itemData = getMediaImage(item);
-        return (React.createElement(FullScreenImage, { key: itemData.src, src: itemData.src, alt: itemData.alt, imageClassName: imageClass, imageStyle: { height } }));
+        return (React.createElement(FullScreenImage, Object.assign({ key: itemData.alt }, itemData, { imageClassName: imageClass, imageStyle: { height } })));
     })));
     const imageBackground = (oneImage) => {
         const imageData = getMediaImage(oneImage);
         return (React.createElement(animated.div, { style: { transform: parallaxInterpolate } },
-            React.createElement(BackgroundImage, { className: imageClass, src: imageData.src, style: { height }, disableCompress: imageData.disableCompress })));
+            React.createElement(BackgroundImage, Object.assign({}, imageData, { className: imageClass, style: { height } }))));
     };
     const imageOnly = (oneImage) => {
         const imageData = getMediaImage(oneImage);
-        return (React.createElement(ImageView, { className: imageClass, src: imageData.src, alt: imageData.alt, style: { height }, disableCompress: imageData.disableCompress }));
+        return React.createElement(ImageView, Object.assign({}, imageData, { className: imageClass, style: { height } }));
     };
     if (Array.isArray(image)) {
         return imageSlider(image);

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

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

package/build/esm/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 } 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, ImageDeviceProps } from './common';
 import { ThemeSupporting } from '../../utils';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
 import { BannerCardProps, SubBlock } from './sub-blocks';
@@ -78,8 +78,9 @@ export interface HeaderSliderBlockProps extends Omit<SliderProps, 'title' | 'des
     items: HeaderBlockProps[];
 }
 interface HeaderBackgroundProps {
-    color?: string;
+    /** @deprecated replaced by Media Props image */
     url?: string;
+    /** @deprecated replaced by Media Props image */
     disableCompress?: boolean;
 }
 export interface HeaderBlockBackground extends Partial<HeaderBackgroundProps>, Partial<MediaProps> {
@@ -151,12 +152,7 @@ export interface BannerBlockProps extends BannerCardProps, Animatable {
 }
 export interface CompaniesBlockProps extends Animatable {
     title: string;
-    images: ThemeSupporting<{
-        desktop: string;
-        tablet: string;
-        mobile: string;
-        alt?: string;
-    }>;
+    images: ThemeSupporting<ImageDeviceProps>;
 }
 export interface MediaContentProps {
     title: string;

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

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

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

@@ -1,5 +1,4 @@
-import { Block, ConstructorItem, HeaderBlockBackground } from './';
-import { MediaProps, MetrikaGoal, NewMetrikaGoal } from './index';
+import { Block, ConstructorItem } from './';
+import { 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/esm/models/guards.js

@@ -5,6 +5,3 @@ export function isBlock(block) {
 export function isNewMetrikaFormat(metrika) {
     return Boolean(Array.isArray(metrika) && metrika.length && typeof metrika[0] === 'object');
 }
-export function headerHasMediaBackground(background) {
-    return 'image' in background || 'video' in background || 'youtube' in background;
-}