Changeset 57574 for trunk/src/wp-includes/class-wp-block.php

Timestamp:

02/09/2024 10:38:38 AM (12 months ago)

Author:

gziolo

Message:

Editor: Refactor block binding processing and attribute computation

Refactors the processing of block bindings into steps:

• Gets the value for each "bound" attribute from the respective source.
• Returns the computer attributes with values from the sources.
• The computed attributes get injected into block's content.
• The render_callback gets the updated list of attributes and processeded block content.

Fixes #60282.
Props czapla, gziolo, andraganescu, santosguillamot.

File:

• trunk/src/wp-includes/class-wp-block.php (modified) (9 diffs)

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

@@ -193 +193 @@
 
     /**
-     * Processes the block bindings in block's attributes.
+     * Processes the block bindings and updates the block attributes with the values from the sources.
      *
      * A block might contain bindings in its attributes. Bindings are mappings
@@ -200 +200 @@
      * retrieve a value from outside the block, e.g. from post meta.
      *
-     * This function will process those bindings and replace the HTML with the value of the binding.
-     * The value is retrieved from the source of the binding.
+     * This function will process those bindings and update the block's attributes
+     * with the values coming from the bindings.
      *
      * ### Example
@@ -229 +229 @@
      * @since 6.5.0
      *
-     * @param string $block_content Block content.
-     * @param array  $block         The full block, including name and attributes.
-     * @return string The modified block content.
-     */
-    private function process_block_bindings( $block_content ) {
+     * @return array The computed block attributes for the provided block bindings.
+     */
+    private function process_block_bindings() {
         $parsed_block = $this->parsed_block;
+
+        $computed_attributes = array();
 
         // Allowed blocks that support block bindings.
@@ -252 +252 @@
             ! is_array( $parsed_block['attrs']['metadata']['bindings'] )
         ) {
-            return $block_content;
-        }
-
-        $modified_block_content = $block_content;
+            return $computed_attributes;
+        }
+
         foreach ( $parsed_block['attrs']['metadata']['bindings'] as $attribute_name => $block_binding ) {
             // If the attribute is not in the allowed list, process next attribute.
@@ -276 +275 @@
             // If the value is not null, process the HTML based on the block and the attribute.
             if ( ! is_null( $source_value ) ) {
-                $modified_block_content = $this->replace_html( $modified_block_content, $attribute_name, $source_value );
-            }
-        }
-
-        return $modified_block_content;
+                $computed_attributes[ $attribute_name ] = $source_value;
+            }
+        }
+
+        return $computed_attributes;
     }
 
@@ -392 +391 @@
      *
      * @since 5.5.0
+     * @since 6.5.0 Added block bindings processing.
      *
      * @global WP_Post $post Global post object.
@@ -411 +411 @@
         );
 
+        // Process the block bindings and get attributes updated with the values from the sources.
+        $computed_attributes = $this->process_block_bindings();
+        if ( ! empty( $computed_attributes ) ) {
+            // Merge the computed attributes with the original attributes
+            $this->attributes = array_merge( $this->attributes, $computed_attributes );
+        }
+
         $is_dynamic    = $options['dynamic'] && $this->name && null !== $this->block_type && $this->block_type->is_dynamic();
         $block_content = '';
@@ -446 +453 @@
         }
 
+        if ( ! empty( $computed_attributes ) && ! empty( $block_content ) ) {
+            foreach ( $computed_attributes as $attribute_name => $source_value ) {
+                $block_content = $this->replace_html( $block_content, $attribute_name, $source_value );
+            }
+        }
+
         if ( $is_dynamic ) {
             $global_post = $post;
@@ -488 +501 @@
             }
         }
-
-        // Process the block bindings for this block, if any are registered. This
-        // will replace the block content with the value from a registered binding source.
-        $block_content = $this->process_block_bindings( $block_content );
 
         /**