From af9e04cd103ad88c118f35e6494b10aa6154af86 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Tue, 5 Dec 2023 19:26:40 +0100
Subject: [PATCH] experiment replacing inner blocks

---
 .../directive-processing.php                  | 31 ++++++++++---------
 .../directive-processing-test.php             |  2 +-
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 4ff45ef0cdd9..8bed9a46409b 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -173,35 +173,36 @@ function gutenberg_interactivity_evaluate_reference( $path, array $context = arr
  * @return string The processed HTML.
  */
 function gutenberg_process_interactive_block( $interactive_block ) {
-	$block_index = 0;
-	$content     = '';
-	$directives  = array(
+	$block_index  = 0;
+	$content      = '';
+	$directives   = array(
 		'data-wp-bind'    => 'gutenberg_interactivity_process_wp_bind',
 		'data-wp-context' => 'gutenberg_interactivity_process_wp_context',
 		'data-wp-class'   => 'gutenberg_interactivity_process_wp_class',
 		'data-wp-style'   => 'gutenberg_interactivity_process_wp_style',
 		'data-wp-text'    => 'gutenberg_interactivity_process_wp_text',
 	);
+	$inner_blocks = array();
 
 	foreach ( $interactive_block['innerContent'] as $inner_content ) {
 		if ( is_string( $inner_content ) ) {
-			// This content belongs to an interactive block and therefore can contain
-			// directives.
-			$tags = new WP_Directive_Processor( $inner_content );
-			$tags->process_rendered_html( $tags, 'data-wp-', $directives );
-			$content .= $tags->get_updated_html();
+			$content .= $inner_content;
 		} else {
 			// This is an inner block. It may be an interactive block or a
 			// non-interactive block.
-			$inner_block  = $interactive_block['innerBlocks'][ $block_index ];
-			$block_index += 1;
-			if ( 'core/interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_interactive_block( $inner_block );
-			} elseif ( 'core/non-interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_non_interactive_block( $inner_block );
-			}
+			$content       .= '<wp-inner-blocks-' . $block_index . '></wp-inner-blocks-' . $block_index . '>';
+			$inner_blocks[] = $interactive_block['innerBlocks'][ $block_index ];
+			$block_index   += 1;
 		}
 	}
+	$tags = new WP_Directive_Processor( $content );
+	$tags->process_rendered_html( $tags, 'data-wp-', $directives );
+	$content = $tags->get_updated_html();
+	if ( ! empty( $inner_blocks ) ) {
+		$content = str_replace( '<wp-inner-blocks-' . ( $block_index - 1 ) . '></wp-inner-blocks-' . ( $block_index - 1 ) . '>', gutenberg_process_interactive_block( $inner_blocks[0] ), $content );
+		array_shift( $inner_blocks );
+	}
+
 	return $content;
 }
 
diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index 8f2446d655a0..f01298c84403 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -166,7 +166,7 @@ public function test_directive_processing_child_blocks() {
 
 		$content         = get_the_content( null, false, $post );
 		$rendered_blocks = do_blocks( $content );
-		$expected        = '<div class="wp-block-group"><div class="wp-block-group__inner-container is-layout-constrained wp-block-group-is-layout-constrained"><div data-wp-interactive=\'{"namespace": "gutenberg"}\' data-wp-context=\'{"MyText": "hello" }\'><p data-wp-text=\'context.MyText\'>hello</p></div></div></div>';
+		$expected        = '<div class="wp-block-group is-layout-constrained wp-block-group-is-layout-constrained"><div data-wp-interactive=\'{"namespace": "gutenberg"}\' data-wp-context=\'{"MyText": "hello" }\'><p data-wp-text=\'context.MyText\'>hello</p></div></div>';
 		$this->assertSame( $expected, $rendered_blocks );
 
 		unregister_block_type( 'gutenberg/test-context' );