get_block_wrapper_attributes: Ensures that user-provided attributes override the attributes generated by block supports#10922
Conversation
…verride the attributes generated by block supports
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
|
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 Core Committers: Use this line as a base for the props when committing in SVN: To understand the WordPress project's expectations around crediting contributors, please review the Contributor Attribution page in the Core Handbook. |
Test using WordPress PlaygroundThe 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
For more details about these limitations and more, check out the Limitations page in the WordPress Playground documentation. |
|
|
||
| $attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ]; | ||
| if ( $is_merged ) { | ||
| $attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ]; |
There was a problem hiding this comment.
For posterity, #10877 (comment):
In the case of merging
style, should special handling be added to ensure that$extra_attributes[ $attribute_name ]ends in a semicolon? The current empty space is only really appropriate forclass.
|
Sorry for the late reply. After some consideration, I decided to refactor the
|
| $new_attribute = is_string( $new_attribute ) ? $new_attribute : ''; | ||
| $extra_attribute = is_string( $extra_attribute ) ? $extra_attribute : ''; |
There was a problem hiding this comment.
Sanitize non-string attribute values here.
| ); | ||
|
|
||
| $expected_classes = 'foo-bar-class wp-block-example has-text-color has-red-color has-background has-black-background-color'; | ||
| $expected_styles = 'test: style;'; |
There was a problem hiding this comment.
We shouldn't have used the invalid inline styles in the test in the first place.
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
| wp_parse_list( $extra_attribute ), | ||
| wp_parse_list( $new_attribute ) |
There was a problem hiding this comment.
While uncommon, a class name can technically contain a comma. It just has to be escaped in CSS. See CodePen.
The use of wp_parse_list() will split on commas too, as seen in PHP Playground.
So I think it would be safer to just use preg_split() directly:
| wp_parse_list( $extra_attribute ), | |
| wp_parse_list( $new_attribute ) | |
| preg_split( '/\s+/', $extra_attribute, -1, PREG_SPLIT_NO_EMPTY ), | |
| preg_split( '/\s+/', $new_attribute, -1, PREG_SPLIT_NO_EMPTY ) |
There was a problem hiding this comment.
But I guess sanitize_html_class() will strip out commas anyway.
There was a problem hiding this comment.
Addressed in 66a9169
I also removed sanitize_html_class sanitizing accordingly.
While it's unlikely any developers would include commas in block class names, it's probably best not to introduce new handling for backward compatibility reasons.
Note
This PR is the same as #10877. I submitted this new PR because I accidentally closed #10877 and it can no longer be reopened.
Trac ticket: https://core.trac.wordpress.org/ticket/64603
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.