@gravity-ui/page-constructor 1.15.0-alpha.22 → 1.15.0-alpha.23

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

@@ -6,6 +6,7 @@ export * from '../../sub-blocks/NewsCard/schema';
 export * from '../../sub-blocks/Partner/schema';
 export * from '../../sub-blocks/TutorialCard/schema';
 export * from '../../sub-blocks/CardWithImage/schema';
+export * from '../../sub-blocks/LayoutItem/schema';
 export * from '../../sub-blocks/Quote/schema';
 export * from '../../sub-blocks/Divider/schema';
 export * from '../../sub-blocks/BasicCard/schema';

package/build/esm/sub-blocks/BannerCard/BannerCard.js

@@ -1,6 +1,6 @@
 import React, { useContext } from 'react';
 import { block, getThemedValue } from '../../utils';
-import { Button, YFMWrapper, BackgroundImage, HTML } from '../../components';
+import { Button, YFMWrapper, BackgroundImage, HTML, RouterLink } from '../../components';
 import { ThemeValueContext } from '../../context/theme/ThemeValueContext';
 import './BannerCard.css';
 const b = block('banner-card');
@@ -18,7 +18,8 @@ export const BannerCard = (props) => {
                     React.createElement("h2", { className: b('title') },
                         React.createElement(HTML, null, title)),
                     subtitle && (React.createElement(YFMWrapper, { className: b('subtitle'), content: subtitle, modifiers: { constructor: true } }))),
-                React.createElement(Button, { className: b('button'), theme: "raised", size: "xl", text: text, url: url, target: target })),
+                React.createElement(RouterLink, { href: url },
+                    React.createElement(Button, { className: b('button'), theme: "raised", size: "xl", text: text, url: url, target: target }))),
             React.createElement(BackgroundImage, { className: b('image'), src: getThemedValue(image, theme), disableCompress: disableCompress }))));
 };
 export default BannerCard;

package/build/esm/sub-blocks/HubspotForm/HubspotForm.css

@@ -46,7 +46,7 @@ unpredictable css rules order in build */
   color: var(--yc-color-text-primary);
   background-color: transparent;
   border: 1px solid var(--yc-color-line-generic);
-  border-radius: 6px;
+  border-radius: var(--yc-border-radius-l);
 }
 .pc-hubspot-form .hs-form-field .input input[type=text]:hover,
 .pc-hubspot-form .hs-form-field .input input[type=number]:hover,
@@ -126,9 +126,9 @@ unpredictable css rules order in build */
   opacity: 0;
   flex-shrink: 0;
 }
-.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span,
-.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span,
-.pc-hubspot-form .hs-form-field .hs-form-radio-display span {
+.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span:not(.hs-form-required),
+.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span:not(.hs-form-required),
+.pc-hubspot-form .hs-form-field .hs-form-radio-display span:not(.hs-form-required) {
   color: var(--yc-color-text-primary);
   font-size: var(--yc-text-body-2-font-size);
   line-height: 16px;
@@ -136,12 +136,17 @@ unpredictable css rules order in build */
   margin: 0;
   flex-grow: 1;
 }
+.pc-hubspot-form .hs-form-field .hs-form-checkbox-display .hs-form-required,
+.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display .hs-form-required,
+.pc-hubspot-form .hs-form-field .hs-form-radio-display .hs-form-required {
+  top: 0;
+}
 .pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display,
 .pc-hubspot-form .hs-form-field .hs-form-checkbox-display {
   position: relative;
 }
-.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span:before,
-.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span:before {
+.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span:not(.hs-form-required):before,
+.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span:not(.hs-form-required):before {
   content: "";
   position: absolute;
   top: 0;
@@ -153,8 +158,8 @@ unpredictable css rules order in build */
   border: 1px solid var(--yc-color-line-generic-accent);
   transition: background-color 0.1s linear;
 }
-.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span:after,
-.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span:after {
+.pc-hubspot-form .hs-form-field .hs-form-booleancheckbox-display span:not(.hs-form-required):after,
+.pc-hubspot-form .hs-form-field .hs-form-checkbox-display span:not(.hs-form-required):after {
   content: "";
   position: absolute;
   top: -10px;
@@ -276,7 +281,7 @@ unpredictable css rules order in build */
   box-sizing: border-box;
   height: 44px;
   padding: 0 20px;
-  border-radius: 8px;
+  border-radius: var(--yc-border-radius-xl);
   background-color: var(--yc-color-base-special);
   color: var(--yc-my-color-brand-text-contrast);
   line-height: 44px;

package/build/esm/sub-blocks/HubspotForm/HubspotFormContainer.d.ts

@@ -1,5 +1,5 @@
 import { HubspotFormProps } from '../../models';
-type HubspotFormContainerPropsKeys = 'className' | 'formId' | 'formInstanceId' | 'portalId' | 'region' | 'formClassName';
+type HubspotFormContainerPropsKeys = 'className' | 'formId' | 'formInstanceId' | 'portalId' | 'region' | 'formClassName' | 'createDOMElement';
 type HubspotFormContainerProps = Pick<HubspotFormProps, HubspotFormContainerPropsKeys>;
 declare const HubspotFormContainer: (props: HubspotFormContainerProps) => JSX.Element;
 export default HubspotFormContainer;

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

@@ -1,16 +1,21 @@
-import React from 'react';
+import React, { useRef } from 'react';
 import loadHubspotScript from './loadHubspotScript';
 import { useMount } from '../../hooks';
 const HubspotFormContainer = (props) => {
-    const { className, formId, formInstanceId, portalId, region, formClassName, } = props;
+    const { className, formId, formInstanceId, portalId, region, formClassName, createDOMElement, } = props;
+    const containerRef = useRef(null);
+    const hsContainerRef = useRef();
     const containerId = formInstanceId
         ? `hubspot-form-${formId}-${formInstanceId}`
         : `hubspot-form-${formId}`;
-    useMount(() => {
-        (async () => {
-            if (!window.hbspt) {
-                await loadHubspotScript();
-            }
+    const createForm = () => {
+        if (containerRef.current && !hsContainerRef.current && createDOMElement) {
+            hsContainerRef.current = document.createElement('div');
+            containerRef.current.id = '';
+            hsContainerRef.current.id = containerId;
+            containerRef.current.appendChild(hsContainerRef.current);
+        }
+        if (!createDOMElement || hsContainerRef.current) {
             if (window.hbspt) {
                 window.hbspt.forms.create({
                     region,
@@ -21,8 +26,21 @@ const HubspotFormContainer = (props) => {
                     formInstanceId,
                 });
             }
+        }
+    };
+    useMount(() => {
+        (async () => {
+            if (!window.hbspt) {
+                await loadHubspotScript();
+            }
+            createForm();
         })();
+        return () => {
+            if (createDOMElement && containerRef.current && containerRef.current.lastChild) {
+                containerRef.current.removeChild(containerRef.current.lastChild);
+            }
+        };
     });
-    return React.createElement("div", { className: className, id: containerId });
+    return React.createElement("div", { className: className, id: containerId, ref: containerRef });
 };
 export default HubspotFormContainer;

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

@@ -12,7 +12,7 @@ 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
-    analyticsEvents, onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, } = props;
+    analyticsEvents, onBeforeSubmit, onSubmit, onBeforeLoad, onLoad, createDOMElement, onSubmitError, } = props;
     const handleMetrika = useMetrika();
     const context = useContext(BlockPositionContext);
     const defaultEvent = useMemo(() => ({
@@ -29,6 +29,7 @@ const HubspotForm = (props) => {
         onBeforeLoad,
         onBeforeSubmit,
         onLoad,
+        onSubmitError,
         onSubmit: (e) => {
             handleMetrika === null || handleMetrika === void 0 ? void 0 : handleMetrika({ pixelEvents });
             handleAnalytics(analyticsEvents);
@@ -43,8 +44,9 @@ const HubspotForm = (props) => {
         handleAnalytics,
         analyticsEvents,
         onSubmit,
+        onSubmitError,
     ]);
     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 }));
+    return (React.createElement(HubspotFormContainer, { createDOMElement: createDOMElement, key: [formClassName, formId, formInstanceId, portalId, region].join(), className: b({ theme, mobile }, className), formClassName: formClassName, formId: formId, portalId: portalId, formInstanceId: formInstanceId, region: region }));
 };
 export default HubspotForm;

package/build/esm/sub-blocks/LayoutItem/LayoutItem.css

@@ -0,0 +1,16 @@
+/* use this for style redefinitions to awoid problems with
+unpredictable css rules order in build */
+.pc-layout-item__media {
+  width: 100%;
+  display: block;
+  border-radius: var(--pc-border-radius);
+}
+.pc-layout-item__media_border {
+  border: 1px solid var(--yc-color-line-generic);
+}
+.pc-layout-item__meta-info {
+  margin: 16px 0 -8px 0;
+}
+.pc-layout-item__content {
+  margin: 16px 16px 0 0;
+}

package/build/esm/sub-blocks/LayoutItem/LayoutItem.d.ts

@@ -0,0 +1,4 @@
+import { LayoutItemProps } from '../../models';
+import './LayoutItem.css';
+declare const LayoutItem: ({ content: { links, ...content }, metaInfo, media, border, fullScreen, className, }: LayoutItemProps) => JSX.Element;
+export default LayoutItem;

package/build/esm/sub-blocks/LayoutItem/LayoutItem.js

@@ -0,0 +1,20 @@
+import { __rest } from "tslib";
+import React from 'react';
+import { block } from '../../utils';
+import { FullScreenMedia, Media, MetaInfo } from '../../components';
+import { getLayoutItemLinks, hasFullScreen, showFullScreenIcon } from './utils';
+import { Content } from '..';
+import './LayoutItem.css';
+const b = block('layout-item');
+const LayoutItem = (_a) => {
+    var _b = _a.content, { links } = _b, content = __rest(_b, ["links"]), { metaInfo, media, border, fullScreen, className } = _a;
+    return (React.createElement("div", { className: b(null, className) },
+        fullScreen && hasFullScreen(media) ? (React.createElement(FullScreenMedia, { showFullScreenIcon: showFullScreenIcon(media) }, (_a = {}) => {
+            var { className: mediaClassName } = _a, fullScreenMediaProps = __rest(_a, ["className"]);
+            return (React.createElement(Media, Object.assign({}, media, fullScreenMediaProps, { className: b('media', { border }, mediaClassName) })));
+        })) : (React.createElement(Media, Object.assign({}, media, { className: b('media', { border }) }))),
+        metaInfo && React.createElement(MetaInfo, { items: metaInfo, className: b('meta-info') }),
+        React.createElement("div", { className: b('content') },
+            React.createElement(Content, Object.assign({}, content, { links: getLayoutItemLinks(links), size: "s", colSizes: { all: 12, md: 12 } })))));
+};
+export default LayoutItem;

package/build/esm/sub-blocks/LayoutItem/schema.d.ts

@@ -0,0 +1,218 @@
+export declare const LayoutItem: {
+    type: string;
+    additionalProperties: boolean;
+    required: string[];
+    properties: {
+        media: {
+            color: {
+                type: string;
+            };
+            image: {
+                anyOf: ({
+                    oneOf: ({
+                        type: string;
+                        properties: {
+                            when: {
+                                type: string;
+                            };
+                        };
+                    } | {
+                        type: string;
+                        pattern: string;
+                    })[];
+                } | {
+                    type: string;
+                    items: {
+                        oneOf: ({
+                            type: string;
+                            properties: {
+                                when: {
+                                    type: string;
+                                };
+                            };
+                        } | {
+                            type: string;
+                            pattern: string;
+                        })[];
+                    };
+                })[];
+            };
+            video: {
+                type: string;
+                additionalProperties: boolean;
+                required: string[];
+                properties: {
+                    src: {
+                        type: string;
+                        items: {
+                            type: string;
+                        };
+                    };
+                    loop: {
+                        anyOf: ({
+                            type: string;
+                            additionalProperties: boolean;
+                            required: string[];
+                            properties: {
+                                start: {
+                                    type: string;
+                                };
+                                end: {
+                                    type: string;
+                                };
+                            };
+                        } | {
+                            type: string;
+                        })[];
+                    };
+                    type: {
+                        type: string;
+                        enum: string[];
+                    };
+                    muted: {
+                        type: string;
+                    };
+                    playing: {
+                        type: string;
+                    };
+                    elapsedTime: {
+                        type: string;
+                    };
+                    playIcon: {
+                        type: string;
+                        additionalProperties: boolean;
+                        properties: {
+                            type: {
+                                type: string;
+                                enum: string[];
+                            };
+                            theme: {
+                                type: string;
+                                enum: string[];
+                            };
+                            text: {
+                                type: string;
+                                contentType: string;
+                            };
+                        };
+                    };
+                    controls: {
+                        type: string;
+                        enum: string[];
+                    };
+                };
+            };
+            youtube: {
+                type: string;
+            };
+            parallax: {
+                type: string;
+            };
+            height: {
+                type: string;
+            };
+            previewImg: {
+                type: string;
+            };
+            dataLens: {
+                oneOf: ({
+                    type: string;
+                    additionalProperties: boolean;
+                    required: string[];
+                    properties: {
+                        id: {
+                            type: string;
+                        };
+                        theme: {
+                            type: string;
+                            enum: string[];
+                        };
+                    };
+                } | {
+                    type: string;
+                })[];
+            };
+        };
+        content: Partial<{
+            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;
+                    contentType: string;
+                })[];
+            };
+            text: {
+                type: string;
+                contentType: string;
+            };
+            additionalInfo: {
+                type: string;
+                contentType: string;
+            };
+            size: {
+                type: string;
+                enum: string[];
+            };
+            links: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        when: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+            buttons: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        when: {
+                            type: string;
+                        };
+                    };
+                };
+            };
+            theme: {
+                type: string;
+                enum: string[];
+            };
+        }>;
+        metaInfo: {
+            type: string;
+            items: {
+                type: string;
+                contentType: string;
+            };
+        };
+        border: {
+            type: string;
+        };
+        fullScreen: {
+            type: string;
+        };
+        type: {};
+        when: {};
+    };
+};

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

@@ -0,0 +1,14 @@
+import { omit } from 'lodash';
+import { BaseProps, MediaProps } from '../../schema/validators/common';
+import { ContentBase } from '../../sub-blocks/Content/schema';
+import metaInfo from '../../components/MetaInfo/schema';
+export const LayoutItem = {
+    type: 'object',
+    additionalProperties: false,
+    required: ['content', 'media'],
+    properties: Object.assign(Object.assign({}, BaseProps), { media: MediaProps, content: omit(ContentBase, ['colSize', 'size', 'centered']), metaInfo: metaInfo, border: {
+            type: 'boolean',
+        }, fullScreen: {
+            type: 'boolean',
+        } }),
+};

package/build/esm/sub-blocks/LayoutItem/utils.d.ts

@@ -0,0 +1,29 @@
+import { LayoutItemProps, LinkTheme, MediaProps } from '../../models';
+export declare const getLayoutItemLinks: (links: LayoutItemProps['content']['links']) => {
+    url: string;
+    text?: string | undefined;
+    textSize?: import("../../models").TextSize | undefined;
+    theme: LinkTheme;
+    colorTheme?: import("../../models").TextTheme | undefined;
+    arrow?: boolean | undefined;
+    target?: string | undefined;
+    metrikaGoals?: import("../../models").MetrikaGoal | undefined;
+    pixelEvents?: import("../../models").ButtonPixel | undefined;
+    context?: string | undefined;
+    analyticsEvents?: {
+        name: string;
+        type?: string | undefined;
+        counters?: import("../../models").AnalyticsCounters | undefined;
+        context?: string | undefined;
+        target?: string | undefined;
+    } | {
+        name: string;
+        type?: string | undefined;
+        counters?: import("../../models").AnalyticsCounters | undefined;
+        context?: string | undefined;
+        target?: string | undefined;
+    }[] | undefined;
+    className?: string | undefined;
+}[] | undefined;
+export declare const hasFullScreen: ({ dataLens, image }: MediaProps) => boolean;
+export declare const showFullScreenIcon: ({ youtube }: MediaProps) => boolean;

package/build/esm/sub-blocks/LayoutItem/utils.js

@@ -0,0 +1,6 @@
+export const getLayoutItemLinks = (links) => links === null || links === void 0 ? void 0 : links.map((link) => (Object.assign({ theme: 'normal' }, link)));
+export const hasFullScreen = ({ dataLens, image }) => {
+    // datalens and slider media card don't support fullScreen mode
+    return !(dataLens || Array.isArray(image));
+};
+export const showFullScreenIcon = ({ youtube }) => !youtube;

package/build/esm/sub-blocks/index.d.ts

@@ -7,6 +7,7 @@ export { default as MediaCard } from './MediaCard/MediaCard';
 export { default as BannerCard } from './BannerCard/BannerCard';
 export { default as TutorialCard } from './TutorialCard/TutorialCard';
 export { default as CardWithImage } from './CardWithImage/CardWithImage';
+export { default as LayoutItem } from './LayoutItem/LayoutItem';
 export { default as BackgroundCard } from './BackgroundCard/BackgroundCard';
 export { default as BasicCard } from './BasicCard/BasicCard';
 export { default as Content } from './Content/Content';

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

@@ -7,6 +7,7 @@ export { default as MediaCard } from './MediaCard/MediaCard';
 export { default as BannerCard } from './BannerCard/BannerCard';
 export { default as TutorialCard } from './TutorialCard/TutorialCard';
 export { default as CardWithImage } from './CardWithImage/CardWithImage';
+export { default as LayoutItem } from './LayoutItem/LayoutItem';
 export { default as BackgroundCard } from './BackgroundCard/BackgroundCard';
 export { default as BasicCard } from './BasicCard/BasicCard';
 export { default as Content } from './Content/Content';

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

@@ -138,6 +138,23 @@ const config = {
             transformer: typografTransformer,
         },
     ],
+    [SubBlockType.LayoutItem]: [
+        {
+            fields: ['content'],
+            parser: parseContentLayout,
+            transformer: yfmTransformer,
+        },
+        {
+            fields: ['content'],
+            parser: parseContentLayoutTitle,
+            transformer: typografTransformer,
+        },
+        {
+            fields: ['metaInfo'],
+            parser: createItemsParser([]),
+            transformer: typografTransformer,
+        },
+    ],
     [SubBlockType.Quote]: {
         fields: ['text'],
         transformer: typografTransformer,

package/build/esm/utils/hubspot.d.ts

@@ -1,4 +1,4 @@
-export type HubspotEventName = 'onBeforeFormInit' | 'onFormReady' | 'onFormSubmit' | 'onFormSubmitted' | `_${string}`;
+export type HubspotEventName = 'onBeforeFormInit' | 'onFormReady' | 'onFormSubmit' | 'onFormSubmitted' | 'onFormError' | `_${string}`;
 export interface HubspotEventData {
     type: HubspotEventName | string;
     eventName: HubspotEventName;
@@ -11,6 +11,7 @@ export interface HubspotEventHandlers {
     onBeforeSubmit?: (arg: HubspotEventData) => void;
     onSubmit?: (arg: HubspotEventData) => void;
     onLoad?: (arg: HubspotEventData) => void;
+    onSubmitError?: (arg: HubspotEventData) => void;
 }
 export declare function loopBackHabspotEvents(formId: string): ({ data, source, origin }: MessageEvent) => void;
 export declare function handleHubspotEvents(handlers: HubspotEventHandlers, formId: string): ({ data }: MessageEvent) => void;

package/build/esm/utils/hubspot.js

@@ -20,7 +20,7 @@ export function loopBackHabspotEvents(formId) {
 }
 export function handleHubspotEvents(handlers, formId) {
     return ({ data }) => {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         if (!isHubspotEventData(data)) {
             return;
         }
@@ -44,6 +44,10 @@ export function handleHubspotEvents(handlers, formId) {
                 (_d = handlers.onSubmit) === null || _d === void 0 ? void 0 : _d.call(handlers, data);
                 break;
             }
+            case 'onFormError': {
+                (_e = handlers.onSubmitError) === null || _e === void 0 ? void 0 : _e.call(handlers, data);
+                break;
+            }
             default:
                 break;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.15.0-alpha.22",
+  "version": "1.15.0-alpha.23",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -56,7 +56,8 @@
     "react-waypoint": "^10.1.0",
     "sanitize-html": "^2.6.1",
     "snakecase-keys": "^5.1.0",
-    "typograf": "^6.14.0"
+    "typograf": "^6.14.0",
+    "uuid": "^9.0.0"
   },
   "peerDependencies": {
     "react": "^16.0.0 || ^17.0.0",
@@ -87,6 +88,8 @@
     "@types/react-slick": "^0.23.7",
     "@types/react-transition-group": "^4.4.4",
     "@types/sanitize-html": "^2.6.0",
+    "@types/uuid": "^9.0.0",
+    "es5-ext": "0.10.53",
     "eslint": "^7.32.0",
     "eslint-plugin-local": "./eslint-plugin-local",
     "eslint-plugin-testing-library": "^5.9.1",

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

@@ -174,6 +174,7 @@ export interface MediaComponentVideoProps extends AnalyticsEventsBase {
 export interface MediaComponentYoutubeProps {
     youtube: string;
     previewImg?: string;
+    fullScreen?: boolean;
 }
 export interface MediaComponentImageProps {
     image: ImageProps | ImageProps[] | ImageDeviceProps;
@@ -245,27 +246,10 @@ export interface TitleBaseProps {
     custom?: string | ReactNode;
     onClick?: () => void;
 }
-export interface CardData {
-    header?: CardHeader;
-    text?: string;
-    title?: string;
-    link?: LinkProps;
-    footer?: string;
-    url?: string;
-    service?: {
-        slug: string;
-        name: string;
-    };
-    links?: LinkProps[];
-}
 export type CardBorder = 'shadow' | 'line' | 'none';
 export interface CardBaseProps {
     border?: CardBorder;
 }
-export interface CardHeader {
-    title?: string;
-    image?: ImageProps;
-}
 export interface PriceDescriptionProps {
     title: string;
     detailedTitle?: string;