From e0723a7068cd56cb83bb80ded67444d7676aa4f8 Mon Sep 17 00:00:00 2001
From: Glen Davies <glen.davies@a8c.com>
Date: Mon, 14 Dec 2020 07:21:58 +1300
Subject: [PATCH] Move block props to the outer wrapper

---
 packages/block-library/src/image/edit.js | 5 +++--
 packages/block-library/src/image/save.js | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index a4414ff85785d1..744bd77f20909f 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -307,6 +307,7 @@ export function ImageEdit( {
 		'is-resized': !! width || !! height,
 		'is-focused': isSelected,
 		[ `size-${ sizeSlug }` ]: sizeSlug,
+		'list-image': isListItem,
 	} );
 
 	const blockProps = useBlockProps( {
@@ -333,8 +334,8 @@ export function ImageEdit( {
 		return (
 			<>
 				{ controls }
-				<li className="list-image">
-					<figure { ...blockProps }>
+				<li { ...blockProps }>
+					<figure>
 						{ image }
 						{ mediaPlaceholder }
 					</figure>
diff --git a/packages/block-library/src/image/save.js b/packages/block-library/src/image/save.js
index 9db1cf1e15a779..868db590e9a58e 100644
--- a/packages/block-library/src/image/save.js
+++ b/packages/block-library/src/image/save.js
@@ -33,6 +33,7 @@ export default function save( { attributes } ) {
 		[ `align${ align }` ]: align,
 		[ `size-${ sizeSlug }` ]: sizeSlug,
 		'is-resized': width || height,
+		'list-image': isListItem,
 	} );
 
 	const image = (
@@ -69,8 +70,8 @@ export default function save( { attributes } ) {
 	const blockProps = useBlockProps.save( { className: classes } );
 	if ( isListItem ) {
 		return (
-			<li className="list-image">
-				<figure { ...blockProps }>{ figure }</figure>
+			<li { ...blockProps }>
+				<figure>{ figure }</figure>
 			</li>
 		);
 	}