@gravity-ui/page-constructor 1.15.0-alpha.4 → 1.15.0-alpha.6

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

@@ -206,6 +206,9 @@ export declare const BannerCardProps: {
                                     };
                                 };
                             };
+                            blockName: {
+                                type: string;
+                            };
                         };
                     } | {
                         type: string;
@@ -241,6 +244,9 @@ export declare const BannerCardProps: {
                                         };
                                     };
                                 };
+                                blockName: {
+                                    type: string;
+                                };
                             };
                         };
                     })[];
@@ -483,6 +489,9 @@ export declare const BannerBlock: {
                                         };
                                     };
                                 };
+                                blockName: {
+                                    type: string;
+                                };
                             };
                         } | {
                             type: string;
@@ -518,6 +527,9 @@ export declare const BannerBlock: {
                                             };
                                         };
                                     };
+                                    blockName: {
+                                        type: string;
+                                    };
                                 };
                             };
                         })[];
@@ -761,6 +773,9 @@ export declare const BannerCard: {
                                         };
                                     };
                                 };
+                                blockName: {
+                                    type: string;
+                                };
                             };
                         } | {
                             type: string;
@@ -796,6 +811,9 @@ export declare const BannerCard: {
                                             };
                                         };
                                     };
+                                    blockName: {
+                                        type: string;
+                                    };
                                 };
                             };
                         })[];

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

@@ -459,6 +459,9 @@ export declare const MediaBlock: {
                                         };
                                     };
                                 };
+                                blockName: {
+                                    type: string;
+                                };
                             };
                         } | {
                             type: string;
@@ -494,6 +497,9 @@ export declare const MediaBlock: {
                                             };
                                         };
                                     };
+                                    blockName: {
+                                        type: string;
+                                    };
                                 };
                             };
                         })[];

package/build/cjs/blocks/Share/Share.js

@@ -7,12 +7,13 @@ const utils_1 = require("../../utils");
 const models_1 = require("../../models");
 const locationContext_1 = require("../../context/locationContext");
 const i18n_1 = tslib_1.__importDefault(require("./i18n"));
-const hooks_1 = require("src/hooks");
+const hooks_1 = require("../../hooks");
 const Facebook_1 = require("../../icons/Facebook");
 const Twitter_1 = require("../../icons/Twitter");
 const Linkedin_1 = require("../../icons/Linkedin");
 const Vk_1 = require("../../icons/Vk");
 const Telegram_1 = require("../../icons/Telegram");
+const constants_1 = require("../../constants");
 const icons = {
     facebook: Facebook_1.Facebook,
     twitter: Twitter_1.Twitter,
@@ -23,12 +24,12 @@ const icons = {
 const b = (0, utils_1.block)('share-block');
 const Share = ({ items, title, blockName = models_1.BlockType.ShareBlock }) => {
     const { pathname, hostname } = (0, react_1.useContext)(locationContext_1.LocationContext);
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
-    const handleButtonClick = (0, react_1.useCallback)(() => handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics([], {
-        name: 'default',
-        type: 'button',
-        block: blockName,
-    }), [handleAnalytics, blockName]);
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'share-button-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
+    const handleButtonClick = (0, react_1.useCallback)(() => handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(), [handleAnalytics]);
     return (react_1.default.createElement("div", { className: b() },
         react_1.default.createElement("h5", { className: b('title') }, title || (0, i18n_1.default)('constructor-share')),
         react_1.default.createElement("div", { className: b('items') }, items.map((type) => {

package/build/cjs/components/BackLink/BackLink.js

@@ -5,18 +5,19 @@ const react_1 = tslib_1.__importStar(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const icons_1 = require("../../icons");
 const locationContext_1 = require("../../context/locationContext");
-const hooks_1 = require("src/hooks");
+const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const COMPONENT_NAME = 'backlink';
 function BackLink(props) {
     const { history } = (0, react_1.useContext)(locationContext_1.LocationContext);
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
     const { url, title, theme = 'default', size = 'l', className, shouldHandleBackAction = false, onClick, blockName = COMPONENT_NAME, } = props;
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'back-link-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const backActionHandler = (0, react_1.useCallback)(async () => {
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics([], {
-            name: 'default',
-            type: 'button',
-            block: blockName,
-        });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics();
         if (!history) {
             return;
         }
@@ -29,7 +30,7 @@ function BackLink(props) {
         else {
             history.push({ pathname: url });
         }
-    }, [blockName, handleAnalytics, history, onClick, url]);
+    }, [handleAnalytics, history, onClick, url]);
     return (react_1.default.createElement(uikit_1.Button, { className: className, view: theme === 'special' ? 'flat-contrast' : 'flat-secondary', size: size, href: shouldHandleBackAction ? undefined : url, onClick: shouldHandleBackAction ? backActionHandler : undefined },
         react_1.default.createElement(uikit_1.Icon, { data: icons_1.ArrowSidebar, size: 24 }),
         react_1.default.createElement("span", null, title)));

package/build/cjs/components/Button/Button.js

@@ -9,29 +9,26 @@ const localeContext_1 = require("../../context/localeContext/localeContext");
 const useMetrika_1 = require("../../hooks/useMetrika");
 const hooks_1 = require("../../hooks");
 const icons_1 = require("../../icons");
+const constants_1 = require("../../constants");
 const COMPONENT_NAME = 'button';
 const b = (0, utils_1.block)('button-block');
 const Button = (props) => {
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
     const { lang, tld } = (0, react_1.useContext)(localeContext_1.LocaleContext);
     const { className, metrikaGoals, pixelEvents, analyticsEvents, size = 'l', theme = 'normal', url, img, onClick: onClickOrigin, text, blockName = COMPONENT_NAME } = props, rest = tslib_1.__rest(props, ["className", "metrikaGoals", "pixelEvents", "analyticsEvents", "size", "theme", "url", "img", "onClick", "text", "blockName"]);
     const defaultImgPosition = 'left';
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'button-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const onClick = (0, react_1.useCallback)(() => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents, { name: 'default', type: 'button', block: blockName });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
         if (onClickOrigin) {
             onClickOrigin();
         }
-    }, [
-        handleMetrika,
-        metrikaGoals,
-        pixelEvents,
-        handleAnalytics,
-        analyticsEvents,
-        blockName,
-        onClickOrigin,
-    ]);
+    }, [handleMetrika, metrikaGoals, pixelEvents, handleAnalytics, analyticsEvents, onClickOrigin]);
     const buttonImg = img instanceof Object
         ? { url: img.url, position: img.position || defaultImgPosition, alt: img.alt }
         : { url: img, position: defaultImgPosition };

package/build/cjs/components/ButtonTabs/ButtonTabs.js

@@ -4,11 +4,17 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const utils_1 = require("../../utils");
 const index_1 = require("../index");
-const hooks_1 = require("src/hooks");
+const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const b = (0, utils_1.block)('button-tabs');
+const COMPONENT_NAME = 'button-tabs';
 const ButtonTabs = (props) => {
-    const { className, items, activeTab, onSelectTab, blockName = '' } = props;
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const { className, items, activeTab, onSelectTab, blockName = COMPONENT_NAME } = props;
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'button-tabs-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const activeTabId = (0, react_1.useMemo)(() => {
         if (activeTab) {
             return activeTab;
@@ -16,11 +22,11 @@ const ButtonTabs = (props) => {
         return items[0].id;
     }, [activeTab, items]);
     const handleClick = (0, react_1.useCallback)((tabId) => {
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics([], { name: 'default', type: 'button', block: blockName });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics();
         if (onSelectTab) {
             onSelectTab(tabId);
         }
-    }, [blockName, handleAnalytics, onSelectTab]);
+    }, [handleAnalytics, onSelectTab]);
     return (react_1.default.createElement("div", { className: b(null, className) }, items.map((item) => {
         const isActive = item.id === activeTabId;
         return (react_1.default.createElement(index_1.Button, { text: item.title, className: b('item', { active: isActive }), key: item.title, size: 'l', onClick: () => handleClick(item.id), theme: isActive ? 'monochrome' : 'normal' }));

package/build/cjs/components/CardBase/CardBase.js

@@ -8,6 +8,7 @@ const BackgroundImage_1 = tslib_1.__importDefault(require("../BackgroundImage/Ba
 const RouterLink_1 = tslib_1.__importDefault(require("../RouterLink/RouterLink"));
 const useMetrika_1 = require("../../hooks/useMetrika");
 const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const COMPONENT_NAME = 'card-base';
 const b = (0, utils_1.block)('card-base-block');
 const Header = () => null;
@@ -16,7 +17,11 @@ const Footer = () => null;
 const Layout = (props) => {
     const { className, bodyClassName, metrikaGoals, pixelEvents, analyticsEvents, contentClassName, children, url, target, border = 'shadow', blockName = COMPONENT_NAME, } = props;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'card-base-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     let header, content, footer, image, headerClass, footerClass;
     function handleChild(child) {
         switch (child.type) {
@@ -49,7 +54,7 @@ const Layout = (props) => {
     const fullClassName = b({ border }, className);
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents, { name: 'default', type: 'card', block: blockName });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     return url ? (react_1.default.createElement(RouterLink_1.default, { href: url },
         react_1.default.createElement("a", { href: url, target: target, rel: target === '_blank' ? 'noopener noreferrer' : undefined, className: fullClassName, draggable: false, onDragStart: (e) => e.preventDefault(), onClick: onClick }, cardContent))) : (react_1.default.createElement("div", { className: fullClassName }, cardContent));

package/build/cjs/components/HeaderBreadcrumbs/HeaderBreadcrumbs.js

@@ -5,19 +5,20 @@ const react_1 = tslib_1.__importDefault(require("react"));
 const utils_1 = require("../../utils");
 const useMetrika_1 = require("../../hooks/useMetrika");
 const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const b = (0, utils_1.block)('header-breadcrumbs');
 const COMPONENT_NAME = 'header-breadcrumbs';
 function HeaderBreadcrumbs(props) {
     const { items, metrikaGoals, pixelEvents, analyticsEvents, theme = 'light', blockName = COMPONENT_NAME, className, } = props;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'header-breadcrumbs-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents, {
-            name: 'default',
-            type: 'header-breadcrumbs',
-            block: blockName,
-        });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     return (react_1.default.createElement("div", { className: b({ theme }, className) }, items.map((item) => (react_1.default.createElement("div", { className: b('item'), key: item.url },
         react_1.default.createElement("a", { href: item.url, className: b('text'), onClick: onClick }, item.text))))));

package/build/cjs/components/Link/Link.js

@@ -11,6 +11,7 @@ const localeContext_1 = require("../../context/localeContext/localeContext");
 const locationContext_1 = require("../../context/locationContext/locationContext");
 const useMetrika_1 = require("../../hooks/useMetrika");
 const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const b = (0, utils_1.block)('link-block');
 const WORD_JOINER_SYM = '\u200b';
 const COMPONENT_NAME = 'link';
@@ -29,14 +30,18 @@ function getArrowSize(size) {
 const LinkBlock = (props) => {
     const { text, url, arrow, metrikaGoals, pixelEvents, analyticsEvents, theme = 'file-link', colorTheme = 'light', textSize = 'm', className, target, children, blockName = COMPONENT_NAME, } = props;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'link-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const { hostname } = (0, react_1.useContext)(locationContext_1.LocationContext);
     const { tld } = (0, react_1.useContext)(localeContext_1.LocaleContext);
     const href = (0, utils_1.setUrlTld)(props.url, tld);
     const defaultTextSize = theme === 'back' ? 'l' : 'm';
     const onClick = () => {
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents, { name: 'default', type: 'link', block: blockName });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
     };
     const getLinkByType = () => {
         switch (theme) {

package/build/cjs/components/ReactPlayer/ReactPlayer.js

@@ -14,6 +14,7 @@ const metrikaContext_1 = require("../../context/metrikaContext");
 const mobileContext_1 = require("../../context/mobileContext");
 const icons_1 = require("../../icons");
 const hooks_1 = require("../../hooks");
+const constants_1 = require("../../constants");
 const b = (0, utils_1.block)('ReactPlayer');
 const FPS = 60;
 const COMPONENT_NAME = 'react-player';
@@ -36,7 +37,11 @@ exports.ReactPlayerBlock = react_1.default.forwardRef((props, originRef) => {
     const [started, setStarted] = (0, react_1.useState)(autoPlay);
     const [paused, setPaused] = (0, react_1.useState)(false);
     const [ended, setEnded] = (0, react_1.useState)(false);
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'react-player-controls-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     (0, react_1.useImperativeHandle)(originRef, () => ({
         pause: () => setIsPlaying(false),
     }));
@@ -112,30 +117,14 @@ exports.ReactPlayerBlock = react_1.default.forwardRef((props, originRef) => {
                 metrika.reachGoals(goal, counterName);
             }
         }
-        if (handleAnalytics) {
-            const events = isMuted ? playEvents : stopEvents;
-            if (events) {
-                handleAnalytics(events, {
-                    type: 'react-player-change-mute',
-                    block: blockName,
-                });
-            }
-        }
+        const events = isMuted ? playEvents : stopEvents;
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(events);
         if (isMuted) {
             setProps({ playingVideoRef: ref.current });
         }
         // In order to the progress bar to update (equals 0) before displaying
         setTimeout(() => setMuted(!isMuted), 0);
-    }, [
-        playerRef,
-        metrika,
-        videoMetrika,
-        handleAnalytics,
-        playEvents,
-        stopEvents,
-        blockName,
-        setProps,
-    ]);
+    }, [playerRef, metrika, videoMetrika, handleAnalytics, playEvents, stopEvents, setProps]);
     const handleClick = (0, react_1.useCallback)(() => changeMute(muted), [changeMute, muted]);
     const handleClickPreview = (0, react_1.useCallback)(() => {
         setIsPlaying(true);
@@ -146,15 +135,8 @@ exports.ReactPlayerBlock = react_1.default.forwardRef((props, originRef) => {
                 metrika.reachGoals(play, counterName);
             }
         }
-        if (handleAnalytics) {
-            if (playEvents) {
-                handleAnalytics(playEvents, {
-                    type: 'react-player-preview',
-                    block: blockName,
-                });
-            }
-        }
-    }, [onClickPreview, metrika, videoMetrika, handleAnalytics, playEvents, blockName]);
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(playEvents);
+    }, [onClickPreview, metrika, videoMetrika, handleAnalytics, playEvents]);
     const onPause = (0, react_1.useCallback)(() => {
         // For support correct state for youtube
         setIsPlaying(false);

package/build/cjs/components/YandexForm/YandexForm.js

@@ -8,7 +8,8 @@ const localeContext_1 = require("../../context/localeContext");
 const mobileContext_1 = require("../../context/mobileContext");
 const utils_1 = require("../../utils");
 const useMetrika_1 = require("../../hooks/useMetrika");
-const hooks_1 = require("../..//hooks");
+const hooks_1 = require("../../hooks");
+const constants_2 = require("../../constants");
 exports.YANDEX_FORM_ORIGIN = 'https://forms.yandex.ru';
 const CONTAINER_ID = 'pc-yandex-form-container';
 const COMPONENT_NAME = 'yandex-form';
@@ -19,7 +20,11 @@ const YandexForm = (props) => {
     const iframeRef = (0, react_1.useRef)();
     const yaFormOrigin = customFormOrigin || exports.YANDEX_FORM_ORIGIN;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'yndex-form-submit',
+        type: constants_2.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     const isMobile = (0, react_1.useContext)(mobileContext_1.MobileContext);
     const locale = (0, react_1.useContext)(localeContext_1.LocaleContext);
     const updateFormIframe = (0, react_1.useCallback)((container) => {
@@ -60,11 +65,7 @@ const YandexForm = (props) => {
             window.scrollBy(0, top - headerHeight);
         }
         handleMetrika({ metrikaGoals, pixelEvents });
-        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents, {
-            name: 'default',
-            type: 'yandex-form',
-            block: blockName,
-        });
+        handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
         if (onSubmit) {
             onSubmit();
         }
@@ -74,7 +75,6 @@ const YandexForm = (props) => {
         pixelEvents,
         handleAnalytics,
         analyticsEvents,
-        blockName,
         onSubmit,
         headerHeight,
     ]);

package/build/cjs/constants.d.ts

@@ -5,3 +5,4 @@ export declare const BREAKPOINTS: {
     lg: number;
     xl: number;
 };
+export declare const DEFAULT_EVENT_TYPE = "default-event";

package/build/cjs/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BREAKPOINTS = void 0;
+exports.DEFAULT_EVENT_TYPE = exports.BREAKPOINTS = void 0;
 exports.BREAKPOINTS = {
     xs: 0,
     sm: 577,
@@ -8,3 +8,4 @@ exports.BREAKPOINTS = {
     lg: 1081,
     xl: 1185,
 };
+exports.DEFAULT_EVENT_TYPE = 'default-event';

package/build/cjs/context/analyticsContext/analyticsContext.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { AnalyticsEvent } from '../../models';
 export interface AnalyticsContextProps {
-    sendEvents?: (e: AnalyticsEvent | AnalyticsEvent[], defaults?: Record<string, string | boolean | number>) => void;
+    sendEvents?: (e: AnalyticsEvent | AnalyticsEvent[]) => void;
 }
 export declare const AnalyticsContext: React.Context<AnalyticsContextProps>;

package/build/cjs/hooks/useAnalytics.d.ts

@@ -1,2 +1,2 @@
-import { AnalyticsEvent, DefaultEvent } from '../models';
-export declare const useAnalytics: () => ((e?: AnalyticsEvent | AnalyticsEvent[], defaultEvent?: DefaultEvent) => void) | undefined;
+import { AnalyticsEvent } from '../models';
+export declare const useAnalytics: (defaultEvent?: AnalyticsEvent) => ((e?: AnalyticsEvent | AnalyticsEvent[]) => void) | undefined;

package/build/cjs/hooks/useAnalytics.js

@@ -3,16 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.useAnalytics = void 0;
 const react_1 = require("react");
 const analyticsContext_1 = require("../context/analyticsContext");
-const useAnalytics = () => {
+const useAnalytics = (defaultEvent) => {
     const { sendEvents } = (0, react_1.useContext)(analyticsContext_1.AnalyticsContext);
     if (!sendEvents) {
         return undefined;
     }
-    return (e, defaultEvent) => {
-        if (!e) {
+    return (e) => {
+        let events = [];
+        if (defaultEvent && e) {
+            events = Array.isArray(e) ? [...e, defaultEvent] : [e, defaultEvent];
+        }
+        else if (e) {
+            events = e;
+        }
+        if (!events) {
             return;
         }
-        sendEvents(e, defaultEvent);
+        sendEvents(events);
     };
 };
 exports.useAnalytics = useAnalytics;

package/build/cjs/models/common.d.ts

@@ -76,6 +76,6 @@ export type AnalyticsEvent<T = {}> = T & {
     name: string;
     type?: string;
     counters?: AnalyticsCounters;
+    blockName?: string;
 };
-export type DefaultEvent = Record<string, string | boolean | number>;
 export {};

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

@@ -538,6 +538,9 @@ export declare const ButtonProps: {
                         };
                     };
                 };
+                blockName: {
+                    type: string;
+                };
             };
         } | {
             type: string;
@@ -573,6 +576,9 @@ export declare const ButtonProps: {
                             };
                         };
                     };
+                    blockName: {
+                        type: string;
+                    };
                 };
             };
         })[];
@@ -834,6 +840,9 @@ export declare const ButtonBlock: {
                             };
                         };
                     };
+                    blockName: {
+                        type: string;
+                    };
                 };
             } | {
                 type: string;
@@ -869,6 +878,9 @@ export declare const ButtonBlock: {
                                 };
                             };
                         };
+                        blockName: {
+                            type: string;
+                        };
                     };
                 };
             })[];

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

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

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

@@ -31,5 +31,8 @@ exports.AnalyticsEventSchema = {
                 },
             },
         },
+        blockName: {
+            type: 'string',
+        },
     },
 };

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

@@ -9,13 +9,18 @@ const useMetrika_1 = require("../../hooks/useMetrika");
 const models_1 = require("../../models");
 const hooks_1 = require("../../hooks");
 const HubspotFormContainer_1 = tslib_1.__importDefault(require("./HubspotFormContainer"));
+const constants_1 = require("../../constants");
 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, blockName = models_1.SubBlockType.HubspotForm, } = props;
     const handleMetrika = (0, useMetrika_1.useMetrika)();
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'hubspot-form-submit',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
     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,11 +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, {
-                name: 'default',
-                type: 'hubspot-form',
-                block: blockName,
-            });
+            handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(analyticsEvents);
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(e);
         },
     }), [
@@ -41,7 +42,6 @@ const HubspotForm = (props) => {
         pixelEvents,
         handleAnalytics,
         analyticsEvents,
-        blockName,
         onSubmit,
     ]);
     (0, hooks_1.useHandleHubspotEvents)(handlers, formId);

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

@@ -8,19 +8,20 @@ const models_1 = require("../../models");
 const components_1 = require("../../components");
 const ThemeValueContext_1 = require("../../context/theme/ThemeValueContext");
 const utils_2 = require("../../components/Media/Image/utils");
-const hooks_1 = require("src/hooks");
+const hooks_1 = require("../../hooks");
+const constants_1 = require("src/constants");
 const b = (0, utils_1.block)('quote');
 const Quote = (props) => {
     const { theme: textTheme = 'light', color, image, border = 'shadow', text, logo, author, url, buttonText, blockName = models_1.SubBlockType.Quote, } = props;
     const { themeValue: theme } = (0, react_1.useContext)(ThemeValueContext_1.ThemeValueContext);
     const imageThemed = (0, utils_1.getThemedValue)(image, theme);
     const imageData = (0, utils_2.getMediaImage)(imageThemed);
-    const handleAnalytics = (0, hooks_1.useAnalytics)();
-    const handleButtonClick = (0, react_1.useCallback)(() => handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics([], {
-        name: 'default',
-        type: 'button',
-        block: blockName,
-    }), [blockName, handleAnalytics]);
+    const handleAnalytics = (0, hooks_1.useAnalytics)({
+        name: 'quote-button-click',
+        type: constants_1.DEFAULT_EVENT_TYPE,
+        blockName: blockName,
+    });
+    const handleButtonClick = (0, react_1.useCallback)(() => handleAnalytics === null || handleAnalytics === void 0 ? void 0 : handleAnalytics(), [handleAnalytics]);
     const renderFooter = Boolean(author || url) && (react_1.default.createElement("div", { className: b('author-wrapper') },
         author && (react_1.default.createElement(components_1.Author, { className: b('author', { theme: textTheme }), author: author, type: models_1.AuthorType.Line })),
         url && buttonText && (react_1.default.createElement(uikit_1.Button, { view: "outlined", size: "xl", href: url, className: b('link-button', { theme: textTheme }), onClick: handleButtonClick }, buttonText))));