Skip to content

Inner blocks: memoize allowedBlocks to prevent needlessly updating settings #30311

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

Merged
talldan merged 1 commit into from
Mar 30, 2021
Merged

Inner blocks: memoize allowedBlocks to prevent needlessly updating settings #30311

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
10 changes: 7 additions & 3 deletions packages/block-editor/src/components/inner-blocks/use-nested-settings-update.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/**
* WordPress dependencies
*/
import { useLayoutEffect } from '@wordpress/element';
import { useLayoutEffect, useMemo } from '@wordpress/element';
import { useSelect, useDispatch } from '@wordpress/data';
import isShallowEqual from '@wordpress/is-shallow-equal';

Expand Down Expand Up @@ -54,9 +54,13 @@ export default function useNestedSettingsUpdate(
[ clientId ]
);

// Memoize as inner blocks implementors often pass a new array on every
// render.
const _allowedBlocks = useMemo( () => allowedBlocks, allowedBlocks );

useLayoutEffect( () => {
const newSettings = {
allowedBlocks,
allowedBlocks: _allowedBlocks,
templateLock:
templateLock === undefined ? parentLock : templateLock,
};
Expand All @@ -77,7 +81,7 @@ export default function useNestedSettingsUpdate(
}, [
clientId,
blockListSettings,
allowedBlocks,
_allowedBlocks,
templateLock,
parentLock,
captureToolbars,
Expand Down