Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Inner blocks: don't re-render list when controlled blocks change #58575

Merged
merged 1 commit into from
Feb 2, 2024
Merged

Inner blocks: don't re-render list when controlled blocks change #58575

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 6 additions & 2 deletions packages/block-editor/src/components/inner-blocks/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import classnames from 'classnames';
* WordPress dependencies
*/
import { useMergeRefs } from '@wordpress/compose';
import { forwardRef, useMemo } from '@wordpress/element';
import { forwardRef, useMemo, memo } from '@wordpress/element';
import { useSelect } from '@wordpress/data';
import {
getBlockSupport,
Expand Down Expand Up @@ -42,6 +42,8 @@ function BlockContext( { children, clientId } ) {
);
}

const BlockListItemsMemo = memo( BlockListItems );

/**
* InnerBlocks is a component which allows a single block to have multiple blocks
* as children. The UncontrolledInnerBlocks component is used whenever the inner
Expand Down Expand Up @@ -117,8 +119,10 @@ function UncontrolledInnerBlocks( props ) {
[ defaultLayout, usedLayout, allowSizingOnChildren ]
);

// For controlled inner blocks, we don't want a change in blocks to
// re-render the blocks list.
const items = (
<BlockListItems
<BlockListItemsMemo
rootClientId={ clientId }
renderAppender={ renderAppender }
__experimentalAppenderTagName={ __experimentalAppenderTagName }
Expand Down
Loading