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.

Sign up for GitHub

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

Post Title: Add support for text decoration #38986

Closed
wants to merge 2 commits into from
Closed

Post Title: Add support for text decoration #38986

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56924a7
Post Title: Add support for text decoration
scruffian Feb 22, 2022
53ffbd0
restore output escaping
scruffian Feb 22, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/block-library/src/post-title/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"__experimentalFontFamily": true,
"__experimentalFontWeight": true,
"__experimentalFontStyle": true,
"__experimentalTextDecoration": true,
"__experimentalTextTransform": true,
"__experimentalLetterSpacing": true,
"__experimentalDefaultControls": {
Expand Down
13 changes: 11 additions & 2 deletions packages/block-library/src/post-title/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,19 @@ function render_block_core_post_title( $attributes, $content, $block ) {
$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . $attributes['level'];
}

$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );

if ( isset( $attributes['isLink'] ) && $attributes['isLink'] ) {
$title = sprintf( '<a href="%1$s" target="%2$s" rel="%3$s">%4$s</a>', get_the_permalink( $post_ID ), esc_attr( $attributes['linkTarget'] ), esc_attr( $attributes['rel'] ), $title );
return sprintf(
'<%1$s><a href="%2$s" target="%3$s" rel="%4$s" %5$s>%6$s</a></%1$s>',
Copy link
Contributor

Choose a reason for hiding this comment

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

Where did $tag_name come from? Why do we now have a wrapping element?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Previously this was output to a $title variable. $title was then wrapped in a wrapping element after the if statement.

This change simply returns the whole markup rather than creating a variable, which I thought was easier to read than having multiple if statements.

Copy link
Contributor

Choose a reason for hiding this comment

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

I appreciate this might seem like a nit pick, but in order to keep this PR focused I really think we should go back to the previous setup whereby we had a single return statement.

Why?

Having two return statements means the HTML output is effectively generated in x2 places thus increasingly the complexity of reasoning around the code. It also doubles the surface area for the introduction of XSS bugs (as evidenced by the original omission of the esc_* functions in this PR).

$tag_name,
get_the_permalink( $post_ID ),
esc_attr( $attributes['linkTarget'] ),
esc_attr( $attributes['rel'] ),
$wrapper_attributes,
Copy link
Contributor

Choose a reason for hiding this comment

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

We're now applying the wrapper_attributes to the <a> as opposed to the wrapping tag. What are the impacts on this on Theme styling and potential regressions?

$title
);
}
$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => $align_class_name ) );

return sprintf(
'<%1$s %2$s>%3$s</%1$s>',
Expand Down