From cfe8ab9b2048fdb26f13e3889953be9c8f380c9a Mon Sep 17 00:00:00 2001 From: Isabel Brison Date: Wed, 21 Jun 2023 05:30:24 +0000 Subject: [PATCH] Editor: update layout classnames and specificity. Adds a compound layout classname and reduces layout spacing rule specificity. Props ramonopoly, andrewserong, poena. Fixes #58548. git-svn-id: https://develop.svn.wordpress.org/trunk@55956 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-includes/block-supports/layout.php | 5 +++++ src/wp-includes/class-wp-theme-json.php | 8 ++++--- src/wp-includes/theme.json | 22 ++++++++++++++----- .../blocks/fixtures/core__column.server.html | 2 +- .../blocks/fixtures/core__columns.server.html | 6 ++--- .../core__columns__deprecated.server.html | 2 +- .../core__gallery-with-caption.server.html | 2 +- .../blocks/fixtures/core__gallery.server.html | 2 +- .../core__gallery__columns.server.html | 2 +- .../core__gallery__deprecated-1.server.html | 2 +- .../core__gallery__deprecated-2.server.html | 2 +- .../core__gallery__deprecated-3.server.html | 2 +- .../core__gallery__deprecated-4.server.html | 2 +- .../core__gallery__deprecated-5.server.html | 2 +- .../core__gallery__deprecated-6.server.html | 2 +- .../core__gallery__deprecated-7.server.html | 4 ++-- tests/phpunit/tests/block-supports/layout.php | 7 +++--- tests/phpunit/tests/media.php | 6 +++-- tests/phpunit/tests/theme/wpThemeJson.php | 14 +++++++----- 19 files changed, 59 insertions(+), 35 deletions(-) diff --git a/src/wp-includes/block-supports/layout.php b/src/wp-includes/block-supports/layout.php index 22fe6d7b7a..98b44079ba 100644 --- a/src/wp-includes/block-supports/layout.php +++ b/src/wp-includes/block-supports/layout.php @@ -312,6 +312,7 @@ function wp_get_layout_style( $selector, $layout, $has_block_gap_support = false * Renders the layout config to the block wrapper. * * @since 5.8.0 + * @since 6.3.0 Adds compound class to layout wrapper for global spacing styles. * @access private * * @param string $block_content Rendered block content. @@ -474,6 +475,10 @@ function wp_render_layout_support_flag( $block_content, $block ) { } } + // Add combined layout and block classname for global styles to hook onto. + $block_name = explode( '/', $block['blockName'] ); + $class_names[] = 'wp-block-' . end( $block_name ) . '-' . $layout_classname; + $content_with_outer_classnames = ''; if ( ! empty( $outer_class_names ) ) { diff --git a/src/wp-includes/class-wp-theme-json.php b/src/wp-includes/class-wp-theme-json.php index 74f3971bf2..afff53f9da 100644 --- a/src/wp-includes/class-wp-theme-json.php +++ b/src/wp-includes/class-wp-theme-json.php @@ -1246,6 +1246,7 @@ class WP_Theme_JSON { * Gets the CSS layout rules for a particular block from theme.json layout definitions. * * @since 6.1.0 + * @since 6.3.0 Reduced specificity for layout margin rules. * * @param array $block_metadata Metadata about the block to get styles for. * @return string Layout styles for the block. @@ -1342,7 +1343,7 @@ class WP_Theme_JSON { $spacing_rule['selector'] ); } else { - $format = static::ROOT_BLOCK_SELECTOR === $selector ? '%s .%s%s' : '%s.%s%s'; + $format = static::ROOT_BLOCK_SELECTOR === $selector ? ':where(%s .%s) %s' : '%s-%s%s'; $layout_selector = sprintf( $format, $selector, @@ -2560,8 +2561,9 @@ class WP_Theme_JSON { $has_block_gap_support = _wp_array_get( $this->theme_json, array( 'settings', 'spacing', 'blockGap' ) ) !== null; if ( $has_block_gap_support ) { $block_gap_value = static::get_property_value( $this->theme_json, array( 'styles', 'spacing', 'blockGap' ) ); - $css .= '.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }'; - $css .= ".wp-site-blocks > * + * { margin-block-start: $block_gap_value; }"; + $css .= ":where(.wp-site-blocks) > * { margin-block-start: $block_gap_value; margin-block-end: 0; }"; + $css .= ':where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }'; + $css .= ':where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }'; // For backwards compatibility, ensure the legacy block gap CSS variable is still available. $css .= "$selector { --wp--style--block-gap: $block_gap_value; }"; diff --git a/src/wp-includes/theme.json b/src/wp-includes/theme.json index af44799060..581bdb0b32 100644 --- a/src/wp-includes/theme.json +++ b/src/wp-includes/theme.json @@ -219,14 +219,19 @@ ], "spacingStyles": [ { - "selector": " > *", + "selector": " > :first-child:first-child", + "rules": { + "margin-block-start": "0" + } + }, + { + "selector": " > :last-child:last-child", "rules": { - "margin-block-start": "0", "margin-block-end": "0" } }, { - "selector": " > * + *", + "selector": " > *", "rules": { "margin-block-start": null, "margin-block-end": "0" @@ -279,14 +284,19 @@ ], "spacingStyles": [ { - "selector": " > *", + "selector": " > :first-child:first-child", + "rules": { + "margin-block-start": "0" + } + }, + { + "selector": " > :last-child:last-child", "rules": { - "margin-block-start": "0", "margin-block-end": "0" } }, { - "selector": " > * + *", + "selector": " > *", "rules": { "margin-block-start": null, "margin-block-end": "0" diff --git a/tests/phpunit/data/blocks/fixtures/core__column.server.html b/tests/phpunit/data/blocks/fixtures/core__column.server.html index a3624daaf0..d0b6ab4016 100644 --- a/tests/phpunit/data/blocks/fixtures/core__column.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__column.server.html @@ -1,5 +1,5 @@ -
+

Column One, Paragraph One

diff --git a/tests/phpunit/data/blocks/fixtures/core__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__columns.server.html index 1c144512d1..e35ab2763e 100644 --- a/tests/phpunit/data/blocks/fixtures/core__columns.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__columns.server.html @@ -1,7 +1,7 @@ -
+
-
+

Column One, Paragraph One

@@ -11,7 +11,7 @@
-
+

Column Two, Paragraph One

diff --git a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html index 9d213ddcdf..c61aabf682 100644 --- a/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__columns__deprecated.server.html @@ -1,5 +1,5 @@ -
+

Column One, Paragraph One

diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html index 18e3f1d8c8..49912d63c4 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery-with-caption.server.html @@ -1,6 +1,6 @@
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html index fdea3c8cee..051cc297b4 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery.server.html @@ -1,6 +1,6 @@
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html index 33bf96793e..024adf2115 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__columns.server.html @@ -1,5 +1,5 @@ -
+
+
title
diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html index 4f47253ffb..399594ce59 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-2.server.html @@ -1,5 +1,5 @@ -
    +
    • title diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html index 9c58c81034..e017c1a0c8 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-3.server.html @@ -1,5 +1,5 @@ -
        +
        • title diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html index 355dc4bdf4..b835e5f1ab 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-4.server.html @@ -1,5 +1,5 @@ -
          +
          • diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html index 57c42cc3bd..f69cf83abc 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-5.server.html @@ -1,5 +1,5 @@ -
            +
            • diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html index 9175cfa561..7952cd8c48 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-6.server.html @@ -1,5 +1,5 @@ -
              +
              • diff --git a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html index d3fa62fdf5..69df4fd1bc 100644 --- a/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html +++ b/tests/phpunit/data/blocks/fixtures/core__gallery__deprecated-7.server.html @@ -1,12 +1,12 @@ -
                +
                -
                +
                diff --git a/tests/phpunit/tests/block-supports/layout.php b/tests/phpunit/tests/block-supports/layout.php index 73acce8bc7..df0abf9b49 100644 --- a/tests/phpunit/tests/block-supports/layout.php +++ b/tests/phpunit/tests/block-supports/layout.php @@ -170,6 +170,7 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase { /** * @ticket 57584 + * @ticket 58548 * * @dataProvider data_layout_support_flag_renders_classnames_on_wrapper * @@ -207,7 +208,7 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase { ), ), ), - 'expected_output' => '
                ', + 'expected_output' => '
                ', ), 'single wrapper block layout with constrained type' => array( 'args' => array( @@ -226,7 +227,7 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase { ), ), ), - 'expected_output' => '
                ', + 'expected_output' => '
                ', ), 'multiple wrapper block layout with flow type' => array( 'args' => array( @@ -247,7 +248,7 @@ class Test_Block_Supports_Layout extends WP_UnitTestCase { ), ), ), - 'expected_output' => '
                ', + 'expected_output' => '
                ', ), ); } diff --git a/tests/phpunit/tests/media.php b/tests/phpunit/tests/media.php index 9ea0cc53b0..3c42f01290 100644 --- a/tests/phpunit/tests/media.php +++ b/tests/phpunit/tests/media.php @@ -3827,6 +3827,7 @@ EOF; * image in the loop when using a block theme. * * @ticket 56930 + * @ticket 58548 * * @covers ::wp_filter_content_tags * @covers ::wp_get_loading_attr_default @@ -3863,7 +3864,7 @@ EOF; $_wp_current_template_content = ''; $html = get_the_block_template_html(); - $this->assertSame( '
                ' . $expected_content . '
                ', $html ); + $this->assertSame( '
                ' . $expected_content . '
                ', $html ); } /** @@ -3871,6 +3872,7 @@ EOF; * to the featured image when using a block theme. * * @ticket 56930 + * @ticket 58548 * * @covers ::wp_filter_content_tags * @covers ::wp_get_loading_attr_default @@ -3918,7 +3920,7 @@ EOF; $_wp_current_template_content = ' '; $html = get_the_block_template_html(); - $this->assertSame( '
                ' . $expected_featured_image . '
                ' . $expected_content . '
                ', $html ); + $this->assertSame( '
                ' . $expected_featured_image . '
                ' . $expected_content . '
                ', $html ); } /** diff --git a/tests/phpunit/tests/theme/wpThemeJson.php b/tests/phpunit/tests/theme/wpThemeJson.php index 8b54960ccf..19212bc513 100644 --- a/tests/phpunit/tests/theme/wpThemeJson.php +++ b/tests/phpunit/tests/theme/wpThemeJson.php @@ -448,6 +448,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 54336 + * @ticket 58548 */ public function test_get_stylesheet_renders_enabled_protected_properties() { $theme_json = new WP_Theme_JSON( @@ -466,7 +467,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ) ); - $expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1em; }body { --wp--style--block-gap: 1em; }'; + $expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1em; }'; $this->assertSame( $expected, $theme_json->get_stylesheet() ); $this->assertSame( $expected, $theme_json->get_stylesheet( array( 'styles' ) ) ); } @@ -3299,6 +3300,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { * @dataProvider data_get_layout_definitions * * @ticket 56467 + * @ticket 58548 * * @param array $layout_definitions Layout definitions as stored in core theme.json. */ @@ -3325,7 +3327,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { // Results also include root site blocks styles. $this->assertSame( - 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1em; }body { --wp--style--block-gap: 1em; }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: 1em;margin-block-end: 0;}body .is-layout-flex{gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}', + 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1em; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1em; }:where(body .is-layout-flow) > *{margin-block-start: 0;margin-block-end: 0;}:where(body .is-layout-flow) > * + *{margin-block-start: 1em;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1em;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}', $theme_json->get_stylesheet( array( 'styles' ) ) ); } @@ -3334,6 +3336,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { * @dataProvider data_get_layout_definitions * * @ticket 56467 + * @ticket 58548 * * @param array $layout_definitions Layout definitions as stored in core theme.json. */ @@ -3360,7 +3363,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { // Results also include root site blocks styles. $this->assertSame( - 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: var(--wp--preset--spacing--60); }body { --wp--style--block-gap: var(--wp--preset--spacing--60); }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}body .is-layout-flex{gap: var(--wp--preset--spacing--60);}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}', + 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: var(--wp--preset--spacing--60); margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: var(--wp--preset--spacing--60); }:where(body .is-layout-flow) > *{margin-block-start: 0;margin-block-end: 0;}:where(body .is-layout-flow) > * + *{margin-block-start: var(--wp--preset--spacing--60);margin-block-end: 0;}:where(body .is-layout-flex) {gap: var(--wp--preset--spacing--60);}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}', $theme_json->get_stylesheet( array( 'styles' ) ) ); } @@ -3516,7 +3519,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { ); $this->assertSame( - 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: 1rem; }body { --wp--style--block-gap: 1rem; }body .is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}body .is-layout-flow > * + *{margin-block-start: 1rem;margin-block-end: 0;}body .is-layout-flex{gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}.wp-block-post-content{color: gray;}.wp-block-social-links.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links.is-layout-flex{gap: 0;}.wp-block-buttons.is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons.is-layout-flex{gap: 0;}', + 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: 1rem; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: 1rem; }:where(body .is-layout-flow) > *{margin-block-start: 0;margin-block-end: 0;}:where(body .is-layout-flow) > * + *{margin-block-start: 1rem;margin-block-end: 0;}:where(body .is-layout-flex) {gap: 1rem;}body .is-layout-flow > .alignleft{float: left;margin-inline-start: 0;margin-inline-end: 2em;}body .is-layout-flow > .alignright{float: right;margin-inline-start: 2em;margin-inline-end: 0;}body .is-layout-flow > .aligncenter{margin-left: auto !important;margin-right: auto !important;}body .is-layout-flex{display: flex;}body .is-layout-flex{flex-wrap: wrap;align-items: center;}.wp-block-post-content{color: gray;}.wp-block-social-links-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-social-links-is-layout-flex{gap: 0;}.wp-block-buttons-is-layout-flow > *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-flow > * + *{margin-block-start: 0;margin-block-end: 0;}.wp-block-buttons-is-layout-flex{gap: 0;}', $theme_json->get_stylesheet() ); } @@ -3958,6 +3961,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { /** * @ticket 56611 + * @ticket 58548 */ public function test_get_styles_with_appearance_tools() { $theme_json = new WP_Theme_JSON( @@ -3974,7 +3978,7 @@ class Tests_Theme_wpThemeJson extends WP_UnitTestCase { 'selector' => 'body', ); - $expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.wp-site-blocks > * { margin-block-start: 0; margin-block-end: 0; }.wp-site-blocks > * + * { margin-block-start: ; }body { --wp--style--block-gap: ; }'; + $expected = 'body { margin: 0; }.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }:where(.wp-site-blocks) > * { margin-block-start: ; margin-block-end: 0; }:where(.wp-site-blocks) > :first-child:first-child { margin-block-start: 0; }:where(.wp-site-blocks) > :last-child:last-child { margin-block-end: 0; }body { --wp--style--block-gap: ; }'; $root_rules = $theme_json->get_root_layout_rules( WP_Theme_JSON::ROOT_BLOCK_SELECTOR, $metadata ); $this->assertSame( $expected, $root_rules ); }