@gravity-ui/page-constructor 4.0.0-beta.0 → 4.0.0

package/build/cjs/sub-blocks/Quote/Quote.css

@@ -10,14 +10,14 @@ unpredictable css rules order in build */
   height: 100%;
   overflow-x: hidden;
   border-radius: var(--pc-border-radius);
-  background-color: var(--yc-color-base-float);
+  background-color: var(--g-color-base-float);
   transition: box-shadow 0.3s cubic-bezier(0.22, 0.61, 0.36, 1);
   display: flex;
   min-height: 400px;
   height: 100%;
 }
 .pc-quote_theme_dark {
-  color: var(--yc-color-text-light-primary);
+  color: var(--g-color-text-light-primary);
 }
 .pc-quote_theme_dark h1,
 .pc-quote_theme_dark h2,
@@ -26,10 +26,10 @@ unpredictable css rules order in build */
 .pc-quote_theme_dark h5,
 .pc-quote_theme_dark h6,
 .pc-quote_theme_dark .yfm {
-  color: var(--yc-color-text-light-primary);
+  color: var(--g-color-text-light-primary);
 }
 .pc-quote_border_line {
-  border: 1px solid var(--yc-color-line-generic);
+  border: 1px solid var(--g-color-line-generic);
 }
 .pc-quote_border_line, .pc-quote_border_none {
   cursor: default;
@@ -60,8 +60,8 @@ unpredictable css rules order in build */
 .pc-quote__content {
   margin-top: 24px;
   position: relative;
-  font-size: var(--yc-text-body-3-font-size);
-  line-height: var(--yc-text-body-3-line-height);
+  font-size: var(--g-text-body-3-font-size);
+  line-height: var(--g-text-body-3-line-height);
 }
 .pc-quote__content::before {
   position: absolute;
@@ -84,7 +84,7 @@ unpredictable css rules order in build */
   margin-top: 20px;
 }
 .pc-quote__author_theme_dark, .pc-quote_theme_dark {
-  color: var(--yc-color-text-light-primary);
+  color: var(--g-color-text-light-primary);
 }
 .pc-quote__author_theme_dark h1,
 .pc-quote__author_theme_dark h2,
@@ -99,7 +99,7 @@ unpredictable css rules order in build */
 .pc-quote_theme_dark h5,
 .pc-quote_theme_dark h6,
 .pc-quote_theme_dark .yfm {
-  color: var(--yc-color-text-light-primary);
+  color: var(--g-color-text-light-primary);
 }
 .pc-quote__author {
   max-width: calc(60% - 20px);
@@ -110,10 +110,10 @@ unpredictable css rules order in build */
   /* stylelint-enable declaration-no-important */
 }
 .pc-quote__link-button_theme_dark {
-  color: var(--yc-color-base-background) !important;
+  color: var(--g-color-base-background) !important;
 }
 .pc-quote__link-button_theme_dark:before {
-  border-color: var(--yc-color-base-background) !important;
+  border-color: var(--g-color-base-background) !important;
 }
 @media (max-width: 1081px) {
   .pc-quote__author-wrapper {

package/build/cjs/sub-blocks/Quote/Quote.js

@@ -5,14 +5,14 @@ const react_1 = tslib_1.__importStar(require("react"));
 const uikit_1 = require("@gravity-ui/uikit");
 const components_1 = require("../../components");
 const utils_1 = require("../../components/Media/Image/utils");
-const ThemeValueContext_1 = require("../../context/theme/ThemeValueContext");
+const theme_1 = require("../../context/theme");
 const hooks_1 = require("../../hooks");
 const models_1 = require("../../models");
 const utils_2 = require("../../utils");
 const b = (0, utils_2.block)('quote');
 const Quote = (props) => {
     const { theme: textTheme = 'light', color, image, border = 'shadow', text, logo, author, url, buttonText, } = props;
-    const { themeValue: theme } = (0, react_1.useContext)(ThemeValueContext_1.ThemeValueContext);
+    const theme = (0, theme_1.useTheme)();
     const imageThemed = (0, utils_2.getThemedValue)(image, theme);
     const imageData = (0, utils_1.getMediaImage)(imageThemed);
     const handleAnalytics = (0, hooks_1.useAnalytics)(models_1.DefaultEventNames.QuoteButton, url);

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

@@ -8,7 +8,7 @@ export declare const Quote: {
                 contentType: string;
             };
             image: {
-                oneOf: ({
+                oneOf: (({
                     oneOf: ({
                         type: string;
                         properties: {
@@ -19,12 +19,16 @@ export declare const Quote: {
                     } | {
                         type: string;
                         pattern: string;
+                        optionName: string;
                     })[];
-                } | {
+                } & {
+                    optionName: string;
+                }) | {
                     type: string;
                     additionalProperties: boolean;
                     required: import("../..").Theme[];
                     properties: {};
+                    optionName: string;
                 })[];
             };
             logo: {
@@ -36,7 +40,6 @@ export declare const Quote: {
             };
             url: {
                 type: string;
-                pattern: string;
             };
             buttonText: {
                 type: string;
@@ -68,7 +71,9 @@ export declare const Quote: {
                 };
             };
             type: {};
-            when: {};
+            when: {
+                type: string;
+            };
         };
     };
 };

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

@@ -12,12 +12,11 @@ exports.Quote = {
                 contentType: 'text',
             }, image: (0, common_1.withTheme)(schema_1.ImageProps), logo: {
                 type: 'string',
-                pattern: schema_1.urlPattern,
+                pattern: schema_1.imageUrlPattern,
             }, color: {
                 type: 'string',
             }, url: {
                 type: 'string',
-                pattern: schema_1.urlPattern,
             }, buttonText: {
                 type: 'string',
             }, theme: common_1.ThemeProps, author: common_1.authorItem }),

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

@@ -51,7 +51,7 @@ function parsePriceDetailedBlock(transformer, block) {
 }
 const parseContentLayout = (transformer, content) => {
     if (content) {
-        const { text, additionalInfo } = content;
+        const { text, additionalInfo, list } = content;
         /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
         if (text) {
             content.text = transformer(text);
@@ -59,6 +59,14 @@ const parseContentLayout = (transformer, content) => {
         if (additionalInfo) {
             content.additionalInfo = transformer(additionalInfo);
         }
+        if (list) {
+            content.list = list.map((item) => {
+                if (item === null || item === void 0 ? void 0 : item.text) {
+                    return Object.assign(Object.assign({}, item), { text: transformer(item.text) });
+                }
+                return item;
+            });
+        }
         /* eslint-enable no-not-accumulator-reassign/no-not-accumulator-reassign */
     }
     return content;
@@ -187,6 +195,11 @@ exports.config = {
             fields: ['title', 'additionalInfo'],
             transformer: common_1.yfmTransformer,
         },
+        {
+            fields: ['list'],
+            transformer: common_1.yfmTransformer,
+            parser: (0, common_1.createItemsParser)(['text']),
+        },
     ],
     [models_1.BlockType.MapBlock]: [
         ...exports.blockHeaderTransformer,
@@ -261,6 +274,11 @@ exports.config = {
             transformer: common_1.typografTransformer,
             parser: parseTitle,
         },
+        {
+            fields: ['list'],
+            transformer: common_1.yfmTransformer,
+            parser: (0, common_1.createItemsParser)(['text']),
+        },
     ],
     [models_1.BlockType.InfoBlock]: [
         {

package/build/cjs/text-transform/filter.d.ts

@@ -0,0 +1,20 @@
+import { ContentVariables } from './transformers';
+type WhenValue = string | boolean | undefined;
+type OrArray<T> = T | T[];
+type OrArrayRecord<T> = Record<string, OrArray<T>>;
+interface FilteredContentItem extends OrArrayRecord<FilteredContentItem> {
+}
+type FilteredContent = OrArray<FilteredContentItem>;
+type FilterableContentItem = FilteredContentItem & {
+    when: WhenValue;
+};
+export type FilterableContent = OrArray<FilterableContentItem>;
+/**
+ * Filters content recoursively by result of it's 'when' property evaluation applied to vars argument.
+ * e.g. property {..., when: 'someVar == "someValue"' } will be included in result only if vars.someVar === 'someValue'
+ * @param {FilterableContent} content
+ * @param {ContentVariables} vars
+ * @return {FilteredContent}
+ */
+export declare function filterContent(content: FilterableContent | FilteredContent, vars: ContentVariables): FilteredContent;
+export {};

package/build/cjs/text-transform/filter.js

@@ -0,0 +1,61 @@
+"use strict";
+/* eslint-disable no-param-reassign */
+/* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.filterContent = void 0;
+const tslib_1 = require("tslib");
+const evaluation_1 = tslib_1.__importDefault(require("@doc-tools/transform/lib/liquid/evaluation"));
+function filterItems(items, vars, propertyName) {
+    if (!Array.isArray(items)) {
+        throw new Error(`Error while filtering: items has invalid key '${propertyName}' equals ${JSON.stringify(items)}`);
+    }
+    return items.reduce((result, item) => {
+        const passedFiltration = checkWhenCondition(item.when, vars);
+        if (passedFiltration) {
+            const property = propertyName && item[propertyName];
+            if (property === undefined) {
+                result.push(item);
+            }
+            else {
+                const filteredProperty = filterItems(property, vars, propertyName);
+                if (filteredProperty.length !== 0) {
+                    result.push(Object.assign(Object.assign({}, item), { [propertyName]: filteredProperty }));
+                }
+            }
+        }
+        return result;
+    }, []);
+}
+function checkWhenCondition(whenValue, vars) {
+    return (whenValue === true ||
+        whenValue === undefined ||
+        (typeof whenValue === 'string' && (!whenValue || (0, evaluation_1.default)(whenValue, vars))));
+}
+function isItemArray(content) {
+    return Array.isArray(content);
+}
+function isItem(content) {
+    return content && typeof content === 'object' && !Array.isArray(content);
+}
+/**
+ * Filters content recoursively by result of it's 'when' property evaluation applied to vars argument.
+ * e.g. property {..., when: 'someVar == "someValue"' } will be included in result only if vars.someVar === 'someValue'
+ * @param {FilterableContent} content
+ * @param {ContentVariables} vars
+ * @return {FilteredContent}
+ */
+function filterContent(content, vars) {
+    if (isItemArray(content)) {
+        return filterItems(content, vars).map((item) => filterContent(item, vars));
+    }
+    else if (isItem(content)) {
+        return Object.entries(content).reduce((acc, [key, value]) => {
+            acc[key] = filterContent(value, vars);
+            return acc;
+        }, {});
+    }
+    else {
+        return content;
+    }
+}
+exports.filterContent = filterContent;

package/build/cjs/text-transform/index.d.ts

@@ -2,3 +2,4 @@ export * from './utils';
 export * from './config';
 export * from './common';
 export * from './transformers';
+export * from './filter';

package/build/cjs/text-transform/index.js

@@ -5,3 +5,4 @@ tslib_1.__exportStar(require("./utils"), exports);
 tslib_1.__exportStar(require("./config"), exports);
 tslib_1.__exportStar(require("./common"), exports);
 tslib_1.__exportStar(require("./transformers"), exports);
+tslib_1.__exportStar(require("./filter"), exports);

package/build/cjs/text-transform/transformers.d.ts

@@ -1,5 +1,6 @@
 import { ConstructorBlock } from '../models/constructor';
 import { Lang } from '../utils/configure';
+export type ContentVariables = Record<string, string>;
 export type ContentTransformerProps = {
     content: {
         blocks?: ConstructorBlock[];
@@ -7,6 +8,7 @@ export type ContentTransformerProps = {
     options: {
         lang: Lang;
         customConfig?: {};
+        vars?: ContentVariables;
     };
 };
 export declare const contentTransformer: ({ content, options }: ContentTransformerProps) => {

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

@@ -6,6 +6,7 @@ const tslib_1 = require("tslib");
 /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
 const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const config_1 = require("./config");
+const filter_1 = require("./filter");
 function transformBlocks(blocks, lang, customConfig = {}) {
     const fullConfig = Object.assign(Object.assign({}, config_1.config), customConfig);
     const clonedBlocks = lodash_1.default.cloneDeep(blocks);
@@ -46,8 +47,8 @@ function transformBlock(lang, blocksConfig, block) {
     return block;
 }
 const contentTransformer = ({ content, options }) => {
-    const { lang, customConfig = {} } = options;
-    const { blocks = [] } = content;
+    const { lang, customConfig = {}, vars } = options;
+    const { blocks = [] } = (vars ? (0, filter_1.filterContent)(content, vars) : content);
     const transformedBlocks = transformBlocks(blocks, lang, customConfig);
     return {
         blocks: transformedBlocks,

package/build/cjs/text-transform/utils.js

@@ -26,7 +26,12 @@ exports.DEFAULT_ALLOWED_TAGS = [
 ];
 exports.typografConfig = {
     enabled: ['common/nbsp/afterNumber', 'common/nbsp/afterParagraphMark'],
-    disabled: ['common/symbols/cf', 'ru/other/phone-number'],
+    disabled: [
+        'common/symbols/cf',
+        'ru/other/phone-number',
+        'common/space/afterColon',
+        'common/space/afterSemicolon',
+    ],
 };
 exports.sanitizeStripOptions = {
     allowedTags: [],

package/build/cjs/utils/blocks.d.ts

@@ -1,6 +1,7 @@
 import { Block, CustomConfig, PCShareSocialNetwork, TextSize } from '../models';
 import { ConstructorBlock } from '../models/constructor';
 export declare function getHeaderTag(size: TextSize): "h1" | "h2" | "h4" | "h5";
+export declare function hasBlockTag(content: string): boolean;
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
@@ -11,4 +12,3 @@ export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => stri
 export declare const getOrderedBlocks: (blocks: Block[], headerBlockTypes?: string[]) => Block[];
 export declare const getHeaderBlock: (blocks: Block[], headerBlockTypes?: string[]) => Block | undefined;
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
-export declare const getBlockIndexFromId: (blockId?: string) => number;

package/build/cjs/utils/blocks.js

@@ -1,7 +1,44 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getBlockIndexFromId = exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomHeaderTypes = exports.getCustomSubBlockTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.hasBlockTag = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
+const BLOCK_ELEMENTS = [
+    'div',
+    'p',
+    'h[1-6]',
+    'address',
+    'article',
+    'aside',
+    'blockquote',
+    'canvas',
+    'dd',
+    'dl',
+    'dt',
+    'fieldset',
+    'figcaption',
+    'footer',
+    'header',
+    'hr',
+    'main',
+    'nav',
+    'section',
+    'video',
+    'pre',
+    'figure',
+    'form',
+    'pre',
+    'ol',
+    'ul',
+    'li',
+    'table',
+    'thead',
+    'tbody',
+    'tfoot',
+    'tr',
+    'th',
+    'td',
+];
+const BLOCK_ELEMENTS_REGEX = `<(${BLOCK_ELEMENTS.join('|')})[^>]*>`;
 function getHeaderTag(size) {
     switch (size) {
         case 'l':
@@ -16,6 +53,11 @@ function getHeaderTag(size) {
     }
 }
 exports.getHeaderTag = getHeaderTag;
+function hasBlockTag(content) {
+    const regex = new RegExp(BLOCK_ELEMENTS_REGEX, 'g');
+    return regex.test(content);
+}
+exports.hasBlockTag = hasBlockTag;
 function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
@@ -83,5 +125,3 @@ const getShareLink = (url, type, title, text) => {
     }
 };
 exports.getShareLink = getShareLink;
-const getBlockIndexFromId = (blockId) => { var _a; return Number((_a = blockId === null || blockId === void 0 ? void 0 : blockId.split('-')) === null || _a === void 0 ? void 0 : _a.slice(-1).pop()); };
-exports.getBlockIndexFromId = getBlockIndexFromId;

package/build/cjs/utils/imageCompress.js

@@ -7,5 +7,5 @@ var AvailableForCompressExtension;
     AvailableForCompressExtension["JPG"] = "jpg";
     AvailableForCompressExtension["JPEG"] = "jpeg";
 })(AvailableForCompressExtension = exports.AvailableForCompressExtension || (exports.AvailableForCompressExtension = {}));
-const isCompressible = (fileName) => Object.keys(AvailableForCompressExtension).some((ext) => fileName.endsWith(`.${ext}`));
+const isCompressible = (fileName) => Object.values(AvailableForCompressExtension).some((ext) => fileName.toLowerCase().endsWith(`.${ext}`));
 exports.isCompressible = isCompressible;

package/build/cjs/utils/theme.d.ts

@@ -4,4 +4,4 @@ export interface ThemedValue<T> extends Partial<Record<string, T>> {
 }
 export type ThemeSupporting<T> = T | ThemedValue<T>;
 export declare function isThemedValue<T>(value: ThemeSupporting<T>): value is ThemedValue<T>;
-export declare function getThemedValue<T>(value: ThemeSupporting<T>, theme?: string): T;
+export declare function getThemedValue<T>(value: ThemeSupporting<T>, theme?: import("..").Theme): T;