Handle undefined attributes as null in block bindings.

WordPress · Jan 18, 2024 · c34e1ad · c34e1ad
1 parent d159752
commit c34e1ad
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 10 deletions.
diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
@@ -21,7 +21,7 @@ function gutenberg_register_pattern_support( $block_type ) {
 			'core/paragraph' => array( 'content' ),
 			'core/heading'   => array( 'content' ),
 			'core/image'     => array( 'url', 'title', 'alt' ),
-			'core/button'    => array( 'url', 'text' ),
+			'core/button'    => array( 'url', 'text', 'linkTarget' ),
 		);
 		$pattern_support = array_key_exists( $block_type->name, $allowed_blocks );
 

diff --git a/lib/experimental/block-bindings/class-wp-block-bindings.php b/lib/experimental/block-bindings/class-wp-block-bindings.php
@@ -16,6 +16,10 @@
  * Core class used to define supported blocks, register sources, and populate HTML with content from those sources.
  */
 class WP_Block_Bindings {
+	/**
+	 * A singleton flag to represent skipping processing the attribute.
+	 */
+	const SKIP = array();
 
 	/**
 	 * Holds the registered block bindings sources, keyed by source identifier.

diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
@@ -7,10 +7,10 @@
 if ( function_exists( 'wp_block_bindings_register_source' ) ) {
 	$pattern_source_callback = function ( $source_attrs, $block_instance, $attribute_name ) {
 		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
-			return null;
+			return WP_Block_Bindings::SKIP;
 		}
 		$block_id = $block_instance->attributes['metadata']['id'];
-		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
+		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), WP_Block_Bindings::SKIP );
 	};
 	wp_block_bindings_register_source(
 		'pattern_attributes',

diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
@@ -105,7 +105,7 @@ function gutenberg_process_block_bindings( $block_content, $block, $block_instan
 				'core/paragraph' => array( 'content' ),
 				'core/heading'   => array( 'content' ),
 				'core/image'     => array( 'url', 'title', 'alt' ),
-				'core/button'    => array( 'url', 'text' ),
+				'core/button'    => array( 'url', 'text', 'linkTarget' ),
 			);
 
 			// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
@@ -153,7 +153,7 @@ function gutenberg_process_block_bindings( $block_content, $block, $block_instan
 				}
 				$source_value = $source_callback( $source_args, $block_instance, $binding_attribute );
 				// If the value is null, process next attribute.
-				if ( is_null( $source_value ) ) {
+				if ( WP_Block_Bindings::SKIP === $source_value ) {
 					continue;
 				}
 

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
@@ -104,9 +104,14 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 			defaultValues[ blockId ] ??= {};
 			defaultValues[ blockId ][ attributeKey ] =
 				block.attributes[ attributeKey ];
-			if ( overrides[ blockId ]?.[ attributeKey ] !== undefined ) {
+			if (
+				overrides[ blockId ] &&
+				Object.hasOwn( overrides[ blockId ], attributeKey )
+			) {
 				newAttributes[ attributeKey ] =
-					overrides[ blockId ][ attributeKey ];
+					overrides[ blockId ][ attributeKey ] === undefined
+						? null
+						: overrides[ blockId ][ attributeKey ];
 			}
 		}
 		return {
@@ -134,10 +139,10 @@ function getOverridesFromBlocks( blocks, defaultValues ) {
 				defaultValues[ blockId ][ attributeKey ]
 			) {
 				overrides[ blockId ] ??= {};
-				// TODO: We need a way to represent `undefined` in the serialized overrides.
-				// Also see: https://github.com/WordPress/gutenberg/pull/57249#discussion_r1452987871
 				overrides[ blockId ][ attributeKey ] =
-					block.attributes[ attributeKey ];
+					block.attributes[ attributeKey ] === undefined
+						? null
+						: block.attributes[ attributeKey ];
 			}
 		}
 	}

diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
@@ -27,6 +27,7 @@ export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
 	'core/button': {
 		text: __( 'Text' ),
 		url: __( 'URL' ),
+		linkTarget: __( 'Link Target' ),
 	},
 	'core/image': {
 		url: __( 'URL' ),