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

Timestamp:

09/26/2022 10:15:17 AM (4 years ago)

Author:

jorgefilipecosta

Message:

Fix: Revert [54305].

This commit caused an incompatibility with the latest released Gutenberg version.

Props bernhard-reiter.

File:

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

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

@@ -774 +774 @@
                         }
 
-                        // Assign defaults, then override those that the block sets by itself.
+                        // Assign defaults, then overwrite those that the block sets by itself.
                         // If the block selector is compounded, will append the element to each
                         // individual block selector.
@@ -867 +867 @@
          *                       - `variables`: only the CSS Custom Properties for presets & custom ones.
          *                       - `styles`: only the styles section in theme.json.
-         *                       - `presets`: only the classes for the presets. @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
-         * @param array $options An array of options for now used for internal purposes only (may change without notice).
-         *                       The options currently supported are 'scope' that makes sure all style are scoped to a given selector,
-         *                       and root_selector which overwrites and forces a given selector to be used on the root node.
+         *                       - `presets`: only the classes for the presets.
+         * @param array $origins A list of origins to include. By default it includes VALID_ORIGINS.
          * @return string Stylesheet.
          */
-        public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null, $options = array() ) {
+        public function get_stylesheet( $types = array( 'variables', 'styles', 'presets' ), $origins = null ) {
                 if ( null === $origins ) {
                         $origins = static::VALID_ORIGINS;
@@ -894 +892 @@
                 $setting_nodes   = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
 
-                $root_style_key    = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $style_nodes, 'selector' ), true );
-                $root_settings_key = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $setting_nodes, 'selector' ), true );
-
-                if ( ! empty( $options['scope'] ) ) {
-                        foreach ( $setting_nodes as &$node ) {
-                                $node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
-                        }
-                        foreach ( $style_nodes as &$node ) {
-                                $node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
-                        }
-                }
-
-                if ( ! empty( $options['root_selector'] ) ) {
-                        if ( false !== $root_settings_key ) {
-                                $setting_nodes[ $root_settings_key ]['selector'] = $options['root_selector'];
-                        }
-                        if ( false !== $root_style_key ) {
-                                $setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
-                        }
-                }
-
                 $stylesheet = '';
 
@@ -922 +899 @@
 
                 if ( in_array( 'styles', $types, true ) ) {
-                        if ( false !== $root_style_key ) {
-                                $stylesheet .= $this->get_root_layout_rules( $style_nodes[ $root_style_key ]['selector'], $style_nodes[ $root_style_key ] );
+                        $root_block_key = array_search( static::ROOT_BLOCK_SELECTOR, array_column( $style_nodes, 'selector' ), true );
+
+                        if ( false !== $root_block_key ) {
+                                $stylesheet .= $this->get_root_layout_rules( static::ROOT_BLOCK_SELECTOR, $style_nodes[ $root_block_key ] );
                         }
                         $stylesheet .= $this->get_block_classes( $style_nodes );
                 } elseif ( in_array( 'base-layout-styles', $types, true ) ) {
-                        $root_selector    = static::ROOT_BLOCK_SELECTOR;
-                        $columns_selector = '.wp-block-columns';
-                        if ( ! empty( $options['scope'] ) ) {
-                                $root_selector    = static::scope_selector( $options['scope'], $root_selector );
-                                $columns_selector = static::scope_selector( $options['scope'], $columns_selector );
-                        }
-                        if ( ! empty( $options['root_selector'] ) ) {
-                                $root_selector = $options['root_selector'];
-                        }
                         // Base layout styles are provided as part of `styles`, so only output separately if explicitly requested.
                         // For backwards compatibility, the Columns block is explicitly included, to support a different default gap value.
@@ -941 +911 @@
                                 array(
                                         'path'     => array( 'styles' ),
-                                        'selector' => $root_selector,
+                                        'selector' => static::ROOT_BLOCK_SELECTOR,
                                 ),
                                 array(
                                         'path'     => array( 'styles', 'blocks', 'core/columns' ),
-                                        'selector' => $columns_selector,
+                                        'selector' => '.wp-block-columns',
                                         'name'     => 'core/columns',
                                 ),
@@ -1396 +1366 @@
          * @return string Scoped selector.
          */
-        public static function scope_selector( $scope, $selector ) {
+        protected static function scope_selector( $scope, $selector ) {
                 $scopes    = explode( ',', $scope );
                 $selectors = explode( ',', $selector );
@@ -1403 +1373 @@
                 foreach ( $scopes as $outer ) {
                         foreach ( $selectors as $inner ) {
-                                $outer = trim( $outer );
-                                $inner = trim( $inner );
-                                if ( ! empty( $outer ) && ! empty( $inner ) ) {
-                                        $selectors_scoped[] = $outer . ' ' . $inner;
-                                } elseif ( empty( $outer ) ) {
-                                        $selectors_scoped[] = $inner;
-                                } elseif ( empty( $inner ) ) {
-                                        $selectors_scoped[] = $outer;
-                                }
-                        }
-                }
-
-                $result = implode( ', ', $selectors_scoped );
-                return $result;
+                                $selectors_scoped[] = trim( $outer ) . ' ' . trim( $inner );
+                        }
+                }
+
+                return implode( ', ', $selectors_scoped );
         }