Merge branch 'trunk' into fix/order-endpoint-tax-format-incorrect

woocommerce · Nov 16, 2023 · c343f47 · c343f47
2 parents c1f34ea + 2ec01df
commit c343f47
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/assets/js/blocks/product-gallery/frontend.tsx b/assets/js/blocks/product-gallery/frontend.tsx
@@ -10,6 +10,7 @@ interface State {
 export interface ProductGalleryInteractivityApiContext {
 	woocommerce: {
 		selectedImage: string;
+		firstMainImageId: string;
 		imageId: string;
 		visibleImagesIds: string[];
 		dialogVisibleImagesIds: string[];
@@ -40,6 +41,11 @@ interface Actions {
 		handleNextImageButtonClick: {
 			( store: Store ): void;
 		};
+		dialog: {
+			handleCloseButtonClick: {
+				( store: Store ): void;
+			};
+		};
 	};
 }
 
@@ -123,7 +129,9 @@ interactivityApiStore( {
 
 					// Check if the esc key is pressed.
 					if ( event.keyCode === Keys.ESC ) {
-						context.woocommerce.isDialogOpen = false;
+						actions.woocommerce.dialog.handleCloseButtonClick(
+							store
+						);
 					}
 
 					// Check if left arrow key is pressed.
@@ -175,6 +183,10 @@ interactivityApiStore( {
 			dialog: {
 				handleCloseButtonClick: ( { context }: Store ) => {
 					context.woocommerce.isDialogOpen = false;
+
+					// Reset the main image.
+					context.woocommerce.selectedImage =
+						context.woocommerce.firstMainImageId;
 				},
 			},
 			handleSelectImage: ( { context }: Store ) => {

diff --git a/src/BlockTypes/ProductGallery.php b/src/BlockTypes/ProductGallery.php
@@ -139,6 +139,7 @@ protected function render( $attributes, $content, $block ) {
 					array(
 						'woocommerce' => array(
 							'selectedImage'          => $product->get_image_id(),
+							'firstMainImageId'       => $product->get_image_id(),
 							'visibleImagesIds'       => ProductGalleryUtils::get_product_gallery_image_ids( $product, $number_of_thumbnails, true ),
 							'dialogVisibleImagesIds' => ProductGalleryUtils::get_product_gallery_image_ids( $product, null, false ),
 							'mouseIsOverPreviousOrNextButton' => false,

diff --git a/templates/parts/product-gallery.html b/templates/parts/product-gallery.html
@@ -1,6 +1,8 @@
 <!-- wp:group {"layout":{"type":"constrained"}} -->
 <div class="wp-block-group">
-	<!-- wp:woocommerce/product-gallery {"mode":"full"} -->
+	<!-- wp:post-title {"align":"full","__woocommerceNamespace":"woocommerce/product-collection/product-title"} /-->
+
+	<!-- wp:woocommerce/product-gallery {"mode":"full","pagerDisplayMode":"off","align":"wide"} -->
 	<div
 		class="wp-block-woocommerce-product-gallery wc-block-product-gallery wc-block-product-gallery--has-next-previous-buttons-inside-image">
 		<!-- wp:group {"layout":{"type":"flex","flexWrap":"nowrap"}} -->
@@ -24,4 +26,4 @@
 	</div>
 	<!-- /wp:woocommerce/product-gallery -->
 </div>
-<!-- /wp:group -->
+<!-- /wp:group -->