Skip to content

Block Bindings: Fix back-compat layer #71691

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Sep 16, 2025
Merged

Block Bindings: Fix back-compat layer #71691

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ec404de
Block Bindings: Fix back-compat layer
ockham Sep 16, 2025
5a3ded2
Add backport changelog
ockham Sep 16, 2025
47f0c05
Add test coverage for the bug that this PR is fixing
ockham Sep 16, 2025
3363b02
Fix Button block regression
ockham Sep 16, 2025
6a488fe
Move down to make order a bit easier to grasp
ockham Sep 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions backport-changelog/6.9/9469.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
https://github.com/WordPress/wordpress-develop/pull/9469

* https://github.com/WordPress/gutenberg/pull/71389
* https://github.com/WordPress/gutenberg/pull/71691
26 changes: 15 additions & 11 deletions lib/compat/wordpress-6.9/block-bindings.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,26 +36,30 @@ function gutenberg_block_bindings_render_block( $block_content, $block, $instanc
return $block_content;
}

$attributes = $instance->parsed_block['attrs'];
// Process the block bindings and get attributes updated with the values from the sources.
$computed_attributes = gutenberg_process_block_bindings( $instance );
if ( empty( $computed_attributes ) ) {
return $block_content;
}

// Merge the computed attributes with the original attributes.
$instance->attributes = array_merge( $attributes, $computed_attributes );
/**
* Merge the computed attributes with the original attributes.
*
* Note that this is not a recursive merge, meaning that nested attributes --
* such as block bindings metadata -- will be completely replaced.
* This is desirable. At this point, Core has already processed any block
* bindings that it supports. What remains to be processed are only the attributes
* for which support was added later (through the `block_bindings_supported_attributes`
* filter). To do so, we'll run `$instance->render()` once more
* so the block can update its content based on those attributes.
*/
$instance->attributes = array_merge( $instance->attributes, $computed_attributes );

/**
* This filter is called from WP_Block::render(), after the block content has
* already been rendered. However, dynamic blocks expect their render() method
* to receive block attributes to have their bound values. This means that we have
* to re-render the block here.
* To do so, we'll set a flag that this filter checks when invoked to avoid infinite
* recursion. Furthermore, we can unset all of the block's bindings, as we know that
* they have been processed by the time we reach this point.
* This filter (`gutenberg_block_bindings_render_block`) is called from `WP_Block::render()`.
* To avoid infinite recursion, we set a flag that this filter checks when invoked which tells
* it to exit early.
*/
unset( $instance->parsed_block['attrs']['metadata']['bindings'] );
$inside_block_bindings_render = true;
$block_content = $instance->render();
$inside_block_bindings_render = false;
Expand Down
Loading