From 04d282421c3d2a79c7bfafa896b3726c13675b0b Mon Sep 17 00:00:00 2001
From: Karen Attfield <karenlattfield@gmail.com>
Date: Fri, 3 Jan 2025 12:31:02 +0000
Subject: [PATCH] Replacing the figure with the div, to prevent style issues
 with the enclosing extra container

---
 .../tiled-gallery/gallery-image/edit.js       | 68 +++++++++----------
 1 file changed, 32 insertions(+), 36 deletions(-)

diff --git a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
index 723e60e46f1e7..84ed896b32f2f 100644
--- a/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
+++ b/projects/plugins/jetpack/extensions/blocks/tiled-gallery/gallery-image/edit.js
@@ -111,52 +111,48 @@ class GalleryImageEdit extends Component {
 		return (
 			// The image itself is not meant to be interactive, but the enclosing element should be.
 			<div
-				className={ clsx( 'tiled-gallery__item-container' ) }
+				className={ clsx( 'tiled-gallery__item', {
+					'is-selected': isSelected,
+					'is-transient': isTransient,
+					[ `filter__${ imageFilter }` ]: !! imageFilter,
+				} ) }
 				tabIndex="0"
 				role="button"
 				onClick={ this.onImageClick }
 				onKeyDown={ this.onImageKeyDown }
 				aria-label={ ariaLabel }
 			>
-				<figure
-					className={ clsx( 'tiled-gallery__item', {
-						'is-selected': isSelected,
-						'is-transient': isTransient,
-						[ `filter__${ imageFilter }` ]: !! imageFilter,
-					} ) }
-				>
-					{ showMovers && (
-						<div className="tiled-gallery__item__move-menu">
-							<Button
-								icon={ columns === 1 ? upChevron : leftChevron }
-								onClick={ isFirstItem ? undefined : onMoveBackward }
-								className="tiled-gallery__item__move-backward"
-								label={ __( 'Move image backward', 'jetpack' ) }
-								aria-disabled={ isFirstItem }
-								disabled={ ! isSelected }
-							/>
-							<Button
-								icon={ columns === 1 ? downChevron : rightChevron }
-								onClick={ isLastItem ? undefined : onMoveForward }
-								className="tiled-gallery__item__move-forward"
-								label={ __( 'Move image forward', 'jetpack' ) }
-								aria-disabled={ isLastItem }
-								disabled={ ! isSelected }
-							/>
-						</div>
-					) }
-					<div className="tiled-gallery__item__inline-menu">
+				{ showMovers && (
+					<div className="tiled-gallery__item__move-menu">
 						<Button
-							icon={ close }
-							onClick={ onRemove }
-							className="tiled-gallery__item__remove"
-							label={ __( 'Remove image', 'jetpack' ) }
+							icon={ columns === 1 ? upChevron : leftChevron }
+							onClick={ isFirstItem ? undefined : onMoveBackward }
+							className="tiled-gallery__item__move-backward"
+							label={ __( 'Move image backward', 'jetpack' ) }
+							aria-disabled={ isFirstItem }
+							disabled={ ! isSelected }
+						/>
+						<Button
+							icon={ columns === 1 ? downChevron : rightChevron }
+							onClick={ isLastItem ? undefined : onMoveForward }
+							className="tiled-gallery__item__move-forward"
+							label={ __( 'Move image forward', 'jetpack' ) }
+							aria-disabled={ isLastItem }
 							disabled={ ! isSelected }
 						/>
 					</div>
-					{ /* Keep the <a> HTML structure, but ensure there is no navigation from edit */ }
-					{ href ? <a aria-hidden="true">{ img }</a> : img }
-				</figure>
+				) }
+				<div className="tiled-gallery__item__inline-menu">
+					<Button
+						icon={ close }
+						onClick={ onRemove }
+						className="tiled-gallery__item__remove"
+						label={ __( 'Remove image', 'jetpack' ) }
+						disabled={ ! isSelected }
+					/>
+				</div>
+				{ /* Keep the <a> HTML structure, but ensure there is no navigation from edit */ }
+				{ href ? <a aria-hidden="true">{ img }</a> : img }
 			</div>
 		);
 	}