<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53234] trunk/src/wp-includes: Editor: Move `wp_enqueue_block_style()` to `wp-includes/script-loader.php`, for better consistency.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53234">53234</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53234","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-04-20 13:51:21 +0000 (Wed, 20 Apr 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: Move `wp_enqueue_block_style()` to `wp-includes/script-loader.php`, for better consistency.
As a result of <a href="https://core.trac.wordpress.org/changeset/52741">[52741]</a> and <a href="https://core.trac.wordpress.org/changeset/52743">[52743]</a>, `wp_enqueue_block_support_styles()` was moved to `wp-includes/script-loader.php`. However, `wp_enqueue_block_style()` was still defined in `wp-includes/blocks.php`. This changeset also moves `wp_enqueue_block_support_styles()` to `wp-includes/script-loader.php` for better consistency.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/52741">[52741]</a>, <a href="https://core.trac.wordpress.org/changeset/52743">[52743]</a>.
Props SergeyBiryukov, mukesh27, audrasjb.
Fixes <a href="https://core.trac.wordpress.org/ticket/55182">#55182</a>.
See <a href="https://core.trac.wordpress.org/ticket/55148">#55148</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksphp">trunk/src/wp-includes/blocks.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/blocks.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/blocks.php 2022-04-20 12:46:01 UTC (rev 53233)
+++ trunk/src/wp-includes/blocks.php 2022-04-20 13:51:21 UTC (rev 53234)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1229,112 +1229,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Enqueues a stylesheet for a specific block.
- *
- * If the theme has opted-in to separate-styles loading,
- * then the stylesheet will be enqueued on-render,
- * otherwise when the block inits.
- *
- * @since 5.9.0
- *
- * @param string $block_name The block-name, including namespace.
- * @param array $args An array of arguments [handle,src,deps,ver,media].
- * @return void
- */
-function wp_enqueue_block_style( $block_name, $args ) {
- $args = wp_parse_args(
- $args,
- array(
- 'handle' => '',
- 'src' => '',
- 'deps' => array(),
- 'ver' => false,
- 'media' => 'all',
- )
- );
-
- /**
- * Callback function to register and enqueue styles.
- *
- * @param string $content When the callback is used for the render_block filter,
- * the content needs to be returned so the function parameter
- * is to ensure the content exists.
- * @return string Block content.
- */
- $callback = static function( $content ) use ( $args ) {
- // Register the stylesheet.
- if ( ! empty( $args['src'] ) ) {
- wp_register_style( $args['handle'], $args['src'], $args['deps'], $args['ver'], $args['media'] );
- }
-
- // Add `path` data if provided.
- if ( isset( $args['path'] ) ) {
- wp_style_add_data( $args['handle'], 'path', $args['path'] );
-
- // Get the RTL file path.
- $rtl_file_path = str_replace( '.css', '-rtl.css', $args['path'] );
-
- // Add RTL stylesheet.
- if ( file_exists( $rtl_file_path ) ) {
- wp_style_add_data( $args['handle'], 'rtl', 'replace' );
-
- if ( is_rtl() ) {
- wp_style_add_data( $args['handle'], 'path', $rtl_file_path );
- }
- }
- }
-
- // Enqueue the stylesheet.
- wp_enqueue_style( $args['handle'] );
-
- return $content;
- };
-
- $hook = did_action( 'wp_enqueue_scripts' ) ? 'wp_footer' : 'wp_enqueue_scripts';
- if ( wp_should_load_separate_core_block_assets() ) {
- /**
- * Callback function to register and enqueue styles.
- *
- * @param string $content The block content.
- * @param array $block The full block, including name and attributes.
- * @return string Block content.
- */
- $callback_separate = static function( $content, $block ) use ( $block_name, $callback ) {
- if ( ! empty( $block['blockName'] ) && $block_name === $block['blockName'] ) {
- return $callback( $content );
- }
- return $content;
- };
-
- /*
- * The filter's callback here is an anonymous function because
- * using a named function in this case is not possible.
- *
- * The function cannot be unhooked, however, users are still able
- * to dequeue the stylesheets registered/enqueued by the callback
- * which is why in this case, using an anonymous function
- * was deemed acceptable.
- */
- add_filter( 'render_block', $callback_separate, 10, 2 );
- return;
- }
-
- /*
- * The filter's callback here is an anonymous function because
- * using a named function in this case is not possible.
- *
- * The function cannot be unhooked, however, users are still able
- * to dequeue the stylesheets registered/enqueued by the callback
- * which is why in this case, using an anonymous function
- * was deemed acceptable.
- */
- add_filter( $hook, $callback );
-
- // Enqueue assets in the editor.
- add_action( 'enqueue_block_assets', $callback );
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Allow multiple block styles.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2022-04-20 12:46:01 UTC (rev 53233)
+++ trunk/src/wp-includes/script-loader.php 2022-04-20 13:51:21 UTC (rev 53234)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2921,3 +2921,109 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Enqueues a stylesheet for a specific block.
+ *
+ * If the theme has opted-in to separate-styles loading,
+ * then the stylesheet will be enqueued on-render,
+ * otherwise when the block inits.
+ *
+ * @since 5.9.0
+ *
+ * @param string $block_name The block-name, including namespace.
+ * @param array $args An array of arguments [handle,src,deps,ver,media].
+ * @return void
+ */
+function wp_enqueue_block_style( $block_name, $args ) {
+ $args = wp_parse_args(
+ $args,
+ array(
+ 'handle' => '',
+ 'src' => '',
+ 'deps' => array(),
+ 'ver' => false,
+ 'media' => 'all',
+ )
+ );
+
+ /**
+ * Callback function to register and enqueue styles.
+ *
+ * @param string $content When the callback is used for the render_block filter,
+ * the content needs to be returned so the function parameter
+ * is to ensure the content exists.
+ * @return string Block content.
+ */
+ $callback = static function( $content ) use ( $args ) {
+ // Register the stylesheet.
+ if ( ! empty( $args['src'] ) ) {
+ wp_register_style( $args['handle'], $args['src'], $args['deps'], $args['ver'], $args['media'] );
+ }
+
+ // Add `path` data if provided.
+ if ( isset( $args['path'] ) ) {
+ wp_style_add_data( $args['handle'], 'path', $args['path'] );
+
+ // Get the RTL file path.
+ $rtl_file_path = str_replace( '.css', '-rtl.css', $args['path'] );
+
+ // Add RTL stylesheet.
+ if ( file_exists( $rtl_file_path ) ) {
+ wp_style_add_data( $args['handle'], 'rtl', 'replace' );
+
+ if ( is_rtl() ) {
+ wp_style_add_data( $args['handle'], 'path', $rtl_file_path );
+ }
+ }
+ }
+
+ // Enqueue the stylesheet.
+ wp_enqueue_style( $args['handle'] );
+
+ return $content;
+ };
+
+ $hook = did_action( 'wp_enqueue_scripts' ) ? 'wp_footer' : 'wp_enqueue_scripts';
+ if ( wp_should_load_separate_core_block_assets() ) {
+ /**
+ * Callback function to register and enqueue styles.
+ *
+ * @param string $content The block content.
+ * @param array $block The full block, including name and attributes.
+ * @return string Block content.
+ */
+ $callback_separate = static function( $content, $block ) use ( $block_name, $callback ) {
+ if ( ! empty( $block['blockName'] ) && $block_name === $block['blockName'] ) {
+ return $callback( $content );
+ }
+ return $content;
+ };
+
+ /*
+ * The filter's callback here is an anonymous function because
+ * using a named function in this case is not possible.
+ *
+ * The function cannot be unhooked, however, users are still able
+ * to dequeue the stylesheets registered/enqueued by the callback
+ * which is why in this case, using an anonymous function
+ * was deemed acceptable.
+ */
+ add_filter( 'render_block', $callback_separate, 10, 2 );
+ return;
+ }
+
+ /*
+ * The filter's callback here is an anonymous function because
+ * using a named function in this case is not possible.
+ *
+ * The function cannot be unhooked, however, users are still able
+ * to dequeue the stylesheets registered/enqueued by the callback
+ * which is why in this case, using an anonymous function
+ * was deemed acceptable.
+ */
+ add_filter( $hook, $callback );
+
+ // Enqueue assets in the editor.
+ add_action( 'enqueue_block_assets', $callback );
+}
</ins></span></pre>
</div>
</div>
</body>
</html>