Media & Text Block: Add image fill option

packages/block-library/CHANGELOG.md

@@ -6,6 +6,7 @@
 - Add `wide` and `full` alignments to Categories block ([#14533](https://github.com/WordPress/gutenberg/pull/14533)).
 - Add all alignment options to RSS block ([#14533](https://github.com/WordPress/gutenberg/pull/14533)).
 - Add all alignment options to Search block ([#14533](https://github.com/WordPress/gutenberg/pull/14533)).
+- Add image fill option and focal point picker to Media & Text block ([#14445](https://github.com/WordPress/gutenberg/pull/14445)).
 - Updated the edit flow of the `image` block, updated the edit icon and unified the image editing in only one UI based on `MediaPlaceholder`
 
 ### Bug Fixes

packages/block-library/src/media-text/deprecated.js

@@ -0,0 +1,107 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+import { noop } from 'lodash';
+
+/**
+ * WordPress dependencies
+ */
+import {
+	InnerBlocks,
+	getColorClassName,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { DEFAULT_MEDIA_WIDTH } from './index';
+
+export default [
+	{
+		attributes: {
+			align: {
+				type: 'string',
+				default: 'wide',
+			},
+			backgroundColor: {
+				type: 'string',
+			},
+			customBackgroundColor: {
+				type: 'string',
+			},
+			mediaAlt: {
+				type: 'string',
+				source: 'attribute',
+				selector: 'figure img',
+				attribute: 'alt',
+				default: '',
+			},
+			mediaPosition: {
+				type: 'string',
+				default: 'left',
+			},
+			mediaId: {
+				type: 'number',
+			},
+			mediaUrl: {
+				type: 'string',
+				source: 'attribute',
+				selector: 'figure video,figure img',
+				attribute: 'src',
+			},
+			mediaType: {
+				type: 'string',
+			},
+			mediaWidth: {
+				type: 'number',
+				default: 50,
+			},
+			isStackedOnMobile: {
+				type: 'boolean',
+				default: false,
+			},
+		},
+		save( { attributes } ) {
+			const {
+				backgroundColor,
+				customBackgroundColor,
+				isStackedOnMobile,
+				mediaAlt,
+				mediaPosition,
+				mediaType,
+				mediaUrl,
+				mediaWidth,
+			} = attributes;
+			const mediaTypeRenders = {
+				image: () => <img src={ mediaUrl } alt={ mediaAlt } />,
+				video: () => <video controls src={ mediaUrl } />,
+			};
+			const backgroundClass = getColorClassName( 'background-color', backgroundColor );
+			const className = classnames( {
+				'has-media-on-the-right': 'right' === mediaPosition,
+				[ backgroundClass ]: backgroundClass,
+				'is-stacked-on-mobile': isStackedOnMobile,
+			} );
+
+			let gridTemplateColumns;
+			if ( mediaWidth !== DEFAULT_MEDIA_WIDTH ) {
+				gridTemplateColumns = 'right' === mediaPosition ? `auto ${ mediaWidth }%` : `${ mediaWidth }% auto`;
+			}
+			const style = {
+				backgroundColor: backgroundClass ? undefined : customBackgroundColor,
+				gridTemplateColumns,
+			};
+			return (
+				<div className={ className } style={ style }>
+					<figure className="wp-block-media-text__media" >
+						{ ( mediaTypeRenders[ mediaType ] || noop )() }
+					</figure>
+					<div className="wp-block-media-text__content">
+						<InnerBlocks.Content />
+					</div>
+				</div>
+			);
+		},
+	},
+];

packages/block-library/src/media-text/edit.js

@@ -23,6 +23,7 @@ import {
 	ToggleControl,
 	Toolbar,
 	ExternalLink,
+	FocalPointPicker,
 } from '@wordpress/components';
 /**
  * Internal dependencies
@@ -77,6 +78,8 @@ class MediaTextEdit extends Component {
 			mediaId: media.id,
 			mediaType,
 			mediaUrl: src || media.url,
+			imageFill: undefined,
+			focalPoint: undefined,
 		} );
 	}
 
@@ -99,15 +102,15 @@ class MediaTextEdit extends Component {
 
 	renderMediaArea() {
 		const { attributes } = this.props;
-		const { mediaAlt, mediaId, mediaPosition, mediaType, mediaUrl, mediaWidth } = attributes;
+		const { mediaAlt, mediaId, mediaPosition, mediaType, mediaUrl, mediaWidth, imageFill, focalPoint } = attributes;
 
 		return (
 			<MediaContainer
 				className="block-library-media-text__media-container"
 				onSelectMedia={ this.onSelectMedia }
 				onWidthChange={ this.onWidthChange }
 				commitWidthChange={ this.commitWidthChange }
-				{ ...{ mediaAlt, mediaId, mediaType, mediaUrl, mediaPosition, mediaWidth } }
+				{ ...{ mediaAlt, mediaId, mediaType, mediaUrl, mediaPosition, mediaWidth, imageFill, focalPoint } }
 			/>
 		);
 	}
@@ -128,6 +131,9 @@ class MediaTextEdit extends Component {
 			mediaType,
 			mediaWidth,
 			verticalAlignment,
+			mediaUrl,
+			imageFill,
+			focalPoint,
 		} = attributes;
 		const temporaryMediaWidth = this.state.mediaWidth;
 		const classNames = classnames( className, {
@@ -136,6 +142,7 @@ class MediaTextEdit extends Component {
 			[ backgroundColor.class ]: backgroundColor.class,
 			'is-stacked-on-mobile': isStackedOnMobile,
 			[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
+			'is-image-fill': imageFill,
 		} );
 		const widthString = `${ temporaryMediaWidth || mediaWidth }%`;
 		const style = {
@@ -173,6 +180,19 @@ class MediaTextEdit extends Component {
 						isStackedOnMobile: ! isStackedOnMobile,
 					} ) }
 				/>
+				{ mediaType === 'image' && ( <ToggleControl
+					label={ __( 'Crop image to fill entire column' ) }
+					checked={ imageFill }
+					onChange={ () => setAttributes( {
+						imageFill: ! imageFill,
+					} ) }
+				/> ) }
+				{ imageFill && ( <FocalPointPicker
+					label={ __( 'Focal Point Picker' ) }
+					url={ mediaUrl }
+					value={ focalPoint }
+					onChange={ ( value ) => setAttributes( { focalPoint: value } ) }
+				/> ) }
 				{ mediaType === 'image' && ( <TextareaControl
 					label={ __( 'Alt Text (Alternative Text)' ) }
 					value={ mediaAlt }

packages/block-library/src/media-text/editor.scss

@@ -22,6 +22,11 @@
 	width: 100% !important;
 }
 
+.wp-block-media-text.is-image-fill .editor-media-container__resizer {
+	// The resizer sets an inline height but for the image fill we set it to full height.
+	height: 100% !important;
+}
+
 .wp-block-media-text .block-editor-inner-blocks {
 	word-break: break-word;
 	grid-area: media-text-content;

packages/block-library/src/media-text/index.js

@@ -19,8 +19,10 @@ import { __ } from '@wordpress/i18n';
  */
 import edit from './edit';
 import icon from './icon';
+import deprecated from './deprecated';
+import { imageFillStyles } from './media-container';
 
-const DEFAULT_MEDIA_WIDTH = 50;
+export const DEFAULT_MEDIA_WIDTH = 50;
 
 export const name = 'core/media-text';
 
@@ -69,6 +71,12 @@ const blockAttributes = {
 	verticalAlignment: {
 		type: 'string',
 	},
+	imageFill: {
+		type: 'boolean',
+	},
+	focalPoint: {
+		type: 'object',
+	},
 };
 
 export const settings = {
@@ -160,6 +168,8 @@ export const settings = {
 			mediaWidth,
 			mediaId,
 			verticalAlignment,
+			imageFill,
+			focalPoint,
 		} = attributes;
 		const mediaTypeRenders = {
 			image: () => <img src={ mediaUrl } alt={ mediaAlt } className={ ( mediaId && mediaType === 'image' ) ? `wp-image-${ mediaId }` : null } />,
@@ -171,7 +181,9 @@ export const settings = {
 			[ backgroundClass ]: backgroundClass,
 			'is-stacked-on-mobile': isStackedOnMobile,
 			[ `is-vertically-aligned-${ verticalAlignment }` ]: verticalAlignment,
+			'is-image-fill': imageFill,
 		} );
+		const backgroundStyles = imageFill ? imageFillStyles( mediaUrl, focalPoint ) : {};
 
 		let gridTemplateColumns;
 		if ( mediaWidth !== DEFAULT_MEDIA_WIDTH ) {
@@ -183,7 +195,7 @@ export const settings = {
 		};
 		return (
 			<div className={ className } style={ style }>
-				<figure className="wp-block-media-text__media" >
+				<figure className="wp-block-media-text__media" style={ backgroundStyles }>
 					{ ( mediaTypeRenders[ mediaType ] || noop )() }
 				</figure>
 				<div className="wp-block-media-text__content">
@@ -193,50 +205,5 @@ export const settings = {
 		);
 	},
 
-	deprecated: [
-		{
-			attributes: blockAttributes,
-			save( { attributes } ) {
-				const {
-					backgroundColor,
-					customBackgroundColor,
-					isStackedOnMobile,
-					mediaAlt,
-					mediaPosition,
-					mediaType,
-					mediaUrl,
-					mediaWidth,
-				} = attributes;
-				const mediaTypeRenders = {
-					image: () => <img src={ mediaUrl } alt={ mediaAlt } />,
-					video: () => <video controls src={ mediaUrl } />,
-				};
-				const backgroundClass = getColorClassName( 'background-color', backgroundColor );
-				const className = classnames( {
-					'has-media-on-the-right': 'right' === mediaPosition,
-					[ backgroundClass ]: backgroundClass,
-					'is-stacked-on-mobile': isStackedOnMobile,
-				} );
-
-				let gridTemplateColumns;
-				if ( mediaWidth !== DEFAULT_MEDIA_WIDTH ) {
-					gridTemplateColumns = 'right' === mediaPosition ? `auto ${ mediaWidth }%` : `${ mediaWidth }% auto`;
-				}
-				const style = {
-					backgroundColor: backgroundClass ? undefined : customBackgroundColor,
-					gridTemplateColumns,
-				};
-				return (
-					<div className={ className } style={ style }>
-						<figure className="wp-block-media-text__media" >
-							{ ( mediaTypeRenders[ mediaType ] || noop )() }
-						</figure>
-						<div className="wp-block-media-text__content">
-							<InnerBlocks.Content />
-						</div>
-					</div>
-				);
-			},
-		},
-	],
+	deprecated,
 };

packages/block-library/src/media-text/media-container.js

@@ -21,6 +21,15 @@ import icon from './media-container-icon';
  */
 const ALLOWED_MEDIA_TYPES = [ 'image', 'video' ];
 
+export function imageFillStyles( url, focalPoint ) {
+	return url ?
+		{
+			backgroundImage: `url(${ url })`,
+			backgroundPosition: focalPoint ? `${ focalPoint.x * 100 }% ${ focalPoint.y * 100 }%` : `initial`,
+		} :
+		{};
+}
+
 class MediaContainer extends Component {
 	renderToolbarEditButton() {
 		const { mediaId, onSelectMedia } = this.props;
@@ -46,11 +55,12 @@ class MediaContainer extends Component {
 	}
 
 	renderImage() {
-		const { mediaAlt, mediaUrl, className } = this.props;
+		const { mediaAlt, mediaUrl, className, imageFill, focalPoint } = this.props;
+		const backgroundStyles = imageFill ? imageFillStyles( mediaUrl, focalPoint ) : {};
 		return (
 			<Fragment>
 				{ this.renderToolbarEditButton() }
-				<figure className={ className }>
+				<figure className={ className } style={ backgroundStyles }>
 					<img src={ mediaUrl } alt={ mediaAlt } />
 				</figure>
 			</Fragment>

packages/block-library/src/media-text/style.scss

@@ -41,6 +41,24 @@
 	vertical-align: middle;
 }
 
+.wp-block-media-text.is-image-fill figure {
+	height: 100%;
+	min-height: 250px;
+	background-size: cover;
+}
+
+.wp-block-media-text.is-image-fill figure > img {
+	// The image is visually hidden but accessible to assistive technologies.
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	border: 0;
+}
+
 /*
 * Here we here not able to use a mobile first CSS approach.
 * Custom widths are set using inline styles, and on mobile,

packages/e2e-tests/fixtures/blocks/core__media-text__image-fill-no-focal-point-selected.html

@@ -0,0 +1,13 @@
+<!-- wp:media-text {"mediaId":11,"mediaType":"image","imageFill":true} -->
+<div class="wp-block-media-text alignwide is-image-fill">
+	<figure class="wp-block-media-text__media"
+		style="background-image:url(http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg);background-position:initial">
+		<img src="http://localhost:8888/wp-content/uploads/2019/03/Dzts-v2X0AMxju_-1024x1024.jpg" alt="My alt text"
+			class="wp-image-11" /></figure>
+	<div class="wp-block-media-text__content">
+		<!-- wp:paragraph {"placeholder":"Content…","fontSize":"large"} -->
+		<p class="has-large-font-size">My Content</p>
+		<!-- /wp:paragraph -->
+	</div>
+</div>
+<!-- /wp:media-text -->