Changeset 52232 for trunk/src/wp-includes/class-wp-theme-json-resolver.php

Timestamp:

11/23/2021 05:38:45 AM (5 years ago)

Author:

noisysocks

Message:

Update @wordpress packages

Update packages to include these bug fixes from Gutenberg:

• FSE: Add welcome guide
• Update theme styles for the code block
• Add feature flag to toggle the new site editor sidebar
• Add templates list page for site editor
• Cover Block: Fix default background dim
• E2E: Add more Cover block tests
• Cover Block: Fix regressions
• Post Comments Form: ensure typography styles are applied to child elements
• Navigation: Fix space-between
• Fix background colours in nested submenus.
• Fix duplicate custom classnames in navigation submenu block
• Fix colour rendering in Navigation overlay
• Fix: Add ability to opt out of Core color palette V2
• Change @package to WordPress in block-library
• Make the core color palette opt-in for themes with not theme.json
• Remove textdomain from calendar block
• Page List block: fix space before href attribute
• Try: Let Featured Image block inherit dimensions, look like a placeholder
• [Global Styles]: Add block icon next to blocks list
• Page List: Use core entities instead of direct apiFetch
• Site Editor: Stabilize export endpoint
• Fix mobile horizontal scrollbar.
• Multi-entity save: Only set site entity to pending if really saving
• Add page list to navigation direct insert conditions
• Implement "Add New" for templates list in Site Editor
• Post Featured Image: Remove withNotices HOC
• Fix page list missing button styles when set to open on click.
• Make appender fixed position to avoid jumps in the UI
• Color UI component: reorder palettes and update names (core by defaults, user by custom)
• Remove the Styles link in Site Editor
• GlobalStyles sidebar: do not show default palette if theme opts-out
• Only render the site editor canvas when the global styles are ready.
• Global Styles: rename core origin key to default for presets
• Clarify i18n context for PostTemplateActions's "New" label
• Revert erroneous native editor package version bumps
• Try: Hide the columns inserter in pattern previews.
• Fix site editor region navigation
• Update navigation sidebar responsiveness
• Add _wp_array_set and _wp_to_kebab_case to 5.8 compat
• Make user able to change all color palette origins
• Site Editor: Update hrefs to not specifically refer to themes.php?page=gutenberg-edit-site
• Site Editor: Validate the postType query argument
• Navigation: Scale submenu icon.
• Move the theme editor under tools for FSE themes
• Deprecate navigation areas

See #54487.

File:

• trunk/src/wp-includes/class-wp-theme-json-resolver.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-theme-json-resolver.php

@@ -137 +137 @@
                 $config     = self::read_json_file( __DIR__ . '/theme.json' );
                 $config     = self::translate( $config );
-                self::$core = new WP_Theme_JSON( $config, 'core' );
+                self::$core = new WP_Theme_JSON( $config, 'default' );
 
                 return self::$core;
@@ -183 +183 @@
                 * and merge the self::$theme upon that.
                 */
-                $theme_support_data  = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+                $theme_support_data = WP_Theme_JSON::get_from_editor_settings( get_default_block_editor_settings() );
+                if ( ! self::theme_has_support() ) {
+                        if ( ! isset( $theme_support_data['settings']['color'] ) ) {
+                                $theme_support_data['settings']['color'] = array();
+                        }
+
+                        $default_palette = false;
+                        if ( current_theme_supports( 'default-color-palette' ) ) {
+                                $default_palette = true;
+                        }
+                        if ( ! isset( $theme_support_data['settings']['color']['palette'] ) ) {
+                                // If the theme does not have any palette, we still want to show the core one.
+                                $default_palette = true;
+                        }
+                        $theme_support_data['settings']['color']['defaultPalette'] = $default_palette;
+
+                        $default_gradients = false;
+                        if ( current_theme_supports( 'default-gradient-presets' ) ) {
+                                $default_gradients = true;
+                        }
+                        if ( ! isset( $theme_support_data['settings']['color']['gradients'] ) ) {
+                                // If the theme does not have any gradients, we still want to show the core ones.
+                                $default_gradients = true;
+                        }
+                        $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
+                }
                 $with_theme_supports = new WP_Theme_JSON( $theme_support_data );
                 $with_theme_supports->merge( self::$theme );
@@ -294 +319 @@
         /**
          * There are three sources of data (origins) for a site:
-         * core, theme, and user. The user's has higher priority
+         * default, theme, and user. The user's has higher priority
          * than the theme's, and the theme's higher than core's.
          *