Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export const ConstructorBlocks = ({items, shouldRenderBlock}: ConstructorBlocksP
let itemElement;
const key = getBlockKey(item, index);
const blockId = parentId ? `${parentId}_${key}` : key;
if (shouldRenderBlock && !shouldRenderBlock(item, key)) {
if (shouldRenderBlock && !shouldRenderBlock(item, blockId)) {
return null;
}

Expand All @@ -44,8 +44,8 @@ export const ConstructorBlocks = ({items, shouldRenderBlock}: ConstructorBlocksP
itemElement = (
<ConstructorLoadable
block={item}
key={key}
blockKey={key}
key={blockId}
blockKey={blockId}
config={config}
serviceId={serviceId}
params={params}
Expand All @@ -58,7 +58,7 @@ export const ConstructorBlocks = ({items, shouldRenderBlock}: ConstructorBlocksP

itemElement = (
<BlockIdContext.Provider value={blockId}>
<ConstructorItem data={item} key={key}>
<ConstructorItem data={item} key={blockId}>
{children}
</ConstructorItem>
</BlockIdContext.Provider>
Expand Down