Changeset 52743

Timestamp:

02/16/2022 10:18:33 PM (3 years ago)

Author:

jorgefilipecosta

Message:

Script Loader: Improvements to the load block support styles mechanism.

This commit applies feedback given to commit 52741. It changes the new function name, the file where it is located, and improves its documentation and marks.

Follow-up to [52741].
Props hellofromtonya, swissspidy, oandregal.
See #55148.

Location:

trunk/src/wp-includes

Files:

• block-supports/elements.php (modified) (1 diff)
• block-supports/layout.php (modified) (1 diff)
• blocks.php (modified) (1 diff)
• script-loader.php (modified) (1 diff)

trunk/src/wp-includes/block-supports/elements.php

@@ -69 +69 @@
     }
 
-    wp_enqueue_block_support( $style );
+    wp_enqueue_block_support_styles( $style );
 
     return $content;

trunk/src/wp-includes/block-supports/layout.php

@@ -176 +176 @@
     );
 
-    wp_enqueue_block_support( $style );
+    wp_enqueue_block_support_styles( $style );
 
     return $content;

trunk/src/wp-includes/blocks.php

@@ -1333 +1333 @@
 }
 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";
-        }
-    );
-}

trunk/src/wp-includes/script-loader.php

@@ -2884 +2884 @@
     wp_enqueue_style( 'global-styles-css-custom-properties' );
 }
+
+/**
+ * This function takes care of adding inline styles
+ * in the proper place, depending on the theme in use.
+ *
+ * @since 5.9.1
+ *
+ * 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.
+ *
+ * @link https://core.trac.wordpress.org/ticket/53494.
+ *
+ * @param string $style String containing the CSS styles to be added.
+ */
+function wp_enqueue_block_support_styles( $style ) {
+    $action_hook_name = 'wp_footer';
+    if ( wp_is_block_theme() ) {
+        $action_hook_name = 'wp_enqueue_scripts';
+    }
+    add_action(
+        $action_hook_name,
+        static function () use ( $style ) {
+            echo "<style>$style</style>\n";
+        }
+    );
+}