@gravity-ui/page-constructor 3.4.0 → 3.5.0-alpha.0

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

@@ -1,11 +1,6 @@
 export declare const ContentBase: {
     title: {
         oneOf: ({
-            type: string;
-            contentType: string;
-            optionName: string;
-        } | {
-            optionName: string;
             type: string;
             additionalProperties: boolean;
             required: string[];
@@ -25,13 +20,14 @@ export declare const ContentBase: {
                     type: string;
                 };
             };
-            contentType?: undefined;
+        } | {
+            type: string;
+            contentType: string;
         })[];
     };
     text: {
         type: string;
         contentType: string;
-        inputType: string;
     };
     additionalInfo: {
         type: string;
@@ -78,11 +74,6 @@ export declare const ContentBlock: {
             };
             title: {
                 oneOf: ({
-                    type: string;
-                    contentType: string;
-                    optionName: string;
-                } | {
-                    optionName: string;
                     type: string;
                     additionalProperties: boolean;
                     required: string[];
@@ -102,13 +93,14 @@ export declare const ContentBlock: {
                             type: string;
                         };
                     };
-                    contentType?: undefined;
+                } | {
+                    type: string;
+                    contentType: string;
                 })[];
             };
             text: {
                 type: string;
                 contentType: string;
-                inputType: string;
             };
             additionalInfo: {
                 type: string;

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

@@ -2,19 +2,11 @@ import { ButtonBlock, LinkProps, TitleProps, containerSizesArray, contentSizes,
 import { filteredArray } from '../../schema/validators/utils';
 export const ContentBase = {
     title: {
-        oneOf: [
-            {
-                type: 'string',
-                contentType: 'text',
-                optionName: 'text',
-            },
-            Object.assign(Object.assign({}, TitleProps), { optionName: 'options' }),
-        ],
+        oneOf: [{ type: 'string', contentType: 'text' }, TitleProps],
     },
     text: {
         type: 'string',
         contentType: 'yfm',
-        inputType: 'textarea',
     },
     additionalInfo: {
         type: 'string',

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

@@ -8,8 +8,7 @@ export declare const LayoutItem: {
                 type: string;
             };
             image: {
-                oneOf: ({
-                    optionName: string;
+                anyOf: ({
                     oneOf: ({
                         type: string;
                         properties: {
@@ -20,10 +19,7 @@ export declare const LayoutItem: {
                     } | {
                         type: string;
                         pattern: string;
-                        optionName: string;
                     })[];
-                    type?: undefined;
-                    items?: undefined;
                 } | {
                     type: string;
                     items: {
@@ -37,10 +33,8 @@ export declare const LayoutItem: {
                         } | {
                             type: string;
                             pattern: string;
-                            optionName: string;
                         })[];
                     };
-                    optionName: string;
                 })[];
             };
             video: {
@@ -55,8 +49,7 @@ export declare const LayoutItem: {
                         };
                     };
                     loop: {
-                        oneOf: ({
-                            optionName: string;
+                        anyOf: ({
                             type: string;
                             additionalProperties: boolean;
                             required: string[];
@@ -70,7 +63,6 @@ export declare const LayoutItem: {
                             };
                         } | {
                             type: string;
-                            optionName: string;
                         })[];
                     };
                     type: {
@@ -80,13 +72,13 @@ export declare const LayoutItem: {
                     muted: {
                         type: string;
                     };
-                    autoplay: {
+                    playing: {
                         type: string;
                     };
                     elapsedTime: {
                         type: string;
                     };
-                    playButton: {
+                    playIcon: {
                         type: string;
                         additionalProperties: boolean;
                         properties: {
@@ -124,10 +116,6 @@ export declare const LayoutItem: {
             };
             dataLens: {
                 oneOf: ({
-                    type: string;
-                    optionName: string;
-                } | {
-                    optionName: string;
                     type: string;
                     additionalProperties: boolean;
                     required: string[];
@@ -140,6 +128,8 @@ export declare const LayoutItem: {
                             enum: string[];
                         };
                     };
+                } | {
+                    type: string;
                 })[];
             };
             fullscreen: {
@@ -227,11 +217,6 @@ export declare const LayoutItem: {
         content: Partial<{
             title: {
                 oneOf: ({
-                    type: string;
-                    contentType: string;
-                    optionName: string;
-                } | {
-                    optionName: string;
                     type: string;
                     additionalProperties: boolean;
                     required: string[];
@@ -251,13 +236,14 @@ export declare const LayoutItem: {
                             type: string;
                         };
                     };
-                    contentType?: undefined;
+                } | {
+                    type: string;
+                    contentType: string;
                 })[];
             };
             text: {
                 type: string;
                 contentType: string;
-                inputType: string;
             };
             additionalInfo: {
                 type: string;

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

@@ -10,8 +10,7 @@ export declare const MediaCardBlock: {
                 type: string;
             };
             image: {
-                oneOf: ({
-                    optionName: string;
+                anyOf: ({
                     oneOf: ({
                         type: string;
                         properties: {
@@ -22,10 +21,7 @@ export declare const MediaCardBlock: {
                     } | {
                         type: string;
                         pattern: string;
-                        optionName: string;
                     })[];
-                    type?: undefined;
-                    items?: undefined;
                 } | {
                     type: string;
                     items: {
@@ -39,10 +35,8 @@ export declare const MediaCardBlock: {
                         } | {
                             type: string;
                             pattern: string;
-                            optionName: string;
                         })[];
                     };
-                    optionName: string;
                 })[];
             };
             video: {
@@ -57,8 +51,7 @@ export declare const MediaCardBlock: {
                         };
                     };
                     loop: {
-                        oneOf: ({
-                            optionName: string;
+                        anyOf: ({
                             type: string;
                             additionalProperties: boolean;
                             required: string[];
@@ -72,7 +65,6 @@ export declare const MediaCardBlock: {
                             };
                         } | {
                             type: string;
-                            optionName: string;
                         })[];
                     };
                     type: {
@@ -82,13 +74,13 @@ export declare const MediaCardBlock: {
                     muted: {
                         type: string;
                     };
-                    autoplay: {
+                    playing: {
                         type: string;
                     };
                     elapsedTime: {
                         type: string;
                     };
-                    playButton: {
+                    playIcon: {
                         type: string;
                         additionalProperties: boolean;
                         properties: {
@@ -126,10 +118,6 @@ export declare const MediaCardBlock: {
             };
             dataLens: {
                 oneOf: ({
-                    type: string;
-                    optionName: string;
-                } | {
-                    optionName: string;
                     type: string;
                     additionalProperties: boolean;
                     required: string[];
@@ -142,6 +130,8 @@ export declare const MediaCardBlock: {
                             enum: string[];
                         };
                     };
+                } | {
+                    type: string;
                 })[];
             };
             fullscreen: {

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

@@ -49,7 +49,6 @@ export declare const PriceDetailedBlock: {
             priceType: {
                 type: string;
                 enum: string[];
-                default: string;
             };
             numberGroupItems: {
                 type: string;

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

@@ -124,10 +124,7 @@ const PriceDetailsListProps = {
 };
 const PriceDetailsProps = {
     items: {
-        oneOf: [
-            Object.assign(Object.assign({}, filteredArray(Object.assign({}, PriceDetailsListProps))), { optionName: 'marked-list' }),
-            Object.assign(Object.assign({}, filteredArray(Object.assign({}, PriceDetailsSettingsProps))), { optionName: 'settings' }),
-        ],
+        anyOf: [filteredArray(PriceDetailsListProps), filteredArray(PriceDetailsSettingsProps)],
     },
 };
 const PriceItem = {
@@ -143,7 +140,6 @@ export const PriceDetailedBlock = {
         properties: Object.assign(Object.assign(Object.assign({}, BaseProps), AnimatableProps), { items: filteredArray(PriceItem), description: PriceDetailedDescriptionProps, details: PriceDetailedDetailsProps, priceType: {
                 type: 'string',
                 enum: PriceDetailedDetailsType,
-                default: 'settings',
             }, numberGroupItems: {
                 type: 'number',
                 enum: [3, 4, 5],

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

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

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

@@ -23,7 +23,12 @@ export const DEFAULT_ALLOWED_TAGS = [
 ];
 export const 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',
+    ],
 };
 export const sanitizeStripOptions = {
     allowedTags: [],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "3.4.0",
+  "version": "3.5.0-alpha.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
@@ -48,10 +48,8 @@
   "dependencies": {
     "@gravity-ui/i18n": "^1.0.0",
     "bem-cn-lite": "^4.0.0",
-    "final-form": "^4.20.9",
     "github-buttons": "2.23.0",
     "lodash": "^4.17.21",
-    "react-final-form": "^6.5.9",
     "react-player": "^2.9.0",
     "react-slick": "^0.28.1",
     "react-spring": "^9.3.0",
@@ -71,7 +69,6 @@
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
     "@doc-tools/transform": "2.12.0",
-    "@gravity-ui/dynamic-forms": "^1.7.1",
     "@gravity-ui/eslint-config": "^2.0.0",
     "@gravity-ui/icons": "^2.1.0",
     "@gravity-ui/prettier-config": "^1.0.1",
@@ -88,7 +85,6 @@
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^29.2.4",
-    "@types/json-schema": "^7.0.12",
     "@types/lodash": "^4.14.176",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
@@ -143,5 +139,8 @@
     "*.{json,yaml,yml,md}": [
       "prettier --write"
     ]
+  },
+  "publishConfig": {
+    "tag": "alpha"
   }
 }

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

@@ -30,7 +30,6 @@ export interface Childable {
     children?: SubBlock[];
 }
 export interface BlockBaseProps {
-    type: BlockType;
     index?: number;
     anchor?: AnchorProps;
     visible?: GridColumnSize;
@@ -245,18 +244,14 @@ export interface IconsBlockProps {
         src: string;
     }[];
 }
-interface ContentLayoutBlockParams {
-    size?: ContentSize;
-    background?: BackgroundImageProps;
-    centered?: boolean;
-    theme?: ContentTheme;
-    textWidth?: ContentTextSize;
-}
-export interface ContentLayoutBlockProps extends ContentLayoutBlockParams {
-    /**
-     * @deprecated Use params on top level instead
-     */
-    properties?: ContentLayoutBlockParams;
+export interface ContentLayoutBlockProps {
+    properties?: {
+        size?: ContentSize;
+        background?: BackgroundImageProps;
+        centered?: boolean;
+        theme?: ContentTheme;
+        textWidth?: ContentTextSize;
+    };
     textContent: ContentBlockProps;
     fileContent?: FileLinkProps[];
 }

package/server/models/constructor.d.ts

@@ -1,5 +1,5 @@
 import React, { PropsWithChildren } from 'react';
-import { Animatable, Block, BlockDecorationProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
+import { Animatable, Block, BlockDecoratorProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
 export interface PageData {
     content: PageContent;
 }
@@ -41,7 +41,7 @@ export interface CustomConfig {
     headers?: CustomItems;
     loadable?: LoadableConfig;
     decorators?: {
-        block?: ((props: BlockDecorationProps) => React.ReactElement)[];
+        block?: ((props: BlockDecoratorProps) => React.ReactElement)[];
     };
 }
 export {};

package/server/models/customization.d.ts

@@ -1,4 +1,9 @@
 import { PropsWithChildren } from 'react';
-import { BlockBaseProps } from './constructor-items';
-export type BlockDecorationProps = Pick<BlockBaseProps, 'index' | 'type'> & PropsWithChildren;
-export type BlockDecorator = (props: BlockDecorationProps) => React.ReactElement;
+export interface BlockDecorationProps extends PropsWithChildren {
+    id: string | number;
+}
+export interface BlockDecoratorProps extends PropsWithChildren {
+    id: string | number;
+    isHeader?: boolean;
+}
+export type BlockDecorator = (props: BlockDecoratorProps) => React.ReactElement;

package/server/models/navigation.d.ts

@@ -63,7 +63,6 @@ export interface HeaderData {
     leftItems: NavigationItemModel[];
     rightItems?: NavigationItemModel[];
     iconSize?: number;
-    withBorder?: boolean;
 }
 export interface FooterColumn {
     title: string;

package/server/text-transform/utils.js

@@ -39,7 +39,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/editor/components/AddBlock/AddBlock.d.ts

@@ -1,7 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { Block, ClassNameProps } from '../../../models';
-export interface AddBlockProps extends ClassNameProps {
-    onAdd: (data: Block) => void;
-}
-declare const AddBlock: ({ onAdd, className }: PropsWithChildren<AddBlockProps>) => JSX.Element;
-export default AddBlock;

package/build/cjs/editor/components/BlockForm/BlockForm.d.ts

@@ -1,12 +0,0 @@
-import React from 'react';
-import { Block } from '../../../models';
-import { CustomSpec } from '../../dynamic-forms-custom/parser/types';
-interface BlockFormProps {
-    data: Block;
-    spec: CustomSpec;
-    onChange: (data: Block) => void;
-    onSelect: () => void;
-    active?: boolean;
-}
-export declare const BlockForm: React.MemoExoticComponent<({ data: { type, ...content }, onChange, onSelect, active, spec: specRaw }: BlockFormProps) => JSX.Element>;
-export {};

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

@@ -1,33 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.BlockForm = void 0;
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importStar(require("react"));
-const dynamic_forms_1 = require("@gravity-ui/dynamic-forms");
-const lodash_1 = tslib_1.__importDefault(require("lodash"));
-const react_final_form_1 = require("react-final-form");
-const config_1 = require("../../dynamic-forms-custom/config");
-const usePreviousValue_1 = tslib_1.__importDefault(require("../../hooks/usePreviousValue"));
-exports.BlockForm = (0, react_1.memo)((_a) => {
-    var _b = _a.data, { type } = _b, content = tslib_1.__rest(_b, ["type"]), { onChange, onSelect, active, spec: specRaw } = _a;
-    // get initial values only at first render, then the form manages data
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    const initialValues = (0, react_1.useMemo)(() => ({ content }), []);
-    const prevContent = (0, usePreviousValue_1.default)(content);
-    const spec = (0, react_1.useMemo)(() => (Object.assign(Object.assign({}, specRaw), { viewSpec: Object.assign(Object.assign({}, specRaw.viewSpec), { layoutOpen: active }) })), [specRaw, active]);
-    return (react_1.default.createElement(react_final_form_1.Form, { initialValues: initialValues, onSubmit: lodash_1.default.noop }, () => (react_1.default.createElement("div", { onClick: () => {
-            if (!active) {
-                onSelect();
-            }
-        } },
-        react_1.default.createElement(react_final_form_1.FormSpy, { onChange: ({ values }) => {
-                // fix for FormSpy onChange called twice without content changes
-                if (!lodash_1.default.isEqual(values.content, prevContent)) {
-                    onChange(Object.assign({ type }, values.content));
-                }
-            }, subscription: { values: true } }),
-        react_1.default.createElement(dynamic_forms_1.DynamicField, { name: "content", 
-            // there is no way other way to manage with form open/close state now
-            key: String(active), spec: spec, config: config_1.dynamicConfig })))));
-});
-exports.BlockForm.displayName = 'BlockForm';

package/build/cjs/editor/components/ControlPanel/ControlPanel.css

@@ -1,26 +0,0 @@
-/* use this for style redefinitions to awoid problems with
-unpredictable css rules order in build */
-.pc-control-panel {
-  display: flex;
-  justify-content: center;
-  width: 100%;
-  height: var(--editor-header-height);
-  padding: 8px 20px;
-  background-color: var(--yc-color-base-background);
-  border-bottom: 1px solid var(--yc-color-line-generic);
-}
-.pc-control-panel__icon {
-  display: flex;
-  align-items: center;
-}
-.pc-control-panel__radio-button {
-  margin-left: 12px;
-}
-.pc-control-panel__radio-button .yc-radio-button__option {
-  display: flex;
-  align-items: center;
-}
-.pc-control-panel__mode-switch {
-  display: flex;
-  align-items: center;
-}

package/build/cjs/editor/components/ControlPanel/ControlPanel.d.ts

@@ -1,8 +0,0 @@
-import { ClassNameProps } from '../../../models';
-import { ViewModeItem } from '../../types';
-export interface ControlPanelProps extends ClassNameProps {
-    viewMode?: ViewModeItem;
-    onViewModeChange: (viewMode: ViewModeItem) => void;
-}
-declare const ControlPanel: ({ viewMode, onViewModeChange, className, }: ControlPanelProps) => JSX.Element;
-export default ControlPanel;

package/build/cjs/editor/components/ControlPanel/ControlPanel.js

@@ -1,24 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
-const icons_1 = require("@gravity-ui/icons");
-const uikit_1 = require("@gravity-ui/uikit");
-const utils_1 = require("../../../utils");
-const types_1 = require("../../types");
-const i18n_1 = tslib_1.__importDefault(require("./i18n"));
-const ICON_SIZE = 14;
-const b = (0, utils_1.block)('control-panel');
-const ControlPanelViewModeIcons = {
-    [types_1.ViewModeItem.Edititng]: icons_1.Pencil,
-    [types_1.ViewModeItem.View]: icons_1.Display,
-};
-const ControlPanel = ({ viewMode = types_1.ViewModeItem.Edititng, onViewModeChange, className, }) => (react_1.default.createElement("div", { className: b(null, className) },
-    react_1.default.createElement("div", { className: b('mode-switch') },
-        react_1.default.createElement("span", null, (0, i18n_1.default)('mode')),
-        react_1.default.createElement(uikit_1.RadioButton, { className: b('radio-button'), value: viewMode, onUpdate: (value) => onViewModeChange(value) }, Object.values(types_1.ViewModeItem).map((item) => {
-            const Icon = ControlPanelViewModeIcons[item];
-            return (react_1.default.createElement(uikit_1.RadioButton.Option, { key: item, value: item },
-                react_1.default.createElement(Icon, { className: b('icon'), width: ICON_SIZE, height: ICON_SIZE })));
-        })))));
-exports.default = ControlPanel;

package/build/cjs/editor/components/ControlPanel/i18n/en.json

@@ -1,3 +0,0 @@
-{
-  "mode": "Mode"
-}

package/build/cjs/editor/components/ControlPanel/i18n/index.d.ts

@@ -1,2 +0,0 @@
-declare const _default: (key: string, params?: import("@gravity-ui/i18n").Params | undefined) => string;
-export default _default;

package/build/cjs/editor/components/ControlPanel/i18n/index.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-const registerKeyset_1 = require("../../../../utils/registerKeyset");
-const en_json_1 = tslib_1.__importDefault(require("./en.json"));
-const ru_json_1 = tslib_1.__importDefault(require("./ru.json"));
-const COMPONENT = 'ControlPanel';
-exports.default = (0, registerKeyset_1.registerKeyset)({ en: en_json_1.default, ru: ru_json_1.default }, COMPONENT);

package/build/cjs/editor/components/ControlPanel/i18n/ru.json

@@ -1,3 +0,0 @@
-{
-  "mode": "Режим"
-}

package/build/cjs/editor/components/EditBlock/EditBlock.d.ts

@@ -1,13 +0,0 @@
-import React from 'react';
-import { EditBlockProps } from '../../types';
-export declare enum EditBlockControls {
-    Up = "up",
-    Down = "down",
-    Copy = "copy",
-    Delete = "delete"
-}
-export type EditBlockActions = {
-    [key in EditBlockControls]?: () => void;
-};
-declare const _default: React.MemoExoticComponent<({ actions, isActive, onSelect, isHeader, children }: EditBlockProps) => JSX.Element>;
-export default _default;