@gravity-ui/page-constructor 1.15.0-alpha.13 → 1.15.0-alpha.14

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

@@ -11,13 +11,14 @@ const ConstructorItem_1 = require("../ConstructorItem");
 const ConstructorBlock_1 = require("../ConstructorBlock/ConstructorBlock");
 const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
     const { blockTypes, loadables, itemMap } = (0, react_1.useContext)(innerContext_1.InnerContext);
-    const renderer = (item, index) => {
+    const renderer = (parentContext = '', item, index) => {
         if (!itemMap[item.type]) {
             return null;
         }
         let children;
         let itemElement;
         const key = (0, utils_1.getBlockKey)(item, index);
+        const context = (0, utils_1.getBlockContext)({ parentContext, block: item, index });
         if (shouldRenderBlock && !shouldRenderBlock(item, key)) {
             return null;
         }
@@ -31,12 +32,12 @@ const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
         }
         else {
             if ('children' in item && item.children) {
-                children = item.children.map(renderer);
+                children = item.children.map(renderer.bind(null, parentContext));
             }
-            itemElement = (react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: item, key: key }, children));
+            itemElement = (react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: item, key: key, context: context }, children));
         }
         return blockTypes.includes(item.type) ? (react_1.default.createElement(ConstructorBlock_1.ConstructorBlock, { data: item, key: key, Component: itemElement })) : (itemElement);
     };
-    return react_1.default.createElement(react_1.Fragment, null, items.map(renderer));
+    return react_1.default.createElement(react_1.Fragment, null, items.map(renderer.bind(null, '')));
 };
 exports.ConstructorBlocks = ConstructorBlocks;

package/build/cjs/containers/PageConstructor/components/ConstructorItem/ConstructorItem.d.ts

@@ -1,6 +1,7 @@
 import { ConstructorItem as ConstructorItemType, WithChildren } from '../../../../models';
 export interface ConstructorItemProps {
     data: ConstructorItemType;
+    context?: string;
 }
-export declare const ConstructorItem: ({ data, children }: WithChildren<ConstructorItemProps>) => JSX.Element;
+export declare const ConstructorItem: ({ data, children, context, }: WithChildren<ConstructorItemProps>) => JSX.Element;
 export declare const ConstructorHeader: ({ data }: Pick<ConstructorItemProps, 'data'>) => JSX.Element;

package/build/cjs/containers/PageConstructor/components/ConstructorItem/ConstructorItem.js

@@ -4,11 +4,12 @@ exports.ConstructorHeader = exports.ConstructorItem = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const innerContext_1 = require("../../../../context/innerContext");
-const ConstructorItem = ({ data, children }) => {
+const ConstructorItem = ({ data, children, context = '', }) => {
     const { itemMap } = (0, react_1.useContext)(innerContext_1.InnerContext);
-    const { type } = data, rest = tslib_1.__rest(data, ["type"]);
+    const { type } = data;
+    const localContext = context + type ? `_${type}` : '';
     const Component = itemMap[type];
-    return react_1.default.createElement(Component, Object.assign({}, rest), children);
+    return (react_1.default.createElement(Component, Object.assign({}, data, { context: localContext }), children));
 };
 exports.ConstructorItem = ConstructorItem;
 const ConstructorHeader = ({ data }) => (react_1.default.createElement(exports.ConstructorItem, { data: data, key: data.type }));

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

@@ -2,9 +2,16 @@ import { ConstructorBlock } from '../models/constructor';
 import { TextSize, CustomConfig, PCShareSocialNetwork } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h4" | "h2";
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
+type GetBlockContextArgs = {
+    block: ConstructorBlock;
+    index: number;
+    parentContext?: string;
+};
+export declare function getBlockContext({ parentContext, block, index }: GetBlockContextArgs): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
     [x: string]: any;
 };
 export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
+export {};

package/build/cjs/utils/blocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockContext = exports.getBlockKey = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
 function getHeaderTag(size) {
     switch (size) {
@@ -18,6 +18,10 @@ function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
 exports.getBlockKey = getBlockKey;
+function getBlockContext({ parentContext = '', block, index }) {
+    return `${parentContext}${parentContext ? '-' : ''}${block.type}-${index}`;
+}
+exports.getBlockContext = getBlockContext;
 const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...Object.keys(blocks),
     ...Object.keys(headers),

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

@@ -1,19 +1,20 @@
 import _ from 'lodash';
 import React, { Fragment, useContext } from 'react';
-import { getBlockKey } from '../../../../utils';
+import { getBlockContext, getBlockKey } from '../../../../utils';
 import { InnerContext } from '../../../../context/innerContext';
 import { ConstructorLoadable } from '../ConstructorLoadable';
 import { ConstructorItem } from '../ConstructorItem';
 import { ConstructorBlock } from '../ConstructorBlock/ConstructorBlock';
 export const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
     const { blockTypes, loadables, itemMap } = useContext(InnerContext);
-    const renderer = (item, index) => {
+    const renderer = (parentContext = '', item, index) => {
         if (!itemMap[item.type]) {
             return null;
         }
         let children;
         let itemElement;
         const key = getBlockKey(item, index);
+        const context = getBlockContext({ parentContext, block: item, index });
         if (shouldRenderBlock && !shouldRenderBlock(item, key)) {
             return null;
         }
@@ -27,11 +28,11 @@ export const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
         }
         else {
             if ('children' in item && item.children) {
-                children = item.children.map(renderer);
+                children = item.children.map(renderer.bind(null, parentContext));
             }
-            itemElement = (React.createElement(ConstructorItem, { data: item, key: key }, children));
+            itemElement = (React.createElement(ConstructorItem, { data: item, key: key, context: context }, children));
         }
         return blockTypes.includes(item.type) ? (React.createElement(ConstructorBlock, { data: item, key: key, Component: itemElement })) : (itemElement);
     };
-    return React.createElement(Fragment, null, items.map(renderer));
+    return React.createElement(Fragment, null, items.map(renderer.bind(null, '')));
 };

package/build/esm/containers/PageConstructor/components/ConstructorItem/ConstructorItem.d.ts

@@ -1,6 +1,7 @@
 import { ConstructorItem as ConstructorItemType, WithChildren } from '../../../../models';
 export interface ConstructorItemProps {
     data: ConstructorItemType;
+    context?: string;
 }
-export declare const ConstructorItem: ({ data, children }: WithChildren<ConstructorItemProps>) => JSX.Element;
+export declare const ConstructorItem: ({ data, children, context, }: WithChildren<ConstructorItemProps>) => JSX.Element;
 export declare const ConstructorHeader: ({ data }: Pick<ConstructorItemProps, 'data'>) => JSX.Element;

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

@@ -1,10 +1,10 @@
-import { __rest } from "tslib";
 import React, { useContext } from 'react';
 import { InnerContext } from '../../../../context/innerContext';
-export const ConstructorItem = ({ data, children }) => {
+export const ConstructorItem = ({ data, children, context = '', }) => {
     const { itemMap } = useContext(InnerContext);
-    const { type } = data, rest = __rest(data, ["type"]);
+    const { type } = data;
+    const localContext = context + type ? `_${type}` : '';
     const Component = itemMap[type];
-    return React.createElement(Component, Object.assign({}, rest), children);
+    return (React.createElement(Component, Object.assign({}, data, { context: localContext }), children));
 };
 export const ConstructorHeader = ({ data }) => (React.createElement(ConstructorItem, { data: data, key: data.type }));

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

@@ -2,9 +2,16 @@ import { ConstructorBlock } from '../models/constructor';
 import { TextSize, CustomConfig, PCShareSocialNetwork } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h4" | "h2";
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
+type GetBlockContextArgs = {
+    block: ConstructorBlock;
+    index: number;
+    parentContext?: string;
+};
+export declare function getBlockContext({ parentContext, block, index }: GetBlockContextArgs): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
     [x: string]: any;
 };
 export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
+export {};

package/build/esm/utils/blocks.js

@@ -13,6 +13,9 @@ export function getHeaderTag(size) {
 export function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
+export function getBlockContext({ parentContext = '', block, index }) {
+    return `${parentContext}${parentContext ? '-' : ''}${block.type}-${index}`;
+}
 export const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...Object.keys(blocks),
     ...Object.keys(headers),

package/package.json

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

package/server/utils/blocks.d.ts

@@ -2,9 +2,16 @@ import { ConstructorBlock } from '../models/constructor';
 import { TextSize, CustomConfig, PCShareSocialNetwork } from '../models';
 export declare function getHeaderTag(size: TextSize): "h1" | "h4" | "h2";
 export declare function getBlockKey(block: ConstructorBlock, index: number): string;
+type GetBlockContextArgs = {
+    block: ConstructorBlock;
+    index: number;
+    parentContext?: string;
+};
+export declare function getBlockContext({ parentContext, block, index }: GetBlockContextArgs): string;
 export declare const getCustomBlockTypes: ({ blocks, headers }?: CustomConfig) => string[];
 export declare const getCustomItems: ({ blocks, headers, subBlocks }?: CustomConfig) => {
     [x: string]: any;
 };
 export declare const getCustomHeaderTypes: (customBlocks?: CustomConfig) => string[];
 export declare const getShareLink: (url: string, type: PCShareSocialNetwork, title?: string, text?: string) => string | undefined;
+export {};

package/server/utils/blocks.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockKey = exports.getHeaderTag = void 0;
+exports.getShareLink = exports.getCustomHeaderTypes = exports.getCustomItems = exports.getCustomBlockTypes = exports.getBlockContext = exports.getBlockKey = exports.getHeaderTag = void 0;
 const models_1 = require("../models");
 function getHeaderTag(size) {
     switch (size) {
@@ -18,6 +18,10 @@ function getBlockKey(block, index) {
     return `${block.type}-${index}`;
 }
 exports.getBlockKey = getBlockKey;
+function getBlockContext({ parentContext = '', block, index }) {
+    return `${parentContext}${parentContext ? '-' : ''}${block.type}-${index}`;
+}
+exports.getBlockContext = getBlockContext;
 const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [
     ...Object.keys(blocks),
     ...Object.keys(headers),