Changeset 55368

Timestamp:

02/20/2023 09:11:57 PM (2 years ago)

Author:

hellofromTonya

Message:

Editor: Fix 'wp-block-library-theme' style enqueue conditions.

Fixes the conditions for when to enqueue the opinionated block styles (i.e. 'wp-block-library-theme' stylesheet):

• the theme adds 'wp-block-styles' theme support;
• and no editor styles are declared.

This resolves an issue with themes that do not add the 'wp-block-styles' theme support while not impacting themes that do.

Follow-up to [53419], [52069], [50761], [44157].

Props mikachan, costdev, glendaviesnz, hellofromTonya, jffng, mamaduka, ndiego, poena, sannevndrmeulen, scruffian.
Fixes #57561.

Location:

trunk

Files:

• src/wp-admin/site-editor.php (modified) (1 diff)
• src/wp-includes/block-editor.php (modified) (2 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)
• tests/phpunit/tests/dependencies/styles.php (modified) (2 diffs)

trunk/src/wp-admin/site-editor.php

@@ -121 +121 @@
 
 if (
-    current_theme_supports( 'wp-block-styles' ) ||
+    current_theme_supports( 'wp-block-styles' ) &&
     ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
 ) {

trunk/src/wp-includes/block-editor.php

@@ -297 +297 @@
  */
 function _wp_get_iframed_editor_assets() {
-    global $pagenow;
+    global $pagenow, $editor_styles;
 
     $script_handles = array(
@@ -306 +306 @@
     );
 
-    if ( current_theme_supports( 'wp-block-styles' ) ) {
+    if (
+        current_theme_supports( 'wp-block-styles' ) &&
+        ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
+    ) {
         $style_handles[] = 'wp-block-library-theme';
     }

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

@@ -1636 +1636 @@
     }
 
-    if ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 ) {
-        // Include opinionated block styles if no $editor_styles are declared, so the editor never appears broken.
+    if (
+        current_theme_supports( 'wp-block-styles' ) &&
+        ( ! is_array( $editor_styles ) || count( $editor_styles ) === 0 )
+    ) {
+        /*
+         * Include opinionated block styles if the theme supports block styles and
+         * no $editor_styles are declared, so the editor never appears broken.
+         */
         $wp_edit_blocks_dependencies[] = 'wp-block-library-theme';
     }

trunk/tests/phpunit/tests/dependencies/styles.php

@@ -406 +406 @@
 
     /**
-     * Tests that visual block styles are enqueued in the editor even when there is not theme support for 'wp-block-styles'.
-     *
-     * Visual block styles should always be enqueued when editing to avoid the appearance of a broken editor.
+     * Tests that visual block styles are not be enqueued in the editor when there is not theme support for 'wp-block-styles'.
+     *
+     * @ticket 57561
      *
      * @covers ::wp_enqueue_style
@@ -420 +420 @@
         $this->assertFalse( wp_style_is( 'wp-block-library-theme' ) );
         wp_enqueue_style( 'wp-edit-blocks' );
-        $this->assertTrue( wp_style_is( 'wp-block-library-theme' ) );
+        $this->assertFalse( wp_style_is( 'wp-block-library-theme' ), "The 'wp-block-library-theme' style should not be in the queue after enqueuing 'wp-edit-blocks'" );
     }