Changeset 52753

Timestamp:

02/17/2022 02:17:18 PM (3 years ago)

Author:

jorgefilipecosta

Message:

Global Styles: Load the global styles before the theme styles in the editor.

This commit makes the site editor follow what we do in the front-end, where theme styles are loaded after global styles by default.

Props oandregal, ntsekouras.
Merges [52752] to the 5.9 branch.
Fixes #55188.

Location:

branches/5.9

Files:

• . (modified) (1 prop)
• src/wp-admin/edit-form-blocks.php (modified) (1 diff)
• src/wp-includes/block-editor.php (modified) (3 diffs)

branches/5.9/src/wp-admin/edit-form-blocks.php

@@ -192 +192 @@
     'bodyPlaceholder'                      => $body_placeholder,
     'autosaveInterval'                     => AUTOSAVE_INTERVAL,
-    'styles'                               => get_block_editor_theme_styles(),
     'richEditingEnabled'                   => user_can_richedit(),
     'postLock'                             => $lock_details,

branches/5.9/src/wp-includes/block-editor.php

@@ -308 +308 @@
     );
 
-    $presets = array(
+    $global_styles = array();
+    $presets       = array(
         array(
             'css'                     => 'variables',
@@ -321 +322 @@
         $actual_css = wp_get_global_stylesheet( array( $preset_style['css'] ) );
         if ( '' !== $actual_css ) {
-            $preset_style['css']         = $actual_css;
-            $editor_settings['styles'][] = $preset_style;
+            $preset_style['css'] = $actual_css;
+            $global_styles[]     = $preset_style;
         }
     }
@@ -333 +334 @@
         $actual_css    = wp_get_global_stylesheet( array( $block_classes['css'] ) );
         if ( '' !== $actual_css ) {
-            $block_classes['css']        = $actual_css;
-            $editor_settings['styles'][] = $block_classes;
+            $block_classes['css'] = $actual_css;
+            $global_styles[]      = $block_classes;
         }
     }
+
+    $editor_settings['styles'] = array_merge( $global_styles, get_block_editor_theme_styles() );
 
     $editor_settings['__experimentalFeatures'] = wp_get_global_settings();