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

Fix duotone on parallax/repeated featured image cover blocks #65929

Merged
merged 8 commits into from
Oct 15, 2024
Merged

Fix duotone on parallax/repeated featured image cover blocks #65929

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
40df1ce
Fix parallax/repeated featured image covers with duotone
ajlende Oct 7, 2024
06f9438
Fix default background position
ajlende Oct 7, 2024
7ead02b
Match JS attribute order
ajlende Oct 7, 2024
e145280
Fix ternary
ajlende Oct 7, 2024
83281a9
Simplify object_position
ajlende Oct 7, 2024
3aa0043
Remove redundant conditional
ajlende Oct 14, 2024
4f9cb28
Fix alt text source
ajlende Oct 14, 2024
affae2f
Add wp-image class
ajlende Oct 14, 2024
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
57 changes: 38 additions & 19 deletions packages/block-library/src/cover/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,29 +20,22 @@ function render_block_core_cover( $attributes, $content ) {
return $content;
}

$object_position = isset( $attributes['focalPoint'] )
? round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%'
: null;

if ( ! ( $attributes['hasParallax'] || $attributes['isRepeated'] ) ) {
$attr = array(
'class' => 'wp-block-cover__image-background',
'data-object-fit' => 'cover',
);

if ( isset( $attributes['focalPoint'] ) ) {
$object_position = round( $attributes['focalPoint']['x'] * 100 ) . '% ' . round( $attributes['focalPoint']['y'] * 100 ) . '%';
if ( $object_position ) {
$attr['data-object-position'] = $object_position;
$attr['style'] = 'object-position: ' . $object_position;
$attr['style'] = 'object-position:' . $object_position . ';';
}

$image = get_the_post_thumbnail( null, 'post-thumbnail', $attr );

/*
* Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
* and removes eventual whitespace characters between the two (typically introduced at template level)
*/
$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
$offset = $matches[0][1];
$content = substr( $content, 0, $offset ) . $image . substr( $content, $offset );
}
} else {
if ( in_the_loop() ) {
update_post_thumbnail_cache();
Expand All @@ -52,15 +45,41 @@ function render_block_core_cover( $attributes, $content ) {
return $content;
}

$processor = new WP_HTML_Tag_Processor( $content );
$current_thumbnail_id = get_post_thumbnail_id();

$processor = new WP_HTML_Tag_Processor( '<div></div>' );
$processor->next_tag();

$styles = $processor->get_attribute( 'style' );
$merged_styles = ! empty( $styles ) ? $styles . ';' : '';
$merged_styles .= 'background-image:url(' . esc_url( $current_featured_image ) . ');';
$current_alt = trim( strip_tags( get_post_meta( $current_thumbnail_id, '_wp_attachment_image_alt', true ) ) );
if ( $current_alt ) {
$processor->set_attribute( 'role', 'img' );
$processor->set_attribute( 'aria-label', $current_alt );
}

$processor->add_class( 'wp-block-cover__image-background' );
$processor->add_class( 'wp-image-' . $current_thumbnail_id );
if ( $attributes['hasParallax'] ) {
$processor->add_class( 'has-parallax' );
}
if ( $attributes['isRepeated'] ) {
$processor->add_class( 'is-repeated' );
}

$styles = 'background-position:' . ( $object_position ?? '50% 50%' ) . ';';
$styles .= 'background-image:url(' . esc_url( $current_featured_image ) . ');';
$processor->set_attribute( 'style', $styles );

$image = $processor->get_updated_html();
}

$processor->set_attribute( 'style', $merged_styles );
$content = $processor->get_updated_html();
/*
* Inserts the featured image between the (1st) cover 'background' `span` and 'inner_container' `div`,
* and removes eventual whitespace characters between the two (typically introduced at template level)
*/
$inner_container_start = '/<div\b[^>]+wp-block-cover__inner-container[\s|"][^>]*>/U';
if ( 1 === preg_match( $inner_container_start, $content, $matches, PREG_OFFSET_CAPTURE ) ) {
$offset = $matches[0][1];
$content = substr( $content, 0, $offset ) . $image . substr( $content, $offset );
Comment on lines +75 to +82
Copy link
Contributor Author

@ajlende ajlende Oct 7, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

Moved from L37-L45 above as both branches of the conditional need to insert content in the same place.

}

return $content;
Expand Down
Loading