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

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

@@ -0,0 +1,56 @@
+/* eslint-disable no-param-reassign */
+/* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
+import evalExp from '@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 || evalExp(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}
+ */
+export 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;
+    }
+}

package/build/esm/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/esm/text-transform/index.js

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

package/build/esm/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/esm/text-transform/transformers.js

@@ -2,6 +2,7 @@
 /* eslint-disable no-not-accumulator-reassign/no-not-accumulator-reassign */
 import _ from 'lodash';
 import { config } from './config';
+import { filterContent } from './filter';
 function transformBlocks(blocks, lang, customConfig = {}) {
     const fullConfig = Object.assign(Object.assign({}, config), customConfig);
     const clonedBlocks = _.cloneDeep(blocks);
@@ -42,8 +43,8 @@ function transformBlock(lang, blocksConfig, block) {
     return block;
 }
 export const contentTransformer = ({ content, options }) => {
-    const { lang, customConfig = {} } = options;
-    const { blocks = [] } = content;
+    const { lang, customConfig = {}, vars } = options;
+    const { blocks = [] } = (vars ? filterContent(content, vars) : content);
     const transformedBlocks = transformBlocks(blocks, lang, customConfig);
     return {
         blocks: transformedBlocks,

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/build/esm/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/esm/utils/blocks.js

@@ -1,4 +1,41 @@
 import { PCShareSocialNetwork } from '../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('|')})[^>]*>`;
 export function getHeaderTag(size) {
     switch (size) {
         case 'l':
@@ -12,6 +49,10 @@ export function getHeaderTag(size) {
             return 'h2';
     }
 }
+export function hasBlockTag(content) {
+    const regex = new RegExp(BLOCK_ELEMENTS_REGEX, 'g');
+    return regex.test(content);
+}
 export function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
@@ -71,4 +112,3 @@ export const getShareLink = (url, type, title, text) => {
             return undefined;
     }
 };
-export 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()); };

package/build/esm/utils/imageCompress.js

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

package/build/esm/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;

package/package.json

@@ -1,24 +1,57 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "4.0.0-beta.0",
+  "version": "4.0.0",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/gravity-ui/page-constructor"
   },
+  "exports": {
+    ".": {
+      "types": "./build/esm/index.d.ts",
+      "require": "./build/cjs/index.js",
+      "import": "./build/esm/index.js"
+    },
+    "./editor": {
+      "types": "./build/esm/editor/index.d.ts",
+      "require": "./build/cjs/editor/index.js",
+      "import": "./build/esm/editor/index.js"
+    },
+    "./server": {
+      "types": "./server/index.d.ts",
+      "require": "./server/index.js",
+      "import": "./server/index.js"
+    },
+    "./styles/*": "./styles/*",
+    "./widget/*": "./widget/*"
+  },
+  "main": "./build/cjs/index.js",
+  "module": "./build/esm/index.js",
+  "types": "./build/esm/index.d.ts",
+  "typesVersions": {
+    "*": {
+      "index.d.ts": [
+        "./build/esm/index.d.ts"
+      ],
+      "editor": [
+        "./build/esm/editor/index.d.ts"
+      ],
+      "server": [
+        "./server/index.d.ts"
+      ]
+    }
+  },
   "files": [
     "build",
     "styles",
-    "server"
+    "server",
+    "widget"
   ],
   "sideEffects": [
     "*.css",
     "*.scss"
   ],
-  "main": "build/cjs/index.js",
-  "module": "build/esm/index.js",
-  "typings": "build/esm/index.d.ts",
   "scripts": {
     "deps:install": "npm ci",
     "deps:truncate": "npm prune --production",
@@ -32,13 +65,14 @@
     "lint": "run-p lint:js lint:styles lint:prettier typecheck",
     "typecheck": "tsc --noEmit",
     "dev": "npm run storybook:start",
-    "storybook:start": "TS_NODE_PROJECT=.storybook/tsconfig.json start-storybook -p 7009",
-    "storybook:build": "TS_NODE_PROJECT=.storybook/tsconfig.json build-storybook -c .storybook -o storybook-static",
+    "storybook:start": "sb dev -p 7009",
+    "storybook:build": "sb build -c .storybook -o storybook-static",
     "start": "node dist",
     "clean": "gulp clean",
     "build:client": "gulp",
     "build:server": "rimraf server && tsc -p tsconfig.server.json && move-file server/server.js server/index.js && move-file server/server.d.ts server/index.d.ts",
-    "build": "run-p build:client build:server",
+    "build:widget": "webpack --config widget.webpack.js",
+    "build": "run-p build:client build:server build:widget",
     "prepublishOnly": "npm run lint && npm run build",
     "prepare": "husky install",
     "test": "jest",
@@ -46,62 +80,83 @@
     "test:watch": "jest --watchAll"
   },
   "dependencies": {
+    "@gravity-ui/components": "^2.0.0",
+    "@gravity-ui/dynamic-forms": "^1.11.0",
     "@gravity-ui/i18n": "^1.0.0",
+    "ajv": "^8.12.0",
     "bem-cn-lite": "^4.0.0",
+    "final-form": "^4.20.9",
     "github-buttons": "2.23.0",
     "lodash": "^4.17.21",
+    "monaco-editor": "^0.38.0",
+    "react-final-form": "^6.5.9",
+    "react-monaco-editor": "^0.53.0",
     "react-player": "^2.9.0",
-    "react-slick": "^0.28.1",
+    "react-slick": "^0.29.0",
     "react-spring": "^9.3.0",
     "react-transition-group": "^4.4.2",
     "react-waypoint": "^10.1.0",
-    "sanitize-html": "^2.6.1",
+    "sanitize-html": "2.6.1",
     "snakecase-keys": "^5.1.0",
     "typograf": "^6.14.0",
     "uuid": "^9.0.0"
   },
   "peerDependencies": {
-    "@doc-tools/transform": "^2.6.1",
-    "@gravity-ui/uikit": "^4.1.0",
+    "@doc-tools/transform": "^3.3.2",
+    "@gravity-ui/uikit": "^5.1.0",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
+    "@babel/core": "^7.22.8",
+    "@babel/preset-env": "^7.22.9",
+    "@babel/preset-react": "^7.22.5",
+    "@babel/preset-typescript": "^7.22.5",
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
-    "@doc-tools/transform": "2.12.0",
+    "@doc-tools/transform": "^3.3.2",
     "@gravity-ui/eslint-config": "^2.0.0",
     "@gravity-ui/icons": "^2.1.0",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^1.0.0",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^4.1.0",
-    "@storybook/addon-actions": "^6.3.12",
-    "@storybook/addon-essentials": "^6.5.10",
-    "@storybook/addon-knobs": "^6.3.1",
-    "@storybook/addon-viewport": "^6.3.12",
+    "@gravity-ui/uikit": "^5.1.0",
+    "@storybook/addon-actions": "^7.1.0",
+    "@storybook/addon-essentials": "^7.1.0",
+    "@storybook/addon-knobs": "^7.0.2",
+    "@storybook/addon-viewport": "^7.1.0",
     "@storybook/preset-scss": "^1.0.3",
-    "@storybook/react": "^6.5.16",
+    "@storybook/react": "^7.1.0",
+    "@storybook/react-webpack5": "^7.1.0",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^14.4.3",
     "@types/jest": "^29.2.4",
+    "@types/js-yaml": "^4.0.5",
+    "@types/json-schema": "^7.0.12",
     "@types/lodash": "^4.14.176",
     "@types/react": "^18.0.27",
     "@types/react-dom": "^18.0.10",
     "@types/react-slick": "^0.23.7",
     "@types/react-transition-group": "^4.4.4",
-    "@types/sanitize-html": "^2.6.0",
+    "@types/sanitize-html": "2.6.1",
     "@types/uuid": "^9.0.0",
+    "@types/webpack-env": "^1.18.1",
+    "autoprefixer": "^10.4.14",
+    "babel-loader": "^8.3.0",
+    "css-loader": "^5.2.7",
     "es5-ext": "0.10.53",
     "eslint": "^8.34.0",
     "eslint-plugin-local": "./eslint-plugin-local",
     "eslint-plugin-no-not-accumulator-reassign": "^0.1.0",
+    "eslint-plugin-react": "^7.33.0",
     "eslint-plugin-testing-library": "^5.9.1",
     "gulp": "^4.0.2",
     "gulp-dart-sass": "^1.0.2",
-    "gulp-replace": "^1.1.3",
+    "gulp-replace": "^1.1.4",
+    "gulp-ts-alias": "^2.0.0",
     "gulp-typescript": "^6.0.0-alpha.1",
     "html-loader": "^1.3.2",
+    "htmlparser2": "^6.1.0",
     "husky": "^7.0.4",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
@@ -112,20 +167,28 @@
     "move-file-cli": "^3.0.0",
     "npm-run-all": "^4.1.5",
     "postcss": "^8.4.16",
+    "postcss-loader": "^4.3.0",
+    "postcss-preset-env": "^9.0.0",
     "postcss-scss": "^4.0.4",
     "prettier": "2.4.1",
     "react": "^18.2.0",
     "react-docgen-typescript": "^2.2.2",
     "react-dom": "^18.2.0",
+    "resolve-url-loader": "^3.1.5",
     "rimraf": "^3.0.2",
-    "sass": "^1.54.4",
-    "sass-loader": "^10.3.1",
+    "sass": "^1.63.6",
+    "sass-loader": "^10.4.1",
+    "storybook": "^7.1.0",
+    "style-loader": "^2.0.0",
     "stylelint": "^14.11.0",
     "svg-sprite-loader": "^6.0.11",
+    "terser-webpack-plugin": "^5.3.9",
     "ts-jest": "^29.0.3",
     "tslib": "^2.4.0",
     "typescript": "^4.9.4",
-    "webpack": "^4.46.0"
+    "webpack": "^5.88.2",
+    "webpack-cli": "^5.1.4",
+    "webpack-shell-plugin-next": "^2.3.1"
   },
   "lint-staged": {
     "*.{css,scss}": [

package/server/components/constants.d.ts

@@ -1,4 +1,6 @@
-export declare const DEFAULT_THEME = "light";
+import { Theme } from '../models';
+export declare const DEFAULT_THEME = Theme.Light;
+export declare const UIKIT_ROOT_CLASS = "g-root";
 export declare const KEY: {
     ENTER: string;
     TAB: string;

package/server/components/constants.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HEADER_HEIGHT = exports.KEY = exports.DEFAULT_THEME = void 0;
-exports.DEFAULT_THEME = 'light';
+exports.HEADER_HEIGHT = exports.KEY = exports.UIKIT_ROOT_CLASS = exports.DEFAULT_THEME = void 0;
+const models_1 = require("../models");
+exports.DEFAULT_THEME = models_1.Theme.Light;
+exports.UIKIT_ROOT_CLASS = 'g-root';
 exports.KEY = {
     ENTER: 'Enter',
     TAB: 'Tab',

package/server/models/common.d.ts

@@ -7,6 +7,7 @@ export declare enum Theme {
     Light = "light",
     Dark = "dark"
 }
+export declare const themeNames: Record<Theme, string>;
 /**
  * @deprecated Pixel will be deleted
  */
@@ -63,6 +64,9 @@ export interface Metrika {
 export interface ClassNameProps {
     className?: string;
 }
+export interface QAProps {
+    qa?: string;
+}
 export type Timeout = ReturnType<typeof setTimeout> | undefined;
 export declare enum PredefinedEventTypes {
     Default = "default-event",
@@ -79,7 +83,8 @@ export declare enum DefaultEventNames {
     HubspotFormSubmit = "hubspot-form-submit",
     QuoteButton = "quote-button-click",
     BackLink = "back-link-click",
-    Breadcrumb = "breadcrumb-click"
+    Breadcrumb = "breadcrumb-click",
+    VideoPreview = "video-preview-click"
 }
 export type AnalyticsCounters = {
     include?: string[];

package/server/models/common.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DefaultEventNames = exports.PredefinedEventTypes = exports.PixelEventType = exports.Theme = void 0;
+exports.DefaultEventNames = exports.PredefinedEventTypes = exports.PixelEventType = exports.themeNames = exports.Theme = void 0;
 var Theme;
 (function (Theme) {
     Theme["Light"] = "light";
     Theme["Dark"] = "dark";
 })(Theme = exports.Theme || (exports.Theme = {}));
+exports.themeNames = {
+    [Theme.Light]: 'Light',
+    [Theme.Dark]: 'Dark',
+};
 /**
  * @deprecated Pixel will be deleted from package
  */
@@ -48,4 +52,5 @@ var DefaultEventNames;
     DefaultEventNames["QuoteButton"] = "quote-button-click";
     DefaultEventNames["BackLink"] = "back-link-click";
     DefaultEventNames["Breadcrumb"] = "breadcrumb-click";
+    DefaultEventNames["VideoPreview"] = "video-preview-click";
 })(DefaultEventNames = exports.DefaultEventNames || (exports.DefaultEventNames = {}));

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

@@ -154,14 +154,11 @@ export interface MediaBaseBlockProps extends Animatable, MediaContentProps {
     mediaOnly?: boolean;
     disableShadow?: boolean;
 }
-export interface MediaContentProps {
+export interface MediaContentProps extends Omit<ContentBlockProps, 'colSizes' | 'text' | 'title' | 'theme' | 'centered'> {
     title: string;
     description?: string;
-    additionalInfo?: string;
+    /** @deprecated  Use array of buttons from ContentBlockProps instead**/
     button?: ButtonProps;
-    links?: LinkProps[];
-    buttons?: ButtonProps[];
-    size?: ContentSize;
 }
 export interface MediaBlockProps extends MediaBaseBlockProps {
     media: ThemeSupporting<MediaProps>;
@@ -210,6 +207,7 @@ export interface TabsBlockProps extends Animatable {
     centered?: boolean;
     direction?: MediaDirection;
     items: TabsBlockItem[];
+    contentSize?: ContentSize;
 }
 export interface CardLayoutBlockProps extends Childable, Animatable, LoadableChildren {
     title?: TitleItemProps | string;
@@ -243,17 +241,22 @@ export interface IconsBlockProps {
         src: string;
     }[];
 }
-export interface ContentLayoutBlockProps {
-    properties?: {
-        size?: ContentSize;
-        background?: BackgroundImageProps;
-        centered?: boolean;
-        theme?: ContentTheme;
-        textWidth?: ContentTextSize;
-    };
+interface ContentLayoutBlockParams {
+    size?: ContentSize;
+    background?: BackgroundImageProps;
+    centered?: boolean;
+    theme?: ContentTheme;
+    textWidth?: ContentTextSize;
+}
+export interface ContentLayoutBlockProps extends ContentLayoutBlockParams {
     textContent: ContentBlockProps;
     fileContent?: FileLinkProps[];
 }
+export interface ContentItemProps {
+    title?: string;
+    text?: string;
+    icon: ThemedImage;
+}
 export interface ContentBlockProps {
     title?: TitleItemBaseProps | string;
     text?: string;
@@ -264,6 +267,7 @@ export interface ContentBlockProps {
     colSizes?: GridColumnSizesType;
     centered?: boolean;
     theme?: ContentTheme;
+    list?: ContentItemProps[];
 }
 export declare enum PCShareSocialNetwork {
     Vk = "vk",

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

@@ -1,7 +1,7 @@
 import { CSSProperties, ReactNode } from 'react';
 import { ButtonView, ButtonProps as UikitButtonProps } from '@gravity-ui/uikit';
 import { ThemeSupporting } from '../../utils/theme';
-import { AnalyticsEventsBase, ClassNameProps, PixelEventType } from '../common';
+import { AnalyticsEventsBase, ClassNameProps, PixelEventType, QAProps } from '../common';
 export declare enum AuthorType {
     Column = "column",
     Line = "line"
@@ -90,11 +90,10 @@ export interface ImageDeviceProps extends ImageInfoProps {
 }
 export type ImageProps = string | ImageObjectProps | ImageDeviceProps;
 export type ThemedImage = ThemeSupporting<ImageProps>;
-export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement>, Partial<ImageDeviceProps>, Partial<ImageObjectProps> {
+export interface BackgroundImageProps extends React.HTMLProps<HTMLDivElement>, Partial<ImageDeviceProps>, Partial<ImageObjectProps>, QAProps {
     style?: CSSProperties;
     imageClassName?: string;
     hide?: boolean;
-    qa?: string;
 }
 export interface MediaVideoProps extends AnalyticsEventsBase {
     src: string[];
@@ -327,12 +326,11 @@ export interface PriceDetailedProps extends CardBaseProps {
     foldable?: PriceFoldableDetailsProps;
     labelsDefaultText?: Record<PriceLabelColor, string>;
 }
-export interface AuthorProps {
+export interface AuthorProps extends QAProps {
     author: AuthorItem;
     className?: string;
     authorContainerClassName?: string;
     type?: AuthorType;
-    dataQa?: string;
 }
 export interface TitleProps {
     title?: TitleItemProps | string;

package/server/models/constructor.d.ts

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

package/server/models/customization.d.ts

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

package/server/models/navigation.d.ts

@@ -44,6 +44,8 @@ export interface NavigationButtonItem extends ButtonProps {
 export interface NavigationDropdownItem extends NavigationItemBase {
     type: NavigationItemType.Dropdown;
     items: NavigationLinkItem[];
+    hidePopup: () => void;
+    isActive: boolean;
 }
 export interface NavigationSocialItem extends Omit<NavigationItemBase, 'text'> {
     type: NavigationItemType.Social;
@@ -51,8 +53,7 @@ export interface NavigationSocialItem extends Omit<NavigationItemBase, 'text'> {
     url: string;
 }
 export type NavigationItemModel = NavigationLinkItem | NavigationButtonItem | NavigationDropdownItem;
-export type NavigationItemData = NavigationLinkItem | NavigationButtonItem | NavigationSocialItem | DropdownItemData;
-export type DropdownItemData = Omit<NavigationDropdownItem, 'items'>;
+export type NavigationItemData = NavigationLinkItem | NavigationButtonItem | NavigationSocialItem | NavigationDropdownItem;
 export interface NavigationLogoData {
     icon: ImageProps;
     text?: string;
@@ -63,6 +64,7 @@ export interface HeaderData {
     leftItems: NavigationItemModel[];
     rightItems?: NavigationItemModel[];
     iconSize?: number;
+    withBorder?: boolean;
 }
 export interface FooterColumn {
     title: string;