-
Notifications
You must be signed in to change notification settings - Fork 3.3k
get_block_wrapper_attributes: Ensures that user-provided attributes override the attributes generated by block supports #10877
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
base: trunk
Are you sure you want to change the base?
Conversation
…verride the attributes generated by block supports
|
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. |
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
Co-authored-by: Weston Ruter <westonruter@gmail.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just realizing the logic here can be simplified a bit by having a single array that contains the attributes to merge or override:
// This is hardcoded on purpose.
// We only support a fixed list of attributes.
$handled_attributes = array(
'style' => true,
'class' => true,
'id' => false,
'aria-label' => false,
);
$attributes = array();
foreach ( $handled_attributes as $attribute_name => $is_merged ) {
if ( empty( $new_attributes[ $attribute_name ] ) && empty( $extra_attributes[ $attribute_name ] ) ) {
continue;
}
if ( empty( $new_attributes[ $attribute_name ] ) ) {
$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ];
continue;
}
if ( empty( $extra_attributes[ $attribute_name ] ) ) {
$attributes[ $attribute_name ] = $new_attributes[ $attribute_name ];
continue;
}
if ( $is_merged ) {
$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ];
} else {
$attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ];
}
}
foreach ( $extra_attributes as $attribute_name => $value ) {
if ( ! isset( $handled_attributes[ $attribute_name ] ) ) {
$attributes[ $attribute_name ] = $value;
}
}| // We only support a fixed list of attributes. | ||
| $attributes_to_merge = array( 'style', 'class', 'id', 'aria-label' ); | ||
| $attributes = array(); | ||
| $attributes_to_merge = array( 'style', 'class', 'id', 'aria-label' ); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Shouldn't id and aria-label be removed from this list?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Naturally this is irrelevant if #10877 (comment) is adopted.
| continue; | ||
| } | ||
|
|
||
| $attributes[ $attribute_name ] = $extra_attributes[ $attribute_name ] . ' ' . $new_attributes[ $attribute_name ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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 for class.
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.