From 64d9026115bd4de7bd494bae24fed7d16ea1a76b Mon Sep 17 00:00:00 2001 From: Carlos Bravo Date: Thu, 8 Sep 2022 16:05:45 +0200 Subject: [PATCH] Backport global styles support heading and caption for 6.1 --- src/wp-includes/class-wp-theme-json.php | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php index a299c8556ef66..05b8cccf76249 100644 --- a/src/wp-includes/class-wp-theme-json.php +++ b/src/wp-includes/class-wp-theme-json.php @@ -347,16 +347,20 @@ class WP_Theme_JSON { * The valid elements that can be found under styles. * * @since 5.8.0 + * @since 6.1.0 Added heading, button, caption to the elements. * @var string[] */ const ELEMENTS = array( - 'link' => 'a', - 'h1' => 'h1', - 'h2' => 'h2', - 'h3' => 'h3', - 'h4' => 'h4', - 'h5' => 'h5', - 'h6' => 'h6', + 'link' => 'a', + 'heading' => 'h1, h2, h3, h4, h5, h6', + 'h1' => 'h1', + 'h2' => 'h2', + 'h3' => 'h3', + 'h4' => 'h4', + 'h5' => 'h5', + 'h6' => 'h6', + 'button' => '.wp-element-button, .wp-block-button__link', // We have the .wp-block-button__link class so that this will target older buttons that have been serialized. + 'caption' => '.wp-element-caption, .wp-block-audio figcaption, .wp-block-embed figcaption, .wp-block-gallery figcaption, .wp-block-image figcaption, .wp-block-table figcaption, .wp-block-video figcaption', // The block classes are necessary to target older content that won't use the new class names. ); /** @@ -1476,7 +1480,10 @@ protected static function get_style_nodes( $theme_json, $selectors = array() ) { ); if ( isset( $theme_json['styles']['elements'] ) ) { - foreach ( $theme_json['styles']['elements'] as $element => $node ) { + foreach ( self::ELEMENTS as $element => $selector ) { + if ( ! isset( $theme_json['styles']['elements'][ $element ] ) ) { + continue; + } $nodes[] = array( 'path' => array( 'styles', 'elements', $element ), 'selector' => static::ELEMENTS[ $element ],