Micro-optimizations in ::get_styles_for_block()

Author: hellofromtonya

src/wp-includes/class-wp-theme-json.php

@@ -2168,33 +2168,35 @@ public function get_styles_for_block( $block_metadata ) {
 
 				// If the block has feature selectors, generate the declarations for them within the current style variation.
 				if ( ! empty( $block_metadata['features'] ) ) {
+					$clean_style_variation_selector = trim( $style_variation_selector );
 					foreach ( $block_metadata['features'] as $feature_name => $feature_selector ) {
-						if ( ! empty( $style_variation_node[ $feature_name ] ) ) {
-							// Prepend the variation selector to the feature selector.
-							$split_feature_selectors    = explode( ',', $feature_selector );
-							$feature_selectors          = array_map(
-								function( $split_feature_selector ) use ( $style_variation_selector ) {
-									return trim( $style_variation_selector ) . trim( $split_feature_selector );
-								},
-								$split_feature_selectors
-							);
-							$combined_feature_selectors = implode( ',', $feature_selectors );
-
-							// Compute declarations for the feature.
-							$new_feature_declarations = static::compute_style_properties( array( $feature_name => $style_variation_node[ $feature_name ] ), $settings, null, $this->theme_json );
-
-							// Merge new declarations with any that already exist for
-							// the feature selector. This may occur when multiple block
-							// support features use the same custom selector.
-							if ( isset( $style_variation_declarations[ $combined_feature_selectors ] ) ) {
-								$style_variation_declarations[ $combined_feature_selectors ] = array_merge( $style_variation_declarations[ $combined_feature_selectors ], $new_feature_declarations );
-							} else {
-								$style_variation_declarations[ $combined_feature_selectors ] = $new_feature_declarations;
-							}
-							// Remove the feature from the variation's node now the
-							// styles will be included under the feature level selector.
-							unset( $style_variation_node[ $feature_name ] );
+						if ( empty( $style_variation_node[ $feature_name ] ) ) {
+							continue;
+						}
+						// Prepend the variation selector to the feature selector.
+						$split_feature_selectors    = explode( ',', $feature_selector );
+						$feature_selectors          = array_map(
+							static function( $split_feature_selector ) use ( $clean_style_variation_selector ) {
+								return $clean_style_variation_selector . trim( $split_feature_selector );
+							},
+							$split_feature_selectors
+						);
+						$combined_feature_selectors = implode( ',', $feature_selectors );
+
+						// Compute declarations for the feature.
+						$new_feature_declarations = static::compute_style_properties( array( $feature_name => $style_variation_node[ $feature_name ] ), $settings, null, $this->theme_json );
+
+						// Merge new declarations with any that already exist for
+						// the feature selector. This may occur when multiple block
+						// support features use the same custom selector.
+						if ( isset( $style_variation_declarations[ $combined_feature_selectors ] ) ) {
+							$style_variation_declarations[ $combined_feature_selectors ] = array_merge( $style_variation_declarations[ $combined_feature_selectors ], $new_feature_declarations );
+						} else {
+							$style_variation_declarations[ $combined_feature_selectors ] = $new_feature_declarations;
 						}
+						// Remove the feature from the variation's node now the
+						// styles will be included under the feature level selector.
+						unset( $style_variation_node[ $feature_name ] );
 					}
 				}
 				// Compute declarations for remaining styles not covered by feature level selectors.