Changeset 58264 for trunk/src/wp-includes/class-wp-theme-json-resolver.php

Timestamp:

05/31/2024 05:47:23 AM (6 months ago)

Author:

noisysocks

Message:

Block Themes: Add section styling via extended block style variations

Provide users with the ability to style entire sections of a page without
having to tediously reapply the same sets of styles.

This is done by extending block style variations to apply to nested blocks.

See ​https://github.com/WordPress/gutenberg/pull/57908.

Fixes #61312.
Props aaronrobertshaw, talldanwp, ramonopoly, isabel_brison, andrewserong.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (3 diffs)

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

@@ -702 +702 @@
     }
 
+    /**
+     * Determines if a supplied style variation matches the provided scope.
+     *
+     * For backwards compatibility, if a variation does not define any scope
+     * related property, e.g. `blockTypes`, it is assumed to be a theme style
+     * variation.
+     *
+     * @since 6.6.0
+     *
+     * @param array  $variation Theme.json shaped style variation object.
+     * @param string $scope     Scope to check e.g. theme, block etc.
+     *
+     * @return boolean
+     */
+    private static function style_variation_has_scope( $variation, $scope ) {
+        if ( 'block' === $scope ) {
+            return isset( $variation['blockTypes'] );
+        }
+
+        if ( 'theme' === $scope ) {
+            return ! isset( $variation['blockTypes'] );
+        }
+
+        return false;
+    }
 
     /**
@@ -708 +733 @@
      * @since 6.0.0
      * @since 6.2.0 Returns parent theme variations if theme is a child.
+     * @since 6.6.0 Added configurable scope parameter to allow filtering
+     *              theme.json partial files by the scope to which they
+     *              can be applied e.g. theme vs block etc.
+     *
+     * @param string $scope The scope or type of style variation to retrieve e.g. theme, block etc.
      *
      * @return array
      */
-    public static function get_style_variations() {
+    public static function get_style_variations( $scope = 'theme' ) {
         $variation_files    = array();
         $variations         = array();
@@ -734 +764 @@
         foreach ( $variation_files as $path => $file ) {
             $decoded_file = wp_json_file_decode( $path, array( 'associative' => true ) );
-            if ( is_array( $decoded_file ) ) {
+            if ( is_array( $decoded_file ) && static::style_variation_has_scope( $decoded_file, $scope ) ) {
                 $translated = static::translate( $decoded_file, wp_get_theme()->get( 'TextDomain' ) );
                 $variation  = ( new WP_Theme_JSON( $translated ) )->get_raw_data();