@gravity-ui/page-constructor 4.31.1-alpha.0 → 4.33.0

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

@@ -1,8 +1,8 @@
 import React, { useEffect, useMemo, useRef } from 'react';
 import { MediaVideoType } from '../../../models';
 import { block, getQaAttrubutes } from '../../../utils';
+import { DefaultVideo } from '../../DefaultVideo/DefaultVideo';
 import ReactPlayerBlock from '../../ReactPlayer/ReactPlayer';
-import { getVideoTypesWithPriority } from './utils';
 import './Video.css';
 const b = block('media-component-video');
 const Video = (props) => {
@@ -45,13 +45,9 @@ const Video = (props) => {
     ]);
     const defaultVideoBlock = useMemo(() => {
         return video.src.length && !hasVideoFallback ? (React.createElement("div", { className: b('wrap', videoClassName), style: { height }, "data-qa": qaAttributes.default },
-            React.createElement("video", { disablePictureInPicture: true, playsInline: true, 
-                // @ts-ignore
-                // eslint-disable-next-line react/no-unknown-property
-                pip: "false", className: b('item'), ref: ref, preload: "metadata", muted: true, "aria-label": video.ariaLabel }, getVideoTypesWithPriority(video.src).map(({ src, type }, index) => (React.createElement("source", { key: index, src: src, type: type, "data-qa": qaAttributes.source })))))) : null;
+            React.createElement(DefaultVideo, { ref: ref, video: video, qa: qaAttributes.source }))) : null;
     }, [
-        video.src,
-        video.ariaLabel,
+        video,
         hasVideoFallback,
         videoClassName,
         height,

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

@@ -3,6 +3,7 @@ import { ClassNameProps, TitleProps as TitleParams } from '../../models';
 import './Title.css';
 export interface TitleProps extends TitleParams {
     colSizes?: GridColumnSizesType;
+    id?: string;
 }
-declare const Title: ({ title, subtitle, className, colSizes, }: TitleProps & ClassNameProps) => JSX.Element | null;
+declare const Title: ({ title, subtitle, className, colSizes, id, }: TitleProps & ClassNameProps) => JSX.Element | null;
 export default Title;

package/build/esm/components/Title/Title.js

@@ -6,12 +6,12 @@ import YFMWrapper from '../YFMWrapper/YFMWrapper';
 import TitleItem from './TitleItem';
 import './Title.css';
 const b = block('title');
-const Title = ({ title, subtitle, className, colSizes = { all: 12, sm: 8 }, }) => {
+const Title = ({ title, subtitle, className, colSizes = { all: 12, sm: 8 }, id, }) => {
     if (!title && !subtitle) {
         return null;
     }
     const _a = !title || typeof title === 'string' ? { text: title } : title, { text } = _a, titleProps = __rest(_a, ["text"]);
-    return (React.createElement("div", { className: b(null, className) },
+    return (React.createElement("div", { className: b(null, className), id: id },
         text && (React.createElement(Col, { reset: true, sizes: colSizes },
             React.createElement(TitleItem, Object.assign({ text: text }, titleProps)))),
         subtitle && (React.createElement(Col, { reset: true, sizes: colSizes },

package/build/esm/components/Title/TitleItem.css

@@ -50,13 +50,13 @@ unpredictable css rules order in build */
   }
 }
 .pc-title-item__arrow {
-  margin-top: 10px;
+  margin-top: 9px;
 }
 .pc-title-item__arrow_size_xs {
-  margin-top: 7px;
+  margin-top: 6px;
 }
 .pc-title-item__arrow_size_s {
-  margin-top: 5px;
+  margin-top: 4px;
 }
 .pc-title-item__link {
   color: inherit;

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

@@ -1,5 +1,20 @@
-import { YandexFormProps } from '../../models';
+import { PixelEvent } from '../../models';
+import { AnalyticsEventsBase } from '../../models/common';
 export declare const YANDEX_FORM_ORIGIN = "https://forms.yandex.ru";
-export declare const YANDEX_FORM_SECTION = "surveys";
+export interface YandexFormProps extends AnalyticsEventsBase {
+    id: number | string;
+    containerId?: string;
+    theme?: string;
+    className?: string;
+    headerHeight?: number;
+    customFormOrigin?: string;
+    params?: {
+        [key: string]: string;
+    };
+    onSubmit?: () => void;
+    onLoad?: () => void;
+    metrikaGoals?: string | string[];
+    pixelEvents?: string | string[] | PixelEvent | PixelEvent[];
+}
 declare const YandexForm: (props: YandexFormProps) => JSX.Element;
 export default YandexForm;

package/build/esm/components/YandexForm/YandexForm.js

@@ -7,15 +7,13 @@ import { DefaultEventNames } from '../../models/common';
 import { block } from '../../utils';
 import { HEADER_HEIGHT } from '../constants';
 export const YANDEX_FORM_ORIGIN = 'https://forms.yandex.ru';
-export const YANDEX_FORM_SECTION = 'surveys';
 const CONTAINER_ID = 'pc-yandex-form-container';
 const b = block('yandex-form');
 const YandexForm = (props) => {
-    const { onLoad, id, params, className, theme, containerId = CONTAINER_ID, headerHeight = HEADER_HEIGHT, onSubmit, metrikaGoals, pixelEvents, analyticsEvents, customFormOrigin, customFormSection, } = props;
+    const { onLoad, id, params, className, theme, containerId = CONTAINER_ID, headerHeight = HEADER_HEIGHT, onSubmit, metrikaGoals, pixelEvents, analyticsEvents, customFormOrigin, } = props;
     const formContainerRef = useRef(null);
     const iframeRef = useRef();
     const yaFormOrigin = customFormOrigin || YANDEX_FORM_ORIGIN;
-    const yaFormSection = customFormSection || YANDEX_FORM_SECTION;
     const handleMetrika = useMetrika();
     const handleAnalytics = useAnalytics(DefaultEventNames.YandexFormSubmit);
     const isMobile = useContext(MobileContext);
@@ -37,7 +35,7 @@ const YandexForm = (props) => {
                 queryParams.set(param, params[param]);
             });
         }
-        const src = `${yaFormOrigin}/${yaFormSection}/${id}/?${queryParams}`;
+        const src = `${yaFormOrigin}/surveys/${id}/?${queryParams}`;
         if (iframeRef.current) {
             iframeRef.current.src = src;
         }
@@ -52,7 +50,7 @@ const YandexForm = (props) => {
             iframeRef.current.width = '100%';
             container.appendChild(iframeRef.current);
         }
-    }, [locale.lang, theme, isMobile, yaFormOrigin, yaFormSection, id, containerId, params]);
+    }, [locale.lang, theme, isMobile, yaFormOrigin, id, containerId, params]);
     const handleSubmit = useCallback(() => {
         if (formContainerRef && formContainerRef.current) {
             const { top } = formContainerRef.current.getBoundingClientRect();

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

@@ -17,7 +17,6 @@ export declare const blockMap: {
     "share-block": ({ items, title }: import("./models").ShareBlockProps) => JSX.Element;
     "map-block": ({ map, ...props }: import("./models").MapBlockProps) => JSX.Element;
     "filter-block": import("react").FC<import("./models").FilterBlockProps>;
-    "form-block": import("react").FC<import("./models").FormBlockProps>;
 };
 export declare const subBlockMap: {
     divider: ({ size, border }: import("./models").DividerProps) => JSX.Element;

package/build/esm/constructor-items.js

@@ -1,4 +1,4 @@
-import { BannerBlock, CardLayoutBlock, CompaniesBlock, ContentLayoutBlock, ExtendedFeaturesBlock, FilterBlock, FormBlock, HeaderBlock, HeaderSliderBlock, IconsBlock, InfoBlock, MapBlock, MediaBlock, PromoFeaturesBlock, QuestionsBlock, ShareBlock, SliderBlock, TableBlock, TabsBlock, } from './blocks';
+import { BannerBlock, CardLayoutBlock, CompaniesBlock, ContentLayoutBlock, ExtendedFeaturesBlock, FilterBlock, HeaderBlock, HeaderSliderBlock, IconsBlock, InfoBlock, MapBlock, MediaBlock, PromoFeaturesBlock, QuestionsBlock, ShareBlock, SliderBlock, TableBlock, TabsBlock, } from './blocks';
 import { BlockType, NavigationItemType, SubBlockType } from './models';
 import { GithubButton, NavigationButton, NavigationDropdown, NavigationLink, } from './navigation/components/NavigationItem';
 import SocialIcon from './navigation/components/SocialIcon/SocialIcon';
@@ -22,7 +22,6 @@ export const blockMap = {
     [BlockType.ShareBlock]: ShareBlock,
     [BlockType.MapBlock]: MapBlock,
     [BlockType.FilterBlock]: FilterBlock,
-    [BlockType.FormBlock]: FormBlock,
 };
 export const subBlockMap = {
     [SubBlockType.Divider]: Divider,

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

@@ -3,8 +3,8 @@ import { ButtonSize } from '@gravity-ui/uikit';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
 import { ThemeSupporting } from '../../utils';
 import { AnalyticsEventsBase } from '../common';
-import { AnchorProps, Animatable, BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, ImageDeviceProps, Justify, LegendTableMarkerType, LinkProps, MapProps, MediaDirection, MediaProps, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleItemBaseProps, TitleItemProps, YandexFormProps } from './common';
-import { BannerCardProps, HubspotFormProps, SubBlock, SubBlockModels } from './sub-blocks';
+import { AnchorProps, Animatable, BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, ImageDeviceProps, Justify, LegendTableMarkerType, LinkProps, MapProps, MediaDirection, MediaProps, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleItemBaseProps, TitleItemProps } from './common';
+import { BannerCardProps, SubBlock, SubBlockModels } from './sub-blocks';
 export declare enum BlockType {
     PromoFeaturesBlock = "promo-features-block",
     ExtendedFeaturesBlock = "extended-features-block",
@@ -23,8 +23,7 @@ export declare enum BlockType {
     ContentLayoutBlock = "content-layout-block",
     ShareBlock = "share-block",
     MapBlock = "map-block",
-    FilterBlock = "filter-block",
-    FormBlock = "form-block"
+    FilterBlock = "filter-block"
 }
 export declare const BlockTypes: BlockType[];
 export declare const HeaderBlockTypes: BlockType[];
@@ -275,7 +274,9 @@ export interface ContentItemProps {
 }
 export interface ContentBlockProps {
     title?: TitleItemBaseProps | string;
+    titleId?: string;
     text?: string;
+    textId?: string;
     additionalInfo?: string;
     links?: LinkProps[];
     buttons?: ButtonProps[];
@@ -296,29 +297,6 @@ export interface ShareBlockProps {
     items: PCShareSocialNetwork[];
     title?: string;
 }
-export declare enum FormBlockDataTypes {
-    YANDEX = "yandex",
-    HUBSPOT_INLINE = "hubspot-inline"
-}
-export declare enum FormBlockDirection {
-    FormContent = "form-content",
-    ContentForm = "content-form",
-    Center = "center"
-}
-export interface FormBlockYandexData {
-    yandex: YandexFormProps;
-}
-export interface FormBlockHubspotData {
-    hubspot: HubspotFormProps;
-}
-export type FormBlockData = FormBlockYandexData | FormBlockHubspotData;
-export interface FormBlockProps {
-    formData: FormBlockData;
-    title?: string;
-    textContent?: Omit<ContentBlockProps, 'centered' | 'colSizes' | 'size'>;
-    direction?: FormBlockDirection;
-    background?: BackgroundImageProps;
-}
 export type HeaderBlockModel = {
     type: BlockType.HeaderBlock;
 } & HeaderBlockProps;
@@ -373,9 +351,6 @@ export type ContentLayoutBlockModel = {
 export type ShareBLockModel = {
     type: BlockType.ShareBlock;
 } & ShareBlockProps;
-export type FormBlockModel = {
-    type: BlockType.FormBlock;
-} & FormBlockProps;
-type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel | FormBlockModel;
+type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
 export type Block = BlockModels & BlockBaseProps;
 export {};

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

@@ -18,7 +18,6 @@ export var BlockType;
     BlockType["ShareBlock"] = "share-block";
     BlockType["MapBlock"] = "map-block";
     BlockType["FilterBlock"] = "filter-block";
-    BlockType["FormBlock"] = "form-block";
 })(BlockType || (BlockType = {}));
 export const BlockTypes = Object.values(BlockType);
 export const HeaderBlockTypes = [BlockType.HeaderBlock, BlockType.HeaderSliderBlock];
@@ -42,14 +41,3 @@ export var PCShareSocialNetwork;
     PCShareSocialNetwork["Facebook"] = "facebook";
     PCShareSocialNetwork["LinkedIn"] = "linkedin";
 })(PCShareSocialNetwork || (PCShareSocialNetwork = {}));
-export var FormBlockDataTypes;
-(function (FormBlockDataTypes) {
-    FormBlockDataTypes["YANDEX"] = "yandex";
-    FormBlockDataTypes["HUBSPOT_INLINE"] = "hubspot-inline";
-})(FormBlockDataTypes || (FormBlockDataTypes = {}));
-export var FormBlockDirection;
-(function (FormBlockDirection) {
-    FormBlockDirection["FormContent"] = "form-content";
-    FormBlockDirection["ContentForm"] = "content-form";
-    FormBlockDirection["Center"] = "center";
-})(FormBlockDirection || (FormBlockDirection = {}));

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

@@ -1,7 +1,7 @@
-import React, { CSSProperties, ReactNode } from 'react';
+import React, { CSSProperties, HTMLProps, ReactNode } from 'react';
 import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
 import { ThemeSupporting } from '../../utils';
-import { AnalyticsEventsBase, ClassNameProps, PixelEvent, PixelEventType, QAProps } from '../common';
+import { AnalyticsEventsBase, ClassNameProps, PixelEventType, QAProps } from '../common';
 export declare enum AuthorType {
     Column = "column",
     Line = "line"
@@ -95,7 +95,7 @@ interface LoopProps {
     start: number;
     end?: number;
 }
-export interface ImageInfoProps {
+export interface ImageInfoProps extends Pick<HTMLProps<HTMLImageElement>, 'aria-describedby'> {
     alt?: string;
     disableCompress?: boolean;
 }
@@ -138,6 +138,7 @@ export interface LinkProps extends AnalyticsEventsBase, Stylable, Tabbable {
     target?: string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    extraProps?: HTMLProps<HTMLAnchorElement>;
 }
 export interface FileLinkProps extends ClassNameProps, Tabbable {
     href: string;
@@ -147,11 +148,13 @@ export interface FileLinkProps extends ClassNameProps, Tabbable {
     theme?: ContentTheme;
     urlTitle?: string;
     onClick?: () => void;
+    extraProps?: HTMLProps<HTMLAnchorElement>;
 }
 export type ButtonTheme = ButtonView | 'github' | 'app-store' | 'google-play' | 'scale' | 'monochrome';
 export interface ButtonProps extends AnalyticsEventsBase, Pick<UikitButtonProps, 'size' | 'width' | 'extraProps'> {
     text: string;
     url: string;
+    urlTitle?: string;
     primary?: boolean;
     theme?: ButtonTheme;
     img?: ButtonImageProps | string;
@@ -337,20 +340,4 @@ export interface TitleProps {
     title?: TitleItemProps | string;
     subtitle?: string;
 }
-export interface YandexFormProps extends AnalyticsEventsBase {
-    id: number | string;
-    containerId?: string;
-    theme?: string;
-    className?: string;
-    headerHeight?: number;
-    customFormOrigin?: string;
-    customFormSection?: string;
-    params?: {
-        [key: string]: string;
-    };
-    onSubmit?: () => void;
-    onLoad?: () => void;
-    metrikaGoals?: string | string[];
-    pixelEvents?: string | string[] | PixelEvent | PixelEvent[];
-}
 export {};

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

@@ -1,6 +1,4 @@
-import { Block, ConstructorItem, FormBlockData, FormBlockHubspotData, FormBlockYandexData } from './';
+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 isYandexDataForm(data: FormBlockData): data is FormBlockYandexData;
-export declare function isHubspotDataForm(data: FormBlockData): data is FormBlockHubspotData;

package/build/esm/models/guards.js

@@ -1,13 +1,7 @@
-import { BlockTypes, } from './';
+import { BlockTypes } from './';
 export function isBlock(block) {
     return block.type in BlockTypes;
 }
 export function isNewMetrikaFormat(metrika) {
     return Boolean(Array.isArray(metrika) && metrika.length && typeof metrika[0] === 'object');
 }
-export function isYandexDataForm(data) {
-    return Boolean(data.yandex);
-}
-export function isHubspotDataForm(data) {
-    return Boolean(data.hubspot);
-}

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

@@ -62,6 +62,7 @@ export interface NavigationLogoData {
     icon: ImageProps;
     text?: string;
     url?: string;
+    urlTitle?: string;
 }
 export type ThemedNavigationLogoData = NavigationLogoData & ThemeSupporting<NavigationLogoData>;
 export interface HeaderData {

package/build/esm/navigation/components/Logo/Logo.css

@@ -7,6 +7,7 @@ unpredictable css rules order in build */
 .pc-logo {
   display: flex;
   align-items: center;
+  text-decoration: none;
 }
 .pc-logo__icon {
   display: flex;

package/build/esm/navigation/components/Logo/Logo.js

@@ -1,19 +1,24 @@
-import React from 'react';
+import React, { Fragment, useContext } from 'react';
 import { Image } from '../../../components';
 import { getMediaImage } from '../../../components/Media/Image/utils';
 import RouterLink from '../../../components/RouterLink/RouterLink';
+import { LocationContext } from '../../../context/locationContext';
 import { useTheme } from '../../../context/theme';
-import { block, getThemedValue } from '../../../utils';
+import { block, getLinkProps, getThemedValue } from '../../../utils';
 import './Logo.css';
 const b = block('logo');
 const Logo = (props) => {
+    const { hostname, Link } = useContext(LocationContext);
     const theme = useTheme();
     const themedLogoProps = getThemedValue(props, theme) || props;
     const imageData = getMediaImage(themedLogoProps.icon || props.icon);
     const textData = themedLogoProps.text || props.text;
-    return (React.createElement(RouterLink, { href: themedLogoProps.url || props.url || '/', passHref: true },
-        React.createElement("div", { className: b(null, props.className) },
-            imageData && React.createElement(Image, Object.assign({ className: b('icon') }, imageData)),
-            React.createElement("span", { className: b('text') }, textData))));
+    const url = themedLogoProps.url || props.url || '/';
+    const urlTitle = themedLogoProps.urlTitle || props.urlTitle || textData;
+    const linkExtraProps = getLinkProps(url, hostname);
+    const content = (React.createElement(Fragment, null,
+        imageData && React.createElement(Image, Object.assign({ className: b('icon') }, imageData)),
+        React.createElement("span", { className: b('text') }, textData)));
+    return (React.createElement(RouterLink, { href: url, passHref: true }, Link ? (React.createElement("span", { className: b(null, props.className) }, content)) : (React.createElement("a", Object.assign({ className: b(null, props.className), href: url, title: urlTitle }, linkExtraProps), content))));
 };
 export default Logo;

package/build/esm/schema/constants.js

@@ -1,6 +1,6 @@
-import { BannerBlock, BannerCard, CardLayoutBlock, CompaniesBlock, ContentLayoutBlock, ExtendedFeaturesBlock, FilterBlock, FormBlock, HeaderBlock, HeaderSliderBlock, IconsBlock, InfoBlock, MapBlock, MediaBlock, PromoFeaturesBlock, QuestionsBlock, ShareBlock, SliderBlock, TableBlock, TabsBlock, } from './validators/blocks';
+import { BannerBlock, BannerCard, CardLayoutBlock, CompaniesBlock, ContentLayoutBlock, ExtendedFeaturesBlock, FilterBlock, HeaderBlock, HeaderSliderBlock, IconsBlock, InfoBlock, MapBlock, MediaBlock, PromoFeaturesBlock, QuestionsBlock, ShareBlock, SliderBlock, TableBlock, TabsBlock, } from './validators/blocks';
 import { BackgroundCard, BasicCard, Divider, MediaCardBlock, PriceDetailedBlock, Quote, } from './validators/sub-blocks';
-export const blockSchemas = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Divider), ExtendedFeaturesBlock), PromoFeaturesBlock), SliderBlock), QuestionsBlock), HeaderBlock), BannerBlock), CompaniesBlock), MediaBlock), MapBlock), InfoBlock), TableBlock), TabsBlock), HeaderSliderBlock), IconsBlock), CardLayoutBlock), ContentLayoutBlock), ShareBlock), FilterBlock), FormBlock);
+export const blockSchemas = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Divider), ExtendedFeaturesBlock), PromoFeaturesBlock), SliderBlock), QuestionsBlock), HeaderBlock), BannerBlock), CompaniesBlock), MediaBlock), MapBlock), InfoBlock), TableBlock), TabsBlock), HeaderSliderBlock), IconsBlock), CardLayoutBlock), ContentLayoutBlock), ShareBlock), FilterBlock);
 export const cardSchemas = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, MediaCardBlock), BannerCard), PriceDetailedBlock), BackgroundCard), Quote), BasicCard);
 export const constructorBlockSchemaNames = [
     'divider',
@@ -27,7 +27,6 @@ export const constructorBlockSchemaNames = [
     'content-layout-block',
     'share-block',
     'filter-block',
-    'form-block',
 ];
 export const constructorCardSchemaNames = [
     'media-card',

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

@@ -16,4 +16,3 @@ export * from '../../blocks/CardLayout/schema';
 export * from '../../blocks/ContentLayout/schema';
 export * from '../../blocks/Share/schema';
 export * from '../../blocks/FilterBlock/schema';
-export * from '../../blocks/Form/schema';

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

@@ -16,4 +16,3 @@ export * from '../../blocks/CardLayout/schema';
 export * from '../../blocks/ContentLayout/schema';
 export * from '../../blocks/Share/schema';
 export * from '../../blocks/FilterBlock/schema';
-export * from '../../blocks/Form/schema';

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

@@ -1,5 +1,6 @@
 import { __rest } from "tslib";
 import React from 'react';
+import { useUniqId } from '@gravity-ui/uikit';
 import { Content } from '../';
 import CardBase from '../../components/CardBase/CardBase';
 import Image from '../../components/Image/Image';
@@ -11,10 +12,12 @@ const b = block('basic-card');
 const BasicCard = (props) => {
     const { title, text, icon, additionalInfo, links, buttons, iconPosition = IconPosition.Top } = props, cardParams = __rest(props, ["title", "text", "icon", "additionalInfo", "links", "buttons", "iconPosition"]);
     const iconProps = icon && getMediaImage(icon);
-    return (React.createElement(CardBase, Object.assign({ className: b() }, cardParams),
+    const titleId = useUniqId();
+    const descriptionId = useUniqId();
+    return (React.createElement(CardBase, Object.assign({ className: b() }, cardParams, { extraProps: { 'aria-describedby': descriptionId, 'aria-labelledby': titleId } }),
         React.createElement(CardBase.Content, null,
             React.createElement("div", { className: b('content', { ['icon-position']: iconPosition }) },
                 iconProps && (React.createElement(Image, Object.assign({}, iconProps, { className: b('icon', { ['icon-position']: iconPosition }) }))),
-                React.createElement(Content, { title: title, text: text, additionalInfo: additionalInfo, links: links, buttons: buttons, colSizes: { all: 12, md: 12 }, size: "s", className: b({ ['content-layout']: iconPosition }) })))));
+                React.createElement(Content, { title: title, titleId: titleId, text: text, textId: descriptionId, additionalInfo: additionalInfo, links: links, buttons: buttons, colSizes: { all: 12, md: 12 }, size: "s", className: b({ ['content-layout']: iconPosition }) })))));
 };
 export default BasicCard;

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

@@ -1,4 +1,5 @@
 import React from 'react';
+import { useUniqId } from '@gravity-ui/uikit';
 import { Button, Title, YFMWrapper } from '../../components';
 import LinkBlock from '../../components/Link/Link';
 import { Col } from '../../grid';
@@ -35,16 +36,18 @@ function getButtonSize(size) {
     }
 }
 const Content = (props) => {
-    const { title, text, additionalInfo, size = 'l', links, buttons, colSizes = { all: 12, sm: 8 }, centered, theme, className, list, qa, } = props;
+    const { title, titleId: titleIdFromProps, text, textId, additionalInfo, size = 'l', links, buttons, colSizes = { all: 12, sm: 8 }, centered, theme, className, list, qa, } = props;
     const qaAttributes = getQaAttrubutes(qa, ['links', 'link', 'buttons', 'button', 'list']);
     const titleProps = !title || typeof title === 'string'
         ? { text: title, textSize: getTextSize(size) }
         : title;
     const hasTitle = Boolean(title);
+    const defaultTitleId = useUniqId();
+    const titleId = titleIdFromProps || defaultTitleId;
     return (React.createElement(Col, { className: b({ size, centered, theme }, className), reset: true, sizes: colSizes, qa: qaAttributes.container },
-        title && React.createElement(Title, { className: b('title'), title: titleProps, colSizes: { all: 12 } }),
+        title && (React.createElement(Title, { className: b('title'), title: titleProps, colSizes: { all: 12 }, id: titleId })),
         text && (React.createElement("div", { className: b('text', { ['without-title']: !hasTitle }) },
-            React.createElement(YFMWrapper, { content: text, modifiers: { constructor: true, [`constructor-size-${size}`]: true } }))),
+            React.createElement(YFMWrapper, { content: text, modifiers: { constructor: true, [`constructor-size-${size}`]: true }, id: textId }))),
         (list === null || list === void 0 ? void 0 : list.length) ? React.createElement(ContentList, { list: list, size: size, qa: qaAttributes.list }) : null,
         additionalInfo && (React.createElement("div", { className: b('notice') },
             React.createElement(YFMWrapper, { content: additionalInfo, modifiers: {
@@ -52,7 +55,11 @@ const Content = (props) => {
                     'constructor-notice': true,
                     [`constructor-size-${size}`]: true,
                 } }))),
-        links && (React.createElement("div", { className: b('links'), "data-qa": qaAttributes.links }, links.map((link) => (React.createElement(LinkBlock, Object.assign({ className: b('link') }, link, { textSize: getLinkSize(size), key: link.url, qa: qaAttributes.link })))))),
-        buttons && (React.createElement("div", { className: b('buttons'), "data-qa": qaAttributes.buttons }, buttons.map((item) => (React.createElement(Button, Object.assign({ className: b('button') }, item, { key: item.url, size: getButtonSize(size), qa: qaAttributes.button }))))))));
+        links && (React.createElement("div", { className: b('links'), "data-qa": qaAttributes.links }, links.map((link) => (React.createElement(LinkBlock, Object.assign({ className: b('link') }, link, { textSize: getLinkSize(size), key: link.url, qa: qaAttributes.link, extraProps: {
+                'aria-describedby': link.urlTitle ? undefined : titleId,
+            } })))))),
+        buttons && (React.createElement("div", { className: b('buttons'), "data-qa": qaAttributes.buttons }, buttons.map((item) => (React.createElement(Button, Object.assign({ className: b('button') }, item, { key: item.url, size: getButtonSize(size), qa: qaAttributes.button, extraProps: {
+                'aria-describedby': item.urlTitle ? undefined : titleId,
+            } }))))))));
 };
 export default Content;

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

@@ -239,16 +239,6 @@ unpredictable css rules order in build */
   font-weight: var(--g-text-body-font-weight);
   margin: 20px 0;
 }
-.pc-hubspot-form .hs-richtext a:focus {
-  box-shadow: 0 0 0 2px var(--g-color-line-focus);
-}
-.pc-hubspot-form .hs-richtext a:focus:not(:focus-visible) {
-  box-shadow: none;
-}
-.pc-hubspot-form .hs-richtext a:focus {
-  outline: 0;
-  border-radius: var(--g-focus-border-radius);
-}
 .pc-hubspot-form .hs_error_rollup {
   padding-left: 10px;
   font-size: var(--g-text-body-1-font-size);
@@ -390,6 +380,16 @@ unpredictable css rules order in build */
 .pc-hubspot-form_mobile .hs-button.primary {
   width: 80%;
 }
+.pc-hubspot-form a:focus {
+  box-shadow: 0 0 0 2px var(--g-color-line-focus);
+}
+.pc-hubspot-form a:focus:not(:focus-visible) {
+  box-shadow: none;
+}
+.pc-hubspot-form a:focus {
+  outline: 0;
+  border-radius: var(--g-focus-border-radius);
+}
 .pc-hubspot-form_theme_dark {
   --g-color-line-focus: var(--pc-color-line-focus-dark);
 }

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

@@ -10,6 +10,7 @@ export declare const getLayoutItemLinks: (links: LayoutItemProps['content']['lin
     target?: string | undefined;
     metrikaGoals?: import("../../models").MetrikaGoal | undefined;
     pixelEvents?: import("../../models").ButtonPixel | undefined;
+    extraProps?: import("react").HTMLProps<HTMLAnchorElement> | undefined;
     analyticsEvents?: {
         name: string;
         type?: string | undefined;

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

@@ -62,7 +62,6 @@ unpredictable css rules order in build */
 }
 .pc-quote__content_quote-type_chevron::before {
   position: absolute;
-  top: -1px;
   left: -10px;
   content: "«";
 }
@@ -71,7 +70,6 @@ unpredictable css rules order in build */
 }
 .pc-quote__content_quote-type_english-double::before {
   position: absolute;
-  top: -1px;
   left: -8px;
   content: "“";
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "4.31.1-alpha.0",
+  "version": "4.33.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

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

@@ -3,8 +3,8 @@ import { ButtonSize } from '@gravity-ui/uikit';
 import { GridColumnSize, GridColumnSizesType } from '../../grid/types';
 import { ThemeSupporting } from '../../utils';
 import { AnalyticsEventsBase } from '../common';
-import { AnchorProps, Animatable, BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, ImageDeviceProps, Justify, LegendTableMarkerType, LinkProps, MapProps, MediaDirection, MediaProps, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleItemBaseProps, TitleItemProps, YandexFormProps } from './common';
-import { BannerCardProps, HubspotFormProps, SubBlock, SubBlockModels } from './sub-blocks';
+import { AnchorProps, Animatable, BackgroundImageProps, ButtonProps, ContentSize, ContentTextSize, ContentTheme, FileLinkProps, HeaderBreadCrumbsProps, HeaderImageSize, HeaderOffset, HeaderWidth, ImageDeviceProps, Justify, LegendTableMarkerType, LinkProps, MapProps, MediaDirection, MediaProps, TextSize, TextTheme, ThemedImage, ThemedMediaProps, ThemedMediaVideoProps, TitleItemBaseProps, TitleItemProps } from './common';
+import { BannerCardProps, SubBlock, SubBlockModels } from './sub-blocks';
 export declare enum BlockType {
     PromoFeaturesBlock = "promo-features-block",
     ExtendedFeaturesBlock = "extended-features-block",
@@ -23,8 +23,7 @@ export declare enum BlockType {
     ContentLayoutBlock = "content-layout-block",
     ShareBlock = "share-block",
     MapBlock = "map-block",
-    FilterBlock = "filter-block",
-    FormBlock = "form-block"
+    FilterBlock = "filter-block"
 }
 export declare const BlockTypes: BlockType[];
 export declare const HeaderBlockTypes: BlockType[];
@@ -275,7 +274,9 @@ export interface ContentItemProps {
 }
 export interface ContentBlockProps {
     title?: TitleItemBaseProps | string;
+    titleId?: string;
     text?: string;
+    textId?: string;
     additionalInfo?: string;
     links?: LinkProps[];
     buttons?: ButtonProps[];
@@ -296,29 +297,6 @@ export interface ShareBlockProps {
     items: PCShareSocialNetwork[];
     title?: string;
 }
-export declare enum FormBlockDataTypes {
-    YANDEX = "yandex",
-    HUBSPOT_INLINE = "hubspot-inline"
-}
-export declare enum FormBlockDirection {
-    FormContent = "form-content",
-    ContentForm = "content-form",
-    Center = "center"
-}
-export interface FormBlockYandexData {
-    yandex: YandexFormProps;
-}
-export interface FormBlockHubspotData {
-    hubspot: HubspotFormProps;
-}
-export type FormBlockData = FormBlockYandexData | FormBlockHubspotData;
-export interface FormBlockProps {
-    formData: FormBlockData;
-    title?: string;
-    textContent?: Omit<ContentBlockProps, 'centered' | 'colSizes' | 'size'>;
-    direction?: FormBlockDirection;
-    background?: BackgroundImageProps;
-}
 export type HeaderBlockModel = {
     type: BlockType.HeaderBlock;
 } & HeaderBlockProps;
@@ -373,9 +351,6 @@ export type ContentLayoutBlockModel = {
 export type ShareBLockModel = {
     type: BlockType.ShareBlock;
 } & ShareBlockProps;
-export type FormBlockModel = {
-    type: BlockType.FormBlock;
-} & FormBlockProps;
-type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel | FormBlockModel;
+type BlockModels = SliderBlockModel | ExtendedFeaturesBlockModel | PromoFeaturesBlockModel | QuestionsBlockModel | BannerBlockModel | CompaniesBlockModel | MediaBlockModel | MapBlockModel | InfoBlockModel | TableBlockModel | TabsBlockModel | HeaderBlockModel | IconsBlockModel | HeaderSliderBlockModel | CardLayoutBlockModel | ContentLayoutBlockModel | ShareBLockModel | FilterBlockModel;
 export type Block = BlockModels & BlockBaseProps;
 export {};