Allow grid to use style variation blockGap values for columns calculation#75360
Merged
tellthemachines merged 5 commits intotrunkfrom Feb 12, 2026
Merged
Allow grid to use style variation blockGap values for columns calculation#75360tellthemachines merged 5 commits intotrunkfrom
tellthemachines merged 5 commits intotrunkfrom
Conversation
tellthemachines
requested review from
aaronrobertshaw,
andrewserong and
ramonjd
tellthemachines
added
[Type] Bug
|
The following accounts have interacted with this PR and/or linked issues. I will continue to update these lists as activity occurs. You can also manually ask me to refresh this list by adding the If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message. To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
|
Size Change: +113 B (0%) Total Size: 3 MB
ℹ️ View Unchanged
|
ramonjd
approved these changes
Feb 10, 2026
Member
ramonjd
left a comment
ramonjd
left a comment
There was a problem hiding this comment.
LGTM and works a treat. 🌮 Approving pending the Core backport.
Kapture.2026-02-10.at.12.56.41.mp4
Up to you whether you want to reuse the getVariationNameFromClass style variation util, but if not, it could be worth a comment to say that the logic is intentionally mirrored.
Also, you probably have an extra PHP test in WP_Block_Supports_Layout_Test on your radar as part of the Core backport
| * | ||
| * @return {string|null} The name of the first registered variation, or null if none found. | ||
| */ | ||
| function getVariationNameFromClass( className, registeredStyles = [] ) { |
Member
There was a problem hiding this comment.
Is there anyway to reuse getVariationNameFromClass, or is it preferable not to have a cross-hook dep?
Contributor
Author
There was a problem hiding this comment.
Oh well spotted, yes I think we can reuse it.
lib/block-supports/layout.php
Outdated
Comment on lines
24
to
39
| foreach ( $classes as $name ) { | ||
| if ( str_starts_with( $name, 'is-style-' ) ) { | ||
| $match = substr( $name, strlen( 'is-style-' ) ); | ||
| if ( 'default' !== $match ) { | ||
| $matches[] = $match; | ||
| } | ||
| } | ||
| } | ||
|
|
||
| foreach ( $matches as $variation ) { | ||
| foreach ( $registered_styles as $style ) { | ||
| if ( isset( $style['name'] ) && $style['name'] === $variation ) { | ||
| return $variation; | ||
| } | ||
| } | ||
| } |
Member
There was a problem hiding this comment.
Not a blocker and feel free to ignore, but I was trying to work out a way to save a loop or two here. Then I remembered that there are presumably a handful of classes and registered styles per block, so it's all negligible. Posting anyway so I can get if off my chest 😅
$registered_names = array_filter( array_column( $registered_styles, 'name' ) );
$prefix = 'is-style-';
$len = strlen( $prefix );
foreach ( explode( ' ', $class_name ) as $class ) {
if ( str_starts_with( $class, $prefix ) ) {
$variation = substr( $class, $len );
if ( 'default' !== $variation && in_array( $variation, $registered_names, true ) ) {
return $variation;
}
}
}
Contributor
Author
There was a problem hiding this comment.
Nice, I can use that, thanks!
lib/block-supports/layout.php
Outdated
| $matches = array(); | ||
| $classes = explode( ' ', $class_name ); | ||
|
|
||
| foreach ( $classes as $name ) { |
Member
There was a problem hiding this comment.
Shell we use here array_filter along with array_map?
Contributor
Author
There was a problem hiding this comment.
I updated this block to Ramon's suggestion above.
lib/block-supports/layout.php
Outdated
|
|
||
| foreach ( $classes as $name ) { | ||
| if ( str_starts_with( $name, 'is-style-' ) ) { | ||
| $match = substr( $name, strlen( 'is-style-' ) ); |
Member
There was a problem hiding this comment.
Suggested change
| $match = substr( $name, strlen( 'is-style-' ) ); | |
| $match = substr( $name, 9 ); // 'is-style-' is 9 characters |
As we already know it's 9 why we calculate it?
Contributor
Author
There was a problem hiding this comment.
That's just to avoid a magic number; by using strlen the code is self-explanatory.
Co-authored-by: Mukesh Panchal <[email protected]>
Contributor
Author
|
Feedback addressed and test added! Merging this now. Sync PR in WordPress/wordpress-develop#10906. |
Comment on lines
+41
to
+43
| /* | ||
| * Register a style variation with a custom blockGap value for testing. | ||
| */ |
8 tasks
tellthemachines
added a commit
that referenced
this pull request
Feb 17, 2026
tellthemachines
added a commit
that referenced
this pull request
Feb 17, 2026
Co-authored-by: tellthemachines <[email protected]> Co-authored-by: andrewserong <[email protected]> Co-authored-by: ramonjd <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What?
Follow-up to #74725 made possible by #74529.
Now that we output blockGap values for block style variations, we should ensure the grid block columns computation takes any active variation value into account.
Testing Instructions