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

Block Style Variations: Fix complex variation selectors when using selectors API #67061

Merged

Conversation

aaronrobertshaw
Copy link
Contributor

@aaronrobertshaw aaronrobertshaw commented Nov 18, 2024

Fixes: #66885

What?

Fixes a bug in the manipulation of selectors for block style variations that would result in an incorrect selector and fail to match the appropriate elements on the frontend.

Why?

  • Bugs = bad
  • Frontend should match editor.

How?

Tweaks how the original block name in the block's selector is replaced so that it doesn't miss more complex selectors e.g. ones with compound classes, CSS functions etc.

Testing Instructions

  1. Confirm Theme.json unit tests are passing:
    npm run test:unit:php:base -- --filter WP_Theme_JSON_Gutenberg_Test
  2. Register a custom block style variation for a block that uses the Selectors API with compound selector or something with a CSS function in it. The List block sparked the original issue fixed by this PR, see snippet below for List block style.
    register_block_style(
    	'core/list',
    	array(
    		'name'       => 'my-list-border',
    		'label'      => __( 'my list border' ),
    		'style_data' => array(
    			'border'  => array(
    				'color' => 'green',
    				'style' => 'solid',
    				'width' => '2px',
    			),
    			'color'   => array(
    				'background' => '#FBFAF3',
    			),
    			'spacing' => array(
    				'padding' => array(
    					'bottom' => 'var(--wp--preset--spacing--30)',
    					'left'   => 'var(--wp--preset--spacing--50)',
    					'right'  => 'var(--wp--preset--spacing--50)',
    					'top'    => 'var(--wp--preset--spacing--30)',
    				),
    			),
    		),
    	),
    )
  3. Edit a post, add a List block to it, and apply the custom block style from the last step.
  4. Save the post and view on the frontend.
  5. Confirm the List block's border styles are now reflected there as well (they still should not be recursively applied to nested lists)
  6. In the site editor, add some global styles for the Image block.
    • Add a border to all images
    • Add a different border to the rounded Image block style
  7. Confirm the borders for images continue to work as before.
  8. Make sure other blocks using the selectors API to set custom selectors within block.json work e.g. Post Featured Image, Avatar, List Item.
  9. Check blocks like Button, that still use old __experimentalSelector property in block.json

There might be more use cases I'm missing so bonus points for testing more than the list above 😅

Screenshots or screencast

Before After
Screenshot 2024-11-18 at 4 10 03 pm Screenshot 2024-11-18 at 4 10 34 pm

Note the missing border in the Before image above.

@aaronrobertshaw aaronrobertshaw added [Type] Bug An existing feature does not function as intended [Feature] Block Style Variations Issues or PRs that are related to the style variations for blocks labels Nov 18, 2024
@aaronrobertshaw aaronrobertshaw self-assigned this Nov 18, 2024
@aaronrobertshaw aaronrobertshaw changed the title Fix/complex variation selectors when using selectors api Block Style Variations: Fix complex variation selectors when using selectors API Nov 18, 2024
Copy link

github-actions bot commented Nov 18, 2024

Flaky tests detected in 9d0147e.
Some tests passed with failed attempts. The failures may not be related to this commit but are still reported for visibility. See the documentation for more information.

🔍 Workflow run URL: https://github.com/WordPress/gutenberg/actions/runs/11904578790
📝 Reported issues:

@aaronrobertshaw aaronrobertshaw marked this pull request as ready for review November 19, 2024 01:43
Copy link

github-actions bot commented Nov 19, 2024

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.

If you're merging code through a pull request on GitHub, copy and paste the following into the bottom of the merge commit message.

Co-authored-by: aaronrobertshaw <aaronrobertshaw@git.wordpress.org>
Co-authored-by: ramonjd <ramonopoly@git.wordpress.org>
Co-authored-by: yogeshbhutkar <yogeshbhutkar@git.wordpress.org>
Co-authored-by: Anuj-Rathore24 <anujrathore24@git.wordpress.org>
Co-authored-by: shimotmk <shimotomoki@git.wordpress.org>

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

@aaronrobertshaw aaronrobertshaw requested review from talldan, ramonjd and tellthemachines and removed request for tellthemachines November 19, 2024 01:43
@ramonjd
Copy link
Member

ramonjd commented Nov 20, 2024

Given my list block in the editor:

Screenshot 2024-11-20 at 2 07 52 pm

Here's the frontend:

Trunk This PR
Screenshot 2024-11-20 at 2 07 41 pm Screenshot 2024-11-20 at 2 07 35 pm

Images, buttons and their alternative styles appear as expected (I can't see any regressions)

Screenshot 2024-11-20 at 2 14 58 pm

Copy link
Member

@ramonjd ramonjd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Thanks for the instructions and unit tests. 🚢

@aaronrobertshaw aaronrobertshaw merged commit 7d8dee1 into trunk Nov 20, 2024
70 checks passed
@aaronrobertshaw aaronrobertshaw deleted the fix/complex-variation-selectors-when-using-selectors-api branch November 20, 2024 03:57
@github-actions github-actions bot added this to the Gutenberg 19.8 milestone Nov 20, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
[Feature] Block Style Variations Issues or PRs that are related to the style variations for blocks [Type] Bug An existing feature does not function as intended
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Adding a block style with a border to a list block does not work on the front screen
2 participants