@gravity-ui/page-constructor 1.11.1 → 1.12.1-alpha.0

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

@@ -5,6 +5,30 @@ export declare const CardWithImageItem: {
         image: {
             type: string;
         };
+        description: {
+            type: string;
+            contentType: string;
+        };
+        disableCompress: {
+            type: string;
+        };
+        border: {
+            type: string;
+        };
+        fullScreen: {
+            type: string;
+        };
+        links: {
+            type: string;
+            items: {
+                type: string;
+                properties: {
+                    when: {
+                        type: string;
+                    };
+                };
+            };
+        };
         title: {
             oneOf: ({
                 type: string;
@@ -13,6 +37,7 @@ export declare const CardWithImageItem: {
                 properties: {
                     text: {
                         type: string;
+                        contentType: string;
                     };
                     textSize: {
                         type: string;
@@ -27,33 +52,12 @@ export declare const CardWithImageItem: {
                 };
             } | {
                 type: string;
+                contentType: string;
             })[];
         };
-        description: {
-            type: string;
-        };
         additionalInfo: {
             type: string;
-        };
-        disableCompress: {
-            type: string;
-        };
-        border: {
-            type: string;
-        };
-        fullScreen: {
-            type: string;
-        };
-        links: {
-            type: string;
-            items: {
-                type: string;
-                properties: {
-                    when: {
-                        type: string;
-                    };
-                };
-            };
+            contentType: string;
         };
         buttons: {
             type: string;
@@ -78,6 +82,30 @@ export declare const CardWithImage: {
             image: {
                 type: string;
             };
+            description: {
+                type: string;
+                contentType: string;
+            };
+            disableCompress: {
+                type: string;
+            };
+            border: {
+                type: string;
+            };
+            fullScreen: {
+                type: string;
+            };
+            links: {
+                type: string;
+                items: {
+                    type: string;
+                    properties: {
+                        when: {
+                            type: string;
+                        };
+                    };
+                };
+            };
             title: {
                 oneOf: ({
                     type: string;
@@ -86,6 +114,7 @@ export declare const CardWithImage: {
                     properties: {
                         text: {
                             type: string;
+                            contentType: string;
                         };
                         textSize: {
                             type: string;
@@ -100,33 +129,12 @@ export declare const CardWithImage: {
                     };
                 } | {
                     type: string;
+                    contentType: string;
                 })[];
             };
-            description: {
-                type: string;
-            };
             additionalInfo: {
                 type: string;
-            };
-            disableCompress: {
-                type: string;
-            };
-            border: {
-                type: string;
-            };
-            fullScreen: {
-                type: string;
-            };
-            links: {
-                type: string;
-                items: {
-                    type: string;
-                    properties: {
-                        when: {
-                            type: string;
-                        };
-                    };
-                };
+                contentType: string;
             };
             buttons: {
                 type: string;

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

@@ -1,11 +1,15 @@
-import { BaseProps, textSize, ButtonBlock, TitleProps } from '../../schema/validators/common';
+import { omit } from 'lodash';
+import { BaseProps, textSize } from '../../schema/validators/common';
 import { filteredArray } from '../../schema/validators/utils';
+import { ContentBase } from '../../sub-blocks/Content/schema';
+const CardWithImageContentProps = omit(ContentBase, ['links', 'size', 'text', 'theme']);
 const CardWithImageLinks = {
     type: 'object',
     additionalProperties: false,
     required: ['title', 'link'],
     properties: Object.assign(Object.assign({}, BaseProps), { title: {
             type: 'string',
+            contentType: 'text',
         }, link: {
             type: 'string',
         }, arrow: {
@@ -21,21 +25,18 @@ const CardWithImageLinks = {
 export const CardWithImageItem = {
     additionalProperties: false,
     required: ['image'],
-    properties: Object.assign(Object.assign({}, BaseProps), { image: {
+    properties: Object.assign(Object.assign(Object.assign({}, BaseProps), CardWithImageContentProps), { image: {
             type: 'string',
-        }, title: {
-            oneOf: [{ type: 'string' }, TitleProps],
         }, description: {
             type: 'string',
-        }, additionalInfo: {
-            type: 'string',
+            contentType: 'yfm',
         }, disableCompress: {
             type: 'boolean',
         }, border: {
             type: 'boolean',
         }, fullScreen: {
             type: 'boolean',
-        }, links: filteredArray(CardWithImageLinks), buttons: filteredArray(ButtonBlock) }),
+        }, links: filteredArray(CardWithImageLinks) }),
 };
 export const CardWithImage = {
     'card-with-image': CardWithImageItem,

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

@@ -7,6 +7,7 @@ export declare const ContentBase: {
             properties: {
                 text: {
                     type: string;
+                    contentType: string;
                 };
                 textSize: {
                     type: string;
@@ -21,13 +22,16 @@ export declare const ContentBase: {
             };
         } | {
             type: string;
+            contentType: string;
         })[];
     };
     text: {
         type: string;
+        contentType: string;
     };
     additionalInfo: {
         type: string;
+        contentType: string;
     };
     size: {
         type: string;
@@ -76,6 +80,7 @@ export declare const ContentBlock: {
                     properties: {
                         text: {
                             type: string;
+                            contentType: string;
                         };
                         textSize: {
                             type: string;
@@ -90,13 +95,16 @@ export declare const ContentBlock: {
                     };
                 } | {
                     type: string;
+                    contentType: string;
                 })[];
             };
             text: {
                 type: string;
+                contentType: string;
             };
             additionalInfo: {
                 type: string;
+                contentType: string;
             };
             size: {
                 type: string;

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

@@ -2,13 +2,15 @@ import { containerSizesArray, contentSizes, contentThemes, LinkProps, sizeNumber
 import { filteredArray } from '../../schema/validators/utils';
 export const ContentBase = {
     title: {
-        oneOf: [{ type: 'string' }, TitleProps],
+        oneOf: [{ type: 'string', contentType: 'text' }, TitleProps],
     },
     text: {
         type: 'string',
+        contentType: 'yfm',
     },
     additionalInfo: {
         type: 'string',
+        contentType: 'yfm',
     },
     size: {
         type: 'string',

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

@@ -94,6 +94,7 @@ export declare const MediaCardBlock: {
                             };
                             text: {
                                 type: string;
+                                contentType: string;
                             };
                         };
                     };

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

@@ -5,6 +5,7 @@ export declare const NewsCard: {
         properties: {
             title: {
                 type: string;
+                contentType: string;
             };
             url: {
                 type: string;

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

@@ -5,6 +5,7 @@ export const NewsCard = {
         required: ['title', 'url', 'date'],
         properties: Object.assign(Object.assign({}, BaseProps), { title: {
                 type: 'string',
+                contentType: 'text',
             }, url: {
                 type: 'string',
             }, date: {

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

@@ -5,6 +5,7 @@ export declare const PartnerBlock: {
         properties: {
             text: {
                 type: string;
+                contentType: string;
             };
             logo: {
                 oneOf: ({

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

@@ -6,6 +6,7 @@ export const PartnerBlock = {
         required: ['text', 'logo', 'url'],
         properties: Object.assign(Object.assign({}, BaseProps), { text: {
                 type: 'string',
+                contentType: 'text',
             }, logo: ImageProps, url: {
                 type: 'string',
             } }),

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

@@ -66,6 +66,7 @@ export declare const PriceDetailedBlock: {
                 properties: {
                     title: {
                         type: string;
+                        contentType: string;
                     };
                     size: {
                         type: string;

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

@@ -19,6 +19,7 @@ const PriceDetailedFoldableDetailsProps = {
     properties: {
         title: {
             type: 'string',
+            contentType: 'text',
         },
         size: {
             type: 'string',
@@ -72,6 +73,7 @@ const PriceDescriptionLabelProps = {
         },
         text: {
             type: 'string',
+            contentType: 'text',
         },
         size: {
             type: 'string',
@@ -82,12 +84,15 @@ const PriceDescriptionLabelProps = {
 const PriceDescriptionProps = {
     title: {
         type: 'string',
+        contentType: 'text',
     },
     description: {
         type: 'string',
+        contentType: 'yfm',
     },
     detailedTitle: {
         type: 'string',
+        contentType: 'text',
     },
     label: PriceDescriptionLabelProps,
 };
@@ -98,9 +103,11 @@ const PriceDetailsSettingsProps = {
     properties: {
         title: {
             type: 'string',
+            contentType: 'text',
         },
         description: {
             type: 'string',
+            contentType: 'yfm',
         },
     },
 };
@@ -111,6 +118,7 @@ const PriceDetailsListProps = {
     properties: {
         text: {
             type: 'string',
+            contentType: 'yfm',
         },
     },
 };

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

@@ -5,6 +5,7 @@ export declare const Quote: {
         properties: {
             text: {
                 type: string;
+                contentType: string;
             };
             image: {
                 oneOf: ({
@@ -47,9 +48,11 @@ export declare const Quote: {
                 properties: {
                     firstName: {
                         type: string;
+                        contentType: string;
                     };
                     secondName: {
                         type: string;
+                        contentType: string;
                     };
                     avatar: {
                         type: string;
@@ -57,6 +60,7 @@ export declare const Quote: {
                     };
                     description: {
                         type: string;
+                        contentType: string;
                     };
                 };
             };

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

@@ -6,6 +6,7 @@ export const Quote = {
         required: ['text', 'image', 'logo'],
         properties: Object.assign(Object.assign({}, BaseProps), { text: {
                 type: 'string',
+                contentType: 'text',
             }, image: withTheme(ImageProps), logo: {
                 type: 'string',
                 pattern: urlPattern,

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

@@ -8,9 +8,11 @@ export declare const TutorialCard: {
             };
             title: {
                 type: string;
+                contentType: string;
             };
             text: {
                 type: string;
+                contentType: string;
             };
             icon: {
                 oneOf: ({

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

@@ -8,8 +8,10 @@ export const TutorialCard = {
                 type: 'string',
             }, title: {
                 type: 'string',
+                contentType: 'text',
             }, text: {
                 type: 'string',
+                contentType: 'text',
             }, icon: ImageProps }),
     },
 };

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,
@@ -295,7 +297,13 @@ const config = {
             fields: ['description'],
             transformer: yfmTransformer,
         },
+        {
+            fields: ['title'],
+            transformer: typografTransformer,
+            parser: parseTitle,
+        },
     ],
+    [BlockType.PromoFeaturesBlock]: blockHeaderTransfomer,
     [BlockType.InfoBlock]: [
         {
             fields: ['rightContent', 'leftContent'],
@@ -314,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.11.1",
+  "version": "1.12.1-alpha.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -66,7 +66,7 @@
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@doc-tools/transform": "^2.12.0",
+    "@doc-tools/transform": "2.12.0",
     "@gravity-ui/eslint-config": "^1.0.2",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^1.0.0",
@@ -103,7 +103,6 @@
     "lint-staged": "^11.2.6",
     "markdown-loader": "^6.0.0",
     "move-file-cli": "^3.0.0",
-    "mq-polyfill": "^1.1.8",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.16",
     "postcss-scss": "^4.0.4",

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

@@ -332,6 +332,7 @@ export interface AuthorProps {
     className?: string;
     authorContainerClassName?: string;
     type?: AuthorType;
+    dataQa?: string;
 }
 export interface BlockHeaderProps {
     title?: TitleProps | string;