@gravity-ui/page-constructor 6.0.0-alpha.3 → 6.0.0-alpha.5

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

@@ -1,27 +1,50 @@
 import defaultPlugins from '@diplodoc/transform/lib/plugins';
 import { fullTransform, typografToHTML } from './utils';
-export const createItemsParser = (fields) => (transformer, items) => items.map((item) => {
-    if (!item) {
-        return item;
-    }
-    else if (typeof item === 'string') {
-        return transformer(item);
-    }
-    else {
-        return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
-            if (item[fieldName]) {
-                // eslint-disable-next-line no-param-reassign
-                acc[fieldName] = transformer(item[fieldName]);
-            }
-            return acc;
-        }, {}));
-    }
-});
-export function yfmTransformer(lang, content, options = {}) {
+export const createItemsParser = (fields) => (transformer, items) => {
+    const applyTransform = (itemLocal) => typeof itemLocal === 'string' ? transformer(itemLocal) : itemLocal;
+    return items.map((item) => {
+        if (!item) {
+            return item;
+        }
+        else if (typeof item === 'string') {
+            return transformer(item);
+        }
+        else {
+            return Object.assign(Object.assign({}, item), fields.reduce((acc, fieldName) => {
+                if (fieldName.includes('.')) {
+                    const [firstProperty, secondProperty] = fieldName.split('.');
+                    const root = item[firstProperty];
+                    if (!root || typeof root !== 'object') {
+                        return acc;
+                    }
+                    if (Array.isArray(root)) {
+                        if (!acc[firstProperty]) {
+                            // eslint-disable-next-line no-param-reassign
+                            acc[firstProperty] = [];
+                        }
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = root.map((subItem) => (Object.assign(Object.assign({}, subItem), { [secondProperty]: applyTransform(subItem[secondProperty]) })));
+                    }
+                    else {
+                        // eslint-disable-next-line no-param-reassign
+                        acc[firstProperty] = Object.assign(Object.assign({}, root), { [secondProperty]: applyTransform(root[secondProperty]) });
+                    }
+                }
+                else if (item[fieldName]) {
+                    // eslint-disable-next-line no-param-reassign
+                    acc[fieldName] = applyTransform(item[fieldName]);
+                }
+                return acc;
+            }, {}));
+        }
+    });
+};
+export function yfmTransformer(lang, content, options = {}, renderInline = false) {
     const { plugins = [] } = options;
     const { html } = fullTransform(content, {
         lang,
         plugins: [...defaultPlugins, ...plugins],
+        renderInline,
     });
     return html;
 }

package/build/esm/text-transform/config.d.ts

@@ -1,8 +1,8 @@
 import { TitleItemProps } from '../models';
-import { Parser, Transformer, TransformerRaw, typografTransformer, yfmTransformer } from './common';
+import { Parser, Transformer, TransformerRaw, yfmTransformer } from './common';
 export declare const blockHeaderTransformer: ({
     fields: string[];
-    transformer: typeof typografTransformer;
+    transformer: typeof yfmTransformer;
     parser: (transformer: Transformer, title: TitleItemProps | string) => string | {
         text: string;
         navTitle?: string | undefined;
@@ -14,15 +14,18 @@ export declare const blockHeaderTransformer: ({
         custom?: import("react").ReactNode;
         onClick?: (() => void) | undefined;
     };
+    renderInline: boolean;
 } | {
     fields: string[];
     transformer: typeof yfmTransformer;
     parser?: undefined;
+    renderInline?: undefined;
 })[];
 interface BlockConfig {
     transformer: TransformerRaw;
     fields?: string[];
     parser?: Parser;
+    renderInline?: boolean;
 }
 export type BlocksConfig = Record<string, BlockConfig | BlockConfig[]>;
 export declare const config: BlocksConfig;

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

@@ -2,11 +2,27 @@
 /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
 import { __rest } from "tslib";
 import { BlockType, SubBlockType, } from '../models';
-import { createItemsParser, typografTransformer, yfmTransformer, } from './common';
-function parseTableBlock(transformer, content) {
+import { createItemsParser, yfmTransformer } from './common';
+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"]);
@@ -81,8 +97,9 @@ function parseContentLayoutTitle(transformer, content) {
 export const blockHeaderTransformer = [
     {
         fields: ['title'],
-        transformer: typografTransformer,
+        transformer: yfmTransformer,
         parser: parseTitle,
+        renderInline: true,
     },
     {
         fields: ['description'],
@@ -93,7 +110,8 @@ export const config = {
     [SubBlockType.BasicCard]: [
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['text', 'additionalInfo'],
@@ -102,22 +120,16 @@ export const config = {
     ],
     [SubBlockType.BackgroundCard]: [
         {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
+            renderInline: true,
         },
     ],
     [SubBlockType.ImageCard]: [
         {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: yfmTransformer,
-        },
-        {
-            fields: ['title'],
-            transformer: typografTransformer,
+            renderInline: true,
         },
     ],
     [SubBlockType.LayoutItem]: [
@@ -129,7 +141,8 @@ export const config = {
         {
             fields: ['content'],
             parser: parseContentLayoutTitle,
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['metaInfo'],
@@ -139,26 +152,30 @@ export const config = {
     ],
     [SubBlockType.Quote]: [
         {
-            fields: ['text'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['yfmText'],
+            fields: ['text', 'yfmText'],
             transformer: yfmTransformer,
+            renderInline: true,
         },
     ],
     [BlockType.ExtendedFeaturesBlock]: [
         ...blockHeaderTransformer,
         {
             fields: ['items'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: createItemsParser(['title']),
+            renderInline: true,
         },
         {
             fields: ['items'],
             transformer: yfmTransformer,
             parser: createItemsParser(['text', 'additionalInfo']),
         },
+        {
+            fields: ['items'],
+            transformer: yfmTransformer,
+            parser: createItemsParser(['list.text']),
+            renderInline: true,
+        },
     ],
     [BlockType.PromoFeaturesBlock]: [
         ...blockHeaderTransformer,
@@ -169,15 +186,13 @@ export const config = {
         },
     ],
     [BlockType.SliderOldBlock]: blockHeaderTransformer,
+    [BlockType.SliderBlock]: blockHeaderTransformer,
     [BlockType.CompaniesBlock]: blockHeaderTransformer,
     [BlockType.QuestionsBlock]: [
         {
-            fields: ['title'],
-            transformer: typografTransformer,
-        },
-        {
-            fields: ['text', 'additionalInfo'],
+            fields: ['title', 'text', 'additionalInfo'],
             transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['items'],
@@ -188,7 +203,8 @@ export const config = {
     [BlockType.BannerBlock]: [
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['subtitle'],
@@ -198,7 +214,8 @@ export const config = {
     [SubBlockType.BannerCard]: [
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['subtitle'],
@@ -208,7 +225,7 @@ export const config = {
     [BlockType.MediaBlock]: [
         ...blockHeaderTransformer,
         {
-            fields: ['title', 'additionalInfo'],
+            fields: ['additionalInfo'],
             transformer: yfmTransformer,
         },
         {
@@ -233,27 +250,35 @@ export const config = {
         },
         {
             fields: ['items'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: parseItemsTitle,
+            renderInline: true,
         },
     ],
     [BlockType.TableBlock]: [
+        {
+            fields: ['title'],
+            transformer: yfmTransformer,
+            renderInline: true,
+        },
         {
             fields: ['table'],
             transformer: yfmTransformer,
-            parser: parseTableBlock,
+            parser: parseTableBlockLegend,
         },
-    ],
-    [BlockType.HeaderSliderBlock]: [
         {
-            fields: ['items'],
-            transformer: typografTransformer,
-            parser: createItemsParser(['title', 'overtitle']),
+            fields: ['table'],
+            transformer: yfmTransformer,
+            parser: parseTableBlockContent,
+            renderInline: true,
         },
+    ],
+    [BlockType.HeaderSliderBlock]: [
         {
             fields: ['items'],
             transformer: yfmTransformer,
-            parser: createItemsParser(['description']),
+            parser: createItemsParser(['title', 'overtitle', 'description']),
+            renderInline: true,
         },
     ],
     [SubBlockType.PriceDetailed]: [
@@ -267,6 +292,11 @@ export const config = {
             fields: ['description'],
             transformer: yfmTransformer,
         },
+        {
+            fields: ['overtitle', 'title'],
+            transformer: yfmTransformer,
+            renderInline: true,
+        },
     ],
     [BlockType.ContentLayoutBlock]: [
         {
@@ -276,8 +306,9 @@ export const config = {
         },
         {
             fields: ['textContent'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
     [SubBlockType.Content]: [
@@ -287,8 +318,9 @@ export const config = {
         },
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: parseTitle,
+            renderInline: true,
         },
         {
             fields: ['list'],
@@ -297,6 +329,11 @@ export const config = {
         },
     ],
     [BlockType.InfoBlock]: [
+        {
+            fields: ['title'],
+            transformer: yfmTransformer,
+            renderInline: true,
+        },
         {
             fields: ['rightContent', 'leftContent'],
             transformer: yfmTransformer,
@@ -304,14 +341,16 @@ export const config = {
         },
         {
             fields: ['rightContent', 'leftContent'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
     [BlockType.ShareBlock]: [
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
     ],
     [BlockType.CardLayoutBlock]: blockHeaderTransformer,
@@ -320,12 +359,13 @@ export const config = {
     [SubBlockType.PriceCard]: [
         {
             fields: ['title'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
+            renderInline: true,
         },
         {
             fields: ['list'],
             transformer: yfmTransformer,
-            parser: createItemsParser(['text']),
+            parser: createItemsParser(['title', 'text']),
         },
     ],
     [BlockType.FormBlock]: [
@@ -336,8 +376,9 @@ export const config = {
         },
         {
             fields: ['textContent'],
-            transformer: typografTransformer,
+            transformer: yfmTransformer,
             parser: parseContentLayoutTitle,
+            renderInline: true,
         },
     ],
 };

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

@@ -18,10 +18,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/package.json

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