From b5451467968b3d2d7c987cbb2e44841bdf902ad4 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Fri, 17 Nov 2023 17:27:47 +0100
Subject: [PATCH 01/27] Initial commit

---
 .../class-wp-directive-processor.php          | 55 ++++++++++++++++-
 .../directive-processing.php                  | 61 +++++++++++++++++++
 2 files changed, 114 insertions(+), 2 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index e717b2e553943..253d2d98306cc 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -23,9 +23,9 @@
 class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_4 {
 
 	/**
-	 * An array of root blocks.
+	 * A string containing the main root block.
 	 *
-	 * @var array
+	 * @var string
 	 */
 	public static $root_block = null;
 
@@ -70,6 +70,57 @@ public static function has_root_block() {
 	}
 
 
+
+	/**
+	 * A string containing the main children of interactive.
+	 *
+	 * @var string
+	 */
+	public static $children_of_interactive_block = null;
+
+
+		/**
+		 * Add a root block to the variable.
+		 *
+		 * @param array $block The block to add.
+		 *
+		 * @return void
+		 */
+	public static function mark_children_of_interactive_block( $block ) {
+		self::$children_of_interactive_block = md5( serialize( $block ) );
+	}
+
+	/**
+	 * Remove a root block to the variable.
+	 *
+	 * @return void
+	 */
+	public static function unmark_children_of_interactive_block() {
+		self::$children_of_interactive_block = null;
+	}
+
+	/**
+	 * Check if block is a root block.
+	 *
+	 * @param array $block The block to check.
+	 *
+	 * @return bool True if block is a root block, false otherwise.
+	 */
+	public static function is_marked_as_children_of_interactive_block( $block ) {
+		return md5( serialize( $block ) ) === self::$children_of_interactive_block;
+	}
+
+	/**
+	 * Check if a root block has already been defined.
+	 *
+	 * @return bool True if block is a root block, false otherwise.
+	 */
+	public static function has_children_of_interactive_block() {
+		return isset( self::$children_of_interactive_block );
+	}
+
+
+
 	/**
 	 * Find the matching closing tag for an opening tag.
 	 *
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 064fc8ea62cbb..09c68a75ad355 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -7,6 +7,8 @@
  * @subpackage Interactivity API
  */
 
+global $children_of_interactive_block;
+$children_of_interactive_block = array();
 /**
  * Mark if the block is a root block. Checks that there is already a root block
  * in order not to mark template-parts or synced patterns as root blocks, where
@@ -56,6 +58,65 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 }
 add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 );
 
+/**
+ * Creates a stack of interactive block children.
+ *
+ * @param array    $parsed_block The parsed block.
+ * @param array    $source_block The source block.
+ * @param WP_Block $parent_block The parent block.
+ */
+function gutenberg_mark_interactive_block_children( $parsed_block, $source_block, $parent_block ) {
+	if (
+			isset( $parent_block ) &&
+			isset( $parent_block->block_type->supports['interactivity'] ) &&
+			$parent_block->block_type->supports['interactivity']
+		) {
+		WP_Directive_Processor::mark_children_of_interactive_block( $source_block );
+	}
+	return $parsed_block;
+}
+add_filter( 'render_block_data', 'gutenberg_mark_interactive_block_children', 100, 3 );
+
+
+/**
+ * Add a marker indicating if the block is interactive or not.
+ * core/interactivity-wrapper if it is interactive.
+ * core/non-interactivity-wrapper if it is not interactive.
+ *
+ * @param string   $block_content The block content.
+ * @param array    $block The full block, including name and attributes.
+ * @param WP_Block $block_instance The block instance.
+ */
+function gutenberg_mark_block_interactivity( $block_content, $block, $block_instance ) {
+	if (
+			isset( $block_instance->block_type->supports['interactivity'] ) &&
+			$block_instance->block_type->supports['interactivity']
+		) {
+		WP_Directive_Processor::unmark_children_of_interactive_block();
+		// Mark interactive blocks so we can process them later.
+		return get_comment_delimited_block_content(
+			'core/interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+				// We can put extra information about the block here.
+			),
+			$block_content
+		);
+	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
+		// Mark children of interactive blocks that are not interactive themselves
+		// to so we can skip them later.
+		WP_Directive_Processor::unmark_children_of_interactive_block();
+		return get_comment_delimited_block_content(
+			'core/non-interactivity-wrapper',
+			array(),
+			$block_content
+		);
+	}
+
+		return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_mark_block_interactivity', 10, 3 );
 
 /**
  * Resolve the reference using the store and the context from the provided path.

From 296f237589b7f646325c1e07775c8a1f234b5861 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 18 Nov 2023 13:33:09 +0100
Subject: [PATCH 02/27] It works, but is stripping comments

---
 .../class-wp-directive-processor.php             | 16 +++++++++-------
 .../interactivity-api/directive-processing.php   |  9 ++++-----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 253d2d98306cc..cb00a0231bd42 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -72,11 +72,11 @@ public static function has_root_block() {
 
 
 	/**
-	 * A string containing the main children of interactive.
+	 * An array containing the main children of interactive.
 	 *
-	 * @var string
+	 * @var array
 	 */
-	public static $children_of_interactive_block = null;
+	public static $children_of_interactive_block = array();
 
 
 		/**
@@ -87,16 +87,18 @@ public static function has_root_block() {
 		 * @return void
 		 */
 	public static function mark_children_of_interactive_block( $block ) {
-		self::$children_of_interactive_block = md5( serialize( $block ) );
+		self::$children_of_interactive_block[] = md5( serialize( $block ) );
 	}
 
 	/**
 	 * Remove a root block to the variable.
 	 *
+	 * @param array $block The block to remove.
+	 *
 	 * @return void
 	 */
-	public static function unmark_children_of_interactive_block() {
-		self::$children_of_interactive_block = null;
+	public static function unmark_children_of_interactive_block( $block ) {
+		self::$children_of_interactive_block = array_diff( self::$children_of_interactive_block, array( md5( serialize( $block ) ) ) );
 	}
 
 	/**
@@ -107,7 +109,7 @@ public static function unmark_children_of_interactive_block() {
 	 * @return bool True if block is a root block, false otherwise.
 	 */
 	public static function is_marked_as_children_of_interactive_block( $block ) {
-		return md5( serialize( $block ) ) === self::$children_of_interactive_block;
+		return in_array( md5( serialize( $block ) ), self::$children_of_interactive_block, true );
 	}
 
 	/**
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 09c68a75ad355..812c9c6f6afe0 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -92,7 +92,6 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 			isset( $block_instance->block_type->supports['interactivity'] ) &&
 			$block_instance->block_type->supports['interactivity']
 		) {
-		WP_Directive_Processor::unmark_children_of_interactive_block();
 		// Mark interactive blocks so we can process them later.
 		return get_comment_delimited_block_content(
 			'core/interactivity-wrapper',
@@ -105,10 +104,10 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
 		// Mark children of interactive blocks that are not interactive themselves
 		// to so we can skip them later.
-		WP_Directive_Processor::unmark_children_of_interactive_block();
-		return get_comment_delimited_block_content(
-			'core/non-interactivity-wrapper',
-			array(),
+		WP_Directive_Processor::unmark_children_of_interactive_block( $block );
+		return sprintf(
+			'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
+			// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
 			$block_content
 		);
 	}

From 4adc34c8787a69a1c12ee413b54d364b30d25c23 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 18 Nov 2023 13:36:39 +0100
Subject: [PATCH 03/27] Added an extra return for debugging

---
 .../directive-processing.php                  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 812c9c6f6afe0..b50b0dda3b0a5 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -105,11 +105,24 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 		// Mark children of interactive blocks that are not interactive themselves
 		// to so we can skip them later.
 		WP_Directive_Processor::unmark_children_of_interactive_block( $block );
-		return sprintf(
-			'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
-			// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
+		return get_comment_delimited_block_content(
+			'core/interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+				// We can put extra information about the block here.
+			),
 			$block_content
 		);
+		/**
+		 * Debugging purposes only.
+		 */
+			return sprintf(
+				'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
+				// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
+				// $block['blockName'],
+				$block_content
+			);
+
 	}
 
 		return $block_content;

From b7185a3c3ff646ce1d139dfdf78230fc0d2383a0 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 18 Nov 2023 14:10:55 +0100
Subject: [PATCH 04/27] Refactor to use string instead of arrays to compare

---
 .../class-wp-directive-processor.php          | 30 +++++--------------
 .../directive-processing.php                  | 21 ++++++-------
 2 files changed, 18 insertions(+), 33 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index cb00a0231bd42..31037f1981a89 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -69,15 +69,12 @@ public static function has_root_block() {
 		return isset( self::$root_block );
 	}
 
-
-
 	/**
-	 * An array containing the main children of interactive.
+	 * A string containing the main children of interactive.
 	 *
-	 * @var array
+	 * @var string
 	 */
-	public static $children_of_interactive_block = array();
-
+	public static $children_of_interactive_block = null;
 
 		/**
 		 * Add a root block to the variable.
@@ -87,18 +84,16 @@ public static function has_root_block() {
 		 * @return void
 		 */
 	public static function mark_children_of_interactive_block( $block ) {
-		self::$children_of_interactive_block[] = md5( serialize( $block ) );
+		self::$children_of_interactive_block = md5( serialize( $block ) );
 	}
 
 	/**
 	 * Remove a root block to the variable.
 	 *
-	 * @param array $block The block to remove.
-	 *
 	 * @return void
 	 */
-	public static function unmark_children_of_interactive_block( $block ) {
-		self::$children_of_interactive_block = array_diff( self::$children_of_interactive_block, array( md5( serialize( $block ) ) ) );
+	public static function unmark_children_of_interactive_block() {
+		self::$children_of_interactive_block = null;
 	}
 
 	/**
@@ -109,20 +104,9 @@ public static function unmark_children_of_interactive_block( $block ) {
 	 * @return bool True if block is a root block, false otherwise.
 	 */
 	public static function is_marked_as_children_of_interactive_block( $block ) {
-		return in_array( md5( serialize( $block ) ), self::$children_of_interactive_block, true );
-	}
-
-	/**
-	 * Check if a root block has already been defined.
-	 *
-	 * @return bool True if block is a root block, false otherwise.
-	 */
-	public static function has_children_of_interactive_block() {
-		return isset( self::$children_of_interactive_block );
+		return md5( serialize( $block ) ) === self::$children_of_interactive_block;
 	}
 
-
-
 	/**
 	 * Find the matching closing tag for an opening tag.
 	 *
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index b50b0dda3b0a5..2850840c4f9e5 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -104,7 +104,17 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
 		// Mark children of interactive blocks that are not interactive themselves
 		// to so we can skip them later.
-		WP_Directive_Processor::unmark_children_of_interactive_block( $block );
+		WP_Directive_Processor::unmark_children_of_interactive_block();
+
+		/**
+		 * Debugging purposes only. It seems that comments are being stripped.
+		 */
+		return sprintf(
+			'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
+			// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
+			// $block['blockName'],
+			$block_content
+		);
 		return get_comment_delimited_block_content(
 			'core/interactivity-wrapper',
 			array(
@@ -113,15 +123,6 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 			),
 			$block_content
 		);
-		/**
-		 * Debugging purposes only.
-		 */
-			return sprintf(
-				'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
-				// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
-				// $block['blockName'],
-				$block_content
-			);
 
 	}
 

From 4116193d2195135e316115dcdfc6387e7b4edc70 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 18 Nov 2023 15:53:11 +0100
Subject: [PATCH 05/27] Use hidden textarea to save comments in production html

---
 .../directive-processing.php                  | 22 +++++++++----------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 2850840c4f9e5..28d42553f9ca2 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -77,7 +77,6 @@ function gutenberg_mark_interactive_block_children( $parsed_block, $source_block
 }
 add_filter( 'render_block_data', 'gutenberg_mark_interactive_block_children', 100, 3 );
 
-
 /**
  * Add a marker indicating if the block is interactive or not.
  * core/interactivity-wrapper if it is interactive.
@@ -107,23 +106,22 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 		WP_Directive_Processor::unmark_children_of_interactive_block();
 
 		/**
-		 * Debugging purposes only. It seems that comments are being stripped.
+		 * Debugging purposes only. Nested comments are not allowed.
+		 * We wrap a hidden textarea to save the block content delimited
+		 * by comments so we can later process it.
 		 */
 		return sprintf(
-			'<br class="non-interactive-start" /> %s <br class="non-interactive-end" />',
-			// '<!-- wp:non-interactivity-wrapper {"blockName":"%s"} -->%s<!-- /wp:non-interactivity-wrapper -->',
-			// $block['blockName'],
-			$block_content
-		);
-		return get_comment_delimited_block_content(
-			'core/interactivity-wrapper',
-			array(
-				'blockName' => $block['blockName'],
+			'<textarea style="display:none"> %1s </textarea> %2s',
+			get_comment_delimited_block_content(
+				'core/non-interactivity-wrapper',
+				array(
+					'blockName' => $block['blockName'],
 				// We can put extra information about the block here.
+				),
+				$block_content
 			),
 			$block_content
 		);
-
 	}
 
 		return $block_content;

From 585e8fd023f7a30ca2843a22f3dbea8e7224b1d8 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Sat, 18 Nov 2023 17:20:55 +0100
Subject: [PATCH 06/27] Use divs as delimiters, comments not working for
 interactive innner components

---
 .../directive-processing.php                  | 23 +++++++------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 28d42553f9ca2..c79420c4c5a20 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -92,12 +92,13 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 			$block_instance->block_type->supports['interactivity']
 		) {
 		// Mark interactive blocks so we can process them later.
-		return get_comment_delimited_block_content(
-			'core/interactivity-wrapper',
-			array(
-				'blockName' => $block['blockName'],
-				// We can put extra information about the block here.
-			),
+		/**
+		 * Debugging purposes only. Nested comments are not allowed.
+		 * We wrap a hidden textarea to save the block content delimited
+		 * by comments so we can later process it.
+		 */
+		return sprintf(
+			'<div data-wp-delimiter="interactivity-wrapper-start" style="display:none"></div>%s<div data-wp-delimiter="interactivity-wrapper-end" style="display:none"></div>',
 			$block_content
 		);
 	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
@@ -111,15 +112,7 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 		 * by comments so we can later process it.
 		 */
 		return sprintf(
-			'<textarea style="display:none"> %1s </textarea> %2s',
-			get_comment_delimited_block_content(
-				'core/non-interactivity-wrapper',
-				array(
-					'blockName' => $block['blockName'],
-				// We can put extra information about the block here.
-				),
-				$block_content
-			),
+			'<div data-wp-delimiter="non-interactivity-wrapper-start" style="display:none"></div>%s<div data-wp-delimiter="non-interactivity-wrapper-end" style="display:none"></div>',
 			$block_content
 		);
 	}

From ca33458b9c8a5faa27381a9431b838b6e62b1c2c Mon Sep 17 00:00:00 2001
From: Carlos Bravo <carlos.bravo@automattic.com>
Date: Tue, 28 Nov 2023 19:02:37 +0100
Subject: [PATCH 07/27] Back to array for references and comment delimiters

---
 .../class-wp-directive-processor.php          | 31 ++++++------
 .../directive-processing.php                  | 47 ++++++++-----------
 2 files changed, 36 insertions(+), 42 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 31037f1981a89..1fec096891ba5 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -70,30 +70,31 @@ public static function has_root_block() {
 	}
 
 	/**
-	 * A string containing the main children of interactive.
+	 * An array containing the main children of interactive.
 	 *
-	 * @var string
+	 * @var array
+	 */
+	public static $children_of_interactive_block = array();
+
+	/**
+	 * Add a root block to the variable.
+	 *
+	 * @param array $block The block to add.
+	 *
+	 * @return void
 	 */
-	public static $children_of_interactive_block = null;
-
-		/**
-		 * Add a root block to the variable.
-		 *
-		 * @param array $block The block to add.
-		 *
-		 * @return void
-		 */
 	public static function mark_children_of_interactive_block( $block ) {
-		self::$children_of_interactive_block = md5( serialize( $block ) );
+		self::$children_of_interactive_block[] = md5( serialize( $block ) );
 	}
 
 	/**
 	 * Remove a root block to the variable.
 	 *
+	 * @param array $block The block to remove.
 	 * @return void
 	 */
-	public static function unmark_children_of_interactive_block() {
-		self::$children_of_interactive_block = null;
+	public static function unmark_children_of_interactive_block( $block ) {
+		self::$children_of_interactive_block = array_diff( self::$children_of_interactive_block, array( md5( serialize( $block ) ) ) );
 	}
 
 	/**
@@ -104,7 +105,7 @@ public static function unmark_children_of_interactive_block() {
 	 * @return bool True if block is a root block, false otherwise.
 	 */
 	public static function is_marked_as_children_of_interactive_block( $block ) {
-		return md5( serialize( $block ) ) === self::$children_of_interactive_block;
+		return in_array( md5( serialize( $block ) ), self::$children_of_interactive_block, true );
 	}
 
 	/**
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index c79420c4c5a20..a85f03999a42d 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -7,8 +7,6 @@
  * @subpackage Interactivity API
  */
 
-global $children_of_interactive_block;
-$children_of_interactive_block = array();
 /**
  * Mark if the block is a root block. Checks that there is already a root block
  * in order not to mark template-parts or synced patterns as root blocks, where
@@ -88,36 +86,32 @@ function gutenberg_mark_interactive_block_children( $parsed_block, $source_block
  */
 function gutenberg_mark_block_interactivity( $block_content, $block, $block_instance ) {
 	if (
-			isset( $block_instance->block_type->supports['interactivity'] ) &&
-			$block_instance->block_type->supports['interactivity']
-		) {
+		isset( $block_instance->block_type->supports['interactivity'] ) &&
+		$block_instance->block_type->supports['interactivity']
+	) {
 		// Mark interactive blocks so we can process them later.
-		/**
-		 * Debugging purposes only. Nested comments are not allowed.
-		 * We wrap a hidden textarea to save the block content delimited
-		 * by comments so we can later process it.
-		 */
-		return sprintf(
-			'<div data-wp-delimiter="interactivity-wrapper-start" style="display:none"></div>%s<div data-wp-delimiter="interactivity-wrapper-end" style="display:none"></div>',
+		return get_comment_delimited_block_content(
+			'core/interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+			// We can put extra information about the block here.
+			),
 			$block_content
 		);
 	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
+		WP_Directive_Processor::unmark_children_of_interactive_block( $block );
 		// Mark children of interactive blocks that are not interactive themselves
 		// to so we can skip them later.
-		WP_Directive_Processor::unmark_children_of_interactive_block();
-
-		/**
-		 * Debugging purposes only. Nested comments are not allowed.
-		 * We wrap a hidden textarea to save the block content delimited
-		 * by comments so we can later process it.
-		 */
-		return sprintf(
-			'<div data-wp-delimiter="non-interactivity-wrapper-start" style="display:none"></div>%s<div data-wp-delimiter="non-interactivity-wrapper-end" style="display:none"></div>',
+		return get_comment_delimited_block_content(
+			'core/non-interactivity-wrapper',
+			array(
+				'blockName' => $block['blockName'],
+				// We can put extra information about the block here.
+			),
 			$block_content
 		);
 	}
-
-		return $block_content;
+	return $block_content;
 }
 
 add_filter( 'render_block', 'gutenberg_mark_block_interactivity', 10, 3 );
@@ -141,10 +135,9 @@ function gutenberg_interactivity_evaluate_reference( $path, array $context = arr
 	 * passed context) using the subsequent path should be negated.
 	 */
 	$should_negate_value = '!' === $path[0];
-
-	$path          = $should_negate_value ? substr( $path, 1 ) : $path;
-	$path_segments = explode( '.', $path );
-	$current       = $store;
+	$path                = $should_negate_value ? substr( $path, 1 ) : $path;
+	$path_segments       = explode( '.', $path );
+	$current             = $store;
 	foreach ( $path_segments as $p ) {
 		if ( isset( $current[ $p ] ) ) {
 			$current = $current[ $p ];

From 0c4d2e25fceac05ccf6746d4aef8d4b1a0478eac Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Wed, 29 Nov 2023 18:24:29 +0100
Subject: [PATCH 08/27] Restore changes from `store()` migration PR

---
 .../class-wp-interactivity-initial-state.php  |  85 ++++++++
 .../class-wp-interactivity-store.php          |  69 -------
 .../directive-processing.php                  |   2 +-
 .../interactivity-api/initial-state.php       |  29 +++
 lib/experimental/interactivity-api/store.php  |  28 ---
 lib/load.php                                  |   4 +-
 ...ss-wp-interactivity-initial-state-test.php | 111 +++++++++++
 .../class-wp-interactivity-store-test.php     | 186 ------------------
 8 files changed, 228 insertions(+), 286 deletions(-)
 create mode 100644 lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
 delete mode 100644 lib/experimental/interactivity-api/class-wp-interactivity-store.php
 create mode 100644 lib/experimental/interactivity-api/initial-state.php
 delete mode 100644 lib/experimental/interactivity-api/store.php
 create mode 100644 phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php

diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
new file mode 100644
index 0000000000000..a1edbcff776fb
--- /dev/null
+++ b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * WP_Interactivity_Initial_State class
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+if ( class_exists( 'WP_Interactivity_Initial_State' ) ) {
+	return;
+}
+
+/**
+ * Manages the initial state of the Interactivity API store in the server and
+ * its serialization so it can be restored in the browser upon hydration.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+class WP_Interactivity_Initial_State {
+	/**
+	 * Map of initial state by namespace.
+	 *
+	 * @var array
+	 */
+	private static $initial_state = array();
+
+	/**
+	 * Get state from a given namespace.
+	 *
+	 * @param string $store_ns Namespace.
+	 *
+	 * @return array The requested state.
+	 */
+	public static function get_state( $store_ns = null ) {
+		if ( ! $store_ns ) {
+			return self::$initial_state;
+		}
+		return self::$initial_state[ $store_ns ] ?? array();
+	}
+
+	/**
+	 * Merge data into the state with the given namespace.
+	 *
+	 * @param string $store_ns Namespace.
+	 * @param array  $data      State to merge.
+	 *
+	 * @return void
+	 */
+	public static function merge_state( $store_ns, $data ) {
+		self::$initial_state[ $store_ns ] = array_replace_recursive(
+			self::get_state( $store_ns ),
+			$data
+		);
+	}
+
+	/**
+	 * Get store data.
+	 *
+	 * @return array
+	 */
+	public static function get_data() {
+		return self::$initial_state;
+	}
+
+	/**
+	 * Reset the initial state.
+	 */
+	public static function reset() {
+		self::$initial_state = array();
+	}
+
+	/**
+	 * Render the initial state.
+	 */
+	public static function render() {
+		if ( empty( self::$initial_state ) ) {
+			return;
+		}
+		echo sprintf(
+			'<script id="wp-interactivity-initial-state" type="application/json">%s</script>',
+			wp_json_encode( self::$initial_state, JSON_HEX_TAG | JSON_HEX_AMP )
+		);
+	}
+}
diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-store.php b/lib/experimental/interactivity-api/class-wp-interactivity-store.php
deleted file mode 100644
index c53701b14e8af..0000000000000
--- a/lib/experimental/interactivity-api/class-wp-interactivity-store.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * WP_Interactivity_Store class
- *
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Interactivity_Store' ) ) {
-	return;
-}
-
-/**
- * Manages the initial state of the Interactivity API store in the server and
- * its serialization so it can be restored in the browser upon hydration.
- *
- * It's a private class, exposed by other functions, like `wp_store`.
- *
- * @access private
- */
-class WP_Interactivity_Store {
-	/**
-	 * Store.
-	 *
-	 * @var array
-	 */
-	private static $store = array();
-
-	/**
-	 * Get store data.
-	 *
-	 * @return array
-	 */
-	public static function get_data() {
-		return self::$store;
-	}
-
-	/**
-	 * Merge data.
-	 *
-	 * @param array $data The data that will be merged with the existing store.
-	 */
-	public static function merge_data( $data ) {
-		self::$store = array_replace_recursive( self::$store, $data );
-	}
-
-	/**
-	 * Reset the store data.
-	 */
-	public static function reset() {
-		self::$store = array();
-	}
-
-	/**
-	 * Render the store data.
-	 */
-	public static function render() {
-		if ( empty( self::$store ) ) {
-			return;
-		}
-		echo sprintf(
-			'<script id="wp-interactivity-initial-state" type="application/json">%s</script>',
-			wp_json_encode( self::$store, JSON_HEX_TAG | JSON_HEX_AMP )
-		);
-	}
-}
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 064fc8ea62cbb..a2f00d624bd20 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -66,7 +66,7 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
  */
 function gutenberg_interactivity_evaluate_reference( $path, array $context = array() ) {
 	$store = array_merge(
-		WP_Interactivity_Store::get_data(),
+		WP_Interactivity_Initial_State::get_state(),
 		array( 'context' => $context )
 	);
 
diff --git a/lib/experimental/interactivity-api/initial-state.php b/lib/experimental/interactivity-api/initial-state.php
new file mode 100644
index 0000000000000..a38d0da631f3c
--- /dev/null
+++ b/lib/experimental/interactivity-api/initial-state.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Functions to expose the store of the WP_Interactivity_Initial_State class.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+if ( ! function_exists( 'wp_initial_state' ) ) {
+	/**
+	 * Merge data into the state with the given namespace.
+	 *
+	 * @param string $store_ns  Namespace.
+	 * @param array  $data      State to merge.
+	 *
+	 * @return array The current state for the given namespace.
+	 */
+	function wp_initial_state( $store_ns, $data = null ) {
+		if ( $data ) {
+			WP_Interactivity_Initial_State::merge_state( $store_ns, $data );
+		}
+		return WP_Interactivity_Initial_State::get_state( $store_ns );
+	}
+
+	/**
+	 * Render the Interactivity API initial state in the frontend.
+	 */
+	add_action( 'wp_footer', array( 'WP_Interactivity_Initial_State', 'render' ), 8 );
+}
diff --git a/lib/experimental/interactivity-api/store.php b/lib/experimental/interactivity-api/store.php
deleted file mode 100644
index 05c8b35f780d4..0000000000000
--- a/lib/experimental/interactivity-api/store.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Functions to expose the store of the WP_Interactivity_Store class.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( ! function_exists( 'wp_store' ) ) {
-	/**
-	 * Merge data with the existing store.
-	 *
-	 * @param array $data Data that will be merged with the existing store.
-	 *
-	 * @return $data The current store data.
-	 */
-	function wp_store( $data = null ) {
-		if ( $data ) {
-			WP_Interactivity_Store::merge_data( $data );
-		}
-		return WP_Interactivity_Store::get_data();
-	}
-}
-
-/**
- * Render the Interactivity API store in the frontend.
- */
-add_action( 'wp_footer', array( 'WP_Interactivity_Store', 'render' ), 8 );
diff --git a/lib/load.php b/lib/load.php
index 5da1a1126da26..54408b636548e 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -113,8 +113,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
 }
 
-require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-store.php';
-require __DIR__ . '/experimental/interactivity-api/store.php';
+require __DIR__ . '/experimental/interactivity-api/class-wp-interactivity-initial-state.php';
+require __DIR__ . '/experimental/interactivity-api/initial-state.php';
 require __DIR__ . '/experimental/interactivity-api/modules.php';
 require __DIR__ . '/experimental/interactivity-api/class-wp-directive-processor.php';
 require __DIR__ . '/experimental/interactivity-api/class-wp-directive-context.php';
diff --git a/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php b/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
new file mode 100644
index 0000000000000..ece4ee9c39f01
--- /dev/null
+++ b/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
@@ -0,0 +1,111 @@
+<?php
+/**
+ * `WP_Interactivity_Initial_State` class test.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Tests for the `WP_Interactivity_Initial_State` class.
+ *
+ * @group  interactivity-api
+ * @covers WP_Interactivity_Initial_State
+ */
+class WP_Interactivity_Initial_State_Test extends WP_UnitTestCase {
+	public function set_up() {
+		// Clear the state before each test.
+		WP_Interactivity_Initial_State::reset();
+	}
+
+	public function test_initial_state_should_be_empty() {
+		$this->assertEmpty( WP_Interactivity_Initial_State::get_data() );
+	}
+
+	public function test_initial_state_can_be_merged() {
+		$state = array(
+			'a'      => 1,
+			'b'      => 2,
+			'nested' => array(
+				'c' => 3,
+			),
+		);
+		WP_Interactivity_Initial_State::merge_state( 'core', $state );
+		$this->assertSame( $state, WP_Interactivity_Initial_State::get_state( 'core' ) );
+	}
+
+	public function test_initial_state_can_be_extended() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'b' => 2 ) );
+		WP_Interactivity_Initial_State::merge_state( 'custom', array( 'c' => 3 ) );
+		$this->assertSame(
+			array(
+				'core'   => array(
+					'a' => 1,
+					'b' => 2,
+				),
+				'custom' => array(
+					'c' => 3,
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_existing_props_should_be_overwritten() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 'overwritten' ) );
+		$this->assertSame(
+			array(
+				'core' => array(
+					'a' => 'overwritten',
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_existing_indexed_arrays_should_be_replaced() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => array( 1, 2 ) ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => array( 3, 4 ) ) );
+		$this->assertSame(
+			array(
+				'core' => array(
+					'a' => array( 3, 4 ),
+				),
+			),
+			WP_Interactivity_Initial_State::get_data()
+		);
+	}
+
+	public function test_initial_state_should_be_correctly_rendered() {
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'a' => 1 ) );
+		WP_Interactivity_Initial_State::merge_state( 'core', array( 'b' => 2 ) );
+		WP_Interactivity_Initial_State::merge_state( 'custom', array( 'c' => 3 ) );
+
+		ob_start();
+		WP_Interactivity_Initial_State::render();
+		$rendered = ob_get_clean();
+		$this->assertSame(
+			'<script id="wp-interactivity-initial-state" type="application/json">{"core":{"a":1,"b":2},"custom":{"c":3}}</script>',
+			$rendered
+		);
+	}
+
+	public function test_initial_state_should_also_escape_tags_and_amps() {
+		WP_Interactivity_Initial_State::merge_state(
+			'test',
+			array(
+				'amps' => 'http://site.test/?foo=1&baz=2&bar=3',
+				'tags' => 'Do not do this: <!-- <script>',
+			)
+		);
+		ob_start();
+		WP_Interactivity_Initial_State::render();
+		$rendered = ob_get_clean();
+		$this->assertSame(
+			'<script id="wp-interactivity-initial-state" type="application/json">{"test":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2\u0026bar=3","tags":"Do not do this: \u003C!-- \u003Cscript\u003E"}}</script>',
+			$rendered
+		);
+	}
+}
diff --git a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php b/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
deleted file mode 100644
index 837d6fd50f193..0000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-interactivity-store-test.php
+++ /dev/null
@@ -1,186 +0,0 @@
-<?php
-/**
- * `WP_Interactivity_Store` class test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the `WP_Interactivity_Store` class.
- *
- * @group  interactivity-api
- * @covers WP_Interactivity_Store
- */
-class WP_Interactivity_Store_Test extends WP_UnitTestCase {
-	public function set_up() {
-		// Clear the state before each test.
-		WP_Interactivity_Store::reset();
-	}
-
-	public function test_store_should_be_empty() {
-		$this->assertEmpty( WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_merged() {
-		$data = array(
-			'state' => array(
-				'core' => array(
-					'a'      => 1,
-					'b'      => 2,
-					'nested' => array(
-						'c' => 3,
-					),
-				),
-			),
-		);
-		WP_Interactivity_Store::merge_data( $data );
-		$this->assertSame( $data, WP_Interactivity_Store::get_data() );
-	}
-
-	public function test_store_can_be_extended() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core'   => array(
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core'   => array(
-						'a' => 1,
-						'b' => 2,
-					),
-					'custom' => array(
-						'c' => 3,
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_props_should_be_overwritten() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 'overwritten',
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_existing_indexed_arrays_should_be_replaced() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 1, 2 ),
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			)
-		);
-		$this->assertSame(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => array( 3, 4 ),
-					),
-				),
-			),
-			WP_Interactivity_Store::get_data()
-		);
-	}
-
-	public function test_store_should_be_correctly_rendered() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'a' => 1,
-					),
-				),
-			)
-		);
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'core' => array(
-						'b' => 2,
-					),
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"core":{"a":1,"b":2}}}</script>',
-			$rendered
-		);
-	}
-
-	public function test_store_should_also_escape_tags_and_amps() {
-		WP_Interactivity_Store::merge_data(
-			array(
-				'state' => array(
-					'amps' => 'http://site.test/?foo=1&baz=2&bar=3',
-					'tags' => 'Do not do this: <!-- <script>',
-				),
-			)
-		);
-		ob_start();
-		WP_Interactivity_Store::render();
-		$rendered = ob_get_clean();
-		$this->assertSame(
-			'<script id="wp-interactivity-initial-state" type="application/json">{"state":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2\u0026bar=3","tags":"Do not do this: \u003C!-- \u003Cscript\u003E"}}</script>',
-			$rendered
-		);
-	}
-}

From d2aca77fa5040734e4b555aa7f6f8111d35aa179 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Wed, 29 Nov 2023 20:51:37 +0100
Subject: [PATCH 09/27] Handle namespaces in Directive Processor

---
 .../class-wp-directive-processor.php          | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 1fec096891ba5..51ee0a19b9cee 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -108,6 +108,38 @@ public static function is_marked_as_children_of_interactive_block( $block ) {
 		return in_array( md5( serialize( $block ) ), self::$children_of_interactive_block, true );
 	}
 
+	/**
+	 * Stack of namespaces.
+	 *
+	 * @var string[]
+	 */
+	private $ns_stack = array();
+
+	/**
+	 * Push a new namespace onto the namespace stack.
+	 *
+	 * @param string $ns The new namespace.
+	 */
+	public function push_namespace( string $ns ) {
+		$this->ns_stack[] = $ns;
+	}
+
+	/**
+	 * Discard the current namespace.
+	 */
+	public function pop_namespace() {
+		array_pop( $this->ns_stack );
+	}
+
+	/**
+	 * Return the current namespace, or false if no namespace is set.
+	 *
+	 * @return string|bool
+	 */
+	public function get_namespace() {
+		return end( $this->ns_stack );
+	}
+
 	/**
 	 * Find the matching closing tag for an opening tag.
 	 *

From ad0cc8cb0ba1f84f9c6b29022850105a28b09546 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Wed, 29 Nov 2023 20:52:35 +0100
Subject: [PATCH 10/27] Add data-wp-interactive processor

---
 .../directive-processing.php                  | 11 +++++----
 .../directives/wp-interactive.php             | 23 +++++++++++++++++++
 lib/load.php                                  |  1 +
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 lib/experimental/interactivity-api/directives/wp-interactive.php

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index d67f32b5c2e65..091d2a8322c96 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -39,11 +39,12 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 	if ( WP_Directive_Processor::is_marked_as_root_block( $block ) ) {
 		WP_Directive_Processor::unmark_root_block();
 		$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',
+			'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
+			'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',
 		);
 
 		$tags = new WP_Directive_Processor( $block_content );
diff --git a/lib/experimental/interactivity-api/directives/wp-interactive.php b/lib/experimental/interactivity-api/directives/wp-interactive.php
new file mode 100644
index 0000000000000..4d3bbc8459007
--- /dev/null
+++ b/lib/experimental/interactivity-api/directives/wp-interactive.php
@@ -0,0 +1,23 @@
+<?php
+/**
+ * Process wp-interactive directive attribute.
+ *
+ * @package wp-directives
+ */
+
+/**
+ * Process wp-interactive directive attribute.
+ *
+ * @param WP_Directive_Processor $tags Tags.
+ */
+function gutenberg_interactivity_process_wp_interactive( $tags ) {
+	if ( $tags->is_tag_closer() ) {
+		$tags->pop_namespace();
+		return;
+	}
+
+	$value  = $tags->get_attribute( 'data-wp-interactive' );
+	$island = json_decode( $value );
+
+	$tags->push_namespace( $island['namespace'] );
+}
diff --git a/lib/load.php b/lib/load.php
index 54408b636548e..4d88f892456f3 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -124,6 +124,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/interactivity-api/directives/wp-class.php';
 require __DIR__ . '/experimental/interactivity-api/directives/wp-style.php';
 require __DIR__ . '/experimental/interactivity-api/directives/wp-text.php';
+require __DIR__ . '/experimental/interactivity-api/directives/wp-interactive.php';
 
 require __DIR__ . '/experimental/modules/class-gutenberg-modules.php';
 

From ef45f118e313d6d4b3ebab3bb1daa2cf003aeac5 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 14:01:31 +0100
Subject: [PATCH 11/27] Pass namespace to `evaluate_reference`

---
 .../interactivity-api/directive-processing.php             | 7 ++++---
 lib/experimental/interactivity-api/directives/wp-bind.php  | 2 +-
 lib/experimental/interactivity-api/directives/wp-class.php | 2 +-
 lib/experimental/interactivity-api/directives/wp-style.php | 2 +-
 lib/experimental/interactivity-api/directives/wp-text.php  | 2 +-
 5 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 091d2a8322c96..5a83baefafc5f 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -122,12 +122,13 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
  *
  * @param string $path Path.
  * @param array  $context Context data.
+ * @param string $ns Current namespace.
  * @return mixed
  */
-function gutenberg_interactivity_evaluate_reference( $path, array $context = array() ) {
+function gutenberg_interactivity_evaluate_reference( $path, array $context = array(), $ns ) {
 	$store = array_merge(
-		WP_Interactivity_Initial_State::get_state(),
-		array( 'context' => $context )
+		WP_Interactivity_Initial_State::get_state( $ns ),
+		array( 'context' => $context[ $ns ] )
 	);
 
 	/*
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
index 54be4a9faeb7d..9cadc5577b26b 100644
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ b/lib/experimental/interactivity-api/directives/wp-bind.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
 		}
 
 		$expr  = $tags->get_attribute( $attr );
-		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
 		$tags->set_attribute( $bound_attr, $value );
 	}
 }
diff --git a/lib/experimental/interactivity-api/directives/wp-class.php b/lib/experimental/interactivity-api/directives/wp-class.php
index 741cc75b42c60..50c4e1c98f680 100644
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ b/lib/experimental/interactivity-api/directives/wp-class.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_class( $tags, $context ) {
 		}
 
 		$expr      = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
 		if ( $add_class ) {
 			$tags->add_class( $class_name );
 		} else {
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
index 9c37f9082c2c0..cae77c543ec45 100644
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ b/lib/experimental/interactivity-api/directives/wp-style.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_style( $tags, $context ) {
 		}
 
 		$expr        = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
 		if ( $style_value ) {
 			$style_attr = $tags->get_attribute( 'style' );
 			$style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value );
diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php
index b0cfc98a74e70..74fe1a50ea223 100644
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ b/lib/experimental/interactivity-api/directives/wp-text.php
@@ -22,6 +22,6 @@ function gutenberg_interactivity_process_wp_text( $tags, $context ) {
 		return;
 	}
 
-	$text = gutenberg_interactivity_evaluate_reference( $value, $context->get_context() );
+	$text = gutenberg_interactivity_evaluate_reference( $value, $context->get_context(), $tags->get_namespace() );
 	$tags->set_inner_html( esc_html( $text ) );
 }

From a4970ae1cb45cca8181bb39e1ed71d431a3728f7 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 14:02:06 +0100
Subject: [PATCH 12/27] Use `$this` instead of `$tags`

---
 .../class-wp-directive-processor.php          | 21 +++++++++----------
 .../directive-processing.php                  |  5 +++--
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 51ee0a19b9cee..62c78f83674e6 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -184,22 +184,21 @@ public function next_balanced_closer() {
 	 * Traverses the HTML searching for Interactivity API directives and processing
 	 * them.
 	 *
-	 * @param WP_Directive_Processor $tags An instance of the WP_Directive_Processor.
-	 * @param string                 $prefix Attribute prefix.
-	 * @param string[]               $directives Directives.
+	 * @param string   $prefix Attribute prefix.
+	 * @param string[] $directives Directives.
 	 *
 	 * @return WP_Directive_Processor The modified instance of the
 	 * WP_Directive_Processor.
 	 */
-	public function process_rendered_html( $tags, $prefix, $directives ) {
+	public function process_rendered_html( $prefix, $directives ) {
 		$context   = new WP_Directive_Context();
 		$tag_stack = array();
 
-		while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
-			$tag_name = $tags->get_tag();
+		while ( $this->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
+			$tag_name = $this->get_tag();
 
 			// Is this a tag that closes the latest opening tag?
-			if ( $tags->is_tag_closer() ) {
+			if ( $this->is_tag_closer() ) {
 				if ( 0 === count( $tag_stack ) ) {
 					continue;
 				}
@@ -215,7 +214,7 @@ public function process_rendered_html( $tags, $prefix, $directives ) {
 				}
 			} else {
 				$attributes = array();
-				foreach ( $tags->get_attribute_names_with_prefix( $prefix ) as $name ) {
+				foreach ( $this->get_attribute_names_with_prefix( $prefix ) as $name ) {
 					/*
 					 * Removes the part after the double hyphen before looking for
 					 * the directive processor inside `$directives`, e.g., "wp-bind"
@@ -234,7 +233,7 @@ public function process_rendered_html( $tags, $prefix, $directives ) {
 				 * encounter the matching closing tag.
 				 */
 				if (
-				! WP_Directive_Processor::is_html_void_element( $tags->get_tag() ) &&
+				! WP_Directive_Processor::is_html_void_element( $this->get_tag() ) &&
 				( 0 !== count( $attributes ) || 0 !== count( $tag_stack ) )
 				) {
 					$tag_stack[] = array( $tag_name, $attributes );
@@ -242,11 +241,11 @@ public function process_rendered_html( $tags, $prefix, $directives ) {
 			}
 
 			foreach ( $attributes as $attribute ) {
-				call_user_func( $directives[ $attribute ], $tags, $context );
+				call_user_func( $directives[ $attribute ], $this, $context );
 			}
 		}
 
-		return $tags;
+		return $this;
 	}
 
 	/**
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 5a83baefafc5f..eac12bad1cf7c 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -48,8 +48,9 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 		);
 
 		$tags = new WP_Directive_Processor( $block_content );
-		$tags = $tags->process_rendered_html( $tags, 'data-wp-', $directives );
-		return $tags->get_updated_html();
+		return $tags
+			->process_rendered_html( 'data-wp-', $directives )
+			->get_updated_html();
 
 	}
 

From ceb84d7f98fa3c33b0a947e7da648c1dcdeabfa3 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 14:20:28 +0100
Subject: [PATCH 13/27] Execute directives by priority

---
 .../class-wp-directive-processor.php          | 19 ++++++++++++++++++-
 .../directive-processing.php                  |  2 +-
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 62c78f83674e6..6c779cbdf88c5 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -194,6 +194,10 @@ public function process_rendered_html( $prefix, $directives ) {
 		$context   = new WP_Directive_Context();
 		$tag_stack = array();
 
+		// Extract all directive names. They'll be used later on.
+		$directive_names     = array_keys( $directives );
+		$directive_names_rev = array_reverse( $directive_names );
+
 		while ( $this->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
 			$tag_name = $this->get_tag();
 
@@ -240,7 +244,20 @@ public function process_rendered_html( $prefix, $directives ) {
 				}
 			}
 
-			foreach ( $attributes as $attribute ) {
+			/*
+			 * Sort attributes by the order they appear in the `$directives`
+			 * argument, considering it as the priority order in which
+			 * directives should be processed. Note that the order is reversed
+			 * for tag closers.
+			 */
+			$sorted_attrs = array_intersect(
+				$this->is_tag_closer()
+					? $directive_names_rev
+					: $directive_names,
+				$attributes
+			);
+
+			foreach ( $sorted_attrs as $attribute ) {
 				call_user_func( $directives[ $attribute ], $this, $context );
 			}
 		}
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index eac12bad1cf7c..6252a869137f9 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -40,8 +40,8 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 		WP_Directive_Processor::unmark_root_block();
 		$directives = array(
 			'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
-			'data-wp-bind'        => 'gutenberg_interactivity_process_wp_bind',
 			'data-wp-context'     => 'gutenberg_interactivity_process_wp_context',
+			'data-wp-bind'        => 'gutenberg_interactivity_process_wp_bind',
 			'data-wp-class'       => 'gutenberg_interactivity_process_wp_class',
 			'data-wp-style'       => 'gutenberg_interactivity_process_wp_style',
 			'data-wp-text'        => 'gutenberg_interactivity_process_wp_text',

From 56f77c4e5bc50615fb2495bc6798f5aa6d285cb4 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 16:03:02 +0100
Subject: [PATCH 14/27] Add context with its namespace

---
 lib/experimental/interactivity-api/directives/wp-context.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
index 7d92b0ac7b0c6..d89bb658ebec6 100644
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ b/lib/experimental/interactivity-api/directives/wp-context.php
@@ -24,5 +24,6 @@ function gutenberg_interactivity_process_wp_context( $tags, $context ) {
 		true
 	);
 
-	$context->set_context( $new_context ?? array() );
+	$ns = $tags->get_namespace();
+	$context->set_context( array( $ns => $new_context ?? array() ) );
 }

From effeabc83df53933780629051fa743723c459bf1 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 16:51:57 +0100
Subject: [PATCH 15/27] Handle directive-level namespaces

---
 .../class-wp-directive-processor.php            | 17 +++++++++++++++++
 .../interactivity-api/directive-processing.php  |  6 ++++++
 .../interactivity-api/directives/wp-context.php | 14 ++++++++++----
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 6c779cbdf88c5..f6282f8ff712b 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -398,4 +398,21 @@ public static function is_html_void_element( $tag_name ) {
 	public static function parse_attribute_name( $name ) {
 		return explode( '--', $name, 2 );
 	}
+
+	/**
+	 * Extract and return the namespace from the given directive value.
+	 *
+	 * @param string $value The directive value.
+	 * @return array The resulting array
+	 */
+	public static function parse_value_ns( $value ) {
+		$matches = array();
+		$has_ns  = preg_match( '/^([\w-_\/]+)::(.+)$/', $value, $matches );
+
+		if ( $has_ns ) {
+			return array_slice( $matches, 1 );
+		} else {
+			return array( null, $value );
+		}
+	}
 }
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 6252a869137f9..1d89eaa3d2719 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -127,6 +127,12 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
  * @return mixed
  */
 function gutenberg_interactivity_evaluate_reference( $path, array $context = array(), $ns ) {
+	// Separate the namespace from the path value (if present).
+	list( $path_ns, $path ) = WP_Directive_Processor::parse_value_ns( $path );
+
+	// Overwrite namespace if path value contains one.
+	$ns = $path_ns ?? $ns;
+
 	$store = array_merge(
 		WP_Interactivity_Initial_State::get_state( $ns ),
 		array( 'context' => $context[ $ns ] )
diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
index d89bb658ebec6..3d00bede43e7a 100644
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ b/lib/experimental/interactivity-api/directives/wp-context.php
@@ -19,11 +19,17 @@ function gutenberg_interactivity_process_wp_context( $tags, $context ) {
 
 	$value = $tags->get_attribute( 'data-wp-context' );
 
-	$new_context = json_decode(
-		is_string( $value ) && ! empty( $value ) ? $value : '{}',
-		true
+	/**
+	 * Separate namespace and value from the context directive attribute. A
+	 * check to ensure it's a non-empty string in order to avoid exceptions.
+	 */
+	list( $ns, $value ) = WP_Directive_Processor::parse_value_ns(
+		is_string( $value ) && ! empty( $value ) ? $value : '{}'
 	);
 
-	$ns = $tags->get_namespace();
+	// If there's no directive namespace, use the inherited one.
+	$ns = $ns ?? $tags->get_namespace();
+
+	$new_context = json_decode( $value, true );
 	$context->set_context( array( $ns => $new_context ?? array() ) );
 }

From 4cb8ee1a06656bfa4f50835dac0b3009378807f5 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 17:18:34 +0100
Subject: [PATCH 16/27] Fix value_ns regex

---
 .../interactivity-api/class-wp-directive-processor.php          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index f6282f8ff712b..048a324cb9a22 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -407,7 +407,7 @@ public static function parse_attribute_name( $name ) {
 	 */
 	public static function parse_value_ns( $value ) {
 		$matches = array();
-		$has_ns  = preg_match( '/^([\w-_\/]+)::(.+)$/', $value, $matches );
+		$has_ns  = preg_match( '/^([\w\-_\/]+)::(.+)$/', $value, $matches );
 
 		if ( $has_ns ) {
 			return array_slice( $matches, 1 );

From 8b7f2b038a9d071f9c31470d7fc668d95fcf40c7 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 17:18:51 +0100
Subject: [PATCH 17/27] Add initial state under `state`

---
 lib/experimental/interactivity-api/directive-processing.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 1d89eaa3d2719..576f70b5f69f9 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -133,9 +133,9 @@ function gutenberg_interactivity_evaluate_reference( $path, array $context = arr
 	// Overwrite namespace if path value contains one.
 	$ns = $path_ns ?? $ns;
 
-	$store = array_merge(
-		WP_Interactivity_Initial_State::get_state( $ns ),
-		array( 'context' => $context[ $ns ] )
+	$store = array(
+		'state'   => WP_Interactivity_Initial_State::get_state( $ns ),
+		'context' => $context[ $ns ] ?? array(),
 	);
 
 	/*

From 1d151661dfd62c16e7d15f313e36ffe9ce4d5adb Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 17:25:54 +0100
Subject: [PATCH 18/27] Change `evaluate_reference` arguments order

---
 lib/experimental/interactivity-api/directive-processing.php | 6 +++---
 lib/experimental/interactivity-api/directives/wp-bind.php   | 2 +-
 lib/experimental/interactivity-api/directives/wp-class.php  | 2 +-
 lib/experimental/interactivity-api/directives/wp-style.php  | 2 +-
 lib/experimental/interactivity-api/directives/wp-text.php   | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index 576f70b5f69f9..4a3ed4b4ed1ea 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -121,12 +121,12 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
 /**
  * Resolve the reference using the store and the context from the provided path.
  *
- * @param string $path Path.
+ * @param string $path    Path.
+ * @param string $ns      Current namespace.
  * @param array  $context Context data.
- * @param string $ns Current namespace.
  * @return mixed
  */
-function gutenberg_interactivity_evaluate_reference( $path, array $context = array(), $ns ) {
+function gutenberg_interactivity_evaluate_reference( $path, $ns, array $context = array() ) {
 	// Separate the namespace from the path value (if present).
 	list( $path_ns, $path ) = WP_Directive_Processor::parse_value_ns( $path );
 
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
index 9cadc5577b26b..bccd94f81f267 100644
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ b/lib/experimental/interactivity-api/directives/wp-bind.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
 		}
 
 		$expr  = $tags->get_attribute( $attr );
-		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
+		$value = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		$tags->set_attribute( $bound_attr, $value );
 	}
 }
diff --git a/lib/experimental/interactivity-api/directives/wp-class.php b/lib/experimental/interactivity-api/directives/wp-class.php
index 50c4e1c98f680..09750e426774f 100644
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ b/lib/experimental/interactivity-api/directives/wp-class.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_class( $tags, $context ) {
 		}
 
 		$expr      = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
+		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		if ( $add_class ) {
 			$tags->add_class( $class_name );
 		} else {
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
index cae77c543ec45..ace690a4bf161 100644
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ b/lib/experimental/interactivity-api/directives/wp-style.php
@@ -26,7 +26,7 @@ function gutenberg_interactivity_process_wp_style( $tags, $context ) {
 		}
 
 		$expr        = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context(), $tags->get_namespace() );
+		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $tags->get_namespace(), $context->get_context() );
 		if ( $style_value ) {
 			$style_attr = $tags->get_attribute( 'style' );
 			$style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value );
diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php
index 74fe1a50ea223..ad1698006a9b5 100644
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ b/lib/experimental/interactivity-api/directives/wp-text.php
@@ -22,6 +22,6 @@ function gutenberg_interactivity_process_wp_text( $tags, $context ) {
 		return;
 	}
 
-	$text = gutenberg_interactivity_evaluate_reference( $value, $context->get_context(), $tags->get_namespace() );
+	$text = gutenberg_interactivity_evaluate_reference( $value, $tags->get_namespace(), $context->get_context() );
 	$tags->set_inner_html( esc_html( $text ) );
 }

From 6d0ddeff9c3e61a4bf7af951e0c3ae0631210c73 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 17:45:23 +0100
Subject: [PATCH 19/27] Update `evaluate_reference` tests

---
 .../directive-processing-test.php             | 78 +++++++++----------
 1 file changed, 36 insertions(+), 42 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index 46ef0284df15d..099c0df34d336 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -129,28 +129,25 @@ public function test_interactivity_process_directives_in_root_blocks() {
 class Tests_Utils_Evaluate extends WP_UnitTestCase {
 	public function test_evaluate_function_should_access_state() {
 		// Init a simple store.
-		wp_store(
+		wp_initial_state(
+			'test',
 			array(
-				'state' => array(
-					'core' => array(
-						'number' => 1,
-						'bool'   => true,
-						'nested' => array(
-							'string' => 'hi',
-						),
-					),
+				'number' => 1,
+				'bool'   => true,
+				'nested' => array(
+					'string' => 'hi',
 				),
 			)
 		);
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( '!state.core.bool' ) );
+		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.number', 'test' ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.bool', 'test' ) );
+		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.nested.string', 'test' ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( '!state.bool', 'test' ) );
 	}
 
 	public function test_evaluate_function_should_access_passed_context() {
 		$context = array(
-			'local' => array(
+			'test' => array(
 				'number' => 2,
 				'bool'   => false,
 				'nested' => array(
@@ -158,58 +155,55 @@ public function test_evaluate_function_should_access_passed_context() {
 				),
 			),
 		);
-		$this->assertSame( 2, gutenberg_interactivity_evaluate_reference( 'context.local.number', $context ) );
-		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'context.local.bool', $context ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( '!context.local.bool', $context ) );
-		$this->assertSame( 'bye', gutenberg_interactivity_evaluate_reference( 'context.local.nested.string', $context ) );
+		$this->assertSame( 2, gutenberg_interactivity_evaluate_reference( 'context.number', 'test', $context ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'context.bool', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( '!context.bool', 'test', $context ) );
+		$this->assertSame( 'bye', gutenberg_interactivity_evaluate_reference( 'context.nested.string', 'test', $context ) );
 		// Previously defined state is also accessible.
-		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.core.number' ) );
-		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.core.bool' ) );
-		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.core.nested.string' ) );
+		$this->assertSame( 1, gutenberg_interactivity_evaluate_reference( 'state.number', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'state.bool', 'test', $context ) );
+		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.nested.string', 'test', $context ) );
 	}
 
 	public function test_evaluate_function_should_return_null_for_unresolved_paths() {
-		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist' ) );
+		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist', 'test' ) );
 	}
 
 	public function test_evaluate_function_should_execute_anonymous_functions() {
-		$context = new WP_Directive_Context( array( 'count' => 2 ) );
+		$context = new WP_Directive_Context( array( 'test' => array( 'count' => 2 ) ) );
 		$helper  = new Helper_Class();
 
-		wp_store(
+		wp_initial_state(
+			'test',
 			array(
-				'state'     => array(
-					'count' => 3,
-				),
-				'selectors' => array(
-					'anonymous_function'           => function ( $store ) {
-						return $store['state']['count'] + $store['context']['count'];
-					},
-					// Other types of callables should not be executed.
-					'function_name'                => 'gutenberg_test_process_directives_helper_increment',
-					'class_method'                 => array( $helper, 'increment' ),
-					'class_static_method'          => 'Helper_Class::static_increment',
-					'class_static_method_as_array' => array( 'Helper_Class', 'static_increment' ),
-				),
+				'count'                        => 3,
+				'anonymous_function'           => function ( $store ) {
+					return $store['state']['count'] + $store['context']['count'];
+				},
+				// Other types of callables should not be executed.
+				'function_name'                => 'gutenberg_test_process_directives_helper_increment',
+				'class_method'                 => array( $helper, 'increment' ),
+				'class_static_method'          => 'Helper_Class::static_increment',
+				'class_static_method_as_array' => array( 'Helper_Class', 'static_increment' ),
 			)
 		);
 
-		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'selectors.anonymous_function', $context->get_context() ) );
+		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'state.anonymous_function', 'test', $context->get_context() ) );
 		$this->assertSame(
 			'gutenberg_test_process_directives_helper_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.function_name', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.function_name', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			array( $helper, 'increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_method', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			'Helper_Class::static_increment',
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_static_method', 'test', $context->get_context() )
 		);
 		$this->assertSame(
 			array( 'Helper_Class', 'static_increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method_as_array', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_static_method_as_array', 'test', $context->get_context() )
 		);
 	}
 }

From e6ffd1d4c6463aa917170d1b59f2f5205387df54 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 17:52:38 +0100
Subject: [PATCH 20/27] Add tests for value namespaces

---
 .../directive-processing-test.php             | 34 +++++++++++++++++++
 1 file changed, 34 insertions(+)

diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index 099c0df34d336..d896a3776d61e 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -165,6 +165,40 @@ public function test_evaluate_function_should_access_passed_context() {
 		$this->assertSame( 'hi', gutenberg_interactivity_evaluate_reference( 'state.nested.string', 'test', $context ) );
 	}
 
+	public function test_evaluate_function_should_access_state_using_path_ns() {
+		// Add a new namespace to the store.
+		wp_initial_state(
+			'test/other',
+			array(
+				'number' => 3,
+				'bool'   => true,
+				'nested' => array(
+					'string' => 'bonjour',
+				),
+			)
+		);
+		$this->assertSame( 3, gutenberg_interactivity_evaluate_reference( 'test/other::state.number', 'test' ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'test/other::state.bool', 'test' ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'test/other::!state.bool', 'test' ) );
+		$this->assertSame( 'bonjour', gutenberg_interactivity_evaluate_reference( 'test/other::state.nested.string', 'test' ) );
+	}
+
+	public function test_evaluate_function_should_access_passed_context_using_path_ns() {
+		$context = array(
+			'test/other' => array(
+				'number' => 4,
+				'bool'   => false,
+				'nested' => array(
+					'string' => 'adieu',
+				),
+			),
+		);
+		$this->assertSame( 4, gutenberg_interactivity_evaluate_reference( 'test/other::context.number', 'test', $context ) );
+		$this->assertFalse( gutenberg_interactivity_evaluate_reference( 'test/other::context.bool', 'test', $context ) );
+		$this->assertTrue( gutenberg_interactivity_evaluate_reference( 'test/other::!context.bool', 'test', $context ) );
+		$this->assertSame( 'adieu', gutenberg_interactivity_evaluate_reference( 'test/other::context.nested.string', 'test', $context ) );
+	}
+
 	public function test_evaluate_function_should_return_null_for_unresolved_paths() {
 		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist', 'test' ) );
 	}

From 5af5ad903fea44ebff584d883cbbf29184134da2 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:09:35 +0100
Subject: [PATCH 21/27] Update directive processing tests

---
 .../interactivity-api/directive-processing-test.php           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index d896a3776d61e..9ca40d0221bc8 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -60,7 +60,7 @@ function ( $p ) {
 
 		$markup = '<div>Example: <div foo-test="abc"><img><span>This is a test></span><div>Here is a nested div</div></div></div>';
 		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
+		$tags->process_rendered_html( 'foo-', $directives );
 	}
 
 	public function test_directives_with_double_hyphen_processed_correctly() {
@@ -74,7 +74,7 @@ public function test_directives_with_double_hyphen_processed_correctly() {
 
 		$markup = '<div foo-test--value="abc"></div>';
 		$tags   = new WP_Directive_Processor( $markup );
-		$tags->process_rendered_html( $tags, 'foo-', $directives );
+		$tags->process_rendered_html( 'foo-', $directives );
 	}
 
 	public function test_interactivity_process_directives_in_root_blocks() {

From 95e84f33e4fa1f3fa867fb841aa3c9ed3f65c28c Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:13:55 +0100
Subject: [PATCH 22/27] Parse wp-interactive JSON as array

---
 .../interactivity-api/directives/wp-interactive.php             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/interactivity-api/directives/wp-interactive.php b/lib/experimental/interactivity-api/directives/wp-interactive.php
index 4d3bbc8459007..a13451ef18c6f 100644
--- a/lib/experimental/interactivity-api/directives/wp-interactive.php
+++ b/lib/experimental/interactivity-api/directives/wp-interactive.php
@@ -17,7 +17,7 @@ function gutenberg_interactivity_process_wp_interactive( $tags ) {
 	}
 
 	$value  = $tags->get_attribute( 'data-wp-interactive' );
-	$island = json_decode( $value );
+	$island = json_decode( $value, true );
 
 	$tags->push_namespace( $island['namespace'] );
 }

From 68fcce405c7834f23d45f49635ed797fbcb7db76 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:25:41 +0100
Subject: [PATCH 23/27] Update wp-bind tests

---
 .../interactivity-api/directives/wp-bind-test.php    | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
index bfb4c428cd946..ed49cfa7b3f9c 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpBind extends WP_UnitTestCase {
 	public function test_directive_sets_attribute() {
-		$markup = '<img data-wp-bind--src="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<img data-wp-bind--src="context.imageSource" />';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
@@ -23,7 +24,7 @@ public function test_directive_sets_attribute() {
 		gutenberg_interactivity_process_wp_bind( $tags, $context );
 
 		$this->assertSame(
-			'<img src="./wordpress.png" data-wp-bind--src="context.myblock.imageSource" />',
+			'<img src="./wordpress.png" data-wp-bind--src="context.imageSource" />',
 			$tags->get_updated_html()
 		);
 		$this->assertSame( './wordpress.png', $tags->get_attribute( 'src' ) );
@@ -31,8 +32,9 @@ public function test_directive_sets_attribute() {
 	}
 
 	public function test_directive_ignores_empty_bound_attribute() {
-		$markup = '<img data-wp-bind.="context.myblock.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<img data-wp-bind="context.imageSource" />';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );

From defec0c46f696a93c59dd940457f0f6c87f9bfc9 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:32:28 +0100
Subject: [PATCH 24/27] Fix wp-class tests

---
 .../directives/wp-class-test.php              | 35 +++++++++++--------
 1 file changed, 20 insertions(+), 15 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directives/wp-class-test.php b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
index 419546c6d9ef8..a8edf543902f2 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-class-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpClass extends WP_UnitTestCase {
 	public function test_directive_adds_class() {
-		$markup = '<div data-wp-class--red="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--red="context.isRed" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
@@ -23,7 +24,7 @@ public function test_directive_adds_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--red="context.myblock.isRed" class="blue red">Test</div>',
+			'<div data-wp-class--red="context.isRed" class="blue red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringContainsString( 'red', $tags->get_attribute( 'class' ) );
@@ -31,8 +32,9 @@ public function test_directive_adds_class() {
 	}
 
 	public function test_directive_removes_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="red blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="red blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -40,7 +42,7 @@ public function test_directive_removes_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="red">Test</div>',
+			'<div data-wp-class--blue="context.isBlue" class="red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringNotContainsString( 'blue', $tags->get_attribute( 'class' ) );
@@ -48,8 +50,9 @@ public function test_directive_removes_class() {
 	}
 
 	public function test_directive_removes_empty_class_attribute() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -57,8 +60,8 @@ public function test_directive_removes_empty_class_attribute() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			// WP_HTML_Tag_Processor has a TODO note to prune whitespace after classname removal.
-			'<div data-wp-class--blue="context.myblock.isBlue" >Test</div>',
+			// WP_Directive_Processor has a TODO note to prune whitespace after classname removal.
+			'<div data-wp-class--blue="context.isBlue" >Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertNull( $tags->get_attribute( 'class' ) );
@@ -66,8 +69,9 @@ public function test_directive_removes_empty_class_attribute() {
 	}
 
 	public function test_directive_does_not_remove_non_existant_class() {
-		$markup = '<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class--blue="context.isBlue" class="green red">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
@@ -75,7 +79,7 @@ public function test_directive_does_not_remove_non_existant_class() {
 		gutenberg_interactivity_process_wp_class( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-class--blue="context.myblock.isBlue" class="green red">Test</div>',
+			'<div data-wp-class--blue="context.isBlue" class="green red">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertSame( 'green red', $tags->get_attribute( 'class' ) );
@@ -83,8 +87,9 @@ public function test_directive_does_not_remove_non_existant_class() {
 	}
 
 	public function test_directive_ignores_empty_class_name() {
-		$markup = '<div data-wp-class.="context.myblock.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-class="context.isRed" class="blue">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );

From 881c5e4f01a7704facbf23bd28e0ba709f4e254a Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:33:54 +0100
Subject: [PATCH 25/27] Update wp-style tests

---
 .../interactivity-api/directives/wp-style-test.php   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directives/wp-style-test.php b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
index 8942559b2fe89..18d4e285e2f72 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-style-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
@@ -14,8 +14,9 @@
  */
 class Tests_Directives_WpStyle extends WP_UnitTestCase {
 	public function test_directive_adds_style() {
-		$markup = '<div data-wp-style--color="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-style--color="context.color" style="background: blue;">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
@@ -23,7 +24,7 @@ public function test_directive_adds_style() {
 		gutenberg_interactivity_process_wp_style( $tags, $context );
 
 		$this->assertSame(
-			'<div data-wp-style--color="context.myblock.color" style="background: blue;color: green;">Test</div>',
+			'<div data-wp-style--color="context.color" style="background: blue;color: green;">Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertStringContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
@@ -31,8 +32,9 @@ public function test_directive_adds_style() {
 	}
 
 	public function test_directive_ignores_empty_style() {
-		$markup = '<div data-wp-style.="context.myblock.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-style="context.color" style="background: blue;">Test</div>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );

From 976fea7f62d9552e76286d11252e9622fdb06422 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 18:35:07 +0100
Subject: [PATCH 26/27] Update wp-text tests

---
 .../interactivity-api/directives/wp-text-test.php      | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directives/wp-text-test.php b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
index 81d2d0f370a64..6ba00a5127d4f 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-text-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
@@ -14,31 +14,33 @@
  */
 class Tests_Directives_WpText extends WP_UnitTestCase {
 	public function test_directive_sets_inner_html_based_on_attribute_value_and_escapes_html() {
-		$markup = '<div data-wp-text="context.myblock.someText"></div>';
+		$markup = '<div data-wp-text="context.someText"></div>';
 
 		$tags = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'The HTML tag <br> produces a line break.' ) ) );
 		$context        = clone $context_before;
 		gutenberg_interactivity_process_wp_text( $tags, $context );
 
-		$expected_markup = '<div data-wp-text="context.myblock.someText">The HTML tag &lt;br&gt; produces a line break.</div>';
+		$expected_markup = '<div data-wp-text="context.someText">The HTML tag &lt;br&gt; produces a line break.</div>';
 		$this->assertSame( $expected_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
 	}
 
 	public function test_directive_overwrites_inner_html_based_on_attribute_value() {
-		$markup = '<div data-wp-text="context.myblock.someText">Lorem ipsum dolor sit.</div>';
+		$markup = '<div data-wp-text="context.someText">Lorem ipsum dolor sit.</div>';
 
 		$tags = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'someText' => 'Honi soit qui mal y pense.' ) ) );
 		$context        = clone $context_before;
 		gutenberg_interactivity_process_wp_text( $tags, $context );
 
-		$expected_markup = '<div data-wp-text="context.myblock.someText">Honi soit qui mal y pense.</div>';
+		$expected_markup = '<div data-wp-text="context.someText">Honi soit qui mal y pense.</div>';
 		$this->assertSame( $expected_markup, $tags->get_updated_html() );
 		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-text directive changed context' );
 	}

From 6b721a08f630688b09cbd267d5e6b0c29f797c90 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Thu, 30 Nov 2023 19:09:38 +0100
Subject: [PATCH 27/27] Update wp-context tests

---
 .../directives/wp-context-test.php            | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/phpunit/experimental/interactivity-api/directives/wp-context-test.php b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
index 1277b016848cc..a6a63f6303726 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-context-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
@@ -21,8 +21,9 @@ public function test_directive_merges_context_correctly_upon_wp_context_attribut
 			)
 		);
 
-		$markup = '<div data-wp-context=\'{ "myblock": { "open": true } }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$markup = '<div data-wp-context=\'{ "open": true }\'>';
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 		$tags->next_tag();
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
@@ -38,38 +39,40 @@ public function test_directive_merges_context_correctly_upon_wp_context_attribut
 
 	public function test_directive_resets_context_correctly_upon_closing_tag() {
 		$context = new WP_Directive_Context(
-			array( 'my-key' => 'original-value' )
+			array( 'myblock' => array( 'my-key' => 'original-value' ) )
 		);
 
 		$context->set_context(
-			array( 'my-key' => 'new-value' )
+			array( 'myblock' => array( 'my-key' => 'new-value' ) )
 		);
 
 		$markup = '</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		$tags->push_namespace( 'myblock' );
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'original-value' ),
+			array( 'myblock' => array( 'my-key' => 'original-value' ) ),
 			$context->get_context()
 		);
 	}
 
 	public function test_directive_doesnt_throw_on_malformed_context_objects() {
 		$context = new WP_Directive_Context(
-			array( 'my-key' => 'some-value' )
+			array( 'myblock' => array( 'my-key' => 'some-value' ) )
 		);
 
 		$markup = '<div data-wp-context=\'{ "wrong_json_object: }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 		$tags->next_tag();
+		$tags->push_namespace( 'myblock' );
 
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 	}
@@ -83,14 +86,15 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
+		$tags->push_namespace( 'myblock' );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -100,7 +104,7 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -110,7 +114,7 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -134,14 +138,15 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -151,7 +156,7 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -161,7 +166,7 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -185,14 +190,15 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 				</div>
 			</div>
 		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
+		$tags   = new WP_Directive_Processor( $markup );
+		$tags->push_namespace( 'myblock' );
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
 		gutenberg_interactivity_process_wp_context( $tags, $context );
 
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -202,7 +208,7 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);
 
@@ -212,7 +218,7 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 
 		// Still the same context.
 		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
+			array( 'myblock' => array( 'my-key' => 'some-value' ) ),
 			$context->get_context()
 		);