Changeset 52747

Timestamp:

02/17/2022 01:07:46 PM (3 years ago)

Author:

jorgefilipecosta

Message:

Script Loader: Load block support styles in the head for block themes.

The dynamic block styles for layout and elements should be loaded in the head for block themes. While that should also be the case for classic themes, the current mechanism we use (render_block) does not allow us to do that, hence, this PR doesn't change anything for them and will be loaded the body.

Props oandregal, youknowriad, wpsoul.
Merges [52741] to the 5.9 branch.
Fixes #55148.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• src/wp-includes/block-supports/elements.php (modified) (2 diffs)
• src/wp-includes/block-supports/layout.php (modified) (1 diff)
• src/wp-includes/blocks.php (modified) (1 diff)

branches/5.9/src/wp-includes/block-supports/elements.php

@@ -47 +47 @@
     $link_color_declaration = esc_html( safecss_filter_attr( "color: $link_color" ) );
 
-    $style = "<style>.$class_name a{" . $link_color_declaration . ";}</style>\n";
+    $style = ".$class_name a{" . $link_color_declaration . ';}';
 
     // Like the layout hook this assumes the hook only applies to blocks with a single wrapper.
@@ -69 +69 @@
     }
 
-    /*
-     * Ideally styles should be loaded in the head, but blocks may be parsed
-     * after that, so loading in the footer for now.
-     * See https://core.trac.wordpress.org/ticket/53494.
-     */
-    add_action(
-        'wp_footer',
-        static function () use ( $style ) {
-            echo $style;
-        }
-    );
+    wp_enqueue_block_support( $style );
 
     return $content;

branches/5.9/src/wp-includes/block-supports/layout.php

@@ -176 +176 @@
     );
 
-    /*
-     * Ideally styles should be loaded in the head, but blocks may be parsed
-     * after that, so loading in the footer for now.
-     * See https://core.trac.wordpress.org/ticket/53494.
-     */
-    add_action(
-        'wp_footer',
-        static function () use ( $style ) {
-            echo '<style>' . $style . '</style>';
-        }
-    );
+    wp_enqueue_block_support( $style );
 
     return $content;

branches/5.9/src/wp-includes/blocks.php

@@ -1329 +1329 @@
 }
 add_filter( 'block_type_metadata', '_wp_multiple_block_styles' );
+
+/**
+ * This function takes care of adding inline styles
+ * in the proper place, depending on the theme in use.
+ *
+ * For block themes, it's loaded in the head.
+ * For classic ones, it's loaded in the body
+ * because the wp_head action (and wp_enqueue_scripts)
+ * happens before the render_block.
+ *
+ * See https://core.trac.wordpress.org/ticket/53494.
+ *
+ * @param string $style String containing the CSS styles to be added.
+ */
+function wp_enqueue_block_support( $style ) {
+    $action_hook_name = 'wp_footer';
+    if ( wp_is_block_theme() ) {
+        $action_hook_name = 'wp_enqueue_scripts';
+    }
+    add_action(
+        $action_hook_name,
+        function () use ( $style ) {
+            echo "<style>$style</style>\n";
+        }
+    );
+}