Handle duplicate image when closing lightbox as well

packages/block-library/src/image/index.php

@@ -230,7 +230,8 @@ function block_core_image_render_lightbox( $block_content, $block ) {
 	// contain a caption, and we don't want to trigger the lightbox when the
 	// caption is clicked.
 	$p->set_attribute( 'data-wp-on-async--click', 'actions.showLightbox' );
-	$p->set_attribute( 'data-wp-class--hide', 'state.overlayOpened' );
+	$p->set_attribute( 'data-wp-class--hide', 'state.contentImageHide' );
+	$p->set_attribute( 'data-wp-class--show', 'state.contentImageShow' );
 
 	$body_content = $p->get_updated_html();
 

packages/block-library/src/image/style.scss

@@ -11,7 +11,11 @@
 		box-sizing: border-box;
 
 		&.hide {
-			opacity: 0;
+			visibility: hidden;
+		}
+
+		&.show {
+			animation: show-content-image 0.4s;
 		}
 	}
 
@@ -323,6 +327,18 @@
 	}
 }
 
+@keyframes show-content-image {
+	0% {
+		visibility: hidden;
+	}
+	99% {
+		visibility: hidden;
+	}
+	100% {
+		visibility: visible;
+	}
+}
+
 @keyframes turn-on-visibility {
 	0% {
 		opacity: 0;

packages/block-library/src/image/view.js

@@ -59,6 +59,19 @@ const { state, actions, callbacks } = store(
 				const { imageId } = getContext();
 				return state.metadata[ imageId ].imageButtonTop;
 			},
+			get contentImageHide() {
+				const ctx = getContext();
+				return (
+					state.overlayEnabled && state.currentImageId === ctx.imageId
+				);
+			},
+			get contentImageShow() {
+				const ctx = getContext();
+				return (
+					! state.overlayEnabled &&
+					state.currentImageId === ctx.imageId
+				);
+			},
 		},
 		actions: {
 			showLightbox() {
@@ -75,8 +88,8 @@ const { state, actions, callbacks } = store(
 				state.scrollLeftReset = document.documentElement.scrollLeft;
 
 				// Sets the current expanded image in the state and enables the overlay.
-				state.currentImageId = imageId;
 				state.overlayEnabled = true;
+				state.currentImageId = imageId;
 
 				// Computes the styles of the overlay for the animation.
 				callbacks.setOverlayStyles();