Commit b8731725741 for woocommerce

commit b8731725741d92f96a2dab6f2f1476f0f093fb1e
Author: Vladimir Reznichenko <kalessil@gmail.com>
Date:   Wed Nov 18 08:41:44 2026 +0100

    [Performance] Introduce lazy block registration for product display blocks (#70914)

diff --git a/plugins/woocommerce/changelog/performance-optimize-blocks-registration-product-display-blocks b/plugins/woocommerce/changelog/performance-optimize-blocks-registration-product-display-blocks
new file mode 100644
index 00000000000..0a683bd079f
--- /dev/null
+++ b/plugins/woocommerce/changelog/performance-optimize-blocks-registration-product-display-blocks
@@ -0,0 +1,4 @@
+Significance: minor
+Type: performance
+
+Introduced lazy block registration for product display elements blocks.
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/image/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/image/block.json
index 31ae61b2642..052fc8e892f 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/image/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/image/block.json
@@ -54,6 +54,10 @@
 		"core/post-template"
 	],
 	"usesContext": [ "imageId", "postId", "query", "queryId" ],
+	"style": [
+		"wc-blocks-style",
+		"file:../product-image.css"
+	],
 	"keywords": [ "WooCommerce" ],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/product-image-gallery/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/product-image-gallery/block.json
index 21d0e45ad73..119839085ed 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/product-image-gallery/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/product-image-gallery/block.json
@@ -13,6 +13,7 @@
 	},
 	"keywords": [ "WooCommerce" ],
 	"usesContext": [ "postId", "postType", "queryId" ],
+	"style": "file:../product-image-gallery.css",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating-stars/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating-stars/block.json
index 444e3bee147..06a17abf70e 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating-stars/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating-stars/block.json
@@ -39,6 +39,10 @@
 		"root": ".wp-block-woocommerce-product-rating-stars.wc-block-components-product-rating, .wp-block-woocommerce-product-rating-stars .wc-block-components-product-rating"
 	},
 	"ancestor": [ "woocommerce/single-product" ],
+	"style": [
+		"wc-blocks-style",
+		"file:../product-rating-stars.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating/block.json
index 255560aec58..bf13e8d68d5 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/rating/block.json
@@ -43,6 +43,11 @@
 		"core/post-template"
 	],
 	"usesContext": [ "query", "queryId", "postId" ],
+	"style": [
+		"wc-blocks-style",
+		"wc-blocks-packages-style",
+		"file:../product-rating.css"
+	],
 	"keywords": [ "WooCommerce" ],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sale-badge/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sale-badge/block.json
index d7a32671b5d..02172e2b093 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sale-badge/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sale-badge/block.json
@@ -56,6 +56,10 @@
 	],
 	"usesContext": [ "query", "queryId", "postId" ],
 	"keywords": [ "WooCommerce" ],
+	"style": [
+		"wc-blocks-style",
+		"file:../product-sale-badge.css"
+	],
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"example": {},
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sku/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sku/block.json
index 85955a0b42f..c86555d2ce6 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sku/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/sku/block.json
@@ -60,6 +60,7 @@
 		}
 	},
 	"keywords": [ "WooCommerce" ],
+	"style": "file:../product-sku.css",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/stock-indicator/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/stock-indicator/block.json
index debb3e6dfe1..ba499b33a80 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/stock-indicator/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/stock-indicator/block.json
@@ -40,6 +40,7 @@
 	],
 	"usesContext": [ "query", "queryId", "postId" ],
 	"keywords": [ "WooCommerce" ],
+	"style": "file:../product-stock-indicator.css",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/summary/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/summary/block.json
index 7e4f9ba3d78..984e61d4ded 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/summary/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/summary/block.json
@@ -70,6 +70,7 @@
 	],
 	"usesContext": [ "query", "queryId", "postId" ],
 	"keywords": [ "WooCommerce" ],
+	"style": "file:../product-summary.css",
 	"textdomain": "woocommerce",
 	"apiVersion": 3,
 	"$schema": "https://schemas.wp.org/trunk/block.json"
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/title/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/title/block.json
index 555437b8312..53529f53e76 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/title/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-elements-blocks/title/block.json
@@ -32,6 +32,10 @@
 	"selectors": {
 		"root": ".wp-block-woocommerce-product-title .wc-block-components-product-title"
 	},
+	"style": [
+		"wc-blocks-style",
+		"file:../product-title.css"
+	],
 	"textdomain": "woocommerce",
 	"attributes": {
 		"headingLevel": {
diff --git a/plugins/woocommerce/client/blocks/assets/js/blocks/product-specifications/block.json b/plugins/woocommerce/client/blocks/assets/js/blocks/product-specifications/block.json
index 6c3340b8915..d74e26bf674 100644
--- a/plugins/woocommerce/client/blocks/assets/js/blocks/product-specifications/block.json
+++ b/plugins/woocommerce/client/blocks/assets/js/blocks/product-specifications/block.json
@@ -6,6 +6,10 @@
 	"description": "Display product weight, dimensions, and attributes.",
 	"category": "woocommerce",
 	"keywords": [ "attributes", "weight", "dimensions", "additional information" ],
+	"style": [
+		"wp-block-table",
+		"file:../product-specifications.css"
+	],
 	"textdomain": "woocommerce",
 	"ancestor": [
 		"woocommerce/single-product",
diff --git a/plugins/woocommerce/phpstan-baseline.neon b/plugins/woocommerce/phpstan-baseline.neon
index fadb0795899..3e059e005e6 100644
--- a/plugins/woocommerce/phpstan-baseline.neon
+++ b/plugins/woocommerce/phpstan-baseline.neon
@@ -49609,12 +49609,6 @@ parameters:
 			count: 1
 			path: src/Blocks/BlockTypes/ProductQuery.php

-		-
-			message: '#^Method Automattic\\WooCommerce\\Blocks\\BlockTypes\\ProductRating\:\:get_block_type_style\(\) should return null but returns array\<mixed, mixed\>\.$#'
-			identifier: return.type
-			count: 1
-			path: src/Blocks/BlockTypes/ProductRating.php
-
 		-
 			message: '#^Method Automattic\\WooCommerce\\Blocks\\BlockTypes\\ProductRating\:\:get_block_type_uses_context\(\) has no return type specified\.$#'
 			identifier: missingType.return
@@ -49627,12 +49621,6 @@ parameters:
 			count: 1
 			path: src/Blocks/BlockTypes/ProductRating.php

-		-
-			message: '#^Parameter \#1 \$arr1 of function array_merge expects array, array\<string\>\|null given\.$#'
-			identifier: argument.type
-			count: 1
-			path: src/Blocks/BlockTypes/ProductRating.php
-
 		-
 			message: '#^Parameter \#1 \$url of function esc_url expects string, string\|false given\.$#'
 			identifier: argument.type
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductAverageRating.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductAverageRating.php
index a8f1fd1c5bc..96904bef417 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductAverageRating.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductAverageRating.php
@@ -9,6 +9,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductAverageRating class.
  */
 class ProductAverageRating extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -34,15 +35,6 @@ class ProductAverageRating extends AbstractBlock {
 		return null;
 	}

-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
-
 	/**
 	 * Include and render the block.
 	 *
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductDescription.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductDescription.php
index 96be982b74e..8914982ada5 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductDescription.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductDescription.php
@@ -8,6 +8,8 @@ use Automattic\WooCommerce\Blocks\Utils\ProductDescriptionUtils;
  * ProductDescription class.
  */
 class ProductDescription extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;
+
 	/**
 	 * Block name.
 	 *
@@ -66,15 +68,6 @@ class ProductDescription extends AbstractBlock {
 		);
 	}

-	/**
-	 * Disable the frontend stylesheet for this block type. It does not have one.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
-
 	/**
 	 * Disable the frontend script for this block type. It does not have one.
 	 *
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductImage.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductImage.php
index ec3c337aa1f..7424e12e579 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductImage.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductImage.php
@@ -8,6 +8,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductImage class.
  */
 class ProductImage extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductImageGallery.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductImageGallery.php
index c6a0c36633f..36018067ec0 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductImageGallery.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductImageGallery.php
@@ -7,6 +7,8 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductImageGallery class.
  */
 class ProductImageGallery extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;
+
 	/**
 	 * Block name.
 	 *
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductMeta.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductMeta.php
index d6884d84514..8c26a6a1963 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductMeta.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductMeta.php
@@ -8,6 +8,8 @@ namespace Automattic\WooCommerce\Blocks\BlockTypes;
  * ProductMeta class.
  */
 class ProductMeta extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;
+
 	/**
 	 * Block name.
 	 *
@@ -43,13 +45,4 @@ class ProductMeta extends AbstractBlock {
 	protected function get_block_type_script( $key = null ) {
 		return null;
 	}
-
-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
 }
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductPrice.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductPrice.php
index 48823a015af..8399af89ed7 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductPrice.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductPrice.php
@@ -27,15 +27,6 @@ class ProductPrice extends AbstractBlock {
 	 */
 	protected $api_version = '3';

-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
-
 	/**
 	 * Overwrite parent method to prevent script registration.
 	 *
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRating.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRating.php
index f00023abdbb..f800b63a1a2 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRating.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRating.php
@@ -6,6 +6,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductRating class.
  */
 class ProductRating extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -34,10 +35,10 @@ class ProductRating extends AbstractBlock {
 	/**
 	 * Get the frontend style handle for this block type.
 	 *
-	 * @return null
+	 * @return string[]
 	 */
 	protected function get_block_type_style() {
-		return array_merge( parent::get_block_type_style(), [ 'wc-blocks-packages-style' ] );
+		return array_merge( (array) parent::get_block_type_style(), array( 'wc-blocks-packages-style' ) );
 	}

 	/**
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingCounter.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingCounter.php
index 683fb0df5da..6ab833f7e81 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingCounter.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingCounter.php
@@ -6,6 +6,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductRatingCounter class.
  */
 class ProductRatingCounter extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
@@ -31,15 +32,6 @@ class ProductRatingCounter extends AbstractBlock {
 		return null;
 	}

-	/**
-	 * Get the frontend style handle for this block type.
-	 *
-	 * @return null
-	 */
-	protected function get_block_type_style() {
-		return null;
-	}
-
 	/**
 	 * Register the context.
 	 */
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingStars.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingStars.php
index 366465d6250..5817c0d2d39 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingStars.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductRatingStars.php
@@ -6,6 +6,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductRatingStars class.
  */
 class ProductRatingStars extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSKU.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSKU.php
index eb59c581f3a..e6af4231bd8 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSKU.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSKU.php
@@ -9,6 +9,7 @@ use WP_Block;
  * ProductSKU class.
  */
 class ProductSKU extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSaleBadge.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSaleBadge.php
index efa6bd9e660..6604a32bc97 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSaleBadge.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSaleBadge.php
@@ -7,6 +7,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductSaleBadge class.
  */
 class ProductSaleBadge extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSpecifications.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSpecifications.php
index 0fbc73514c1..4d8e0211ab4 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSpecifications.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSpecifications.php
@@ -8,6 +8,8 @@ use Automattic\WooCommerce\Enums\ProductType;
  * ProductSpecifications class.
  */
 class ProductSpecifications extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;
+
 	/**
 	 * Block name.
 	 *
@@ -134,7 +136,7 @@ class ProductSpecifications extends AbstractBlock {
 								<td class="wp-block-product-specifications-item__value" data-wp-interactive="woocommerce/products" data-wp-text="state.productInContext.<?php echo esc_attr( $product_attribute['api_field'] ); ?>">
 									<?php echo wp_kses_post( $product_attribute['value'] ); ?>
 								</td>
-							<?php else : ?>
+							<?php else : ?>
 								<td class="wp-block-product-specifications-item__value">
 									<?php echo wp_kses_post( $product_attribute['value'] ); ?>
 								</td>
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSummary.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSummary.php
index 5773975c002..426be4d160c 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductSummary.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductSummary.php
@@ -9,6 +9,7 @@ use Automattic\WooCommerce\Blocks\Utils\StyleAttributesUtils;
  * ProductSummary class.
  */
 class ProductSummary extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;


 	/**
diff --git a/plugins/woocommerce/src/Blocks/BlockTypes/ProductTitle.php b/plugins/woocommerce/src/Blocks/BlockTypes/ProductTitle.php
index 179638d629e..9781b9f26c1 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypes/ProductTitle.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypes/ProductTitle.php
@@ -5,6 +5,7 @@ namespace Automattic\WooCommerce\Blocks\BlockTypes;
  * ProductTitle class.
  */
 class ProductTitle extends AbstractBlock {
+	use EnableBlockJsonAssetsTrait;

 	/**
 	 * Block name.
diff --git a/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php b/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
index d2c875186c5..d2ea21a2c9b 100644
--- a/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
+++ b/plugins/woocommerce/src/Blocks/BlockTypesLazyController.php
@@ -87,6 +87,7 @@ final class BlockTypesLazyController {
 		$block_groups = array(
 			$this->get_order_confirmation_blocks(),
 			$this->get_add_to_cart_with_options_blocks(),
+			$this->get_product_display_element_blocks(),
 		);
 		foreach ( $block_groups as $blocks_group ) {
 			foreach ( $blocks_group as $block_name => $block_class ) {
@@ -97,10 +98,14 @@ final class BlockTypesLazyController {
 					}
 					$asset_api          = $this->asset_api;
 					$use_custom_handles = static function ( $metadata ) use ( $block_name, $asset_api ) {
-						foreach ( (array) ( $metadata['style'] ?? array() ) as $index => $specifier ) {
-							if ( 'file:../' . $block_name . '.css' === $specifier ) {
-								$custom_handle               = 'wc-blocks-style-' . $block_name;
-								$metadata['style'][ $index ] = $custom_handle;
+						// Backward compatibility: some blocks didn't use the custom handles before lazy-loading introduction.
+						$skip   = array( 'product-price', 'product-stock-indicator' );
+						$styles = (array) ( $metadata['style'] ?? array() );
+						foreach ( $styles as $index => $specifier ) {
+							if ( 'file:../' . $block_name . '.css' === $specifier && ! in_array( $block_name, $skip, true ) ) {
+								$custom_handle     = 'wc-blocks-style-' . $block_name;
+								$styles[ $index ]  = $custom_handle;
+								$metadata['style'] = $styles;
 								$asset_api->register_style( $custom_handle, $asset_api->get_block_asset_build_path( $block_name, 'css' ), array(), 'all', true );
 								break;
 							}
@@ -293,4 +298,38 @@ final class BlockTypesLazyController {

 		return $list;
 	}
+
+	/**
+	 * Side effect free and stateless product display element blocks.
+	 *
+	 * @return array<string,string>
+	 */
+	private function get_product_display_element_blocks(): array {
+		// ProductGalleryLargeImage: excluded — overrides initialize() with block_type_metadata_settings filter.
+		$list = array(
+			'product-price'                             => \Automattic\WooCommerce\Blocks\BlockTypes\ProductPrice::class,
+			'product-title'                             => \Automattic\WooCommerce\Blocks\BlockTypes\ProductTitle::class,
+			'product-sku'                               => \Automattic\WooCommerce\Blocks\BlockTypes\ProductSKU::class,
+			'product-sale-badge'                        => \Automattic\WooCommerce\Blocks\BlockTypes\ProductSaleBadge::class,
+			'product-summary'                           => \Automattic\WooCommerce\Blocks\BlockTypes\ProductSummary::class,
+			'product-average-rating'                    => \Automattic\WooCommerce\Blocks\BlockTypes\ProductAverageRating::class,
+			'product-rating'                            => \Automattic\WooCommerce\Blocks\BlockTypes\ProductRating::class,
+			'product-rating-counter'                    => \Automattic\WooCommerce\Blocks\BlockTypes\ProductRatingCounter::class,
+			'product-rating-stars'                      => \Automattic\WooCommerce\Blocks\BlockTypes\ProductRatingStars::class,
+			'product-description'                       => \Automattic\WooCommerce\Blocks\BlockTypes\ProductDescription::class,
+			'product-specifications'                    => \Automattic\WooCommerce\Blocks\BlockTypes\ProductSpecifications::class,
+			'product-gallery'                           => \Automattic\WooCommerce\Blocks\BlockTypes\ProductGallery::class,
+			'product-gallery-thumbnails'                => \Automattic\WooCommerce\Blocks\BlockTypes\ProductGalleryThumbnails::class,
+			'product-gallery-large-image-next-previous' => \Automattic\WooCommerce\Blocks\BlockTypes\NextPreviousButtons::class,
+		);
+		if ( ! is_admin() ) {
+			// These blocks have no individual editor scripts or override enqueue_data(), hence load eagerly in admin.
+			$list['product-meta']            = \Automattic\WooCommerce\Blocks\BlockTypes\ProductMeta::class;
+			$list['product-image-gallery']   = \Automattic\WooCommerce\Blocks\BlockTypes\ProductImageGallery::class;
+			$list['product-image']           = \Automattic\WooCommerce\Blocks\BlockTypes\ProductImage::class;
+			$list['product-stock-indicator'] = \Automattic\WooCommerce\Blocks\BlockTypes\ProductStockIndicator::class;
+		}
+
+		return $list;
+	}
 }