Changeset 58289

Timestamp:

06/03/2024 07:42:57 AM (2 years ago)

Author:

isabel_brison

Message:

Editor: Add block bindings support for a __default attribute for pattern overrides.

Adds handling for a __default block binding attribute for pattern overrides that dynamically adds support for all supported block binding attributes.

Props talldanwp, petitphp, mukesh27, isabel_brison, kevin940726.
Fixes #61333.

Location:

trunk

Files:

• src/wp-includes/class-wp-block.php (modified) (3 diffs)
• tests/phpunit/tests/block-bindings/render.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-block.php

@@ -237 +237 @@
          *
          * @since 6.5.0
+         * @since 6.6.0 Handle the `__default` attribute for pattern overrides.
          *
          * @return array The computed block attributes for the provided block bindings.
@@ -260 +261 @@
                 }
 
-                foreach ( $parsed_block['attrs']['metadata']['bindings'] as $attribute_name => $block_binding ) {
+                $bindings = $parsed_block['attrs']['metadata']['bindings'];
+
+                /*
+                 * If the default binding is set for pattern overrides, replace it
+                 * with a pattern override binding for all supported attributes.
+                 */
+                if (
+                        isset( $bindings['__default']['source'] ) &&
+                        'core/pattern-overrides' === $bindings['__default']['source']
+                ) {
+                        $updated_bindings = array();
+
+                        /*
+                         * Build a binding array of all supported attributes.
+                         * Note that this also omits the `__default` attribute from the
+                         * resulting array.
+                         */
+                        foreach ( $supported_block_attributes[ $parsed_block['blockName'] ] as $attribute_name ) {
+                                // Retain any non-pattern override bindings that might be present.
+                                $updated_bindings[ $attribute_name ] = isset( $bindings[ $attribute_name ] )
+                                        ? $bindings[ $attribute_name ]
+                                        : array( 'source' => 'core/pattern-overrides' );
+                        }
+                        $bindings = $updated_bindings;
+                }
+
+                foreach ( $bindings as $attribute_name => $block_binding ) {
                         // If the attribute is not in the supported list, process next attribute.
                         if ( ! in_array( $attribute_name, $supported_block_attributes[ $this->name ], true ) ) {
@@ -414 +441 @@
                  * the rendered HTML of all its inner blocks, including any interactive block.
                  */
-                static $root_interactive_block  = null;
+                static $root_interactive_block = null;
                 /**
                  * Filters whether Interactivity API should process directives.

trunk/tests/phpunit/tests/block-bindings/render.php

@@ -235 +235 @@
                 );
         }
+
+        /**
+         * Tests if the `__default` attribute is replaced with real attribues for
+         * pattern overrides.
+         *
+         * @ticket 61333
+         *
+         * @covers WP_Block::process_block_bindings
+         */
+        public function test_default_binding_for_pattern_overrides() {
+                $expected_content = 'This is the content value';
+
+                $block_content = <<<HTML
+<!-- wp:paragraph {"metadata":{"bindings":{"__default":{"source":"core/pattern-overrides"}},"name":"Test"}} -->
+<p>This should not appear</p>
+<!-- /wp:paragraph -->
+HTML;
+
+                $parsed_blocks = parse_blocks( $block_content );
+                $block         = new WP_Block( $parsed_blocks[0], array( 'pattern/overrides' => array( 'Test' => array( 'content' => $expected_content ) ) ) );
+                $result        = $block->render();
+
+                $this->assertSame(
+                        "<p>$expected_content</p>",
+                        trim( $result ),
+                        'The `__default` attribute should be replaced with the real attribute prior to the callback.'
+                );
+        }
 }