add scale if height is set

WordPress · May 10, 2021 · 2c4edcc · 2c4edcc
1 parent d706e84
commit 2c4edcc
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/packages/block-library/src/post-featured-image/dimension-controls.js b/packages/block-library/src/post-featured-image/dimension-controls.js
@@ -59,7 +59,6 @@ const DimensionControls = ( {
 	attributes: { width, height, scale },
 	setAttributes,
 } ) => {
-	const dimensionsAreSet = width && height;
 	const onDimensionChange = ( dimension, nextValue ) => {
 		setAttributes( {
 			[ dimension ]: parseFloat( nextValue ) < 0 ? '0' : nextValue,
@@ -92,7 +91,7 @@ const DimensionControls = ( {
 					/>
 				</FlexItem>
 			</Flex>
-			{ dimensionsAreSet && (
+			{ !! height && (
 				<>
 					<BaseControl
 						aria-label={ scaleLabel }

diff --git a/packages/block-library/src/post-featured-image/edit.js b/packages/block-library/src/post-featured-image/edit.js
@@ -90,7 +90,7 @@ function PostFeaturedImageDisplay( {
 			<img
 				src={ media.source_url }
 				alt={ media.alt_text || __( 'Featured image' ) }
-				style={ { height, objectFit: height && width && scale } }
+				style={ { height, objectFit: height && scale } }
 			/>
 		);
 	}

diff --git a/packages/block-library/src/post-featured-image/index.php b/packages/block-library/src/post-featured-image/index.php
@@ -38,17 +38,14 @@ function render_block_core_post_featured_image( $attributes, $content, $block )
 		$wrapper_attributes = get_block_wrapper_attributes( array( 'style' => "width:{$attributes['width']};" ) );
 	}
 
-	$image_styles = '';
 	if ( $has_height ) {
 		$image_styles = "height:{$attributes['height']};";
-	}
-	if ( $has_height && $has_width && ! empty( $attributes['scale'] ) ) {
-		$image_styles .= "object-fit:{$attributes['scale']};";
-	}
-
-	if ( $image_styles ) {
+		if ( ! empty( $attributes['scale'] ) ) {
+			$image_styles .= "object-fit:{$attributes['scale']};";
+		}
 		$featured_image = str_replace( 'src=', "style='$image_styles' src=", $featured_image );
 	}
+
 	return "<figure $wrapper_attributes>$featured_image</figure>";
 }