@gravity-ui/page-constructor 1.14.0-alpha.8 → 1.15.0-alpha.0

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AnalyticsEventSchema = void 0;
+exports.AnalyticsEventV2Schema = exports.AnalyticsEventSchema = void 0;
 exports.AnalyticsEventSchema = {
     type: 'object',
     additionalProperties: false,
@@ -55,3 +55,36 @@ exports.AnalyticsEventSchema = {
         },
     },
 };
+exports.AnalyticsEventV2Schema = {
+    type: 'object',
+    propertyNames: { type: 'string' },
+    additionalProperty: { type: 'number' },
+    required: ['name'],
+    properties: {
+        name: {
+            type: 'string',
+        },
+        type: {
+            type: 'string',
+        },
+        counters: {
+            type: 'object',
+            additionalProperties: false,
+            required: [],
+            properties: {
+                include: {
+                    type: 'array',
+                    items: {
+                        type: 'string',
+                    },
+                },
+                exclude: {
+                    type: 'array',
+                    items: {
+                        type: 'string',
+                    },
+                },
+            },
+        },
+    },
+};

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

@@ -3,10 +3,12 @@ import * as common from './common';
 import * as subBlocks from './sub-blocks';
 import * as pixel from './pixel';
 import * as utils from './utils';
+import * as navigation from './navigation';
 export declare const validators: {
     blocks: typeof blocks;
     common: typeof common;
     subBlocks: typeof subBlocks;
     pixel: typeof pixel;
     utils: typeof utils;
+    navigation: typeof navigation;
 };

package/build/cjs/schema/validators/index.js

@@ -7,10 +7,12 @@ const common = tslib_1.__importStar(require("./common"));
 const subBlocks = tslib_1.__importStar(require("./sub-blocks"));
 const pixel = tslib_1.__importStar(require("./pixel"));
 const utils = tslib_1.__importStar(require("./utils"));
+const navigation = tslib_1.__importStar(require("./navigation"));
 exports.validators = {
     blocks,
     common,
     subBlocks,
     pixel,
     utils,
+    navigation,
 };

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

@@ -0,0 +1 @@
+export * from '../../navigation/schema';

package/build/cjs/schema/validators/navigation.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("../../navigation/schema"), exports);

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

@@ -8,14 +8,13 @@ const mobileContext_1 = require("../../context/mobileContext");
 const useMetrika_1 = require("../../hooks/useMetrika");
 const hooks_1 = require("../../hooks");
 const HubspotFormContainer_1 = tslib_1.__importDefault(require("./HubspotFormContainer"));
-const useAnalytics_1 = require("../../hooks/useAnalytics");
 const b = (0, utils_1.block)('hubspot-form');
 const HubspotForm = (props) => {
     const { className, theme: themeProp, isMobile: isMobileProp, formId, formInstanceId, portalId, region, formClassName, pixelEvents, 
     // hubspotEvents, // TODO: decide how to handle them
     analyticsEvents, onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, } = props;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, useAnalytics_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)();
     const { themeValue } = (0, react_1.useContext)(ThemeValueContext_1.ThemeValueContext);
     const isMobileValue = (0, react_1.useContext)(mobileContext_1.MobileContext);
     const theme = themeProp !== null && themeProp !== void 0 ? themeProp : themeValue;
@@ -26,7 +25,7 @@ const HubspotForm = (props) => {
         onLoad,
         onSubmit: (e) => {
             handleMetrika === null || handleMetrika === void 0 ? void 0 : handleMetrika({ pixelEvents });
-            handleAnalytics(analyticsEvents);
+            handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(e);
         },
     }), [

package/build/cjs/text-transform/blocks.js

@@ -162,15 +162,7 @@ const config = {
         },
     ],
     [models_1.BlockType.PromoFeaturesBlock]: [
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
-        {
-            fields: ['description'],
-            transformer: yfmTransformer,
-        },
+        ...blockHeaderTransfomer,
         {
             fields: ['items'],
             transformer: yfmTransformer,
@@ -309,7 +301,6 @@ const config = {
             parser: parseTitle,
         },
     ],
-    [models_1.BlockType.PromoFeaturesBlock]: blockHeaderTransfomer,
     [models_1.BlockType.InfoBlock]: [
         {
             fields: ['rightContent', 'leftContent'],

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

@@ -176,7 +176,12 @@ export declare const BannerCardProps: {
                 analyticsEvents: {
                     anyOf: ({
                         type: string;
-                        additionalProperties: boolean;
+                        propertyNames: {
+                            type: string;
+                        };
+                        additionalProperty: {
+                            type: string;
+                        };
                         required: string[];
                         properties: {
                             name: {
@@ -204,34 +209,17 @@ export declare const BannerCardProps: {
                                     };
                                 };
                             };
-                            category: {
-                                type: string;
-                            };
-                            label: {
-                                type: string;
-                            };
-                            params: {
-                                type: string;
-                                items: {
-                                    type: string;
-                                    additionalProperties: boolean;
-                                    required: string[];
-                                    properties: {
-                                        key: {
-                                            type: string;
-                                        };
-                                        value: {
-                                            type: string;
-                                        };
-                                    };
-                                };
-                            };
                         };
                     } | {
                         type: string;
                         items: {
                             type: string;
-                            additionalProperties: boolean;
+                            propertyNames: {
+                                type: string;
+                            };
+                            additionalProperty: {
+                                type: string;
+                            };
                             required: string[];
                             properties: {
                                 name: {
@@ -259,28 +247,6 @@ export declare const BannerCardProps: {
                                         };
                                     };
                                 };
-                                category: {
-                                    type: string;
-                                };
-                                label: {
-                                    type: string;
-                                };
-                                params: {
-                                    type: string;
-                                    items: {
-                                        type: string;
-                                        additionalProperties: boolean;
-                                        required: string[];
-                                        properties: {
-                                            key: {
-                                                type: string;
-                                            };
-                                            value: {
-                                                type: string;
-                                            };
-                                        };
-                                    };
-                                };
                             };
                         };
                     })[];
@@ -490,7 +456,12 @@ export declare const BannerBlock: {
                     analyticsEvents: {
                         anyOf: ({
                             type: string;
-                            additionalProperties: boolean;
+                            propertyNames: {
+                                type: string;
+                            };
+                            additionalProperty: {
+                                type: string;
+                            };
                             required: string[];
                             properties: {
                                 name: {
@@ -518,34 +489,17 @@ export declare const BannerBlock: {
                                         };
                                     };
                                 };
-                                category: {
-                                    type: string;
-                                };
-                                label: {
-                                    type: string;
-                                };
-                                params: {
-                                    type: string;
-                                    items: {
-                                        type: string;
-                                        additionalProperties: boolean;
-                                        required: string[];
-                                        properties: {
-                                            key: {
-                                                type: string;
-                                            };
-                                            value: {
-                                                type: string;
-                                            };
-                                        };
-                                    };
-                                };
                             };
                         } | {
                             type: string;
                             items: {
                                 type: string;
-                                additionalProperties: boolean;
+                                propertyNames: {
+                                    type: string;
+                                };
+                                additionalProperty: {
+                                    type: string;
+                                };
                                 required: string[];
                                 properties: {
                                     name: {
@@ -573,28 +527,6 @@ export declare const BannerBlock: {
                                             };
                                         };
                                     };
-                                    category: {
-                                        type: string;
-                                    };
-                                    label: {
-                                        type: string;
-                                    };
-                                    params: {
-                                        type: string;
-                                        items: {
-                                            type: string;
-                                            additionalProperties: boolean;
-                                            required: string[];
-                                            properties: {
-                                                key: {
-                                                    type: string;
-                                                };
-                                                value: {
-                                                    type: string;
-                                                };
-                                            };
-                                        };
-                                    };
                                 };
                             };
                         })[];
@@ -805,7 +737,12 @@ export declare const BannerCard: {
                     analyticsEvents: {
                         anyOf: ({
                             type: string;
-                            additionalProperties: boolean;
+                            propertyNames: {
+                                type: string;
+                            };
+                            additionalProperty: {
+                                type: string;
+                            };
                             required: string[];
                             properties: {
                                 name: {
@@ -833,34 +770,17 @@ export declare const BannerCard: {
                                         };
                                     };
                                 };
-                                category: {
-                                    type: string;
-                                };
-                                label: {
-                                    type: string;
-                                };
-                                params: {
-                                    type: string;
-                                    items: {
-                                        type: string;
-                                        additionalProperties: boolean;
-                                        required: string[];
-                                        properties: {
-                                            key: {
-                                                type: string;
-                                            };
-                                            value: {
-                                                type: string;
-                                            };
-                                        };
-                                    };
-                                };
                             };
                         } | {
                             type: string;
                             items: {
                                 type: string;
-                                additionalProperties: boolean;
+                                propertyNames: {
+                                    type: string;
+                                };
+                                additionalProperty: {
+                                    type: string;
+                                };
                                 required: string[];
                                 properties: {
                                     name: {
@@ -888,28 +808,6 @@ export declare const BannerCard: {
                                             };
                                         };
                                     };
-                                    category: {
-                                        type: string;
-                                    };
-                                    label: {
-                                        type: string;
-                                    };
-                                    params: {
-                                        type: string;
-                                        items: {
-                                            type: string;
-                                            additionalProperties: boolean;
-                                            required: string[];
-                                            properties: {
-                                                key: {
-                                                    type: string;
-                                                };
-                                                value: {
-                                                    type: string;
-                                                };
-                                            };
-                                        };
-                                    };
                                 };
                             };
                         })[];

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

@@ -429,7 +429,12 @@ export declare const MediaBlock: {
                     analyticsEvents: {
                         anyOf: ({
                             type: string;
-                            additionalProperties: boolean;
+                            propertyNames: {
+                                type: string;
+                            };
+                            additionalProperty: {
+                                type: string;
+                            };
                             required: string[];
                             properties: {
                                 name: {
@@ -457,34 +462,17 @@ export declare const MediaBlock: {
                                         };
                                     };
                                 };
-                                category: {
-                                    type: string;
-                                };
-                                label: {
-                                    type: string;
-                                };
-                                params: {
-                                    type: string;
-                                    items: {
-                                        type: string;
-                                        additionalProperties: boolean;
-                                        required: string[];
-                                        properties: {
-                                            key: {
-                                                type: string;
-                                            };
-                                            value: {
-                                                type: string;
-                                            };
-                                        };
-                                    };
-                                };
                             };
                         } | {
                             type: string;
                             items: {
                                 type: string;
-                                additionalProperties: boolean;
+                                propertyNames: {
+                                    type: string;
+                                };
+                                additionalProperty: {
+                                    type: string;
+                                };
                                 required: string[];
                                 properties: {
                                     name: {
@@ -512,28 +500,6 @@ export declare const MediaBlock: {
                                             };
                                         };
                                     };
-                                    category: {
-                                        type: string;
-                                    };
-                                    label: {
-                                        type: string;
-                                    };
-                                    params: {
-                                        type: string;
-                                        items: {
-                                            type: string;
-                                            additionalProperties: boolean;
-                                            required: string[];
-                                            properties: {
-                                                key: {
-                                                    type: string;
-                                                };
-                                                value: {
-                                                    type: string;
-                                                };
-                                            };
-                                        };
-                                    };
                                 };
                             };
                         })[];

package/build/esm/components/Button/Button.js

@@ -5,7 +5,7 @@ import { block, setUrlTld } from '../../utils';
 import { toCommonSize, toCommonView } from './utils';
 import { LocaleContext } from '../../context/localeContext/localeContext';
 import { useMetrika } from '../../hooks/useMetrika';
-import { useAnalytics } from '../../hooks/useAnalytics';
+import { useAnalytics } from '../../hooks';
 import { Github } from '../../icons';
 import './Button.css';
 const b = block('button-block');
@@ -17,7 +17,7 @@ const Button = (props) => {
     const defaultImgPosition = 'left';
     const onClick = useCallback(() => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics(analyticsEvents);
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
         if (onClickOrigin) {
             onClickOrigin();
         }

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

@@ -1,6 +1,6 @@
 import React, { ReactElement, HTMLAttributeAnchorTarget } from 'react';
 import { ButtonPixel, CardBaseProps as CardBaseParams, ImageProps, MetrikaGoal, WithChildren } from '../../models';
-import { AnalyticsEvent } from '../../models/common';
+import { AnalyticsEventV2 } from '../../models/common';
 import './CardBase.css';
 export interface CardBaseProps extends CardBaseParams {
     className?: string;
@@ -11,7 +11,7 @@ export interface CardBaseProps extends CardBaseParams {
     target?: HTMLAttributeAnchorTarget;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
-    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
+    analyticsEvents?: AnalyticsEventV2 | AnalyticsEventV2[];
 }
 export interface CardHeaderBaseProps {
     className?: string;

package/build/esm/components/CardBase/CardBase.js

@@ -3,7 +3,7 @@ import { block } from '../../utils';
 import BackgroundImage from '../BackgroundImage/BackgroundImage';
 import RouterLink from '../RouterLink/RouterLink';
 import { useMetrika } from '../../hooks/useMetrika';
-import { useAnalytics } from '../../hooks/useAnalytics';
+import { useAnalytics } from '../../hooks';
 import './CardBase.css';
 const b = block('card-base-block');
 const Header = () => null;
@@ -45,7 +45,7 @@ export const Layout = (props) => {
     const fullClassName = b({ border }, className);
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics(analyticsEvents);
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     return url ? (React.createElement(RouterLink, { href: url },
         React.createElement("a", { href: url, target: target, rel: target === '_blank' ? 'noopener noreferrer' : undefined, className: fullClassName, draggable: false, onDragStart: (e) => e.preventDefault(), onClick: onClick }, cardContent))) : (React.createElement("div", { className: fullClassName }, cardContent));

package/build/esm/components/HeaderBreadcrumbs/HeaderBreadcrumbs.js

@@ -1,7 +1,7 @@
 import React from 'react';
 import { block } from '../../utils';
 import { useMetrika } from '../../hooks/useMetrika';
-import { useAnalytics } from '../../hooks/useAnalytics';
+import { useAnalytics } from '../../hooks';
 import './HeaderBreadcrumbs.css';
 const b = block('header-breadcrumbs');
 export default function HeaderBreadcrumbs(props) {
@@ -10,7 +10,7 @@ export default function HeaderBreadcrumbs(props) {
     const handleAnalytics = useAnalytics();
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics(analyticsEvents);
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     return (React.createElement("div", { className: b({ theme }, className) }, items.map((item) => (React.createElement("div", { className: b('item'), key: item.url },
         React.createElement("a", { href: item.url, className: b('text'), onClick: onClick }, item.text))))));

package/build/esm/components/Link/Link.js

@@ -7,7 +7,7 @@ import BackLink from '../BackLink/BackLink';
 import { LocaleContext } from '../../context/localeContext/localeContext';
 import { LocationContext } from '../../context/locationContext/locationContext';
 import { useMetrika } from '../../hooks/useMetrika';
-import { useAnalytics } from '../../hooks/useAnalytics';
+import { useAnalytics } from '../../hooks';
 import './Link.css';
 const b = block('link-block');
 const WORD_JOINER_SYM = '\u200b';
@@ -33,7 +33,7 @@ const LinkBlock = (props) => {
     const defaultTextSize = theme === 'back' ? 'l' : 'm';
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics(analyticsEvents);
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     const getLinkByType = () => {
         switch (theme) {

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

@@ -7,7 +7,7 @@ import YoutubeBlock from '../VideoBlock/VideoBlock';
 import './Media.css';
 const b = block('Media');
 export const Media = (props) => {
-    const { image, video, youtube, dataLens, color, height, previewImg, parallax = false, metrika, } = props;
+    const { image, video, youtube, dataLens, color, height, previewImg, parallax = false, metrika, analyticsEvents, } = props;
     const { className, imageClassName, videoClassName, youtubeClassName, playVideo = true, isBackground, playButton, customBarControlsClassName, } = props;
     const [hasVideoFallback, setHasVideoFallback] = useState(false);
     const content = useMemo(() => {
@@ -16,7 +16,7 @@ export const Media = (props) => {
             result.push(React.createElement(Image, { key: "image", parallax: parallax, image: image, height: height, imageClassName: imageClassName, isBackground: isBackground, video: video, hasVideoFallback: hasVideoFallback }));
         }
         if (video) {
-            result.push(React.createElement(Video, { key: "video", video: video, videoClassName: videoClassName, height: height, metrika: metrika, playVideo: playVideo, previewImg: previewImg, playButton: playButton, customBarControlsClassName: customBarControlsClassName, hasVideoFallback: hasVideoFallback, setHasVideoFallback: setHasVideoFallback }));
+            result.push(React.createElement(Video, { key: "video", video: video, videoClassName: videoClassName, height: height, metrika: metrika, analyticsEvents: analyticsEvents, playVideo: playVideo, previewImg: previewImg, playButton: playButton, customBarControlsClassName: customBarControlsClassName, hasVideoFallback: hasVideoFallback, setHasVideoFallback: setHasVideoFallback }));
         }
         if (youtube) {
             result = (React.createElement(YoutubeBlock, { className: b('youtube', youtubeClassName), record: youtube, attributes: { color: 'white', rel: '0' }, previewImg: previewImg, height: height }));
@@ -37,6 +37,7 @@ export const Media = (props) => {
         hasVideoFallback,
         videoClassName,
         metrika,
+        analyticsEvents,
         playVideo,
         previewImg,
         playButton,

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

@@ -6,7 +6,7 @@ import { block } from '../../../utils';
 import './Video.css';
 const b = block('media-component-video');
 const Video = (props) => {
-    const { video, height, metrika, previewImg, playButton: commonPlayButton, customBarControlsClassName, videoClassName, playVideo, setHasVideoFallback, hasVideoFallback, } = props;
+    const { video, height, metrika, analyticsEvents, previewImg, playButton: commonPlayButton, customBarControlsClassName, videoClassName, playVideo, setHasVideoFallback, hasVideoFallback, } = props;
     const ref = useRef(null);
     useEffect(() => {
         if (ref && ref.current) {
@@ -29,16 +29,17 @@ const Video = (props) => {
     }, [playVideo, video, setHasVideoFallback]);
     const reactPlayerBlock = useMemo(() => {
         const { src, loop, controls, muted, autoplay = true, elapsedTime, playButton } = video;
-        return (React.createElement(ReactPlayerBlock, { className: b('react-player', videoClassName), src: src, previewImgUrl: previewImg, loop: Boolean(loop), controls: controls, muted: muted, autoplay: autoplay && playVideo, elapsedTime: elapsedTime, playButton: playButton || commonPlayButton, customBarControlsClassName: customBarControlsClassName, metrika: metrika, height: height }));
+        return (React.createElement(ReactPlayerBlock, { className: b('react-player', videoClassName), src: src, previewImgUrl: previewImg, loop: Boolean(loop), controls: controls, muted: muted, autoplay: autoplay && playVideo, elapsedTime: elapsedTime, playButton: playButton || commonPlayButton, customBarControlsClassName: customBarControlsClassName, metrika: metrika, analyticsEvents: analyticsEvents, height: height }));
     }, [
         video,
-        height,
         videoClassName,
         previewImg,
         playVideo,
         commonPlayButton,
         customBarControlsClassName,
         metrika,
+        analyticsEvents,
+        height,
     ]);
     const defaultVideoBlock = useMemo(() => {
         return video.src.length && !hasVideoFallback ? (React.createElement("div", { className: b('wrap', videoClassName), style: { height } },