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

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

@@ -499,6 +499,53 @@ export declare const ButtonProps: {
             };
         };
     };
+    gaEvents: {
+        type: string;
+        items: {
+            type: string;
+            required: string[];
+            additionalProperties: boolean;
+            properties: {
+                eventName: {
+                    type: string;
+                };
+                eventCategory: {
+                    type: string;
+                };
+                eventLabel: {
+                    type: string;
+                };
+                value: {
+                    type: string;
+                };
+                groups: {
+                    oneOf: ({
+                        type: string;
+                        items?: undefined;
+                    } | {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                    })[];
+                };
+                sendTo: {
+                    oneOf: ({
+                        type: string;
+                        items?: undefined;
+                    } | {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                    })[];
+                };
+                eventTimeout: {
+                    type: string;
+                };
+            };
+        };
+    };
     target: {
         type: string;
         enum: string[];
@@ -714,6 +761,53 @@ export declare const ButtonBlock: {
                 };
             };
         };
+        gaEvents: {
+            type: string;
+            items: {
+                type: string;
+                required: string[];
+                additionalProperties: boolean;
+                properties: {
+                    eventName: {
+                        type: string;
+                    };
+                    eventCategory: {
+                        type: string;
+                    };
+                    eventLabel: {
+                        type: string;
+                    };
+                    value: {
+                        type: string;
+                    };
+                    groups: {
+                        oneOf: ({
+                            type: string;
+                            items?: undefined;
+                        } | {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        })[];
+                    };
+                    sendTo: {
+                        oneOf: ({
+                            type: string;
+                            items?: undefined;
+                        } | {
+                            type: string;
+                            items: {
+                                type: string;
+                            };
+                        })[];
+                    };
+                    eventTimeout: {
+                        type: string;
+                    };
+                };
+            };
+        };
         target: {
             type: string;
             enum: string[];
@@ -869,3 +963,34 @@ export declare const CardBase: {
         enum: string[];
     };
 };
+export declare const BlockHeaderProps: {
+    title: {
+        oneOf: ({
+            type: string;
+            additionalProperties: boolean;
+            required: string[];
+            properties: {
+                text: {
+                    type: string;
+                    contentType: string;
+                };
+                textSize: {
+                    type: string;
+                    enum: string[];
+                };
+                url: {
+                    type: string;
+                };
+                resetMargin: {
+                    type: string;
+                };
+            };
+        } | {
+            type: string;
+        })[];
+    };
+    description: {
+        type: string;
+        contentType: string;
+    };
+};

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

@@ -1,3 +1,4 @@
+import { gaEvents } from './ga-events';
 import { pixelEvents } from './pixel';
 import { Theme } from '../../models';
 import { ImageProps, urlPattern } from '../../components/Image/schema';
@@ -329,6 +330,7 @@ export const ButtonProps = {
         ],
     },
     pixelEvents,
+    gaEvents,
     target: {
         type: 'string',
         enum: ['_self', '_blank', '_parent', '_top'],
@@ -444,3 +446,12 @@ export const CardBase = {
         enum: ['border', 'shadow', 'none'],
     },
 };
+export const BlockHeaderProps = {
+    title: {
+        oneOf: [{ type: 'string' }, TitleProps],
+    },
+    description: {
+        type: 'string',
+        contentType: 'yfm',
+    },
+};

package/build/esm/schema/validators/ga-events.d.ts

@@ -0,0 +1,47 @@
+export declare const gaEvents: {
+    type: string;
+    items: {
+        type: string;
+        required: string[];
+        additionalProperties: boolean;
+        properties: {
+            eventName: {
+                type: string;
+            };
+            eventCategory: {
+                type: string;
+            };
+            eventLabel: {
+                type: string;
+            };
+            value: {
+                type: string;
+            };
+            groups: {
+                oneOf: ({
+                    type: string;
+                    items?: undefined;
+                } | {
+                    type: string;
+                    items: {
+                        type: string;
+                    };
+                })[];
+            };
+            sendTo: {
+                oneOf: ({
+                    type: string;
+                    items?: undefined;
+                } | {
+                    type: string;
+                    items: {
+                        type: string;
+                    };
+                })[];
+            };
+            eventTimeout: {
+                type: string;
+            };
+        };
+    };
+};

package/build/esm/schema/validators/ga-events.js

@@ -0,0 +1,47 @@
+export const gaEvents = {
+    type: 'array',
+    items: {
+        type: 'object',
+        required: ['eventName'],
+        additionalProperties: false,
+        properties: {
+            eventName: {
+                type: 'string',
+            },
+            eventCategory: {
+                type: 'string',
+            },
+            eventLabel: {
+                type: 'string',
+            },
+            value: {
+                type: 'number',
+            },
+            groups: {
+                oneOf: [
+                    { type: 'string' },
+                    {
+                        type: 'array',
+                        items: {
+                            type: 'string',
+                        },
+                    },
+                ],
+            },
+            sendTo: {
+                oneOf: [
+                    { type: 'string' },
+                    {
+                        type: 'array',
+                        items: {
+                            type: 'string',
+                        },
+                    },
+                ],
+            },
+            eventTimeout: {
+                type: 'number',
+            },
+        },
+    },
+};

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

@@ -1,7 +1,7 @@
 import { omit } from 'lodash';
 import { BaseProps, textSize } from '../../schema/validators/common';
 import { filteredArray } from '../../schema/validators/utils';
-import { ContentBase } from '../../../src/sub-blocks/Content/schema';
+import { ContentBase } from '../../sub-blocks/Content/schema';
 const CardWithImageContentProps = omit(ContentBase, ['links', 'size', 'text', 'theme']);
 const CardWithImageLinks = {
     type: 'object',

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

@@ -35,13 +35,6 @@ function parsePromoFeatures(transformer, items) {
         return (Object.assign({ text: transformer(text) }, rest));
     });
 }
-function parseSlider(transformer, block) {
-    const { title, description } = block;
-    block.title = Object.assign(Object.assign({}, title), { text: transformer(title ? title.text : '') });
-    if (description) {
-        block.description = transformer(description);
-    }
-}
 const parseTitle = (transformer, title) => typeof title === 'object' && 'text' in title
     ? Object.assign(Object.assign({}, title), { text: transformer(title.text) }) : title && transformer(title);
 const parseItemsTitle = (transformer, items) => items.map((_a) => {
@@ -95,6 +88,17 @@ export function yfmTransformer(lang, content) {
 export function typografTransformer(lang, content) {
     return typografToHTML(content, lang);
 }
+const blockHeaderTransfomer = [
+    {
+        fields: ['title'],
+        transformer: typografTransformer,
+        parser: parseTitle,
+    },
+    {
+        fields: ['description'],
+        transformer: yfmTransformer,
+    },
+];
 const config = {
     [SubBlockType.Partner]: {
         fields: ['text'],
@@ -139,35 +143,35 @@ const config = {
         transformer: typografTransformer,
     },
     [BlockType.ExtendedFeaturesBlock]: [
+        ...blockHeaderTransfomer,
         {
-            fields: ['title'],
+            fields: ['items'],
             transformer: typografTransformer,
-            parser: parseTitle,
+            parser: createItemsParser(['title']),
         },
         {
-            fields: ['description'],
+            fields: ['items'],
             transformer: yfmTransformer,
+            parser: createItemsParser(['text', 'additionalInfo']),
         },
+    ],
+    [BlockType.PromoFeaturesBlock]: [
         {
-            fields: ['items'],
+            fields: ['title'],
             transformer: typografTransformer,
-            parser: createItemsParser(['title']),
+            parser: parseTitle,
+        },
+        {
+            fields: ['description'],
+            transformer: yfmTransformer,
         },
         {
             fields: ['items'],
             transformer: yfmTransformer,
-            parser: createItemsParser(['text', 'additionalInfo']),
+            parser: parsePromoFeatures,
         },
     ],
-    [BlockType.PromoFeaturesBlock]: {
-        fields: ['items'],
-        transformer: yfmTransformer,
-        parser: parsePromoFeatures,
-    },
-    [BlockType.SliderBlock]: {
-        transformer: typografTransformer,
-        parser: parseSlider,
-    },
+    [BlockType.SliderBlock]: blockHeaderTransfomer,
     [BlockType.QuestionsBlock]: [
         {
             fields: ['title'],
@@ -204,21 +208,14 @@ const config = {
         },
     ],
     [BlockType.MediaBlock]: [
+        ...blockHeaderTransfomer,
         {
-            fields: ['title'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['description', 'title', 'additionalInfo'],
+            fields: ['title', 'additionalInfo'],
             transformer: yfmTransformer,
         },
     ],
     [BlockType.TabsBlock]: [
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
+        ...blockHeaderTransfomer,
         {
             fields: ['items'],
             transformer: yfmTransformer,
@@ -250,6 +247,11 @@ const config = {
         },
     ],
     [BlockType.SimpleBlock]: [
+        {
+            fields: ['title'],
+            transformer: typografTransformer,
+            parser: parseTitle,
+        },
         {
             fields: ['description'],
             transformer: yfmTransformer,
@@ -301,28 +303,7 @@ const config = {
             parser: parseTitle,
         },
     ],
-    [BlockType.CardLayoutBlock]: [
-        {
-            fields: ['description'],
-            transformer: yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
-    ],
-    [BlockType.PromoFeaturesBlock]: [
-        {
-            fields: ['description'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
-    ],
+    [BlockType.PromoFeaturesBlock]: blockHeaderTransfomer,
     [BlockType.InfoBlock]: [
         {
             fields: ['rightContent', 'leftContent'],
@@ -341,6 +322,15 @@ const config = {
             transformer: typografTransformer,
         },
     ],
+    [BlockType.CardLayoutBlock]: blockHeaderTransfomer,
+    [BlockType.IconsBlock]: [
+        {
+            fields: ['title'],
+            transformer: typografTransformer,
+            parser: parseTitle,
+        },
+    ],
+    [BlockType.LinkTableBlock]: blockHeaderTransfomer,
 };
 function addRandomOrder(block) {
     if (block) {

package/package.json

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

package/server/models/common.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { MetrikaGoal } from './';
+import { GAEventParams, MetrikaGoal } from './';
 export interface Refable<T> {
     ref?: React.Ref<T>;
 }
@@ -45,6 +45,9 @@ export interface Metrika {
     reachGoal: (counterName: string, ...args: any) => void;
     reachGoals: (goals: MetrikaGoal, counterName?: string) => void;
 }
+export interface GaInline {
+    event: (eventName: string, params?: GAEventParams) => void;
+}
 export interface ClassNameProps {
     className?: string;
 }

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

@@ -121,6 +121,7 @@ export interface LinkProps extends Stylable {
     target?: string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    gaEvents?: GAEvents;
 }
 export interface FileLinkProps extends ClassNameProps {
     href: string;
@@ -139,6 +140,7 @@ export interface ButtonProps {
     img?: ButtonImageProps | string;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    gaEvents?: GAEvents;
     target?: string;
 }
 export interface ButtonImageProps {
@@ -222,6 +224,7 @@ export interface HeaderBreadCrumbsProps extends ClassNameProps {
     theme?: TextTheme;
     metrikaGoals?: MetrikaGoal;
     pixelEvents?: ButtonPixel;
+    gaEvents?: GAEvents;
 }
 export interface PreviewContentItemProps {
     title: string;
@@ -337,4 +340,22 @@ export interface BlockHeaderProps {
     title?: TitleProps | string;
     description?: string;
 }
+export declare type GaParameterValue = string | number | boolean;
+declare type GACommandConfig<T> = T & {
+    [key: string]: GaParameterValue;
+};
+declare type GACommonParams = {
+    groups?: string | string[];
+    sendTo?: string | string[];
+    eventTimeout?: number;
+};
+export declare type GAEventParams = GACommandConfig<GACommonParams & {
+    eventCategory?: string;
+    eventLabel?: string;
+    value?: number;
+}>;
+export type GAEvent = GAEventParams & {
+    eventName: string;
+};
+export type GAEvents = GAEvent | GAEvent[];
 export {};

package/server/text-transform/blocks.js

@@ -52,13 +52,6 @@ function parsePromoFeatures(transformer, items) {
         return (Object.assign({ text: transformer(text) }, rest));
     });
 }
-function parseSlider(transformer, block) {
-    const { title, description } = block;
-    block.title = Object.assign(Object.assign({}, title), { text: transformer(title ? title.text : '') });
-    if (description) {
-        block.description = transformer(description);
-    }
-}
 const parseTitle = (transformer, title) => typeof title === 'object' && 'text' in title
     ? Object.assign(Object.assign({}, title), { text: transformer(title.text) }) : title && transformer(title);
 const parseItemsTitle = (transformer, items) => items.map((_a) => {
@@ -114,6 +107,17 @@ function typografTransformer(lang, content) {
     return (0, utils_1.typografToHTML)(content, lang);
 }
 exports.typografTransformer = typografTransformer;
+const blockHeaderTransfomer = [
+    {
+        fields: ['title'],
+        transformer: typografTransformer,
+        parser: parseTitle,
+    },
+    {
+        fields: ['description'],
+        transformer: yfmTransformer,
+    },
+];
 const config = {
     [models_1.SubBlockType.Partner]: {
         fields: ['text'],
@@ -158,35 +162,35 @@ const config = {
         transformer: typografTransformer,
     },
     [models_1.BlockType.ExtendedFeaturesBlock]: [
+        ...blockHeaderTransfomer,
         {
-            fields: ['title'],
+            fields: ['items'],
             transformer: typografTransformer,
-            parser: parseTitle,
+            parser: (0, exports.createItemsParser)(['title']),
         },
         {
-            fields: ['description'],
+            fields: ['items'],
             transformer: yfmTransformer,
+            parser: (0, exports.createItemsParser)(['text', 'additionalInfo']),
         },
+    ],
+    [models_1.BlockType.PromoFeaturesBlock]: [
         {
-            fields: ['items'],
+            fields: ['title'],
             transformer: typografTransformer,
-            parser: (0, exports.createItemsParser)(['title']),
+            parser: parseTitle,
+        },
+        {
+            fields: ['description'],
+            transformer: yfmTransformer,
         },
         {
             fields: ['items'],
             transformer: yfmTransformer,
-            parser: (0, exports.createItemsParser)(['text', 'additionalInfo']),
+            parser: parsePromoFeatures,
         },
     ],
-    [models_1.BlockType.PromoFeaturesBlock]: {
-        fields: ['items'],
-        transformer: yfmTransformer,
-        parser: parsePromoFeatures,
-    },
-    [models_1.BlockType.SliderBlock]: {
-        transformer: typografTransformer,
-        parser: parseSlider,
-    },
+    [models_1.BlockType.SliderBlock]: blockHeaderTransfomer,
     [models_1.BlockType.QuestionsBlock]: [
         {
             fields: ['title'],
@@ -223,21 +227,14 @@ const config = {
         },
     ],
     [models_1.BlockType.MediaBlock]: [
+        ...blockHeaderTransfomer,
         {
-            fields: ['title'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['description', 'title', 'additionalInfo'],
+            fields: ['title', 'additionalInfo'],
             transformer: yfmTransformer,
         },
     ],
     [models_1.BlockType.TabsBlock]: [
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
+        ...blockHeaderTransfomer,
         {
             fields: ['items'],
             transformer: yfmTransformer,
@@ -269,6 +266,11 @@ const config = {
         },
     ],
     [models_1.BlockType.SimpleBlock]: [
+        {
+            fields: ['title'],
+            transformer: typografTransformer,
+            parser: parseTitle,
+        },
         {
             fields: ['description'],
             transformer: yfmTransformer,
@@ -320,28 +322,7 @@ const config = {
             parser: parseTitle,
         },
     ],
-    [models_1.BlockType.CardLayoutBlock]: [
-        {
-            fields: ['description'],
-            transformer: yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
-    ],
-    [models_1.BlockType.PromoFeaturesBlock]: [
-        {
-            fields: ['description'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
-            parser: parseTitle,
-        },
-    ],
+    [models_1.BlockType.PromoFeaturesBlock]: blockHeaderTransfomer,
     [models_1.BlockType.InfoBlock]: [
         {
             fields: ['rightContent', 'leftContent'],
@@ -360,6 +341,15 @@ const config = {
             transformer: typografTransformer,
         },
     ],
+    [models_1.BlockType.CardLayoutBlock]: blockHeaderTransfomer,
+    [models_1.BlockType.IconsBlock]: [
+        {
+            fields: ['title'],
+            transformer: typografTransformer,
+            parser: parseTitle,
+        },
+    ],
+    [models_1.BlockType.LinkTableBlock]: blockHeaderTransfomer,
 };
 function addRandomOrder(block) {
     if (block) {