Changeset 61009 for trunk/src/wp-includes/blocks/block.php

Timestamp:

10/21/2025 07:11:53 AM (3 months ago)

Author:

ellatrix

Message:

Editor: update packages.

Updates the packages to match Gutenberg version 21.9.0 RC2.

Also updates the sync script to work with the new package-lock.json format.
Some reusable block tests were adjusted to work with more render arguments.
Added core-data to the ignore list for verify:source-maps because Yjs has been bundled by accident. To be removed in a follow-up. See https://core.trac.wordpress.org/ticket/64120. See ​https://github.com/WordPress/gutenberg/pull/72503.

See: ​https://github.com/WordPress/wordpress-develop/pull/10355.
See: https://core.trac.wordpress.org/ticket/64117.

Props ellatrix, dmsnell.
Fixes #64117.

File:

• trunk/src/wp-includes/blocks/block.php (modified) (3 diffs)

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

@@ -1 @@
-<?php
+<?php // phpcs:ignore WordPress.Files.FileName.InvalidClassFileName // Needed for WP_Block_Cloner helper class.
 /**
  * Server-side rendering of the `core/block` block.
@@ -17 +17 @@
  * @return string Rendered HTML of the referenced block.
  */
-function render_block_core_block( $attributes ) {
+function render_block_core_block( $attributes, $content, $block_instance ) {
     static $seen_refs = array();
 
@@ -74 +74 @@
     }
 
-    /**
-     * 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.
-     */
-    $has_pattern_overrides = isset( $attributes['content'] ) && null !== get_block_bindings_source( 'core/pattern-overrides' );
-    if ( $has_pattern_overrides ) {
-        $filter_block_context = static function ( $context ) use ( $attributes ) {
-            $context['pattern/overrides'] = $attributes['content'];
-            return $context;
-        };
-        add_filter( 'render_block_context', $filter_block_context, 1 );
-    }
-
     // Apply Block Hooks.
     $content = apply_block_hooks_to_content_from_post_object( $content, $reusable_block );
 
-    $content = do_blocks( $content );
+    /**
+     * We attach the blocks from $content as inner blocks to the Synced Pattern block instance.
+     * This ensures that block context available to the Synced Pattern block instance is provided to
+     * those blocks.
+     */
+    $block_instance->parsed_block['innerBlocks']  = parse_blocks( $content );
+    $block_instance->parsed_block['innerContent'] = array_fill( 0, count( $block_instance->parsed_block['innerBlocks'] ), null );
+    if ( method_exists( $block_instance, 'refresh_context_dependents' ) ) {
+        // WP_Block::refresh_context_dependents() was introduced in WordPress 6.8.
+        $block_instance->refresh_context_dependents();
+    } else {
+        // This branch can be removed once Gutenberg requires WordPress 6.8 or later.
+        if ( ! class_exists( 'WP_Block_Cloner' ) ) {
+            // phpcs:ignore Gutenberg.Commenting.SinceTag.MissingClassSinceTag
+            class WP_Block_Cloner extends WP_Block {
+                /**
+                 * Static methods of subclasses have access to protected properties
+                 * of instances of the parent class.
+                 * In this case, this gives us access to `available_context` and `registry`.
+                 */
+                // phpcs:ignore Gutenberg.Commenting.SinceTag.MissingMethodSinceTag
+                public static function clone_instance( $instance ) {
+                    return new WP_Block(
+                        $instance->parsed_block,
+                        $instance->available_context,
+                        $instance->registry
+                    );
+                }
+            }
+        }
+        $block_instance = WP_Block_Cloner::clone_instance( $block_instance );
+    }
+
+    $content = $block_instance->render( array( 'dynamic' => false ) );
     unset( $seen_refs[ $attributes['ref'] ] );
-
-    if ( $has_pattern_overrides ) {
-        remove_filter( 'render_block_context', $filter_block_context, 1 );
-    }
 
     return $content;