Changeset 52054

Timestamp:

11/08/2021 09:44:12 PM (3 years ago)

Author:

jorgefilipecosta

Message:

Add: Public functions for interacting with global styles & settings.

This commit ports the public functions to interact with the global styles & settings.

See #54336.
Props oandregal.

Location:

trunk/src

Files:

• wp-admin/load-styles.php (modified) (1 diff)
• wp-includes/block-editor.php (modified) (1 diff)
• wp-includes/global-styles-and-settings.php (added)
• wp-includes/script-loader.php (modified) (1 diff)
• wp-settings.php (modified) (1 diff)

trunk/src/wp-admin/load-styles.php

@@ -19 +19 @@
 require ABSPATH . WPINC . '/theme.php';
 require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
+require ABSPATH . WPINC . '/global-styles-and-settings.php';
 require ABSPATH . WPINC . '/script-loader.php';
 require ABSPATH . WPINC . '/version.php';

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

@@ -304 +304 @@
     );
 
-    $theme_json = WP_Theme_JSON_Resolver::get_merged_data();
+    $presets = array(
+        array(
+            'css'                     => 'variables',
+            '__unstableType'          => 'presets',
+            '__experimentalNoWrapper' => true,
+        ),
+        array(
+            'css'            => 'presets',
+            '__unstableType' => 'presets',
+        ),
+    );
+    foreach ( $presets as $preset_style ) {
+        $actual_css = wp_get_global_stylesheet( array( $preset_style['css'] ) );
+        if ( '' !== $actual_css ) {
+            $preset_style['css']         = $actual_css;
+            $editor_settings['styles'][] = $preset_style;
+        }
+    }
 
     if ( WP_Theme_JSON_Resolver::theme_has_support() ) {
-        $editor_settings['styles'][] = array(
-            'css'            => $theme_json->get_stylesheet( array( 'styles', 'presets' ) ),
-            '__unstableType' => 'globalStyles',
+        $block_classes = array(
+            'css'            => 'styles',
+            '__unstableType' => 'theme',
         );
-        $editor_settings['styles'][] = array(
-            'css'                     => $theme_json->get_stylesheet( array( 'variables' ) ),
-            '__experimentalNoWrapper' => true,
-            '__unstableType'          => 'globalStyles',
-        );
-    }
-
-    $editor_settings['__experimentalFeatures'] = $theme_json->get_settings();
+        $actual_css    = wp_get_global_stylesheet( array( $block_classes['css'] ) );
+        if ( '' !== $actual_css ) {
+            $block_classes['css'] = $actual_css;
+            $editor_settings['styles'][] = $block_classes;
+        }
+    }
+
+    $editor_settings['__experimentalFeatures'] = wp_get_global_settings();
     // These settings may need to be updated based on data coming from theme.json sources.
     if ( isset( $editor_settings['__experimentalFeatures']['color']['palette'] ) ) {

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

@@ -2304 +2304 @@
     }
 
-    $can_use_cache = (
-        ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
-        ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
-        ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
-        ! is_admin()
-    );
-
-    $stylesheet     = null;
-    $transient_name = 'global_styles_' . get_stylesheet();
-
-    if ( $can_use_cache ) {
-        $cache = get_transient( $transient_name );
-        if ( $cache ) {
-            $stylesheet = $cache;
-        }
-    }
-
-    if ( null === $stylesheet ) {
-        $theme_json = WP_Theme_JSON_Resolver::get_merged_data();
-        $stylesheet = $theme_json->get_stylesheet();
-
-        if ( $can_use_cache ) {
-            set_transient( $transient_name, $stylesheet, MINUTE_IN_SECONDS );
-        }
-    }
+    $stylesheet = wp_get_global_stylesheet();
 
     if ( empty( $stylesheet ) ) {

trunk/src/wp-settings.php

@@ -174 +174 @@
 require ABSPATH . WPINC . '/class-wp-theme-json.php';
 require ABSPATH . WPINC . '/class-wp-theme-json-resolver.php';
+require ABSPATH . WPINC . '/global-styles-and-settings.php';
 require ABSPATH . WPINC . '/class-wp-block-template.php';
 require ABSPATH . WPINC . '/block-template-utils.php';