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.

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

Performance: block style variations: only calc styles for present inner blocks #62683

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open
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
36 changes: 34 additions & 2 deletions packages/block-editor/src/hooks/block-style-variation.js
Original file line number Diff line number Diff line change
Expand Up @@ -118,17 +118,42 @@ function useBlockProps( { name, className, clientId } ) {
clientId
);

const descendantBlockNames = useSelect(
( select ) => {
// Avoid a subscription if there is no variation.
if ( ! variation ) {
return;
}
const { getClientIdsOfDescendants, getBlockName } =
select( blockEditorStore );
// Could be moved to a private memoized selector, but this also
// makes sure the reference is stable.
return JSON.stringify( [
...new Set(
[ clientId, ...getClientIdsOfDescendants( clientId ) ].map(
( id ) => getBlockName( id )
)
),
] );
},
[ clientId, variation ]
);

const variationStyles = useMemo( () => {
if ( ! variation ) {
return;
}

const variationConfig = { settings, styles };
const names = JSON.parse( descendantBlockNames );
const blockSelectors = getBlockSelectors(
getBlockTypes(),
getBlockTypes().filter( ( blockType ) =>
names.includes( blockType.name )
),
getBlockStyles,
clientId
);

const hasBlockGapSupport = false;
const hasFallbackGapSupport = true;
const disableLayoutStyles = true;
Expand All @@ -151,7 +176,14 @@ function useBlockProps( { name, className, clientId } ) {
variationStyles: true,
}
);
}, [ variation, settings, styles, getBlockStyles, clientId ] );
}, [
variation,
settings,
styles,
getBlockStyles,
clientId,
descendantBlockNames,
] );

useStyleOverride( {
id: `variation-${ clientId }`,
Expand Down
Loading