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

Timestamp:

09/14/2022 02:19:16 PM (4 years ago)

Author:

audrasjb

Message:

Editor: Backport foundation for Layout block support refactor (part 1).

This change backports the following changes from Gutenberg repository:

• [WordPress/gutenberg#40875 gutenberg#40875] Layout: Use semantic classnames, centralize layout definitions, reduce duplication, and fix blockGap in theme.json
• [WordPress/gutenberg#42544 gutenberg#42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg#42544
• [WordPress/gutenberg#42087 gutenberg#42087] Theme.json: Add block support feature level selectors for blocks gutenberg#42087
• [WordPress/gutenberg#43792 gutenberg#43792] Global Styles: Split root layout rules into a different function gutenberg#43792
• [WordPress/gutenberg#42544 gutenberg#42544] Layout: Add a disable-layout-styles theme supports flag to opt out of all layout styles gutenberg#42544
• [WordPress/gutenberg#42665 gutenberg#42665] Layout: Reduce specificity of fallback blockGap styles gutenberg#42665
• [WordPress/gutenberg#42085 gutenberg#42085] Core CSS support for root padding and alignfull blocks gutenberg#42085

Note that it doesn't entirely port over PR40875 — the remaining PHP changes for that PR will be explored in a separate PR targeting layout.php.

Props andrewserong, aaronrobertshaw, isabel_brison.
See #56467.

File:

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

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

@@ -231 +231 @@
 
                 return $with_theme_supports;
+        }
+
+        /**
+         * Gets the styles for blocks from the block.json file.
+         *
+         * @since 6.1.0
+         *
+         * @return WP_Theme_JSON
+         */
+        public static function get_block_data() {
+                $registry = WP_Block_Type_Registry::get_instance();
+                $blocks   = $registry->get_all_registered();
+                $config   = array( 'version' => 1 );
+                foreach ( $blocks as $block_name => $block_type ) {
+                        if ( isset( $block_type->supports['__experimentalStyle'] ) ) {
+                                $config['styles']['blocks'][ $block_name ] = static::remove_json_comments( $block_type->supports['__experimentalStyle'] );
+                        }
+
+                        if (
+                                isset( $block_type->supports['spacing']['blockGap']['__experimentalDefault'] ) &&
+                                null === _wp_array_get( $config, array( 'styles', 'blocks', $block_name, 'spacing', 'blockGap' ), null )
+                        ) {
+                                // Ensure an empty placeholder value exists for the block, if it provides a default blockGap value.
+                                // The real blockGap value to be used will be determined when the styles are rendered for output.
+                                $config['styles']['blocks'][ $block_name ]['spacing']['blockGap'] = null;
+                        }
+                }
+
+                // Core here means it's the lower level part of the styles chain.
+                // It can be a core or a third-party block.
+                return new WP_Theme_JSON( $config, 'core' );
+        }
+
+        /**
+         * When given an array, this will remove any keys with the name `//`.
+         *
+         * @param array $array The array to filter.
+         * @return array The filtered array.
+         */
+        private static function remove_json_comments( $array ) {
+                unset( $array['//'] );
+                foreach ( $array as $k => $v ) {
+                        if ( is_array( $v ) ) {
+                                $array[ $k ] = static::remove_json_comments( $v );
+                        }
+                }
+
+                return $array;
         }
 
@@ -371 +419 @@
          * @since 5.9.0 Added user data, removed the `$settings` parameter,
          *              added the `$origin` parameter.
+         * @since 6.1.0 Added block data.
          *
          * @param string $origin Optional. To what level should we merge data.
@@ -383 +432 @@
                 $result = new WP_Theme_JSON();
                 $result->merge( static::get_core_data() );
+                $result->merge( static::get_block_data() );
                 $result->merge( static::get_theme_data() );