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 Featured Image: Fix borders after addition of overlay feature #44286

Merged
merged 6 commits into from
Sep 27, 2022
Merged

Post Featured Image: Fix borders after addition of overlay feature #44286

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bf8838b
Add overlay to post featured image border selectors
aaronrobertshaw Sep 20, 2022
85f38a0
Fix borders on overlays for individual blocks
aaronrobertshaw Sep 21, 2022
b388f34
Provide a fallback border style
aaronrobertshaw Sep 21, 2022
1d9bd9a
Make the editor markup match frontend
aaronrobertshaw Sep 21, 2022
b0eeade
Remove fallback for theme.json border style
aaronrobertshaw Sep 23, 2022
84def8b
Reduce unnecessary specificity in styles
aaronrobertshaw Sep 23, 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
2 changes: 1 addition & 1 deletion packages/block-library/src/post-featured-image/block.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
"color": true,
"radius": true,
"width": true,
"__experimentalSelector": "img, .block-editor-media-placeholder",
"__experimentalSelector": "img, .block-editor-media-placeholder, .wp-block-post-featured-image__overlay",
"__experimentalSkipSerialization": true,
"__experimentalDefaultControls": {
"color": true,
Expand Down
42 changes: 18 additions & 24 deletions packages/block-library/src/post-featured-image/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,16 +76,25 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
$has_custom_gradient = isset( $attributes['customGradient'] ) && $attributes['customGradient'];
$has_solid_overlay = isset( $attributes['overlayColor'] ) && $attributes['overlayColor'];
$has_custom_overlay = isset( $attributes['customOverlayColor'] ) && $attributes['customOverlayColor'];
$class_names = array(
'wp-block-post-featured-image__overlay',
);
$styles_properties = array();
$class_names = array( 'wp-block-post-featured-image__overlay' );
$styles = array();

if ( ! $has_dim_background ) {
return '';
}

// Generate required classes for the element.
// Apply border classes and styles.
$border_attributes = get_block_core_post_featured_image_border_attributes( $attributes );

if ( ! empty( $border_attributes['class'] ) ) {
$class_names[] = $border_attributes['class'];
}

if ( ! empty( $border_attributes['style'] ) ) {
$styles[] = $border_attributes['style'];
}

// Apply overlay and gradient classes.
if ( $has_dim_background ) {
$class_names[] = 'has-background-dim';
$class_names[] = "has-background-dim-{$attributes['dimRatio']}";
Expand All @@ -103,35 +112,20 @@ function get_block_core_post_featured_image_overlay_element_markup( $attributes
$class_names[] = "has-{$attributes['gradient']}-gradient-background";
}

// Generate required CSS properties and their values.
if ( ! empty( $attributes['style']['border']['radius'] ) ) {
$styles_properties['border-radius'] = $attributes['style']['border']['radius'];
}

if ( ! empty( $attributes['style']['border']['width'] ) ) {
$styles_properties['border-width'] = $attributes['style']['border']['width'];
}

// Apply background styles.
if ( $has_custom_gradient ) {
$styles_properties['background-image'] = $attributes['customGradient'];
$styles[] = sprintf( 'background-image: %s;', $attributes['customGradient'] );
}

if ( $has_custom_overlay ) {
$styles_properties['background-color'] = $attributes['customOverlayColor'];
}

$styles = '';

foreach ( $styles_properties as $style_attribute => $style_attribute_value ) {
$styles .= "{$style_attribute}: $style_attribute_value; ";
$styles[] = sprintf( 'background-color: %s;', $attributes['customOverlayColor'] );
}

return sprintf(
'<span class="%s" style="%s" aria-hidden="true"></span>',
esc_attr( implode( ' ', $class_names ) ),
esc_attr( trim( $styles ) )
esc_attr( safecss_filter_attr( implode( ' ', $styles ) ) )
);

}

/**
Expand Down
31 changes: 17 additions & 14 deletions packages/block-library/src/post-featured-image/overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,20 +47,23 @@ const Overlay = ( {

return (
<>
<span
aria-hidden="true"
className={ classnames(
'wp-block-post-featured-image__overlay',
dimRatioToClass( dimRatio ),
{
[ overlayColor.class ]: overlayColor.class,
'has-background-dim': dimRatio !== undefined,
'has-background-gradient': gradientValue,
[ gradientClass ]: gradientClass,
}
) }
style={ overlayStyles }
/>
{ !! dimRatio && (
aaronrobertshaw marked this conversation as resolved.
Show resolved Hide resolved
<span
aria-hidden="true"
className={ classnames(
'wp-block-post-featured-image__overlay',
dimRatioToClass( dimRatio ),
{
[ overlayColor.class ]: overlayColor.class,
'has-background-dim': dimRatio !== undefined,
'has-background-gradient': gradientValue,
[ gradientClass ]: gradientClass,
},
borderProps.className
) }
style={ overlayStyles }
/>
) }
<InspectorControls __experimentalGroup="color">
<ColorGradientSettingsDropdown
__experimentalHasMultipleOrigins
Expand Down
5 changes: 5 additions & 0 deletions packages/block-library/src/post-featured-image/style.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
box-sizing: border-box;
}

:where(img),
:where(.wp-block-post-featured-image__overlay) {
border-style: solid;
aaronrobertshaw marked this conversation as resolved.
Show resolved Hide resolved
}
aaronrobertshaw marked this conversation as resolved.
Show resolved Hide resolved

&.alignwide img,
&.alignfull img {
width: 100%;
Expand Down