Infer block variation name from attributes

WordPress · May 21, 2024 · d7735f8 · d7735f8
1 parent 52d6b3d
commit d7735f8
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/wp-includes/block-supports/generated-classname.php b/src/wp-includes/block-supports/generated-classname.php
@@ -48,7 +48,7 @@ function wp_get_block_default_classname( $block_name ) {
  * @param WP_Block_Type $block_type Block Type.
  * @return array Block CSS classes and inline styles.
  */
-function wp_apply_generated_classname_support( $block_type ) {
+function wp_apply_generated_classname_support( $block_type, $block_attributes ) {
 	$attributes                      = array();
 	$has_generated_classname_support = block_has_support( $block_type, 'className', true );
 	if ( $has_generated_classname_support ) {
@@ -57,6 +57,11 @@ function wp_apply_generated_classname_support( $block_type ) {
 		if ( $block_classname ) {
 			$attributes['class'] = $block_classname;
 		}
+
+		$variation = infer_block_variation( $block_type, $block_attributes );
+		if ( $variation ) {
+			$attributes['class'] .= ' ' . $block_classname . '-' . $variation;
+		}
 	}
 
 	return $attributes;

diff --git a/src/wp-includes/blocks.php b/src/wp-includes/blocks.php
@@ -2389,3 +2389,15 @@ function get_canonical_block_name( $block_name ) {
 
 	return $block_name;
 }
+
+function infer_block_variation( $block_type, $attributes ) {
+	$variations = $block_type->get_variations();
+	foreach ( $variations as $variation ) {
+		foreach ( $variation['attributes'] as $attribute => $value ) {
+			if ( ! isset( $attributes[ $attribute ] ) || $attributes[ $attribute ] !== $value ) {
+				continue 2;
+			}
+		}
+		return $variation['name'];
+	}
+}