Decouple Post Blocks Experiment from Site Editor Experiment

WordPress · Dec 18, 2020 · 7b6db89 · 7b6db89
1 parent 66496e5
commit 7b6db89
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 28 deletions.
diff --git a/lib/editor-settings.php b/lib/editor-settings.php
@@ -40,6 +40,7 @@ function gutenberg_get_common_block_editor_settings() {
 
 	$settings = array(
 		'__unstableEnableFullSiteEditingBlocks' => gutenberg_is_fse_theme(),
+		'__unstableEnablePostBlocks'            => gutenberg_is_experiment_enabled( 'gutenberg-post-blocks' ),
 		'disableCustomColors'                   => get_theme_support( 'disable-custom-colors' ),
 		'disableCustomFontSizes'                => get_theme_support( 'disable-custom-font-sizes' ),
 		'disableCustomGradients'                => get_theme_support( 'disable-custom-gradients' ),
@@ -77,6 +78,7 @@ function gutenberg_get_common_block_editor_settings() {
  */
 function gutenberg_extend_post_editor_settings( $settings ) {
 	$settings['__unstableEnableFullSiteEditingBlocks'] = gutenberg_is_fse_theme();
+	$settings['__unstableEnablePostBlocks']            = gutenberg_is_experiment_enabled( 'gutenberg-post-blocks' );
 	return $settings;
 }
 add_filter( 'block_editor_settings', 'gutenberg_extend_post_editor_settings' );
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
@@ -40,6 +40,17 @@ function gutenberg_initialize_experiments_settings() {
 		'gutenberg_display_experiment_section',
 		'gutenberg-experiments'
 	);
+	add_settings_field(
+		'gutenberg-post-blocks',
+		__( 'Post Blocks', 'gutenberg' ),
+		'gutenberg_display_experiment_field',
+		'gutenberg-experiments',
+		'gutenberg_experiments_section',
+		array(
+			'label' => __( 'Enable Post Blocks in block editor', 'gutenberg' ),
+			'id'    => 'gutenberg-post-blocks',
+		)
+	);
 	add_settings_field(
 		'gutenberg-navigation',
 		__( 'Navigation', 'gutenberg' ),

diff --git a/packages/block-library/src/index.js b/packages/block-library/src/index.js
@@ -191,6 +191,7 @@ export const registerCoreBlocks = (
  * Function to register experimental core blocks depending on editor settings.
  *
  * @param {boolean} enableFSEBlocks Whether to enable the full site editing blocks.
+ * @param {boolean} enablePostBlocks Whether to enable the post blocks.
  * @example
  * ```js
  * import { __experimentalRegisterExperimentalCoreBlocks } from '@wordpress/block-library';
@@ -200,38 +201,37 @@ export const registerCoreBlocks = (
  */
 export const __experimentalRegisterExperimentalCoreBlocks =
 	process.env.GUTENBERG_PHASE === 2
-		? ( enableFSEBlocks ) => {
+		? ( enableFSEBlocks, enablePostBlocks ) => {
+				const postBlocks = [
+					siteLogo,
+					siteTagline,
+					siteTitle,
+					query,
+					queryLoop,
+					queryPagination,
+					postTitle,
+					postContent,
+					postAuthor,
+					postComment,
+					postCommentAuthor,
+					postCommentContent,
+					postCommentDate,
+					postComments,
+					postCommentsCount,
+					postCommentsForm,
+					postDate,
+					postExcerpt,
+					postFeaturedImage,
+					postHierarchicalTerms,
+					postTags,
+				];
 				[
 					navigation,
 					navigationLink,
-
 					// Register Full Site Editing Blocks.
 					...( enableFSEBlocks
-						? [
-								siteLogo,
-								siteTagline,
-								siteTitle,
-								templatePart,
-								query,
-								queryLoop,
-								queryPagination,
-								postTitle,
-								postContent,
-								postAuthor,
-								postComment,
-								postCommentAuthor,
-								postCommentContent,
-								postCommentDate,
-								postComments,
-								postCommentsCount,
-								postCommentsForm,
-								postDate,
-								postExcerpt,
-								postFeaturedImage,
-								postHierarchicalTerms,
-								postTags,
-						  ]
-						: [] ),
+						? [ templatePart, ...postBlocks ]
+						: ( enablePostBlocks && postBlocks ) || [] ),
 				].forEach( registerBlock );
 		  }
 		: undefined;
diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
@@ -93,8 +93,13 @@ export function initializeEditor(
 	);
 	registerCoreBlocks();
 	if ( process.env.GUTENBERG_PHASE === 2 ) {
+		const {
+			__unstableEnableFullSiteEditingBlocks,
+			__unstableEnablePostBlocks,
+		} = settings;
 		__experimentalRegisterExperimentalCoreBlocks(
-			settings.__unstableEnableFullSiteEditingBlocks
+			__unstableEnableFullSiteEditingBlocks,
+			__unstableEnablePostBlocks
 		);
 	}