Rebuilding the entire editing experience pages and posts was just the start. We have expanded what is possible within the editor by making every part of your site customizable right in the editor. Customize your site navigation. Change your site title. Customize your footer. If you can imagine it, you can build it.
';
++}
++
++/**
++ * Renders a 'viewport' meta tag.
++ *
++ * This is hooked into {@see 'wp_head'} to decouple its output from the default template canvas.
++ */
++function gutenberg_viewport_meta_tag() {
++ echo '' . "\n";
++}
++
++/**
++ * Strips .php suffix from template file names.
++ *
++ * @access private
++ *
++ * @param string $template_file Template file name.
++ * @return string Template file name without extension.
++ */
++function gutenberg_strip_php_suffix( $template_file ) {
++ return preg_replace( '/\.(php|html)$/', '', $template_file );
++}
++
++/**
++ * Removes post details from block context when rendering a block template.
++ *
++ * @param array $context Default context.
++ *
++ * @return array Filtered context.
++ */
++function gutenberg_template_render_without_post_block_context( $context ) {
++ /*
++ * When loading a template or template part directly and not through a page
++ * that resolves it, the top-level post ID and type context get set to that
++ * of the template part. Templates are just the structure of a site, and
++ * they should not be available as post context because blocks like Post
++ * Content would recurse infinitely.
++ */
++ if ( isset( $context['postType'] ) &&
++ ( 'wp_template' === $context['postType'] || 'wp_template_part' === $context['postType'] ) ) {
++ unset( $context['postId'] );
++ unset( $context['postType'] );
++ }
++
++ return $context;
++}
++add_filter( 'render_block_context', 'gutenberg_template_render_without_post_block_context' );
+diff --git a/lib/full-site-editing/template-parts.php b/lib/full-site-editing/template-parts.php
+new file mode 100644
+index 0000000000..172ca6a5ed
+--- /dev/null
++++ b/lib/full-site-editing/template-parts.php
+@@ -0,0 +1,120 @@
++ __( 'Template Parts', 'gutenberg' ),
++ 'singular_name' => __( 'Template Part', 'gutenberg' ),
++ 'menu_name' => _x( 'Template Parts', 'Admin Menu text', 'gutenberg' ),
++ 'add_new' => _x( 'Add New', 'Template Part', 'gutenberg' ),
++ 'add_new_item' => __( 'Add New Template Part', 'gutenberg' ),
++ 'new_item' => __( 'New Template Part', 'gutenberg' ),
++ 'edit_item' => __( 'Edit Template Part', 'gutenberg' ),
++ 'view_item' => __( 'View Template Part', 'gutenberg' ),
++ 'all_items' => __( 'All Template Parts', 'gutenberg' ),
++ 'search_items' => __( 'Search Template Parts', 'gutenberg' ),
++ 'parent_item_colon' => __( 'Parent Template Part:', 'gutenberg' ),
++ 'not_found' => __( 'No template parts found.', 'gutenberg' ),
++ 'not_found_in_trash' => __( 'No template parts found in Trash.', 'gutenberg' ),
++ 'archives' => __( 'Template part archives', 'gutenberg' ),
++ 'insert_into_item' => __( 'Insert into template part', 'gutenberg' ),
++ 'uploaded_to_this_item' => __( 'Uploaded to this template part', 'gutenberg' ),
++ 'filter_items_list' => __( 'Filter template parts list', 'gutenberg' ),
++ 'items_list_navigation' => __( 'Template parts list navigation', 'gutenberg' ),
++ 'items_list' => __( 'Template parts list', 'gutenberg' ),
++ );
++
++ $args = array(
++ 'labels' => $labels,
++ 'description' => __( 'Template parts to include in your templates.', 'gutenberg' ),
++ 'public' => false,
++ 'has_archive' => false,
++ 'show_ui' => true,
++ 'show_in_menu' => 'themes.php',
++ 'show_in_admin_bar' => false,
++ 'show_in_rest' => true,
++ 'rest_base' => 'template-parts',
++ 'rest_controller_class' => 'WP_REST_Templates_Controller',
++ 'map_meta_cap' => true,
++ 'supports' => array(
++ 'title',
++ 'slug',
++ 'excerpt',
++ 'editor',
++ 'revisions',
++ ),
++ );
++
++ register_post_type( 'wp_template_part', $args );
++}
++add_action( 'init', 'gutenberg_register_template_part_post_type' );
++
++/**
++ * Fixes the label of the 'wp_template_part' admin menu entry.
++ */
++function gutenberg_fix_template_part_admin_menu_entry() {
++ if ( ! gutenberg_is_fse_theme() ) {
++ return;
++ }
++
++ global $submenu;
++ if ( ! isset( $submenu['themes.php'] ) ) {
++ return;
++ }
++ $post_type = get_post_type_object( 'wp_template_part' );
++ if ( ! $post_type ) {
++ return;
++ }
++ foreach ( $submenu['themes.php'] as $key => $submenu_entry ) {
++ if ( $post_type->labels->all_items === $submenu['themes.php'][ $key ][0] ) {
++ $submenu['themes.php'][ $key ][0] = $post_type->labels->menu_name; // phpcs:ignore WordPress.WP.GlobalVariablesOverride
++ break;
++ }
++ }
++}
++add_action( 'admin_menu', 'gutenberg_fix_template_part_admin_menu_entry' );
++
++// Customize the `wp_template` admin list.
++add_filter( 'manage_wp_template_part_posts_columns', 'gutenberg_templates_lists_custom_columns' );
++add_action( 'manage_wp_template_part_posts_custom_column', 'gutenberg_render_templates_lists_custom_column', 10, 2 );
++add_filter( 'views_edit-wp_template_part', 'gutenberg_filter_templates_edit_views' );
++
++/**
++ * Sets a custom slug when creating auto-draft template parts.
++ * This is only needed for auto-drafts created by the regular WP editor.
++ * If this page is to be removed, this won't be necessary.
++ *
++ * @param int $post_id Post ID.
++ */
++function set_unique_slug_on_create_template_part( $post_id ) {
++ $post = get_post( $post_id );
++ if ( 'auto-draft' !== $post->post_status ) {
++ return;
++ }
++
++ if ( ! $post->post_name ) {
++ wp_update_post(
++ array(
++ 'ID' => $post_id,
++ 'post_name' => 'custom_slug_' . uniqid(),
++ )
++ );
++ }
++
++ $terms = get_the_terms( $post_id, 'wp_theme' );
++ if ( ! $terms || ! count( $terms ) ) {
++ wp_set_post_terms( $post_id, wp_get_theme()->get_stylesheet(), 'wp_theme' );
++ }
++}
++add_action( 'save_post_wp_template_part', 'set_unique_slug_on_create_template_part' );
+diff --git a/lib/full-site-editing/templates-utils.php b/lib/full-site-editing/templates-utils.php
+new file mode 100644
+index 0000000000..bc270a738d
+--- /dev/null
++++ b/lib/full-site-editing/templates-utils.php
+@@ -0,0 +1,113 @@
++post_name );
++ return;
++ }
++
++ if ( 'description' === $column_name && has_excerpt( $post_id ) ) {
++ the_excerpt( $post_id );
++ return;
++ }
++
++ if ( 'status' === $column_name ) {
++ $post_status = get_post_status( $post_id );
++ // The auto-draft status doesn't have localized labels.
++ if ( 'auto-draft' === $post_status ) {
++ echo esc_html_x( 'Auto-Draft', 'Post status', 'gutenberg' );
++ return;
++ }
++ $post_status_object = get_post_status_object( $post_status );
++ echo esc_html( $post_status_object->label );
++ return;
++ }
++
++ if ( 'theme' === $column_name ) {
++ $terms = get_the_terms( $post_id, 'wp_theme' );
++ if ( empty( $terms ) || is_wp_error( $terms ) ) {
++ return;
++ }
++ $themes = array();
++ foreach ( $terms as $term ) {
++ $themes[] = esc_html( wp_get_theme( $term->slug ) );
++ }
++ echo implode( ' ', $themes );
++ return;
++ }
++}
++
++/**
++ * Adds the auto-draft view to the templates and template parts admin lists.
++ *
++ * @param array $views The edit views to filter.
++ */
++function gutenberg_filter_templates_edit_views( $views ) {
++ $post_type = get_current_screen()->post_type;
++ $url = add_query_arg(
++ array(
++ 'post_type' => $post_type,
++ 'post_status' => 'auto-draft',
++ ),
++ 'edit.php'
++ );
++ $is_auto_draft_view = isset( $_REQUEST['post_status'] ) && 'auto-draft' === $_REQUEST['post_status'];
++ $class_html = $is_auto_draft_view ? ' class="current"' : '';
++ $aria_current = $is_auto_draft_view ? ' aria-current="page"' : '';
++ $post_count = wp_count_posts( $post_type, 'readable' );
++ $label = sprintf(
++ // The auto-draft status doesn't have localized labels.
++ translate_nooped_plural(
++ /* translators: %s: Number of auto-draft posts. */
++ _nx_noop(
++ 'Auto-Draft (%s)',
++ 'Auto-Drafts (%s)',
++ 'Post status',
++ 'gutenberg'
++ ),
++ $post_count->{'auto-draft'}
++ ),
++ number_format_i18n( $post_count->{'auto-draft'} )
++ );
++
++ $auto_draft_view = sprintf(
++ '%s',
++ esc_url( $url ),
++ $class_html,
++ $aria_current,
++ $label
++ );
++
++ array_splice( $views, 1, 0, array( 'auto-draft' => $auto_draft_view ) );
++
++ return $views;
++}
+diff --git a/lib/templates.php b/lib/full-site-editing/templates.php
+similarity index 50%
+rename from lib/templates.php
+rename to lib/full-site-editing/templates.php
+index d0c9075b8d..6362d7716c 100644
+--- a/lib/templates.php
++++ b/lib/full-site-editing/templates.php
+@@ -21,12 +21,6 @@ function gutenberg_get_template_paths() {
+ $block_template_files = array_merge( $block_template_files, $child_block_template_files );
+ }
+
+- if ( gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing-demo' ) ) {
+- $demo_block_template_files = glob( dirname( __FILE__ ) . '/demo-block-templates/*.html' );
+- $demo_block_template_files = is_array( $demo_block_template_files ) ? $demo_block_template_files : array();
+- $block_template_files = array_merge( $block_template_files, $demo_block_template_files );
+- }
+-
+ return $block_template_files;
+ }
+
+@@ -34,6 +28,10 @@ function gutenberg_get_template_paths() {
+ * Registers block editor 'wp_template' post type.
+ */
+ function gutenberg_register_template_post_type() {
++ if ( ! gutenberg_is_fse_theme() ) {
++ return;
++ }
++
+ $labels = array(
+ 'name' => __( 'Templates', 'gutenberg' ),
+ 'singular_name' => __( 'Template', 'gutenberg' ),
+@@ -57,20 +55,22 @@ function gutenberg_register_template_post_type() {
+ );
+
+ $args = array(
+- 'labels' => $labels,
+- 'description' => __( 'Templates to include in your theme.', 'gutenberg' ),
+- 'public' => false,
+- 'has_archive' => false,
+- 'show_ui' => true,
+- 'show_in_menu' => 'themes.php',
+- 'show_in_admin_bar' => false,
+- 'show_in_rest' => true,
+- 'rest_base' => 'templates',
+- 'capability_type' => array( 'template', 'templates' ),
+- 'map_meta_cap' => true,
+- 'supports' => array(
++ 'labels' => $labels,
++ 'description' => __( 'Templates to include in your theme.', 'gutenberg' ),
++ 'public' => false,
++ 'has_archive' => false,
++ 'show_ui' => true,
++ 'show_in_menu' => 'themes.php',
++ 'show_in_admin_bar' => false,
++ 'show_in_rest' => true,
++ 'rest_base' => 'templates',
++ 'rest_controller_class' => 'WP_REST_Templates_Controller',
++ 'capability_type' => array( 'template', 'templates' ),
++ 'map_meta_cap' => true,
++ 'supports' => array(
+ 'title',
+ 'slug',
++ 'excerpt',
+ 'editor',
+ 'revisions',
+ ),
+@@ -80,6 +80,35 @@ function gutenberg_register_template_post_type() {
+ }
+ add_action( 'init', 'gutenberg_register_template_post_type' );
+
++/**
++ * Registers block editor 'wp_theme' taxonomy.
++ */
++function gutenberg_register_wp_theme_taxonomy() {
++ if ( ! gutenberg_is_fse_theme() ) {
++ return;
++ }
++
++ register_taxonomy(
++ 'wp_theme',
++ array( 'wp_template', 'wp_template_part' ),
++ array(
++ 'public' => false,
++ 'hierarchical' => false,
++ 'labels' => array(
++ 'name' => __( 'Themes', 'gutenberg' ),
++ 'singular_name' => __( 'Theme', 'gutenberg' ),
++ ),
++ 'query_var' => false,
++ 'rewrite' => false,
++ 'show_ui' => false,
++ '_builtin' => true,
++ 'show_in_nav_menus' => false,
++ 'show_in_rest' => false,
++ )
++ );
++}
++add_action( 'init', 'gutenberg_register_wp_theme_taxonomy' );
++
+ /**
+ * Filters the capabilities of a user to conditionally grant them capabilities for managing 'wp_template' posts.
+ *
+@@ -106,30 +135,13 @@ function gutenberg_grant_template_caps( array $allcaps ) {
+ }
+ add_filter( 'user_has_cap', 'gutenberg_grant_template_caps' );
+
+-/**
+- * Filters `wp_template` posts slug resolution to bypass deduplication logic as
+- * template slugs should be unique.
+- *
+- * @param string $slug The resolved slug (post_name).
+- * @param int $post_ID Post ID.
+- * @param string $post_status No uniqueness checks are made if the post is still draft or pending.
+- * @param string $post_type Post type.
+- * @param int $post_parent Post parent ID.
+- * @param int $original_slug The desired slug (post_name).
+- * @return string The original, desired slug.
+- */
+-function gutenberg_filter_wp_template_wp_unique_post_slug( $slug, $post_ID, $post_status, $post_type, $post_parent, $original_slug ) {
+- if ( 'wp_template' === $post_type ) {
+- return $original_slug;
+- }
+- return $slug;
+-}
+-add_filter( 'wp_unique_post_slug', 'gutenberg_filter_wp_template_wp_unique_post_slug', 10, 6 );
+-
+ /**
+ * Fixes the label of the 'wp_template' admin menu entry.
+ */
+ function gutenberg_fix_template_admin_menu_entry() {
++ if ( ! gutenberg_is_fse_theme() ) {
++ return;
++ }
+ global $submenu;
+ if ( ! isset( $submenu['themes.php'] ) ) {
+ return;
+@@ -147,87 +159,36 @@ function gutenberg_fix_template_admin_menu_entry() {
+ }
+ add_action( 'admin_menu', 'gutenberg_fix_template_admin_menu_entry' );
+
+-/**
+- * Filters the 'wp_template' post type columns in the admin list table.
+- *
+- * @param array $columns Columns to display.
+- * @return array Filtered $columns.
+- */
+-function gutenberg_filter_template_list_table_columns( array $columns ) {
+- $columns['slug'] = __( 'Slug', 'gutenberg' );
+- if ( isset( $columns['date'] ) ) {
+- unset( $columns['date'] );
+- }
+- return $columns;
+-}
+-add_filter( 'manage_wp_template_posts_columns', 'gutenberg_filter_template_list_table_columns' );
++// Customize the `wp_template` admin list.
++add_filter( 'manage_wp_template_posts_columns', 'gutenberg_templates_lists_custom_columns' );
++add_action( 'manage_wp_template_posts_custom_column', 'gutenberg_render_templates_lists_custom_column', 10, 2 );
++add_filter( 'views_edit-wp_template', 'gutenberg_filter_templates_edit_views' );
+
+ /**
+- * Renders column content for the 'wp_template' post type list table.
++ * Sets a custom slug when creating auto-draft templates.
++ * This is only needed for auto-drafts created by the regular WP editor.
++ * If this page is to be removed, this won't be necessary.
+ *
+- * @param string $column_name Column name to render.
+- * @param int $post_id Post ID.
++ * @param int $post_id Post ID.
+ */
+-function gutenberg_render_template_list_table_column( $column_name, $post_id ) {
+- if ( 'slug' !== $column_name ) {
++function set_unique_slug_on_create_template( $post_id ) {
++ $post = get_post( $post_id );
++ if ( 'auto-draft' !== $post->post_status ) {
+ return;
+ }
+- $post = get_post( $post_id );
+- echo esc_html( $post->post_name );
+-}
+-add_action( 'manage_wp_template_posts_custom_column', 'gutenberg_render_template_list_table_column', 10, 2 );
+
+-/**
+- * Filter for adding a `resolved` parameter to `wp_template` queries.
+- *
+- * @param array $query_params The query parameters.
+- * @return array Filtered $query_params.
+- */
+-function filter_rest_wp_template_collection_params( $query_params ) {
+- $query_params += array(
+- 'resolved' => array(
+- 'description' => __( 'Whether to filter for resolved templates', 'gutenberg' ),
+- 'type' => 'boolean',
+- ),
+- );
+- return $query_params;
+-}
+-apply_filters( 'rest_wp_template_collection_params', 'filter_rest_wp_template_collection_params', 99, 1 );
+-
+-/**
+- * Filter for supporting the `resolved` parameter in `wp_template` queries.
+- *
+- * @param array $args The query arguments.
+- * @param WP_REST_Request $request The request object.
+- * @return array Filtered $args.
+- */
+-function filter_rest_wp_template_query( $args, $request ) {
+- // Create auto-drafts for each theme template files.
+- $block_template_files = gutenberg_get_template_paths();
+- foreach ( $block_template_files as $path ) {
+- $template_type = basename( $path, '.html' );
+- gutenberg_find_template_post_and_parts( $template_type, array( $template_type ) );
++ if ( ! $post->post_name ) {
++ wp_update_post(
++ array(
++ 'ID' => $post_id,
++ 'post_name' => 'custom_slug_' . uniqid(),
++ )
++ );
+ }
+
+- if ( $request['resolved'] ) {
+- $template_ids = array( 0 ); // Return nothing by default (the 0 is needed for `post__in`).
+- $template_types = $request['slug'] ? $request['slug'] : get_template_types();
+-
+- foreach ( $template_types as $template_type ) {
+- // Skip 'embed' for now because it is not a regular template type.
+- if ( in_array( $template_type, array( 'embed' ), true ) ) {
+- continue;
+- }
+-
+- $current_template = gutenberg_find_template_post_and_parts( $template_type );
+- if ( isset( $current_template ) ) {
+- $template_ids[] = $current_template['template_post']->ID;
+- }
+- }
+- $args['post__in'] = $template_ids;
+- $args['post_status'] = array( 'publish', 'auto-draft' );
++ $terms = get_the_terms( $post_id, 'wp_theme' );
++ if ( ! $terms || ! count( $terms ) ) {
++ wp_set_post_terms( $post_id, wp_get_theme()->get_stylesheet(), 'wp_theme' );
+ }
+-
+- return $args;
+ }
+-add_filter( 'rest_wp_template_query', 'filter_rest_wp_template_query', 99, 2 );
++add_action( 'save_post_wp_template', 'set_unique_slug_on_create_template' );
+diff --git a/lib/global-styles.php b/lib/global-styles.php
+index 2b4173f58d..5aab927771 100644
+--- a/lib/global-styles.php
++++ b/lib/global-styles.php
+@@ -14,698 +14,132 @@ function gutenberg_experimental_global_styles_has_theme_json_support() {
+ return is_readable( locate_template( 'experimental-theme.json' ) );
+ }
+
+-/**
+- * Given a tree, it creates a flattened one
+- * by merging the keys and binding the leaf values
+- * to the new keys.
+- *
+- * It also transforms camelCase names into kebab-case
+- * and substitutes '/' by '-'.
+- *
+- * This is thought to be useful to generate
+- * CSS Custom Properties from a tree,
+- * although there's nothing in the implementation
+- * of this function that requires that format.
+- *
+- * For example, assuming the given prefix is '--wp'
+- * and the token is '--', for this input tree:
+- *
+- * {
+- * 'some/property': 'value',
+- * 'nestedProperty': {
+- * 'sub-property': 'value'
+- * }
+- * }
+- *
+- * it'll return this output:
+- *
+- * {
+- * '--wp--some-property': 'value',
+- * '--wp--nested-property--sub-property': 'value'
+- * }
+- *
+- * @param array $tree Input tree to process.
+- * @param string $prefix Prefix to prepend to each variable. '' by default.
+- * @param string $token Token to use between levels. '--' by default.
+- *
+- * @return array The flattened tree.
+- */
+-function gutenberg_experimental_global_styles_get_css_vars( $tree, $prefix = '', $token = '--' ) {
+- $result = array();
+- foreach ( $tree as $property => $value ) {
+- $new_key = $prefix . str_replace(
+- '/',
+- '-',
+- strtolower( preg_replace( '/(?get_stylesheet() );
+- $recent_posts = wp_get_recent_posts(
+- array(
+- 'numberposts' => 1,
+- 'orderby' => 'date',
+- 'order' => 'desc',
+- 'post_type' => $post_type_filter,
+- 'post_status' => $post_status_filter,
+- 'name' => $post_name_filter,
+- )
+- );
+-
+- if ( is_array( $recent_posts ) && ( count( $recent_posts ) === 1 ) ) {
+- $user_cpt = $recent_posts[0];
+- } elseif ( $should_create_cpt ) {
+- $cpt_post_id = wp_insert_post(
+- array(
+- 'post_content' => '{}',
+- 'post_status' => 'publish',
+- 'post_type' => $post_type_filter,
+- 'post_name' => $post_name_filter,
+- ),
+- true
+- );
+- $user_cpt = get_post( $cpt_post_id, ARRAY_A );
+- }
+-
+- return $user_cpt;
+-}
+-
+-/**
+- * Returns the post ID of the CPT containing the user's origin config.
+- *
+- * @return integer
+- */
+-function gutenberg_experimental_global_styles_get_user_cpt_id() {
+- $user_cpt_id = null;
+- $user_cpt = gutenberg_experimental_global_styles_get_user_cpt( true );
+- if ( array_key_exists( 'ID', $user_cpt ) ) {
+- $user_cpt_id = $user_cpt['ID'];
+- }
+- return $user_cpt_id;
+-}
+-
+-/**
+- * Return core's origin config.
+- *
+- * @return array Config that adheres to the theme.json schema.
+- */
+-function gutenberg_experimental_global_styles_get_core() {
+- $config = gutenberg_experimental_global_styles_get_from_file(
+- __DIR__ . '/experimental-default-theme.json'
+- );
+- // Start i18n logic to remove when JSON i18 strings are extracted.
+- $default_colors_i18n = array(
+- 'black' => __( 'Black', 'gutenberg' ),
+- 'cyan-bluish-gray' => __( 'Cyan bluish gray', 'gutenberg' ),
+- 'white' => __( 'White', 'gutenberg' ),
+- 'pale-pink' => __( 'Pale pink', 'gutenberg' ),
+- 'vivid-red' => __( 'Vivid red', 'gutenberg' ),
+- 'luminous-vivid-orange' => __( 'Luminous vivid orange', 'gutenberg' ),
+- 'luminous-vivid-amber' => __( 'Luminous vivid amber', 'gutenberg' ),
+- 'light-green-cyan' => __( 'Light green cyan', 'gutenberg' ),
+- 'vivid-green-cyan' => __( 'Vivid green cyan', 'gutenberg' ),
+- 'pale-cyan-blue' => __( 'Pale cyan blue', 'gutenberg' ),
+- 'vivid-cyan-blue' => __( 'Vivid cyan blue', 'gutenberg' ),
+- 'vivid-purple' => __( 'Vivid purple', 'gutenberg' ),
+- );
+-
+- if ( ! empty( $config['global']['settings']['color']['palette'] ) ) {
+- foreach ( $config['global']['settings']['color']['palette'] as &$color ) {
+- $color['name'] = $default_colors_i18n[ $color['slug'] ];
+- }
+- }
+-
+- $default_gradients_i18n = array(
+- 'vivid-cyan-blue-to-vivid-purple' => __( 'Vivid cyan blue to vivid purple', 'gutenberg' ),
+- 'light-green-cyan-to-vivid-green-cyan' => __( 'Light green cyan to vivid green cyan', 'gutenberg' ),
+- 'luminous-vivid-amber-to-luminous-vivid-orange' => __( 'Luminous vivid amber to luminous vivid orange', 'gutenberg' ),
+- 'luminous-vivid-orange-to-vivid-red' => __( 'Luminous vivid orange to vivid red', 'gutenberg' ),
+- 'very-light-gray-to-cyan-bluish-gray' => __( 'Very light gray to cyan bluish gray', 'gutenberg' ),
+- 'cool-to-warm-spectrum' => __( 'Cool to warm spectrum', 'gutenberg' ),
+- 'blush-light-purple' => __( 'Blush light purple', 'gutenberg' ),
+- 'blush-bordeaux' => __( 'Blush bordeaux', 'gutenberg' ),
+- 'luminous-dusk' => __( 'Luminous dusk', 'gutenberg' ),
+- 'pale-ocean' => __( 'Pale ocean', 'gutenberg' ),
+- 'electric-grass' => __( 'Electric grass', 'gutenberg' ),
+- 'midnight' => __( 'Midnight', 'gutenberg' ),
+- );
+-
+- if ( ! empty( $config['global']['settings']['color']['gradients'] ) ) {
+- foreach ( $config['global']['settings']['color']['gradients'] as &$gradient ) {
+- $gradient['name'] = $default_gradients_i18n[ $gradient['slug'] ];
+- }
+- }
+-
+- $default_font_sizes_i18n = array(
+- 'small' => __( 'Small', 'gutenberg' ),
+- 'normal' => __( 'Normal', 'gutenberg' ),
+- 'medium' => __( 'Medium', 'gutenberg' ),
+- 'large' => __( 'Large', 'gutenberg' ),
+- 'huge' => __( 'Huge', 'gutenberg' ),
+- );
+-
+- if ( ! empty( $config['global']['settings']['typography']['fontSizes'] ) ) {
+- foreach ( $config['global']['settings']['typography']['fontSizes'] as &$font_size ) {
+- $font_size['name'] = $default_font_sizes_i18n[ $font_size['slug'] ];
+- }
+- }
+- // End i18n logic to remove when JSON i18 strings are extracted.
+- return $config;
+-}
+-
+ /**
+ * Returns the theme presets registered via add_theme_support, if any.
+ *
++ * @param array $settings Existing editor settings.
++ *
+ * @return array Config that adheres to the theme.json schema.
+ */
+-function gutenberg_experimental_global_styles_get_theme_support_settings() {
++function gutenberg_experimental_global_styles_get_theme_support_settings( $settings ) {
+ $theme_settings = array();
+ $theme_settings['global'] = array();
+ $theme_settings['global']['settings'] = array();
+
+ // Deprecated theme supports.
+- if ( get_theme_support( 'disable-custom-colors' ) ) {
++ if ( isset( $settings['disableCustomColors'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
+ $theme_settings['global']['settings']['color'] = array();
+ }
+- $theme_settings['global']['settings']['color']['custom'] = false;
++ $theme_settings['global']['settings']['color']['custom'] = ! $settings['disableCustomColors'];
+ }
+- if ( get_theme_support( 'disable-custom-gradients' ) ) {
++
++ if ( isset( $settings['disableCustomGradients'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
+ $theme_settings['global']['settings']['color'] = array();
+ }
+- $theme_settings['global']['settings']['color']['customGradient'] = false;
++ $theme_settings['global']['settings']['color']['customGradient'] = ! $settings['disableCustomGradients'];
+ }
+- if ( get_theme_support( 'disable-custom-font-sizes' ) ) {
++
++ if ( isset( $settings['disableCustomFontSizes'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['typography'] ) ) {
+ $theme_settings['global']['settings']['typography'] = array();
+ }
+- $theme_settings['global']['settings']['typography']['customFontSize'] = false;
++ $theme_settings['global']['settings']['typography']['customFontSize'] = ! $settings['disableCustomFontSizes'];
+ }
+- if ( get_theme_support( 'custom-line-height' ) ) {
++
++ if ( isset( $settings['enableCustomLineHeight'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['typography'] ) ) {
+ $theme_settings['global']['settings']['typography'] = array();
+ }
+- $theme_settings['global']['settings']['typography']['customLineHeight'] = true;
+- }
+- if ( get_theme_support( 'custom-spacing' ) ) {
+- if ( ! isset( $theme_settings['global']['settings']['spacing'] ) ) {
+- $theme_settings['global']['settings']['spacing'] = array();
+- }
+- $theme_settings['global']['settings']['spacing']['custom'] = true;
+- }
+- if ( get_theme_support( 'experimental-link-color' ) ) {
+- if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
+- $theme_settings['global']['settings']['color'] = array();
+- }
+- $theme_settings['global']['settings']['color']['link'] = true;
++ $theme_settings['global']['settings']['typography']['customLineHeight'] = $settings['enableCustomLineHeight'];
+ }
+
+- $custom_units_theme_support = get_theme_support( 'custom-units' );
+- if ( $custom_units_theme_support ) {
++ if ( isset( $settings['enableCustomUnits'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['spacing'] ) ) {
+ $theme_settings['global']['settings']['spacing'] = array();
+ }
+- $theme_settings['global']['settings']['spacing'] ['units'] = true === $custom_units_theme_support ? array( 'px', 'em', 'rem', 'vh', 'vw' ) : $custom_units_theme_support;
++ $theme_settings['global']['settings']['spacing']['units'] = ( true === $settings['enableCustomUnits'] ) ?
++ array( 'px', 'em', 'rem', 'vh', 'vw' ) :
++ $settings['enableCustomUnits'];
+ }
+
+- $theme_colors = get_theme_support( 'editor-color-palette' );
+- if ( ! empty( $theme_colors[0] ) ) {
++ if ( isset( $settings['colors'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
+ $theme_settings['global']['settings']['color'] = array();
+ }
+- $theme_settings['global']['settings']['color']['palette'] = array();
+- $theme_settings['global']['settings']['color']['palette'] = $theme_colors[0];
++ $theme_settings['global']['settings']['color']['palette'] = $settings['colors'];
+ }
+
+- $theme_gradients = get_theme_support( 'editor-gradient-presets' );
+- if ( ! empty( $theme_gradients[0] ) ) {
++ if ( isset( $settings['gradients'] ) ) {
+ if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
+ $theme_settings['global']['settings']['color'] = array();
+ }
+- $theme_settings['global']['settings']['color']['gradients'] = array();
+- $theme_settings['global']['settings']['color']['gradients'] = $theme_gradients[0];
++ $theme_settings['global']['settings']['color']['gradients'] = $settings['gradients'];
+ }
+
+- $theme_font_sizes = get_theme_support( 'editor-font-sizes' );
+- if ( ! empty( $theme_font_sizes[0] ) ) {
++ if ( isset( $settings['fontSizes'] ) ) {
++ $font_sizes = $settings['fontSizes'];
++ // Back-compatibility for presets without units.
++ foreach ( $font_sizes as &$font_size ) {
++ if ( is_numeric( $font_size['size'] ) ) {
++ $font_size['size'] = $font_size['size'] . 'px';
++ }
++ }
+ if ( ! isset( $theme_settings['global']['settings']['typography'] ) ) {
+ $theme_settings['global']['settings']['typography'] = array();
+ }
+- $theme_settings['global']['settings']['typography']['fontSizes'] = array();
+- $theme_settings['global']['settings']['typography']['fontSizes'] = $theme_font_sizes[0];
+- }
+-
+- return $theme_settings;
+-}
+-
+-/**
+- * Returns the theme's origin config.
+- *
+- * It also fetches the existing presets the theme declared via add_theme_support
+- * and uses them if the theme hasn't declared any via theme.json.
+- *
+- * @return array Config that adheres to the theme.json schema.
+- */
+-function gutenberg_experimental_global_styles_get_theme() {
+- $theme_support_settings = gutenberg_experimental_global_styles_get_theme_support_settings();
+- $theme_config = gutenberg_experimental_global_styles_get_from_file(
+- locate_template( 'experimental-theme.json' )
+- );
+-
+- /*
+- * We want the presets declared in theme.json
+- * to take precedence over the ones declared via add_theme_support.
+- *
+- * Note that merging happens at the preset category level. Example:
+- *
+- * - if the theme declares a color palette via add_theme_support &
+- * a set of font sizes via theme.json, both will be included in the output.
+- *
+- * - if the theme declares a color palette both via add_theme_support &
+- * via theme.json, the later takes precedence.
+- *
+- */
+- $theme_config = gutenberg_experimental_global_styles_merge_trees(
+- $theme_support_settings,
+- $theme_config
+- );
+-
+- return $theme_config;
+-}
+-
+-/**
+- * Convert style property to its CSS name.
+- *
+- * @param string $style_property Style property name.
+- * @return string CSS property name.
+- */
+-function gutenberg_experimental_global_styles_get_css_property( $style_property ) {
+- switch ( $style_property ) {
+- case 'backgroundColor':
+- return 'background-color';
+- case 'fontSize':
+- return 'font-size';
+- case 'lineHeight':
+- return 'line-height';
+- default:
+- return $style_property;
++ $theme_settings['global']['settings']['typography']['fontSizes'] = $font_sizes;
+ }
+-}
+
+-/**
+- * Return how the style property is structured.
+- *
+- * @return array Style property structure.
+- */
+-function gutenberg_experimental_global_styles_get_style_property() {
+- return array(
+- '--wp--style--color--link' => array( 'color', 'link' ),
+- 'background' => array( 'color', 'gradient' ),
+- 'backgroundColor' => array( 'color', 'background' ),
+- 'color' => array( 'color', 'text' ),
+- 'fontSize' => array( 'typography', 'fontSize' ),
+- 'lineHeight' => array( 'typography', 'lineHeight' ),
+- );
+-}
+-
+-/**
+- * Return how the support keys are structured.
+- *
+- * @return array Support keys structure.
+- */
+-function gutenberg_experimental_global_styles_get_support_keys() {
+- return array(
+- '--wp--style--color--link' => array( 'color', 'linkColor' ),
+- 'background' => array( 'color', 'gradients' ),
+- 'backgroundColor' => array( 'color' ),
+- 'color' => array( 'color' ),
+- 'fontSize' => array( 'fontSize' ),
+- 'lineHeight' => array( 'lineHeight' ),
+- );
+-}
+-
+-/**
+- * Returns how the presets css variables are structured on the global styles data.
+- *
+- * @return array Presets structure
+- */
+-function gutenberg_experimental_global_styles_get_presets_structure() {
+- return array(
+- 'color' => array(
+- 'path' => array( 'color', 'palette' ),
+- 'key' => 'color',
+- ),
+- 'gradient' => array(
+- 'path' => array( 'color', 'gradients' ),
+- 'key' => 'gradient',
+- ),
+- 'fontSize' => array(
+- 'path' => array( 'typography', 'fontSizes' ),
+- 'key' => 'size',
+- ),
+- );
+-}
+-
+-/**
+- * Returns the style features a particular block supports.
+- *
+- * @param array $supports The block supports array.
+- *
+- * @return array Style features supported by the block.
+- */
+-function gutenberg_experimental_global_styles_get_supported_styles( $supports ) {
+- $support_keys = gutenberg_experimental_global_styles_get_support_keys();
+- $supported_features = array();
+- foreach ( $support_keys as $key => $path ) {
+- if ( gutenberg_experimental_get( $supports, $path ) ) {
+- $supported_features[] = $key;
+- }
+- }
+-
+- return $supported_features;
+-}
+-
+-/**
+- * Retrieves the block data (selector/supports).
+- *
+- * @return array
+- */
+-function gutenberg_experimental_global_styles_get_block_data() {
+- $block_data = array();
+-
+- $registry = WP_Block_Type_Registry::get_instance();
+- $blocks = array_merge(
+- $registry->get_all_registered(),
+- array(
+- 'global' => new WP_Block_Type(
+- 'global',
+- array(
+- 'supports' => array(
+- '__experimentalSelector' => ':root',
+- 'fontSize' => true,
+- 'color' => array(
+- 'linkColor' => true,
+- 'gradients' => true,
+- ),
+- ),
+- )
+- ),
+- )
+- );
+- foreach ( $blocks as $block_name => $block_type ) {
+- if ( ! property_exists( $block_type, 'supports' ) || empty( $block_type->supports ) || ! is_array( $block_type->supports ) ) {
+- continue;
+- }
+-
+- $supports = gutenberg_experimental_global_styles_get_supported_styles( $block_type->supports );
+-
+- /*
+- * Assign the selector for the block.
+- *
+- * Some blocks can declare multiple selectors:
+- *
+- * - core/heading represents the H1-H6 HTML elements
+- * - core/list represents the UL and OL HTML elements
+- * - core/group is meant to represent DIV and other HTML elements
+- *
+- * Some other blocks don't provide a selector,
+- * so we generate a class for them based on their name:
+- *
+- * - 'core/group' => '.wp-block-group'
+- * - 'my-custom-library/block-name' => '.wp-block-my-custom-library-block-name'
+- *
+- * Note that, for core blocks, we don't add the `core/` prefix to its class name.
+- * This is for historical reasons, as they come with a class without that infix.
+- *
+- */
+- if (
+- isset( $block_type->supports['__experimentalSelector'] ) &&
+- is_string( $block_type->supports['__experimentalSelector'] )
+- ) {
+- $block_data[ $block_name ] = array(
+- 'selector' => $block_type->supports['__experimentalSelector'],
+- 'supports' => $supports,
+- 'blockName' => $block_name,
+- );
+- } elseif (
+- isset( $block_type->supports['__experimentalSelector'] ) &&
+- is_array( $block_type->supports['__experimentalSelector'] )
+- ) {
+- foreach ( $block_type->supports['__experimentalSelector'] as $key => $selector ) {
+- $block_data[ $key ] = array(
+- 'selector' => $selector,
+- 'supports' => $supports,
+- 'blockName' => $block_name,
+- );
+- }
+- } else {
+- $block_data[ $block_name ] = array(
+- 'selector' => '.wp-block-' . str_replace( '/', '-', str_replace( 'core/', '', $block_name ) ),
+- 'supports' => $supports,
+- 'blockName' => $block_name,
+- );
++ // Things that didn't land in core yet, so didn't have a setting assigned.
++ if ( current( (array) get_theme_support( 'custom-spacing' ) ) ) {
++ if ( ! isset( $theme_settings['global']['settings']['spacing'] ) ) {
++ $theme_settings['global']['settings']['spacing'] = array();
+ }
++ $theme_settings['global']['settings']['spacing']['customPadding'] = true;
+ }
+
+- return $block_data;
+-}
+-
+-/**
+- * Given an array contain the styles shape returns the css for this styles.
+- * A similar function exists on the client at /packages/block-editor/src/hooks/style.js.
+- *
+- * @param array $styles Array containing the styles shape from global styles.
+- *
+- * @return array Containing a set of css rules.
+- */
+-function gutenberg_experimental_global_styles_flatten_styles_tree( $styles ) {
+- $mappings = gutenberg_experimental_global_styles_get_style_property();
+-
+- $result = array();
+- foreach ( $mappings as $key => $path ) {
+- $value = gutenberg_experimental_get( $styles, $path, null );
+- if ( null !== $value ) {
+- $result[ $key ] = $value;
++ if ( current( (array) get_theme_support( 'experimental-link-color' ) ) ) {
++ if ( ! isset( $theme_settings['global']['settings']['color'] ) ) {
++ $theme_settings['global']['settings']['color'] = array();
+ }
++ $theme_settings['global']['settings']['color']['link'] = true;
+ }
+- return $result;
+-
+-}
+-
+-/**
+- * Given a selector for a block, and the settings of the block, returns a string
+- * with the stylesheet of the preset classes required for that block.
+- *
+- * @param string $selector String with the CSS selector for the block.
+- * @param array $settings Array containing the settings of the block.
+- *
+- * @return string Stylesheet with the preset classes.
+- */
+-function gutenberg_experimental_global_styles_get_preset_classes( $selector, $settings ) {
+- if ( empty( $settings ) || empty( $selector ) ) {
+- return '';
+- }
+-
+- $stylesheet = '';
+- $class_prefix = 'has';
+- $classes_structure = array(
+- 'color' => array(
+- 'path' => array( 'color', 'palette' ),
+- 'key' => 'color',
+- 'property' => 'color',
+- ),
+- 'background-color' => array(
+- 'path' => array( 'color', 'palette' ),
+- 'key' => 'color',
+- 'property' => 'background-color',
+- ),
+- 'gradient-background' => array(
+- 'path' => array( 'color', 'gradients' ),
+- 'key' => 'gradient',
+- 'property' => 'background',
+- ),
+- 'font-size' => array(
+- 'path' => array( 'typography', 'fontSizes' ),
+- 'key' => 'size',
+- 'property' => 'font-size',
+- ),
+- );
+-
+- foreach ( $classes_structure as $class_suffix => $preset_structure ) {
+- $path = $preset_structure['path'];
+- $presets = gutenberg_experimental_get( $settings, $path );
+-
+- if ( empty( $presets ) ) {
+- continue;
+- }
+
+- $key = $preset_structure['key'];
+- $property = $preset_structure['property'];
+-
+- foreach ( $presets as $preset ) {
+- $slug = $preset['slug'];
+- $value = $preset[ $key ];
+-
+- $class_to_use = ".$class_prefix-$slug-$class_suffix";
+- $selector_to_use = '';
+- if ( ':root' === $selector ) {
+- $selector_to_use = $class_to_use;
+- } else {
+- $selector_to_use = "$selector$class_to_use";
+- }
+- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+- $stylesheet .= "$selector_to_use {\n\t$property: $value;\n}\n";
+- } else {
+- $stylesheet .= $selector_to_use . '{' . "$property:$value;}\n";
+- }
+- }
+- }
+- return $stylesheet;
++ return $theme_settings;
+ }
+
+ /**
+ * Takes a tree adhering to the theme.json schema and generates
+ * the corresponding stylesheet.
+ *
+- * @param array $tree Input tree.
++ * @param WP_Theme_JSON $tree Input tree.
++ * @param string $type Type of stylesheet we want accepts 'all', 'block_styles', and 'css_variables'.
+ *
+ * @return string Stylesheet.
+ */
+-function gutenberg_experimental_global_styles_get_stylesheet( $tree ) {
+- $stylesheet = '';
+- $block_data = gutenberg_experimental_global_styles_get_block_data();
+- foreach ( array_keys( $tree ) as $block_name ) {
+- if (
+- ! array_key_exists( $block_name, $block_data ) ||
+- ! array_key_exists( 'selector', $block_data[ $block_name ] ) ||
+- ! array_key_exists( 'supports', $block_data[ $block_name ] )
+- ) {
+- // Skip blocks that haven't declared support,
+- // because we don't know to process them.
+- continue;
+- }
++function gutenberg_experimental_global_styles_get_stylesheet( $tree, $type = 'all' ) {
++ // Check if we can use cached.
++ $can_use_cached = (
++ ( 'all' === $type ) &&
++ ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
++ ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
++ ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
++ ! is_admin()
++ );
+
+- // Create the CSS Custom Properties for the presets.
+- $computed_presets = array();
+- $presets_structure = gutenberg_experimental_global_styles_get_presets_structure();
+- foreach ( $presets_structure as $token => $preset_meta ) {
+- $block_preset = gutenberg_experimental_get( $tree[ $block_name ]['settings'], $preset_meta['path'] );
+- if ( ! empty( $block_preset ) ) {
+- $computed_presets[ $token ] = array();
+- foreach ( $block_preset as $preset_value ) {
+- $computed_presets[ $token ][ $preset_value['slug'] ] = $preset_value[ $preset_meta['key'] ];
+- }
+- }
++ if ( $can_use_cached ) {
++ // Check if we have the styles already cached.
++ $cached = get_transient( 'global_styles' );
++ if ( $cached ) {
++ return $cached;
+ }
+- $token = '--';
+- $preset_prefix = '--wp--preset' . $token;
+- $preset_variables = gutenberg_experimental_global_styles_get_css_vars( $computed_presets, $preset_prefix, $token );
+-
+- // Create the CSS Custom Properties that are specific to the theme.
+- $computed_theme_props = gutenberg_experimental_get( $tree[ $block_name ]['settings'], array( 'custom' ) );
+- $theme_props_prefix = '--wp--custom' . $token;
+- $theme_variables = gutenberg_experimental_global_styles_get_css_vars(
+- $computed_theme_props,
+- $theme_props_prefix,
+- $token
+- );
+-
+- $stylesheet .= gutenberg_experimental_global_styles_resolver_styles(
+- $block_data[ $block_name ]['selector'],
+- $block_data[ $block_name ]['supports'],
+- array_merge(
+- gutenberg_experimental_global_styles_flatten_styles_tree( $tree[ $block_name ]['styles'] ),
+- $preset_variables,
+- $theme_variables
+- )
+- );
+-
+- $stylesheet .= gutenberg_experimental_global_styles_get_preset_classes( $block_data[ $block_name ]['selector'], $tree[ $block_name ]['settings'] );
+ }
+
+- if ( gutenberg_experimental_global_styles_has_theme_json_support() ) {
++ $stylesheet = $tree->get_stylesheet( $type );
++
++ if ( ( 'all' === $type || 'block_styles' === $type ) && gutenberg_experimental_global_styles_has_theme_json_support() ) {
+ // To support all themes, we added in the block-library stylesheet
+ // a style rule such as .has-link-color a { color: var(--wp--style--color--link, #00e); }
+ // so that existing link colors themes used didn't break.
+@@ -714,149 +148,31 @@ function gutenberg_experimental_global_styles_get_stylesheet( $tree ) {
+ $stylesheet .= 'a{color:var(--wp--style--color--link, #00e);}';
+ }
+
+- return $stylesheet;
+-}
+-
+-/**
+- * Generates CSS declarations for a block.
+- *
+- * @param string $block_selector CSS selector for the block.
+- * @param array $block_supports A list of properties supported by the block.
+- * @param array $block_styles The list of properties/values to be converted to CSS.
+- *
+- * @return string The corresponding CSS rule.
+- */
+-function gutenberg_experimental_global_styles_resolver_styles( $block_selector, $block_supports, $block_styles ) {
+- $css_property = '';
+- $css_rule = '';
+- $css_declarations = '';
+-
+- foreach ( $block_styles as $property => $value ) {
+- // Only convert to CSS:
+- //
+- // 1) The style attributes the block has declared support for.
+- // 2) Any CSS custom property attached to the node.
+- if (
+- in_array( $property, $block_supports, true ) ||
+- strstr( $property, '--' )
+- ) {
+- $css_property = gutenberg_experimental_global_styles_get_css_property( $property );
+-
+- // Add whitespace if SCRIPT_DEBUG is defined and set to true.
+- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+- $css_declarations .= "\t" . $css_property . ': ' . $value . ";\n";
+- } else {
+- $css_declarations .= $css_property . ':' . $value . ';';
+- }
+- }
++ if ( $can_use_cached ) {
++ // Cache for a minute.
++ // This cache doesn't need to be any longer, we only want to avoid spikes on high-traffic sites.
++ set_transient( 'global_styles', $stylesheet, MINUTE_IN_SECONDS );
+ }
+
+- if ( '' !== $css_declarations ) {
+-
+- // Add whitespace if SCRIPT_DEBUG is defined and set to true.
+- if ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ) {
+- $css_rule .= $block_selector . " {\n";
+- $css_rule .= $css_declarations;
+- $css_rule .= "}\n";
+- } else {
+- $css_rule .= $block_selector . '{' . $css_declarations . '}';
+- }
+- }
+-
+- return $css_rule;
+-}
+-
+-/**
+- * Helper function that merges trees that adhere to the theme.json schema.
+- *
+- * @param array $core Core origin.
+- * @param array $theme Theme origin.
+- * @param array $user User origin. An empty array by default.
+- *
+- * @return array The merged result.
+- */
+-function gutenberg_experimental_global_styles_merge_trees( $core, $theme, $user = array() ) {
+- $core = gutenberg_experimental_global_styles_normalize_schema( $core );
+- $theme = gutenberg_experimental_global_styles_normalize_schema( $theme );
+- $user = gutenberg_experimental_global_styles_normalize_schema( $user );
+- $result = gutenberg_experimental_global_styles_normalize_schema( array() );
+-
+- foreach ( array_keys( $core ) as $block_name ) {
+- foreach ( array_keys( $core[ $block_name ]['settings'] ) as $subtree ) {
+- $result[ $block_name ]['settings'][ $subtree ] = array_merge(
+- $core[ $block_name ]['settings'][ $subtree ],
+- $theme[ $block_name ]['settings'][ $subtree ],
+- $user[ $block_name ]['settings'][ $subtree ]
+- );
+- }
+- foreach ( array_keys( $core[ $block_name ]['styles'] ) as $subtree ) {
+- $result[ $block_name ]['styles'][ $subtree ] = array_merge(
+- $core[ $block_name ]['styles'][ $subtree ],
+- $theme[ $block_name ]['styles'][ $subtree ],
+- $user[ $block_name ]['styles'][ $subtree ]
+- );
+- }
+- }
+-
+- return $result;
++ return $stylesheet;
+ }
+
+ /**
+- * Given a tree, it normalizes it to the expected schema.
+- *
+- * @param array $tree Source tree to normalize.
+- *
+- * @return array Normalized tree.
++ * Fetches the preferences for each origin (core, theme, user)
++ * and enqueues the resulting stylesheet.
+ */
+-function gutenberg_experimental_global_styles_normalize_schema( $tree ) {
+- $block_schema = array(
+- 'styles' => array(
+- 'typography' => array(),
+- 'color' => array(),
+- ),
+- 'settings' => array(
+- 'color' => array(),
+- 'custom' => array(),
+- 'typography' => array(),
+- 'spacing' => array(),
+- ),
+- );
+-
+- $normalized_tree = array();
+- $block_data = gutenberg_experimental_global_styles_get_block_data();
+- foreach ( array_keys( $block_data ) as $block_name ) {
+- $normalized_tree[ $block_name ] = $block_schema;
++function gutenberg_experimental_global_styles_enqueue_assets() {
++ if ( ! gutenberg_experimental_global_styles_has_theme_json_support() ) {
++ return;
+ }
+
+- $tree = array_merge_recursive(
+- $normalized_tree,
+- $tree
+- );
+-
+- return $tree;
+-}
+-
+-/**
+- * Takes data from the different origins (core, theme, and user)
+- * and returns the merged result.
+- *
+- * @return array Merged trees
+- */
+-function gutenberg_experimental_global_styles_get_merged_origins() {
+- $core = gutenberg_experimental_global_styles_get_core();
+- $theme = gutenberg_experimental_global_styles_get_theme();
+- $user = gutenberg_experimental_global_styles_get_user();
++ $settings = gutenberg_get_common_block_editor_settings();
++ $theme_support_data = gutenberg_experimental_global_styles_get_theme_support_settings( $settings );
+
+- return gutenberg_experimental_global_styles_merge_trees( $core, $theme, $user );
+-}
++ $resolver = new WP_Theme_JSON_Resolver();
++ $all = $resolver->get_origin( $theme_support_data );
+
+-/**
+- * Fetches the preferences for each origin (core, theme, user)
+- * and enqueues the resulting stylesheet.
+- */
+-function gutenberg_experimental_global_styles_enqueue_assets() {
+- $merged = gutenberg_experimental_global_styles_get_merged_origins();
+- $stylesheet = gutenberg_experimental_global_styles_get_stylesheet( $merged );
++ $stylesheet = gutenberg_experimental_global_styles_get_stylesheet( $all );
+ if ( empty( $stylesheet ) ) {
+ return;
+ }
+@@ -866,28 +182,6 @@ function gutenberg_experimental_global_styles_enqueue_assets() {
+ wp_enqueue_style( 'global-styles' );
+ }
+
+-/**
+- * Returns the default config for editor features,
+- * or an empty array if none found.
+- *
+- * @param array $config Config to extract values from.
+- * @return array Default features config for the editor.
+- */
+-function gutenberg_experimental_global_styles_get_editor_settings( $config ) {
+- $settings = array();
+- foreach ( array_keys( $config ) as $context ) {
+- if (
+- empty( $config[ $context ]['settings'] ) ||
+- ! is_array( $config[ $context ]['settings'] )
+- ) {
+- $settings[ $context ] = array();
+- } else {
+- $settings[ $context ] = $config[ $context ]['settings'];
+- }
+- }
+- return $settings;
+-}
+-
+ /**
+ * Adds the necessary data for the Global Styles client UI to the block settings.
+ *
+@@ -895,85 +189,194 @@ function gutenberg_experimental_global_styles_get_editor_settings( $config ) {
+ * @return array New block editor settings
+ */
+ function gutenberg_experimental_global_styles_settings( $settings ) {
+- $merged = gutenberg_experimental_global_styles_get_merged_origins();
+-
+- // STEP 1: ADD FEATURES
+- // These need to be added to settings always.
+- // We also need to unset the deprecated settings defined by core.
+- $settings['__experimentalFeatures'] = gutenberg_experimental_global_styles_get_editor_settings( $merged );
+-
++ $theme_support_data = gutenberg_experimental_global_styles_get_theme_support_settings( $settings );
+ unset( $settings['colors'] );
+- unset( $settings['gradients'] );
+- unset( $settings['fontSizes'] );
+ unset( $settings['disableCustomColors'] );
+- unset( $settings['disableCustomGradients'] );
+ unset( $settings['disableCustomFontSizes'] );
++ unset( $settings['disableCustomGradients'] );
+ unset( $settings['enableCustomLineHeight'] );
+ unset( $settings['enableCustomUnits'] );
++ unset( $settings['fontSizes'] );
++ unset( $settings['gradients'] );
++
++ $resolver = new WP_Theme_JSON_Resolver();
++ $origin = 'theme';
++ if (
++ gutenberg_experimental_global_styles_has_theme_json_support() &&
++ gutenberg_is_fse_theme()
++ ) {
++ // Only lookup for the user data if we need it.
++ $origin = 'user';
++ }
++ $tree = $resolver->get_origin( $theme_support_data, $origin );
++
++ // STEP 1: ADD FEATURES
++ //
++ // These need to be always added to the editor settings,
++ // even for themes that don't support theme.json.
++ // An example of this is that the presets are configured
++ // from the theme support data.
++ $settings['__experimentalFeatures'] = $tree->get_settings();
+
+ // STEP 2 - IF EDIT-SITE, ADD DATA REQUIRED FOR GLOBAL STYLES SIDEBAR
+- // The client needs some information to be able to access/update the user styles.
+- // We only do this if the theme has support for theme.json, though,
+- // as an indicator that the theme will know how to combine this with its stylesheet.
++ //
++ // In the site editor, the user can change styles, so the client
++ // needs the ability to create them. Hence, we pass it some data
++ // for this: base styles (core+theme) and the ID of the user CPT.
+ $screen = get_current_screen();
+ if (
+ ! empty( $screen ) &&
+ function_exists( 'gutenberg_is_edit_site_page' ) &&
+ gutenberg_is_edit_site_page( $screen->id ) &&
+- gutenberg_experimental_global_styles_has_theme_json_support()
++ gutenberg_experimental_global_styles_has_theme_json_support() &&
++ gutenberg_is_fse_theme()
+ ) {
+- $settings['__experimentalGlobalStylesUserEntityId'] = gutenberg_experimental_global_styles_get_user_cpt_id();
+- $settings['__experimentalGlobalStylesContexts'] = gutenberg_experimental_global_styles_get_block_data();
+- $settings['__experimentalGlobalStylesBaseStyles'] = gutenberg_experimental_global_styles_merge_trees(
+- gutenberg_experimental_global_styles_get_core(),
+- gutenberg_experimental_global_styles_get_theme()
+- );
+- } else {
+- // STEP 3 - OTHERWISE, ADD STYLES
++ $user_cpt_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
++ $base_styles = $resolver->get_origin( $theme_support_data, 'theme' )->get_raw_data();
++
++ $settings['__experimentalGlobalStylesUserEntityId'] = $user_cpt_id;
++ $settings['__experimentalGlobalStylesBaseStyles'] = $base_styles;
++ } elseif ( gutenberg_experimental_global_styles_has_theme_json_support() ) {
++ // STEP 3 - ADD STYLES IF THEME HAS SUPPORT
+ //
+ // If we are in a block editor context, but not in edit-site,
+- // we need to add the styles via the settings. This is because
+- // we want them processed as if they were added via add_editor_styles,
+- // which adds the editor wrapper class.
+- $settings['styles'][] = array( 'css' => gutenberg_experimental_global_styles_get_stylesheet( $merged ) );
++ // we add the styles via the settings, so the editor knows that
++ // some of these should be added the wrapper class,
++ // as if they were added via add_editor_styles.
++ $settings['styles'][] = array(
++ 'css' => gutenberg_experimental_global_styles_get_stylesheet( $tree, 'css_variables' ),
++ '__experimentalNoWrapper' => true,
++ );
++ $settings['styles'][] = array(
++ 'css' => gutenberg_experimental_global_styles_get_stylesheet( $tree, 'block_styles' ),
++ );
+ }
+
+ return $settings;
+ }
+
+ /**
+- * Registers a Custom Post Type to store the user's origin config.
++ * Register CPT to store/access user data.
++ *
++ * @return array|undefined
+ */
+-function gutenberg_experimental_global_styles_register_cpt() {
++function gutenberg_experimental_global_styles_register_user_cpt() {
+ if ( ! gutenberg_experimental_global_styles_has_theme_json_support() ) {
+ return;
+ }
+
+- $args = array(
+- 'label' => __( 'Global Styles', 'gutenberg' ),
+- 'description' => 'CPT to store user design tokens',
+- 'public' => false,
+- 'show_ui' => false,
+- 'show_in_rest' => true,
+- 'rest_base' => '__experimental/global-styles',
+- 'capabilities' => array(
+- 'read' => 'edit_theme_options',
+- 'create_posts' => 'edit_theme_options',
+- 'edit_posts' => 'edit_theme_options',
+- 'edit_published_posts' => 'edit_theme_options',
+- 'delete_published_posts' => 'edit_theme_options',
+- 'edit_others_posts' => 'edit_theme_options',
+- 'delete_others_posts' => 'edit_theme_options',
+- ),
+- 'map_meta_cap' => true,
+- 'supports' => array(
+- 'editor',
+- 'revisions',
+- ),
+- );
+- register_post_type( 'wp_global_styles', $args );
++ WP_Theme_JSON_Resolver::register_user_custom_post_type();
+ }
+
+-add_action( 'init', 'gutenberg_experimental_global_styles_register_cpt' );
+-add_filter( 'block_editor_settings', 'gutenberg_experimental_global_styles_settings' );
++add_action( 'init', 'gutenberg_experimental_global_styles_register_user_cpt' );
++add_filter( 'block_editor_settings', 'gutenberg_experimental_global_styles_settings', PHP_INT_MAX );
+ add_action( 'wp_enqueue_scripts', 'gutenberg_experimental_global_styles_enqueue_assets' );
++
++
++/**
++ * Sanitizes global styles user content removing unsafe rules.
++ *
++ * @param string $content Post content to filter.
++ * @return string Filtered post content with unsafe rules removed.
++ */
++function gutenberg_global_styles_filter_post( $content ) {
++ $decoded_data = json_decode( stripslashes( $content ), true );
++ $json_decoding_error = json_last_error();
++ if (
++ JSON_ERROR_NONE === $json_decoding_error &&
++ is_array( $decoded_data ) &&
++ isset( $decoded_data['isGlobalStylesUserThemeJSON'] ) &&
++ $decoded_data['isGlobalStylesUserThemeJSON']
++ ) {
++ unset( $decoded_data['isGlobalStylesUserThemeJSON'] );
++ $theme_json = new WP_Theme_JSON( $decoded_data );
++ $theme_json->remove_insecure_properties();
++ $data_to_encode = $theme_json->get_raw_data();
++ $data_to_encode['isGlobalStylesUserThemeJSON'] = true;
++ return wp_json_encode( $data_to_encode );
++ }
++ return $content;
++}
++
++/**
++ * Adds the filters to filter global styles user theme.json.
++ */
++function gutenberg_global_styles_kses_init_filters() {
++ add_filter( 'content_save_pre', 'gutenberg_global_styles_filter_post' );
++}
++
++/**
++ * Removes the filters to filter global styles user theme.json.
++ */
++function gutenberg_global_styles_kses_remove_filters() {
++ remove_filter( 'content_save_pre', 'gutenberg_global_styles_filter_post' );
++}
++
++/**
++ * Register global styles kses filters if the user does not have unfiltered_html capability.
++ *
++ * @uses render_block_core_navigation()
++ * @throws WP_Error An WP_Error exception parsing the block definition.
++ */
++function gutenberg_global_styles_kses_init() {
++ gutenberg_global_styles_kses_remove_filters();
++ if ( ! current_user_can( 'unfiltered_html' ) ) {
++ gutenberg_global_styles_kses_init_filters();
++ }
++}
++
++/**
++ * This filter is the last being executed on force_filtered_html_on_import.
++ * If the input of the filter is true it means we are in an import situation and should
++ * enable kses, independently of the user capabilities.
++ * So in that case we call gutenberg_global_styles_kses_init_filters;
++ *
++ * @param string $arg Input argument of the filter.
++ * @return string Exactly what was passed as argument.
++ */
++function gutenberg_global_styles_force_filtered_html_on_import_filter( $arg ) {
++ // force_filtered_html_on_import is true we need to init the global styles kses filters.
++ if ( $arg ) {
++ gutenberg_global_styles_kses_init_filters();
++ }
++ return $arg;
++}
++
++/**
++ * This filter is the last being executed on force_filtered_html_on_import.
++ * If the input of the filter is true it means we are in an import situation and should
++ * enable kses, independently of the user capabilities.
++ * So in that case we call gutenberg_global_styles_kses_init_filters;
++ *
++ * @param bool $allow_css Whether the CSS in the test string is considered safe.
++ * @param bool $css_test_string The CSS string to test..
++ * @return bool If $allow_css is true it returns true.
++ * If $allow_css is false and the CSS rule is referencing a WordPress css variable it returns true.
++ * Otherwise the function return false.
++ */
++function gutenberg_global_styles_include_support_for_wp_variables( $allow_css, $css_test_string ) {
++ if ( $allow_css ) {
++ return $allow_css;
++ }
++ $allowed_preset_attributes = array(
++ 'background',
++ 'background-color',
++ 'color',
++ 'font-family',
++ 'font-size',
++ );
++ $parts = explode( ':', $css_test_string, 2 );
++
++ if ( ! in_array( trim( $parts[0] ), $allowed_preset_attributes, true ) ) {
++ return $allow_css;
++ }
++ return ! ! preg_match( '/^var\(--wp-[a-zA-Z0-9\-]+\)$/', trim( $parts[1] ) );
++}
++
++
++add_action( 'init', 'gutenberg_global_styles_kses_init' );
++add_action( 'set_current_user', 'gutenberg_global_styles_kses_init' );
++add_filter( 'force_filtered_html_on_import', 'gutenberg_global_styles_force_filtered_html_on_import_filter', 999 );
++add_filter( 'safecss_filter_attr_allow_css', 'gutenberg_global_styles_include_support_for_wp_variables', 10, 2 );
++// This filter needs to be executed last.
++
+Skip. Plugin only.
+diff --git a/lib/load.php b/lib/load.php
+index 42ebfe7bb5..cff4bb2f49 100644
+--- a/lib/load.php
++++ b/lib/load.php
+@@ -9,6 +9,8 @@ if ( ! defined( 'ABSPATH' ) ) {
+ die( 'Silence is golden.' );
+ }
+
++require_once __DIR__ . '/upgrade.php';
++
+ /**
+ * Checks whether the Gutenberg experiment is enabled.
+ *
+@@ -30,102 +32,86 @@ if ( class_exists( 'WP_REST_Controller' ) ) {
+ * Start: Include for phase 2
+ */
+ if ( ! class_exists( 'WP_REST_Sidebars_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-sidebars-controller.php';
++ require_once __DIR__ . '/class-wp-rest-sidebars-controller.php';
+ }
+ if ( ! class_exists( 'WP_REST_Widget_Types_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-widget-types-controller.php';
++ require_once __DIR__ . '/class-wp-rest-widget-types-controller.php';
+ }
+ if ( ! class_exists( 'WP_REST_Widgets_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-widgets-controller.php';
+- }
+- if ( ! class_exists( 'WP_REST_Block_Directory_Controller' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-rest-block-directory-controller.php';
+- }
+- if ( ! class_exists( 'WP_REST_Block_Types_Controller' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-rest-block-types-controller.php';
++ require_once __DIR__ . '/class-wp-rest-widgets-controller.php';
+ }
+ if ( ! class_exists( 'WP_REST_Menus_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-menus-controller.php';
++ require_once __DIR__ . '/class-wp-rest-menus-controller.php';
+ }
+ if ( ! class_exists( 'WP_REST_Menu_Items_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-menu-items-controller.php';
++ require_once __DIR__ . '/class-wp-rest-menu-items-controller.php';
+ }
+ if ( ! class_exists( 'WP_REST_Menu_Locations_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-menu-locations-controller.php';
++ require_once __DIR__ . '/class-wp-rest-menu-locations-controller.php';
+ }
+ if ( ! class_exists( 'WP_Rest_Customizer_Nonces' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-customizer-nonces.php';
+- }
+- if ( ! class_exists( 'WP_REST_Image_Editor_Controller' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-rest-image-editor-controller.php';
+- }
+- if ( ! class_exists( 'WP_REST_Plugins_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-plugins-controller.php';
++ require_once __DIR__ . '/class-wp-rest-customizer-nonces.php';
+ }
+ if ( ! class_exists( 'WP_REST_Post_Format_Search_Handler' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-post-format-search-handler.php';
++ require_once __DIR__ . '/class-wp-rest-post-format-search-handler.php';
+ }
+ if ( ! class_exists( 'WP_REST_Term_Search_Handler' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-term-search-handler.php';
++ require_once __DIR__ . '/class-wp-rest-term-search-handler.php';
+ }
+ if ( ! class_exists( 'WP_REST_Batch_Controller' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-rest-batch-controller.php';
++ require_once __DIR__ . '/class-wp-rest-batch-controller.php';
++ }
++ if ( ! class_exists( 'WP_REST_Templates_Controller' ) ) {
++ require_once __DIR__ . '/full-site-editing/class-wp-rest-templates-controller.php';
+ }
+ /**
+ * End: Include for phase 2
+ */
+
+- require dirname( __FILE__ ) . '/rest-api.php';
+-}
+-
+-if ( ! class_exists( 'WP_Block_Patterns_Registry' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-block-patterns-registry.php';
+-}
+-
+-if ( ! class_exists( 'WP_Block_Pattern_Categories_Registry' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-block-pattern-categories-registry.php';
++ require __DIR__ . '/rest-api.php';
+ }
+
+-if ( ! class_exists( 'WP_Block' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-block.php';
+-}
+-
+-if ( ! class_exists( 'WP_Block_List' ) ) {
+- require dirname( __FILE__ ) . '/class-wp-block-list.php';
+-}
+ if ( ! class_exists( 'WP_Widget_Block' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-widget-block.php';
++ require_once __DIR__ . '/class-wp-widget-block.php';
+ }
+-require_once dirname( __FILE__ ) . '/widgets-page.php';
+
+-require dirname( __FILE__ ) . '/compat.php';
+-require dirname( __FILE__ ) . '/utils.php';
++require_once __DIR__ . '/widgets-page.php';
++
++require __DIR__ . '/compat.php';
++require __DIR__ . '/utils.php';
++require __DIR__ . '/editor-settings.php';
+
+-// Include FSE related files only if the experiment is enabled.
+-if ( gutenberg_is_experiment_enabled( 'gutenberg-full-site-editing' ) ) {
+- require dirname( __FILE__ ) . '/templates.php';
+- require dirname( __FILE__ ) . '/template-parts.php';
+- require dirname( __FILE__ ) . '/template-loader.php';
+- require dirname( __FILE__ ) . '/edit-site-page.php';
+- require dirname( __FILE__ ) . '/edit-site-export.php';
++if ( ! class_exists( 'WP_Block_Template ' ) ) {
++ require __DIR__ . '/full-site-editing/class-wp-block-template.php';
+ }
++require __DIR__ . '/full-site-editing/full-site-editing.php';
++require __DIR__ . '/full-site-editing/block-templates.php';
++require __DIR__ . '/full-site-editing/default-template-types.php';
++require __DIR__ . '/full-site-editing/templates-utils.php';
++require __DIR__ . '/full-site-editing/page-templates.php';
++require __DIR__ . '/full-site-editing/templates.php';
++require __DIR__ . '/full-site-editing/template-parts.php';
++require __DIR__ . '/full-site-editing/template-loader.php';
++require __DIR__ . '/full-site-editing/edit-site-page.php';
++require __DIR__ . '/full-site-editing/edit-site-export.php';
+
+-require dirname( __FILE__ ) . '/block-patterns.php';
+-require dirname( __FILE__ ) . '/blocks.php';
+-require dirname( __FILE__ ) . '/client-assets.php';
+-require dirname( __FILE__ ) . '/block-directory.php';
+-require dirname( __FILE__ ) . '/demo.php';
+-require dirname( __FILE__ ) . '/widgets.php';
+-require dirname( __FILE__ ) . '/navigation.php';
+-require dirname( __FILE__ ) . '/navigation-page.php';
+-require dirname( __FILE__ ) . '/experiments-page.php';
+-require dirname( __FILE__ ) . '/global-styles.php';
++require __DIR__ . '/blocks.php';
++require __DIR__ . '/client-assets.php';
++require __DIR__ . '/demo.php';
++require __DIR__ . '/widgets.php';
++require __DIR__ . '/navigation.php';
++require __DIR__ . '/navigation-page.php';
++require __DIR__ . '/experiments-page.php';
++require __DIR__ . '/class-wp-theme-json.php';
++require __DIR__ . '/class-wp-theme-json-resolver.php';
++require __DIR__ . '/global-styles.php';
+
+ if ( ! class_exists( 'WP_Block_Supports' ) ) {
+- require_once dirname( __FILE__ ) . '/class-wp-block-supports.php';
++ require_once __DIR__ . '/class-wp-block-supports.php';
+ }
+-require dirname( __FILE__ ) . '/block-supports/generated-classname.php';
+-require dirname( __FILE__ ) . '/block-supports/colors.php';
+-require dirname( __FILE__ ) . '/block-supports/align.php';
+-require dirname( __FILE__ ) . '/block-supports/typography.php';
+-require dirname( __FILE__ ) . '/block-supports/custom-classname.php';
++require __DIR__ . '/block-supports/generated-classname.php';
++require __DIR__ . '/block-supports/colors.php';
++require __DIR__ . '/block-supports/align.php';
++require __DIR__ . '/block-supports/typography.php';
++require __DIR__ . '/block-supports/custom-classname.php';
++require __DIR__ . '/block-supports/border.php';
+diff --git a/lib/navigation-page.php b/lib/navigation-page.php
+index 16be155850..98398cc238 100644
+--- a/lib/navigation-page.php
++++ b/lib/navigation-page.php
+@@ -32,44 +32,12 @@ function gutenberg_navigation_init( $hook ) {
+ return;
+ }
+
+- // Media settings.
+- $max_upload_size = wp_max_upload_size();
+- if ( ! $max_upload_size ) {
+- $max_upload_size = 0;
+- }
+-
+- /** This filter is documented in wp-admin/includes/media.php */
+- $image_size_names = apply_filters(
+- 'image_size_names_choose',
++ $settings = array_merge(
++ gutenberg_get_common_block_editor_settings(),
+ array(
+- 'thumbnail' => __( 'Thumbnail', 'gutenberg' ),
+- 'medium' => __( 'Medium', 'gutenberg' ),
+- 'large' => __( 'Large', 'gutenberg' ),
+- 'full' => __( 'Full Size', 'gutenberg' ),
++ 'blockNavMenus' => get_theme_support( 'block-nav-menus' ),
+ )
+ );
+-
+- $available_image_sizes = array();
+- foreach ( $image_size_names as $image_size_slug => $image_size_name ) {
+- $available_image_sizes[] = array(
+- 'slug' => $image_size_slug,
+- 'name' => $image_size_name,
+- );
+- }
+-
+- $settings = array(
+- 'imageSizes' => $available_image_sizes,
+- 'isRTL' => is_rtl(),
+- 'maxUploadFileSize' => $max_upload_size,
+- 'blockNavMenus' => get_theme_support( 'block-nav-menus' ),
+- );
+-
+- list( $font_sizes, ) = (array) get_theme_support( 'editor-font-sizes' );
+-
+- if ( false !== $font_sizes ) {
+- $settings['fontSizes'] = $font_sizes;
+- }
+-
+ $settings = gutenberg_experimental_global_styles_settings( $settings );
+
+ wp_add_inline_script(
+@@ -78,7 +46,7 @@ function gutenberg_navigation_init( $hook ) {
+ 'wp.domReady( function() {
+ wp.editNavigation.initialize( "navigation-editor", %s );
+ } );',
+- wp_json_encode( gutenberg_experiments_editor_settings( $settings ) )
++ wp_json_encode( $settings )
+ )
+ );
+
+diff --git a/lib/patterns/heading-paragraph.php b/lib/patterns/heading-paragraph.php
+deleted file mode 100644
+index 9a8b160a78..0000000000
+--- a/lib/patterns/heading-paragraph.php
++++ /dev/null
+@@ -1,14 +0,0 @@
+- __( 'Heading and paragraph', 'gutenberg' ),
+- 'content' => "\n
\n
2. " . __( 'Which treats of the first sally the ingenious Don Quixote made from home', 'gutenberg' ) . "
\n\n\n\n
" . __( 'These preliminaries settled, he did not care to put off any longer the execution of his design, urged on to it by the thought of all the world was losing by his delay, seeing what wrongs he intended to right, grievances to redress, injustices to repair, abuses to remove, and duties to discharge.', 'gutenberg' ) . "
\n
\n",
+- 'viewportWidth' => 1000,
+- 'categories' => array( 'text' ),
+- 'description' => _x( 'A heading preceded by a chapter number, and followed by a paragraph.', 'Block pattern description', 'gutenberg' ),
+-);
+diff --git a/lib/patterns/large-header-button.php b/lib/patterns/large-header-button.php
+deleted file mode 100644
+index 1d71e5703f..0000000000
+--- a/lib/patterns/large-header-button.php
++++ /dev/null
+@@ -1,14 +0,0 @@
+- __( 'Large header with a heading and a button ', 'gutenberg' ),
+- 'content' => "\n
\n",
+- 'viewportWidth' => 1000,
+- 'description' => _x( 'Three small columns of text, each with an outlined button with rounded corners at the bottom.', 'Block pattern description', 'gutenberg' ),
+-);
+diff --git a/lib/patterns/text-two-columns-with-images.php b/lib/patterns/text-two-columns-with-images.php
+deleted file mode 100644
+index c4978acbc3..0000000000
+--- a/lib/patterns/text-two-columns-with-images.php
++++ /dev/null
+@@ -1,13 +0,0 @@
+- __( 'Two columns of text with images', 'gutenberg' ),
+- 'categories' => array( 'columns' ),
+- 'content' => "\n
\n
\n
\n\n\n\n\n
" . __( 'They must know, then, that the above-named gentleman whenever he was at leisure (which was mostly all the year round) gave himself up to reading books of chivalry with such ardour and avidity that he almost entirely neglected the pursuit of his field-sports, and even the management of his property; and to such a pitch did his eagerness and infatuation go that he sold many an acre of tillageland to buy books of chivalry to read, and brought home as many of them as he could get.', 'gutenberg' ) . "
\n
\n\n\n\n
\n\n\n\n\n
" . __( 'But of all there were none he liked so well as those of the famous Feliciano de Silva\'s composition, for their lucidity of style and complicated conceits were as pearls in his sight, particularly when in his reading he came upon courtships and cartels, where he often found passages like "the reason of the unreason with which my reason is afflicted so weakens my reason that with reason I murmur at your beauty;" or again, "the high heavens render you deserving of the desert your greatness deserves."', 'gutenberg' ) . "
\n
\n
\n
\n",
+- 'description' => _x( 'Two columns of text, each with an image on top.', 'Block pattern description', 'gutenberg' ),
+-);
+diff --git a/lib/patterns/text-two-columns.php b/lib/patterns/text-two-columns.php
+deleted file mode 100644
+index ca40c74289..0000000000
+--- a/lib/patterns/text-two-columns.php
++++ /dev/null
+@@ -1,13 +0,0 @@
+- __( 'Two columns of text', 'gutenberg' ),
+- 'categories' => array( 'columns' ),
+- 'content' => "\n
\n
" . __( 'Which treats of the character and pursuits of the famous gentleman Don Quixote of La Mancha', 'gutenberg' ) . "
\n\n\n\n
\n
\n
" . __( 'In a village of La Mancha, the name of which I have no desire to call to mind, there lived not long since one of those gentlemen that keep a lance in the lance-rack, an old buckler, a lean hack, and a greyhound for coursing. An olla of rather more beef than mutton, a salad on most nights, scraps on Saturdays, lentils on Fridays, and a pigeon or so extra on Sundays, made away with three-quarters of his income.', 'gutenberg' ) . "
\n
\n\n\n\n
\n
" . __( 'The rest of it went in a doublet of fine cloth and velvet breeches and shoes to match for holidays, while on week-days he made a brave figure in his best homespun. He had in his house a housekeeper past forty, a niece under twenty, and a lad for the field and market-place, who used to saddle the hack as well as handle the bill-hook. The age of this gentleman of ours was bordering on fifty; he was of a hardy habit, spare, gaunt-featured, a very early riser and a great sportsman.', 'gutenberg' ) . "
\n
\n
\n
\n",
+- 'description' => _x( 'Two columns of text preceded by a long heading.', 'Block pattern description', 'gutenberg' ),
+-);
+diff --git a/lib/patterns/three-buttons.php b/lib/patterns/three-buttons.php
+deleted file mode 100644
+index 2f60d3cf00..0000000000
+--- a/lib/patterns/three-buttons.php
++++ /dev/null
+@@ -1,14 +0,0 @@
+- __( 'Three buttons', 'gutenberg' ),
+- 'content' => "\n
![\""](\"https://s.w.org/images/core/5.5/don-quixote-03.jpg\")
![\"\"/](\"https://s.w.org/images/core/5.5/don-quixote-02.jpg\")
![\"\"/](\"https://s.w.org/images/core/5.5/don-quixote-04.jpg\")
![\""](\"https://s.w.org/images/core/5.5/don-quixote-05.jpg\")
