@gravity-ui/page-constructor 4.15.1-alpha.0 → 4.15.2

package/build/esm/components/Map/YMap/YandexMap.js

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useEffect, useRef, useState } from 'react';
 import { Spin } from '@gravity-ui/uikit';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import { LocaleContext } from '../../../context/localeContext/localeContext';
 import { MapsContext } from '../../../context/mapsContext/mapsContext';
 import { MobileContext } from '../../../context/mobileContext';
@@ -47,7 +47,7 @@ const YandexMap = (props) => {
         })();
     }, [apiKey, lang, scriptSrc, containerId, zoom, nonce, attemptsIndex, setLoading]);
     useEffect(() => {
-        const updateSize = _.debounce(() => {
+        const updateSize = debounce(() => {
             if (ref.current) {
                 setHeight(Math.round(getMapHeight(ref.current.offsetWidth, isMobile)));
             }

package/build/esm/components/Media/Image/Image.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import { animated, config, useSpring } from 'react-spring';
 import SliderBlock from '../../../blocks/Slider/Slider';
 import { SliderType } from '../../../models';
@@ -23,7 +23,7 @@ const Image = (props) => {
     useEffect(() => {
         if (parallax) {
             const handleScroll = () => setScrollY(window.scrollY);
-            const debouncedHandler = _.debounce(handleScroll, 5);
+            const debouncedHandler = debounce(handleScroll, 5);
             window.addEventListener('scroll', debouncedHandler, { passive: true });
             return () => window.removeEventListener('scroll', debouncedHandler);
         }

package/build/esm/components/OverflowScroller/OverflowScroller.js

@@ -1,5 +1,5 @@
 import React, { createRef } from 'react';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import { ToggleArrow } from '..';
 import { block } from '../../utils';
 import './OverflowScroller.css';
@@ -17,7 +17,7 @@ export default class OverflowScroller extends React.Component {
         this.containerRef = createRef();
         this.wrapperRef = createRef();
         // eslint-disable-next-line @typescript-eslint/member-ordering, react/sort-comp
-        this.checkOverflow = _.debounce(() => {
+        this.checkOverflow = debounce(() => {
             if (this.containerRef &&
                 this.containerRef.current &&
                 this.wrapperRef &&

package/build/esm/components/ReactPlayer/ReactPlayer.js

@@ -1,6 +1,6 @@
 import React, { Fragment, useCallback, useContext, useEffect, useImperativeHandle, useMemo, useRef, useState, } from 'react';
 import { Icon } from '@gravity-ui/uikit';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import ReactPlayer from 'react-player';
 import { MetrikaContext } from '../../context/metrikaContext';
 import { MobileContext } from '../../context/mobileContext';
@@ -75,7 +75,7 @@ export const ReactPlayerBlock = React.forwardRef((props, originRef) => {
         }
     }, [elapsedTime, playerRef, started]);
     useEffect(() => {
-        const updateSize = _.debounce(() => {
+        const updateSize = debounce(() => {
             if (ref.current) {
                 // We need to get parent's width does not equal 0
                 const parentElement = getParentElement(ref.current);

package/build/esm/containers/PageConstructor/components/ConstructorBlock/ConstructorBlock.js

@@ -1,5 +1,5 @@
 import React, { useMemo } from 'react';
-import _ from 'lodash';
+import pick from 'lodash/pick';
 import BlockBase from '../../../../components/BlockBase/BlockBase';
 import { BlockDecoration } from '../../../../customization/BlockDecoration';
 import { block } from '../../../../utils';
@@ -7,7 +7,7 @@ import './ConstructorBlock.css';
 const b = block('constructor-block');
 export const ConstructorBlock = ({ index = 0, data, children, }) => {
     const { type, indent } = data;
-    const blockBaseProps = useMemo(() => _.pick(data, ['anchor', 'visible', 'resetPaddings']), [data]);
+    const blockBaseProps = useMemo(() => pick(data, ['anchor', 'visible', 'resetPaddings']), [data]);
     const { top, bottom } = indent || { top: 'l', bottom: 'l' };
     return (React.createElement(BlockDecoration, Object.assign({ type: type, index: index }, blockBaseProps),
         React.createElement(BlockBase, Object.assign({ className: b({ type, indentTop: top, indentBottom: bottom }) }, blockBaseProps), children)));

package/build/esm/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.js

@@ -1,5 +1,5 @@
 import React, { Fragment, useContext } from 'react';
-import _ from 'lodash';
+import get from 'lodash/get';
 import { InnerContext } from '../../../../context/innerContext';
 import { BlockDecoration } from '../../../../customization/BlockDecoration';
 import { getBlockKey } from '../../../../utils';
@@ -20,7 +20,7 @@ export const ConstructorBlocks = ({ items }) => {
         }
         if ('loadable' in item && item.loadable) {
             const { source, serviceId, params } = item.loadable;
-            const config = _.get(loadables, source);
+            const config = get(loadables, source);
             if (!config) {
                 return null;
             }

package/build/esm/editor/components/BlockForm/BlockForm.js

@@ -1,7 +1,8 @@
 import { __rest } from "tslib";
 import React, { Fragment, memo, useMemo } from 'react';
 import { DynamicField, SimpleVerticalAccordeon } from '@gravity-ui/dynamic-forms';
-import _ from 'lodash';
+import isEqual from 'lodash/isEqual';
+import noop from 'lodash/noop';
 import { Form as FinalForm, FormSpy } from 'react-final-form';
 import { dynamicConfig } from '../../dynamic-forms-custom/config';
 import usePreviousValue from '../../hooks/usePreviousValue';
@@ -13,10 +14,10 @@ export const BlockForm = memo((_a) => {
     if (!active) {
         return (React.createElement(SimpleVerticalAccordeon, { open: false, name: type, title: spec.viewSpec.layoutTitle || type, onOpenChange: onSelect }, ' '));
     }
-    return (React.createElement(FinalForm, { initialValues: initialValues, onSubmit: _.noop }, () => (React.createElement(Fragment, null,
+    return (React.createElement(FinalForm, { initialValues: initialValues, onSubmit: noop }, () => (React.createElement(Fragment, null,
         React.createElement(FormSpy, { onChange: ({ values }) => {
                 // fix for FormSpy onChange called twice without content changes
-                if (!_.isEqual(values.content, prevContent)) {
+                if (!isEqual(values.content, prevContent)) {
                     onChange(Object.assign({ type }, values.content));
                 }
             }, subscription: { values: true } }),

package/build/esm/editor/components/PagePropsForm/PagePropsForm.js

@@ -1,12 +1,12 @@
 import React, { memo, useMemo } from 'react';
 import { DynamicField } from '@gravity-ui/dynamic-forms';
-import _ from 'lodash';
+import noop from 'lodash/noop';
 import { Form as FinalForm, FormSpy } from 'react-final-form';
 import { dynamicConfig } from '../../dynamic-forms-custom/config';
 export const PagePropsForm = memo(({ data: content, spec, onChange }) => {
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const initialValues = useMemo(() => ({ content }), []);
-    return (React.createElement(FinalForm, { initialValues: initialValues, onSubmit: _.noop }, () => (React.createElement("div", null,
+    return (React.createElement(FinalForm, { initialValues: initialValues, onSubmit: noop }, () => (React.createElement("div", null,
         React.createElement(FormSpy, { onChange: ({ values }) => onChange(Object.assign({}, values.content)), subscription: { values: true } }),
         React.createElement(DynamicField, { name: "content", spec: spec, config: dynamicConfig })))));
 });

package/build/esm/editor/dynamic-forms-custom/components/OneOfCustom/OneOfCustom.js

@@ -1,7 +1,7 @@
 import React, { useMemo } from 'react';
 import { Controller, GroupIndent, SpecTypes, transformArrOut, } from '@gravity-ui/dynamic-forms';
 import Ajv from 'ajv';
-import _ from 'lodash';
+import isEmpty from 'lodash/isEmpty';
 import { block } from '../../../../utils';
 import { getSpecTypeDefaultValue, useOneOf } from '../../hooks/useOneOf';
 import './OneOfCustom.css';
@@ -17,7 +17,7 @@ const getOneOfCustomSpecDefaultType = (spec) => { var _a, _b; return ((_b = (_a
 // dynamic-forms pass {} as default value for required properties of all types
 // this function replaces {} with default value accordingly to selected OneOf option spec type
 const getControllerDefautValue = (value, valueSpecType) => {
-    const isDefaultValue = typeof value === 'object' && _.isEmpty(value);
+    const isDefaultValue = typeof value === 'object' && isEmpty(value);
     const defaultValue = valueSpecType ? getSpecTypeDefaultValue(valueSpecType) : undefined;
     return isDefaultValue ? defaultValue : value;
 };

package/build/esm/editor/dynamic-forms-custom/config.js

@@ -1,8 +1,8 @@
 import { dynamicConfig as libConfig } from '@gravity-ui/dynamic-forms';
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 import { OneOfCustom } from './components/OneOfCustom/OneOfCustom';
 const getDynamicConfig = () => {
-    const dynamicConfig = _.cloneDeep(libConfig);
+    const dynamicConfig = cloneDeep(libConfig);
     dynamicConfig.object.inputs['oneof_custom'] = { Component: OneOfCustom, independent: true };
     return dynamicConfig;
 };

package/build/esm/editor/dynamic-forms-custom/hooks/useOneOf.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { SpecTypes, } from '@gravity-ui/dynamic-forms';
 import { RadioButton, Select } from '@gravity-ui/uikit';
-import _ from 'lodash';
+import isObjectLike from 'lodash/isObjectLike';
+import some from 'lodash/some';
 const MAX_TAB_TITLE_LENGTH = 20;
 export const getSpecTypeDefaultValue = (type) => {
     switch (type) {
@@ -18,10 +19,10 @@ export const getSpecTypeDefaultValue = (type) => {
 export const useOneOf = ({ props, onTogglerChange }) => {
     const { name, input, spec, Layout } = props;
     const { order, disabled, oneOfParams } = spec.viewSpec;
-    const specProperties = React.useMemo(() => (_.isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
+    const specProperties = React.useMemo(() => (isObjectLike(spec.properties) ? spec.properties : {}), [spec.properties]);
     const [oneOfValue, setOneOfValue] = React.useState(() => {
         let valueKeys;
-        if (_.isObjectLike(input.value)) {
+        if (isObjectLike(input.value)) {
             const keys = Object.keys(input.value);
             if (keys.length) {
                 valueKeys = keys;
@@ -54,7 +55,7 @@ export const useOneOf = ({ props, onTogglerChange }) => {
         if ((oneOfParams === null || oneOfParams === void 0 ? void 0 : oneOfParams.toggler) !== 'radio' &&
             ((oneOfParams === null || oneOfParams === void 0 ? void 0 : oneOfParams.toggler) === 'select' ||
                 options.length > 3 ||
-                _.some(options, ({ title }) => title.length > MAX_TAB_TITLE_LENGTH))) {
+                some(options, ({ title }) => title.length > MAX_TAB_TITLE_LENGTH))) {
             return (React.createElement(Select, { width: "max", value: [oneOfValue], onUpdate: onOneOfChange, options: options, disabled: disabled, filterable: options.length > 7, qa: name }));
         }
         return (React.createElement(RadioButton, { value: oneOfValue, onChange: (event) => onOneOfChange([event.target.value]), disabled: disabled, qa: name }, options.map(({ value, title }) => (React.createElement(RadioButton.Option, { key: value, value: value }, title)))));

package/build/esm/editor/store/utils.js

@@ -1,4 +1,4 @@
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
 export const changeBlocksOrder = (array, oldIndex, newIndex) => {
     const result = [...array];
     const element = result.splice(oldIndex, 1)[0];
@@ -7,7 +7,7 @@ export const changeBlocksOrder = (array, oldIndex, newIndex) => {
 };
 export const duplicateBlock = (array, index) => {
     const result = [...array];
-    result.splice(index + 1, 0, _.cloneDeep(result[index]));
+    result.splice(index + 1, 0, cloneDeep(result[index]));
     return result;
 };
 export const getNewBlockIndex = (id, orderedBlocksCount) => {

package/build/esm/editor/utils/index.js

@@ -1,6 +1,6 @@
-import _ from 'lodash';
+import capitalize from 'lodash/capitalize';
 import { ViewModeItem } from '../types';
-export const formatBlockName = (name) => _.capitalize(name).replace(/(block|-)/g, ' ');
+export const formatBlockName = (name) => capitalize(name).replace(/(block|-)/g, ' ');
 export const addCustomDecorator = (decorators, custom = {}) => {
     const customDecorators = custom.decorators || {};
     return Object.assign(Object.assign({}, custom), { decorators: Object.assign(Object.assign({}, customDecorators), { block: [...(customDecorators.block || []), ...decorators] }) });

package/build/esm/hooks/useFocus.js

@@ -1,5 +1,5 @@
 import { useCallback, useContext, useEffect, useState } from 'react';
-import _ from 'lodash';
+import noop from 'lodash/noop';
 import { MobileContext } from '../context/mobileContext';
 export default function useFocus(element) {
     const isMobile = useContext(MobileContext);
@@ -25,7 +25,7 @@ export default function useFocus(element) {
                 }
             };
         }
-        return _.noop;
+        return noop;
     }, [element, isMobile, setFocus, unsetFocus]);
     return {
         hasFocus,

package/build/esm/hooks/useHeightCalculator.js

@@ -1,5 +1,5 @@
 import { useCallback, useEffect, useState } from 'react';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 const DEFAULT_RECALCULATE_ON_RESIZE_DELAY = 1000;
 const DEFAULT_OPTIONS = {
     recalculateOnResizeDelay: DEFAULT_RECALCULATE_ON_RESIZE_DELAY,
@@ -12,7 +12,7 @@ const useHeightCalculator = (containerRef, options = DEFAULT_OPTIONS) => {
             setContainerHeight(containerRef.current.offsetHeight);
     }, [containerRef, containerHeight, setContainerHeight]);
     useEffect(() => {
-        const handleResize = _.debounce(calculateContainerHeight, recalculateOnResizeDelay);
+        const handleResize = debounce(calculateContainerHeight, recalculateOnResizeDelay);
         handleResize();
         window.addEventListener('resize', handleResize, { passive: true });
         return () => {

package/build/esm/hooks/useWindowBreakpoint.js

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import { BREAKPOINTS } from '../constants';
 function calculate(windowWidth) {
     const breakpointsSorted = Object.values(BREAKPOINTS).sort((b1, b2) => b1 - b2);
@@ -18,7 +18,7 @@ export default function useWindowBreakpoint() {
     const [breakpoint, setBreakpoint] = useState(BREAKPOINTS.sm);
     useEffect(() => {
         setBreakpoint(calculate(window.innerWidth));
-        const detect = _.debounce(() => {
+        const detect = debounce(() => {
             setBreakpoint(calculate(window.innerWidth));
         }, 100);
         detect();

package/build/esm/navigation/components/Navigation/Navigation.js

@@ -1,5 +1,5 @@
 import React, { useEffect, useMemo, useState } from 'react';
-import _ from 'lodash';
+import debounce from 'lodash/debounce';
 import OutsideClick from '../../../components/OutsideClick/OutsideClick';
 import { Col, Grid, Row } from '../../../grid';
 import { block } from '../../../utils';
@@ -26,7 +26,7 @@ export const Navigation = ({ data, logo }) => {
                 setShowBorder(window.scrollY > 0);
             }
         };
-        const scrollHandler = _.debounce(showBorderOnScroll, 20);
+        const scrollHandler = debounce(showBorderOnScroll, 20);
         window.addEventListener('scroll', scrollHandler, { passive: true });
         return () => window.removeEventListener('scroll', scrollHandler);
     });

package/build/esm/navigation/components/NavigationItem/NavigationItem.css

@@ -25,4 +25,7 @@ unpredictable css rules order in build */
 }
 .pc-navigation-item_menu-layout_dropdown {
   margin-bottom: 0;
+}
+.pc-navigation-item_menu-layout_dropdown .pc-navigation-item__content_type_link {
+  padding: 8px 12px;
 }

package/build/esm/navigation/components/NavigationItem/NavigationItem.js

@@ -1,6 +1,6 @@
 import { __rest } from "tslib";
 import React, { useContext, useMemo } from 'react';
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 import { BlockIdContext } from '../../../context/blockIdContext';
 import { InnerContext } from '../../../context/innerContext';
 import { NavigationItemType } from '../../../models';

package/build/esm/navigation/components/NavigationPopup/NavigationPopup.css

@@ -22,7 +22,6 @@ unpredictable css rules order in build */
 .pc-navigation-popup__link {
   height: 36px;
   line-height: 20px;
-  padding: 8px 12px;
   border-radius: 8px;
 }
 .pc-navigation-popup__link:hover {

package/build/esm/navigation/schema.js

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 import { ImageProps, imageUrlPattern } from '../components/Image/schema';
 import { ButtonProps } from '../schema/validators/common';
 import { filteredArray } from '../schema/validators/utils';

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

@@ -1,9 +1,9 @@
-import _ from 'lodash';
+import omit from 'lodash/omit';
 import { ImageObjectProps } from '../../components/Image/schema';
 import { BaseProps, CardBase, withTheme } from '../../schema/validators/common';
 import { AnalyticsEventSchema } from '../../schema/validators/event';
 import { ContentBase } from '../Content/schema';
-const BackgroundCardContentProps = _.omit(ContentBase, ['size']);
+const BackgroundCardContentProps = omit(ContentBase, ['size']);
 export const BackgroundCard = {
     'background-card': {
         additionalProperties: false,

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

@@ -1,8 +1,8 @@
-import _ from 'lodash';
+import omit from 'lodash/omit';
 import { ImageProps } from '../../components/Image/schema';
 import { BaseProps, CardBase } from '../../schema/validators/common';
 import { ContentBase } from '../Content/schema';
-const BasicCardContentProps = _.omit(ContentBase, ['size', 'theme']);
+const BasicCardContentProps = omit(ContentBase, ['size', 'theme']);
 export const BasicCard = {
     'basic-card': {
         additionalProperties: false,

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

@@ -1,4 +1,4 @@
-import { omit } from 'lodash';
+import omit from 'lodash/omit';
 import metaInfo from '../../components/MetaInfo/schema';
 import { BaseProps, MediaProps } from '../../schema/validators/common';
 import { AnalyticsEventSchema } from '../../schema/validators/event';

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

@@ -1,5 +1,5 @@
 import React, { Fragment, useCallback, useEffect, useState } from 'react';
-import _ from 'lodash';
+import chunk from 'lodash/chunk';
 import { CardBase } from '../../../components';
 import { BREAKPOINTS } from '../../../constants';
 import { Col, Grid, GridColumnSize, Row } from '../../../grid';
@@ -48,11 +48,11 @@ const CombinedPriceDetailed = (props) => {
             React.createElement("div", null, descriptionComponents),
             React.createElement("div", { className: b('description', { delimiter: useMixedView }) }, detailsComponents)));
     };
-    const chunkedItems = _.chunk(items, groupItemsSize);
+    const chunkedItems = chunk(items, groupItemsSize);
     return (React.createElement(CardBase, { className: b(), border: border, analyticsEvents: analyticsEvents },
         React.createElement(CardBase.Content, null,
-            React.createElement(Grid, null, chunkedItems.map((chunk, id) => {
-                return (React.createElement(Row, { key: id, className: b('row') }, getPrice(chunk)));
+            React.createElement(Grid, null, chunkedItems.map((item, id) => {
+                return (React.createElement(Row, { key: id, className: b('row') }, getPrice(item)));
             })))));
 };
 export default CombinedPriceDetailed;

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

@@ -1,3 +1,5 @@
+/* eslint-disable no-param-reassign */
+/* 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';

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

@@ -1,17 +1,18 @@
-import _ from 'lodash';
+import cloneDeep from 'lodash/cloneDeep';
+import shuffle from 'lodash/shuffle';
 import { config } from './config';
 import { filterContent } from './filter';
 function transformBlocks(blocks, lang, customConfig = {}, options = {}) {
     const fullConfig = Object.assign(Object.assign({}, config), customConfig);
     const { plugins = [] } = options;
-    const clonedBlocks = _.cloneDeep(blocks);
+    const clonedBlocks = cloneDeep(blocks);
     return clonedBlocks.map((block) => transformBlock(lang, fullConfig, block, plugins));
 }
 function transformBlock(lang, blocksConfig, block, plugins) {
     const blockConfig = blocksConfig[block.type];
     if (block) {
         if ('randomOrder' in block && block.randomOrder && 'children' in block && block.children) {
-            block.children = _.shuffle(block.children);
+            block.children = shuffle(block.children);
         }
     }
     if (blockConfig) {

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

@@ -1,7 +1,6 @@
 import { Options, Output } from '@doc-tools/transform';
 import sanitize from 'sanitize-html';
 import { Lang } from '../utils/configure';
-import AddRuleOptions = typograf.AddRuleOptions;
 export declare enum TransformType {
     Text = "text",
     Html = "html"
@@ -15,7 +14,6 @@ export declare const typografConfig: {
     disabled: string[];
 };
 export declare const sanitizeStripOptions: sanitize.IOptions;
-export declare function addTypografRules(options: AddRuleOptions[]): void;
 export declare function typograf(text: string, lang?: Lang): string;
 export declare function sanitizeHtml(html: string, options?: sanitize.IOptions): string;
 export declare function typografToHTML(text: string, lang: Lang, allowedTags?: string[]): string;

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

@@ -34,11 +34,31 @@ export const sanitizeStripOptions = {
     allowedTags: [],
     allowedAttributes: {},
 };
-export function addTypografRules(options) {
-    options.forEach((option) => {
-        Typograf.addRule(option);
-    });
-}
+Typograf.addRule({
+    name: 'common/html/sup',
+    queue: 'end',
+    /* TODO mange with it: in typograf types AddRuleOptions.handler takes only one param: text.
+    But in cloud-www was used this notation with 3 params */
+    //@ts-ignore
+    handler: function (text, settings, context) {
+        const { prefs: { htmlEntity: { type = '' } = {} } = {} } = context;
+        let symbols;
+        switch (type) {
+            case 'digit':
+                symbols = '®|©|™';
+                break;
+            case 'name':
+                symbols = '®|©|™';
+                break;
+            default:
+                symbols = '®|©|™';
+                break;
+        }
+        const symbolsRegex = new RegExp(`(?<!<sup>\\s*)(${symbols})|(${symbols})(?!\\s*<\\/sup>)`, 'gi');
+        return text.replace(symbolsRegex, '<sup>$1</sup>');
+    },
+    htmlAttrs: false,
+});
 function enableRules(tp) {
     const { disabled, enabled } = typografConfig;
     enabled.forEach((rule) => tp.enableRule(rule));

package/build/esm/utils/blocks.js

@@ -1,4 +1,5 @@
-import { camelCase, flatten } from 'lodash';
+import camelCase from 'lodash/camelCase';
+import flatten from 'lodash/flatten';
 import { PCShareSocialNetwork } from '../models';
 const BLOCK_ELEMENTS = [
     'div',

package/package.json

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

package/server/text-transform/config.js

@@ -1,4 +1,6 @@
 "use strict";
+/* eslint-disable no-param-reassign */
+/* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
 var __rest = (this && this.__rest) || function (s, e) {
     var t = {};
     for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)

package/server/text-transform/transformers.js

@@ -4,20 +4,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.contentTransformer = void 0;
-const lodash_1 = __importDefault(require("lodash"));
+const cloneDeep_1 = __importDefault(require("lodash/cloneDeep"));
+const shuffle_1 = __importDefault(require("lodash/shuffle"));
 const config_1 = require("./config");
 const filter_1 = require("./filter");
 function transformBlocks(blocks, lang, customConfig = {}, options = {}) {
     const fullConfig = Object.assign(Object.assign({}, config_1.config), customConfig);
     const { plugins = [] } = options;
-    const clonedBlocks = lodash_1.default.cloneDeep(blocks);
+    const clonedBlocks = (0, cloneDeep_1.default)(blocks);
     return clonedBlocks.map((block) => transformBlock(lang, fullConfig, block, plugins));
 }
 function transformBlock(lang, blocksConfig, block, plugins) {
     const blockConfig = blocksConfig[block.type];
     if (block) {
         if ('randomOrder' in block && block.randomOrder && 'children' in block && block.children) {
-            block.children = lodash_1.default.shuffle(block.children);
+            block.children = (0, shuffle_1.default)(block.children);
         }
     }
     if (blockConfig) {

package/server/text-transform/utils.d.ts

@@ -1,7 +1,6 @@
 import { Options, Output } from '@doc-tools/transform';
 import sanitize from 'sanitize-html';
 import { Lang } from '../utils/configure';
-import AddRuleOptions = typograf.AddRuleOptions;
 export declare enum TransformType {
     Text = "text",
     Html = "html"
@@ -15,7 +14,6 @@ export declare const typografConfig: {
     disabled: string[];
 };
 export declare const sanitizeStripOptions: sanitize.IOptions;
-export declare function addTypografRules(options: AddRuleOptions[]): void;
 export declare function typograf(text: string, lang?: Lang): string;
 export declare function sanitizeHtml(html: string, options?: sanitize.IOptions): string;
 export declare function typografToHTML(text: string, lang: Lang, allowedTags?: string[]): string;

package/server/text-transform/utils.js

@@ -14,7 +14,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.typografEntity = exports.fullTransform = exports.transformMarkdown = exports.typografToText = exports.typografToHTML = exports.sanitizeHtml = exports.typograf = exports.addTypografRules = exports.sanitizeStripOptions = exports.typografConfig = exports.DEFAULT_ALLOWED_TAGS = exports.TransformType = void 0;
+exports.typografEntity = exports.fullTransform = exports.transformMarkdown = exports.typografToText = exports.typografToHTML = exports.sanitizeHtml = exports.typograf = exports.sanitizeStripOptions = exports.typografConfig = exports.DEFAULT_ALLOWED_TAGS = exports.TransformType = void 0;
 const transform_1 = __importDefault(require("@doc-tools/transform"));
 const sanitize_html_1 = __importDefault(require("sanitize-html"));
 const typograf_1 = __importDefault(require("typograf"));
@@ -50,12 +50,31 @@ exports.sanitizeStripOptions = {
     allowedTags: [],
     allowedAttributes: {},
 };
-function addTypografRules(options) {
-    options.forEach((option) => {
-        typograf_1.default.addRule(option);
-    });
-}
-exports.addTypografRules = addTypografRules;
+typograf_1.default.addRule({
+    name: 'common/html/sup',
+    queue: 'end',
+    /* TODO mange with it: in typograf types AddRuleOptions.handler takes only one param: text.
+    But in cloud-www was used this notation with 3 params */
+    //@ts-ignore
+    handler: function (text, settings, context) {
+        const { prefs: { htmlEntity: { type = '' } = {} } = {} } = context;
+        let symbols;
+        switch (type) {
+            case 'digit':
+                symbols = '®|©|™';
+                break;
+            case 'name':
+                symbols = '®|©|™';
+                break;
+            default:
+                symbols = '®|©|™';
+                break;
+        }
+        const symbolsRegex = new RegExp(`(?<!<sup>\\s*)(${symbols})|(${symbols})(?!\\s*<\\/sup>)`, 'gi');
+        return text.replace(symbolsRegex, '<sup>$1</sup>');
+    },
+    htmlAttrs: false,
+});
 function enableRules(tp) {
     const { disabled, enabled } = exports.typografConfig;
     enabled.forEach((rule) => tp.enableRule(rule));

package/server/utils/blocks.js

@@ -1,7 +1,11 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getQaAttrubutes = exports.getShareLink = exports.getHeaderBlock = exports.getOrderedBlocks = exports.getCustomTypes = exports.getCustomItems = exports.getBlockKey = exports.hasBlockTag = exports.getHeaderTag = void 0;
-const lodash_1 = require("lodash");
+const camelCase_1 = __importDefault(require("lodash/camelCase"));
+const flatten_1 = __importDefault(require("lodash/flatten"));
 const models_1 = require("../models");
 const BLOCK_ELEMENTS = [
     'div',
@@ -125,9 +129,9 @@ exports.getShareLink = getShareLink;
 const getQaAttrubutes = (qa, ...customKeys) => {
     const attributes = {};
     if (qa) {
-        const keys = QA_ATTRIBUTES_KEYS.concat((0, lodash_1.flatten)(customKeys));
+        const keys = QA_ATTRIBUTES_KEYS.concat((0, flatten_1.default)(customKeys));
         keys.forEach((key) => {
-            attributes[(0, lodash_1.camelCase)(key)] = `${qa}-${key}`;
+            attributes[(0, camelCase_1.default)(key)] = `${qa}-${key}`;
         });
         attributes.default = qa;
     }