Make registry variations be overridden by partials again

lib/block-supports/block-style-variations.php

@@ -274,3 +274,69 @@ function gutenberg_register_block_style_variations_from_theme_json_partials( $va
 		}
 	}
 }
+
+/**
+ * Merges variations data with existing theme.json data ensuring that the
+ * current theme.json data values take precedence.
+ *
+ * @since 6.6.0
+ *
+ * @param array                        $variations_data Block style variations data keyed by block type.
+ * @param WP_Theme_JSON_Data_Gutenberg $theme_json      Current theme.json data.
+ * @param string                       $origin          Origin for the theme.json data.
+ *
+ * @return WP_Theme_JSON_Gutenberg The merged theme.json data.
+ */
+function gutenberg_merge_block_style_variations_data( $variations_data, $theme_json, $origin = 'theme' ) {
+	if ( empty( $variations_data ) ) {
+		return $theme_json;
+	}
+
+	$variations_theme_json_data = array(
+		'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+		'styles'  => array( 'blocks' => $variations_data ),
+	);
+
+	$variations_theme_json = new WP_Theme_JSON_Data_Gutenberg( $variations_theme_json_data, $origin );
+
+	/*
+	 * Merge the current theme.json data over shared variation data so that
+	 * any explicit per block variation values take precedence.
+	 */
+	return $variations_theme_json->update_with( $theme_json->get_data() );
+}
+
+/**
+ * Merges block style variations registered via the block styles registry with a
+ * style object, under their appropriate block types within theme.json styles.
+ * Any variation values defined within the theme.json specific to a block type
+ * will take precedence over these shared definitions.
+ *
+ * @since 6.6.0
+ *
+ * @param WP_Theme_JSON_Data_Gutenberg $theme_json Current theme.json data.
+ *
+ * @return WP_Theme_JSON_Data_Gutenberg
+ */
+function gutenberg_resolve_block_style_variations_from_styles_registry( $theme_json ) {
+	$registry        = WP_Block_Styles_Registry::get_instance();
+	$styles          = $registry->get_all_registered();
+	$variations_data = array();
+
+	foreach ( $styles as $block_type => $variations ) {
+		foreach ( $variations as $variation_name => $variation ) {
+			if ( ! empty( $variation['style_data'] ) ) {
+				$path = array( $block_type, 'variations', $variation_name );
+				_wp_array_set( $variations_data, $path, $variation['style_data'] );
+			}
+		}
+	}
+
+	return gutenberg_merge_block_style_variations_data( $variations_data, $theme_json );
+}
+
+if ( function_exists( 'wp_resolve_block_style_variations_from_styles_registry' ) ) {
+	remove_filter( 'wp_theme_json_data_theme', 'wp_resolve_block_style_variations_from_styles_registry' );
+}
+
+add_filter( 'wp_theme_json_data_theme', 'gutenberg_resolve_block_style_variations_from_styles_registry', 10, 1 );

lib/class-wp-theme-json-resolver-gutenberg.php

@@ -257,15 +257,12 @@ public static function get_theme_data( $deprecated = array(), $options = array()
 			 * When the resulting data is passed to `WP_Theme_JSON_Data_Gutenberg`
 			 * it will create a `WP_Theme_JSON_Gutenberg` instance which in turn
 			 * unwraps shared variations into their respective block types.
+			 *
+			 * Note: WP_Block_Styles_Registry defined are still merged via
+			 * wp_theme_json_data_theme filter so partials etc can take precedence.
 			 */
 			$theme_json_data = static::inject_shared_variations_from_theme_json_partials( $theme_json_data, $variations );
 
-			/*
-			 * Merge any block style variations registered through the WP_Block_Styles_Registry
-			 * with a style object.
-			 */
-			$theme_json_data = static::inject_shared_variations_from_style_registry( $theme_json_data );
-
 			/**
 			 * Filters the data provided by the theme for global styles and settings.
 			 *
@@ -907,35 +904,4 @@ private static function inject_shared_variations_from_theme_json_partials( $data
 
 		return $data;
 	}
-
-	/**
-	 * Adds shared block style variation definitions sourced from the WP_Block_Styles_Registry.
-	 *
-	 * @since 6.6.0
-	 *
-	 * @param array $data   Array following the theme.json specification.
-	 * @return array Theme json data including shared block style variation definitions.
-	 */
-	private static function inject_shared_variations_from_style_registry( $data ) {
-		$registry        = WP_Block_Styles_Registry::get_instance();
-		$styles          = $registry->get_all_registered();
-		$variations_data = array();
-
-		/*
-		 * As the block style registry stores the styles per block type we don't have
-		 * a shared variation to inject. It will go directly into the block type's variations.
-		 */
-		foreach ( $styles as $block_type => $variations ) {
-			foreach ( $variations as $variation_name => $variation ) {
-				if ( ! empty( $variation['style_data'] ) ) {
-					$current_variation = $theme_json_data['styles']['blocks'][ $block_type ]['variations'][ $variation_name ] ?? array();
-					$merged_variation  = array_replace_recursive( $variation['style_data'], $current_variation );
-					$path              = array( 'styles', 'blocks', $block_type, 'variations', $variation_name );
-					_wp_array_set( $data, $path, $merged_variation );
-				}
-			}
-		}
-
-		return $data;
-	}
 }

phpunit/block-supports/block-style-variations-test.php

@@ -98,9 +98,6 @@ public function filter_set_theme_root() {
 	public function test_add_registered_block_styles_to_theme_data() {
 		switch_theme( 'block-theme' );
 
-		// Register theme-defined variations.
-		WP_Theme_JSON_Resolver_Gutenberg::get_theme_data();
-
 		$variation_styles_data = array(
 			'color'    => array(
 				'background' => 'darkslateblue',
@@ -186,6 +183,6 @@ public function test_add_registered_block_styles_to_theme_data() {
 		unregister_block_style( 'core/group', 'my-variation' );
 		unregister_block_style( 'core/group', 'WithSlug' );
 
-		$this->assertSameSetsWithIndex( $group_styles, $expected );
+		$this->assertSameSetsWithIndex( $expected, $group_styles, 'Variation data does not match' );
 	}
 }