diff --git a/src/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.tsx b/src/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.tsx
index aa90922fb..ad4df941e 100644
--- a/src/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.tsx
+++ b/src/containers/PageConstructor/components/ConstructorBlocks/ConstructorBlocks.tsx
@@ -3,7 +3,6 @@ import React, {Fragment, ReactElement, useContext} from 'react';
import {getBlockKey} from '../../../../utils';
import {InnerContext} from '../../../../context/innerContext';
-import {BlockIdContext} from '../../../../context/blockIdContext';
import {Block, ConstructorItem as ConstructorItemType, ShouldRenderBlock} from '../../../../models';
import {ConstructorLoadable} from '../ConstructorLoadable';
import {ConstructorItem} from '../ConstructorItem';
@@ -37,6 +36,7 @@ export const ConstructorBlocks = ({items, shouldRenderBlock}: ConstructorBlocksP
if ('loadable' in item && item.loadable) {
const {source, serviceId, params} = item.loadable;
const config = _.get(loadables, source);
+
if (!config) {
return null;
}
@@ -57,9 +57,9 @@ export const ConstructorBlocks = ({items, shouldRenderBlock}: ConstructorBlocksP
}
itemElement = (
-
- {children}
-
+
+ {children}
+
);
}
diff --git a/src/containers/PageConstructor/components/ConstructorItem/ConstructorItem.tsx b/src/containers/PageConstructor/components/ConstructorItem/ConstructorItem.tsx
index 34b3137a6..fe27a5334 100644
--- a/src/containers/PageConstructor/components/ConstructorItem/ConstructorItem.tsx
+++ b/src/containers/PageConstructor/components/ConstructorItem/ConstructorItem.tsx
@@ -1,12 +1,18 @@
import React, {useContext} from 'react';
import {ConstructorItem as ConstructorItemType, WithChildren} from '../../../../models';
import {InnerContext} from '../../../../context/innerContext';
+import {BlockIdContext} from '../../../../context/blockIdContext';
export interface ConstructorItemProps {
data: ConstructorItemType;
+ blockKey?: string;
}
-export const ConstructorItem = ({data, children}: WithChildren) => {
+export const ConstructorItem = ({
+ data,
+ blockKey = '',
+ children,
+}: WithChildren) => {
const {itemMap} = useContext(InnerContext);
const {type, ...rest} = data;
@@ -14,9 +20,16 @@ export const ConstructorItem = ({data, children}: WithChildren
>;
- return {children};
+ return (
+
+ {children}
+
+ );
};
-export const ConstructorHeader = ({data}: Pick) => (
-
+export const ConstructorHeader = ({
+ data,
+ blockKey = '',
+}: Pick) => (
+
);
diff --git a/src/containers/PageConstructor/components/ConstructorLoadable/ConstructorLoadable.tsx b/src/containers/PageConstructor/components/ConstructorLoadable/ConstructorLoadable.tsx
index 0c23a7012..233d08ce7 100644
--- a/src/containers/PageConstructor/components/ConstructorLoadable/ConstructorLoadable.tsx
+++ b/src/containers/PageConstructor/components/ConstructorLoadable/ConstructorLoadable.tsx
@@ -3,6 +3,7 @@ import React, {useContext} from 'react';
import Loadable, {LoadableComponentsProps} from '../../../Loadable/Loadable';
import {LoadableConfigItem} from '../../../../models';
import {InnerContext} from '../../../../context/innerContext';
+import {BlockIdContext} from '../../../../context/blockIdContext';
interface ConstructorLoadableProps
extends Omit {
@@ -19,15 +20,17 @@ export const ConstructorLoadable = (props: ConstructorLoadableProps) => {
>;
return (
-
+
+
+
);
};