mirror_php/wordpress
1
0
Fork 0
mirror of git://develop.git.wordpress.org/ synced 2025-04-05 12:42:35 +02:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Editor: Add scoping of feature level global styles selectors.

Browse Source 
Ensures that feature-level selectors for block style variations are correctly scoped when generating a theme.json stylesheet.

Props aaronrobertshaw, audrasjb, vcanales, isabel_brison.
Fixes #61119.


git-svn-id: https://develop.svn.wordpress.org/trunk@58244 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Isabel Brison 2024-05-30 04:38:26 +00:00
parent 0b9c4ed70b
commit 2981078975
2 changed files with 81 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/wp-includes/class-wp-theme-json.php
View File

@ -1199,7 +1199,7 @@ class WP_Theme_JSON {
$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
}
foreach ( $style_nodes as &$node ) {
$node['selector'] = static::scope_selector( $options['scope'], $node['selector'] );
$node = static::scope_style_node_selectors( $options['scope'], $node );
}
unset( $node );
}
@ -1825,6 +1825,39 @@ class WP_Theme_JSON {
return $result;
}
/**
* Scopes the selectors for a given style node.
*
* This includes the primary selector, i.e. `$node['selector']`, as well as any custom
* selectors for features and subfeatures, e.g. `$node['selectors']['border']` etc.
*
* @since 6.6.0
*
* @param string $scope Selector to scope to.
* @param array $node Style node with selectors to scope.
* @return array Node with updated selectors.
*/
protected static function scope_style_node_selectors( $scope, $node ) {
$node['selector'] = static::scope_selector( $scope, $node['selector'] );
if ( empty( $node['selectors'] ) ) {
return $node;
}
foreach ( $node['selectors'] as $feature => $selector ) {
if ( is_string( $selector ) ) {
$node['selectors'][ $feature ] = static::scope_selector( $scope, $selector );
}
if ( is_array( $selector ) ) {
foreach ( $selector as $subfeature => $subfeature_selector ) {
$node['selectors'][ $feature ][ $subfeature ] = static::scope_selector( $scope, $subfeature_selector );
}
}
}
return $node;
}
/**
* Gets preset values keyed by slugs based on settings and metadata.
*

47
tests/phpunit/tests/theme/wpThemeJson.php
View File

@ -5589,4 +5589,51 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase {
),
);
}
/**
* Tests the correct scoping of selectors for a style node.
*
* @ticket 61119
*/
public function test_scope_style_node_selectors() {
$theme_json = new ReflectionClass( 'WP_Theme_JSON' );
$func = $theme_json->getMethod( 'scope_style_node_selectors' );
$func->setAccessible( true );
$node = array(
'name' => 'core/image',
'path' => array( 'styles', 'blocks', 'core/image' ),
'selector' => '.wp-block-image',
'selectors' => array(
'root' => '.wp-block-image',
'border' => '.wp-block-image img, .wp-block-image .wp-block-image__crop-area, .wp-block-image .components-placeholder',
'typography' => array(
'textDecoration' => '.wp-block-image caption',
),
'filter' => array(
'duotone' => '.wp-block-image img, .wp-block-image .components-placeholder',
),
),
);
$actual = $func->invoke( null, '.custom-scope', $node );
$expected = array(
'name' => 'core/image',
'path' => array( 'styles', 'blocks', 'core/image' ),
'selector' => '.custom-scope .wp-block-image',
'selectors' => array(
'root' => '.custom-scope .wp-block-image',
'border' => '.custom-scope .wp-block-image img, .custom-scope .wp-block-image .wp-block-image__crop-area, .custom-scope .wp-block-image .components-placeholder',
'typography' => array(
'textDecoration' => '.custom-scope .wp-block-image caption',
),
'filter' => array(
'duotone' => '.custom-scope .wp-block-image img, .custom-scope .wp-block-image .components-placeholder',
),
),
);
$this->assertEquals( $expected, $actual );
}
}