From f69033d95dae1861d24a2ddbb565c0e94b037dc6 Mon Sep 17 00:00:00 2001
From: Ricardo Artemio Morales <ric.morales22@gmail.com>
Date: Fri, 6 Oct 2023 17:31:39 -0500
Subject: [PATCH 1/2] Disable lightbox UI and add help text for linked images

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

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index d49a8f7cd0578..0c43b02ac15cd 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -377,6 +377,8 @@ export default function Image( {
 	const lightboxChecked =
 		!! lightbox?.enabled || ( ! lightbox && !! lightboxSetting?.enabled );
 
+	const lightboxToggleDisabled = linkDestination !== 'none';
+
 	const dimensionsControl = (
 		<DimensionsTool
 			value={ { width, height, scale, aspectRatio } }
@@ -555,6 +557,14 @@ export default function Image( {
 										lightbox: { enabled: newValue },
 									} );
 								} }
+								disabled={ lightboxToggleDisabled }
+								help={
+									lightboxToggleDisabled
+										? __(
+												'Expand on Click is disabled for linked images.'
+										  )
+										: ''
+								}
 							/>
 						</ToolsPanelItem>
 					) }

From 5542a3128aac687b045faaf2de483bd5f32e9dbe Mon Sep 17 00:00:00 2001
From: Ricardo Artemio Morales <ric.morales22@gmail.com>
Date: Wed, 11 Oct 2023 02:54:43 -0500
Subject: [PATCH 2/2] Update help text

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

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index 0c43b02ac15cd..1f602c4380e88 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -561,7 +561,7 @@ export default function Image( {
 								help={
 									lightboxToggleDisabled
 										? __(
-												'Expand on Click is disabled for linked images.'
+												'“Expand on click” scales the image up, and can’t be combined with a link.'
 										  )
 										: ''
 								}