Add support for column and row spans in grid children. #6493

tellthemachines · 2024-05-03T06:38:31Z

Trac ticket: https://core.trac.wordpress.org/ticket/61111

Syncs the changes from WordPress/gutenberg#58539, WordPress/gutenberg#59057, WordPress/gutenberg#59452 and WordPress/gutenberg#61392 to core.

To test, paste the following markup in a post:

test markup

<!-- wp:group {"layout":{"type":"grid"}} -->
<div class="wp-block-group"><!-- wp:paragraph {"style":{"color":{"background":"#91ded8"},"layout":{"columnSpan":"2"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"style":{"color":{"background":"#91ded8"},"layout":{"rowSpan":"3"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"style":{"color":{"background":"#91ded8"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"style":{"color":{"background":"#91ded8"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"style":{"color":{"background":"#91ded8"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph -->

<!-- wp:paragraph {"style":{"color":{"background":"#91ded8"}}} -->
<p class="has-background" style="background-color:#91ded8">grid item</p>
<!-- /wp:paragraph --></div>
<!-- /wp:group -->

Save and view on the front end. It should show grid items spanning multiple columns and rows:

This Pull Request is for code review only. Please keep all other discussion in the Trac ticket. Do not merge this Pull Request. See GitHub Pull Requests for Code Review in the Core Handbook for more details.

github-actions · 2024-05-03T06:51:01Z

Test using WordPress Playground

The changes in this pull request can previewed and tested using a WordPress Playground instance.

WordPress Playground is an experimental project that creates a full WordPress instance entirely within the browser.

Some things to be aware of

The Plugin and Theme Directories cannot be accessed within Playground.
All changes will be lost when closing a tab with a Playground instance.
All changes will be lost when refreshing the page.
A fresh instance is created each time the link below is clicked.
Every time this pull request is updated, a new ZIP file containing all changes is created. If changes are not reflected in the Playground instance,
it's possible that the most recent build failed, or has not completed. Check the list of workflow runs to be sure.

For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation.

Test this pull request with WordPress Playground.

github-actions · 2024-05-07T07:03:37Z

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 props-bot label.

Core Committers: Use this line as a base for the props when committing in SVN:

Props isabel_brison, andrewserong, peterwilsoncc, mukesh27.

To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook.

tellthemachines · 2024-05-07T07:03:41Z

I've added a test so marking this one ready for review!

andrewserong · 2024-05-09T02:56:21Z

src/wp-includes/block-supports/layout.php

+ */
+add_filter(
+	'render_block_data',
+	function ( $parsed_block, $source_block, $parent_block ) {


Just double-checked the WP coding standards, and it looks like it's discouraged to use anonymous functions in filters:

Closures should not be passed as filter or action callbacks, as removing these via remove_action() / remove_filter() is complex (at this time) (see #46635 for a proposal to address this).

Should we move this to a named function so that plugins (if they really wanted to) are able to remove_filter this?

andrewserong

This is testing great for me on the site frontend, and matches the merged PRs in Gutenberg as far as I can tell 👍

Just left a couple of minor nits. I think the main issue to fix in terms of WP coding style is to make the render_block_data callback a named function so that it can be removed by a plugin if need be, but otherwise this is looking good to me!

andrewserong · 2024-05-09T03:11:13Z

tests/phpunit/tests/block-supports/layout.php

+						),
+					),
+				),
+				'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_id` will not have run previously in this test.


Tiny nit: the code now uses wp_unique_prefixed_id so should the comment refer to that now, too?

Suggested change

'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_id` will not have run previously in this test.

'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_prefixed_id` will not have run previously in this test.

It's probably worth including the prefix in Andrew's comment too, wp_unique_prefixed_id( 'wp-container-content-' ), as the counter is unique to each prefix.

Done, thanks!

andrewserong · 2024-05-09T03:11:42Z

tests/phpunit/tests/block-supports/layout.php

@@ -181,6 +181,7 @@ public function test_outer_container_not_restored_for_aligned_image_block_with_t
 	 * @param string $expected_output The expected output.
 	 */
 	public function test_layout_support_flag_renders_classnames_on_wrapper( $args, $expected_output ) {


I notice this function includes references to the tickets directly above it. Should the linked trac ticket be added to that list?

andrewserong

Thanks for the updates! This is still testing well, and the code looks good to me 👍

mukeshpanchal27 · 2024-05-09T07:55:46Z

src/wp-includes/block-supports/layout.php

+	return $parsed_block;
+}
+
+add_filter( 'render_block_data', 'wp_add_parent_layout_to_parsed_block', 10, 3 );


Is it possible to add unit test for new filter?

Tests added!

tellthemachines · 2024-05-18T20:32:19Z

Committed in r58170.

Add support for column and row spans in grid children.

c9a0514

tellthemachines mentioned this pull request May 3, 2024

PHP backports for WP 6.6 WordPress/gutenberg#61226

Closed

tellthemachines mentioned this pull request May 6, 2024

Check child layout exists before generating classname. WordPress/gutenberg#61392

Merged

tellthemachines added 2 commits May 7, 2024 16:56

Check child layout exists before generating classname.

66a0692

Add a test for child layout classes

ed8549d

tellthemachines marked this pull request as ready for review May 7, 2024 07:03

tellthemachines requested review from mukeshpanchal27 and felixarntz May 7, 2024 07:03

tellthemachines self-assigned this May 7, 2024

tellthemachines requested a review from noisysocks May 7, 2024 07:04

Use wp_unique_prefixed_id instead of wp_unique_id

0b97584

andrewserong reviewed May 9, 2024

View reviewed changes

tellthemachines added 2 commits May 9, 2024 14:29

Convert filter to named function.

e0c0cba

Update comment and ticket annotation.

81a54f5

andrewserong approved these changes May 9, 2024

View reviewed changes

mukeshpanchal27 reviewed May 9, 2024

View reviewed changes

Add unit test for wp_add_parent_layout_to_parsed_block

0926acf

tellthemachines closed this May 18, 2024

tellthemachines mentioned this pull request May 18, 2024

Update child layout selector to match core. WordPress/gutenberg#61777

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for column and row spans in grid children. #6493

Add support for column and row spans in grid children. #6493

tellthemachines commented May 3, 2024 •

edited

github-actions bot commented May 3, 2024

github-actions bot commented May 7, 2024 •

edited

tellthemachines commented May 7, 2024

andrewserong May 9, 2024

tellthemachines May 9, 2024

andrewserong left a comment

andrewserong May 9, 2024

peterwilsoncc May 9, 2024

tellthemachines May 9, 2024

andrewserong May 9, 2024

andrewserong left a comment

mukeshpanchal27 May 9, 2024

tellthemachines May 10, 2024

tellthemachines commented May 18, 2024

	'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_id` will not have run previously in this test.
	'expected_output' => '<p class="wp-container-content-1">Some text.</p>', // The generated classname number assumes `wp_unique_prefixed_id` will not have run previously in this test.

Add support for column and row spans in grid children. #6493

Add support for column and row spans in grid children. #6493

Conversation

tellthemachines commented May 3, 2024 • edited

github-actions bot commented May 3, 2024

Test using WordPress Playground

Some things to be aware of

github-actions bot commented May 7, 2024 • edited

tellthemachines commented May 7, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewserong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

andrewserong left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

tellthemachines commented May 18, 2024

tellthemachines commented May 3, 2024 •

edited

github-actions bot commented May 7, 2024 •

edited