Remove pattern override experiment (#58105)

* Completely remove the pattern overrides experiment flag * Update test to use correct name of block bindings experiment * Restore react native file * Fix paths in native files * Update pattern block test to reflect changes to inner blocks (the reusable block no longer uses controlled inner blocks) * Fix e2e tests --------- Co-authored-by: Kai Hao <[email protected]>
WordPress · Jan 24, 2024 · d9ed5d3 · d9ed5d3
1 parent 291ffb9
commit d9ed5d3
Show file tree

Hide file tree

Showing 15 changed files with 134 additions and 315 deletions.
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
@@ -10,10 +10,8 @@
 // Register the sources.
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments ) {
-	if ( array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-		require_once __DIR__ . '/sources/pattern.php';
-	}
 	if ( array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
+		require_once __DIR__ . '/sources/pattern.php';
 		require_once __DIR__ . '/sources/post-meta.php';
 	}
 }
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
@@ -78,13 +78,9 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 	}
 }
 
-
-
-
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments && (
-	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ||
-	array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
+	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments )
 ) ) {
 
 	require_once __DIR__ . '/block-bindings/index.php';

diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
@@ -33,10 +33,6 @@ function gutenberg_enable_experiments() {
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 		wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' );
 	}
-
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalPatternPartialSyncing = true', 'before' );
-	}
 }
 
 add_action( 'admin_init', 'gutenberg_enable_experiments' );

diff --git a/lib/experiments-page.php b/lib/experiments-page.php
@@ -138,18 +138,6 @@ function gutenberg_initialize_experiments_settings() {
 		)
 	);
 
-	add_settings_field(
-		'gutenberg-pattern-partial-syncing',
-		__( 'Pattern overrides', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Test overrides in synced patterns', 'gutenberg' ),
-			'id'    => 'gutenberg-pattern-partial-syncing',
-		)
-	);
-
 	register_setting(
 		'gutenberg-experiments',
 		'gutenberg-experiments'

diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
@@ -93,8 +93,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 			topLevelLockedBlock:
 				__unstableGetContentLockingParent( _selectedBlockClientId ) ||
 				( getTemplateLock( _selectedBlockClientId ) === 'contentOnly' ||
-				( _selectedBlockName === 'core/block' &&
-					window.__experimentalPatternPartialSyncing )
+				_selectedBlockName === 'core/block'
 					? _selectedBlockClientId
 					: undefined ),
 		};

diff --git a/packages/block-editor/src/components/block-list/use-in-between-inserter.js b/packages/block-editor/src/components/block-list/use-in-between-inserter.js
@@ -77,8 +77,7 @@ export function useInBetweenInserter() {
 				if (
 					getTemplateLock( rootClientId ) ||
 					getBlockEditingMode( rootClientId ) === 'disabled' ||
-					( getBlockName( rootClientId ) === 'core/block' &&
-						window.__experimentalPatternPartialSyncing )
+					getBlockName( rootClientId ) === 'core/block'
 				) {
 					return;
 				}

diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
@@ -2721,8 +2721,7 @@ export const __unstableGetContentLockingParent = createSelector(
 			current = state.blocks.parents.get( current );
 			if (
 				( current &&
-					getBlockName( state, current ) === 'core/block' &&
-					window.__experimentalPatternPartialSyncing ) ||
+					getBlockName( state, current ) === 'core/block' ) ||
 				( current &&
 					getTemplateLock( state, current ) === 'contentOnly' )
 			) {

diff --git a/...block-library/src/block/v1/edit.native.js → ...es/block-library/src/block/edit.native.js b/...block-library/src/block/v1/edit.native.js → ...es/block-library/src/block/edit.native.js
@@ -42,8 +42,8 @@ import { store as noticesStore } from '@wordpress/notices';
 /**
  * Internal dependencies
  */
-import styles from '../editor.scss';
-import EditTitle from '../edit-title';
+import styles from './editor.scss';
+import EditTitle from './edit-title';
 
 export default function ReusableBlockEdit( {
 	attributes: { ref },

diff --git a/packages/block-library/src/block/index.js b/packages/block-library/src/block/index.js
@@ -8,15 +8,14 @@ import { symbol as icon } from '@wordpress/icons';
  */
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
-import editV1 from './v1/edit';
-import editV2 from './edit';
+import edit from './edit';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	edit: window.__experimentalPatternPartialSyncing ? editV2 : editV1,
+	edit,
 	icon,
 };
 

diff --git a/packages/block-library/src/block/v1/edit.js b/packages/block-library/src/block/v1/edit.js
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Pattern blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
 "<!-- wp:paragraph -->
-<p>12</p>
+<p>1</p>
 <!-- /wp:paragraph -->"
 `;