Remove no longer required option to skip root layout styles

WordPress · Dec 22, 2023 · 8ef0c8a · 8ef0c8a
1 parent 71fbbf9
commit 8ef0c8a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 31 deletions.
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
@@ -1233,8 +1233,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 		}
 
 		if ( in_array( 'styles', $types, true ) ) {
-			$skip_root_layout_styles = $options['skip_root_layout_styles'] ?? false;
-			if ( false !== $root_style_key && ! $skip_root_layout_styles ) {
+			if ( false !== $root_style_key ) {
 				$stylesheet .= $this->get_root_layout_rules( $style_nodes[ $root_style_key ]['selector'], $style_nodes[ $root_style_key ] );
 			}
 			$stylesheet .= $this->get_block_classes( $style_nodes );

diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
@@ -217,35 +217,6 @@ public function test_get_stylesheet_skips_layout_styles() {
 		);
 	}
 
-	public function test_get_stylesheet_skips_root_layout_styles() {
-		$theme_json = new WP_Theme_JSON_Gutenberg(
-			array(
-				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
-				'styles'  => array(
-					'blocks' => array(
-						'core/group' => array(
-							'color' => array(
-								'background' => 'deepskyblue',
-							),
-						),
-					),
-				),
-			),
-			'blocks'
-		);
-		$stylesheet = $theme_json->get_stylesheet(
-			array( 'styles' ),
-			array( 'custom' ),
-			array( 'skip_root_layout_styles' => true )
-		);
-
-		// All Layout styles should be skipped.
-		$this->assertEquals(
-			'.wp-block-group{background-color: deepskyblue;}',
-			$stylesheet
-		);
-	}
-
 	public function test_get_stylesheet() {
 		$theme_json = new WP_Theme_JSON_Gutenberg(
 			array(