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

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

@@ -4,14 +4,13 @@ import { block, getThemedValue } from '../../utils';
 import { AuthorType } from '../../models';
 import { Author, Image, HTML } from '../../components';
 import { ThemeValueContext } from '../../context/theme/ThemeValueContext';
-import { getMediaImage } from '../../components/Media/Image/utils';
 import './Quote.css';
 const b = block('quote');
 const Quote = (props) => {
     const { theme: textTheme = 'light', color, image, border = 'shadow', text, logo, author, url, buttonText, } = props;
     const { themeValue: theme } = useContext(ThemeValueContext);
     const imageThemed = getThemedValue(image, theme);
-    const imageData = getMediaImage(imageThemed);
+    const imageData = typeof imageThemed === 'string' ? { src: imageThemed } : imageThemed;
     const renderFooter = Boolean(author || url) && (React.createElement("div", { className: b('author-wrapper') },
         author && (React.createElement(Author, { className: b('author', { theme: textTheme }), author: author, type: AuthorType.Line })),
         url && buttonText && (React.createElement(Button, { view: "outlined", size: "xl", href: url, className: b('link-button', { theme: textTheme }) }, buttonText))));
@@ -24,6 +23,6 @@ const Quote = (props) => {
                         React.createElement(HTML, null, text)))),
             renderFooter),
         React.createElement("div", { className: b('image-wrapper') },
-            React.createElement(Image, Object.assign({}, imageData, { className: b('image') })))));
+            React.createElement(Image, { src: imageData.src, alt: imageData.alt, className: b('image') }))));
 };
 export default Quote;

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

@@ -1,5 +1,4 @@
-import { authorItem, BaseProps, ThemeProps, withTheme } from '../../schema/validators/common';
-import { ImageProps, urlPattern } from '../../components/Image/schema';
+import { authorItem, BaseProps, ImageProps, ThemeProps, withTheme, urlPattern, } from '../../schema/validators/common';
 export const Quote = {
     quote: {
         additionalProperties: false,

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

@@ -6,8 +6,8 @@ import { getMediaImage } from '../../components/Media/Image/utils';
 import './TutorialCard.css';
 const b = block('tutorial-card');
 function iconElement(icon, title) {
-    const image = getMediaImage(icon !== null && icon !== void 0 ? icon : {});
-    return React.createElement(Image, Object.assign({}, image, { alt: title, className: b('icon') }));
+    const { src, alt = title, disableCompress } = getMediaImage(icon !== null && icon !== void 0 ? icon : {});
+    return React.createElement(Image, { src: src, alt: alt, className: b('icon'), disableCompress: disableCompress });
 }
 const TutorialCard = (props) => {
     const { url, title, text, border, icon } = props;

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

@@ -1,5 +1,4 @@
-import { BaseProps } from '../../schema/validators/common';
-import { ImageProps } from '../../components/Image/schema';
+import { BaseProps, ImageProps } from '../../schema/validators/common';
 export const TutorialCard = {
     'tutorial-card': {
         additionalProperties: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.2.3-alpha.3",
+  "version": "1.2.4",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -121,8 +121,5 @@
     "*.{json,yaml,yml,md}": [
       "prettier --write"
     ]
-  },
-  "publishConfig": {
-    "tag": "alpha"
   }
 }

package/server/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/server/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/server/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/server/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/components/Image/schema.d.ts

@@ -1,56 +0,0 @@
-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/cjs/components/Image/schema.js

@@ -1,54 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ImageProps = exports.ImageObjectProps = exports.ImageDeviceProps = exports.urlPattern = void 0;
-const utils_1 = require("../../schema/validators/utils");
-exports.urlPattern = '^((http[s]?|ftp):\\/)?\\/?([^:\\/\\s]+)((\\/\\w+)*\\/)([\\w\\-\\.]+[^#?\\s]+)(.*)?(#[\\w\\-]+)?$';
-exports.ImageDeviceProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['desktop', 'mobile'],
-    properties: {
-        desktop: { type: 'string', pattern: exports.urlPattern },
-        tablet: {
-            type: 'string',
-            pattern: exports.urlPattern,
-        },
-        mobile: {
-            type: 'string',
-            pattern: exports.urlPattern,
-        },
-        alt: {
-            type: 'string',
-        },
-        disableCompress: {
-            type: 'boolean',
-        },
-    },
-};
-exports.ImageObjectProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['src'],
-    properties: {
-        src: {
-            type: 'string',
-            pattern: exports.urlPattern,
-        },
-        alt: {
-            type: 'string',
-        },
-        disableCompress: {
-            type: 'boolean',
-        },
-    },
-};
-exports.ImageProps = {
-    oneOf: [
-        {
-            type: 'string',
-            pattern: exports.urlPattern,
-        },
-        (0, utils_1.filteredItem)(Object.assign({}, exports.ImageObjectProps)),
-        (0, utils_1.filteredItem)(Object.assign({}, exports.ImageDeviceProps)),
-    ],
-};

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

@@ -1,56 +0,0 @@
-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

@@ -1,51 +0,0 @@
-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)),
-    ],
-};