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

package/build/cjs/blocks/Banner/Banner.js

@@ -2,14 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BannerBlock = void 0;
 const tslib_1 = require("tslib");
-const react_1 = tslib_1.__importDefault(require("react"));
+const react_1 = tslib_1.__importStar(require("react"));
 const utils_1 = require("../../utils");
 const models_1 = require("../../models");
 const AnimateBlock_1 = tslib_1.__importDefault(require("../../components/AnimateBlock/AnimateBlock"));
 const sub_blocks_1 = require("../../sub-blocks");
+const blockPositionContext_1 = require("src/context/blockPositionContext");
 const b = (0, utils_1.block)('banner-block');
 const BannerBlock = (props) => {
     const { animated, blockName = models_1.BlockType.BannerBlock } = props, bannerProps = tslib_1.__rest(props, ["animated", "blockName"]);
+    const blockPosition = (0, react_1.useContext)(blockPositionContext_1.BlockPositionContext);
+    // eslint-disable-next-line no-console
+    console.log({ blockPosition });
     return (react_1.default.createElement(AnimateBlock_1.default, { className: b(), animate: animated },
         react_1.default.createElement(sub_blocks_1.BannerCard, Object.assign({}, bannerProps, { blockName: blockName }))));
 };

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

@@ -32,7 +32,7 @@ const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
         }
         else {
             if ('children' in item && item.children) {
-                children = item.children.map(renderer.bind(null, parentContext));
+                children = item.children.map(renderer.bind(null, context));
             }
             itemElement = (react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: item, key: key, context: context }, children));
         }

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

@@ -4,12 +4,13 @@ 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 blockPositionContext_1 = require("src/context/blockPositionContext");
 const ConstructorItem = ({ data, children, context = '', }) => {
     const { itemMap } = (0, react_1.useContext)(innerContext_1.InnerContext);
-    const { type } = data;
-    const localContext = context + type ? `_${type}` : '';
+    const { type } = data, rest = tslib_1.__rest(data, ["type"]);
     const Component = itemMap[type];
-    return (react_1.default.createElement(Component, Object.assign({}, data, { context: localContext }), children));
+    return (react_1.default.createElement(blockPositionContext_1.BlockPositionContext.Provider, { value: context },
+        react_1.default.createElement(Component, Object.assign({}, rest), children)));
 };
 exports.ConstructorItem = ConstructorItem;
 const ConstructorHeader = ({ data }) => (react_1.default.createElement(exports.ConstructorItem, { data: data, key: data.type }));

package/build/cjs/context/blockPositionContext/blockPositionContext.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export type BlockPositionContextProp = string;
+export declare const BlockPositionContext: React.Context<string>;

package/build/cjs/context/blockPositionContext/blockPositionContext.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.BlockPositionContext = void 0;
+const tslib_1 = require("tslib");
+const react_1 = tslib_1.__importDefault(require("react"));
+exports.BlockPositionContext = react_1.default.createContext('');

package/build/cjs/context/blockPositionContext/index.d.ts

@@ -0,0 +1 @@
+export * from './blockPositionContext';

package/build/cjs/context/blockPositionContext/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./blockPositionContext"), exports);

package/build/cjs/utils/blocks.js

@@ -19,7 +19,7 @@ function getBlockKey(block, index) {
 }
 exports.getBlockKey = getBlockKey;
 function getBlockContext({ parentContext = '', block, index }) {
-    return `${parentContext}${parentContext ? '-' : ''}${block.type}-${index}`;
+    return `${parentContext}${parentContext ? '_' : ''}${block.type}-${index}`;
 }
 exports.getBlockContext = getBlockContext;
 const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [

package/build/esm/blocks/Banner/Banner.js

@@ -1,13 +1,17 @@
 import { __rest } from "tslib";
-import React from 'react';
+import React, { useContext } from 'react';
 import { block } from '../../utils';
 import { BlockType } from '../../models';
 import AnimateBlock from '../../components/AnimateBlock/AnimateBlock';
 import { BannerCard } from '../../sub-blocks';
+import { BlockPositionContext } from 'src/context/blockPositionContext';
 import './Banner.css';
 const b = block('banner-block');
 export const BannerBlock = (props) => {
     const { animated, blockName = BlockType.BannerBlock } = props, bannerProps = __rest(props, ["animated", "blockName"]);
+    const blockPosition = useContext(BlockPositionContext);
+    // eslint-disable-next-line no-console
+    console.log({ blockPosition });
     return (React.createElement(AnimateBlock, { className: b(), animate: animated },
         React.createElement(BannerCard, Object.assign({}, bannerProps, { blockName: blockName }))));
 };

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

@@ -28,7 +28,7 @@ export const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
         }
         else {
             if ('children' in item && item.children) {
-                children = item.children.map(renderer.bind(null, parentContext));
+                children = item.children.map(renderer.bind(null, context));
             }
             itemElement = (React.createElement(ConstructorItem, { data: item, key: key, context: context }, children));
         }

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

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

package/build/esm/context/blockPositionContext/blockPositionContext.d.ts

@@ -0,0 +1,3 @@
+import React from 'react';
+export type BlockPositionContextProp = string;
+export declare const BlockPositionContext: React.Context<string>;

package/build/esm/context/blockPositionContext/blockPositionContext.js

@@ -0,0 +1,2 @@
+import React from 'react';
+export const BlockPositionContext = React.createContext('');

package/build/esm/context/blockPositionContext/index.d.ts

@@ -0,0 +1 @@
+export * from './blockPositionContext';

package/build/esm/context/blockPositionContext/index.js

@@ -0,0 +1 @@
+export * from './blockPositionContext';

package/build/esm/utils/blocks.js

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

package/package.json

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

package/server/utils/blocks.js

@@ -19,7 +19,7 @@ function getBlockKey(block, index) {
 }
 exports.getBlockKey = getBlockKey;
 function getBlockContext({ parentContext = '', block, index }) {
-    return `${parentContext}${parentContext ? '-' : ''}${block.type}-${index}`;
+    return `${parentContext}${parentContext ? '_' : ''}${block.type}-${index}`;
 }
 exports.getBlockContext = getBlockContext;
 const getCustomBlockTypes = ({ blocks = {}, headers = {} } = {}) => [