Changeset 54705

Timestamp:

10/27/2022 03:56:12 PM (2 years ago)

Author:

Bernhard Reiter

Message:

Editor: Ensure global styles are rendered for third-party blocks.

This change ensures custom styles for all third-party blocks are rendered on the front end if assets are set to be loaded on a per-block basis. Additionally, this change includes new unit tests to help prevent a similar bug in the future.

Props scruffian, aristath, poena, wildworks, ajlende, andraganescu, ndiego, gigitux, cbravobernal, ramonopoly, andrewserong, oandregal, hellofromTonya, davidbaumwald.
Merges [54703] to the 6.1 branch.
Fixes #56915.

Location:

branches/6.1

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/wp-includes/global-styles-and-settings.php (modified) (3 diffs)
• tests/phpunit/data/themedir1/block-theme/theme.json (modified) (1 diff)
• tests/phpunit/tests/theme/base.php (added)
• tests/phpunit/tests/theme/wpAddGlobalStylesForBlocks.php (added)

branches/6.1/phpcs.xml.dist

@@ -245 +245 @@
                 <element value="WP_Test_Adjacent_Image_Link_TestCase"/>
                 <element value="WP_Tests_Image_Resize_UnitTestCase"/>
+                <element value="WP_Theme_UnitTestCase"/>
 
                 <!-- Mock classes. -->

branches/6.1/src/wp-includes/global-styles-and-settings.php

@@ -219 +219 @@
         }
 
+        $stylesheet_handle = 'global-styles';
         if ( isset( $metadata['name'] ) ) {
-            $block_name = str_replace( 'core/', '', $metadata['name'] );
             /*
              * These block styles are added on block_render.
@@ -226 +226 @@
              * based on whether or not the block is used on the page.
              */
-            wp_add_inline_style( 'wp-block-' . $block_name, $block_css );
+            if ( str_starts_with( $metadata['name'], 'core/' ) ) {
+                $block_name        = str_replace( 'core/', '', $metadata['name'] );
+                $stylesheet_handle = 'wp-block-' . $block_name;
+            }
+            wp_add_inline_style( $stylesheet_handle, $block_css );
         }
 
@@ -243 +247 @@
             );
             if ( isset( $result[0] ) ) {
-                $block_name = str_replace( 'core/', '', $result[0] );
-                wp_add_inline_style( 'wp-block-' . $block_name, $block_css );
+                if ( str_starts_with( $result[0], 'core/' ) ) {
+                    $block_name        = str_replace( 'core/', '', $result[0] );
+                    $stylesheet_handle = 'wp-block-' . $block_name;
+                }
+                wp_add_inline_style( $stylesheet_handle, $block_css );
             }
         }

branches/6.1/tests/phpunit/data/themedir1/block-theme/theme.json

@@ -70 +70 @@
                     "duotone": "var(--wp--preset--duotone--custom-duotone)"
                 }
+            },
+            "my/third-party-block": {
+                "color": {
+                    "background": "hotpink"
+                }
             }
         },