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

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: [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/schema/validators/index.d.ts

@@ -3,12 +3,10 @@ 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/esm/schema/validators/index.js

@@ -3,12 +3,10 @@ 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 const validators = {
     blocks,
     common,
     subBlocks,
     pixel,
     utils,
-    navigation,
 };

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.14.0-alpha.4",
+  "version": "1.14.0-alpha.6",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {

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";

package/server/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/server/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/server/models/navigation.d.ts

@@ -11,7 +11,7 @@ export interface NavigationItemBase {
     icon?: ImageProps;
     url?: string;
 }
-export interface NavigationLinkItem extends Omit<NavigationItemBase, 'url'> {
+export interface NavigationLinkItem extends NavigationItemBase {
     type: NavigationItemType.Link;
     url: string;
     arrow?: boolean;
@@ -19,6 +19,8 @@ export interface NavigationLinkItem extends Omit<NavigationItemBase, 'url'> {
 }
 export interface NavigationButtonItem extends ButtonProps {
     type: NavigationItemType.Button;
+    url: string;
+    target?: string;
 }
 export interface NavigationDropdownItem extends NavigationItemBase {
     type: NavigationItemType.Dropdown;

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

@@ -1,104 +0,0 @@
-export declare const LogoProps: {
-    type: string;
-    additionalProperties: boolean;
-    required: string[];
-    properties: {
-        icon: {
-            oneOf: ({
-                type: string;
-                properties: {
-                    when: {
-                        type: string;
-                    };
-                };
-            } | {
-                type: string;
-                pattern: string;
-            })[];
-        };
-        text: {
-            type: string;
-            contentType: string;
-        };
-        url: {
-            type: string;
-        };
-    };
-};
-export declare const NavigationHeaderProps: {
-    type: string;
-    additionalProperties: boolean;
-    required: string[];
-    properties: {
-        leftItems: {
-            oneOf: {
-                type: string;
-                additionalProperties: boolean;
-                required: string[];
-                properties: {
-                    type: {
-                        type: string;
-                        enum: string[];
-                    };
-                    items: {
-                        type: string;
-                        items: {
-                            type: string;
-                            properties: {
-                                when: {
-                                    type: string;
-                                };
-                            };
-                        };
-                    };
-                    text: {
-                        type: string;
-                        contentType: string;
-                    };
-                    url: {
-                        type: string;
-                    };
-                    icon: {
-                        type: string;
-                        pattern: string;
-                    };
-                };
-            }[];
-        };
-        rightItems: {
-            oneOf: {
-                type: string;
-                additionalProperties: boolean;
-                required: string[];
-                properties: {
-                    type: {
-                        type: string;
-                        enum: string[];
-                    };
-                    items: {
-                        type: string;
-                        items: {
-                            type: string;
-                            properties: {
-                                when: {
-                                    type: string;
-                                };
-                            };
-                        };
-                    };
-                    text: {
-                        type: string;
-                        contentType: string;
-                    };
-                    url: {
-                        type: string;
-                    };
-                    icon: {
-                        type: string;
-                        pattern: string;
-                    };
-                };
-            }[];
-        };
-    };
-};

package/build/cjs/navigation/schema.js

@@ -1,78 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.NavigationHeaderProps = exports.LogoProps = void 0;
-const common_1 = require("../schema/validators/common");
-const schema_1 = require("../components/Image/schema");
-const lodash_1 = require("lodash");
-const utils_1 = require("../schema/validators/utils");
-const NavigationItemType = {
-    type: 'string',
-    enum: ['link', 'button', 'dropdown'],
-};
-exports.LogoProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['icon'],
-    properties: {
-        icon: schema_1.ImageProps,
-        text: {
-            type: 'string',
-            contentType: 'text',
-        },
-        url: {
-            type: 'string',
-        },
-    },
-};
-const NavigationItemBaseProps = {
-    text: {
-        type: 'string',
-        contentType: 'text',
-    },
-    url: {
-        type: 'string',
-    },
-    icon: {
-        type: 'string',
-        pattern: schema_1.urlPattern,
-    },
-};
-const NavigationItemBaseLinkProps = (0, lodash_1.omit)(NavigationItemBaseProps, ['url']);
-const NavigationLinkItemProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['type', 'text'],
-    properties: Object.assign(Object.assign({}, NavigationItemBaseLinkProps), { type: Object.assign({}, NavigationItemType), url: {
-            type: 'string',
-        }, target: {
-            type: 'string',
-        }, arrow: {
-            type: 'boolean',
-        } }),
-};
-const NavigationButtonItemProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['type', 'text', 'url'],
-    properties: Object.assign(Object.assign({}, common_1.ButtonProps), { type: Object.assign({}, NavigationItemType) }),
-};
-const NavigationDropdownItemProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['type', 'items'],
-    properties: Object.assign(Object.assign({}, NavigationItemBaseProps), { type: Object.assign({}, NavigationItemType), items: (0, utils_1.filteredArray)(NavigationLinkItemProps) }),
-};
-const NavigationItemProps = {
-    oneOf: [
-        Object.assign(Object.assign(Object.assign({}, NavigationLinkItemProps), NavigationButtonItemProps), NavigationDropdownItemProps),
-    ],
-};
-exports.NavigationHeaderProps = {
-    type: 'object',
-    additionalProperties: false,
-    required: ['leftItems'],
-    properties: {
-        leftItems: NavigationItemProps,
-        rightItems: NavigationItemProps,
-    },
-};

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

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

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

@@ -1,104 +0,0 @@
-export declare const LogoProps: {
-    type: string;
-    additionalProperties: boolean;
-    required: string[];
-    properties: {
-        icon: {
-            oneOf: ({
-                type: string;
-                properties: {
-                    when: {
-                        type: string;
-                    };
-                };
-            } | {
-                type: string;
-                pattern: string;
-            })[];
-        };
-        text: {
-            type: string;
-            contentType: string;
-        };
-        url: {
-            type: string;
-        };
-    };
-};
-export declare const NavigationHeaderProps: {
-    type: string;
-    additionalProperties: boolean;
-    required: string[];
-    properties: {
-        leftItems: {
-            oneOf: {
-                type: string;
-                additionalProperties: boolean;
-                required: string[];
-                properties: {
-                    type: {
-                        type: string;
-                        enum: string[];
-                    };
-                    items: {
-                        type: string;
-                        items: {
-                            type: string;
-                            properties: {
-                                when: {
-                                    type: string;
-                                };
-                            };
-                        };
-                    };
-                    text: {
-                        type: string;
-                        contentType: string;
-                    };
-                    url: {
-                        type: string;
-                    };
-                    icon: {
-                        type: string;
-                        pattern: string;
-                    };
-                };
-            }[];
-        };
-        rightItems: {
-            oneOf: {
-                type: string;
-                additionalProperties: boolean;
-                required: string[];
-                properties: {
-                    type: {
-                        type: string;
-                        enum: string[];
-                    };
-                    items: {
-                        type: string;
-                        items: {
-                            type: string;
-                            properties: {
-                                when: {
-                                    type: string;
-                                };
-                            };
-                        };
-                    };
-                    text: {
-                        type: string;
-                        contentType: string;
-                    };
-                    url: {
-                        type: string;
-                    };
-                    icon: {
-                        type: string;
-                        pattern: string;
-                    };
-                };
-            }[];
-        };
-    };
-};