Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Global Styles: fix specificity conflict of blocks with single classes as selectors #29378

Merged
merged 3 commits into from
Mar 2, 2021
Merged

Global Styles: fix specificity conflict of blocks with single classes as selectors #29378

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4c4f00b
Add minimum test
oandregal Feb 26, 2021
590133a
Add block styles before presets classes.
oandregal Feb 26, 2021
2d49b36
Make linter happy
oandregal Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions lib/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -785,22 +785,22 @@ private static function compute_style_properties( $declarations, $styles, $suppo
}

/**
* Given a settings array, it extracts its presets
* and adds them to the given input $stylesheet.
* Given a settings array, it returns the generated rulesets
* for the preset classes.
*
* @param string $stylesheet Input stylesheet to add the presets to.
* @param array $settings Settings to process.
* @param string $selector Selector wrapping the classes.
*
* @return the modified $stylesheet.
* @return string The result of processing the presets.
*/
private static function compute_preset_classes( $stylesheet, $settings, $selector ) {
private static function compute_preset_classes( $settings, $selector ) {
if ( self::ROOT_BLOCK_SELECTOR === $selector ) {
// Classes at the global level do not need any CSS prefixed,
// and we don't want to increase its specificity.
$selector = '';
}

$stylesheet = '';
foreach ( self::PRESETS_METADATA as $preset ) {
$values = gutenberg_experimental_get( $settings, $preset['path'], array() );
foreach ( $values as $value ) {
Expand Down Expand Up @@ -1002,7 +1002,9 @@ private function get_block_styles() {
return $stylesheet;
}

$metadata = self::get_blocks_metadata();
$metadata = self::get_blocks_metadata();
$block_rules = '';
$preset_rules = '';
foreach ( $metadata as $block_selector => $metadata ) {
if ( empty( $metadata['selector'] ) ) {
continue;
Expand All @@ -1020,19 +1022,18 @@ private function get_block_styles() {
);
}

$stylesheet .= self::to_ruleset( $selector, $declarations );
$block_rules .= self::to_ruleset( $selector, $declarations );

// Attach the rulesets for the classes.
if ( isset( $this->theme_json['settings'][ $block_selector ] ) ) {
$stylesheet = self::compute_preset_classes(
$stylesheet,
$preset_rules .= self::compute_preset_classes(
$this->theme_json['settings'][ $block_selector ],
$selector
);
}
}

return $stylesheet;
return $block_rules . $preset_rules;
}

/**
Expand Down
39 changes: 37 additions & 2 deletions phpunit/class-wp-theme-json-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,11 +280,11 @@ function test_get_stylesheet() {
);

$this->assertEquals(
':root{--wp--preset--color--grey: grey;--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}:root{--wp--style--color--link: #111;color: var(--wp--preset--color--grey);}.has-grey-color{color: grey;}.has-grey-background-color{background-color: grey;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}',
':root{--wp--preset--color--grey: grey;--wp--preset--font-family--small: 14px;--wp--preset--font-family--big: 41px;}.wp-block-group{--wp--custom--base-font: 16;--wp--custom--line-height--small: 1.2;--wp--custom--line-height--medium: 1.4;--wp--custom--line-height--large: 1.8;}:root{--wp--style--color--link: #111;color: var(--wp--preset--color--grey);}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.has-grey-color{color: grey;}.has-grey-background-color{background-color: grey;}',
$theme_json->get_stylesheet()
);
$this->assertEquals(
':root{--wp--style--color--link: #111;color: var(--wp--preset--color--grey);}.has-grey-color{color: grey;}.has-grey-background-color{background-color: grey;}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}',
':root{--wp--style--color--link: #111;color: var(--wp--preset--color--grey);}.wp-block-group{padding-top: 12px;padding-bottom: 24px;}.has-grey-color{color: grey;}.has-grey-background-color{background-color: grey;}',
$theme_json->get_stylesheet( 'block_styles' )
);
$this->assertEquals(
Expand All @@ -293,6 +293,41 @@ function test_get_stylesheet() {
);
}

function test_get_stylesheet_preset_rules_come_after_block_rules() {
$theme_json = new WP_Theme_JSON(
array(
'settings' => array(
'core/group' => array(
'color' => array(
'palette' => array(
array(
'slug' => 'grey',
'color' => 'grey',
),
),
),
),
),
'styles' => array(
'core/group' => array(
'color' => array(
'text' => 'red',
),
),
),
)
);

$this->assertEquals(
'.wp-block-group{--wp--preset--color--grey: grey;}.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: grey;}.wp-block-group.has-grey-background-color{background-color: grey;}',
$theme_json->get_stylesheet()
);
$this->assertEquals(
'.wp-block-group{color: red;}.wp-block-group.has-grey-color{color: grey;}.wp-block-group.has-grey-background-color{background-color: grey;}',
$theme_json->get_stylesheet( 'block_styles' )
);
}

public function test_merge_incoming_data() {
$root_name = WP_Theme_JSON::ROOT_BLOCK_NAME;
$initial = array(
Expand Down