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

package/build/esm/hooks/useAnalytics.js

@@ -0,0 +1,11 @@
+import { useContext } from 'react';
+import { AnalyticsContext } from '../context/analyticsContext';
+export const useAnalytics = () => {
+    const { sendEvents } = useContext(AnalyticsContext);
+    return (e) => {
+        if (!e) {
+            return;
+        }
+        sendEvents === null || sendEvents === void 0 ? void 0 : sendEvents(e);
+    };
+};

package/build/esm/hooks/useMetrika.d.ts

@@ -1,7 +1,13 @@
 import { ButtonPixel, MetrikaGoal, PixelEvent } from '../models';
+/**
+ * @deprecated Metrika will be deleted
+ */
 type UseMetrikaProps = {
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: string | string[] | PixelEvent | PixelEvent[] | ButtonPixel;
 };
+/**
+ * @deprecated useMetrika will be deleted
+ */
 export declare const useMetrika: () => ({ metrikaGoals, pixelEvents }: UseMetrikaProps) => void;
 export {};

package/build/esm/hooks/useMetrika.js

@@ -2,12 +2,20 @@ import { useContext } from 'react';
 import { MetrikaContext } from '../context/metrikaContext';
 import { PixelEventType } from '../models';
 import { isNewMetrikaFormat } from '../models/guards';
+// eslint-disable-next-line valid-jsdoc
+/**
+ * @deprecated Metrika will be deleted, which uses this logic
+ */
 function isButtonPixel(pixelEvents) {
     if (Array.isArray(pixelEvents) && pixelEvents.length && 'name' in pixelEvents) {
         return true;
     }
     return false;
 }
+// eslint-disable-next-line valid-jsdoc
+/**
+ * @deprecated useMetrika will be deleted
+ */
 export const useMetrika = () => {
     const { metrika, pixel } = useContext(MetrikaContext);
     return ({ metrikaGoals, pixelEvents }) => {

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

@@ -7,12 +7,21 @@ export declare enum Theme {
     Light = "light",
     Dark = "dark"
 }
+/**
+ * @deprecated Pixel will be deleted
+ */
 type PixelCommand = 'track' | 'trackCustom';
+/**
+ * @deprecated Pixel will be deleted
+ */
 export interface PixelEvent {
     command: PixelCommand;
     event: PixelEventType | string;
     data?: Object;
 }
+/**
+ * @deprecated Pixel will be deleted from package
+ */
 export declare enum PixelEventType {
     AddPaymentInfo = "AddPaymentInfo",
     AddToCart = "AddToCart",
@@ -36,11 +45,17 @@ export declare enum PixelEventType {
 export type Modifiers = {
     [name: string]: string | boolean | undefined;
 };
+/**
+ * @deprecated Pixel will be deleted
+ */
 export interface Pixel<TEvent = string> {
     trackStandard: (event: TEvent, data?: Object) => void;
     trackCustom: (event: string, data?: Object) => void;
     track: (trackEvents: string | string[] | PixelEvent[] | PixelEvent) => void;
 }
+/**
+ * @deprecated Metrika will be deleted
+ */
 export interface Metrika {
     reachGoal: (counterName: string, ...args: any) => void;
     reachGoals: (goals: MetrikaGoal, counterName?: string) => void;
@@ -49,4 +64,19 @@ export interface ClassNameProps {
     className?: string;
 }
 export type Timeout = ReturnType<typeof setTimeout> | undefined;
+export type AnalyticsParameter = {
+    key: string;
+    value: string;
+};
+export type AnalyticsEvent = {
+    name: string;
+    type?: string;
+    counters?: {
+        include?: string[];
+        exclude?: string[];
+    };
+    category?: string;
+    label?: string;
+    params?: AnalyticsParameter[];
+};
 export {};

package/build/esm/models/common.js

@@ -3,6 +3,9 @@ export var Theme;
     Theme["Light"] = "light";
     Theme["Dark"] = "dark";
 })(Theme || (Theme = {}));
+/**
+ * @deprecated Pixel will be deleted from package
+ */
 export var PixelEventType;
 (function (PixelEventType) {
     PixelEventType["AddPaymentInfo"] = "AddPaymentInfo";

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

@@ -1,7 +1,7 @@
 import { CSSProperties, ReactNode } from 'react';
 import { ButtonSize, ButtonView } from '@gravity-ui/uikit';
 import { ThemeSupporting } from '../../utils/theme';
-import { ClassNameProps, PixelEventType } from '../common';
+import { AnalyticsEvent, ClassNameProps, PixelEventType } from '../common';
 export declare enum AuthorType {
     Column = "column",
     Line = "line"
@@ -121,6 +121,7 @@ export interface LinkProps extends Stylable {
     target?: string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
 }
 export interface FileLinkProps extends ClassNameProps {
     href: string;
@@ -139,6 +140,7 @@ export interface ButtonProps {
     img?: ButtonImageProps | string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    analyticsEvents?: AnalyticsEvent[];
     target?: string;
 }
 export interface ButtonImageProps {
@@ -222,6 +224,7 @@ export interface HeaderBreadCrumbsProps extends ClassNameProps {
     theme?: TextTheme;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
 }
 export interface PreviewContentItemProps {
     title: string;

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

@@ -3,7 +3,7 @@ import { ThemeSupporting } from '../../utils';
 import { HubspotEventData, HubspotEventHandlers } from '../../utils/hubspot';
 import { AuthorItem, ButtonPixel, ButtonProps, CardBaseProps, ContentTheme, DividerSize, ImageObjectProps, ImageProps, LinkProps, MediaProps, PriceDetailedProps, TextTheme, Themable, ThemedImage } from './common';
 import { ContentBlockProps } from './blocks';
-import { PixelEvent } from '../common';
+import { AnalyticsEvent, PixelEvent } from '../common';
 export declare enum SubBlockType {
     Divider = "divider",
     Quote = "quote",
@@ -61,6 +61,7 @@ export interface HubspotFormProps extends HubspotEventHandlers {
     onLoad?: (arg: HubspotEventData) => void;
     pixelEvents?: string | string[] | PixelEvent | PixelEvent[] | ButtonPixel;
     hubspotEvents?: string[];
+    analyticsEvents?: AnalyticsEvent | AnalyticsEvent[];
 }
 export interface PartnerProps extends CardBaseProps {
     text: string;

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

@@ -414,6 +414,9 @@ export declare const ButtonProps: {
             };
         })[];
     };
+    /**
+     * @deprecated Metrika will be deleted
+     */
     metrikaGoals: {
         anyOf: ({
             type: string;
@@ -443,6 +446,9 @@ export declare const ButtonProps: {
             };
         })[];
     };
+    /**
+     * @deprecated Pixel will be deleted
+     */
     pixelEvents: {
         type: string;
         items: {
@@ -499,6 +505,113 @@ export declare const ButtonProps: {
             };
         };
     };
+    events: {
+        anyOf: ({
+            type: {
+                type: string;
+                additionalProperties: boolean;
+                required: string[];
+                properties: {
+                    name: {
+                        type: string;
+                    };
+                    type: {
+                        type: string;
+                    };
+                    counters: {
+                        type: string;
+                        additionalProperties: boolean;
+                        required: never[];
+                        properties: {
+                            include: {
+                                type: string;
+                                items: string;
+                            };
+                            exclude: {
+                                type: string;
+                                items: string;
+                            };
+                        };
+                    };
+                    category: {
+                        type: string;
+                    };
+                    label: {
+                        type: string;
+                    };
+                    params: {
+                        type: string;
+                        items: {
+                            type: string;
+                            additionalProperties: boolean;
+                            required: string[];
+                            properties: {
+                                key: {
+                                    type: string;
+                                };
+                                value: {
+                                    type: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+            items?: undefined;
+        } | {
+            type: string;
+            items: {
+                type: string;
+                additionalProperties: boolean;
+                required: string[];
+                properties: {
+                    name: {
+                        type: string;
+                    };
+                    type: {
+                        type: string;
+                    };
+                    counters: {
+                        type: string;
+                        additionalProperties: boolean;
+                        required: never[];
+                        properties: {
+                            include: {
+                                type: string;
+                                items: string;
+                            };
+                            exclude: {
+                                type: string;
+                                items: string;
+                            };
+                        };
+                    };
+                    category: {
+                        type: string;
+                    };
+                    label: {
+                        type: string;
+                    };
+                    params: {
+                        type: string;
+                        items: {
+                            type: string;
+                            additionalProperties: boolean;
+                            required: string[];
+                            properties: {
+                                key: {
+                                    type: string;
+                                };
+                                value: {
+                                    type: string;
+                                };
+                            };
+                        };
+                    };
+                };
+            };
+        })[];
+    };
     target: {
         type: string;
         enum: string[];
@@ -629,6 +742,9 @@ export declare const ButtonBlock: {
                 };
             })[];
         };
+        /**
+         * @deprecated Metrika will be deleted
+         */
         metrikaGoals: {
             anyOf: ({
                 type: string;
@@ -658,6 +774,9 @@ export declare const ButtonBlock: {
                 };
             })[];
         };
+        /**
+         * @deprecated Pixel will be deleted
+         */
         pixelEvents: {
             type: string;
             items: {
@@ -714,6 +833,113 @@ export declare const ButtonBlock: {
                 };
             };
         };
+        events: {
+            anyOf: ({
+                type: {
+                    type: string;
+                    additionalProperties: boolean;
+                    required: string[];
+                    properties: {
+                        name: {
+                            type: string;
+                        };
+                        type: {
+                            type: string;
+                        };
+                        counters: {
+                            type: string;
+                            additionalProperties: boolean;
+                            required: never[];
+                            properties: {
+                                include: {
+                                    type: string;
+                                    items: string;
+                                };
+                                exclude: {
+                                    type: string;
+                                    items: string;
+                                };
+                            };
+                        };
+                        category: {
+                            type: string;
+                        };
+                        label: {
+                            type: string;
+                        };
+                        params: {
+                            type: string;
+                            items: {
+                                type: string;
+                                additionalProperties: boolean;
+                                required: string[];
+                                properties: {
+                                    key: {
+                                        type: string;
+                                    };
+                                    value: {
+                                        type: string;
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+                items?: undefined;
+            } | {
+                type: string;
+                items: {
+                    type: string;
+                    additionalProperties: boolean;
+                    required: string[];
+                    properties: {
+                        name: {
+                            type: string;
+                        };
+                        type: {
+                            type: string;
+                        };
+                        counters: {
+                            type: string;
+                            additionalProperties: boolean;
+                            required: never[];
+                            properties: {
+                                include: {
+                                    type: string;
+                                    items: string;
+                                };
+                                exclude: {
+                                    type: string;
+                                    items: string;
+                                };
+                            };
+                        };
+                        category: {
+                            type: string;
+                        };
+                        label: {
+                            type: string;
+                        };
+                        params: {
+                            type: string;
+                            items: {
+                                type: string;
+                                additionalProperties: boolean;
+                                required: string[];
+                                properties: {
+                                    key: {
+                                        type: string;
+                                    };
+                                    value: {
+                                        type: string;
+                                    };
+                                };
+                            };
+                        };
+                    };
+                };
+            })[];
+        };
         target: {
             type: string;
             enum: string[];

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

@@ -1,6 +1,7 @@
 import { pixelEvents } from './pixel';
 import { Theme } from '../../models';
 import { ImageProps, urlPattern } from '../../components/Image/schema';
+import { AnalyticsEventSchema } from './event';
 export const mediaDirection = ['media-content', 'content-media'];
 export const textSize = ['s', 'm', 'l'];
 export const containerSizesArray = ['sm', 'md', 'lg', 'xl', 'all'];
@@ -306,6 +307,9 @@ export const ButtonProps = {
             },
         ],
     },
+    /**
+     * @deprecated Metrika will be deleted
+     */
     metrikaGoals: {
         anyOf: [
             { type: 'string' },
@@ -328,7 +332,13 @@ export const ButtonProps = {
             },
         ],
     },
+    /**
+     * @deprecated Pixel will be deleted
+     */
     pixelEvents,
+    events: {
+        anyOf: [{ type: AnalyticsEventSchema }, { type: 'array', items: AnalyticsEventSchema }],
+    },
     target: {
         type: 'string',
         enum: ['_self', '_blank', '_parent', '_top'],

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

@@ -0,0 +1,50 @@
+export declare const AnalyticsEventSchema: {
+    type: string;
+    additionalProperties: boolean;
+    required: string[];
+    properties: {
+        name: {
+            type: string;
+        };
+        type: {
+            type: string;
+        };
+        counters: {
+            type: string;
+            additionalProperties: boolean;
+            required: never[];
+            properties: {
+                include: {
+                    type: string;
+                    items: string;
+                };
+                exclude: {
+                    type: string;
+                    items: string;
+                };
+            };
+        };
+        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/schema/validators/event.js

@@ -0,0 +1,50 @@
+export const AnalyticsEventSchema = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['name'],
+    properties: {
+        name: {
+            type: 'string',
+        },
+        type: {
+            type: 'string',
+        },
+        counters: {
+            type: 'object',
+            additionalProperties: false,
+            required: [],
+            properties: {
+                include: {
+                    type: 'array',
+                    items: 'string',
+                },
+                exclude: {
+                    type: 'array',
+                    items: 'string',
+                },
+            },
+        },
+        category: {
+            type: 'string',
+        },
+        label: {
+            type: 'string',
+        },
+        params: {
+            type: 'array',
+            items: {
+                type: 'object',
+                additionalProperties: false,
+                required: ['key', 'value'],
+                properties: {
+                    key: {
+                        type: 'string',
+                    },
+                    value: {
+                        type: 'string',
+                    },
+                },
+            },
+        },
+    },
+};

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

@@ -5,13 +5,15 @@ import { MobileContext } from '../../context/mobileContext';
 import { useMetrika } from '../../hooks/useMetrika';
 import { useHandleHubspotEvents } from '../../hooks';
 import HubspotFormContainer from './HubspotFormContainer';
+import { useAnalytics } from '../../hooks/useAnalytics';
 import './HubspotForm.css';
 const b = 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
-    onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, } = props;
+    analyticsEvents, onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, } = props;
     const handleMetrika = useMetrika();
+    const handleAnalytics = useAnalytics();
     const { themeValue } = useContext(ThemeValueContext);
     const isMobileValue = useContext(MobileContext);
     const theme = themeProp !== null && themeProp !== void 0 ? themeProp : themeValue;
@@ -22,9 +24,19 @@ const HubspotForm = (props) => {
         onLoad,
         onSubmit: (e) => {
             handleMetrika === null || handleMetrika === void 0 ? void 0 : handleMetrika({ pixelEvents });
+            handleAnalytics(analyticsEvents);
             onSubmit === null || onSubmit === void 0 ? void 0 : onSubmit(e);
         },
-    }), [onBeforeLoad, onBeforeSubmit, onLoad, handleMetrika, pixelEvents, onSubmit]);
+    }), [
+        onBeforeLoad,
+        onBeforeSubmit,
+        onLoad,
+        handleMetrika,
+        pixelEvents,
+        handleAnalytics,
+        analyticsEvents,
+        onSubmit,
+    ]);
     useHandleHubspotEvents(handlers, formId);
     return (React.createElement(HubspotFormContainer, { key: [formClassName, formId, formInstanceId, portalId, region].join(), className: b({ theme, mobile }, className), formClassName: formClassName, formId: formId, portalId: portalId, formInstanceId: formInstanceId, region: region }));
 };

package/package.json

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

package/server/models/common.d.ts

@@ -7,12 +7,21 @@ export declare enum Theme {
     Light = "light",
     Dark = "dark"
 }
+/**
+ * @deprecated Pixel will be deleted
+ */
 type PixelCommand = 'track' | 'trackCustom';
+/**
+ * @deprecated Pixel will be deleted
+ */
 export interface PixelEvent {
     command: PixelCommand;
     event: PixelEventType | string;
     data?: Object;
 }
+/**
+ * @deprecated Pixel will be deleted from package
+ */
 export declare enum PixelEventType {
     AddPaymentInfo = "AddPaymentInfo",
     AddToCart = "AddToCart",
@@ -36,11 +45,17 @@ export declare enum PixelEventType {
 export type Modifiers = {
     [name: string]: string | boolean | undefined;
 };
+/**
+ * @deprecated Pixel will be deleted
+ */
 export interface Pixel<TEvent = string> {
     trackStandard: (event: TEvent, data?: Object) => void;
     trackCustom: (event: string, data?: Object) => void;
     track: (trackEvents: string | string[] | PixelEvent[] | PixelEvent) => void;
 }
+/**
+ * @deprecated Metrika will be deleted
+ */
 export interface Metrika {
     reachGoal: (counterName: string, ...args: any) => void;
     reachGoals: (goals: MetrikaGoal, counterName?: string) => void;
@@ -49,4 +64,19 @@ export interface ClassNameProps {
     className?: string;
 }
 export type Timeout = ReturnType<typeof setTimeout> | undefined;
+export type AnalyticsParameter = {
+    key: string;
+    value: string;
+};
+export type AnalyticsEvent = {
+    name: string;
+    type?: string;
+    counters?: {
+        include?: string[];
+        exclude?: string[];
+    };
+    category?: string;
+    label?: string;
+    params?: AnalyticsParameter[];
+};
 export {};

package/server/models/common.js

@@ -6,6 +6,9 @@ var Theme;
     Theme["Light"] = "light";
     Theme["Dark"] = "dark";
 })(Theme = exports.Theme || (exports.Theme = {}));
+/**
+ * @deprecated Pixel will be deleted from package
+ */
 var PixelEventType;
 (function (PixelEventType) {
     PixelEventType["AddPaymentInfo"] = "AddPaymentInfo";