Make WordPress Core

Changeset 52741


Ignore:
Timestamp:
02/16/2022 05:26:46 PM (2 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.
Fixes #55148.

Location:
trunk/src/wp-includes
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-includes/block-supports/elements.php

    r52069 r52741  
    4747    $link_color_declaration = esc_html( safecss_filter_attr( "color: $link_color" ) );
    4848
    49     $style = "<style>.$class_name a{" . $link_color_declaration . ";}</style>\n";
     49    $style = ".$class_name a{" . $link_color_declaration . ';}';
    5050
    5151    // Like the layout hook this assumes the hook only applies to blocks with a single wrapper.
     
    6969    }
    7070
    71     /*
    72      * Ideally styles should be loaded in the head, but blocks may be parsed
    73      * after that, so loading in the footer for now.
    74      * See https://core.trac.wordpress.org/ticket/53494.
    75      */
    76     add_action(
    77         'wp_footer',
    78         static function () use ( $style ) {
    79             echo $style;
    80         }
    81     );
     71    wp_enqueue_block_support( $style );
    8272
    8373    return $content;
  • trunk/src/wp-includes/block-supports/layout.php

    r52434 r52741  
    176176    );
    177177
    178     /*
    179      * Ideally styles should be loaded in the head, but blocks may be parsed
    180      * after that, so loading in the footer for now.
    181      * See https://core.trac.wordpress.org/ticket/53494.
    182      */
    183     add_action(
    184         'wp_footer',
    185         static function () use ( $style ) {
    186             echo '<style>' . $style . '</style>';
    187         }
    188     );
     178    wp_enqueue_block_support( $style );
    189179
    190180    return $content;
  • trunk/src/wp-includes/blocks.php

    r52699 r52741  
    13331333}
    13341334add_filter( 'block_type_metadata', '_wp_multiple_block_styles' );
     1335
     1336/**
     1337 * This function takes care of adding inline styles
     1338 * in the proper place, depending on the theme in use.
     1339 *
     1340 * For block themes, it's loaded in the head.
     1341 * For classic ones, it's loaded in the body
     1342 * because the wp_head action (and wp_enqueue_scripts)
     1343 * happens before the render_block.
     1344 *
     1345 * See https://core.trac.wordpress.org/ticket/53494.
     1346 *
     1347 * @param string $style String containing the CSS styles to be added.
     1348 */
     1349function wp_enqueue_block_support( $style ) {
     1350    $action_hook_name = 'wp_footer';
     1351    if ( wp_is_block_theme() ) {
     1352        $action_hook_name = 'wp_enqueue_scripts';
     1353    }
     1354    add_action(
     1355        $action_hook_name,
     1356        function () use ( $style ) {
     1357            echo "<style>$style</style>\n";
     1358        }
     1359    );
     1360}
Note: See TracChangeset for help on using the changeset viewer.