Add overrides attribute to pattern block and share it via providesCon…

…text
WordPress · Jan 23, 2024 · 5a95a4c · 5a95a4c
1 parent 810fe29
commit 5a95a4c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 49 deletions.
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
@@ -42,7 +42,7 @@ Create and save content to reuse across your site. Update the pattern, and the c
 -	**Name:** core/block
 -	**Category:** reusable
 -	**Supports:** ~~customClassName~~, ~~html~~, ~~inserter~~, ~~renaming~~
--	**Attributes:** ref
+-	**Attributes:** overrides, ref
 
 ## Button
 

diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json
@@ -10,8 +10,14 @@
 	"attributes": {
 		"ref": {
 			"type": "number"
+		},
+		"overrides": {
+			"type": "object"
 		}
 	},
+	"providesContext": {
+		"pattern/overrides": "overrides"
+	},
 	"supports": {
 		"customClassName": false,
 		"html": false,

diff --git a/packages/block-library/src/block/index.php b/packages/block-library/src/block/index.php
@@ -45,32 +45,9 @@ function render_block_core_block( $attributes ) {
 	global $wp_embed;
 	$content = $wp_embed->run_shortcode( $reusable_block->post_content );
 	$content = $wp_embed->autoembed( $content );
-
-	$gutenberg_experiments        = get_option( 'gutenberg-experiments' );
-	$has_partial_synced_overrides = $gutenberg_experiments
-		&& array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
-		&& isset( $attributes['overrides'] );
-
-	/**
-	 * We set the `pattern/overrides` context through the `render_block_context`
-	 * filter so that it is available when a pattern's inner blocks are
-	 * rendering via do_blocks given it only receives the inner content.
-	 */
-	if ( $has_partial_synced_overrides ) {
-		$filter_block_context = static function ( $context ) use ( $attributes ) {
-			$context['pattern/overrides'] = $attributes['overrides'];
-			return $context;
-		};
-		add_filter( 'render_block_context', $filter_block_context, 1 );
-	}
-
 	$content = do_blocks( $content );
 	unset( $seen_refs[ $attributes['ref'] ] );
 
-	if ( $has_partial_synced_overrides ) {
-		remove_filter( 'render_block_context', $filter_block_context, 1 );
-	}
-
 	return $content;
 }
 
@@ -86,28 +63,3 @@ function register_block_core_block() {
 	);
 }
 add_action( 'init', 'register_block_core_block' );
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-	/**
-	 * Registers the overrides attribute for core/block.
-	 *
-	 * @param array  $args       Array of arguments for registering a block type.
-	 * @param string $block_name Block name including namespace.
-	 * @return array $args
-	 */
-	function register_block_core_block_args( $args, $block_name ) {
-		if ( 'core/block' === $block_name ) {
-			$args['attributes'] = array_merge(
-				$args['attributes'],
-				array(
-					'overrides' => array(
-						'type' => 'object',
-					),
-				)
-			);
-		}
-		return $args;
-	}
-	add_filter( 'register_block_type_args', 'register_block_core_block_args', 10, 2 );
-}