@gravity-ui/page-constructor 1.15.0-alpha.2 → 1.15.0-alpha.21

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

@@ -110,7 +110,8 @@ export interface MediaVideoProps {
     playButton?: PlayButtonProps;
     controls?: MediaVideoControlsType;
     metrika?: MetrikaVideo;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface LinkProps extends Stylable {
     url: string;
@@ -123,6 +124,7 @@ export interface LinkProps extends Stylable {
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
     analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface FileLinkProps extends ClassNameProps {
     href: string;
@@ -141,8 +143,9 @@ export interface ButtonProps {
     img?: ButtonImageProps | string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
     target?: string;
+    context?: string;
 }
 export interface ButtonImageProps {
     url: string;
@@ -170,7 +173,8 @@ export interface MediaComponentVideoProps {
     video: MediaVideoProps;
     height?: number;
     metrika?: MetrikaVideo;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
     previewImg?: string;
 }
 export interface MediaComponentYoutubeProps {
@@ -222,11 +226,12 @@ export interface HeaderBreadCrumbsProps extends ClassNameProps {
     items: {
         url: string;
         text: ReactNode;
+        analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
     }[];
     theme?: TextTheme;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
-    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface PreviewContentItemProps {
     title: string;

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

@@ -62,6 +62,7 @@ export interface HubspotFormProps extends HubspotEventHandlers {
     pixelEvents?: string | string[] | PixelEvent | PixelEvent[] | ButtonPixel;
     hubspotEvents?: string[];
     analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface PartnerProps extends CardBaseProps {
     text: string;
@@ -77,6 +78,7 @@ export interface QuoteProps extends Themable, CardBaseProps {
     author?: AuthorItem;
     buttonText?: string;
     theme?: TextTheme;
+    context?: string;
 }
 export interface NewsCardData {
     id: number;
@@ -111,6 +113,7 @@ export interface BannerCardProps {
     color?: ThemeSupporting<string>;
     theme?: TextTheme;
     button: Pick<ButtonProps, 'text' | 'url' | 'target'>;
+    context?: string;
 }
 export interface MediaCardProps extends MediaProps, CardBaseProps {
 }
@@ -118,7 +121,7 @@ export interface CardWithImageLinkProps extends Omit<LinkProps, 'text' | 'url'>
     title: string;
     link: string;
 }
-export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockProps, 'title' | 'additionalInfo' | 'buttons' | 'theme'> {
+export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockProps, 'title' | 'additionalInfo' | 'buttons' | 'theme' | 'context'> {
     image: string;
     description?: string;
     disableCompress?: boolean;

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

@@ -9,6 +9,7 @@ import SocialIcon from '../SocialIcon/SocialIcon';
 import { getMediaImage } from '../../../components/Media/Image/utils';
 import './NavigationItem.css';
 const b = block('navigation-item');
+const BLOCK_NAME = 'navigation';
 const Content = ({ text, icon }) => (React.createElement(Fragment, null,
     icon && typeof icon !== 'string' && React.createElement(Image, Object.assign({ className: b('icon') }, icon)),
     React.createElement("span", { className: b('text') }, text)));
@@ -37,8 +38,8 @@ const NavigationLink = (props) => {
 };
 const NavigationButton = (props) => {
     const { url, target } = props;
-    return target ? (React.createElement(Button, Object.assign({}, props, { url: url }))) : (React.createElement(RouterLink, { href: url },
-        React.createElement(Button, Object.assign({}, props, { url: url }))));
+    return target ? (React.createElement(Button, Object.assign({}, props, { url: url, context: BLOCK_NAME }))) : (React.createElement(RouterLink, { href: url },
+        React.createElement(Button, Object.assign({}, props, { url: url, context: BLOCK_NAME }))));
 };
 //todo: add types support form component in map
 // eslint-disable-next-line @typescript-eslint/no-explicit-any

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

@@ -538,6 +538,9 @@ export declare const ButtonProps: {
                         };
                     };
                 };
+                context: {
+                    type: string;
+                };
             };
         } | {
             type: string;
@@ -573,6 +576,9 @@ export declare const ButtonProps: {
                             };
                         };
                     };
+                    context: {
+                        type: string;
+                    };
                 };
             };
         })[];
@@ -636,6 +642,9 @@ export declare const BlockBaseProps: {
     resetPaddings: {
         type: string;
     };
+    context: {
+        type: string;
+    };
     type: {};
     when: {};
 };
@@ -831,6 +840,9 @@ export declare const ButtonBlock: {
                             };
                         };
                     };
+                    context: {
+                        type: string;
+                    };
                 };
             } | {
                 type: string;
@@ -866,6 +878,9 @@ export declare const ButtonBlock: {
                                 };
                             };
                         };
+                        context: {
+                            type: string;
+                        };
                     };
                 };
             })[];

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

@@ -386,6 +386,8 @@ export const BlockBaseProps = Object.assign(Object.assign({}, BaseProps), { anch
         enum: containerSizesArray,
     }, resetPaddings: {
         type: 'boolean',
+    }, context: {
+        type: 'string',
     } });
 export const TitleProps = {
     type: 'object',

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

@@ -30,5 +30,8 @@ export declare const AnalyticsEventSchema: {
                 };
             };
         };
+        context: {
+            type: string;
+        };
     };
 };

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

@@ -28,5 +28,8 @@ export const AnalyticsEventSchema = {
                 },
             },
         },
+        context: {
+            type: 'string',
+        },
     },
 };

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

@@ -38,6 +38,9 @@ export declare const BackgroundCard: {
                 type: string;
                 enum: string[];
             };
+            context: {
+                type: string;
+            };
             title: {
                 oneOf: ({
                     type: string;

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

@@ -14,6 +14,8 @@ export const BackgroundCard = {
             }, paddingBottom: {
                 type: 'string',
                 enum: ['s', 'm', 'l', 'xl'],
+            }, context: {
+                type: 'string',
             } }),
     },
 };

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

@@ -3,8 +3,10 @@ import { block } from '../../utils';
 import { ThemeValueContext } from '../../context/theme/ThemeValueContext';
 import { MobileContext } from '../../context/mobileContext';
 import { useMetrika } from '../../hooks/useMetrika';
+import { PredefinedEventTypes } from '../../models';
 import { useHandleHubspotEvents, useAnalytics } from '../../hooks';
 import HubspotFormContainer from './HubspotFormContainer';
+import { BlockPositionContext } from '../../context/blockPositionContext';
 import './HubspotForm.css';
 const b = block('hubspot-form');
 const HubspotForm = (props) => {
@@ -12,7 +14,13 @@ const HubspotForm = (props) => {
     // hubspotEvents, // TODO: decide how to handle them
     analyticsEvents, onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, } = props;
     const handleMetrika = useMetrika();
-    const handleAnalytics = useAnalytics();
+    const context = useContext(BlockPositionContext);
+    const defaultEvent = useMemo(() => ({
+        name: 'hubspot-form-submit',
+        type: PredefinedEventTypes.Default,
+        context,
+    }), [context]);
+    const handleAnalytics = useAnalytics(defaultEvent);
     const { themeValue } = useContext(ThemeValueContext);
     const isMobileValue = useContext(MobileContext);
     const theme = themeProp !== null && themeProp !== void 0 ? themeProp : themeValue;
@@ -23,7 +31,7 @@ const HubspotForm = (props) => {
         onLoad,
         onSubmit: (e) => {
             handleMetrika === null || handleMetrika === void 0 ? void 0 : handleMetrika({ pixelEvents });
-            handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
+            handleAnalytics(analyticsEvents);
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(e);
         },
     }), [

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

@@ -1,10 +1,12 @@
-import React, { useContext } from 'react';
+import React, { useCallback, useContext, useMemo } from 'react';
 import { Button } from '@gravity-ui/uikit';
 import { block, getThemedValue } from '../../utils';
-import { AuthorType } from '../../models';
+import { AuthorType, PredefinedEventTypes } from '../../models';
 import { Author, Image, HTML } from '../../components';
 import { ThemeValueContext } from '../../context/theme/ThemeValueContext';
 import { getMediaImage } from '../../components/Media/Image/utils';
+import { useAnalytics } from '../../hooks';
+import { BlockPositionContext } from '../../context/blockPositionContext';
 import './Quote.css';
 const b = block('quote');
 const Quote = (props) => {
@@ -12,9 +14,18 @@ const Quote = (props) => {
     const { themeValue: theme } = useContext(ThemeValueContext);
     const imageThemed = getThemedValue(image, theme);
     const imageData = getMediaImage(imageThemed);
+    const context = useContext(BlockPositionContext);
+    const defaultEvent = useMemo(() => ({
+        name: 'quote-button-click',
+        type: PredefinedEventTypes.Default,
+        context,
+        target: url,
+    }), [context, url]);
+    const handleAnalytics = useAnalytics(defaultEvent);
+    const handleButtonClick = useCallback(() => handleAnalytics(), [handleAnalytics]);
     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))));
+        url && buttonText && (React.createElement(Button, { view: "outlined", size: "xl", href: url, className: b('link-button', { theme: textTheme }), onClick: handleButtonClick }, buttonText))));
     return (React.createElement("div", { className: b({ theme: textTheme, border }), style: color ? { backgroundColor: color } : {} },
         React.createElement("div", { key: text, className: b('content-wrapper') },
             React.createElement("div", null,

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

@@ -64,6 +64,9 @@ export declare const Quote: {
                     };
                 };
             };
+            context: {
+                type: string;
+            };
             type: {};
             when: {};
         };

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

@@ -15,6 +15,8 @@ export const Quote = {
             }, url: {
                 type: 'string',
                 pattern: urlPattern,
-            }, theme: ThemeProps, author: authorItem }),
+            }, theme: ThemeProps, author: authorItem, context: {
+                type: 'string',
+            } }),
     },
 };

package/build/esm/utils/blocks.d.ts

@@ -2,9 +2,16 @@ import { ConstructorBlock } from '../models/constructor';
 import { TextSize, CustomConfig, PCShareSocialNetwork } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h4" | "h2";
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
+type GetBlockContextArgs = {
+    block: ConstructorBlock;
+    index: number;
+    parentContext?: string;
+};
+export declare function getBlockContext({ parentContext, block, index }: GetBlockContextArgs): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
     [x: string]: any;
 };
 export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
+export {};

package/build/esm/utils/blocks.js

@@ -13,6 +13,9 @@ export function getHeaderTag(size) {
 export function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
+export function getBlockContext({ parentContext = '', block, index }) {
+    return `${parentContext}${parentContext ? '_' : ''}${block.type}-${index}`;
+}
 export const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...Object.keys(blocks),
     ...Object.keys(headers),

package/package.json

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

package/server/models/common.d.ts

@@ -64,10 +64,11 @@ export interface ClassNameProps {
     className?: string;
 }
 export type Timeout = ReturnType<typeof setTimeout> | undefined;
-export type AnalyticsParameter = {
-    key: string;
-    value: string | number | boolean;
-};
+export declare enum PredefinedEventTypes {
+    Default = "default-event",
+    Play = "play",
+    Stop = "stop"
+}
 export type AnalyticsCounters = {
     include?: string[];
     exclude?: string[];
@@ -76,5 +77,7 @@ export type AnalyticsEvent<T = {}> = T & {
     name: string;
     type?: string;
     counters?: AnalyticsCounters;
+    context?: string;
+    target?: string;
 };
 export {};

package/server/models/common.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PixelEventType = exports.Theme = void 0;
+exports.PredefinedEventTypes = exports.PixelEventType = exports.Theme = void 0;
 var Theme;
 (function (Theme) {
     Theme["Light"] = "light";
@@ -30,3 +30,9 @@ var PixelEventType;
     PixelEventType["Subscribe"] = "Subscribe";
     PixelEventType["ViewContent"] = "ViewContent";
 })(PixelEventType = exports.PixelEventType || (exports.PixelEventType = {}));
+var PredefinedEventTypes;
+(function (PredefinedEventTypes) {
+    PredefinedEventTypes["Default"] = "default-event";
+    PredefinedEventTypes["Play"] = "play";
+    PredefinedEventTypes["Stop"] = "stop";
+})(PredefinedEventTypes = exports.PredefinedEventTypes || (exports.PredefinedEventTypes = {}));

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

@@ -109,6 +109,7 @@ export interface HeaderBlockProps {
     verticalOffset?: 's' | 'm' | 'l' | 'xl';
     breadcrumbs?: HeaderBreadCrumbsProps;
     status?: JSX.Element;
+    context?: string;
 }
 export type CalculatorProps = Animatable;
 export interface SimpleBlockProps extends Animatable, Childable {
@@ -127,6 +128,7 @@ export interface ExtendedFeaturesProps extends Animatable {
     title?: TitleProps | string;
     description?: string;
     colSizes?: GridColumnSizesType;
+    context?: string;
 }
 export interface PromoFeaturesItem {
     title: string;
@@ -139,6 +141,7 @@ export interface PromoFeaturesProps extends Animatable {
     title?: TitleProps | string;
     description?: string;
     theme?: 'grey' | 'default';
+    context?: string;
 }
 export interface QuestionItem {
     title: string;
@@ -163,6 +166,7 @@ export interface MediaContentProps {
     links?: LinkProps[];
     buttons?: ButtonProps[];
     size?: ContentSize;
+    context?: string;
 }
 export interface MediaBlockProps extends Animatable, MediaContentProps {
     media: ThemeSupporting<MediaProps>;
@@ -180,6 +184,7 @@ export interface PreviewBlockProps extends Animatable {
     ratioMediaContent?: PreviewRatioMediaContent;
     stopVideo?: boolean;
     showImmediately?: boolean;
+    context?: string;
 }
 export interface InfoBlockProps {
     theme?: TextTheme;
@@ -194,6 +199,7 @@ export interface InfoBlockProps {
     links?: Pick<LinkProps, 'text' | 'url'>[];
     leftContent?: Omit<ContentBlockProps, 'colSizes' | 'theme' | 'size'>;
     rightContent?: Omit<ContentBlockProps, 'colSizes' | 'theme' | 'size'>;
+    context?: string;
 }
 export interface SecurityBlockPoint {
     img: string;
@@ -209,6 +215,7 @@ export interface SecurityBlockProps extends Animatable {
     title: string;
     points?: SecurityBlockPoint[];
     media: MediaProps;
+    context?: string;
 }
 export interface TableProps {
     content: string[][];
@@ -235,6 +242,7 @@ export interface TabsBlockProps extends BlockHeaderProps, Animatable {
     centered?: boolean;
     direction?: MediaDirection;
     items: TabsBlockItem[];
+    context?: string;
 }
 export interface LinkTableBlockProps extends BlockHeaderProps {
     items: LinkProps[][];
@@ -264,6 +272,7 @@ export interface ContentLayoutBlockProps {
     };
     textContent: ContentBlockProps;
     fileContent?: FileLinkProps[];
+    context?: string;
 }
 export interface ContentBlockProps {
     title?: TitleBaseProps | string;
@@ -275,6 +284,7 @@ export interface ContentBlockProps {
     colSizes?: GridColumnSizesType;
     centered?: boolean;
     theme?: ContentTheme;
+    context?: string;
 }
 export declare enum PCShareSocialNetwork {
     Vk = "vk",

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

@@ -110,7 +110,8 @@ export interface MediaVideoProps {
     playButton?: PlayButtonProps;
     controls?: MediaVideoControlsType;
     metrika?: MetrikaVideo;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface LinkProps extends Stylable {
     url: string;
@@ -123,6 +124,7 @@ export interface LinkProps extends Stylable {
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
     analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface FileLinkProps extends ClassNameProps {
     href: string;
@@ -141,8 +143,9 @@ export interface ButtonProps {
     img?: ButtonImageProps | string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
     target?: string;
+    context?: string;
 }
 export interface ButtonImageProps {
     url: string;
@@ -170,7 +173,8 @@ export interface MediaComponentVideoProps {
     video: MediaVideoProps;
     height?: number;
     metrika?: MetrikaVideo;
-    analyticsEvents?: AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
     previewImg?: string;
 }
 export interface MediaComponentYoutubeProps {
@@ -222,11 +226,12 @@ export interface HeaderBreadCrumbsProps extends ClassNameProps {
     items: {
         url: string;
         text: ReactNode;
+        analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
     }[];
     theme?: TextTheme;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
-    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface PreviewContentItemProps {
     title: string;

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

@@ -62,6 +62,7 @@ export interface HubspotFormProps extends HubspotEventHandlers {
     pixelEvents?: string | string[] | PixelEvent | PixelEvent[] | ButtonPixel;
     hubspotEvents?: string[];
     analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    context?: string;
 }
 export interface PartnerProps extends CardBaseProps {
     text: string;
@@ -77,6 +78,7 @@ export interface QuoteProps extends Themable, CardBaseProps {
     author?: AuthorItem;
     buttonText?: string;
     theme?: TextTheme;
+    context?: string;
 }
 export interface NewsCardData {
     id: number;
@@ -111,6 +113,7 @@ export interface BannerCardProps {
     color?: ThemeSupporting<string>;
     theme?: TextTheme;
     button: Pick<ButtonProps, 'text' | 'url' | 'target'>;
+    context?: string;
 }
 export interface MediaCardProps extends MediaProps, CardBaseProps {
 }
@@ -118,7 +121,7 @@ export interface CardWithImageLinkProps extends Omit<LinkProps, 'text' | 'url'>
     title: string;
     link: string;
 }
-export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockProps, 'title' | 'additionalInfo' | 'buttons' | 'theme'> {
+export interface CardWithImageProps extends ClassNameProps, Pick<ContentBlockProps, 'title' | 'additionalInfo' | 'buttons' | 'theme' | 'context'> {
     image: string;
     description?: string;
     disableCompress?: boolean;

package/server/utils/blocks.d.ts

@@ -2,9 +2,16 @@ import { ConstructorBlock } from '../models/constructor';
 import { TextSize, CustomConfig, PCShareSocialNetwork } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h4" | "h2";
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
+type GetBlockContextArgs = {
+    block: ConstructorBlock;
+    index: number;
+    parentContext?: string;
+};
+export declare function getBlockContext({ parentContext, block, index }: GetBlockContextArgs): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
     [x: string]: any;
 };
 export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
+export {};

package/server/utils/blocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockContext = exports.getBlockKey = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
 function getHeaderTag(size) {
     switch (size) {
@@ -18,6 +18,10 @@ function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
 exports.getBlockKey = getBlockKey;
+function getBlockContext({ parentContext = '', block, index }) {
+    return `${parentContext}${parentContext ? '_' : ''}${block.type}-${index}`;
+}
+exports.getBlockContext = getBlockContext;
 const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...Object.keys(blocks),
     ...Object.keys(headers),