From cfcfa022c9c65f2bad90dbb8f72075c4e88dfe30 Mon Sep 17 00:00:00 2001
From: Jerry Jones <jones.jeremydavid@gmail.com>
Date: Thu, 12 Sep 2024 10:04:10 -0500
Subject: [PATCH] Put replace media flow in own group depending on contentOnly
 or not

---
 packages/block-library/src/image/image.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 60d83f8912907..1673d36e463d5 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -559,7 +559,8 @@ export default function Image( {
 	const mediaReplaceFlow = isSingleSelected &&
 		! isEditingImage &&
 		! lockUrlControls && (
-			<BlockControls group="other">
+			// For contentOnly mode, put this button in its own area so it has borders around it.
+			<BlockControls group={ isContentOnlyMode ? 'inline' : 'other' }>
 				<MediaReplaceFlow
 					mediaId={ id }
 					mediaURL={ url }