Patterns: removes the pattern experiment

docs/reference-guides/core-blocks.md

@@ -480,7 +480,7 @@ Show a block pattern. ([Source](https://github.com/WordPress/gutenberg/tree/trun
 -	**Name:** core/pattern
 -	**Category:** theme
 -	**Supports:** ~~html~~, ~~inserter~~
--	**Attributes:** slug, syncStatus
+-	**Attributes:** slug
 
 ## Post Author
 

lib/experimental/editor-settings.php

@@ -86,9 +86,6 @@ function gutenberg_enable_experiments() {
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-group-grid-variation', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
 	}
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-enhancements', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnablePatternEnhancements = true', 'before' );
-	}
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-interactivity-api-core-blocks', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalInteractivityAPI = true', 'before' );
 	}

lib/experiments-page.php

@@ -89,18 +89,6 @@ function gutenberg_initialize_experiments_settings() {
 		)
 	);
 
-	add_settings_field(
-		'gutenberg-pattern-enhancements',
-		__( 'Pattern enhancements', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Test the Pattern block enhancements', 'gutenberg' ),
-			'id'    => 'gutenberg-pattern-enhancements',
-		)
-	);
-
 	register_setting(
 		'gutenberg-experiments',
 		'gutenberg-experiments'

packages/block-library/src/pattern/block.json

@@ -13,10 +13,6 @@
 	"attributes": {
 		"slug": {
 			"type": "string"
-		},
-		"syncStatus": {
-			"type": [ "string", "boolean" ],
-			"enum": [ "full", "partial" ]
 		}
 	}
 }

packages/block-library/src/pattern/edit.js

@@ -7,35 +7,26 @@ import { useEffect } from '@wordpress/element';
 import {
 	store as blockEditorStore,
 	useBlockProps,
-	useInnerBlocksProps,
 } from '@wordpress/block-editor';
 
 const PatternEdit = ( { attributes, clientId } ) => {
-	const { slug, syncStatus } = attributes;
-	const { selectedPattern, innerBlocks } = useSelect(
-		( select ) => {
-			return {
-				selectedPattern:
-					select( blockEditorStore ).__experimentalGetParsedPattern(
-						slug
-					),
-				innerBlocks:
-					select( blockEditorStore ).getBlock( clientId )
-						?.innerBlocks,
-			};
-		},
-		[ slug, clientId ]
+	const selectedPattern = useSelect(
+		( select ) =>
+			select( blockEditorStore ).__experimentalGetParsedPattern(
+				attributes.slug
+			),
+		[ attributes.slug ]
 	);
-	const {
-		replaceBlocks,
-		replaceInnerBlocks,
-		__unstableMarkNextChangeAsNotPersistent,
-	} = useDispatch( blockEditorStore );
+
+	const { replaceBlocks, __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
 
 	// Run this effect when the component loads.
 	// This adds the Pattern's contents to the post.
+	// This change won't be saved.
+	// It will continue to pull from the pattern file unless changes are made to its respective template part.
 	useEffect( () => {
-		if ( selectedPattern?.blocks && ! innerBlocks?.length ) {
+		if ( selectedPattern?.blocks ) {
 			// We batch updates to block list settings to avoid triggering cascading renders
 			// for each container block included in a tree and optimize initial render.
 			// Since the above uses microtasks, we need to use a microtask here as well,
@@ -48,36 +39,19 @@ const PatternEdit = ( { attributes, clientId } ) => {
 					cloneBlock( block )
 				);
 				__unstableMarkNextChangeAsNotPersistent();
-				if ( syncStatus === 'partial' ) {
-					replaceInnerBlocks( clientId, clonedBlocks );
-					return;
-				}
 				replaceBlocks( clientId, clonedBlocks );
 			} );
 		}
 	}, [
 		clientId,
 		selectedPattern?.blocks,
-		replaceInnerBlocks,
 		__unstableMarkNextChangeAsNotPersistent,
-		innerBlocks,
-		syncStatus,
 		replaceBlocks,
 	] );
 
-	const blockProps = useBlockProps( {
-		className: slug?.replace( '/', '-' ),
-	} );
-
-	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		templateLock: syncStatus === 'partial' ? 'contentOnly' : false,
-	} );
-
-	if ( syncStatus !== 'partial' ) {
-		return <div { ...blockProps } />;
-	}
+	const props = useBlockProps();
 
-	return <div { ...innerBlocksProps } />;
+	return <div { ...props } />;
 };
 
 export default PatternEdit;

packages/block-library/src/pattern/index.js

@@ -3,14 +3,13 @@
  */
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
-import PatternEditV1 from './v1/edit';
-import PatternEditV2 from './edit';
+import PatternEdit from './edit';
 
 const { name } = metadata;
 export { metadata, name };
 
-export const settings = window?.__experimentalEnablePatternEnhancements
-	? { edit: PatternEditV2 }
-	: { edit: PatternEditV1 };
+export const settings = {
+	edit: PatternEdit,
+};
 
 export const init = () => initBlock( { name, metadata, settings } );

packages/block-library/src/pattern/index.php

@@ -39,19 +39,7 @@ function render_block_core_pattern( $attributes ) {
 	}
 
 	$pattern = $registry->get_registered( $slug );
-
-	// Currently all existing blocks should be returned here without a wp-block-pattern wrapper
-	// as the syncStatus attribute is only used if the gutenberg-pattern-enhancements experiment
-	// is enabled.
-	if ( ! isset( $attributes['syncStatus'] ) ) {
-		return do_blocks( $pattern['content'] );
-	}
-
-	$block_classnames = 'wp-block-pattern ' . str_replace( '/', '-', $attributes['slug'] );
-	$classnames       = isset( $attributes['className'] ) ? $attributes['className'] . ' ' . $block_classnames : $block_classnames;
-	$wrapper          = '<div class="' . esc_attr( $classnames ) . '">%s</div>';
-
-	return sprintf( $wrapper, do_blocks( $pattern['content'] ) );
+	return do_blocks( $pattern['content'] );
 }
 
 add_action( 'init', 'register_block_core_pattern' );