@gravity-ui/page-constructor 6.2.0-beta.1 → 7.0.0-beta.2

package/server/text-transform/config.js

@@ -16,10 +16,26 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.config = exports.blockHeaderTransformer = void 0;
 const models_1 = require("../models");
 const common_1 = require("./common");
-function parseTableBlock(transformer, content) {
+function parseTableBlockLegend(transformer, content) {
     const legend = content === null || content === void 0 ? void 0 : content.legend;
     return Object.assign(Object.assign({}, (content || {})), { legend: legend && legend.map((string) => transformer(string)) });
 }
+function parseTableBlockContent(transformer, content) {
+    const legend = content === null || content === void 0 ? void 0 : content.legend;
+    const tableContent = content === null || content === void 0 ? void 0 : content.content;
+    return Object.assign(Object.assign({}, (content || {})), { content: tableContent &&
+            tableContent.map((row, i) => row.map((cell, j) => {
+                if (legend) {
+                    if (i === 0 || j === 0) {
+                        return transformer(cell);
+                    }
+                    return cell;
+                }
+                else {
+                    return transformer(cell);
+                }
+            })) });
+}
 function parseFeatures(transformer, items) {
     return items.map((_a) => {
         var { title, text } = _a, rest = __rest(_a, ["title", "text"]);
@@ -94,8 +110,9 @@ function parseContentLayoutTitle(transformer, content) {
 exports.blockHeaderTransformer = [
     {
         fields: ['title'],
-        transformer: common_1.typografTransformer,
+        transformer: common_1.yfmTransformer,
         parser: parseTitle,
+        renderInline: true,
     },
     {
         fields: ['description'],
@@ -106,7 +123,8 @@ exports.config = {
     [models_1.SubBlockType.BasicCard]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['text', 'additionalInfo'],
@@ -115,22 +133,16 @@ exports.config = {
     ],
     [models_1.SubBlockType.BackgroundCard]: [
         {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: common_1.yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: common_1.typografTransformer,
+            renderInline: true,
         },
     ],
     [models_1.SubBlockType.ImageCard]: [
         {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: common_1.yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: common_1.typografTransformer,
+            renderInline: true,
         },
     ],
     [models_1.SubBlockType.LayoutItem]: [
@@ -142,7 +154,8 @@ exports.config = {
         {
             fields: ['content'],
             parser: parseContentLayoutTitle,
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['metaInfo'],
@@ -152,26 +165,30 @@ exports.config = {
     ],
     [models_1.SubBlockType.Quote]: [
         {
-            fields: ['text'],
-            transformer: common_1.typografTransformer,
-        },
-        {
-            fields: ['yfmText'],
+            fields: ['text', 'yfmText'],
             transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.ExtendedFeaturesBlock]: [
         ...exports.blockHeaderTransformer,
         {
             fields: ['items'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: (0, common_1.createItemsParser)(['title']),
+            renderInline: true,
         },
         {
             fields: ['items'],
             transformer: common_1.yfmTransformer,
             parser: (0, common_1.createItemsParser)(['text', 'additionalInfo']),
         },
+        {
+            fields: ['items'],
+            transformer: common_1.yfmTransformer,
+            parser: (0, common_1.createItemsParser)(['list.text']),
+            renderInline: true,
+        },
     ],
     [models_1.BlockType.PromoFeaturesBlock]: [
         ...exports.blockHeaderTransformer,
@@ -181,16 +198,14 @@ exports.config = {
             parser: parsePromoFeatures,
         },
     ],
+    [models_1.BlockType.SliderOldBlock]: exports.blockHeaderTransformer,
     [models_1.BlockType.SliderBlock]: exports.blockHeaderTransformer,
     [models_1.BlockType.CompaniesBlock]: exports.blockHeaderTransformer,
     [models_1.BlockType.QuestionsBlock]: [
         {
-            fields: ['title'],
-            transformer: common_1.typografTransformer,
-        },
-        {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['items'],
@@ -201,7 +216,8 @@ exports.config = {
     [models_1.BlockType.BannerBlock]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['subtitle'],
@@ -211,7 +227,8 @@ exports.config = {
     [models_1.SubBlockType.BannerCard]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['subtitle'],
@@ -221,7 +238,7 @@ exports.config = {
     [models_1.BlockType.MediaBlock]: [
         ...exports.blockHeaderTransformer,
         {
-            fields: ['title', 'additionalInfo'],
+            fields: ['additionalInfo'],
             transformer: common_1.yfmTransformer,
         },
         {
@@ -246,27 +263,35 @@ exports.config = {
         },
         {
             fields: ['items'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: parseItemsTitle,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.TableBlock]: [
+        {
+            fields: ['title'],
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
+        },
         {
             fields: ['table'],
             transformer: common_1.yfmTransformer,
-            parser: parseTableBlock,
+            parser: parseTableBlockLegend,
         },
-    ],
-    [models_1.BlockType.HeaderSliderBlock]: [
         {
-            fields: ['items'],
-            transformer: common_1.typografTransformer,
-            parser: (0, common_1.createItemsParser)(['title', 'overtitle']),
+            fields: ['table'],
+            transformer: common_1.yfmTransformer,
+            parser: parseTableBlockContent,
+            renderInline: true,
         },
+    ],
+    [models_1.BlockType.HeaderSliderBlock]: [
         {
             fields: ['items'],
             transformer: common_1.yfmTransformer,
-            parser: (0, common_1.createItemsParser)(['description']),
+            parser: (0, common_1.createItemsParser)(['title', 'overtitle', 'description']),
+            renderInline: true,
         },
     ],
     [models_1.SubBlockType.PriceDetailed]: [
@@ -280,6 +305,11 @@ exports.config = {
             fields: ['description'],
             transformer: common_1.yfmTransformer,
         },
+        {
+            fields: ['overtitle', 'title'],
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
+        },
     ],
     [models_1.BlockType.ContentLayoutBlock]: [
         {
@@ -289,8 +319,9 @@ exports.config = {
         },
         {
             fields: ['textContent'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
     [models_1.SubBlockType.Content]: [
@@ -300,8 +331,9 @@ exports.config = {
         },
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: parseTitle,
+            renderInline: true,
         },
         {
             fields: ['list'],
@@ -310,6 +342,11 @@ exports.config = {
         },
     ],
     [models_1.BlockType.InfoBlock]: [
+        {
+            fields: ['title'],
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
+        },
         {
             fields: ['rightContent', 'leftContent'],
             transformer: common_1.yfmTransformer,
@@ -317,14 +354,16 @@ exports.config = {
         },
         {
             fields: ['rightContent', 'leftContent'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.ShareBlock]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
     ],
     [models_1.BlockType.CardLayoutBlock]: exports.blockHeaderTransformer,
@@ -333,12 +372,13 @@ exports.config = {
     [models_1.SubBlockType.PriceCard]: [
         {
             fields: ['title'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['list'],
             transformer: common_1.yfmTransformer,
-            parser: (0, common_1.createItemsParser)(['text']),
+            parser: (0, common_1.createItemsParser)(['title', 'text']),
         },
     ],
     [models_1.BlockType.FormBlock]: [
@@ -349,8 +389,9 @@ exports.config = {
         },
         {
             fields: ['textContent'],
-            transformer: common_1.typografTransformer,
+            transformer: common_1.yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
 };

package/server/text-transform/transformers.js

@@ -24,10 +24,10 @@ function transformBlock(lang, blocksConfig, block, plugins) {
     if (blockConfig) {
         const configs = Array.isArray(blockConfig) ? blockConfig : [blockConfig];
         configs.forEach((transformConfig) => {
-            const { fields, transformer: transformerRaw, parser } = transformConfig;
+            const { fields, transformer: transformerRaw, parser, renderInline } = transformConfig;
             const transformer = (content) => 
             // eslint-disable-next-line no-useless-call
-            transformerRaw.call(null, lang, content, { plugins });
+            transformerRaw.call(null, lang, content, { plugins, renderInline });
             if (fields) {
                 fields.forEach((field) => {
                     if (block[field]) {

package/server/utils/blocks.d.ts

@@ -1,6 +1,13 @@
-import { ConstructorBlock, CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
+import * as React from 'react';
+import { ConstructorBlock, CustomConfig, PCShareSocialNetwork, TagName, TextSize } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h3" | "h4" | "h2";
-export declare function hasBlockTag(content: string): boolean;
+type SelectVariantArgs = {
+    block?: boolean;
+    content?: string;
+    children?: React.ReactNode;
+    tagName?: TagName;
+};
+export declare function selectTagName({ content, children, tagName }: SelectVariantArgs): string;
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
 export declare const getCustomItems: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => {};
 export declare const getCustomTypes: (types: (keyof CustomConfig)[], customBlocks?: CustomConfig) => string[];
@@ -8,3 +15,4 @@ export declare const getOrderedBlocks: (blocks: ConstructorBlock[], headerBlockT
 export declare const getHeaderBlock: (blocks: ConstructorBlock[], headerBlockTypes?: string[]) => ConstructorBlock | undefined;
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
 export declare const getQaAttrubutes: (qa?: string, ...customKeys: (string | Array<string>)[]) => Record<string, string>;
+export {};

package/server/utils/blocks.js

@@ -5,7 +5,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQaAttrubutes = exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomTypes = exports.getCustomItems = void 0;
 exports.getHeaderTag = getHeaderTag;
-exports.hasBlockTag = hasBlockTag;
+exports.selectTagName = selectTagName;
 exports.getBlockKey = getBlockKey;
 const camelCase_1 = __importDefault(require("lodash/camelCase"));
 const flatten_1 = __importDefault(require("lodash/flatten"));
@@ -62,9 +62,15 @@ function getHeaderTag(size) {
             return 'h2';
     }
 }
-function hasBlockTag(content) {
+function selectTagName({ content, children, tagName }) {
+    if (!children && tagName) {
+        return tagName;
+    }
+    if (!content) {
+        return 'span';
+    }
     const regex = new RegExp(BLOCK_ELEMENTS_REGEX, 'g');
-    return regex.test(content);
+    return regex.test(content) ? 'div' : 'span';
 }
 function getBlockKey(block, index) {
     return `${block.type}-${index}`;

package/styles/fonts.scss

@@ -0,0 +1 @@
+@import '@gravity-ui/uikit/styles/fonts.css';

package/styles/styles.css

@@ -1,5 +1,4 @@
 @charset "UTF-8";
-@import '@gravity-ui/uikit/styles/fonts.css';
 @import '~@gravity-ui/uikit/styles/styles.css';
 @import '~@diplodoc/transform/dist/css/yfm.css';
 /* use this for style redefinitions to awoid problems with

package/styles/styles.scss

@@ -1,4 +1,3 @@
-@import '@gravity-ui/uikit/styles/fonts.css';
 @import '~@gravity-ui/uikit/styles/styles.css';
 @import './mixins.scss';
 @import './variables.scss';

package/styles/variables.scss

@@ -57,3 +57,4 @@ $gridGutterMobile: 8px;
 $contentWidth: calc(#{$newContentWidth} + #{$gridGutter} * 2 + #{$gridContainerPadding} * 2);
 
 $gridContainerMargin: 16px;
+$fullscreenImageMobilePadding: 8px;

package/build/cjs/blocks/SliderNew/Arrow/Arrow.d.ts

@@ -1,11 +0,0 @@
-import * as React from 'react';
-import { ClassNameProps } from "../../../models/index.js";
-export type ArrowType = 'left' | 'right';
-export interface ArrowProps {
-    type: ArrowType;
-    onClick?: () => void;
-    size?: number;
-    extraProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;
-}
-declare const Arrow: ({ type, onClick, className, size, extraProps }: ArrowProps & ClassNameProps) => import("react/jsx-runtime").JSX.Element;
-export default Arrow;

package/build/cjs/blocks/SliderNew/Arrow/Arrow.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const jsx_runtime_1 = require("react/jsx-runtime");
-const ToggleArrow_1 = tslib_1.__importDefault(require("../../../components/ToggleArrow/ToggleArrow.js"));
-const utils_1 = require("../../../utils/index.js");
-const i18n_1 = require("../i18n/index.js");
-const b = (0, utils_1.block)('slider-new-block-arrow');
-const Arrow = ({ type, onClick, className, size = 16, extraProps }) => ((0, jsx_runtime_1.jsx)("div", { className: b({ type }, className), children: (0, jsx_runtime_1.jsx)("button", { className: b('button'), onClick: onClick, "aria-label": (0, i18n_1.i18n)(`arrow-${type}`), ...extraProps, children: (0, jsx_runtime_1.jsx)("span", { className: b('icon-wrapper'), children: (0, jsx_runtime_1.jsx)(ToggleArrow_1.default, { size: size, type: 'horizontal', iconType: "navigation", className: b('icon') }) }) }) }));
-exports.default = Arrow;
-//# sourceMappingURL=Arrow.js.map

package/build/cjs/blocks/SliderNew/Arrow/Arrow.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Arrow.js","sourceRoot":"../../../../../src","sources":["blocks/SliderNew/Arrow/Arrow.tsx"],"names":[],"mappings":";;;;AAEA,yGAAsE;AAEtE,mDAAqC;AACrC,2CAA6B;AAI7B,MAAM,CAAC,GAAG,IAAA,aAAK,EAAC,wBAAwB,CAAC,CAAC;AAW1C,MAAM,KAAK,GAAG,CAAC,EAAC,IAAI,EAAE,OAAO,EAAE,SAAS,EAAE,IAAI,GAAG,EAAE,EAAE,UAAU,EAA8B,EAAE,EAAE,CAAC,CAC9F,gCAAK,SAAS,EAAE,CAAC,CAAC,EAAC,IAAI,EAAC,EAAE,SAAS,CAAC,YAChC,mCACI,SAAS,EAAE,CAAC,CAAC,QAAQ,CAAC,EACtB,OAAO,EAAE,OAAO,gBACJ,IAAA,WAAI,EAAC,SAAS,IAAI,EAAE,CAAC,KAC7B,UAAU,YAEd,iCAAM,SAAS,EAAE,CAAC,CAAC,cAAc,CAAC,YAC9B,uBAAC,qBAAW,IACR,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,YAAY,EAClB,QAAQ,EAAC,YAAY,EACrB,SAAS,EAAE,CAAC,CAAC,MAAM,CAAC,GACtB,GACC,GACF,GACP,CACT,CAAC;AAEF,kBAAe,KAAK,CAAC","sourcesContent":["import * as React from 'react';\n\nimport ToggleArrow from '../../../components/ToggleArrow/ToggleArrow';\nimport {ClassNameProps} from '../../../models';\nimport {block} from '../../../utils';\nimport {i18n} from '../i18n';\n\nimport './Arrow.scss';\n\nconst b = block('slider-new-block-arrow');\n\nexport type ArrowType = 'left' | 'right';\n\nexport interface ArrowProps {\n    type: ArrowType;\n    onClick?: () => void;\n    size?: number;\n    extraProps?: React.ButtonHTMLAttributes<HTMLButtonElement>;\n}\n\nconst Arrow = ({type, onClick, className, size = 16, extraProps}: ArrowProps & ClassNameProps) => (\n    <div className={b({type}, className)}>\n        <button\n            className={b('button')}\n            onClick={onClick}\n            aria-label={i18n(`arrow-${type}`)}\n            {...extraProps}\n        >\n            <span className={b('icon-wrapper')}>\n                <ToggleArrow\n                    size={size}\n                    type={'horizontal'}\n                    iconType=\"navigation\"\n                    className={b('icon')}\n                />\n            </span>\n        </button>\n    </div>\n);\n\nexport default Arrow;\n"]}