@gravity-ui/page-constructor 1.20.4 → 1.20.5

package/CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.20.5](https://github.com/gravity-ui/page-constructor/compare/v1.20.4...v1.20.5) (2023-03-03)
+
+
+### Bug Fixes
+
+* move BlockIdContext.Provider inside ConstructorItem and ConstructorLoadable ([#201](https://github.com/gravity-ui/page-constructor/issues/201)) ([f2036e3](https://github.com/gravity-ui/page-constructor/commit/f2036e333f10711ca51ad3a62c735ca285904cff))
+
 ## [1.20.4](https://github.com/gravity-ui/page-constructor/compare/v1.20.3...v1.20.4) (2023-03-03)
 
 

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

@@ -6,7 +6,6 @@ const lodash_1 = tslib_1.__importDefault(require("lodash"));
 const react_1 = tslib_1.__importStar(require("react"));
 const utils_1 = require("../../../../utils");
 const innerContext_1 = require("../../../../context/innerContext");
-const blockIdContext_1 = require("../../../../context/blockIdContext");
 const ConstructorLoadable_1 = require("../ConstructorLoadable");
 const ConstructorItem_1 = require("../ConstructorItem");
 const ConstructorBlock_1 = require("../ConstructorBlock/ConstructorBlock");
@@ -35,8 +34,7 @@ const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
             if ('children' in item && item.children) {
                 children = item.children.map(renderer.bind(null, blockId));
             }
-            itemElement = (react_1.default.createElement(blockIdContext_1.BlockIdContext.Provider, { value: blockId, key: blockId },
-                react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: item }, children)));
+            itemElement = (react_1.default.createElement(ConstructorItem_1.ConstructorItem, { data: item, key: blockId, blockKey: blockId }, children));
         }
         return blockTypes.includes(item.type) ? (react_1.default.createElement(ConstructorBlock_1.ConstructorBlock, { data: item, key: blockId, Component: itemElement })) : (itemElement);
     };

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;
+    blockKey?: string;
 }
-export declare const ConstructorItem: ({ data, children }: WithChildren<ConstructorItemProps>) => JSX.Element;
-export declare const ConstructorHeader: ({ data }: Pick<ConstructorItemProps, 'data'>) => JSX.Element;
+export declare const ConstructorItem: ({ data, blockKey, children, }: WithChildren<ConstructorItemProps>) => JSX.Element;
+export declare const ConstructorHeader: ({ data, blockKey, }: Pick<ConstructorItemProps, 'data' | 'blockKey'>) => JSX.Element;

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

@@ -4,12 +4,14 @@ 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 blockIdContext_1 = require("../../../../context/blockIdContext");
+const ConstructorItem = ({ data, blockKey = '', children, }) => {
     const { itemMap } = (0, react_1.useContext)(innerContext_1.InnerContext);
     const { type } = data, rest = tslib_1.__rest(data, ["type"]);
     const Component = itemMap[type];
-    return react_1.default.createElement(Component, Object.assign({}, rest), children);
+    return (react_1.default.createElement(blockIdContext_1.BlockIdContext.Provider, { value: blockKey },
+        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 }));
+const ConstructorHeader = ({ data, blockKey = '', }) => (react_1.default.createElement(exports.ConstructorItem, { data: data, key: data.type, blockKey: blockKey }));
 exports.ConstructorHeader = ConstructorHeader;

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

@@ -5,12 +5,14 @@ const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importStar(require("react"));
 const Loadable_1 = tslib_1.__importDefault(require("../../../Loadable/Loadable"));
 const innerContext_1 = require("../../../../context/innerContext");
+const blockIdContext_1 = require("../../../../context/blockIdContext");
 const ConstructorLoadable = (props) => {
     const { itemMap } = (0, react_1.useContext)(innerContext_1.InnerContext);
     const { block, blockKey, config, serviceId, params } = props;
     const { type } = block;
     const { fetch, component: ChildComponent } = config;
     const Component = itemMap[type];
-    return (react_1.default.createElement(Loadable_1.default, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params }));
+    return (react_1.default.createElement(blockIdContext_1.BlockIdContext.Provider, { value: blockKey, key: blockKey },
+        react_1.default.createElement(Loadable_1.default, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params })));
 };
 exports.ConstructorLoadable = ConstructorLoadable;

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

@@ -2,7 +2,6 @@ import _ from 'lodash';
 import React, { Fragment, useContext } from 'react';
 import { getBlockKey } from '../../../../utils';
 import { InnerContext } from '../../../../context/innerContext';
-import { BlockIdContext } from '../../../../context/blockIdContext';
 import { ConstructorLoadable } from '../ConstructorLoadable';
 import { ConstructorItem } from '../ConstructorItem';
 import { ConstructorBlock } from '../ConstructorBlock/ConstructorBlock';
@@ -31,8 +30,7 @@ export const ConstructorBlocks = ({ items, shouldRenderBlock }) => {
             if ('children' in item && item.children) {
                 children = item.children.map(renderer.bind(null, blockId));
             }
-            itemElement = (React.createElement(BlockIdContext.Provider, { value: blockId, key: blockId },
-                React.createElement(ConstructorItem, { data: item }, children)));
+            itemElement = (React.createElement(ConstructorItem, { data: item, key: blockId, blockKey: blockId }, children));
         }
         return blockTypes.includes(item.type) ? (React.createElement(ConstructorBlock, { data: item, key: blockId, Component: itemElement })) : (itemElement);
     };

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;
+    blockKey?: string;
 }
-export declare const ConstructorItem: ({ data, children }: WithChildren<ConstructorItemProps>) => JSX.Element;
-export declare const ConstructorHeader: ({ data }: Pick<ConstructorItemProps, 'data'>) => JSX.Element;
+export declare const ConstructorItem: ({ data, blockKey, children, }: WithChildren<ConstructorItemProps>) => JSX.Element;
+export declare const ConstructorHeader: ({ data, blockKey, }: Pick<ConstructorItemProps, 'data' | 'blockKey'>) => JSX.Element;

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';
-export const ConstructorItem = ({ data, children }) => {
+import { BlockIdContext } from '../../../../context/blockIdContext';
+export const ConstructorItem = ({ data, blockKey = '', children, }) => {
     const { itemMap } = useContext(InnerContext);
     const { type } = data, rest = __rest(data, ["type"]);
     const Component = itemMap[type];
-    return React.createElement(Component, Object.assign({}, rest), children);
+    return (React.createElement(BlockIdContext.Provider, { value: blockKey },
+        React.createElement(Component, Object.assign({}, rest), children)));
 };
-export const ConstructorHeader = ({ data }) => (React.createElement(ConstructorItem, { data: data, key: data.type }));
+export const ConstructorHeader = ({ data, blockKey = '', }) => (React.createElement(ConstructorItem, { data: data, key: data.type, blockKey: blockKey }));

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

@@ -1,11 +1,13 @@
 import React, { useContext } from 'react';
 import Loadable from '../../../Loadable/Loadable';
 import { InnerContext } from '../../../../context/innerContext';
+import { BlockIdContext } from '../../../../context/blockIdContext';
 export const ConstructorLoadable = (props) => {
     const { itemMap } = useContext(InnerContext);
     const { block, blockKey, config, serviceId, params } = props;
     const { type } = block;
     const { fetch, component: ChildComponent } = config;
     const Component = itemMap[type];
-    return (React.createElement(Loadable, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params }));
+    return (React.createElement(BlockIdContext.Provider, { value: blockKey, key: blockKey },
+        React.createElement(Loadable, { key: blockKey, block: block, blockKey: blockKey, Component: Component, ChildComponent: ChildComponent, fetch: fetch, serviceId: serviceId, params: params })));
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/page-constructor",
-  "version": "1.20.4",
+  "version": "1.20.5",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {