WIP - Hybrid themes implementation

gutenberg.php

@@ -102,7 +102,7 @@ function gutenberg_menu() {
  * @since 9.4.0
  */
 function gutenberg_site_editor_menu() {
-	if ( gutenberg_is_fse_theme() ) {
+	if ( gutenberg_is_fse_enabled() ) {
 		add_menu_page(
 			__( 'Site Editor (beta)', 'gutenberg' ),
 			sprintf(

lib/client-assets.php

@@ -666,7 +666,7 @@ function gutenberg_extend_block_editor_styles( $settings ) {
  * @return array Filtered editor settings.
  */
 function gutenberg_extend_block_editor_settings_with_fse_theme_flag( $settings ) {
-	$settings['isFSETheme'] = gutenberg_is_fse_theme();
+	$settings['isFSETheme'] = gutenberg_is_fse_enabled();
 
 	// Enable the new layout options for themes with a theme.json file.
 	$settings['supportsLayout'] = WP_Theme_JSON_Resolver::theme_has_support();

lib/compat.php

@@ -14,7 +14,7 @@
  * @return bool
  */
 function gutenberg_should_load_separate_block_assets() {
-	$load_separate_styles = gutenberg_is_fse_theme();
+	$load_separate_styles = gutenberg_is_fse_enabled();
 	/**
 	 * Determine if separate styles will be loaded for blocks on-render or not.
 	 *

lib/editor-settings.php

@@ -39,7 +39,7 @@ function gutenberg_get_common_block_editor_settings() {
 	};
 
 	$settings = array(
-		'__unstableEnableFullSiteEditingBlocks' => gutenberg_is_fse_theme(),
+		'__unstableEnableFullSiteEditingBlocks' => gutenberg_is_fse_enabled(),
 		'disableCustomColors'                   => get_theme_support( 'disable-custom-colors' ),
 		'disableCustomFontSizes'                => get_theme_support( 'disable-custom-font-sizes' ),
 		'disableCustomGradients'                => get_theme_support( 'disable-custom-gradients' ),
@@ -77,7 +77,7 @@ function gutenberg_get_common_block_editor_settings() {
  * @return array Filtered settings.
  */
 function gutenberg_extend_post_editor_settings( $settings ) {
-	$settings['__unstableEnableFullSiteEditingBlocks'] = gutenberg_is_fse_theme();
+	$settings['__unstableEnableFullSiteEditingBlocks'] = gutenberg_is_fse_enabled();
 	return $settings;
 }
 add_filter( 'block_editor_settings', 'gutenberg_extend_post_editor_settings' );

lib/experiments-page.php

@@ -62,6 +62,19 @@ function gutenberg_initialize_experiments_settings() {
 			'id'    => 'gutenberg-widgets-in-customizer',
 		)
 	);
+	if ( ! gutenberg_is_fse_theme() ) {
+		add_settings_field(
+			'gutenberg-fse',
+			__( 'Full Site Editing', 'gutenberg' ),
+			'gutenberg_display_experiment_field',
+			'gutenberg-experiments',
+			'gutenberg_experiments_section',
+			array(
+				'label' => __( 'Allow creating templates using the block editor', 'gutenberg' ),
+				'id'    => 'gutenberg-fse',
+			)
+		);
+	}
 	register_setting(
 		'gutenberg-experiments',
 		'gutenberg-experiments'

lib/full-site-editing/full-site-editing.php

@@ -5,6 +5,15 @@
  * @package gutenberg
  */
 
+/**
+ * Returns whether the FSE is enabled or not.
+ *
+ * @return boolean Whether FSE is enabled or not.
+ */
+function gutenberg_is_fse_enabled() {
+	return gutenberg_is_fse_theme() || gutenberg_is_experiment_enabled( 'gutenberg-fse' );
+}
+
 /**
  * Returns whether the current theme is an FSE theme or not.
  *
@@ -64,19 +73,16 @@ function gutenberg_remove_legacy_pages() {
  */
 function gutenberg_adminbar_items( $wp_admin_bar ) {
 
-	// Early exit if not an FSE theme.
-	if ( ! gutenberg_is_fse_theme() ) {
-		return;
+	// Remove items if an FSE theme.
+	if ( gutenberg_is_fse_theme() ) {
+		$wp_admin_bar->remove_node( 'customize' );
+		$wp_admin_bar->remove_node( 'customize-background' );
+		$wp_admin_bar->remove_node( 'customize-header' );
+		$wp_admin_bar->remove_node( 'widgets' );
 	}
 
-	// Remove customizer link.
-	$wp_admin_bar->remove_node( 'customize' );
-	$wp_admin_bar->remove_node( 'customize-background' );
-	$wp_admin_bar->remove_node( 'customize-header' );
-	$wp_admin_bar->remove_node( 'widgets' );
-
 	// Add site-editor link.
-	if ( ! is_admin() && current_user_can( 'edit_theme_options' ) ) {
+	if ( gutenberg_is_fse_enabled() && ! is_admin() && current_user_can( 'edit_theme_options' ) ) {
 		$wp_admin_bar->add_node(
 			array(
 				'id'    => 'site-editor',
@@ -101,7 +107,7 @@ function gutenberg_adminbar_items( $wp_admin_bar ) {
  * @param array $menu_order Menu Order.
  */
 function gutenberg_menu_order( $menu_order ) {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return $menu_order;
 	}
 

lib/full-site-editing/page-templates.php

@@ -15,7 +15,7 @@
  * @return array (Maybe) modified page templates array.
  */
 function gutenberg_load_block_page_templates( $templates, $theme, $post, $post_type ) {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return $templates;
 	}
 

lib/full-site-editing/template-loader.php

@@ -9,7 +9,7 @@
  * Adds necessary filters to use 'wp_template' posts instead of theme template files.
  */
 function gutenberg_add_template_loader_filters() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 

lib/full-site-editing/template-parts.php

@@ -9,7 +9,7 @@
  * Registers block editor 'wp_template_part' post type.
  */
 function gutenberg_register_template_part_post_type() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 
@@ -64,7 +64,7 @@ function gutenberg_register_template_part_post_type() {
  * Registers the 'wp_template_part_area' taxonomy.
  */
 function gutenberg_register_wp_template_part_area_taxonomy() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 
@@ -107,7 +107,7 @@ function gutenberg_register_wp_template_part_area_taxonomy() {
  * Fixes the label of the 'wp_template_part' admin menu entry.
  */
 function gutenberg_fix_template_part_admin_menu_entry() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 

lib/full-site-editing/templates.php

@@ -28,7 +28,7 @@ function gutenberg_get_template_paths() {
  * Registers block editor 'wp_template' post type.
  */
 function gutenberg_register_template_post_type() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 
@@ -84,7 +84,7 @@ function gutenberg_register_template_post_type() {
  * Registers block editor 'wp_theme' taxonomy.
  */
 function gutenberg_register_wp_theme_taxonomy() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 
@@ -139,7 +139,7 @@ function gutenberg_grant_template_caps( array $allcaps ) {
  * Fixes the label of the 'wp_template' admin menu entry.
  */
 function gutenberg_fix_template_admin_menu_entry() {
-	if ( ! gutenberg_is_fse_theme() ) {
+	if ( ! gutenberg_is_fse_enabled() ) {
 		return;
 	}
 	global $submenu;

lib/global-styles.php

@@ -198,7 +198,7 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
 	$origin = 'theme';
 	if (
 		WP_Theme_JSON_Resolver::theme_has_support() &&
-		gutenberg_is_fse_theme()
+		gutenberg_is_fse_enabled()
 	) {
 		// Only lookup for the user data if we need it.
 		$origin = 'user';
@@ -224,7 +224,7 @@ function gutenberg_experimental_global_styles_settings( $settings ) {
 		function_exists( 'gutenberg_is_edit_site_page' ) &&
 		gutenberg_is_edit_site_page( $screen->id ) &&
 		WP_Theme_JSON_Resolver::theme_has_support() &&
-		gutenberg_is_fse_theme()
+		gutenberg_is_fse_enabled()
 	) {
 		$user_cpt_id = WP_Theme_JSON_Resolver::get_user_custom_post_type_id();
 		$base_styles = WP_Theme_JSON_Resolver::get_merged_data( $theme_support_data, 'theme' )->get_raw_data();

packages/edit-site/src/utils/get-closest-available-template.js

@@ -4,6 +4,21 @@
 import { find } from 'lodash';
 
 export default function getClosestAvailableTemplate( slug, templates ) {
+	// Fallback in case there are no templates.
+	if ( ! templates.length ) {
+		return {
+			id: 'index',
+			content: {
+				raw: '',
+			},
+			slug: 'index',
+			is_custom: false,
+			type: 'wp_template',
+			status: 'publish',
+			wp_id: null,
+		};
+	}
+
 	const template = find( templates, { slug } );
 	if ( template ) {
 		return template;