From 80f8d9e6a2770a390c87a0c9d1e6d62d54f7e2ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Greg=20Zi=C3=B3=C5=82kowski?= <grzegorz@gziolo.pl>
Date: Mon, 8 Jan 2024 14:09:07 +0100
Subject: [PATCH 001/296] Modules: Load the import map polyfill when needed
 (#57256)

* Modules: Load the import map polyfill when needed

* Update lib/experimental/modules/class-gutenberg-modules.php

Co-authored-by: Felix Arntz <felixarntz@users.noreply.github.com>

---------

Co-authored-by: Felix Arntz <felixarntz@users.noreply.github.com>
---
 .../modules/class-gutenberg-modules.php       | 26 ++++++++++++-------
 1 file changed, 16 insertions(+), 10 deletions(-)

diff --git a/lib/experimental/modules/class-gutenberg-modules.php b/lib/experimental/modules/class-gutenberg-modules.php
index 0a2da03545776..5aa012f8e2f2c 100644
--- a/lib/experimental/modules/class-gutenberg-modules.php
+++ b/lib/experimental/modules/class-gutenberg-modules.php
@@ -152,15 +152,21 @@ public static function print_module_preloads() {
 	 * import maps (https://github.com/guybedford/es-module-shims/issues/406).
 	 */
 	public static function print_import_map_polyfill() {
-		$import_map = self::get_import_map();
-		if ( ! empty( $import_map['imports'] ) ) {
-			wp_print_script_tag(
-				array(
-					'src'   => gutenberg_url( '/build/modules/importmap-polyfill.min.js' ),
-					'defer' => true,
-				)
-			);
-		}
+		$test = 'HTMLScriptElement.supports && HTMLScriptElement.supports("importmap")';
+		$src  = gutenberg_url( '/build/modules/importmap-polyfill.min.js' );
+
+		echo (
+			// Test presence of feature...
+			'<script>( ' . $test . ' ) || ' .
+			/*
+			 * ...appending polyfill on any failures. Cautious viewers may balk
+			 * at the `document.write`. Its caveat of synchronous mid-stream
+			 * blocking write is exactly the behavior we need though.
+			 */
+			'document.write( \'<script src="' .
+			$src .
+			'"></scr\' + \'ipt>\' );</script>'
+		);
 	}
 
 	/**
@@ -273,4 +279,4 @@ function gutenberg_dequeue_module( $module_identifier ) {
 add_action( $modules_position, array( 'Gutenberg_Modules', 'print_module_preloads' ) );
 
 // Prints the script that loads the import map polyfill in the footer.
-add_action( 'wp_footer', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 );
+add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 );

From 302c1487c0298a75b4a0094e77ec87256f15ccdf Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Mon, 8 Jan 2024 07:31:38 -0600
Subject: [PATCH 002/296] Font Library: unregister font collection (#54701)

* remove font collection

* add wp_unregister_font_collection function

* format php

* fix function comment

* add tests for unregister_font_collection

* removig unused variable

* update wording on comments

Co-authored-by: Colin Stewart <79332690+costdev@users.noreply.github.com>

* keep track of unregistered font collection ids in an array

* add tests to assure that get_font_collections returns an empty array if all the font collections were unregistered

* fix tests

* test the initial empty value of the font library collections

* format

* simplify unregistering of font collections and add _doing_it_wrong call

* add translation domain

* adding _doing_it_wrong if you are registering collections with the same id or unregistering a non existing collection id

* updating tests

* replace 6.4.0 by 6.5.0 in comments

Co-authored-by: Vicente Canales <1157901+vcanales@users.noreply.github.com>

* update version

Co-authored-by: Grant Kinney <creativecoder@users.noreply.github.com>

* consolidate code as only one function to avoid code repetition

* create base test case

* format php

* assertWPError

* check that collection was not unregistered by mistake

* calling parent test class mehtods

* format php

---------

Co-authored-by: Colin Stewart <79332690+costdev@users.noreply.github.com>
Co-authored-by: Vicente Canales <1157901+vcanales@users.noreply.github.com>
Co-authored-by: Grant Kinney <creativecoder@users.noreply.github.com>
---
 .../font-library/class-wp-font-library.php    | 50 +++++++++++++++--
 .../fonts/font-library/font-library.php       | 13 +++++
 .../fonts/font-library/wpFontLibrary/base.php | 26 +++++++++
 .../wpFontLibrary/getFontCollection.php       |  8 +--
 .../wpFontLibrary/getFontCollections.php      | 26 +++------
 .../wpFontLibrary/getFontsDir.php             |  2 +-
 .../wpFontLibrary/getMimeTypes.php            |  2 +-
 .../wpFontLibrary/registerFontCollection.php  |  6 ++-
 .../wpFontLibrary/setUploadDir.php            |  2 +-
 .../unregisterFontCollection.php              | 54 +++++++++++++++++++
 10 files changed, 156 insertions(+), 33 deletions(-)
 create mode 100644 phpunit/tests/fonts/font-library/wpFontLibrary/base.php
 create mode 100644 phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php

diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index 9320a554e510c..59ec5e93fa787 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -63,15 +63,57 @@ public static function get_expected_font_mime_types_per_php_version( $php_versio
 	 */
 	public static function register_font_collection( $config ) {
 		$new_collection = new WP_Font_Collection( $config );
-
-		if ( isset( self::$collections[ $config['id'] ] ) ) {
-			return new WP_Error( 'font_collection_registration_error', 'Font collection already registered.' );
+		if ( self::is_collection_registered( $config['id'] ) ) {
+			$error_message = sprintf(
+				/* translators: %s: Font collection id. */
+				__( 'Font collection with id: "%s" is already registered.', 'default' ),
+				$config['id']
+			);
+			_doing_it_wrong(
+				__METHOD__,
+				$error_message,
+				'6.5.0'
+			);
+			return new WP_Error( 'font_collection_registration_error', $error_message );
 		}
-
 		self::$collections[ $config['id'] ] = $new_collection;
 		return $new_collection;
 	}
 
+	/**
+	 * Unregisters a previously registered font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $collection_id Font collection ID.
+	 * @return bool True if the font collection was unregistered successfully and false otherwise.
+	 */
+	public static function unregister_font_collection( $collection_id ) {
+		if ( ! self::is_collection_registered( $collection_id ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				/* translators: %s: Font collection id. */
+				sprintf( __( 'Font collection "%s" not found.', 'default' ), $collection_id ),
+				'6.5.0'
+			);
+			return false;
+		}
+		unset( self::$collections[ $collection_id ] );
+		return true;
+	}
+
+	/**
+	 * Checks if a font collection is registered.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $collection_id Font collection ID.
+	 * @return bool True if the font collection is registered and false otherwise.
+	 */
+	private static function is_collection_registered( $collection_id ) {
+		return array_key_exists( $collection_id, self::$collections );
+	}
+
 	/**
 	 * Gets all the font collections available.
 	 *
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index 709f63e9126cb..711a6bb40c282 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -60,6 +60,19 @@ function wp_register_font_collection( $config ) {
 	}
 }
 
+if ( ! function_exists( 'wp_unregister_font_collection' ) ) {
+	/**
+	 * Unregisters a font collection from the Font Library.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $collection_id The font collection ID.
+	 */
+	function wp_unregister_font_collection( $collection_id ) {
+		WP_Font_Library::unregister_font_collection( $collection_id );
+	}
+
+}
 
 $default_font_collection = array(
 	'id'          => 'default-font-collection',
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/base.php b/phpunit/tests/fonts/font-library/wpFontLibrary/base.php
new file mode 100644
index 0000000000000..e8d970f5b3d39
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/base.php
@@ -0,0 +1,26 @@
+<?php
+/**
+ * Test Case for WP_Font_Library tests.
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ */
+abstract class WP_Font_Library_UnitTestCase extends WP_UnitTestCase {
+	public function reset_font_collections() {
+		// Resets the private static property WP_Font_Library::$collections to empty array.
+		$reflection = new ReflectionClass( 'WP_Font_Library' );
+		$property   = $reflection->getProperty( 'collections' );
+		$property->setAccessible( true );
+		$property->setValue( array() );
+	}
+
+	public function set_up() {
+		parent::set_up();
+		$this->reset_font_collections();
+	}
+
+	public function tear_down() {
+		parent::tear_down();
+		$this->reset_font_collections();
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
index bfdb7258fa11a..00d5ca2dcb2e7 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
@@ -10,20 +10,16 @@
  *
  * @covers WP_Font_Library::get_font_collection
  */
-class Tests_Fonts_WpFontLibrary_GetFontCollection extends WP_UnitTestCase {
+class Tests_Fonts_WpFontLibrary_GetFontCollection extends WP_Font_Library_UnitTestCase {
 
-	public static function set_up_before_class() {
+	public function test_should_get_font_collection() {
 		$my_font_collection_config = array(
 			'id'          => 'my-font-collection',
 			'name'        => 'My Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
 		);
-
 		wp_register_font_collection( $my_font_collection_config );
-	}
-
-	public function test_should_get_font_collection() {
 		$font_collection = WP_Font_Library::get_font_collection( 'my-font-collection' );
 		$this->assertInstanceOf( 'WP_Font_Collection', $font_collection );
 	}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
index 97e66e64e8716..40eacba8e18c5 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
@@ -10,11 +10,13 @@
  *
  * @covers WP_Font_Library::get_font_collections
  */
-class Tests_Fonts_WpFontLibrary_GetFontCollections extends WP_UnitTestCase {
-
-	public static function set_up_before_class() {
-		$font_library = new WP_Font_Library();
+class Tests_Fonts_WpFontLibrary_GetFontCollections extends WP_Font_Library_UnitTestCase {
+	public function test_should_get_an_empty_list() {
+		$font_collections = WP_Font_Library::get_font_collections();
+		$this->assertEmpty( $font_collections, 'Should return an empty array.' );
+	}
 
+	public function test_should_get_mock_font_collection() {
 		$my_font_collection_config = array(
 			'id'          => 'my-font-collection',
 			'name'        => 'My Font Collection',
@@ -22,23 +24,11 @@ public static function set_up_before_class() {
 			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
 		);
 
-		$font_library::register_font_collection( $my_font_collection_config );
-	}
-
-	public function test_should_get_the_default_font_collection() {
-		$font_collections = WP_Font_Library::get_font_collections();
-		$this->assertArrayHasKey( 'default-font-collection', $font_collections, 'Default Google Fonts collection should be registered' );
-		$this->assertInstanceOf( 'WP_Font_Collection', $font_collections['default-font-collection'], 'The value of the array $font_collections[id] should be an instance of WP_Font_Collection class.' );
-	}
+		WP_Font_Library::register_font_collection( $my_font_collection_config );
 
-	public function test_should_get_the_right_number_of_collections() {
 		$font_collections = WP_Font_Library::get_font_collections();
 		$this->assertNotEmpty( $font_collections, 'Sould return an array of font collections.' );
-		$this->assertCount( 2, $font_collections, 'Should return an array with one font collection.' );
-	}
-
-	public function test_should_get_mock_font_collection() {
-		$font_collections = WP_Font_Library::get_font_collections();
+		$this->assertCount( 1, $font_collections, 'Should return an array with one font collection.' );
 		$this->assertArrayHasKey( 'my-font-collection', $font_collections, 'The array should have the key of the registered font collection id.' );
 		$this->assertInstanceOf( 'WP_Font_Collection', $font_collections['my-font-collection'], 'The value of the array $font_collections[id] should be an instance of WP_Font_Collection class.' );
 	}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
index 4bbafc55a2147..1200200d7160b 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::get_fonts_dir
  */
-class Tests_Fonts_WpFontLibrary_GetFontsDir extends WP_UnitTestCase {
+class Tests_Fonts_WpFontLibrary_GetFontsDir extends WP_Font_Library_UnitTestCase {
 
 	public function test_get_fonts_dir() {
 		$this->assertStringEndsWith( '/wp-content/fonts', WP_Font_Library::get_fonts_dir() );
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php
index 708134af69e92..485587060f16a 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getMimeTypes.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Family_Utils::get_expected_font_mime_types_per_php_version
  */
-class Tests_Fonts_WpFontsFamilyUtils_GetMimeTypes extends WP_UnitTestCase {
+class Tests_Fonts_WpFontsFamilyUtils_GetMimeTypes extends WP_Font_Library_UnitTestCase {
 
 	/**
 	 *
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
index 6bc5fbb8161ce..2569830f6bf2a 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::register_font_collection
  */
-class Tests_Fonts_WpFontLibrary_RegisterFontCollection extends WP_UnitTestCase {
+class Tests_Fonts_WpFontLibrary_RegisterFontCollection extends WP_Font_Library_UnitTestCase {
 
 	public function test_should_register_font_collection() {
 		$config     = array(
@@ -70,8 +70,10 @@ public function test_should_return_error_if_id_is_repeated() {
 		$collection1 = WP_Font_Library::register_font_collection( $config1 );
 		$this->assertInstanceOf( 'WP_Font_Collection', $collection1, 'A collection should be registered.' );
 
+		// Expects a _doing_it_wrong notice.
+		$this->setExpectedIncorrectUsage( 'WP_Font_Library::register_font_collection' );
 		// Try to register a second collection with same id.
 		$collection2 = WP_Font_Library::register_font_collection( $config2 );
-		$this->assertWPError( $collection2, 'Second collection with the same id should fail.' );
+		$this->assertWPError( $collection2, 'A WP_Error should be returned.' );
 	}
 }
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
index daa4c84aad900..29d481d8afd6b 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
@@ -10,7 +10,7 @@
  *
  * @covers WP_Font_Library::set_upload_dir
  */
-class Tests_Fonts_WpFontLibrary_SetUploadDir extends WP_UnitTestCase {
+class Tests_Fonts_WpFontLibrary_SetUploadDir extends WP_Font_Library_UnitTestCase {
 
 	public function test_should_set_fonts_upload_dir() {
 		$defaults = array(
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
new file mode 100644
index 0000000000000..e6e16956814fb
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * Test WP_Font_Library::unregister_font_collection().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ *
+ * @covers WP_Font_Library::unregister_font_collection
+ */
+class Tests_Fonts_WpFontLibrary_UnregisterFontCollection extends WP_Font_Library_UnitTestCase {
+
+	public function test_should_unregister_font_collection() {
+		// Registers two mock font collections.
+		$config = array(
+			'id'          => 'mock-font-collection-1',
+			'name'        => 'Mock Collection to be unregistered',
+			'description' => 'A mock font collection to be unregistered.',
+			'src'         => 'my-collection-data.json',
+		);
+		WP_Font_Library::register_font_collection( $config );
+
+		$config = array(
+			'id'          => 'mock-font-collection-2',
+			'name'        => 'Mock Collection',
+			'description' => 'A mock font collection.',
+			'src'         => 'my-mock-data.json',
+		);
+		WP_Font_Library::register_font_collection( $config );
+
+		// Unregister mock font collection.
+		WP_Font_Library::unregister_font_collection( 'mock-font-collection-1' );
+		$collections = WP_Font_Library::get_font_collections();
+		$this->assertArrayNotHasKey( 'mock-font-collection-1', $collections, 'Font collection was not unregistered.' );
+		$this->assertArrayHasKey( 'mock-font-collection-2', $collections, 'Font collection was unregistered by mistake.' );
+
+		// Unregisters remaining mock font collection.
+		WP_Font_Library::unregister_font_collection( 'mock-font-collection-2' );
+		$collections = WP_Font_Library::get_font_collections();
+		$this->assertArrayNotHasKey( 'mock-font-collection-2', $collections, 'Mock font collection was not unregistered.' );
+
+		// Checks that all font collections were unregistered.
+		$this->assertEmpty( $collections, 'Font collections were not unregistered.' );
+	}
+
+	public function unregister_non_existing_collection() {
+		// Unregisters non existing font collection.
+		WP_Font_Library::unregister_font_collection( 'non-existing-collection' );
+		$collections = WP_Font_Library::get_font_collections();
+		$this->assertEmpty( $collections, 'Should not be registered collections.' );
+	}
+}

From 6d4e6ddfccdaebbb75337564c331c402bb3b07d0 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Mon, 8 Jan 2024 08:12:23 -0600
Subject: [PATCH 003/296] Font Library: singularize install font families
 endpoint (#57569)

* singularize install font families endpoint to accept only one font family instead of many in the same request

* lint php

* frontend changes to send only one font family per install request

* restrict the upload of local font files to variants of only one font family

* rename function to make it singular

* fixing strings for translations

* fix permission_callback value updated by mistake
---
 ...class-wp-rest-font-families-controller.php | 149 ++++-----
 .../font-library-modal/context.js             |  14 +-
 .../font-library-modal/font-collection.js     |   9 +-
 .../font-library-modal/local-fonts.js         |  15 +-
 .../font-library-modal/resolvers.js           |   2 +-
 .../font-library-modal/utils/index.js         |  30 +-
 .../test/makeFormDataFromFontFamilies.spec.js |  62 ----
 .../test/makeFormDataFromFontFamily.spec.js   |  58 ++++
 .../installFonts.php                          | 287 ++++++------------
 9 files changed, 258 insertions(+), 368 deletions(-)
 delete mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js
 create mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js

diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
index c92a0d2697f31..0147d80b7bde9 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
@@ -44,8 +44,7 @@ public function register_routes() {
 				array(
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => function () {
-						return true;},
+					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
 				),
 			)
 		);
@@ -59,7 +58,7 @@ public function register_routes() {
 					'callback'            => array( $this, 'install_fonts' ),
 					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
 					'args'                => array(
-						'font_families' => array(
+						'font_family_settings' => array(
 							'required'          => true,
 							'type'              => 'string',
 							'validate_callback' => array( $this, 'validate_install_font_families' ),
@@ -92,85 +91,61 @@ public function register_routes() {
 	 * @param array   $files         Files to install.
 	 * @return array $error_messages Array of error messages.
 	 */
-	private function get_validation_errors( $font_families, $files ) {
+	private function get_validation_errors( $font_family_settings, $files ) {
 		$error_messages = array();
 
-		if ( ! is_array( $font_families ) ) {
-			$error_messages[] = __( 'font_families should be an array of font families.', 'gutenberg' );
+		if ( ! is_array( $font_family_settings ) ) {
+			$error_messages[] = __( 'font_family_settings should be a font family definition.', 'gutenberg' );
 			return $error_messages;
 		}
 
-		// Checks if there is at least one font family.
-		if ( count( $font_families ) < 1 ) {
-			$error_messages[] = __( 'font_families should have at least one font family definition.', 'gutenberg' );
+		if (
+			! isset( $font_family_settings['slug'] ) ||
+			! isset( $font_family_settings['name'] ) ||
+			! isset( $font_family_settings['fontFamily'] )
+		) {
+			$error_messages[] = __( 'Font family should have slug, name and fontFamily properties defined.', 'gutenberg' );
+
 			return $error_messages;
 		}
 
-		for ( $family_index = 0; $family_index < count( $font_families ); $family_index++ ) {
-			$font_family = $font_families[ $family_index ];
-
-			if (
-				! isset( $font_family['slug'] ) ||
-				! isset( $font_family['name'] ) ||
-				! isset( $font_family['fontFamily'] )
-			) {
-				$error_messages[] = sprintf(
-					// translators: 1: font family index.
-					__( 'Font family [%s] should have slug, name and fontFamily properties defined.', 'gutenberg' ),
-					$family_index
-				);
+		if ( isset( $font_family_settings['fontFace'] ) ) {
+			if ( ! is_array( $font_family_settings['fontFace'] ) ) {
+				$error_messages[] = __( 'Font family should have fontFace property defined as an array.', 'gutenberg' );
 			}
 
-			if ( isset( $font_family['fontFace'] ) ) {
-				if ( ! is_array( $font_family['fontFace'] ) ) {
-					$error_messages[] = sprintf(
-						// translators: 1: font family index.
-						__( 'Font family [%s] should have fontFace property defined as an array.', 'gutenberg' ),
-						$family_index
-					);
-					continue;
-				}
+			if ( count( $font_family_settings['fontFace'] ) < 1 ) {
+				$error_messages[] = __( 'Font family should have at least one font face definition.', 'gutenberg' );
+			}
 
-				if ( count( $font_family['fontFace'] ) < 1 ) {
-					$error_messages[] = sprintf(
-						// translators: 1: font family index.
-						__( 'Font family [%s] should have at least one font face definition.', 'gutenberg' ),
-						$family_index
-					);
-				}
+			if ( ! empty( $font_family_settings['fontFace'] ) ) {
+				for ( $face_index = 0; $face_index < count( $font_family_settings['fontFace'] ); $face_index++ ) {
 
-				if ( ! empty( $font_family['fontFace'] ) ) {
-					for ( $face_index = 0; $face_index < count( $font_family['fontFace'] ); $face_index++ ) {
+					$font_face = $font_family_settings['fontFace'][ $face_index ];
+					if ( ! isset( $font_face['fontWeight'] ) || ! isset( $font_face['fontStyle'] ) ) {
+						$error_messages[] = sprintf(
+							// translators: font face index.
+							__( 'Font family Font face [%1$s] should have fontWeight and fontStyle properties defined.', 'gutenberg' ),
+							$face_index
+						);
+					}
 
-						$font_face = $font_family['fontFace'][ $face_index ];
-						if ( ! isset( $font_face['fontWeight'] ) || ! isset( $font_face['fontStyle'] ) ) {
-							$error_messages[] = sprintf(
-								// translators: 1: font family index, 2: font face index.
-								__( 'Font family [%1$s] Font face [%2$s] should have fontWeight and fontStyle properties defined.', 'gutenberg' ),
-								$family_index,
-								$face_index
-							);
-						}
+					if ( isset( $font_face['downloadFromUrl'] ) && isset( $font_face['uploadedFile'] ) ) {
+						$error_messages[] = sprintf(
+							// translators: font face index.
+							__( 'Font family Font face [%1$s] should have only one of the downloadFromUrl or uploadedFile properties defined and not both.', 'gutenberg' ),
+							$face_index
+						);
+					}
 
-						if ( isset( $font_face['downloadFromUrl'] ) && isset( $font_face['uploadedFile'] ) ) {
+					if ( isset( $font_face['uploadedFile'] ) ) {
+						if ( ! isset( $files[ $font_face['uploadedFile'] ] ) ) {
 							$error_messages[] = sprintf(
-								// translators: 1: font family index, 2: font face index.
-								__( 'Font family [%1$s] Font face [%2$s] should have only one of the downloadFromUrl or uploadedFile properties defined and not both.', 'gutenberg' ),
-								$family_index,
+								// translators: font face index.
+								__( 'Font family Font face [%1$s] file is not defined in the request files.', 'gutenberg' ),
 								$face_index
 							);
 						}
-
-						if ( isset( $font_face['uploadedFile'] ) ) {
-							if ( ! isset( $files[ $font_face['uploadedFile'] ] ) ) {
-								$error_messages[] = sprintf(
-									// translators: 1: font family index, 2: font face index.
-									__( 'Font family [%1$s] Font face [%2$s] file is not defined in the request files.', 'gutenberg' ),
-									$family_index,
-									$face_index
-								);
-							}
-						}
 					}
 				}
 			}
@@ -189,9 +164,9 @@ private function get_validation_errors( $font_families, $files ) {
 	 * @return true|WP_Error True if the parameter is valid, WP_Error otherwise.
 	 */
 	public function validate_install_font_families( $param, $request ) {
-		$font_families  = json_decode( $param, true );
-		$files          = $request->get_file_params();
-		$error_messages = $this->get_validation_errors( $font_families, $files );
+		$font_family_settings = json_decode( $param, true );
+		$files                = $request->get_file_params();
+		$error_messages       = $this->get_validation_errors( $font_family_settings, $files );
 
 		if ( empty( $error_messages ) ) {
 			return true;
@@ -327,17 +302,15 @@ private function has_write_permission() {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array[] $font_families Font families to install.
+	 * @param array[] $font_family_settings Font family definition.
 	 * @return bool Whether the request needs write permissions.
 	 */
-	private function needs_write_permission( $font_families ) {
-		foreach ( $font_families as $font ) {
-			if ( isset( $font['fontFace'] ) ) {
-				foreach ( $font['fontFace'] as $face ) {
-					// If the font is being downloaded from a URL or uploaded, it needs write permissions.
-					if ( isset( $face['downloadFromUrl'] ) || isset( $face['uploadedFile'] ) ) {
-						return true;
-					}
+	private function needs_write_permission( $font_family_settings ) {
+		if ( isset( $font_family_settings['fontFace'] ) ) {
+			foreach ( $font_family_settings['fontFace'] as $face ) {
+				// If the font is being downloaded from a URL or uploaded, it needs write permissions.
+				if ( isset( $face['downloadFromUrl'] ) || isset( $face['uploadedFile'] ) ) {
+					return true;
 				}
 			}
 		}
@@ -358,20 +331,20 @@ private function needs_write_permission( $font_families ) {
 	 */
 	public function install_fonts( $request ) {
 		// Get new fonts to install.
-		$fonts_param = $request->get_param( 'font_families' );
+		$font_family_settings = $request->get_param( 'font_family_settings' );
 
 		/*
 		 * As this is receiving form data, the font families are encoded as a string.
 		 * The form data is used  because local fonts need to use that format to
 		 * attach the files in the request.
 		 */
-		$fonts_to_install = json_decode( $fonts_param, true );
+		$font_family_settings = json_decode( $font_family_settings, true );
 
 		$successes       = array();
 		$errors          = array();
 		$response_status = 200;
 
-		if ( empty( $fonts_to_install ) ) {
+		if ( empty( $font_family_settings ) ) {
 			$errors[]        = new WP_Error(
 				'no_fonts_to_install',
 				__( 'No fonts to install', 'gutenberg' )
@@ -379,7 +352,7 @@ public function install_fonts( $request ) {
 			$response_status = 400;
 		}
 
-		if ( $this->needs_write_permission( $fonts_to_install ) ) {
+		if ( $this->needs_write_permission( $font_family_settings ) ) {
 			$upload_dir = WP_Font_Library::get_fonts_dir();
 			if ( ! $this->has_upload_directory() ) {
 				if ( ! wp_mkdir_p( $upload_dir ) ) {
@@ -415,15 +388,13 @@ public function install_fonts( $request ) {
 		}
 
 		// Get uploaded files (used when installing local fonts).
-		$files = $request->get_file_params();
-		foreach ( $fonts_to_install as $font_data ) {
-			$font   = new WP_Font_Family( $font_data );
-			$result = $font->install( $files );
-			if ( is_wp_error( $result ) ) {
-				$errors[] = $result;
-			} else {
-				$successes[] = $result;
-			}
+		$files  = $request->get_file_params();
+		$font   = new WP_Font_Family( $font_family_settings );
+		$result = $font->install( $files );
+		if ( is_wp_error( $result ) ) {
+			$errors[] = $result;
+		} else {
+			$successes[] = $result;
 		}
 
 		$data = array(
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/context.js b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
index 58b8621adcf0c..e0749845788d6 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/context.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
@@ -14,7 +14,7 @@ import {
  * Internal dependencies
  */
 import {
-	fetchInstallFonts,
+	fetchInstallFont,
 	fetchUninstallFonts,
 	fetchFontCollections,
 	fetchFontCollection,
@@ -26,7 +26,7 @@ import {
 	mergeFontFamilies,
 	loadFontFaceInBrowser,
 	getDisplaySrcFromFontFace,
-	makeFormDataFromFontFamilies,
+	makeFormDataFromFontFamily,
 } from './utils';
 import { toggleFont } from './utils/toggleFont';
 import getIntersectingFontFaces from './utils/get-intersecting-font-faces';
@@ -192,19 +192,19 @@ function FontLibraryProvider( { children } ) {
 		return getActivatedFontsOutline( source )[ slug ] || [];
 	};
 
-	async function installFonts( fonts ) {
+	async function installFont( font ) {
 		setIsInstalling( true );
 		try {
 			// Prepare formData to install.
-			const formData = makeFormDataFromFontFamilies( fonts );
+			const formData = makeFormDataFromFontFamily( font );
 			// Install the fonts (upload the font files to the server and create the post in the database).
-			const response = await fetchInstallFonts( formData );
+			const response = await fetchInstallFont( formData );
 			const fontsInstalled = response?.successes || [];
 			// Get intersecting font faces between the fonts we tried to installed and the fonts that were installed
 			// (to avoid activating a non installed font).
 			const fontToBeActivated = getIntersectingFontFaces(
 				fontsInstalled,
-				fonts
+				[ font ]
 			);
 			// Activate the font families (add the font families to the global styles).
 			activateCustomFontFamilies( fontToBeActivated );
@@ -358,7 +358,7 @@ function FontLibraryProvider( { children } ) {
 				isFontActivated,
 				getFontFacesActivated,
 				loadFontFaceAsset,
-				installFonts,
+				installFont,
 				uninstallFont,
 				toggleActivateFont,
 				getAvailableFontsOutline,
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
index 062ad232e3ca9..fc39e2e009653 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -54,7 +54,7 @@ function FontCollection( { id } ) {
 	const [ renderConfirmDialog, setRenderConfirmDialog ] = useState(
 		requiresPermission && ! getGoogleFontsPermissionFromStorage()
 	);
-	const { collections, getFontCollection, installFonts } =
+	const { collections, getFontCollection, installFont } =
 		useContext( FontLibraryContext );
 	const selectedCollection = collections.find(
 		( collection ) => collection.id === id
@@ -92,6 +92,11 @@ function FontCollection( { id } ) {
 		setNotice( null );
 	}, [ id ] );
 
+	useEffect( () => {
+		// If the selected fonts change, reset the selected fonts to install
+		setFontsToInstall( [] );
+	}, [ selectedFont ] );
+
 	// Reset notice after 5 seconds
 	useEffect( () => {
 		if ( notice && notice?.duration !== 0 ) {
@@ -149,7 +154,7 @@ function FontCollection( { id } ) {
 	};
 
 	const handleInstall = async () => {
-		const response = await installFonts( fontsToInstall );
+		const response = await installFont( fontsToInstall[ 0 ] );
 		const installNotice = getNoticeFromInstallResponse( response );
 		setNotice( installNotice );
 		resetFontsToInstall();
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
index 4030dcfb69a77..d4221b420cb61 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
@@ -29,7 +29,7 @@ import { unlock } from '../../../lock-unlock';
 const { ProgressBar } = unlock( componentsPrivateApis );
 
 function LocalFonts() {
-	const { installFonts } = useContext( FontLibraryContext );
+	const { installFont } = useContext( FontLibraryContext );
 	const [ notice, setNotice ] = useState( null );
 	const [ isUploading, setIsUploading ] = useState( false );
 	const supportedFormats =
@@ -153,7 +153,18 @@ function LocalFonts() {
 	 */
 	const handleInstall = async ( fontFaces ) => {
 		const fontFamilies = makeFamiliesFromFaces( fontFaces );
-		const response = await installFonts( fontFamilies );
+
+		if ( fontFamilies.length > 1 ) {
+			setNotice( {
+				type: 'error',
+				message: __(
+					'Variants from only one font family can be uploaded at a time.'
+				),
+			} );
+			return;
+		}
+
+		const response = await installFont( fontFamilies[ 0 ] );
 		const installNotice = getNoticeFromInstallResponse( response );
 		setNotice( installNotice );
 		setIsUploading( false );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
index 0ab4a7ba74224..2e7f413a6fa45 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
@@ -7,7 +7,7 @@
  */
 import apiFetch from '@wordpress/api-fetch';
 
-export async function fetchInstallFonts( data ) {
+export async function fetchInstallFont( data ) {
 	const config = {
 		path: '/wp/v2/font-families',
 		method: 'POST',
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
index 69db09d49a0ce..2874dd446efb4 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
@@ -130,16 +130,21 @@ export function getDisplaySrcFromFontFace( input, urlPrefix ) {
 	return src;
 }
 
-export function makeFormDataFromFontFamilies( fontFamilies ) {
+export function makeFormDataFromFontFamily( fontFamily ) {
 	const formData = new FormData();
-	const newFontFamilies = fontFamilies.map( ( family, familyIndex ) => {
-		const { kebabCase } = unlock( componentsPrivateApis );
-		family.slug = kebabCase( family.slug );
-		if ( family?.fontFace ) {
-			family.fontFace = family.fontFace.map( ( face, faceIndex ) => {
+	const { kebabCase } = unlock( componentsPrivateApis );
+
+	const newFontFamily = {
+		...fontFamily,
+		slug: kebabCase( fontFamily.slug ),
+	};
+
+	if ( newFontFamily?.fontFace ) {
+		const newFontFaces = newFontFamily.fontFace.map(
+			( face, faceIndex ) => {
 				if ( face.file ) {
 					// Slugified file name because the it might contain spaces or characters treated differently on the server.
-					const fileId = `file-${ familyIndex }-${ faceIndex }`;
+					const fileId = `file-${ faceIndex }`;
 					// Add the files to the formData
 					formData.append( fileId, face.file, face.file.name );
 					// remove the file object from the face object the file is referenced by the uploadedFile key
@@ -151,10 +156,11 @@ export function makeFormDataFromFontFamilies( fontFamilies ) {
 					return newFace;
 				}
 				return face;
-			} );
-		}
-		return family;
-	} );
-	formData.append( 'font_families', JSON.stringify( newFontFamilies ) );
+			}
+		);
+		newFontFamily.fontFace = newFontFaces;
+	}
+
+	formData.append( 'font_family_settings', JSON.stringify( newFontFamily ) );
 	return formData;
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js
deleted file mode 100644
index 4adae7889cc5e..0000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamilies.spec.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * Internal dependencies
- */
-import { makeFormDataFromFontFamilies } from '../index';
-
-/* global File */
-
-describe( 'makeFormDataFromFontFamilies', () => {
-	it( 'should process fontFamilies and return FormData', () => {
-		const mockFontFamilies = [
-			{
-				slug: 'bebas',
-				name: 'Bebas',
-				fontFamily: 'Bebas',
-				fontFace: [
-					{
-						file: new File( [ 'content' ], 'test-font1.woff2' ),
-						fontWeight: '500',
-						fontStyle: 'normal',
-					},
-					{
-						file: new File( [ 'content' ], 'test-font2.woff2' ),
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const formData = makeFormDataFromFontFamilies( mockFontFamilies );
-
-		expect( formData instanceof FormData ).toBeTruthy();
-
-		// Check if files are added correctly
-		expect( formData.get( 'file-0-0' ).name ).toBe( 'test-font1.woff2' );
-		expect( formData.get( 'file-0-1' ).name ).toBe( 'test-font2.woff2' );
-
-		// Check if 'fontFamilies' key in FormData is correct
-		const expectedFontFamilies = [
-			{
-				fontFace: [
-					{
-						fontWeight: '500',
-						fontStyle: 'normal',
-						uploadedFile: 'file-0-0',
-					},
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-						uploadedFile: 'file-0-1',
-					},
-				],
-				slug: 'bebas',
-				name: 'Bebas',
-				fontFamily: 'Bebas',
-			},
-		];
-		expect( JSON.parse( formData.get( 'font_families' ) ) ).toEqual(
-			expectedFontFamilies
-		);
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js
new file mode 100644
index 0000000000000..9f38903c89759
--- /dev/null
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js
@@ -0,0 +1,58 @@
+/**
+ * Internal dependencies
+ */
+import { makeFormDataFromFontFamily } from '../index';
+
+/* global File */
+
+describe( 'makeFormDataFromFontFamily', () => {
+	it( 'should process fontFamilies and return FormData', () => {
+		const mockFontFamily = {
+			slug: 'bebas',
+			name: 'Bebas',
+			fontFamily: 'Bebas',
+			fontFace: [
+				{
+					file: new File( [ 'content' ], 'test-font1.woff2' ),
+					fontWeight: '500',
+					fontStyle: 'normal',
+				},
+				{
+					file: new File( [ 'content' ], 'test-font2.woff2' ),
+					fontWeight: '400',
+					fontStyle: 'normal',
+				},
+			],
+		};
+
+		const formData = makeFormDataFromFontFamily( mockFontFamily );
+
+		expect( formData instanceof FormData ).toBeTruthy();
+
+		// Check if files are added correctly
+		expect( formData.get( 'file-0' ).name ).toBe( 'test-font1.woff2' );
+		expect( formData.get( 'file-1' ).name ).toBe( 'test-font2.woff2' );
+
+		// Check if 'fontFamilies' key in FormData is correct
+		const expectedFontFamily = {
+			fontFace: [
+				{
+					fontWeight: '500',
+					fontStyle: 'normal',
+					uploadedFile: 'file-0',
+				},
+				{
+					fontWeight: '400',
+					fontStyle: 'normal',
+					uploadedFile: 'file-1',
+				},
+			],
+			slug: 'bebas',
+			name: 'Bebas',
+			fontFamily: 'Bebas',
+		};
+		expect( JSON.parse( formData.get( 'font_family_settings' ) ) ).toEqual(
+			expectedFontFamily
+		);
+	} );
+} );
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
index d35022306f4e6..98c1cb6e13fe5 100644
--- a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
+++ b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
@@ -21,10 +21,10 @@ class Tests_Fonts_WPRESTFontFamiliesController_InstallFonts extends WP_REST_Font
 	 * @param array $files             Font files to install.
 	 * @param array $expected_response Expected response data.
 	 */
-	public function test_install_fonts( $font_families, $files, $expected_response ) {
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
-		$font_families_json = json_encode( $font_families );
-		$install_request->set_param( 'font_families', $font_families_json );
+	public function test_install_fonts( $font_family_settings, $files, $expected_response ) {
+		$install_request  = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$font_family_json = json_encode( $font_family_settings );
+		$install_request->set_param( 'font_family_settings', $font_family_json );
 		$install_request->set_file_params( $files );
 		$response = rest_get_server()->dispatch( $install_request );
 		$data     = $response->get_data();
@@ -68,38 +68,22 @@ public function data_install_fonts() {
 		return array(
 
 			'google_fonts_to_download'      => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Piazzolla',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '400',
-								'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Montserrat',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '100',
-								'src'             => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'name'       => 'Piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily'      => 'Piazzolla',
+							'fontStyle'       => 'normal',
+							'fontWeight'      => '400',
+							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
+							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
 						),
 					),
 				),
-				'files'             => array(),
-				'expected_response' => array(
+				'files'                => array(),
+				'expected_response'    => array(
 					'successes' => array(
 						array(
 							'fontFamily' => 'Piazzolla',
@@ -114,55 +98,27 @@ public function data_install_fonts() {
 								),
 							),
 						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => '/wp-content/fonts/montserrat_normal_100.ttf',
-								),
-							),
-						),
 					),
 					'errors'    => array(),
 				),
 			),
 
 			'google_fonts_to_use_as_is'     => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily' => 'Piazzolla',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '400',
-								'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily' => 'Montserrat',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '100',
-								'src'        => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'name'       => 'Piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily' => 'Piazzolla',
+							'fontStyle'  => 'normal',
+							'fontWeight' => '400',
+							'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
 						),
 					),
 				),
-				'files'             => array(),
-				'expected_response' => array(
+				'files'                => array(),
+				'expected_response'    => array(
 					'successes' => array(
 						array(
 							'fontFamily' => 'Piazzolla',
@@ -177,35 +133,19 @@ public function data_install_fonts() {
 								),
 							),
 						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-
-								),
-							),
-						),
 					),
 					'errors'    => array(),
 				),
 			),
 
 			'fonts_without_font_faces'      => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Arial',
-						'slug'       => 'arial',
-						'name'       => 'Arial',
-					),
+				'font_family_settings' => array(
+					'fontFamily' => 'Arial',
+					'slug'       => 'arial',
+					'name'       => 'Arial',
 				),
-				'files'             => array(),
-				'expected_response' => array(
+				'files'                => array(),
+				'expected_response'    => array(
 					'successes' => array(
 						array(
 							'fontFamily' => 'Arial',
@@ -218,35 +158,20 @@ public function data_install_fonts() {
 			),
 
 			'fonts_with_local_fonts_assets' => array(
-				'font_families'     => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files0',
-							),
-						),
-					),
-					array(
-						'fontFamily' => 'Montserrat',
-						'slug'       => 'montserrat',
-						'name'       => 'Montserrat',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Montserrat',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '100',
-								'uploadedFile' => 'files1',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'name'       => 'Piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily'   => 'Piazzolla',
+							'fontStyle'    => 'normal',
+							'fontWeight'   => '400',
+							'uploadedFile' => 'files0',
 						),
 					),
 				),
-				'files'             => array(
+				'files'                => array(
 					'files0' => array(
 						'name'     => 'piazzola1.ttf',
 						'type'     => 'font/ttf',
@@ -262,7 +187,7 @@ public function data_install_fonts() {
 						'size'     => 123,
 					),
 				),
-				'expected_response' => array(
+				'expected_response'    => array(
 					'successes' => array(
 						array(
 							'fontFamily' => 'Piazzolla',
@@ -277,20 +202,6 @@ public function data_install_fonts() {
 								),
 							),
 						),
-						array(
-							'fontFamily' => 'Montserrat',
-							'slug'       => 'montserrat',
-							'name'       => 'Montserrat',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Montserrat',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '100',
-									'src'        => '/wp-content/fonts/montserrat_normal_100.ttf',
-								),
-							),
-						),
-
 					),
 					'errors'    => array(),
 				),
@@ -325,15 +236,15 @@ public function data_install_with_improper_inputs() {
 
 		return array(
 			'not a font families array'        => array(
-				'font_families' => 'This is not an array',
+				'font_family_settings' => 'This is not an array',
 			),
 
 			'empty array'                      => array(
-				'font_families' => array(),
+				'font_family_settings' => array(),
 			),
 
 			'without slug'                     => array(
-				'font_families' => array(
+				'font_family_settings' => array(
 					array(
 						'fontFamily' => 'Piazzolla',
 						'name'       => 'Piazzolla',
@@ -342,63 +253,55 @@ public function data_install_with_improper_inputs() {
 			),
 
 			'with improper font face property' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => 'This is not an array',
-					),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'name'       => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'fontFace'   => 'This is not an array',
 				),
 			),
 
 			'with empty font face property'    => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(),
-					),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'name'       => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'fontFace'   => array(),
 				),
 			),
 
 			'fontface referencing uploaded file without uploaded files' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files0',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'name'       => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily'   => 'Piazzolla',
+							'fontStyle'    => 'normal',
+							'fontWeight'   => '400',
+							'uploadedFile' => 'files0',
 						),
 					),
 				),
-				'files'         => array(),
+				'files'                => array(),
 			),
 
 			'fontface referencing uploaded file without uploaded files' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'   => 'Piazzolla',
-								'fontStyle'    => 'normal',
-								'fontWeight'   => '400',
-								'uploadedFile' => 'files666',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'name'       => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily'   => 'Piazzolla',
+							'fontStyle'    => 'normal',
+							'fontWeight'   => '400',
+							'uploadedFile' => 'files666',
 						),
 					),
 				),
-				'files'         => array(
+				'files'                => array(
 					'files0' => array(
 						'name'     => 'piazzola1.ttf',
 						'type'     => 'font/ttf',
@@ -410,20 +313,18 @@ public function data_install_with_improper_inputs() {
 			),
 
 			'fontface with incompatible properties (downloadFromUrl and uploadedFile together)' => array(
-				'font_families' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'slug'       => 'piazzolla',
-						'name'       => 'Piazzolla',
-						'fontFace'   => array(
-							array(
-								'fontFamily'      => 'Piazzolla',
-								'fontStyle'       => 'normal',
-								'fontWeight'      => '400',
-								'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								'uploadedFile'    => 'files0',
-							),
+				'font_family_settings' => array(
+					'fontFamily' => 'Piazzolla',
+					'slug'       => 'piazzolla',
+					'name'       => 'Piazzolla',
+					'fontFace'   => array(
+						array(
+							'fontFamily'      => 'Piazzolla',
+							'fontStyle'       => 'normal',
+							'fontWeight'      => '400',
+							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
+							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
+							'uploadedFile'    => 'files0',
 						),
 					),
 				),

From 73474eba696b897627a0f7b3dd84a646e294e690 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Mon, 8 Jan 2024 23:21:44 +0900
Subject: [PATCH 004/296] Add Template Modal: Update scroll related layout
 (#57617)

---
 packages/edit-site/src/components/add-new-template/style.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/add-new-template/style.scss b/packages/edit-site/src/components/add-new-template/style.scss
index b1c2b669e24ce..4881745c92afa 100644
--- a/packages/edit-site/src/components/add-new-template/style.scss
+++ b/packages/edit-site/src/components/add-new-template/style.scss
@@ -39,7 +39,8 @@
 
 	.edit-site-custom-template-modal__suggestions_list {
 		@include break-small() {
-			overflow: scroll;
+			max-height: $grid-unit-70 * 4; // Height of four buttons
+			overflow-y: auto;
 		}
 
 		&__list-item {

From 1b5ebca728074569e1ddff9928badcc882627e1c Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Mon, 8 Jan 2024 15:53:35 +0000
Subject: [PATCH 005/296] Data views: Make title display in grid views
 consistent (#57553)

---
 packages/dataviews/src/style.scss             | 26 ++++++++++++-------
 .../edit-site/src/components/list/style.scss  |  5 ----
 .../src/components/page-pages/index.js        |  2 +-
 .../src/components/page-pages/style.scss      |  6 -----
 .../page-patterns/dataviews-patterns.js       |  5 +++-
 .../src/components/page-templates/index.js    |  2 +-
 6 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index edf1500d2cc5a..5a2bccdef68f2 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -149,10 +149,22 @@
 	}
 
 	.dataviews-view-grid__card {
-		h3 { // Todo: A better way to target this
-			white-space: nowrap;
-			overflow: hidden;
-			text-overflow: ellipsis;
+		.dataviews-view-grid__primary-field {
+			.dataviews-view-grid__title-field {
+				white-space: nowrap;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: block;
+				font-size: $default-font-size;
+				width: 100%;
+			}
+
+			.dataviews-view-grid__title-field a,
+			button.dataviews-view-grid__title-field {
+				font-weight: 500;
+				color: $gray-900;
+				text-decoration: none;
+			}
 		}
 	}
 
@@ -173,12 +185,6 @@
 
 	.dataviews-view-grid__primary-field {
 		min-height: $grid-unit-30;
-
-		a {
-			color: $gray-900;
-			text-decoration: none;
-			font-weight: 500;
-		}
 	}
 
 	.dataviews-view-grid__fields {
diff --git a/packages/edit-site/src/components/list/style.scss b/packages/edit-site/src/components/list/style.scss
index 9d6e0f0f1d6e2..cfc65252c8e68 100644
--- a/packages/edit-site/src/components/list/style.scss
+++ b/packages/edit-site/src/components/list/style.scss
@@ -186,8 +186,3 @@
 	display: block;
 	color: $gray-700;
 }
-
-.edit-site-list-title__customized-info {
-	font-size: $default-font-size;
-	font-weight: 500;
-}
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 164b4daf8603c..8729922faabea 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -222,7 +222,7 @@ export default function PagePages() {
 						<VStack spacing={ 1 }>
 							<View
 								as="span"
-								className="edit-site-page-pages__list-view-title-field"
+								className="dataviews-view-grid__title-field"
 							>
 								{ [ LAYOUT_TABLE, LAYOUT_GRID ].includes(
 									view.type
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index 35ac8273dc555..933fdadb8d070 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -3,9 +3,3 @@
 	width: $grid-unit-40;
 	height: $grid-unit-40;
 }
-
-
-.edit-site-page-pages__list-view-title-field {
-	font-size: $default-font-size;
-	font-weight: 500;
-}
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
index bf18e0ffed111..ad474d882cfcf 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
@@ -199,7 +199,9 @@ function Title( { item, categoryId } ) {
 			) }
 			<Flex as="span" gap={ 0 } justify="left">
 				{ item.type === PATTERN_TYPES.theme ? (
-					item.title
+					<span className="dataviews-view-grid__title-field">
+						{ item.title }
+					</span>
 				) : (
 					<Heading level={ 5 }>
 						<Button
@@ -208,6 +210,7 @@ function Title( { item, categoryId } ) {
 							// Required for the grid's roving tab index system.
 							// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
 							tabIndex="-1"
+							className="dataviews-view-grid__title-field"
 						>
 							{ item.title || item.name }
 						</Button>
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 1aaf1e153d0c5..c0e0289311db6 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -103,7 +103,7 @@ function TemplateTitle( { item, viewType } ) {
 
 	return (
 		<VStack spacing={ 1 }>
-			<View as="span" className="edit-site-list-title__customized-info">
+			<View as="span" className="dataviews-view-grid__title-field">
 				<Link
 					params={ {
 						postId: item.id,

From cd1237e82423ff32c25bc7c88f874a75d876abf1 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Mon, 8 Jan 2024 16:01:18 +0000
Subject: [PATCH 006/296] Update Table layout design details (#57644)

---
 packages/dataviews/src/pagination.js          |  4 +--
 packages/dataviews/src/style.scss             | 30 +++++++++++++++----
 packages/dataviews/src/view-table.js          |  8 +++--
 .../src/components/page-pages/style.scss      |  5 ++--
 4 files changed, 35 insertions(+), 12 deletions(-)

diff --git a/packages/dataviews/src/pagination.js b/packages/dataviews/src/pagination.js
index 21aeda8a602a1..2c9cade42d89b 100644
--- a/packages/dataviews/src/pagination.js
+++ b/packages/dataviews/src/pagination.js
@@ -23,8 +23,8 @@ const Pagination = memo( function Pagination( {
 		totalPages !== 1 && (
 			<HStack
 				expanded={ false }
-				spacing={ 3 }
-				justify="space-between"
+				spacing={ 6 }
+				justify="end"
 				className="dataviews-pagination"
 			>
 				<HStack justify="flex-start" expanded={ false } spacing={ 2 }>
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 5a2bccdef68f2..049f006dd97bd 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -88,6 +88,11 @@
 		td:first-child,
 		th:first-child {
 			padding-left: $grid-unit-40;
+
+			.dataviews-table-header-button,
+			.dataviews-table-header {
+				margin-left: - #{$grid-unit-10};
+			}
 		}
 
 		td:last-child,
@@ -112,18 +117,27 @@
 		th {
 			position: sticky;
 			top: -1px;
-			background-color: lighten($gray-100, 4%);
+			background-color: $white;
 			box-shadow: inset 0 -#{$border-width} 0 $gray-100;
-			border-top: 1px solid $gray-100;
-			padding-top: $grid-unit-05;
-			padding-bottom: $grid-unit-05;
+			padding-top: $grid-unit-10;
+			padding-bottom: $grid-unit-10;
 			z-index: 1;
+			font-size: 11px;
+			text-transform: uppercase;
+			font-weight: 500;
+			padding-left: $grid-unit-05;
 		}
 	}
 
 	.dataviews-table-header-button {
-		padding: 0;
-		gap: $grid-unit-05;
+		padding: $grid-unit-05 $grid-unit-10;
+		font-size: 11px;
+		text-transform: uppercase;
+		font-weight: 500;
+
+		&:not(:hover) {
+			color: $gray-900;
+		}
 
 		span {
 			speak: none;
@@ -133,6 +147,10 @@
 			}
 		}
 	}
+
+	.dataviews-table-header {
+		padding-left: $grid-unit-05;
+	}
 }
 
 .dataviews-grid-view {
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index 083931bb5203e..0be2ee6767ddf 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -91,8 +91,8 @@ const HeaderMenu = forwardRef( function HeaderMenu(
 				<Button
 					size="compact"
 					className="dataviews-table-header-button"
-					style={ { padding: 0 } }
 					ref={ ref }
+					variant="tertiary"
 				>
 					{ field.header }
 					{ isSorted && (
@@ -409,7 +409,11 @@ function ViewTable( {
 							</th>
 						) ) }
 						{ !! actions?.length && (
-							<th data-field-id="actions">{ __( 'Actions' ) }</th>
+							<th data-field-id="actions">
+								<span className="dataviews-table-header">
+									{ __( 'Actions' ) }
+								</span>
+							</th>
 						) }
 					</tr>
 				</thead>
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index 933fdadb8d070..c2d2cc25529c4 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -1,5 +1,6 @@
 .edit-site-page-pages__featured-image {
 	border-radius: $grid-unit-05;
-	width: $grid-unit-40;
-	height: $grid-unit-40;
+	width: $grid-unit-50;
+	height: $grid-unit-50;
+	display: block;
 }

From 9ce94fa6e038b2e7d3f97249c966908ae6284a25 Mon Sep 17 00:00:00 2001
From: JuanMa <juanma.garrido@automattic.com>
Date: Mon, 8 Jan 2024 19:35:04 +0100
Subject: [PATCH 007/296] Docs: Fundamentals of Block Development - Static or
 Dynamic rendering of a block (#57250)

* Static or Dynamic rendering of a block  first draft

* Add explanation of static and dynamic rendering of blocks

* Updated context with first version

* Update link in static-dynamic-rendering.md

* Refactor static/dynamic rendering explanation in static-dynamic-rendering.md

* Update static/dynamic rendering explanation

* Update block fundamentals documentation with core blocks examples

* Refactor dynamic rendering in save function

* Refactor static/dynamic rendering examples in static-dynamic-rendering.md

* Update examples of core blocks with static rendering

* Update InnerBlocks link in static-dynamic-rendering.md

* Update docs/getting-started/fundamentals/README.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/markup-representation-block.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update docs/getting-started/fundamentals/static-dynamic-rendering.md

Co-authored-by: Nick Diego <nick.diego@automattic.com>

* Update diagrams and improved examples

* Updates on the text as per Justin's feedback

* small adjustments

* Fix capitalization in static-dynamic-rendering.md

---------

Co-authored-by: Nick Diego <nick.diego@automattic.com>
---
 docs/getting-started/fundamentals/README.md   |   3 +-
 .../markup-representation-block.md            |   2 +-
 .../fundamentals/static-dynamic-rendering.md  | 170 ++++++++++++++++++
 docs/manifest.json                            |   6 +
 docs/toc.json                                 |   3 +
 5 files changed, 182 insertions(+), 2 deletions(-)
 create mode 100644 docs/getting-started/fundamentals/static-dynamic-rendering.md

diff --git a/docs/getting-started/fundamentals/README.md b/docs/getting-started/fundamentals/README.md
index 799ff89aa3941..0683e55d7edf7 100644
--- a/docs/getting-started/fundamentals/README.md
+++ b/docs/getting-started/fundamentals/README.md
@@ -9,5 +9,6 @@ In this section, you will learn:
 1. [**Registration of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block) - How a block is registered in both the server and the client.
 1. [**Block wrapper**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-wrapper) - How to set proper attributes to the block's markup wrapper.
 1. [**The block in the Editor**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-in-the-editor) - The block as a React component loaded in the Block Editor and its possibilities.
-1. [**Markup representation of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block) - How blocks are represented in the DB or in templates.
+1. [**Markup representation of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block) - How blocks are represented in the database, theme templates, or patterns.
+1. [**Static or Dynamic rendering of a block**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/static-dynamic-rendering) - How blocks can generate their output for the front end dynamically or statically.
 1. [**Javascript in the Block Editor**](https://developer.wordpress.org/block-editor/getting-started/fundamentals/javascript-in-the-block-editor) - How to work with Javascript for the Block Editor.
\ No newline at end of file
diff --git a/docs/getting-started/fundamentals/markup-representation-block.md b/docs/getting-started/fundamentals/markup-representation-block.md
index 20289f8f228ce..506d0feb8d3d1 100644
--- a/docs/getting-started/fundamentals/markup-representation-block.md
+++ b/docs/getting-started/fundamentals/markup-representation-block.md
@@ -23,7 +23,7 @@ The [markup representation of a block is parsed for the Block Editor](https://de
 Whenever a block is saved, the `save` function, defined when the [block is registered in the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side), is called to return the markup that will be saved into the database within the block delimiter's comment. If `save` is `null` (common case for blocks with dynamic rendering), only a single line block delimiter's comment is stored, along with any attributes
 
 The Post Editor checks that the markup created by the `save` function is identical to the block's markup saved to the database:
-- If there are any differences, the Post Editor trigger a **block validation error**.
+- If there are any differences, the Post Editor triggers a [block validation error](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation).
 - Block validation errors usually happen when a block’s `save` function is updated to change the markup produced by the block.
 - A block developer can mitigate these issues by adding a [**block deprecation**](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-deprecation/) to register the change in the block.
 
diff --git a/docs/getting-started/fundamentals/static-dynamic-rendering.md b/docs/getting-started/fundamentals/static-dynamic-rendering.md
new file mode 100644
index 0000000000000..34d5432850c45
--- /dev/null
+++ b/docs/getting-started/fundamentals/static-dynamic-rendering.md
@@ -0,0 +1,170 @@
+# Static or Dynamic rendering of a block
+
+The block's markup returned on the front end can be dynamically generated on the server when the block is requested from the client (dynamic blocks) or statically generated when the block is saved in the Block Editor (static blocks).
+
+<div class="callout callout-tip">
+The post <a href="https://developer.wordpress.org/news/2023/02/27/static-vs-dynamic-blocks-whats-the-difference/">Static vs. dynamic blocks: What’s the difference?</a> provides a great introduction to static and dynamic blocks.
+</div>
+
+## Static rendering 
+
+![Blocks with static rendering diagram](https://developer.wordpress.org/files/2024/01/static-rendering.png)
+
+Blocks are considered "static" when they have "static rendering", this is when their output for the front end is statically generated when saved to the database, as returned by their `save` functions.
+
+Blocks have static rendering **when no dynamic rendering method has been defined (or is available) for the block**. In this case, the output for the front end will be taken from the [markup representation of the block in the database](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block/) that is returned by its `save` function when the block is saved in the Block Editor. This type is block is often called a "static block".
+
+### How to define static rendering for a block
+
+The `save` function, which can be defined when [registering a block on the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side), determines the markup of the block that will be stored in the database when the content is saved and eventually returned to the front end when there's a request. This markup is stored wrapped up in [unique block delimiters](https://developer.wordpress.org/block-editor/getting-started/fundamentals/markup-representation-block/) but only the markup inside these block indicators is returned as the markup to be rendered for the block on the front end.
+
+To define static rendering for a block we define a `save` function for the block without any dynamic rendering method.
+
+<details><summary><em>Example of static rendering of the <code>preformatted</code> core block</em></summary>
+<br/>
+For example, the following <a href="https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/preformatted/save.js"><code>save</code> function</a> of the <a hreh="https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/preformatted"><code>preformatted</code></a> core block...
+
+```js
+import { RichText, useBlockProps } from '@wordpress/block-editor';
+
+export default function save( { attributes } ) {
+	const { content } = attributes;
+
+	return (
+		<pre { ...useBlockProps.save() }>
+			<RichText.Content value={ content } />
+		</pre>
+	);
+}
+```
+
+...generates the following markup representation of the block when `attributes.content` has the value `"This is some preformatted text"`...
+
+```html
+<!-- wp:preformatted -->
+<pre class="wp-block-preformatted">This is some preformatted text</pre>
+<!-- /wp:preformatted -->
+```
+
+...and it will return the following markup for the block to the front end when there's a request.
+
+```html
+<pre class="wp-block-preformatted">This is some preformatted text</pre>
+```
+
+</details>
+
+<br/>
+
+Blocks with dynamic rendering can also define a markup representation of the block (via the `save` function) which can be processed in the server before returning the markup to the front end. If no dynamic rendering method is found, any markup representation of the block in the database will be returned to the front end.
+
+<div class="callout callout-info">
+The markup stored for a block can be modified before it gets rendered on the front end via hooks such as <a href="https://developer.wordpress.org/reference/functions/render_block/"><code>render_block</code></a> or via <code>$render_callback</code>.
+</div>
+
+Some examples of core blocks with static rendering are:
+- [`separator`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator/save.js) function) 
+- [`spacer`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer/save.js) function).
+- [`button`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/button) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/button/save.js) function).
+
+
+## Dynamic rendering
+
+Blocks with dynamic rendering are blocks that **build their structure and content on the fly when the block is requested from the client**. This type of block is often called a "dynamic block".
+
+![Blocks with dynamic rendering diagram](https://developer.wordpress.org/files/2024/01/dynamic-rendering.png)
+
+There are some common use cases for dynamic blocks:
+
+1. **Blocks where content should change even if a post has not been updated**. An example is the [`latest-posts` core block](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/latest-posts), which will update its content on request time, everywhere it is used after a new post is published.
+2. **Blocks where updates to the markup should be immediately shown on the front end of the website**. For example, if you update the structure of a block by adding a new class, adding an HTML element, or changing the layout in any other way, using a dynamic block ensures those changes are applied immediately on all occurrences of that block across the site. If a dynamic block is not used then when block code is updated, Gutenberg's [validation process](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation) generally applies, causing users to see the validation message: "This block appears to have been modified externally".
+
+### How to define dynamic rendering for a block
+
+A block can define dynamic rendering in two main ways:
+1. Via the `render_callback` argument that can be passed to the [`register_block_type()` function](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-php-server-side).
+1. Via a separate PHP file (usually named `render.php`) which path can be defined at the [`render` property of the `block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style).
+
+Both of these ways to define the block's dynamic rendering receive the following data:
+ - `$attributes` - The array of attributes for this block.
+ - `$content` - Rendered block output (markup of the block as stored in the database).
+ - `$block` - The instance of the [WP_Block](https://developer.wordpress.org/reference/classes/wp_block/) class that represents the block being rendered ([metadata of the block](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)).
+
+<details><summary><em>Example of dynamic rendering of the <code>site-title</code> core block</em></summary>
+<br/>
+
+For example, the [`site-title`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/site-title) core block with the following function registered as [`render_callback`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.php)...
+
+
+```php
+function render_block_core_site_title( $attributes ) {
+	$site_title = get_bloginfo( 'name' );
+	if ( ! $site_title ) {
+		return;
+	}
+
+	$tag_name = 'h1';
+	$classes  = empty( $attributes['textAlign'] ) ? '' : "has-text-align-{$attributes['textAlign']}";
+	if ( isset( $attributes['style']['elements']['link']['color']['text'] ) ) {
+		$classes .= ' has-link-color';
+	}
+
+	if ( isset( $attributes['level'] ) ) {
+		$tag_name = 0 === $attributes['level'] ? 'p' : 'h' . (int) $attributes['level'];
+	}
+
+	if ( $attributes['isLink'] ) {
+		$aria_current = is_home() || ( is_front_page() && 'page' === get_option( 'show_on_front' ) ) ? ' aria-current="page"' : '';
+		$link_target  = ! empty( $attributes['linkTarget'] ) ? $attributes['linkTarget'] : '_self';
+
+		$site_title = sprintf(
+			'<a href="%1$s" target="%2$s" rel="home"%3$s>%4$s</a>',
+			esc_url( home_url() ),
+			esc_attr( $link_target ),
+			$aria_current,
+			esc_html( $site_title )
+		);
+	}
+	$wrapper_attributes = get_block_wrapper_attributes( array( 'class' => trim( $classes ) ) );
+
+	return sprintf(
+		'<%1$s %2$s>%3$s</%1$s>',
+		$tag_name,
+		$wrapper_attributes,
+		// already pre-escaped if it is a link.
+		$attributes['isLink'] ? $site_title : esc_html( $site_title )
+	);
+}
+```
+
+... generates the following markup representation of the block in the database (as [there's no `save` function defined for this block](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.js))...
+
+```html
+<!-- wp:site-title /-->
+```
+
+...and it could generate the following markup for the block to the front end when there's a request (depending on the specific values on the server at request time).
+
+```
+<h1 class="wp-block-site-title"><a href="https://www.wp.org" target="_self" rel="home">My WordPress Website</a></h1>
+```
+
+</details>
+<br/>
+
+### HTML representation of dynamic blocks in the database (`save`)
+
+For dynamic blocks, the `save` callback function can return just `null`, which tells the editor to save only the block delimiter comment (along with any existing [block attributes](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/)) to the database. These attributes are then passed into the server-side rendering callback, which will determine how to display the block on the front end of your site. **When `save` is `null`, the Block Editor will skip the [block markup validation process](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation)**, avoiding issues with frequently changing markup.
+
+Blocks with dynamic rendering can also save an HTML representation of the block as a backup. If you provide a server-side rendering callback, the HTML representing the block in the database will be replaced with the output of your callback, but will be rendered if your block is deactivated (the plugin that registers the block is uninstalled) or your render callback is removed.
+
+In some cases, the block saves an HTML representation of the block and uses a dynamic rendering to fine-tune this markup if some conditions are met. Some examples of core blocks using this approach are:
+- The [`cover`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover) block saves a [full HTML representation of the block in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover/save.js). This markup is processed via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L74) when requested to do some PHP magic that dynamically [injects the featured image if the "use featured image" setting is enabled](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L16).
+- The [`image`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image) block also saves [its HTML representation in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image/save.js) and processes it via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L363) when requested to [add some attributes to the markup](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L18) if some conditions are met.
+
+If you are using [InnerBlocks](https://developer.wordpress.org/block-editor/how-to-guides/block-tutorial/nested-blocks-inner-blocks/) in a dynamic block, you will need to save the `InnerBlocks` in the `save` callback function using `<InnerBlocks.Content/>`.
+
+## Additional Resources
+
+- [Static vs. dynamic blocks: What’s the difference?](https://developer.wordpress.org/news/2023/02/27/static-vs-dynamic-blocks-whats-the-difference/)
+- [Block deprecation – a tutorial](https://developer.wordpress.org/news/2023/03/10/block-deprecation-a-tutorial/)
\ No newline at end of file
diff --git a/docs/manifest.json b/docs/manifest.json
index 5629675c0b57e..67b8fac99f713 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -95,6 +95,12 @@
 		"markdown_source": "../docs/getting-started/fundamentals/markup-representation-block.md",
 		"parent": "fundamentals"
 	},
+	{
+		"title": "Static or Dynamic rendering of a block",
+		"slug": "static-dynamic-rendering",
+		"markdown_source": "../docs/getting-started/fundamentals/static-dynamic-rendering.md",
+		"parent": "fundamentals"
+	},
 	{
 		"title": "Working with Javascript for the Block Editor",
 		"slug": "javascript-in-the-block-editor",
diff --git a/docs/toc.json b/docs/toc.json
index 49110f8bed957..849de991c7808 100644
--- a/docs/toc.json
+++ b/docs/toc.json
@@ -42,6 +42,9 @@
 					{
 						"docs/getting-started/fundamentals/markup-representation-block.md": []
 					},
+					{
+						"docs/getting-started/fundamentals/static-dynamic-rendering.md": []
+					},
 					{
 						"docs/getting-started/fundamentals/javascript-in-the-block-editor.md": []
 					}

From f0fe982735f664e7b0445f5f47da53ee7e457776 Mon Sep 17 00:00:00 2001
From: Chad Chadbourne <13856531+chad1008@users.noreply.github.com>
Date: Mon, 8 Jan 2024 14:40:02 -0500
Subject: [PATCH 008/296] Components: replace `TabPanel` with `Tabs` in the
 Style Book (#57287)

* implement Tabs

* update styles

* focusable false
---
 .../src/components/style-book/index.js        | 49 ++++++++++++-------
 .../src/components/style-book/style.scss      |  6 +--
 2 files changed, 35 insertions(+), 20 deletions(-)

diff --git a/packages/edit-site/src/components/style-book/index.js b/packages/edit-site/src/components/style-book/index.js
index d3e0cb3531ae9..7ecfdc3506cf8 100644
--- a/packages/edit-site/src/components/style-book/index.js
+++ b/packages/edit-site/src/components/style-book/index.js
@@ -8,7 +8,6 @@ import classnames from 'classnames';
  */
 import {
 	Disabled,
-	TabPanel,
 	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -48,6 +47,7 @@ const {
 	CompositeV2: Composite,
 	CompositeItemV2: CompositeItem,
 	useCompositeStoreV2: useCompositeStore,
+	Tabs,
 } = unlock( componentsPrivateApis );
 
 // The content area of the Style Book is rendered within an iframe so that global styles
@@ -253,22 +253,37 @@ function StyleBook( {
 			>
 				{ resizeObserver }
 				{ showTabs ? (
-					<TabPanel
-						className="edit-site-style-book__tab-panel"
-						tabs={ tabs }
-					>
-						{ ( tab ) => (
-							<StyleBookBody
-								category={ tab.name }
-								examples={ examples }
-								isSelected={ isSelected }
-								onSelect={ onSelect }
-								settings={ settings }
-								sizes={ sizes }
-								title={ tab.title }
-							/>
-						) }
-					</TabPanel>
+					<div className="edit-site-style-book__tabs">
+						<Tabs>
+							<Tabs.TabList>
+								{ tabs.map( ( tab ) => (
+									<Tabs.Tab
+										tabId={ tab.name }
+										key={ tab.name }
+									>
+										{ tab.title }
+									</Tabs.Tab>
+								) ) }
+							</Tabs.TabList>
+							{ tabs.map( ( tab ) => (
+								<Tabs.TabPanel
+									key={ tab.name }
+									tabId={ tab.name }
+									focusable={ false }
+								>
+									<StyleBookBody
+										category={ tab.name }
+										examples={ examples }
+										isSelected={ isSelected }
+										onSelect={ onSelect }
+										settings={ settings }
+										sizes={ sizes }
+										title={ tab.title }
+									/>
+								</Tabs.TabPanel>
+							) ) }
+						</Tabs>
+					</div>
 				) : (
 					<StyleBookBody
 						examples={ examples }
diff --git a/packages/edit-site/src/components/style-book/style.scss b/packages/edit-site/src/components/style-book/style.scss
index 0ddefb055a8d8..3b2c6ab0867db 100644
--- a/packages/edit-site/src/components/style-book/style.scss
+++ b/packages/edit-site/src/components/style-book/style.scss
@@ -17,13 +17,13 @@
 	}
 }
 
-.edit-site-style-book__tab-panel {
-	.components-tab-panel__tabs {
+.edit-site-style-book__tabs {
+	[role="tablist"] {
 		background: $white;
 		color: $gray-900;
 	}
 
-	.components-tab-panel__tab-content {
+	[role="tabpanel"] {
 		bottom: 0;
 		left: 0;
 		overflow: auto;

From e27b3066fe724ddd97f33f229b68df240e25467a Mon Sep 17 00:00:00 2001
From: Chad Chadbourne <13856531+chad1008@users.noreply.github.com>
Date: Mon, 8 Jan 2024 15:24:54 -0500
Subject: [PATCH 009/296] Components: replace `TabPanel` with `Tabs` in inline
 color picker (#57292)

* add support for private apis

* implement Tabs

* update styles

* clean up styles
---
 package-lock.json                             |  2 +
 packages/format-library/package.json          |  1 +
 packages/format-library/src/lock-unlock.js    | 10 ++++
 .../format-library/src/text-color/inline.js   | 59 +++++++++++--------
 .../format-library/src/text-color/style.scss  | 23 +-------
 packages/private-apis/src/implementation.js   |  1 +
 6 files changed, 53 insertions(+), 43 deletions(-)
 create mode 100644 packages/format-library/src/lock-unlock.js

diff --git a/package-lock.json b/package-lock.json
index 326c7ac7bf80c..25144ad2de978 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55121,6 +55121,7 @@
 				"@wordpress/html-entities": "file:../html-entities",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
+				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/rich-text": "file:../rich-text",
 				"@wordpress/url": "file:../url"
 			},
@@ -69972,6 +69973,7 @@
 				"@wordpress/html-entities": "file:../html-entities",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
+				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/rich-text": "file:../rich-text",
 				"@wordpress/url": "file:../url"
 			}
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index d2ea9062cf79e..b71addc176e7c 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -35,6 +35,7 @@
 		"@wordpress/html-entities": "file:../html-entities",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
+		"@wordpress/private-apis": "file:../private-apis",
 		"@wordpress/rich-text": "file:../rich-text",
 		"@wordpress/url": "file:../url"
 	},
diff --git a/packages/format-library/src/lock-unlock.js b/packages/format-library/src/lock-unlock.js
new file mode 100644
index 0000000000000..f7512caa4b746
--- /dev/null
+++ b/packages/format-library/src/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'@wordpress/format-library'
+	);
diff --git a/packages/format-library/src/text-color/inline.js b/packages/format-library/src/text-color/inline.js
index f71c776622258..98ced2cca01e2 100644
--- a/packages/format-library/src/text-color/inline.js
+++ b/packages/format-library/src/text-color/inline.js
@@ -17,13 +17,24 @@ import {
 	store as blockEditorStore,
 	useCachedTruthy,
 } from '@wordpress/block-editor';
-import { Popover, TabPanel } from '@wordpress/components';
+import {
+	Popover,
+	privateApis as componentsPrivateApis,
+} from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import { textColor as settings, transparentValue } from './index';
+import { unlock } from '../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
+const TABS = [
+	{ name: 'color', title: __( 'Text' ) },
+	{ name: 'backgroundColor', title: __( 'Background' ) },
+];
 
 function parseCSS( css = '' ) {
 	return css.split( ';' ).reduce( ( accumulator, rule ) => {
@@ -155,30 +166,32 @@ export default function InlineColorUI( {
 	return (
 		<Popover
 			onClose={ onClose }
-			className="components-inline-color-popover"
+			className="format-library__inline-color-popover"
 			anchor={ popoverAnchor }
 		>
-			<TabPanel
-				tabs={ [
-					{
-						name: 'color',
-						title: __( 'Text' ),
-					},
-					{
-						name: 'backgroundColor',
-						title: __( 'Background' ),
-					},
-				] }
-			>
-				{ ( tab ) => (
-					<ColorPicker
-						name={ name }
-						property={ tab.name }
-						value={ value }
-						onChange={ onChange }
-					/>
-				) }
-			</TabPanel>
+			<Tabs>
+				<Tabs.TabList>
+					{ TABS.map( ( tab ) => (
+						<Tabs.Tab tabId={ tab.name } key={ tab.name }>
+							{ tab.title }
+						</Tabs.Tab>
+					) ) }
+				</Tabs.TabList>
+				{ TABS.map( ( tab ) => (
+					<Tabs.TabPanel
+						tabId={ tab.name }
+						focusable={ false }
+						key={ tab.name }
+					>
+						<ColorPicker
+							name={ name }
+							property={ tab.name }
+							value={ value }
+							onChange={ onChange }
+						/>
+					</Tabs.TabPanel>
+				) ) }
+			</Tabs>
 		</Popover>
 	);
 }
diff --git a/packages/format-library/src/text-color/style.scss b/packages/format-library/src/text-color/style.scss
index 121ba8da756cf..439af6db38d0c 100644
--- a/packages/format-library/src/text-color/style.scss
+++ b/packages/format-library/src/text-color/style.scss
@@ -1,23 +1,6 @@
-.components-inline-color-popover {
+.format-library__inline-color-popover {
 
-	.components-popover__content {
-		.components-tab-panel__tab-content {
-			padding: 16px;
-		}
-
-		.components-color-palette {
-			margin-top: 0.6rem;
-		}
-
-		.components-base-control__title {
-			display: block;
-			margin-bottom: 16px;
-			font-weight: 600;
-			color: #191e23;
-		}
-
-		.component-color-indicator {
-			vertical-align: text-bottom;
-		}
+	[role="tabpanel"] {
+		padding: 16px;
 	}
 }
diff --git a/packages/private-apis/src/implementation.js b/packages/private-apis/src/implementation.js
index a7da5bc972655..619478cf76386 100644
--- a/packages/private-apis/src/implementation.js
+++ b/packages/private-apis/src/implementation.js
@@ -24,6 +24,7 @@ const CORE_MODULES_USING_PRIVATE_APIS = [
 	'@wordpress/edit-site',
 	'@wordpress/edit-widgets',
 	'@wordpress/editor',
+	'@wordpress/format-library',
 	'@wordpress/patterns',
 	'@wordpress/reusable-blocks',
 	'@wordpress/router',

From ffa903529df46e56d8e8abac74b0a37090804b10 Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Tue, 9 Jan 2024 12:15:07 +1000
Subject: [PATCH 010/296] feat: Update Image block failed upload visuals
 (#56937)

* refactor: Rename `useIsConnected` to `useNetworkConnectivity`

Attempt to better communicate the Hook intent.

* test: Add `useNetworkConnectivity` Hook tests

* docs: Document `useNetworkConnectivity` Hook

* refactor: Rename `withIsConnected` to `withNetworkConnectivity`

* fix: Optimistically presume network connectivity

Prior to making the asynchronous request to the host app across the
bridge, it is a better UX to presume network connectivity is present
rather than displaying network connectivity messages briefly.

* test: Create realistic default `requestConnectionStatus` mock

* fix: Prevent duplicative offline status indicators

Hoist the `OfflineStatus` indicator from the block list to the editor.
The block list is leveraged for inner blocks, which means it rendered
nested `OfflineStatus` indicators for blocks with inner blocks.

Additionally, the `editor` package feels like an appropriate location
for the offline detection component.

* Add subscribeConnectionStatus to MediaUploadProgress component

* Update MediaUploadProgress to use withIsConnected HOC

* refactor: Fix HoC name reference

This was renamed in a commit onto which this branch was rebased.

* refactor: Enable Fast Refresh for Image component

Place non-React component exports in a separate module to enable Fast
Refresh of the React component.

* feat: Update the image offline message

Match the latest design comps.

* refactor: Avoid unnecessary inconsistency in switch case logic

Replace early return with logic mirroring the rest of the switch case
statements. While I suppose it could be considered subjective, it is
odd and confusing that one of the three cases was structured
differently.

* refactor: Enable Fast Refresh for Image component

Place non-React component exports in a separate module to enable Fast
Refresh of the React component.

* feat: Revert logic intended to display progress bar when offline

I believe this logic erroneously prevented the spinner progress bar from
displaying when an image is successfully uploading. I.e., the logic read
"if show spinner and online, apply 'progress bar hidden' styles." I
imagine this confusion is a result of the previous logic using the `||`
pattern to conditionally apply the hidden styles, which is confusing
in itself.

This logic should likely be implemented by the way the host app
communicates the upload state. Implementing this in the JavaScript logic
is confusing or misleading, in my opinion. It adds a new, somewhat
surprising interpretation of the existing states provided by the host
app.

* refactor: Remove sizing from offline SVG

This allows sizing the icon for different contexts.

* feat: Update Image block media upload visuals

Update iconography and messaging when offline or or there is a upload
error.

* feat: Add paused media upload state

Relying upon the network connection status alone results in the error
message erroneously changing whenever a network connection is
re-established. The error message, in fact, is a state communicated from
the host app's attempt to upload media. Therefore, this creates a new
pause state to represent uploads paused while offline.

* feat: Scope the paused upload state to the Image block

The planned scope of the project was to improve the upload experience of
the Image block, as it is the most frequently used media block type.
Support for additional block types could be added at a later time.

* feat: Enable paused media uploads for Media and Text block types

Because the Media and Text block type relies upon a nested Image block,
it makes sense to enable the paused media uploads for a consistent UX.

* perf: Avoid unnecessary state updates and callback invocations

If the upload state and progress is identical, there should be no reason
to invoke callbacks, update component state, or re-render.

* Add MEDIA_UPLOAD_STATE_PAUSED to Android DeferredEvent emitter

* feat: Add Android paused media upload bridge methods

Enables the Android host app to mirror the functionality of iOS.

* docs: Add change log entry

* feat: Add image upload failure dark mode styles

---------

Co-authored-by: David Calhoun <github@davidcalhoun.me>
---
 .../src/components/index.native.js            |  4 +-
 .../media-upload-progress/constants.js        |  6 ++
 .../media-upload-progress/index.native.js     | 80 +++++++++++++++----
 .../test/index.native.js                      |  4 +-
 .../block-library/src/image/edit.native.js    |  3 +
 .../src/media-text/media-container.native.js  |  4 +-
 packages/components/src/index.native.js       |  3 +-
 .../components/src/mobile/image/constants.js  |  1 +
 .../src/mobile/image/index.native.js          | 73 ++++++++++++-----
 .../src/mobile/image/style.native.scss        | 44 +++++++---
 packages/icons/src/library/offline.js         |  8 +-
 .../GutenbergBridgeJS2Parent.java             |  1 +
 .../WPAndroidGlue/DeferredEventEmitter.java   |  6 ++
 .../WPAndroidGlue/WPAndroidGlueCode.java      |  4 +
 .../react-native-bridge/ios/Gutenberg.swift   |  1 +
 packages/react-native-editor/CHANGELOG.md     |  1 +
 16 files changed, 189 insertions(+), 54 deletions(-)
 create mode 100644 packages/block-editor/src/components/media-upload-progress/constants.js
 create mode 100644 packages/components/src/mobile/image/constants.js

diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
index 45451908a3447..21a9b1114ce5f 100644
--- a/packages/block-editor/src/components/index.native.js
+++ b/packages/block-editor/src/components/index.native.js
@@ -45,13 +45,13 @@ export {
 	MEDIA_TYPE_AUDIO,
 	MEDIA_TYPE_ANY,
 } from './media-upload/constants';
+export { default as MediaUploadProgress } from './media-upload-progress';
 export {
-	default as MediaUploadProgress,
 	MEDIA_UPLOAD_STATE_UPLOADING,
 	MEDIA_UPLOAD_STATE_SUCCEEDED,
 	MEDIA_UPLOAD_STATE_FAILED,
 	MEDIA_UPLOAD_STATE_RESET,
-} from './media-upload-progress';
+} from './media-upload-progress/constants';
 export { default as BlockMediaUpdateProgress } from './block-media-update-progress';
 export { default as URLInput } from './url-input';
 export { default as BlockInvalidWarning } from './block-list/block-invalid-warning';
diff --git a/packages/block-editor/src/components/media-upload-progress/constants.js b/packages/block-editor/src/components/media-upload-progress/constants.js
new file mode 100644
index 0000000000000..4003cd30e44c5
--- /dev/null
+++ b/packages/block-editor/src/components/media-upload-progress/constants.js
@@ -0,0 +1,6 @@
+export const MEDIA_UPLOAD_STATE_IDLE = 0;
+export const MEDIA_UPLOAD_STATE_UPLOADING = 1;
+export const MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
+export const MEDIA_UPLOAD_STATE_FAILED = 3;
+export const MEDIA_UPLOAD_STATE_RESET = 4;
+export const MEDIA_UPLOAD_STATE_PAUSED = 11;
diff --git a/packages/block-editor/src/components/media-upload-progress/index.native.js b/packages/block-editor/src/components/media-upload-progress/index.native.js
index b64b08eec09d8..cb5a25d0bb866 100644
--- a/packages/block-editor/src/components/media-upload-progress/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/index.native.js
@@ -15,23 +15,28 @@ import { subscribeMediaUpload } from '@wordpress/react-native-bridge';
  * Internal dependencies
  */
 import styles from './styles.scss';
-
-export const MEDIA_UPLOAD_STATE_UPLOADING = 1;
-export const MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
-export const MEDIA_UPLOAD_STATE_FAILED = 3;
-export const MEDIA_UPLOAD_STATE_RESET = 4;
+import {
+	MEDIA_UPLOAD_STATE_IDLE,
+	MEDIA_UPLOAD_STATE_UPLOADING,
+	MEDIA_UPLOAD_STATE_SUCCEEDED,
+	MEDIA_UPLOAD_STATE_FAILED,
+	MEDIA_UPLOAD_STATE_RESET,
+	MEDIA_UPLOAD_STATE_PAUSED,
+} from './constants';
 
 export class MediaUploadProgress extends Component {
 	constructor( props ) {
 		super( props );
 
 		this.state = {
+			uploadState: MEDIA_UPLOAD_STATE_IDLE,
 			progress: 0,
 			isUploadInProgress: false,
 			isUploadFailed: false,
 		};
 
 		this.mediaUpload = this.mediaUpload.bind( this );
+		this.getRetryMessage = this.getRetryMessage.bind( this );
 	}
 
 	componentDidMount() {
@@ -45,7 +50,11 @@ export class MediaUploadProgress extends Component {
 	mediaUpload( payload ) {
 		const { mediaId } = this.props;
 
-		if ( payload.mediaId !== mediaId ) {
+		if (
+			payload.mediaId !== mediaId ||
+			( payload.state === this.state.uploadState &&
+				payload.progress === this.state.progress )
+		) {
 			return;
 		}
 
@@ -56,6 +65,9 @@ export class MediaUploadProgress extends Component {
 			case MEDIA_UPLOAD_STATE_SUCCEEDED:
 				this.finishMediaUploadWithSuccess( payload );
 				break;
+			case MEDIA_UPLOAD_STATE_PAUSED:
+				this.finishMediaUploadWithPause( payload );
+				break;
 			case MEDIA_UPLOAD_STATE_FAILED:
 				this.finishMediaUploadWithFailure( payload );
 				break;
@@ -68,6 +80,7 @@ export class MediaUploadProgress extends Component {
 	updateMediaProgress( payload ) {
 		this.setState( {
 			progress: payload.progress,
+			uploadState: payload.state,
 			isUploadInProgress: true,
 			isUploadFailed: false,
 		} );
@@ -77,21 +90,48 @@ export class MediaUploadProgress extends Component {
 	}
 
 	finishMediaUploadWithSuccess( payload ) {
-		this.setState( { isUploadInProgress: false } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+		} );
 		if ( this.props.onFinishMediaUploadWithSuccess ) {
 			this.props.onFinishMediaUploadWithSuccess( payload );
 		}
 	}
 
+	finishMediaUploadWithPause( payload ) {
+		if ( ! this.props.enablePausedUploads ) {
+			this.finishMediaUploadWithFailure( payload );
+			return;
+		}
+
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: true,
+			isUploadFailed: false,
+		} );
+		if ( this.props.onFinishMediaUploadWithFailure ) {
+			this.props.onFinishMediaUploadWithFailure( payload );
+		}
+	}
+
 	finishMediaUploadWithFailure( payload ) {
-		this.setState( { isUploadInProgress: false, isUploadFailed: true } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+			isUploadFailed: true,
+		} );
 		if ( this.props.onFinishMediaUploadWithFailure ) {
 			this.props.onFinishMediaUploadWithFailure( payload );
 		}
 	}
 
 	mediaUploadStateReset( payload ) {
-		this.setState( { isUploadInProgress: false, isUploadFailed: false } );
+		this.setState( {
+			uploadState: payload.state,
+			isUploadInProgress: false,
+			isUploadFailed: false,
+		} );
 		if ( this.props.onMediaUploadStateReset ) {
 			this.props.onMediaUploadStateReset( payload );
 		}
@@ -115,15 +155,24 @@ export class MediaUploadProgress extends Component {
 		}
 	}
 
+	getRetryMessage() {
+		if (
+			this.state.uploadState === MEDIA_UPLOAD_STATE_PAUSED &&
+			this.props.enablePausedUploads
+		) {
+			return __( 'Waiting for connection' );
+		}
+
+		// eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace
+		return __( 'Failed to insert media.\nTap for more info.' );
+	}
+
 	render() {
 		const { renderContent = () => null } = this.props;
-		const { isUploadInProgress, isUploadFailed } = this.state;
+		const { isUploadInProgress, isUploadFailed, uploadState } = this.state;
 		const showSpinner = this.state.isUploadInProgress;
 		const progress = this.state.progress * 100;
-		// eslint-disable-next-line @wordpress/i18n-no-collapsible-whitespace
-		const retryMessage = __(
-			'Failed to insert media.\nTap for more info.'
-		);
+		const retryMessage = this.getRetryMessage();
 
 		const progressBarStyle = [
 			styles.progressBar,
@@ -149,6 +198,9 @@ export class MediaUploadProgress extends Component {
 					) }
 				</View>
 				{ renderContent( {
+					isUploadPaused:
+						uploadState === MEDIA_UPLOAD_STATE_PAUSED &&
+						this.props.enablePausedUploads,
 					isUploadInProgress,
 					isUploadFailed,
 					retryMessage,
diff --git a/packages/block-editor/src/components/media-upload-progress/test/index.native.js b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
index 1185c9c35a868..e5a6b460d94ef 100644
--- a/packages/block-editor/src/components/media-upload-progress/test/index.native.js
+++ b/packages/block-editor/src/components/media-upload-progress/test/index.native.js
@@ -14,13 +14,13 @@ import {
 /**
  * Internal dependencies
  */
+import { MediaUploadProgress } from '../';
 import {
-	MediaUploadProgress,
 	MEDIA_UPLOAD_STATE_UPLOADING,
 	MEDIA_UPLOAD_STATE_SUCCEEDED,
 	MEDIA_UPLOAD_STATE_FAILED,
 	MEDIA_UPLOAD_STATE_RESET,
-} from '../';
+} from '../constants';
 
 let uploadCallBack;
 subscribeMediaUpload.mockImplementation( ( callback ) => {
diff --git a/packages/block-library/src/image/edit.native.js b/packages/block-library/src/image/edit.native.js
index 5c5308af5dfc3..604fb8a7ce52b 100644
--- a/packages/block-library/src/image/edit.native.js
+++ b/packages/block-library/src/image/edit.native.js
@@ -812,6 +812,7 @@ export class ImageEdit extends Component {
 						{ ! this.state.isCaptionSelected &&
 							getToolbarEditButton( openMediaOptions ) }
 						<MediaUploadProgress
+							enablePausedUploads
 							coverUrl={ url }
 							mediaId={ id }
 							onUpdateMediaProgress={ this.updateMediaProgress }
@@ -825,6 +826,7 @@ export class ImageEdit extends Component {
 								this.mediaUploadStateReset
 							}
 							renderContent={ ( {
+								isUploadPaused,
 								isUploadInProgress,
 								isUploadFailed,
 								retryMessage,
@@ -843,6 +845,7 @@ export class ImageEdit extends Component {
 												! isCaptionSelected
 											}
 											isUploadFailed={ isUploadFailed }
+											isUploadPaused={ isUploadPaused }
 											isUploadInProgress={
 												isUploadInProgress
 											}
diff --git a/packages/block-library/src/media-text/media-container.native.js b/packages/block-library/src/media-text/media-container.native.js
index dbc30dcf23e7a..ec6e3999807c8 100644
--- a/packages/block-library/src/media-text/media-container.native.js
+++ b/packages/block-library/src/media-text/media-container.native.js
@@ -170,7 +170,7 @@ class MediaContainer extends Component {
 			mediaWidth,
 			shouldStack,
 		} = this.props;
-		const { isUploadFailed, retryMessage } = params;
+		const { isUploadFailed, isUploadPaused, retryMessage } = params;
 		const focalPointValues = ! focalPoint
 			? IMAGE_DEFAULT_FOCAL_POINT
 			: focalPoint;
@@ -203,6 +203,7 @@ class MediaContainer extends Component {
 							focalPoint={ imageFill && focalPointValues }
 							isSelected={ isMediaSelected }
 							isUploadFailed={ isUploadFailed }
+							isUploadPaused={ isUploadPaused }
 							isUploadInProgress={ isUploadInProgress }
 							onSelectMediaUploadOption={
 								this.onSelectMediaUploadOption
@@ -340,6 +341,7 @@ class MediaContainer extends Component {
 								{ getMediaOptions() }
 
 								<MediaUploadProgress
+									enablePausedUploads
 									coverUrl={ coverUrl }
 									mediaId={ mediaId }
 									onUpdateMediaProgress={
diff --git a/packages/components/src/index.native.js b/packages/components/src/index.native.js
index 3958f359ca307..1421316d27b40 100644
--- a/packages/components/src/index.native.js
+++ b/packages/components/src/index.native.js
@@ -107,7 +107,8 @@ export { default as LinkSettings } from './mobile/link-settings';
 export { default as LinkSettingsScreen } from './mobile/link-settings/link-settings-screen';
 export { default as LinkSettingsNavigation } from './mobile/link-settings/link-settings-navigation';
 export { default as SegmentedControl } from './mobile/segmented-control';
-export { default as Image, IMAGE_DEFAULT_FOCAL_POINT } from './mobile/image';
+export { default as Image } from './mobile/image';
+export { IMAGE_DEFAULT_FOCAL_POINT } from './mobile/image/constants';
 export { default as ImageEditingButton } from './mobile/image/image-editing-button';
 export { setClipboard, getClipboard } from './mobile/clipboard';
 export { default as AudioPlayer } from './mobile/audio-player';
diff --git a/packages/components/src/mobile/image/constants.js b/packages/components/src/mobile/image/constants.js
new file mode 100644
index 0000000000000..e866759bd2ac0
--- /dev/null
+++ b/packages/components/src/mobile/image/constants.js
@@ -0,0 +1 @@
+export const IMAGE_DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
diff --git a/packages/components/src/mobile/image/index.native.js b/packages/components/src/mobile/image/index.native.js
index 064150ec5f728..09b21014a04b0 100644
--- a/packages/components/src/mobile/image/index.native.js
+++ b/packages/components/src/mobile/image/index.native.js
@@ -9,7 +9,7 @@ import FastImage from 'react-native-fast-image';
  */
 import { __ } from '@wordpress/i18n';
 import { Icon } from '@wordpress/components';
-import { image as icon } from '@wordpress/icons';
+import { image, offline } from '@wordpress/icons';
 import { usePreferredColorSchemeStyle } from '@wordpress/compose';
 import { useEffect, useState, Platform } from '@wordpress/element';
 
@@ -22,13 +22,12 @@ import SvgIconRetry from './icon-retry';
 import ImageEditingButton from './image-editing-button';
 
 const ICON_TYPE = {
+	OFFLINE: 'offline',
 	PLACEHOLDER: 'placeholder',
 	RETRY: 'retry',
 	UPLOAD: 'upload',
 };
 
-export const IMAGE_DEFAULT_FOCAL_POINT = { x: 0.5, y: 0.5 };
-
 const ImageComponent = ( {
 	align,
 	alt,
@@ -39,6 +38,7 @@ const ImageComponent = ( {
 	isSelected,
 	shouldUseFastImage,
 	isUploadFailed,
+	isUploadPaused,
 	isUploadInProgress,
 	mediaPickerOptions,
 	onImageDataLoad,
@@ -101,19 +101,23 @@ const ImageComponent = ( {
 	};
 
 	const getIcon = ( iconType ) => {
+		let icon;
 		let iconStyle;
 		switch ( iconType ) {
 			case ICON_TYPE.RETRY:
-				return (
-					<Icon
-						icon={ retryIcon || SvgIconRetry }
-						{ ...styles.iconRetry }
-					/>
-				);
+				icon = retryIcon || SvgIconRetry;
+				iconStyle = iconRetryStyles;
+				break;
+			case ICON_TYPE.OFFLINE:
+				icon = offline;
+				iconStyle = iconOfflineStyles;
+				break;
 			case ICON_TYPE.PLACEHOLDER:
+				icon = image;
 				iconStyle = iconPlaceholderStyles;
 				break;
 			case ICON_TYPE.UPLOAD:
+				icon = image;
 				iconStyle = iconUploadStyles;
 				break;
 		}
@@ -130,6 +134,31 @@ const ImageComponent = ( {
 		styles.iconUploadDark
 	);
 
+	const iconOfflineStyles = usePreferredColorSchemeStyle(
+		styles.iconOffline,
+		styles.iconOfflineDark
+	);
+
+	const retryIconStyles = usePreferredColorSchemeStyle(
+		styles.retryIcon,
+		styles.retryIconDark
+	);
+
+	const iconRetryStyles = usePreferredColorSchemeStyle(
+		styles.iconRetry,
+		styles.iconRetryDark
+	);
+
+	const retryContainerStyles = usePreferredColorSchemeStyle(
+		styles.retryContainer,
+		styles.retryContainerDark
+	);
+
+	const uploadFailedTextStyles = usePreferredColorSchemeStyle(
+		styles.uploadFailedText,
+		styles.uploadFailedTextDark
+	);
+
 	const placeholderStyles = [
 		usePreferredColorSchemeStyle(
 			styles.imageContainerUpload,
@@ -216,9 +245,11 @@ const ImageComponent = ( {
 			>
 				{ isSelected &&
 					highlightSelected &&
-					! ( isUploadInProgress || isUploadFailed ) && (
-						<View style={ imageSelectedStyles } />
-					) }
+					! (
+						isUploadInProgress ||
+						isUploadFailed ||
+						isUploadPaused
+					) && <View style={ imageSelectedStyles } /> }
 
 				{ ! imageData ? (
 					<View style={ placeholderStyles }>
@@ -239,22 +270,24 @@ const ImageComponent = ( {
 					</View>
 				) }
 
-				{ isUploadFailed && retryMessage && (
+				{ ( isUploadFailed || isUploadPaused ) && retryMessage && (
 					<View
 						style={ [
 							styles.imageContainer,
-							styles.retryContainer,
+							retryContainerStyles,
 						] }
 					>
 						<View
 							style={ [
-								styles.retryIcon,
+								retryIconStyles,
 								retryIcon && styles.customRetryIcon,
 							] }
 						>
-							{ getIcon( ICON_TYPE.RETRY ) }
+							{ isUploadPaused
+								? getIcon( ICON_TYPE.OFFLINE )
+								: getIcon( ICON_TYPE.RETRY ) }
 						</View>
-						<Text style={ styles.uploadFailedText }>
+						<Text style={ uploadFailedTextStyles }>
 							{ retryMessage }
 						</Text>
 					</View>
@@ -265,7 +298,11 @@ const ImageComponent = ( {
 				<ImageEditingButton
 					onSelectMediaUploadOption={ onSelectMediaUploadOption }
 					openMediaOptions={ openMediaOptions }
-					url={ ! isUploadFailed && imageData && url }
+					url={
+						! ( isUploadFailed || isUploadPaused ) &&
+						imageData &&
+						url
+					}
 					pickerOptions={ mediaPickerOptions }
 				/>
 			) }
diff --git a/packages/components/src/mobile/image/style.native.scss b/packages/components/src/mobile/image/style.native.scss
index f6deb3655f369..040a8e507667e 100644
--- a/packages/components/src/mobile/image/style.native.scss
+++ b/packages/components/src/mobile/image/style.native.scss
@@ -21,10 +21,23 @@
 }
 
 .retryIcon {
-	width: 80px;
-	height: 80px;
-	justify-content: center;
-	align-items: center;
+	background-color: $black;
+	border-radius: 200px;
+	padding: 8px;
+}
+
+.retryIconDark {
+	background-color: $white;
+}
+
+.iconOffline {
+	fill: $white;
+	width: 24px;
+	height: 24px;
+}
+
+.iconOfflineDark {
+	fill: $black;
 }
 
 .customRetryIcon {
@@ -33,9 +46,13 @@
 }
 
 .iconRetry {
-	fill: #fff;
-	width: 100%;
-	height: 100%;
+	fill: $white;
+	width: 24px;
+	height: 24px;
+}
+
+.iconRetryDark {
+	fill: $black;
 }
 
 .iconPlaceholder {
@@ -90,12 +107,17 @@
 }
 
 .uploadFailedText {
-	color: #fff;
+	color: $black;
+	font-weight: bold;
 	font-size: 14;
 	margin-top: 5;
 	text-align: center;
 }
 
+.uploadFailedTextDark {
+	color: $white;
+}
+
 .editContainer {
 	width: 44px;
 	height: 44px;
@@ -116,7 +138,7 @@
 }
 
 .iconCustomise {
-	fill: #fff;
+	fill: $white;
 	position: absolute;
 	top: 7px;
 	left: 7px;
@@ -124,6 +146,10 @@
 
 .retryContainer {
 	flex: 1;
+	background-color: "rgba(255, 255, 255, 0.8)";
+}
+
+.retryContainerDark {
 	background-color: "rgba(0, 0, 0, 0.5)";
 }
 
diff --git a/packages/icons/src/library/offline.js b/packages/icons/src/library/offline.js
index f0daa1aaeb79e..444d3667f297e 100644
--- a/packages/icons/src/library/offline.js
+++ b/packages/icons/src/library/offline.js
@@ -4,13 +4,7 @@
 import { SVG, Path } from '@wordpress/primitives';
 
 const offline = (
-	<SVG
-		width="16"
-		height="16"
-		viewBox="0 0 16 16"
-		fill="none"
-		xmlns="http://www.w3.org/2000/svg"
-	>
+	<SVG viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
 		<Path
 			fill-rule="evenodd"
 			clip-rule="evenodd"
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
index c1dc4bab896b3..62848ad68f12e 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/ReactNativeGutenbergBridge/GutenbergBridgeJS2Parent.java
@@ -32,6 +32,7 @@ interface MediaUploadEventEmitter {
         void onMediaFileUploadProgress(int mediaId, float progress);
         void onMediaFileUploadSucceeded(int mediaId, String mediaUrl, int serverId, WritableNativeMap metadata);
         void onMediaFileUploadFailed(int mediaId);
+        void onMediaFileUploadPaused(int mediaId);
     }
 
     interface MediaSaveEventEmitter {
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
index fe83bc8a14b54..3bbc8fe742953 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/DeferredEventEmitter.java
@@ -31,6 +31,7 @@ public interface JSEventEmitter {
     private static final int MEDIA_UPLOAD_STATE_SUCCEEDED = 2;
     private static final int MEDIA_UPLOAD_STATE_FAILED = 3;
     private static final int MEDIA_UPLOAD_STATE_RESET = 4;
+    private static final int MEDIA_UPLOAD_STATE_PAUSED = 11;
 
     private static final int MEDIA_SAVE_STATE_SAVING = 5;
     private static final int MEDIA_SAVE_STATE_SUCCEEDED = 6;
@@ -180,6 +181,11 @@ public void onMediaFileUploadFailed(int mediaId) {
         setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_FAILED, mediaId, null, 0);
     }
 
+    @Override
+    public void onMediaFileUploadPaused(int mediaId) {
+        setMediaFileUploadDataInJS(MEDIA_UPLOAD_STATE_PAUSED, mediaId, null, 0);
+    }
+
     // Media file save events emitter
     @Override
     public void onSaveMediaFileClear(String mediaId) {
diff --git a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
index 8bffc6b28c00d..6098f15a6927b 100644
--- a/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
+++ b/packages/react-native-bridge/android/react-native-bridge/src/main/java/org/wordpress/mobile/WPAndroidGlue/WPAndroidGlueCode.java
@@ -1147,6 +1147,10 @@ public void mediaFileUploadFailed(final int mediaId) {
         mDeferredEventEmitter.onMediaFileUploadFailed(mediaId);
     }
 
+    public void mediaFileUploadPaused(final int mediaId) {
+        mDeferredEventEmitter.onMediaFileUploadPaused(mediaId);
+    }
+
     public void mediaFileUploadSucceeded(final int mediaId, final String mediaUrl, final int serverMediaId, final
                                          WritableNativeMap metadata) {
         mDeferredEventEmitter.onMediaFileUploadSucceeded(mediaId, mediaUrl, serverMediaId, metadata);
diff --git a/packages/react-native-bridge/ios/Gutenberg.swift b/packages/react-native-bridge/ios/Gutenberg.swift
index de0d1b513f00d..1a3c047964679 100644
--- a/packages/react-native-bridge/ios/Gutenberg.swift
+++ b/packages/react-native-bridge/ios/Gutenberg.swift
@@ -296,6 +296,7 @@ extension Gutenberg {
         case succeeded = 2
         case failed = 3
         case reset = 4
+        case paused = 11
     }
 
     public enum MediaSaveState: Int, MediaState {
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index ed3f7b5e961eb..381ce0e93e445 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+-   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
 
 ## 1.110.0
 -   [*] [internal] Move InserterButton from components package to block-editor package [#56494]

From 9d632c527a4329ed87379c47b89c1ce3feda971c Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Tue, 9 Jan 2024 14:11:42 +0800
Subject: [PATCH 011/296] [Pattern overrides] Allow multiple attributes
 overrides (#57573)

---
 lib/experimental/blocks.php                   |  2 +-
 lib/experimental/connection-sources/index.php |  8 ++++++--
 packages/block-library/src/block/edit.js      | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 88e46b478389d..d4bb6c9b4586e 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -150,7 +150,7 @@ function gutenberg_render_block_connections( $block_content, $block, $block_inst
 					continue;
 				}
 
-				$custom_value = $connection_sources[ $attribute_value['source'] ]( $block_instance );
+				$custom_value = $connection_sources[ $attribute_value['source'] ]( $block_instance, $attribute_name );
 			} else {
 				// If the attribute does not specify the name of the custom field, skip it.
 				if ( ! isset( $attribute_value['value'] ) ) {
diff --git a/lib/experimental/connection-sources/index.php b/lib/experimental/connection-sources/index.php
index bf89ba177b6e9..4f9e06cb13b94 100644
--- a/lib/experimental/connection-sources/index.php
+++ b/lib/experimental/connection-sources/index.php
@@ -12,8 +12,12 @@
 		// if it doesn't, `get_post_meta()` will just return an empty string.
 		return get_post_meta( $block_instance->context['postId'], $meta_field, true );
 	},
-	'pattern_attributes' => function ( $block_instance ) {
+	'pattern_attributes' => function ( $block_instance, $attribute_name ) {
 		$block_id = $block_instance->attributes['metadata']['id'];
-		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id ), false );
+		return _wp_array_get(
+			$block_instance->context,
+			array( 'pattern/overrides', $block_id, $attribute_name ),
+			false
+		);
 	},
 );
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 607f073323d99..ff0127e203a46 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -97,9 +97,12 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 		const attributes = getPartiallySyncedAttributes( block );
 		const newAttributes = { ...block.attributes };
 		for ( const attributeKey of attributes ) {
-			defaultValues[ blockId ] = block.attributes[ attributeKey ];
+			defaultValues[ blockId ] ??= {};
+			defaultValues[ blockId ][ attributeKey ] =
+				block.attributes[ attributeKey ];
 			if ( overrides[ blockId ] ) {
-				newAttributes[ attributeKey ] = overrides[ blockId ];
+				newAttributes[ attributeKey ] =
+					overrides[ blockId ][ attributeKey ];
 			}
 		}
 		return {
@@ -111,7 +114,7 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 }
 
 function getOverridesFromBlocks( blocks, defaultValues ) {
-	/** @type {Record<string, unknown>} */
+	/** @type {Record<string, Record<string, unknown>>} */
 	const overrides = {};
 	for ( const block of blocks ) {
 		Object.assign(
@@ -123,9 +126,12 @@ function getOverridesFromBlocks( blocks, defaultValues ) {
 		const attributes = getPartiallySyncedAttributes( block );
 		for ( const attributeKey of attributes ) {
 			if (
-				block.attributes[ attributeKey ] !== defaultValues[ blockId ]
+				block.attributes[ attributeKey ] !==
+				defaultValues[ blockId ][ attributeKey ]
 			) {
-				overrides[ blockId ] = block.attributes[ attributeKey ];
+				overrides[ blockId ] ??= {};
+				overrides[ blockId ][ attributeKey ] =
+					block.attributes[ attributeKey ];
 			}
 		}
 	}

From 50f3bf0b3c94edbe87666f520051d6510480989f Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 9 Jan 2024 16:53:28 +0800
Subject: [PATCH 012/296] Try adding template-lock all to patterns (#57661)

---
 packages/block-library/src/block/edit.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index ff0127e203a46..57db2d166f9f9 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -260,6 +260,7 @@ export default function ReusableBlockEdit( {
 	} );
 
 	const innerBlocksProps = useInnerBlocksProps( blockProps, {
+		templateLock: 'all',
 		layout,
 		renderAppender: innerBlocks?.length
 			? undefined

From 8f4f0114de3c395a8efa2459751d9542cb51391e Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Tue, 9 Jan 2024 12:54:37 +0400
Subject: [PATCH 013/296] Migrate 'taxonomies' e2e tests to Playwright (#57662)

* Migrate 'taxonomies' e2e tests to Playwright
* Remove old test file
---
 .../specs/editor/various/taxonomies.test.js   | 251 ------------------
 .../specs/editor/various/taxonomies.spec.js   | 136 ++++++++++
 2 files changed, 136 insertions(+), 251 deletions(-)
 delete mode 100644 packages/e2e-tests/specs/editor/various/taxonomies.test.js
 create mode 100644 test/e2e/specs/editor/various/taxonomies.spec.js

diff --git a/packages/e2e-tests/specs/editor/various/taxonomies.test.js b/packages/e2e-tests/specs/editor/various/taxonomies.test.js
deleted file mode 100644
index a1804307fe74e..0000000000000
--- a/packages/e2e-tests/specs/editor/various/taxonomies.test.js
+++ /dev/null
@@ -1,251 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	createNewPost,
-	findSidebarPanelWithTitle,
-	openDocumentSettingsSidebar,
-	publishPost,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-/**
- * Module constants
- */
-const TAG_TOKEN_SELECTOR =
-	'.components-form-token-field__token-text span:not(.components-visually-hidden)';
-
-function generateRandomNumber() {
-	// Using `Math.random()` directly is fine in this testing context.
-	// eslint-disable-next-line no-restricted-syntax
-	return Math.round( 1 + Math.random() * ( Number.MAX_SAFE_INTEGER - 1 ) );
-}
-
-describe( 'Taxonomies', () => {
-	const canCreatTermInTaxonomy = ( taxonomy ) => {
-		return page.evaluate( ( _taxonomy ) => {
-			const post = wp.data.select( 'core/editor' ).getCurrentPost();
-			if ( ! post._links ) {
-				return false;
-			}
-			return !! post._links[ `wp:action-create-${ _taxonomy }` ];
-		}, taxonomy );
-	};
-
-	const getSelectCategories = () => {
-		return page.evaluate( () => {
-			return Array.from(
-				document.querySelectorAll(
-					'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-				)
-			).map( ( node ) => {
-				return node.parentElement.nextSibling.innerText;
-			} );
-		} );
-	};
-
-	const getCurrentTags = async () => {
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		return page.evaluate(
-			( node, selector ) => {
-				return Array.from( node.querySelectorAll( selector ) ).map(
-					( field ) => {
-						return field.innerText;
-					}
-				);
-			},
-			tagsPanel,
-			TAG_TOKEN_SELECTOR
-		);
-	};
-
-	const openSidebarPanelWithTitle = async ( title ) => {
-		const panel = await page.waitForXPath(
-			`//div[contains(@class,"edit-post-sidebar")]//button[@class="components-button components-panel__body-toggle"][contains(text(),"${ title }")]`
-		);
-		await panel.click();
-	};
-
-	it( 'should be able to open the categories panel and create a new main category if the user has the right capabilities', async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Categories' );
-
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-list'
-		);
-
-		// If the user has no permission to add a new category finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'categories' ) ) ) {
-			return;
-		}
-
-		await page.waitForSelector(
-			'button.editor-post-taxonomies__hierarchical-terms-add'
-		);
-
-		// Click add new category button.
-		await page.click(
-			'button.editor-post-taxonomies__hierarchical-terms-add'
-		);
-
-		// Type the category name in the field.
-		await page.type(
-			'.editor-post-taxonomies__hierarchical-terms-input input[type=text]',
-			'z rand category 1'
-		);
-
-		// Click the submit button.
-		await page.click(
-			'.editor-post-taxonomies__hierarchical-terms-submit'
-		);
-
-		// Wait for the categories to load.
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-		);
-
-		let selectedCategories = await getSelectCategories();
-
-		// The new category is selected.
-		expect( selectedCategories ).toHaveLength( 1 );
-		expect( selectedCategories[ 0 ] ).toEqual( 'z rand category 1' );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the categories to load.
-		await page.waitForSelector(
-			'.editor-post-taxonomies__hierarchical-terms-choice .components-checkbox-control__input:checked'
-		);
-
-		selectedCategories = await getSelectCategories();
-
-		// The category selection was persisted after the publish process.
-		expect( selectedCategories ).toHaveLength( 1 );
-		expect( selectedCategories[ 0 ] ).toEqual( 'z rand category 1' );
-	} );
-
-	it( "should be able to create a new tag with ' on the name", async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Tags' );
-
-		// If the user has no permission to add a new tag finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'tags' ) ) ) {
-			return;
-		}
-
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		const tagInput = await tagsPanel.$(
-			'.components-form-token-field__input'
-		);
-
-		// Click the tag input field.
-		await tagInput.click();
-
-		const tagName = "tag'-" + generateRandomNumber();
-
-		// Type the category name in the field.
-		await tagInput.type( tagName );
-
-		// Press enter to create a new tag.
-		await tagInput.press( 'Enter' );
-
-		await page.waitForSelector( TAG_TOKEN_SELECTOR );
-
-		// Get an array with the tags of the post.
-		let tags = await getCurrentTags();
-
-		// The post should only contain the tag we added.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the tags to load.
-		await page.waitForSelector( '.components-form-token-field__token' );
-
-		tags = await getCurrentTags();
-
-		// The tag selection was persisted after the publish process.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-	} );
-
-	it( 'should be able to open the tags panel and create a new tag if the user has the right capabilities', async () => {
-		await createNewPost();
-
-		await openDocumentSettingsSidebar();
-
-		await openSidebarPanelWithTitle( 'Tags' );
-
-		// If the user has no permission to add a new tag finish the test.
-		if ( ! ( await canCreatTermInTaxonomy( 'tags' ) ) ) {
-			return;
-		}
-
-		// At the start there are no tag tokens.
-		expect( await page.$$( TAG_TOKEN_SELECTOR ) ).toHaveLength( 0 );
-
-		const tagsPanel = await findSidebarPanelWithTitle( 'Tags' );
-		const tagInput = await tagsPanel.$(
-			'.components-form-token-field__input'
-		);
-
-		// Click the tag input field.
-		await tagInput.click();
-
-		const tagName = 'tag-' + generateRandomNumber();
-
-		// Type the category name in the field.
-		await tagInput.type( tagName );
-
-		// Press enter to create a new tag.
-		await tagInput.press( 'Enter' );
-
-		await page.waitForSelector( TAG_TOKEN_SELECTOR );
-
-		// Get an array with the tags of the post.
-		let tags = await getCurrentTags();
-
-		// The post should only contain the tag we added.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-
-		// Type something in the title so we can publish the post.
-		await canvas().type( '.editor-post-title__input', 'Hello World' );
-
-		// Publish the post.
-		await publishPost();
-
-		// Reload the editor.
-		await page.reload();
-
-		// Wait for the tags to load.
-		await page.waitForSelector( '.components-form-token-field__token' );
-
-		tags = await getCurrentTags();
-
-		// The tag selection was persisted after the publish process.
-		expect( tags ).toHaveLength( 1 );
-		expect( tags[ 0 ] ).toEqual( tagName );
-	} );
-} );
diff --git a/test/e2e/specs/editor/various/taxonomies.spec.js b/test/e2e/specs/editor/various/taxonomies.spec.js
new file mode 100644
index 0000000000000..efd8c9c6ee7fe
--- /dev/null
+++ b/test/e2e/specs/editor/various/taxonomies.spec.js
@@ -0,0 +1,136 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+function generateRandomNumber() {
+	return Math.round( 1 + Math.random() * ( Number.MAX_SAFE_INTEGER - 1 ) );
+}
+
+test.describe( 'Taxonomies', () => {
+	test.beforeEach( async ( { admin, editor } ) => {
+		await admin.createNewPost();
+		await editor.openDocumentSettingsSidebar();
+	} );
+
+	test( 'should be able to open the categories panel and create a new main category', async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Categories panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Categories',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		await page
+			.getByRole( 'button', {
+				name: 'Add New Category',
+				expanded: false,
+			} )
+			.click();
+		await page
+			.getByRole( 'textbox', { name: 'New Category Name' } )
+			.fill( 'z rand category 1' );
+		await page.keyboard.press( 'Enter' );
+
+		const categories = page.getByRole( 'group', { name: 'Categories' } );
+		const selectedCategories = categories.getByRole( 'checkbox', {
+			checked: true,
+		} );
+		const newCategory = categories.getByRole( 'checkbox', {
+			name: 'z rand category 1',
+		} );
+
+		await expect( selectedCategories ).toHaveCount( 1 );
+		await expect( newCategory ).toBeChecked();
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		// The category selection was persisted after the publish process.
+		await expect( selectedCategories ).toHaveCount( 1 );
+		await expect( newCategory ).toBeChecked();
+	} );
+
+	test( 'should be able to open the tags panel and create a new tag', async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Tags panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Tags',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		const tagName = 'tag-' + generateRandomNumber();
+		const tags = page.locator( '.components-form-token-field__token-text' );
+
+		await page
+			.getByRole( 'combobox', { name: 'Add New Tag' } )
+			.fill( tagName );
+		await page.keyboard.press( 'Enter' );
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+	} );
+
+	// See: https://github.com/WordPress/gutenberg/pull/21693.
+	test( `should be able to create a new tag with ' on the name`, async ( {
+		editor,
+		page,
+	} ) => {
+		// Open the Document -> Tags panel.
+		const panelToggle = page.getByRole( 'button', {
+			name: 'Tags',
+		} );
+
+		if (
+			( await panelToggle.getAttribute( 'aria-expanded' ) ) === 'false'
+		) {
+			await panelToggle.click();
+		}
+
+		const tagName = "tag'-" + generateRandomNumber();
+		const tags = page.locator( '.components-form-token-field__token-text' );
+
+		await page
+			.getByRole( 'combobox', { name: 'Add New Tag' } )
+			.fill( tagName );
+		await page.keyboard.press( 'Enter' );
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+
+		await editor.canvas
+			.getByRole( 'textbox', { name: 'Add title' } )
+			.fill( 'Hello World' );
+		await editor.publishPost();
+		await page.reload();
+
+		await expect( tags ).toHaveCount( 1 );
+		await expect( tags ).toContainText( tagName );
+	} );
+} );

From 08f704eff3699eaf8ee9ff918afd389283c17b9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 9 Jan 2024 10:44:24 +0100
Subject: [PATCH 014/296] DataViews: consolidate CSS selectors naming schema
 (#57651)

---
 packages/dataviews/src/dataviews.js           |  2 +-
 .../dataviews/src/dropdown-menu-helper.js     |  2 +-
 packages/dataviews/src/style.scss             | 32 +++++++++----------
 packages/dataviews/src/view-grid.js           |  2 +-
 packages/dataviews/src/view-list.js           | 14 ++++----
 packages/dataviews/src/view-table.js          | 10 +++---
 6 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/packages/dataviews/src/dataviews.js b/packages/dataviews/src/dataviews.js
index 91ea942ee6d22..1e3d61659f929 100644
--- a/packages/dataviews/src/dataviews.js
+++ b/packages/dataviews/src/dataviews.js
@@ -57,7 +57,7 @@ export default function DataViews( {
 			<VStack spacing={ 0 } justify="flex-start">
 				<HStack
 					alignment="flex-start"
-					className="dataviews__filters-view-actions"
+					className="dataviews-filters__view-actions"
 				>
 					<HStack justify="start" wrap>
 						{ search && (
diff --git a/packages/dataviews/src/dropdown-menu-helper.js b/packages/dataviews/src/dropdown-menu-helper.js
index 0c473c50cd0c1..ce0ace8f61e55 100644
--- a/packages/dataviews/src/dropdown-menu-helper.js
+++ b/packages/dataviews/src/dropdown-menu-helper.js
@@ -48,7 +48,7 @@ export const DropdownMenuRadioItemCustom = forwardRef(
 						<Icon icon={ radioCheck } />
 					) : (
 						<span
-							className="dataviews__filters-custom-menu-radio-item-prefix"
+							className="dataviews-filters__custom-menu-radio-item-prefix"
 							aria-hidden="true"
 						></span>
 					)
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 049f006dd97bd..0fc32e03f0808 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -10,7 +10,7 @@
 	}
 }
 
-.dataviews__filters-view-actions {
+.dataviews-filters__view-actions {
 	padding: $grid-unit-15 $grid-unit-40;
 	.components-search-control {
 		flex-grow: 1;
@@ -55,7 +55,7 @@
 	margin: $grid-unit-40 0 $grid-unit-20;
 }
 
-.dataviews-table-view {
+.dataviews-view-table {
 	width: 100%;
 	text-indent: 0;
 	border-color: inherit;
@@ -89,8 +89,8 @@
 		th:first-child {
 			padding-left: $grid-unit-40;
 
-			.dataviews-table-header-button,
-			.dataviews-table-header {
+			.dataviews-view-table-header-button,
+			.dataviews-view-table-header {
 				margin-left: - #{$grid-unit-10};
 			}
 		}
@@ -129,7 +129,7 @@
 		}
 	}
 
-	.dataviews-table-header-button {
+	.dataviews-view-table-header-button {
 		padding: $grid-unit-05 $grid-unit-10;
 		font-size: 11px;
 		text-transform: uppercase;
@@ -148,12 +148,12 @@
 		}
 	}
 
-	.dataviews-table-header {
+	.dataviews-view-table-header {
 		padding-left: $grid-unit-05;
 	}
 }
 
-.dataviews-grid-view {
+.dataviews-view-grid {
 	margin-bottom: $grid-unit-30;
 	grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
 	padding: 0 $grid-unit-40;
@@ -221,7 +221,7 @@
 	}
 }
 
-.dataviews-list-view {
+.dataviews-view-list {
 	margin: 0;
 
 	li {
@@ -235,7 +235,7 @@
 		}
 	}
 
-	.dataviews-list-view__item {
+	.dataviews-view-list__item {
 		padding: $grid-unit-15 $grid-unit-40;
 		cursor: default;
 		&:focus,
@@ -252,8 +252,8 @@
 		}
 	}
 
-	.dataviews-list-view__item-selected,
-	.dataviews-list-view__item-selected:hover {
+	.dataviews-view-list__item-selected,
+	.dataviews-view-list__item-selected:hover {
 		background-color: $gray-100;
 
 		&:focus {
@@ -261,7 +261,7 @@
 		}
 	}
 
-	.dataviews-list-view__media-wrapper {
+	.dataviews-view-list__media-wrapper {
 		min-width: $grid-unit-40;
 		height: $grid-unit-40;
 		border-radius: $grid-unit-05;
@@ -281,19 +281,19 @@
 		}
 	}
 
-	.dataviews-list-view__media-placeholder {
+	.dataviews-view-list__media-placeholder {
 		min-width: $grid-unit-40;
 		height: $grid-unit-40;
 		background-color: $gray-200;
 	}
 
-	.dataviews-list-view__fields {
+	.dataviews-view-list__fields {
 		color: $gray-700;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;
 
-		.dataviews-list-view__field {
+		.dataviews-view-list__field {
 			margin-right: $grid-unit-15;
 
 			&:last-child {
@@ -312,7 +312,7 @@
 	padding: 0 $grid-unit-40;
 }
 
-.dataviews__filters-custom-menu-radio-item-prefix {
+.dataviews-filters__custom-menu-radio-item-prefix {
 	display: block;
 	width: 24px;
 }
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index 5ac4d1d42d573..7c18d31dccd19 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -42,7 +42,7 @@ export default function ViewGrid( {
 			gap={ 8 }
 			columns={ 2 }
 			alignment="top"
-			className="dataviews-grid-view"
+			className="dataviews-view-grid"
 		>
 			{ usedData.map( ( item ) => (
 				<VStack
diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
index ab544e0eec9c2..5ee0e295f340b 100644
--- a/packages/dataviews/src/view-list.js
+++ b/packages/dataviews/src/view-list.js
@@ -46,7 +46,7 @@ export default function ViewList( {
 	};
 
 	return (
-		<ul className="dataviews-list-view">
+		<ul className="dataviews-view-list">
 			{ usedData.map( ( item ) => {
 				return (
 					<li key={ getItemId( item ) }>
@@ -56,29 +56,29 @@ export default function ViewList( {
 							aria-pressed={ selection.includes( item.id ) }
 							onKeyDown={ onEnter( item ) }
 							className={ classNames(
-								'dataviews-list-view__item',
+								'dataviews-view-list__item',
 								{
-									'dataviews-list-view__item-selected':
+									'dataviews-view-list__item-selected':
 										selection.includes( item.id ),
 								}
 							) }
 							onClick={ () => onSelectionChange( [ item ] ) }
 						>
 							<HStack spacing={ 3 } alignment="flex-start">
-								<div className="dataviews-list-view__media-wrapper">
+								<div className="dataviews-view-list__media-wrapper">
 									{ mediaField?.render( { item } ) || (
-										<div className="dataviews-list-view__media-placeholder"></div>
+										<div className="dataviews-view-list__media-placeholder"></div>
 									) }
 								</div>
 								<HStack>
 									<VStack spacing={ 1 }>
 										{ primaryField?.render( { item } ) }
-										<div className="dataviews-list-view__fields">
+										<div className="dataviews-view-list__fields">
 											{ visibleFields.map( ( field ) => {
 												return (
 													<span
 														key={ field.id }
-														className="dataviews-list-view__field"
+														className="dataviews-view-list__field"
 													>
 														{ field.render( {
 															item,
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index 0be2ee6767ddf..dc76572e30494 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -90,7 +90,7 @@ const HeaderMenu = forwardRef( function HeaderMenu(
 			trigger={
 				<Button
 					size="compact"
-					className="dataviews-table-header-button"
+					className="dataviews-view-table-header-button"
 					ref={ ref }
 					variant="tertiary"
 				>
@@ -357,9 +357,9 @@ function ViewTable( {
 	const sortValues = { asc: 'ascending', desc: 'descending' };
 
 	return (
-		<div className="dataviews-table-view-wrapper">
+		<div>
 			<table
-				className="dataviews-table-view"
+				className="dataviews-view-table"
 				aria-busy={ isLoading }
 				aria-describedby={ tableNoticeId }
 			>
@@ -410,7 +410,7 @@ function ViewTable( {
 						) ) }
 						{ !! actions?.length && (
 							<th data-field-id="actions">
-								<span className="dataviews-table-header">
+								<span className="dataviews-view-table-header">
 									{ __( 'Actions' ) }
 								</span>
 							</th>
@@ -450,7 +450,7 @@ function ViewTable( {
 				</tbody>
 			</table>
 			<div
-				className={ classNames( 'dataviews-table-status', {
+				className={ classNames( {
 					'dataviews-loading': isLoading,
 					'dataviews-no-results': ! hasData && ! isLoading,
 				} ) }

From 52ff927c9d495f212f2687234a352ae6646c87c6 Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Tue, 9 Jan 2024 05:06:37 -0500
Subject: [PATCH 015/296] build: Patch boost install checksum mismatch error
 (#57658)

* build: Patch boost install checksum mismatch error

Apply the workaround provided by the React Native community to address a
checksum mismatch error that occurs when installing `boost`. The error
originates from issues with the `boost` host, JFrog.

https://github.com/facebook/react-native/issues/42180

* Fix uninstallable patch

* Apply previous patch changes from c5f4583d9c2554c5b8c3b93a0992c45d281416d8

* Add EOF newline to react-native@0.71.11.patch

* Upgrade patch-package to 8.0.0

* Remove boost.podspec updates from react-native+0.71.11.patch

* Add boost-podspec patch and convert existing react-native+0.71.11 patch to initial patch

See also:
  https://github.com/ds300/patch-package?tab=readme-ov-file#creating-multiple-patches-for-the-same-package

---------

Co-authored-by: Derek Blank <derekpblank@gmail.com>
---
 package-lock.json                             | 736 ++++++++++--------
 package.json                                  |   2 +-
 ...=> react-native+0.71.11+001+initial.patch} |   0
 ...act-native+0.71.11+002+boost-podspec.patch |  13 +
 4 files changed, 446 insertions(+), 305 deletions(-)
 rename patches/{react-native+0.71.11.patch => react-native+0.71.11+001+initial.patch} (100%)
 create mode 100644 patches/react-native+0.71.11+002+boost-podspec.patch

diff --git a/package-lock.json b/package-lock.json
index 25144ad2de978..d2c4a65342a35 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -212,7 +212,7 @@
 				"node-fetch": "2.6.1",
 				"node-watch": "0.7.0",
 				"npm-run-all": "4.1.5",
-				"patch-package": "6.2.2",
+				"patch-package": "8.0.0",
 				"postcss": "8.4.16",
 				"postcss-loader": "6.2.1",
 				"prettier": "npm:wp-prettier@3.0.3",
@@ -19711,6 +19711,15 @@
 			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
 			"dev": true
 		},
+		"node_modules/at-least-node": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+			"dev": true,
+			"engines": {
+				"node": ">= 4.0.0"
+			}
+		},
 		"node_modules/atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -21203,13 +21212,14 @@
 			}
 		},
 		"node_modules/call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+			"integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
 			"dev": true,
 			"dependencies": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.1",
+				"set-function-length": "^1.1.1"
 			},
 			"funding": {
 				"url": "https://github.com/sponsors/ljharb"
@@ -24631,6 +24641,20 @@
 				"node": ">=10"
 			}
 		},
+		"node_modules/define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"dev": true,
+			"dependencies": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/define-lazy-prop": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -28068,108 +28092,12 @@
 			}
 		},
 		"node_modules/find-yarn-workspace-root": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz",
-			"integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==",
-			"dev": true,
-			"dependencies": {
-				"fs-extra": "^4.0.3",
-				"micromatch": "^3.1.4"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/braces": {
-			"version": "2.3.2",
-			"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-			"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-			"dev": true,
-			"dependencies": {
-				"arr-flatten": "^1.1.0",
-				"array-unique": "^0.3.2",
-				"extend-shallow": "^2.0.1",
-				"fill-range": "^4.0.0",
-				"isobject": "^3.0.1",
-				"repeat-element": "^1.1.2",
-				"snapdragon": "^0.8.1",
-				"snapdragon-node": "^2.0.1",
-				"split-string": "^3.0.2",
-				"to-regex": "^3.0.1"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/braces/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dev": true,
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fill-range": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-			"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-			"dev": true,
-			"dependencies": {
-				"extend-shallow": "^2.0.1",
-				"is-number": "^3.0.0",
-				"repeat-string": "^1.6.1",
-				"to-regex-range": "^2.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fill-range/node_modules/extend-shallow": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-			"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-			"dev": true,
-			"dependencies": {
-				"is-extendable": "^0.1.0"
-			},
-			"engines": {
-				"node": ">=0.10.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/fs-extra": {
-			"version": "4.0.3",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-			"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-			"dev": true,
-			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
-			}
-		},
-		"node_modules/find-yarn-workspace-root/node_modules/micromatch": {
-			"version": "3.1.10",
-			"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-			"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+			"integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
 			"dev": true,
 			"dependencies": {
-				"arr-diff": "^4.0.0",
-				"array-unique": "^0.3.2",
-				"braces": "^2.3.1",
-				"define-property": "^2.0.2",
-				"extend-shallow": "^3.0.2",
-				"extglob": "^2.0.4",
-				"fragment-cache": "^0.2.1",
-				"kind-of": "^6.0.2",
-				"nanomatch": "^1.2.9",
-				"object.pick": "^1.3.0",
-				"regex-not": "^1.0.0",
-				"snapdragon": "^0.8.1",
-				"to-regex": "^3.0.2"
-			},
-			"engines": {
-				"node": ">=0.10.0"
+				"micromatch": "^4.0.2"
 			}
 		},
 		"node_modules/flat": {
@@ -28603,9 +28531,12 @@
 			"dev": true
 		},
 		"node_modules/function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
 		},
 		"node_modules/function.prototype.name": {
 			"version": "1.1.5",
@@ -33323,12 +33254,36 @@
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true
 		},
+		"node_modules/json-stable-stringify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
+			"integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
+			"dev": true,
+			"dependencies": {
+				"call-bind": "^1.0.5",
+				"isarray": "^2.0.5",
+				"jsonify": "^0.0.1",
+				"object-keys": "^1.1.1"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
 			"integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
 			"dev": true
 		},
+		"node_modules/json-stable-stringify/node_modules/isarray": {
+			"version": "2.0.5",
+			"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+			"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+			"dev": true
+		},
 		"node_modules/json-stringify-safe": {
 			"version": "5.0.1",
 			"resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
@@ -33366,6 +33321,15 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
+		"node_modules/jsonify": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+			"integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+			"dev": true,
+			"funding": {
+				"url": "https://github.com/sponsors/ljharb"
+			}
+		},
 		"node_modules/jsonparse": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -42337,85 +42301,78 @@
 			}
 		},
 		"node_modules/patch-package": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz",
-			"integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
+			"integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
 			"dev": true,
 			"dependencies": {
 				"@yarnpkg/lockfile": "^1.1.0",
-				"chalk": "^2.4.2",
-				"cross-spawn": "^6.0.5",
-				"find-yarn-workspace-root": "^1.2.1",
-				"fs-extra": "^7.0.1",
-				"is-ci": "^2.0.0",
+				"chalk": "^4.1.2",
+				"ci-info": "^3.7.0",
+				"cross-spawn": "^7.0.3",
+				"find-yarn-workspace-root": "^2.0.0",
+				"fs-extra": "^9.0.0",
+				"json-stable-stringify": "^1.0.2",
 				"klaw-sync": "^6.0.0",
-				"minimist": "^1.2.0",
+				"minimist": "^1.2.6",
+				"open": "^7.4.2",
 				"rimraf": "^2.6.3",
-				"semver": "^5.6.0",
+				"semver": "^7.5.3",
 				"slash": "^2.0.0",
-				"tmp": "^0.0.33"
+				"tmp": "^0.0.33",
+				"yaml": "^2.2.2"
 			},
 			"bin": {
 				"patch-package": "index.js"
 			},
 			"engines": {
+				"node": ">=14",
 				"npm": ">5"
 			}
 		},
-		"node_modules/patch-package/node_modules/ansi-styles": {
-			"version": "3.2.1",
-			"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-			"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-			"dev": true,
-			"dependencies": {
-				"color-convert": "^1.9.0"
-			},
-			"engines": {
-				"node": ">=4"
-			}
-		},
 		"node_modules/patch-package/node_modules/chalk": {
-			"version": "2.4.2",
-			"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-			"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+			"version": "4.1.2",
+			"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+			"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 			"dev": true,
 			"dependencies": {
-				"ansi-styles": "^3.2.1",
-				"escape-string-regexp": "^1.0.5",
-				"supports-color": "^5.3.0"
+				"ansi-styles": "^4.1.0",
+				"supports-color": "^7.1.0"
 			},
 			"engines": {
-				"node": ">=4"
+				"node": ">=10"
+			},
+			"funding": {
+				"url": "https://github.com/chalk/chalk?sponsor=1"
 			}
 		},
 		"node_modules/patch-package/node_modules/cross-spawn": {
-			"version": "6.0.5",
-			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-			"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+			"version": "7.0.3",
+			"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+			"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 			"dev": true,
 			"dependencies": {
-				"nice-try": "^1.0.4",
-				"path-key": "^2.0.1",
-				"semver": "^5.5.0",
-				"shebang-command": "^1.2.0",
-				"which": "^1.2.9"
+				"path-key": "^3.1.0",
+				"shebang-command": "^2.0.0",
+				"which": "^2.0.1"
 			},
 			"engines": {
-				"node": ">=4.8"
+				"node": ">= 8"
 			}
 		},
 		"node_modules/patch-package/node_modules/fs-extra": {
-			"version": "7.0.1",
-			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-			"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+			"version": "9.1.0",
+			"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+			"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
 			"dev": true,
 			"dependencies": {
-				"graceful-fs": "^4.1.2",
-				"jsonfile": "^4.0.0",
-				"universalify": "^0.1.0"
+				"at-least-node": "^1.0.0",
+				"graceful-fs": "^4.2.0",
+				"jsonfile": "^6.0.1",
+				"universalify": "^2.0.0"
 			},
 			"engines": {
-				"node": ">=6 <7 || >=8"
+				"node": ">=10"
 			}
 		},
 		"node_modules/patch-package/node_modules/glob": {
@@ -42438,6 +42395,64 @@
 				"url": "https://github.com/sponsors/isaacs"
 			}
 		},
+		"node_modules/patch-package/node_modules/has-flag": {
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+			"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/is-wsl": {
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+			"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+			"dev": true,
+			"dependencies": {
+				"is-docker": "^2.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/jsonfile": {
+			"version": "6.1.0",
+			"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+			"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+			"dev": true,
+			"dependencies": {
+				"universalify": "^2.0.0"
+			},
+			"optionalDependencies": {
+				"graceful-fs": "^4.1.6"
+			}
+		},
+		"node_modules/patch-package/node_modules/open": {
+			"version": "7.4.2",
+			"resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+			"integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+			"dev": true,
+			"dependencies": {
+				"is-docker": "^2.0.0",
+				"is-wsl": "^2.1.1"
+			},
+			"engines": {
+				"node": ">=8"
+			},
+			"funding": {
+				"url": "https://github.com/sponsors/sindresorhus"
+			}
+		},
+		"node_modules/patch-package/node_modules/path-key": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+			"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
+			}
+		},
 		"node_modules/patch-package/node_modules/rimraf": {
 			"version": "2.7.1",
 			"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -42450,13 +42465,25 @@
 				"rimraf": "bin.js"
 			}
 		},
-		"node_modules/patch-package/node_modules/semver": {
-			"version": "5.7.2",
-			"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-			"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+		"node_modules/patch-package/node_modules/shebang-command": {
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+			"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
 			"dev": true,
-			"bin": {
-				"semver": "bin/semver"
+			"dependencies": {
+				"shebang-regex": "^3.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/shebang-regex": {
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+			"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+			"dev": true,
+			"engines": {
+				"node": ">=8"
 			}
 		},
 		"node_modules/patch-package/node_modules/slash": {
@@ -42468,6 +42495,51 @@
 				"node": ">=6"
 			}
 		},
+		"node_modules/patch-package/node_modules/supports-color": {
+			"version": "7.2.0",
+			"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+			"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+			"dev": true,
+			"dependencies": {
+				"has-flag": "^4.0.0"
+			},
+			"engines": {
+				"node": ">=8"
+			}
+		},
+		"node_modules/patch-package/node_modules/universalify": {
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+			"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+			"dev": true,
+			"engines": {
+				"node": ">= 10.0.0"
+			}
+		},
+		"node_modules/patch-package/node_modules/which": {
+			"version": "2.0.2",
+			"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+			"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+			"dev": true,
+			"dependencies": {
+				"isexe": "^2.0.0"
+			},
+			"bin": {
+				"node-which": "bin/node-which"
+			},
+			"engines": {
+				"node": ">= 8"
+			}
+		},
+		"node_modules/patch-package/node_modules/yaml": {
+			"version": "2.3.4",
+			"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+			"integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+			"dev": true,
+			"engines": {
+				"node": ">= 14"
+			}
+		},
 		"node_modules/path-browserify": {
 			"version": "0.0.1",
 			"resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.1.tgz",
@@ -47215,6 +47287,21 @@
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 		},
+		"node_modules/set-function-length": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+			"integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+			"dev": true,
+			"dependencies": {
+				"define-data-property": "^1.1.1",
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			},
+			"engines": {
+				"node": ">= 0.4"
+			}
+		},
 		"node_modules/set-value": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
@@ -71918,6 +72005,12 @@
 			"integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
 			"dev": true
 		},
+		"at-least-node": {
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
+			"integrity": "sha512-+q/t7Ekv1EDY2l6Gda6LLiX14rU9TV20Wa3ofeQmwPFZbOMo9DXrLbOjFaaclkXKWidIaopwAObQDqwWtGUjqg==",
+			"dev": true
+		},
 		"atob": {
 			"version": "2.1.2",
 			"resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
@@ -73082,13 +73175,14 @@
 			}
 		},
 		"call-bind": {
-			"version": "1.0.2",
-			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz",
-			"integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==",
+			"version": "1.0.5",
+			"resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.5.tgz",
+			"integrity": "sha512-C3nQxfFZxFRVoJoGKKI8y3MOEo129NQ+FgQ08iye+Mk4zNZZGdjfs06bVTr+DBSlA66Q2VEcMki/cUCP4SercQ==",
 			"dev": true,
 			"requires": {
-				"function-bind": "^1.1.1",
-				"get-intrinsic": "^1.0.2"
+				"function-bind": "^1.1.2",
+				"get-intrinsic": "^1.2.1",
+				"set-function-length": "^1.1.1"
 			}
 		},
 		"caller-callsite": {
@@ -75687,6 +75781,17 @@
 			"integrity": "sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==",
 			"dev": true
 		},
+		"define-data-property": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.1.tgz",
+			"integrity": "sha512-E7uGkTzkk1d0ByLeSc6ZsFS79Axg+m1P/VsgYsxHgiuc3tFSj+MjMIwe90FC4lOAZzNBdY7kkO2P2wKdsQ1vgQ==",
+			"dev": true,
+			"requires": {
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
 		"define-lazy-prop": {
 			"version": "2.0.0",
 			"resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
@@ -78350,99 +78455,12 @@
 			}
 		},
 		"find-yarn-workspace-root": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-1.2.1.tgz",
-			"integrity": "sha512-dVtfb0WuQG+8Ag2uWkbG79hOUzEsRrhBzgfn86g2sJPkzmcpGdghbNTfUKGTxymFrY/tLIodDzLoW9nOJ4FY8Q==",
+			"version": "2.0.0",
+			"resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+			"integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
 			"dev": true,
 			"requires": {
-				"fs-extra": "^4.0.3",
-				"micromatch": "^3.1.4"
-			},
-			"dependencies": {
-				"braces": {
-					"version": "2.3.2",
-					"resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
-					"integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
-					"dev": true,
-					"requires": {
-						"arr-flatten": "^1.1.0",
-						"array-unique": "^0.3.2",
-						"extend-shallow": "^2.0.1",
-						"fill-range": "^4.0.0",
-						"isobject": "^3.0.1",
-						"repeat-element": "^1.1.2",
-						"snapdragon": "^0.8.1",
-						"snapdragon-node": "^2.0.1",
-						"split-string": "^3.0.2",
-						"to-regex": "^3.0.1"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fill-range": {
-					"version": "4.0.0",
-					"resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
-					"integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
-					"dev": true,
-					"requires": {
-						"extend-shallow": "^2.0.1",
-						"is-number": "^3.0.0",
-						"repeat-string": "^1.6.1",
-						"to-regex-range": "^2.1.0"
-					},
-					"dependencies": {
-						"extend-shallow": {
-							"version": "2.0.1",
-							"resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
-							"integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
-							"dev": true,
-							"requires": {
-								"is-extendable": "^0.1.0"
-							}
-						}
-					}
-				},
-				"fs-extra": {
-					"version": "4.0.3",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-4.0.3.tgz",
-					"integrity": "sha512-q6rbdDd1o2mAnQreO7YADIxf/Whx4AHBiRf6d+/cVT8h44ss+lHgxf1FemcqDnQt9X3ct4McHr+JMGlYSsK7Cg==",
-					"dev": true,
-					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
-					}
-				},
-				"micromatch": {
-					"version": "3.1.10",
-					"resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
-					"integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
-					"dev": true,
-					"requires": {
-						"arr-diff": "^4.0.0",
-						"array-unique": "^0.3.2",
-						"braces": "^2.3.1",
-						"define-property": "^2.0.2",
-						"extend-shallow": "^3.0.2",
-						"extglob": "^2.0.4",
-						"fragment-cache": "^0.2.1",
-						"kind-of": "^6.0.2",
-						"nanomatch": "^1.2.9",
-						"object.pick": "^1.3.0",
-						"regex-not": "^1.0.0",
-						"snapdragon": "^0.8.1",
-						"to-regex": "^3.0.2"
-					}
-				}
+				"micromatch": "^4.0.2"
 			}
 		},
 		"flat": {
@@ -78773,9 +78791,9 @@
 			}
 		},
 		"function-bind": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-			"integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+			"version": "1.1.2",
+			"resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+			"integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="
 		},
 		"function.prototype.name": {
 			"version": "1.1.5",
@@ -82299,6 +82317,26 @@
 			"integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
 			"dev": true
 		},
+		"json-stable-stringify": {
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.1.0.tgz",
+			"integrity": "sha512-zfA+5SuwYN2VWqN1/5HZaDzQKLJHaBVMZIIM+wuYjdptkaQsqzDdqjqf+lZZJUuJq1aanHiY8LhH8LmH+qBYJA==",
+			"dev": true,
+			"requires": {
+				"call-bind": "^1.0.5",
+				"isarray": "^2.0.5",
+				"jsonify": "^0.0.1",
+				"object-keys": "^1.1.1"
+			},
+			"dependencies": {
+				"isarray": {
+					"version": "2.0.5",
+					"resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+					"integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+					"dev": true
+				}
+			}
+		},
 		"json-stable-stringify-without-jsonify": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
@@ -82336,6 +82374,12 @@
 				"graceful-fs": "^4.1.6"
 			}
 		},
+		"jsonify": {
+			"version": "0.0.1",
+			"resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.1.tgz",
+			"integrity": "sha512-2/Ki0GcmuqSrgFyelQq9M05y7PS0mEwuIzrf3f1fPqkVDVRvZrPZtVSMHxdgo8Aq0sxAOb/cr2aqqA3LeWHVPg==",
+			"dev": true
+		},
 		"jsonparse": {
 			"version": "1.3.1",
 			"resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz",
@@ -89309,67 +89353,59 @@
 			"integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="
 		},
 		"patch-package": {
-			"version": "6.2.2",
-			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-6.2.2.tgz",
-			"integrity": "sha512-YqScVYkVcClUY0v8fF0kWOjDYopzIM8e3bj/RU1DPeEF14+dCGm6UeOYm4jvCyxqIEQ5/eJzmbWfDWnUleFNMg==",
+			"version": "8.0.0",
+			"resolved": "https://registry.npmjs.org/patch-package/-/patch-package-8.0.0.tgz",
+			"integrity": "sha512-da8BVIhzjtgScwDJ2TtKsfT5JFWz1hYoBl9rUQ1f38MC2HwnEIkK8VN3dKMKcP7P7bvvgzNDbfNHtx3MsQb5vA==",
 			"dev": true,
 			"requires": {
 				"@yarnpkg/lockfile": "^1.1.0",
-				"chalk": "^2.4.2",
-				"cross-spawn": "^6.0.5",
-				"find-yarn-workspace-root": "^1.2.1",
-				"fs-extra": "^7.0.1",
-				"is-ci": "^2.0.0",
+				"chalk": "^4.1.2",
+				"ci-info": "^3.7.0",
+				"cross-spawn": "^7.0.3",
+				"find-yarn-workspace-root": "^2.0.0",
+				"fs-extra": "^9.0.0",
+				"json-stable-stringify": "^1.0.2",
 				"klaw-sync": "^6.0.0",
-				"minimist": "^1.2.0",
+				"minimist": "^1.2.6",
+				"open": "^7.4.2",
 				"rimraf": "^2.6.3",
-				"semver": "^5.6.0",
+				"semver": "^7.5.3",
 				"slash": "^2.0.0",
-				"tmp": "^0.0.33"
+				"tmp": "^0.0.33",
+				"yaml": "^2.2.2"
 			},
 			"dependencies": {
-				"ansi-styles": {
-					"version": "3.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-					"integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-					"dev": true,
-					"requires": {
-						"color-convert": "^1.9.0"
-					}
-				},
 				"chalk": {
-					"version": "2.4.2",
-					"resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-					"integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+					"version": "4.1.2",
+					"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+					"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
 					"dev": true,
 					"requires": {
-						"ansi-styles": "^3.2.1",
-						"escape-string-regexp": "^1.0.5",
-						"supports-color": "^5.3.0"
+						"ansi-styles": "^4.1.0",
+						"supports-color": "^7.1.0"
 					}
 				},
 				"cross-spawn": {
-					"version": "6.0.5",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz",
-					"integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==",
+					"version": "7.0.3",
+					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+					"integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
 					"dev": true,
 					"requires": {
-						"nice-try": "^1.0.4",
-						"path-key": "^2.0.1",
-						"semver": "^5.5.0",
-						"shebang-command": "^1.2.0",
-						"which": "^1.2.9"
+						"path-key": "^3.1.0",
+						"shebang-command": "^2.0.0",
+						"which": "^2.0.1"
 					}
 				},
 				"fs-extra": {
-					"version": "7.0.1",
-					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-7.0.1.tgz",
-					"integrity": "sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==",
+					"version": "9.1.0",
+					"resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+					"integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
 					"dev": true,
 					"requires": {
-						"graceful-fs": "^4.1.2",
-						"jsonfile": "^4.0.0",
-						"universalify": "^0.1.0"
+						"at-least-node": "^1.0.0",
+						"graceful-fs": "^4.2.0",
+						"jsonfile": "^6.0.1",
+						"universalify": "^2.0.0"
 					}
 				},
 				"glob": {
@@ -89386,6 +89422,47 @@
 						"path-is-absolute": "^1.0.0"
 					}
 				},
+				"has-flag": {
+					"version": "4.0.0",
+					"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+					"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+					"dev": true
+				},
+				"is-wsl": {
+					"version": "2.2.0",
+					"resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+					"integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+					"dev": true,
+					"requires": {
+						"is-docker": "^2.0.0"
+					}
+				},
+				"jsonfile": {
+					"version": "6.1.0",
+					"resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+					"integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+					"dev": true,
+					"requires": {
+						"graceful-fs": "^4.1.6",
+						"universalify": "^2.0.0"
+					}
+				},
+				"open": {
+					"version": "7.4.2",
+					"resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+					"integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+					"dev": true,
+					"requires": {
+						"is-docker": "^2.0.0",
+						"is-wsl": "^2.1.1"
+					}
+				},
+				"path-key": {
+					"version": "3.1.1",
+					"resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+					"integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+					"dev": true
+				},
 				"rimraf": {
 					"version": "2.7.1",
 					"resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
@@ -89395,10 +89472,19 @@
 						"glob": "^7.1.3"
 					}
 				},
-				"semver": {
-					"version": "5.7.2",
-					"resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-					"integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+				"shebang-command": {
+					"version": "2.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+					"integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+					"dev": true,
+					"requires": {
+						"shebang-regex": "^3.0.0"
+					}
+				},
+				"shebang-regex": {
+					"version": "3.0.0",
+					"resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+					"integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
 					"dev": true
 				},
 				"slash": {
@@ -89406,6 +89492,36 @@
 					"resolved": "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz",
 					"integrity": "sha512-ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A==",
 					"dev": true
+				},
+				"supports-color": {
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+					"dev": true,
+					"requires": {
+						"has-flag": "^4.0.0"
+					}
+				},
+				"universalify": {
+					"version": "2.0.1",
+					"resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+					"integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+					"dev": true
+				},
+				"which": {
+					"version": "2.0.2",
+					"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+					"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+					"dev": true,
+					"requires": {
+						"isexe": "^2.0.0"
+					}
+				},
+				"yaml": {
+					"version": "2.3.4",
+					"resolved": "https://registry.npmjs.org/yaml/-/yaml-2.3.4.tgz",
+					"integrity": "sha512-8aAvwVUSHpfEqTQ4w/KMlf3HcRdt50E5ODIQJBw1fQ5RL34xabzxtUlzTXVqc4rkZsPbvrXKWnABCD7kWSmocA==",
+					"dev": true
 				}
 			}
 		},
@@ -92999,6 +93115,18 @@
 			"resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
 			"integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="
 		},
+		"set-function-length": {
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.1.1.tgz",
+			"integrity": "sha512-VoaqjbBJKiWtg4yRcKBQ7g7wnGnLV3M8oLvVWwOk2PdYY6PEFegR1vezXR0tw6fZGF9csVakIRjrJiy2veSBFQ==",
+			"dev": true,
+			"requires": {
+				"define-data-property": "^1.1.1",
+				"get-intrinsic": "^1.2.1",
+				"gopd": "^1.0.1",
+				"has-property-descriptors": "^1.0.0"
+			}
+		},
 		"set-value": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
diff --git a/package.json b/package.json
index 5f99726146658..e98ad7cb1587f 100644
--- a/package.json
+++ b/package.json
@@ -224,7 +224,7 @@
 		"node-fetch": "2.6.1",
 		"node-watch": "0.7.0",
 		"npm-run-all": "4.1.5",
-		"patch-package": "6.2.2",
+		"patch-package": "8.0.0",
 		"postcss": "8.4.16",
 		"postcss-loader": "6.2.1",
 		"prettier": "npm:wp-prettier@3.0.3",
diff --git a/patches/react-native+0.71.11.patch b/patches/react-native+0.71.11+001+initial.patch
similarity index 100%
rename from patches/react-native+0.71.11.patch
rename to patches/react-native+0.71.11+001+initial.patch
diff --git a/patches/react-native+0.71.11+002+boost-podspec.patch b/patches/react-native+0.71.11+002+boost-podspec.patch
new file mode 100644
index 0000000000000..ad785b77a47fc
--- /dev/null
+++ b/patches/react-native+0.71.11+002+boost-podspec.patch
@@ -0,0 +1,13 @@
+diff --git a/node_modules/react-native/third-party-podspecs/boost.podspec b/node_modules/react-native/third-party-podspecs/boost.podspec
+index 3d9331c..bbbb738 100644
+--- a/node_modules/react-native/third-party-podspecs/boost.podspec
++++ b/node_modules/react-native/third-party-podspecs/boost.podspec
+@@ -10,7 +10,7 @@ Pod::Spec.new do |spec|
+   spec.homepage = 'http://www.boost.org'
+   spec.summary = 'Boost provides free peer-reviewed portable C++ source libraries.'
+   spec.authors = 'Rene Rivera'
+-  spec.source = { :http => 'https://boostorg.jfrog.io/artifactory/main/release/1.76.0/source/boost_1_76_0.tar.bz2',
++  spec.source = { :http => 'https://archives.boost.io/release/1.76.0/source/boost_1_76_0.tar.bz2',
+                   :sha256 => 'f0397ba6e982c4450f27bf32a2a83292aba035b827a5623a14636ea583318c41' }
+ 
+   # Pinning to the same version as React.podspec.

From 89f1d6bdcc6f36856337032e64196b7bf7d0ef96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 9 Jan 2024 14:07:05 +0100
Subject: [PATCH 016/296] DataViews: make it the root for pages and add details
 (#57578)

---
 packages/dataviews/README.md                  |  3 +-
 packages/dataviews/src/dataviews.js           |  5 +-
 packages/dataviews/src/style.scss             | 97 ++++++++++++++-----
 packages/dataviews/src/view-list.js           | 62 +++++++-----
 .../src/components/page-main/index.js         |  2 +-
 .../src/components/page-pages/index.js        | 31 +++---
 .../sidebar-dataviews/add-new-view.js         |  2 +-
 .../sidebar-dataviews/default-views.js        | 29 ++++--
 .../src/components/sidebar-dataviews/index.js |  4 +-
 .../sidebar-navigation-screen-page/index.js   |  3 +-
 .../edit-site/src/components/sidebar/index.js | 18 ++--
 .../edit-site/src/utils/get-is-list-page.js   |  5 +-
 12 files changed, 176 insertions(+), 85 deletions(-)

diff --git a/packages/dataviews/README.md b/packages/dataviews/README.md
index 558c509139a66..86e4e3e38c3df 100644
--- a/packages/dataviews/README.md
+++ b/packages/dataviews/README.md
@@ -236,7 +236,8 @@ Array of operations that can be performed upon each record. Each action is an ob
 - `isLoading`: whether the data is loading. `false` by default.
 - `supportedLayouts`: array of layouts supported. By default, all are: `table`, `grid`, `list`.
 - `deferredRendering`: whether the items should be rendered asynchronously. Useful when there's a field that takes a lot of time (e.g.: previews). `false` by default.
-- `onSelectionChange`: callback that returns the selected items. So far, only the `list` view implements this.
+- `onSelectionChange`: callback that signals the user selected one of more items, and takes them as parameter. So far, only the `list` view implements it.
+- `onDetailsChange`: callback that signals the user triggered the details for one of more items, and takes them as paremeter. So far, only the `list` view implements it.
 
 ## Contributing to this package
 
diff --git a/packages/dataviews/src/dataviews.js b/packages/dataviews/src/dataviews.js
index 1e3d61659f929..61837e4f8fc96 100644
--- a/packages/dataviews/src/dataviews.js
+++ b/packages/dataviews/src/dataviews.js
@@ -17,6 +17,7 @@ import Search from './search';
 import { VIEW_LAYOUTS } from './constants';
 
 const defaultGetItemId = ( item ) => item.id;
+const defaultOnSelectionChange = () => {};
 
 export default function DataViews( {
 	view,
@@ -30,7 +31,8 @@ export default function DataViews( {
 	isLoading = false,
 	paginationInfo,
 	supportedLayouts,
-	onSelectionChange,
+	onSelectionChange = defaultOnSelectionChange,
+	onDetailsChange = null,
 	deferredRendering = false,
 } ) {
 	const [ selection, setSelection ] = useState( [] );
@@ -89,6 +91,7 @@ export default function DataViews( {
 					getItemId={ getItemId }
 					isLoading={ isLoading }
 					onSelectionChange={ onSetSelection }
+					onDetailsChange={ onDetailsChange }
 					selection={ selection }
 					deferredRendering={ deferredRendering }
 				/>
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 0fc32e03f0808..7f8329dd86ba2 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -223,27 +223,69 @@
 
 .dataviews-view-list {
 	margin: 0;
+	padding: $grid-unit-10;
 
 	li {
-		border-bottom: $border-width solid $gray-100;
 		margin: 0;
-		&:first-child {
-			border-top: $border-width solid $gray-100;
+
+		.dataviews-view-list__item-wrapper {
+			position: relative;
+			padding-right: $grid-unit-30;
+			border-radius: $grid-unit-05;
+
+			&::after {
+				position: absolute;
+				content: "";
+				top: 100%;
+				left: $grid-unit-30;
+				right: $grid-unit-30;
+				background: $gray-100;
+				height: 1px;
+			}
 		}
-		&:last-child {
-			border-bottom: 0;
+
+		&:not(.is-selected):hover {
+			color: var(--wp-admin-theme-color);
+
+			.dataviews-view-list__fields {
+				color: var(--wp-admin-theme-color);
+			}
 		}
 	}
 
-	.dataviews-view-list__item {
-		padding: $grid-unit-15 $grid-unit-40;
-		cursor: default;
-		&:focus,
-		&:hover {
-			background-color: lighten($gray-100, 3%);
+	li.is-selected,
+	li.is-selected:focus-within {
+		.dataviews-view-list__item-wrapper {
+			background-color: var(--wp-admin-theme-color);
+			color: $white;
+
+			.dataviews-view-list__fields,
+			.components-button {
+				color: $white;
+			}
+
+			&::after {
+				background: transparent;
+			}
 		}
+	}
+
+	.dataviews-view-list__item {
+		padding: $grid-unit-15 0 $grid-unit-15 $grid-unit-30;
+		width: 100%;
+		cursor: pointer;
 		&:focus {
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			&::before {
+				position: absolute;
+				content: "";
+				top: -1px;
+				right: -1px;
+				bottom: -1px;
+				left: -1px;
+				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+				z-index: -1;
+				border-radius: $grid-unit-05;
+			}
 		}
 		h3 {
 			overflow: hidden;
@@ -252,22 +294,12 @@
 		}
 	}
 
-	.dataviews-view-list__item-selected,
-	.dataviews-view-list__item-selected:hover {
-		background-color: $gray-100;
-
-		&:focus {
-			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-		}
-	}
-
 	.dataviews-view-list__media-wrapper {
 		min-width: $grid-unit-40;
 		height: $grid-unit-40;
 		border-radius: $grid-unit-05;
 		overflow: hidden;
 		position: relative;
-		margin-top: $grid-unit-05;
 
 		&::after {
 			content: "";
@@ -301,6 +333,27 @@
 			}
 		}
 	}
+
+	.dataviews-view-list__details-button {
+		align-self: center;
+		opacity: 0;
+	}
+
+	li.is-selected,
+	li:hover,
+	li:focus-within {
+		.dataviews-view-list__details-button {
+			opacity: 1;
+		}
+	}
+
+	li.is-selected {
+		.dataviews-view-list__details-button {
+			&:focus {
+				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) currentColor;
+			}
+		}
+	}
 }
 
 .dataviews-action-modal {
diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
index 5ee0e295f340b..70755c4aa35c5 100644
--- a/packages/dataviews/src/view-list.js
+++ b/packages/dataviews/src/view-list.js
@@ -10,8 +10,11 @@ import { useAsyncList } from '@wordpress/compose';
 import {
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
+	Button,
 } from '@wordpress/components';
 import { ENTER, SPACE } from '@wordpress/keycodes';
+import { info } from '@wordpress/icons';
+import { __ } from '@wordpress/i18n';
 
 export default function ViewList( {
 	view,
@@ -19,6 +22,7 @@ export default function ViewList( {
 	data,
 	getItemId,
 	onSelectionChange,
+	onDetailsChange,
 	selection,
 	deferredRendering,
 } ) {
@@ -49,28 +53,27 @@ export default function ViewList( {
 		<ul className="dataviews-view-list">
 			{ usedData.map( ( item ) => {
 				return (
-					<li key={ getItemId( item ) }>
-						<div
-							role="button"
-							tabIndex={ 0 }
-							aria-pressed={ selection.includes( item.id ) }
-							onKeyDown={ onEnter( item ) }
-							className={ classNames(
-								'dataviews-view-list__item',
-								{
-									'dataviews-view-list__item-selected':
-										selection.includes( item.id ),
-								}
-							) }
-							onClick={ () => onSelectionChange( [ item ] ) }
-						>
-							<HStack spacing={ 3 } alignment="flex-start">
-								<div className="dataviews-view-list__media-wrapper">
-									{ mediaField?.render( { item } ) || (
-										<div className="dataviews-view-list__media-placeholder"></div>
-									) }
-								</div>
-								<HStack>
+					<li
+						key={ getItemId( item ) }
+						className={ classNames( {
+							'is-selected': selection.includes( item.id ),
+						} ) }
+					>
+						<HStack className="dataviews-view-list__item-wrapper">
+							<div
+								role="button"
+								tabIndex={ 0 }
+								aria-pressed={ selection.includes( item.id ) }
+								onKeyDown={ onEnter( item ) }
+								className="dataviews-view-list__item"
+								onClick={ () => onSelectionChange( [ item ] ) }
+							>
+								<HStack spacing={ 3 } justify="start">
+									<div className="dataviews-view-list__media-wrapper">
+										{ mediaField?.render( { item } ) || (
+											<div className="dataviews-view-list__media-placeholder"></div>
+										) }
+									</div>
 									<VStack spacing={ 1 }>
 										{ primaryField?.render( { item } ) }
 										<div className="dataviews-view-list__fields">
@@ -89,8 +92,19 @@ export default function ViewList( {
 										</div>
 									</VStack>
 								</HStack>
-							</HStack>
-						</div>
+							</div>
+							{ onDetailsChange && (
+								<Button
+									className="dataviews-view-list__details-button"
+									onClick={ () =>
+										onDetailsChange( [ item ] )
+									}
+									icon={ info }
+									label={ __( 'View details' ) }
+									size="compact"
+								/>
+							) }
+						</HStack>
 					</li>
 				);
 			} ) }
diff --git a/packages/edit-site/src/components/page-main/index.js b/packages/edit-site/src/components/page-main/index.js
index 4a4a235c1922b..7cc2025ac2c94 100644
--- a/packages/edit-site/src/components/page-main/index.js
+++ b/packages/edit-site/src/components/page-main/index.js
@@ -30,7 +30,7 @@ export default function PageMain() {
 		) : (
 			<PagePatterns />
 		);
-	} else if ( window?.__experimentalAdminViews && path === '/pages' ) {
+	} else if ( window?.__experimentalAdminViews && path === '/page' ) {
 		return <PagePages />;
 	}
 
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 8729922faabea..9bf23100e5db5 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -20,7 +20,10 @@ import { ENTER, SPACE } from '@wordpress/keycodes';
  */
 import Page from '../page';
 import Link from '../routes/link';
-import { default as DEFAULT_VIEWS } from '../sidebar-dataviews/default-views';
+import {
+	DEFAULT_VIEWS,
+	DEFAULT_CONFIG_PER_VIEW_TYPE,
+} from '../sidebar-dataviews/default-views';
 import {
 	ENUMERATION_TYPE,
 	LAYOUT_GRID,
@@ -44,17 +47,6 @@ import { unlock } from '../../lock-unlock';
 const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
-const defaultConfigPerViewType = {
-	[ LAYOUT_TABLE ]: {},
-	[ LAYOUT_GRID ]: {
-		mediaField: 'featured-image',
-		primaryField: 'title',
-	},
-	[ LAYOUT_LIST ]: {
-		primaryField: 'title',
-		mediaField: 'featured-image',
-	},
-};
 
 function useView( type ) {
 	const {
@@ -138,6 +130,18 @@ export default function PagePages() {
 		[ setPageId ]
 	);
 
+	const onDetailsChange = useCallback(
+		( items ) => {
+			if ( !! postType && items?.length === 1 ) {
+				history.push( {
+					postId: items[ 0 ].id,
+					postType,
+				} );
+			}
+		},
+		[ history, postType ]
+	);
+
 	const queryArgs = useMemo( () => {
 		const filters = {};
 		view.filters.forEach( ( filter ) => {
@@ -309,7 +313,7 @@ export default function PagePages() {
 				newView = {
 					...newView,
 					layout: {
-						...defaultConfigPerViewType[ newView.type ],
+						...DEFAULT_CONFIG_PER_VIEW_TYPE[ newView.type ],
 					},
 				};
 			}
@@ -339,6 +343,7 @@ export default function PagePages() {
 					view={ view }
 					onChangeView={ onChangeView }
 					onSelectionChange={ onSelectionChange }
+					onDetailsChange={ onDetailsChange }
 				/>
 			</Page>
 			{ view.type === LAYOUT_LIST && (
diff --git a/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js b/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
index d84d85faf4d60..4bf7a173525c9 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/add-new-view.js
@@ -19,7 +19,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 import SidebarNavigationItem from '../sidebar-navigation-item';
-import DEFAULT_VIEWS from './default-views';
+import { DEFAULT_VIEWS } from './default-views';
 import { unlock } from '../../lock-unlock';
 
 const { useHistory, useLocation } = unlock( routerPrivateApis );
diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
index 11652286e62d8..fe9f046f31972 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -7,10 +7,27 @@ import { trash } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { LAYOUT_TABLE, OPERATOR_IN } from '../../utils/constants';
+import {
+	LAYOUT_LIST,
+	LAYOUT_TABLE,
+	LAYOUT_GRID,
+	OPERATOR_IN,
+} from '../../utils/constants';
+
+export const DEFAULT_CONFIG_PER_VIEW_TYPE = {
+	[ LAYOUT_TABLE ]: {},
+	[ LAYOUT_GRID ]: {
+		mediaField: 'featured-image',
+		primaryField: 'title',
+	},
+	[ LAYOUT_LIST ]: {
+		primaryField: 'title',
+		mediaField: 'featured-image',
+	},
+};
 
 const DEFAULT_PAGE_BASE = {
-	type: LAYOUT_TABLE,
+	type: LAYOUT_LIST,
 	search: '',
 	filters: [],
 	page: 1,
@@ -22,10 +39,12 @@ const DEFAULT_PAGE_BASE = {
 	// All fields are visible by default, so it's
 	// better to keep track of the hidden ones.
 	hiddenFields: [ 'date', 'featured-image' ],
-	layout: {},
+	layout: {
+		...DEFAULT_CONFIG_PER_VIEW_TYPE[ LAYOUT_LIST ],
+	},
 };
 
-const DEFAULT_VIEWS = {
+export const DEFAULT_VIEWS = {
 	page: [
 		{
 			title: __( 'All' ),
@@ -55,5 +74,3 @@ const DEFAULT_VIEWS = {
 		},
 	],
 };
-
-export default DEFAULT_VIEWS;
diff --git a/packages/edit-site/src/components/sidebar-dataviews/index.js b/packages/edit-site/src/components/sidebar-dataviews/index.js
index 9e4534ab34274..9748600907e33 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/index.js
@@ -8,14 +8,14 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 
-import { default as DEFAULT_VIEWS } from './default-views';
+import { DEFAULT_VIEWS } from './default-views';
 import { unlock } from '../../lock-unlock';
 const { useLocation } = unlock( routerPrivateApis );
 import DataViewItem from './dataview-item';
 import CustomDataViewsList from './custom-dataviews-list';
 
 const PATH_TO_TYPE = {
-	'/pages': 'page',
+	'/page': 'page',
 };
 
 export default function DataViewsSidebarContent() {
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
index 110bc920fb0a9..7df1aaa3ba908 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-page/index.js
@@ -31,7 +31,7 @@ import SidebarNavigationScreenDetailsFooter from '../sidebar-navigation-screen-d
 
 const { useHistory } = unlock( routerPrivateApis );
 
-export default function SidebarNavigationScreenPage() {
+export default function SidebarNavigationScreenPage( { backPath } ) {
 	const { setCanvasMode } = unlock( useDispatch( editSiteStore ) );
 	const history = useHistory();
 	const {
@@ -88,6 +88,7 @@ export default function SidebarNavigationScreenPage() {
 
 	return record ? (
 		<SidebarNavigationScreen
+			backPath={ backPath }
 			title={ decodeEntities(
 				record?.title?.rendered || __( '(no title)' )
 			) }
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 3fa1280d59f42..0f986d486fbb8 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -68,20 +68,18 @@ function SidebarScreens() {
 				<SidebarNavigationScreenGlobalStyles />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/page">
-				<SidebarNavigationScreenPages />
-			</SidebarScreenWrapper>
-			<SidebarScreenWrapper path="/page/:postId">
-				<SidebarNavigationScreenPage />
-			</SidebarScreenWrapper>
-			{ window?.__experimentalAdminViews && (
-				<SidebarScreenWrapper path="/pages">
+				{ window?.__experimentalAdminViews ? (
 					<SidebarNavigationScreen
 						title={ __( 'Pages' ) }
-						backPath="/page"
 						content={ <DataViewsSidebarContent /> }
 					/>
-				</SidebarScreenWrapper>
-			) }
+				) : (
+					<SidebarNavigationScreenPages />
+				) }
+			</SidebarScreenWrapper>
+			<SidebarScreenWrapper path="/page/:postId">
+				<SidebarNavigationScreenPage />
+			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/:postType(wp_template)">
 				<SidebarNavigationScreenTemplates />
 			</SidebarScreenWrapper>
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 2ee661253cf06..9530cd85bf04b 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -14,9 +14,8 @@ export default function getIsListPage(
 	isMobileViewport
 ) {
 	return (
-		[ '/wp_template/all', '/wp_template_part/all', '/pages' ].includes(
-			path
-		) ||
+		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
+		( path === '/page' && window?.__experimentalAdminViews ) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.

From 169e2e5bc3410eee23b19d6ac788e3ea111a88f4 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Tue, 9 Jan 2024 14:34:53 +0000
Subject: [PATCH 017/296] Update table header gap (#57671)

---
 packages/dataviews/src/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 7f8329dd86ba2..699edf0de61ab 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -85,6 +85,10 @@
 	tr {
 		border-bottom: 1px solid $gray-100;
 
+		.dataviews-view-table-header-button {
+			gap: $grid-unit-05;
+		}
+
 		td:first-child,
 		th:first-child {
 			padding-left: $grid-unit-40;

From e0eb749259dc7912e7d579df3bacb026c5cb32ce Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Tue, 9 Jan 2024 15:52:47 +0000
Subject: [PATCH 018/296] Pagination spacing (#57670)

---
 packages/dataviews/src/style.scss | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 699edf0de61ab..80630050b68ef 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -338,6 +338,10 @@
 		}
 	}
 
+	& + .dataviews-pagination {
+		justify-content: space-between;
+	}
+
 	.dataviews-view-list__details-button {
 		align-self: center;
 		opacity: 0;

From 240f3036426dac349158aecfa529d0909031de04 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Tue, 9 Jan 2024 16:53:10 +0100
Subject: [PATCH 019/296] WP Scripts: Build block.json viewModule (#57461)

Add handling of viewModule field in block.json when using wp-scripts build or start. As the Modules API matures, our tooling should support it.

We add an option to clearly mark this an an experimental feature: `wp-scripts build --experimental-modules` or `wp-scripts start --experimental-modules`.

To support modules with webpack, it was necessary to run a multi-compilation. An array of webpack configurations is used instead of a single webpack configuration. This is because module compilation is an option at the compilation level and cannot be set for specific entrypoints.

If the `--experimental-modules` option is found, we use an environment variable to change the webpack.config export to return an array `[ scriptWebpackConfig, moduleWebpackConfig ]`. Without the experimental option, the `webpack.config` export is the same. Consumers should be able to continue extending this config without noticing any differences.

Part of #57492.
---
 packages/scripts/CHANGELOG.md             |   4 +
 packages/scripts/README.md                |  14 +-
 packages/scripts/config/webpack.config.js | 196 +++++++++++------
 packages/scripts/scripts/build.js         |   4 +
 packages/scripts/scripts/start.js         |   4 +
 packages/scripts/utils/block-json.js      |  41 ++++
 packages/scripts/utils/config.js          | 253 ++++++++++++----------
 packages/scripts/utils/index.js           |   6 +
 8 files changed, 341 insertions(+), 181 deletions(-)
 create mode 100644 packages/scripts/utils/block-json.js

diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index f6fb412377f7e..a917cd119c17a 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### New Features
+
+-   Add experimental support for `viewModule` field in block.json for `build` and `start` scripts ([#57461](https://github.com/WordPress/gutenberg/pull/57461)).
+
 ### Breaking Changes
 
 -   Drop support for Node.js versions < 18.
diff --git a/packages/scripts/README.md b/packages/scripts/README.md
index 42a9c563ea77f..e4a2be8d9a3fa 100644
--- a/packages/scripts/README.md
+++ b/packages/scripts/README.md
@@ -108,6 +108,11 @@ This script automatically use the optimized config but sometimes you may want to
 -   `--webpack-src-dir` – Allows customization of the source code directory. Default is `src`.
 -   `--output-path` – Allows customization of the output directory. Default is `build`.
 
+Experimental support for the block.json `viewModule` field is available via the
+`--experimental-modules` option. With this option enabled, script and module fields will all be
+compiled. The `viewModule` field is analogous to the `viewScript` field, but will compile a module
+and should be registered in WordPress using the Modules API.
+
 #### Advanced information
 
 This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
@@ -391,6 +396,11 @@ This script automatically use the optimized config but sometimes you may want to
 -   `--webpack-src-dir` – Allows customization of the source code directory. Default is `src`.
 -   `--output-path` – Allows customization of the output directory. Default is `build`.
 
+Experimental support for the block.json `viewModule` field is available via the
+`--experimental-modules` option. With this option enabled, script and module fields will all be
+compiled. The `viewModule` field is analogous to the `viewScript` field, but will compile a module
+and should be registered in WordPress using the Modules API.
+
 #### Advanced information
 
 This script uses [webpack](https://webpack.js.org/) behind the scenes. It’ll look for a webpack config in the top-level directory of your package and will use it if it finds one. If none is found, it’ll use the default config provided by `@wordpress/scripts` packages. Learn more in the [Advanced Usage](#advanced-usage) section.
@@ -723,8 +733,8 @@ module.exports = {
 
 If you follow this approach, please, be aware that:
 
-- You should keep using the `wp-scripts` commands (`start` and `build`). Do not use `webpack` directly.
-- Future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package’s CHANGELOG](https://github.com/WordPress/gutenberg/blob/HEAD/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
+-   You should keep using the `wp-scripts` commands (`start` and `build`). Do not use `webpack` directly.
+-   Future versions of this package may change what webpack and Babel plugins we bundle, default configs, etc. Should those changes be necessary, they will be registered in the [package’s CHANGELOG](https://github.com/WordPress/gutenberg/blob/HEAD/packages/scripts/CHANGELOG.md), so make sure to read it before upgrading.
 
 ## Contributing to this package
 
diff --git a/packages/scripts/config/webpack.config.js b/packages/scripts/config/webpack.config.js
index 1e060d0e142c9..3919558c2f05c 100644
--- a/packages/scripts/config/webpack.config.js
+++ b/packages/scripts/config/webpack.config.js
@@ -4,7 +4,7 @@
 const { BundleAnalyzerPlugin } = require( 'webpack-bundle-analyzer' );
 const { CleanWebpackPlugin } = require( 'clean-webpack-plugin' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
-const { DefinePlugin } = require( 'webpack' );
+const webpack = require( 'webpack' );
 const browserslist = require( 'browserslist' );
 const MiniCSSExtractPlugin = require( 'mini-css-extract-plugin' );
 const { basename, dirname, resolve } = require( 'path' );
@@ -30,6 +30,9 @@ const {
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
 	getRenderPropPaths,
+	getAsBooleanFromENV,
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
 } = require( '../utils' );
 
 const isProduction = process.env.NODE_ENV === 'production';
@@ -39,6 +42,9 @@ if ( ! browserslist.findConfig( '.' ) ) {
 	target += ':' + fromConfigRoot( '.browserslistrc' );
 }
 const hasReactFastRefresh = hasArgInCLI( '--hot' ) && ! isProduction;
+const hasExperimentalModulesFlag = getAsBooleanFromENV(
+	'WP_EXPERIMENTAL_MODULES'
+);
 
 /**
  * The plugin recomputes the render paths once on each compilation. It is necessary to avoid repeating processing
@@ -110,10 +116,10 @@ const cssLoaders = [
 	},
 ];
 
-const config = {
+/** @type {webpack.Configuration} */
+const baseConfig = {
 	mode,
 	target,
-	entry: getWebpackEntryPoints,
 	output: {
 		filename: '[name].js',
 		path: resolve( process.cwd(), 'build' ),
@@ -165,7 +171,7 @@ const config = {
 	module: {
 		rules: [
 			{
-				test: /\.(j|t)sx?$/,
+				test: /\.m?(j|t)sx?$/,
 				exclude: /node_modules/,
 				use: [
 					{
@@ -245,21 +251,72 @@ const config = {
 			},
 		],
 	},
+	stats: {
+		children: false,
+	},
+};
+
+// WP_DEVTOOL global variable controls how source maps are generated.
+// See: https://webpack.js.org/configuration/devtool/#devtool.
+if ( process.env.WP_DEVTOOL ) {
+	baseConfig.devtool = process.env.WP_DEVTOOL;
+}
+
+if ( ! isProduction ) {
+	// Set default sourcemap mode if it wasn't set by WP_DEVTOOL.
+	baseConfig.devtool = baseConfig.devtool || 'source-map';
+}
+
+// Add source-map-loader if devtool is set, whether in dev mode or not.
+if ( baseConfig.devtool ) {
+	baseConfig.module.rules.unshift( {
+		test: /\.(j|t)sx?$/,
+		exclude: [ /node_modules/ ],
+		use: require.resolve( 'source-map-loader' ),
+		enforce: 'pre',
+	} );
+}
+
+/** @type {webpack.Configuration} */
+const scriptConfig = {
+	...baseConfig,
+
+	entry: getWebpackEntryPoints( 'script' ),
+
+	devServer: isProduction
+		? undefined
+		: {
+				devMiddleware: {
+					writeToDisk: true,
+				},
+				allowedHosts: 'auto',
+				host: 'localhost',
+				port: 8887,
+				proxy: {
+					'/build': {
+						pathRewrite: {
+							'^/build': '',
+						},
+					},
+				},
+		  },
+
 	plugins: [
-		new DefinePlugin( {
+		new webpack.DefinePlugin( {
 			// Inject the `SCRIPT_DEBUG` global, used for development features flagging.
 			SCRIPT_DEBUG: ! isProduction,
 		} ),
-		// During rebuilds, all webpack assets that are not used anymore will be
-		// removed automatically. There is an exception added in watch mode for
-		// fonts and images. It is a known limitations:
-		// https://github.com/johnagan/clean-webpack-plugin/issues/159
-		new CleanWebpackPlugin( {
-			cleanAfterEveryBuildPatterns: [ '!fonts/**', '!images/**' ],
-			// Prevent it from deleting webpack assets during builds that have
-			// multiple configurations returned in the webpack config.
-			cleanStaleWebpackAssets: false,
-		} ),
+
+		// If we run a modules build, the 2 compilations can "clean" each other's output
+		// Prevent the cleaning from happening
+		! hasExperimentalModulesFlag &&
+			new CleanWebpackPlugin( {
+				cleanAfterEveryBuildPatterns: [ '!fonts/**', '!images/**' ],
+				// Prevent it from deleting webpack assets during builds that have
+				// multiple configurations returned in the webpack config.
+				cleanStaleWebpackAssets: false,
+			} ),
+
 		new RenderPathsPlugin(),
 		new CopyWebpackPlugin( {
 			patterns: [
@@ -269,27 +326,33 @@ const config = {
 					noErrorOnMissing: true,
 					transform( content, absoluteFrom ) {
 						const convertExtension = ( path ) => {
-							return path.replace( /\.(j|t)sx?$/, '.js' );
+							return path.replace( /\.m?(j|t)sx?$/, '.js' );
 						};
 
 						if ( basename( absoluteFrom ) === 'block.json' ) {
 							const blockJson = JSON.parse( content.toString() );
-							[ 'viewScript', 'script', 'editorScript' ].forEach(
-								( key ) => {
-									if ( Array.isArray( blockJson[ key ] ) ) {
-										blockJson[ key ] =
-											blockJson[ key ].map(
-												convertExtension
-											);
-									} else if (
-										typeof blockJson[ key ] === 'string'
-									) {
-										blockJson[ key ] = convertExtension(
-											blockJson[ key ]
-										);
+
+							[
+								getBlockJsonScriptFields( blockJson ),
+								getBlockJsonModuleFields( blockJson ),
+							].forEach( ( fields ) => {
+								if ( fields ) {
+									for ( const [
+										key,
+										value,
+									] of Object.entries( fields ) ) {
+										if ( Array.isArray( value ) ) {
+											blockJson[ key ] =
+												value.map( convertExtension );
+										} else if (
+											typeof value === 'string'
+										) {
+											blockJson[ key ] =
+												convertExtension( value );
+										}
 									}
 								}
-							);
+							} );
 
 							return JSON.stringify( blockJson, null, 2 );
 						}
@@ -317,52 +380,55 @@ const config = {
 		process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
 		// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
 		new MiniCSSExtractPlugin( { filename: '[name].css' } ),
-		// React Fast Refresh.
-		hasReactFastRefresh && new ReactRefreshWebpackPlugin(),
 		// WP_NO_EXTERNALS global variable controls whether scripts' assets get
 		// generated, and the default externals set.
 		! process.env.WP_NO_EXTERNALS &&
 			new DependencyExtractionWebpackPlugin(),
 	].filter( Boolean ),
-	stats: {
-		children: false,
-	},
 };
 
-// WP_DEVTOOL global variable controls how source maps are generated.
-// See: https://webpack.js.org/configuration/devtool/#devtool.
-if ( process.env.WP_DEVTOOL ) {
-	config.devtool = process.env.WP_DEVTOOL;
-}
+if ( hasExperimentalModulesFlag ) {
+	/** @type {webpack.Configuration} */
+	const moduleConfig = {
+		...baseConfig,
 
-if ( ! isProduction ) {
-	// Set default sourcemap mode if it wasn't set by WP_DEVTOOL.
-	config.devtool = config.devtool || 'source-map';
-	config.devServer = {
-		devMiddleware: {
-			writeToDisk: true,
+		entry: getWebpackEntryPoints( 'module' ),
+
+		experiments: {
+			...baseConfig.experiments,
+			outputModule: true,
 		},
-		allowedHosts: 'auto',
-		host: 'localhost',
-		port: 8887,
-		proxy: {
-			'/build': {
-				pathRewrite: {
-					'^/build': '',
-				},
+
+		output: {
+			...baseConfig.output,
+			module: true,
+			chunkFormat: 'module',
+			library: {
+				...baseConfig.output.library,
+				type: 'module',
 			},
 		},
+
+		plugins: [
+			new webpack.DefinePlugin( {
+				// Inject the `SCRIPT_DEBUG` global, used for development features flagging.
+				SCRIPT_DEBUG: ! isProduction,
+			} ),
+			// The WP_BUNDLE_ANALYZER global variable enables a utility that represents
+			// bundle content as a convenient interactive zoomable treemap.
+			process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
+			// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
+			new MiniCSSExtractPlugin( { filename: '[name].css' } ),
+			// React Fast Refresh.
+			hasReactFastRefresh && new ReactRefreshWebpackPlugin(),
+			// WP_NO_EXTERNALS global variable controls whether scripts' assets get
+			// generated, and the default externals set.
+			! process.env.WP_NO_EXTERNALS &&
+				new DependencyExtractionWebpackPlugin(),
+		].filter( Boolean ),
 	};
-}
 
-// Add source-map-loader if devtool is set, whether in dev mode or not.
-if ( config.devtool ) {
-	config.module.rules.unshift( {
-		test: /\.(j|t)sx?$/,
-		exclude: [ /node_modules/ ],
-		use: require.resolve( 'source-map-loader' ),
-		enforce: 'pre',
-	} );
+	module.exports = [ scriptConfig, moduleConfig ];
+} else {
+	module.exports = scriptConfig;
 }
-
-module.exports = config;
diff --git a/packages/scripts/scripts/build.js b/packages/scripts/scripts/build.js
index 714038fd80ee4..0eef2afb451bf 100644
--- a/packages/scripts/scripts/build.js
+++ b/packages/scripts/scripts/build.js
@@ -12,6 +12,10 @@ const EXIT_ERROR_CODE = 1;
 
 process.env.NODE_ENV = process.env.NODE_ENV || 'production';
 
+if ( hasArgInCLI( '--experimental-modules' ) ) {
+	process.env.WP_EXPERIMENTAL_MODULES = true;
+}
+
 if ( hasArgInCLI( '--webpack-no-externals' ) ) {
 	process.env.WP_NO_EXTERNALS = true;
 }
diff --git a/packages/scripts/scripts/start.js b/packages/scripts/scripts/start.js
index cf29709f3eff1..6296192ef302b 100644
--- a/packages/scripts/scripts/start.js
+++ b/packages/scripts/scripts/start.js
@@ -10,6 +10,10 @@ const { sync: resolveBin } = require( 'resolve-bin' );
 const { getArgFromCLI, getWebpackArgs, hasArgInCLI } = require( '../utils' );
 const EXIT_ERROR_CODE = 1;
 
+if ( hasArgInCLI( '--experimental-modules' ) ) {
+	process.env.WP_EXPERIMENTAL_MODULES = true;
+}
+
 if ( hasArgInCLI( '--webpack-no-externals' ) ) {
 	process.env.WP_NO_EXTERNALS = true;
 }
diff --git a/packages/scripts/utils/block-json.js b/packages/scripts/utils/block-json.js
new file mode 100644
index 0000000000000..892cc63c889e5
--- /dev/null
+++ b/packages/scripts/utils/block-json.js
@@ -0,0 +1,41 @@
+const moduleFields = new Set( [ 'viewModule' ] );
+const scriptFields = new Set( [ 'viewScript', 'script', 'editorScript' ] );
+
+/**
+ * @param {Object} blockJson
+ * @return {null|Record<string, unknown>} Fields
+ */
+function getBlockJsonModuleFields( blockJson ) {
+	let result = null;
+	for ( const field of moduleFields ) {
+		if ( Object.hasOwn( blockJson, field ) ) {
+			if ( ! result ) {
+				result = {};
+			}
+			result[ field ] = blockJson[ field ];
+		}
+	}
+	return result;
+}
+
+/**
+ * @param {Object} blockJson
+ * @return {null|Record<string, unknown>} Fields
+ */
+function getBlockJsonScriptFields( blockJson ) {
+	let result = null;
+	for ( const field of scriptFields ) {
+		if ( Object.hasOwn( blockJson, field ) ) {
+			if ( ! result ) {
+				result = {};
+			}
+			result[ field ] = blockJson[ field ];
+		}
+	}
+	return result;
+}
+
+module.exports = {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+};
diff --git a/packages/scripts/utils/config.js b/packages/scripts/utils/config.js
index e4e42255f95dd..8b1bbb1ca5059 100644
--- a/packages/scripts/utils/config.js
+++ b/packages/scripts/utils/config.js
@@ -17,6 +17,10 @@ const {
 } = require( './cli' );
 const { fromConfigRoot, fromProjectRoot, hasProjectFile } = require( './file' );
 const { hasPackageProp } = require( './package' );
+const {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+} = require( './block-json' );
 const { log } = console;
 
 // See https://babeljs.io/docs/en/config-files#configuration-file-types.
@@ -108,7 +112,10 @@ const hasPostCSSConfig = () =>
  */
 const getWebpackArgs = () => {
 	// Gets all args from CLI without those prefixed with `--webpack`.
-	let webpackArgs = getArgsFromCLI( [ '--webpack' ] );
+	let webpackArgs = getArgsFromCLI( [
+		'--experimental-modules',
+		'--webpack',
+	] );
 
 	const hasWebpackOutputOption =
 		hasArgInCLI( '-o' ) || hasArgInCLI( '--output' );
@@ -186,104 +193,52 @@ function getWordPressSrcDirectory() {
  *
  * @see https://webpack.js.org/concepts/entry-points/
  *
- * @return {Object<string,string>} The list of entry points.
+ * @param {'script' | 'module'} buildType
  */
-function getWebpackEntryPoints() {
-	// 1. Handles the legacy format for entry points when explicitly provided with the `process.env.WP_ENTRY`.
-	if ( process.env.WP_ENTRY ) {
-		return JSON.parse( process.env.WP_ENTRY );
-	}
+function getWebpackEntryPoints( buildType ) {
+	/**
+	 * @return {Object<string,string>} The list of entry points.
+	 */
+	return () => {
+		// 1. Handles the legacy format for entry points when explicitly provided with the `process.env.WP_ENTRY`.
+		if ( process.env.WP_ENTRY ) {
+			return buildType === 'script'
+				? JSON.parse( process.env.WP_ENTRY )
+				: {};
+		}
 
-	// Continue only if the source directory exists.
-	if ( ! hasProjectFile( getWordPressSrcDirectory() ) ) {
-		log(
-			chalk.yellow(
-				`Source directory "${ getWordPressSrcDirectory() }" was not found. Please confirm there is a "src" directory in the root or the value passed to --webpack-src-dir is correct.`
-			)
-		);
-		return {};
-	}
+		// Continue only if the source directory exists.
+		if ( ! hasProjectFile( getWordPressSrcDirectory() ) ) {
+			log(
+				chalk.yellow(
+					`Source directory "${ getWordPressSrcDirectory() }" was not found. Please confirm there is a "src" directory in the root or the value passed to --webpack-src-dir is correct.`
+				)
+			);
+			return {};
+		}
 
-	// 2. Checks whether any block metadata files can be detected in the defined source directory.
-	//    It scans all discovered files looking for JavaScript assets and converts them to entry points.
-	const blockMetadataFiles = glob( '**/block.json', {
-		absolute: true,
-		cwd: fromProjectRoot( getWordPressSrcDirectory() ),
-	} );
+		// 2. Checks whether any block metadata files can be detected in the defined source directory.
+		//    It scans all discovered files looking for JavaScript assets and converts them to entry points.
+		const blockMetadataFiles = glob( '**/block.json', {
+			absolute: true,
+			cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+		} );
+
+		if ( blockMetadataFiles.length > 0 ) {
+			const srcDirectory = fromProjectRoot(
+				getWordPressSrcDirectory() + sep
+			);
+
+			const entryPoints = {};
 
-	if ( blockMetadataFiles.length > 0 ) {
-		const srcDirectory = fromProjectRoot(
-			getWordPressSrcDirectory() + sep
-		);
-		const entryPoints = blockMetadataFiles.reduce(
-			( accumulator, blockMetadataFile ) => {
+			for ( const blockMetadataFile of blockMetadataFiles ) {
+				const fileContents = readFileSync( blockMetadataFile );
+				let parsedBlockJson;
 				// wrapping in try/catch in case the file is malformed
 				// this happens especially when new block.json files are added
 				// at which point they are completely empty and therefore not valid JSON
 				try {
-					const { editorScript, script, viewScript } = JSON.parse(
-						readFileSync( blockMetadataFile )
-					);
-					[ editorScript, script, viewScript ]
-						.flat()
-						.filter(
-							( value ) => value && value.startsWith( 'file:' )
-						)
-						.forEach( ( value ) => {
-							// Removes the `file:` prefix.
-							const filepath = join(
-								dirname( blockMetadataFile ),
-								value.replace( 'file:', '' )
-							);
-
-							// Takes the path without the file extension, and relative to the defined source directory.
-							if ( ! filepath.startsWith( srcDirectory ) ) {
-								log(
-									chalk.yellow(
-										`Skipping "${ value.replace(
-											'file:',
-											''
-										) }" listed in "${ blockMetadataFile.replace(
-											fromProjectRoot( sep ),
-											''
-										) }". File is located outside of the "${ getWordPressSrcDirectory() }" directory.`
-									)
-								);
-								return;
-							}
-							const entryName = filepath
-								.replace( extname( filepath ), '' )
-								.replace( srcDirectory, '' )
-								.replace( /\\/g, '/' );
-
-							// Detects the proper file extension used in the defined source directory.
-							const [ entryFilepath ] = glob(
-								`${ entryName }.[jt]s?(x)`,
-								{
-									absolute: true,
-									cwd: fromProjectRoot(
-										getWordPressSrcDirectory()
-									),
-								}
-							);
-
-							if ( ! entryFilepath ) {
-								log(
-									chalk.yellow(
-										`Skipping "${ value.replace(
-											'file:',
-											''
-										) }" listed in "${ blockMetadataFile.replace(
-											fromProjectRoot( sep ),
-											''
-										) }". File does not exist in the "${ getWordPressSrcDirectory() }" directory.`
-									)
-								);
-								return;
-							}
-							accumulator[ entryName ] = entryFilepath;
-						} );
-					return accumulator;
+					parsedBlockJson = JSON.parse( fileContents );
 				} catch ( error ) {
 					chalk.yellow(
 						`Skipping "${ blockMetadataFile.replace(
@@ -291,35 +246,105 @@ function getWebpackEntryPoints() {
 							''
 						) }" due to malformed JSON.`
 					);
-					return accumulator;
 				}
-			},
-			{}
-		);
 
-		if ( Object.keys( entryPoints ).length > 0 ) {
-			return entryPoints;
+				const fields =
+					buildType === 'script'
+						? getBlockJsonScriptFields( parsedBlockJson )
+						: getBlockJsonModuleFields( parsedBlockJson );
+
+				if ( ! fields ) {
+					continue;
+				}
+
+				for ( const value of Object.values( fields ).flat() ) {
+					if ( ! value.startsWith( 'file:' ) ) {
+						continue;
+					}
+
+					// Removes the `file:` prefix.
+					const filepath = join(
+						dirname( blockMetadataFile ),
+						value.replace( 'file:', '' )
+					);
+
+					// Takes the path without the file extension, and relative to the defined source directory.
+					if ( ! filepath.startsWith( srcDirectory ) ) {
+						log(
+							chalk.yellow(
+								`Skipping "${ value.replace(
+									'file:',
+									''
+								) }" listed in "${ blockMetadataFile.replace(
+									fromProjectRoot( sep ),
+									''
+								) }". File is located outside of the "${ getWordPressSrcDirectory() }" directory.`
+							)
+						);
+						return;
+					}
+					const entryName = filepath
+						.replace( extname( filepath ), '' )
+						.replace( srcDirectory, '' )
+						.replace( /\\/g, '/' );
+
+					// Detects the proper file extension used in the defined source directory.
+					const [ entryFilepath ] = glob(
+						`${ entryName }.?(m)[jt]s?(x)`,
+						{
+							absolute: true,
+							cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+						}
+					);
+
+					if ( ! entryFilepath ) {
+						log(
+							chalk.yellow(
+								`Skipping "${ value.replace(
+									'file:',
+									''
+								) }" listed in "${ blockMetadataFile.replace(
+									fromProjectRoot( sep ),
+									''
+								) }". File does not exist in the "${ getWordPressSrcDirectory() }" directory.`
+							)
+						);
+						return;
+					}
+					entryPoints[ entryName ] = entryFilepath;
+				}
+			}
+
+			if ( Object.keys( entryPoints ).length > 0 ) {
+				return entryPoints;
+			}
 		}
-	}
 
-	// 3. Checks whether a standard file name can be detected in the defined source directory,
-	//  and converts the discovered file to entry point.
-	const [ entryFile ] = glob( 'index.[jt]s?(x)', {
-		absolute: true,
-		cwd: fromProjectRoot( getWordPressSrcDirectory() ),
-	} );
+		// Don't do any further processing if this is a module build.
+		// This only respects *module block.json fields.
+		if ( buildType === 'module' ) {
+			return {};
+		}
 
-	if ( ! entryFile ) {
-		log(
-			chalk.yellow(
-				`No entry file discovered in the "${ getWordPressSrcDirectory() }" directory.`
-			)
-		);
-		return {};
-	}
+		// 3. Checks whether a standard file name can be detected in the defined source directory,
+		//  and converts the discovered file to entry point.
+		const [ entryFile ] = glob( 'index.[jt]s?(x)', {
+			absolute: true,
+			cwd: fromProjectRoot( getWordPressSrcDirectory() ),
+		} );
+
+		if ( ! entryFile ) {
+			log(
+				chalk.yellow(
+					`No entry file discovered in the "${ getWordPressSrcDirectory() }" directory.`
+				)
+			);
+			return {};
+		}
 
-	return {
-		index: entryFile,
+		return {
+			index: entryFile,
+		};
 	};
 }
 
diff --git a/packages/scripts/utils/index.js b/packages/scripts/utils/index.js
index ae93160381df4..148895ecbc4ed 100644
--- a/packages/scripts/utils/index.js
+++ b/packages/scripts/utils/index.js
@@ -25,6 +25,10 @@ const {
 } = require( './config' );
 const { fromProjectRoot, fromConfigRoot, hasProjectFile } = require( './file' );
 const { getPackageProp, hasPackageProp } = require( './package' );
+const {
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
+} = require( './block-json' );
 
 module.exports = {
 	fromProjectRoot,
@@ -40,6 +44,8 @@ module.exports = {
 	getWordPressSrcDirectory,
 	getWebpackEntryPoints,
 	getRenderPropPaths,
+	getBlockJsonModuleFields,
+	getBlockJsonScriptFields,
 	hasArgInCLI,
 	hasBabelConfig,
 	hasCssnanoConfig,

From a8b4cc216c68fa1c42d25e0911d3cdbe8e1e619e Mon Sep 17 00:00:00 2001
From: Jerry Jones <jones.jeremydavid@gmail.com>
Date: Tue, 9 Jan 2024 10:23:34 -0600
Subject: [PATCH 020/296] Make getLastFocus and setLastFocus private (#57612)

---
 .../data/data-core-block-editor.md            | 24 -------------------
 .../src/components/navigable-toolbar/index.js |  3 ++-
 .../components/writing-flow/use-tab-nav.js    | 14 +++++------
 packages/block-editor/src/store/actions.js    | 15 ------------
 .../block-editor/src/store/private-actions.js | 15 ++++++++++++
 .../src/store/private-selectors.js            | 11 +++++++++
 packages/block-editor/src/store/selectors.js  | 11 ---------
 7 files changed, 35 insertions(+), 58 deletions(-)

diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
index 38a93552bcbef..7b0bd386daaf4 100644
--- a/docs/reference-guides/data/data-core-block-editor.md
+++ b/docs/reference-guides/data/data-core-block-editor.md
@@ -588,18 +588,6 @@ _Properties_
 -   _isDisabled_ `boolean`: Whether or not the user should be prevented from inserting this item.
 -   _frecency_ `number`: Heuristic that combines frequency and recency.
 
-### getLastFocus
-
-Returns the element of the last element that had focus when focus left the editor canvas.
-
-_Parameters_
-
--   _state_ `Object`: Block editor state.
-
-_Returns_
-
--   `Object`: Element.
-
 ### getLastMultiSelectedBlockClientId
 
 Returns the client ID of the last block in the multi-selection set, or null if there is no multi-selection.
@@ -1663,18 +1651,6 @@ _Parameters_
 -   _clientId_ `string`: The block's clientId.
 -   _hasControlledInnerBlocks_ `boolean`: True if the block's inner blocks are controlled.
 
-### setLastFocus
-
-Action that sets the element that had focus when focus leaves the editor canvas.
-
-_Parameters_
-
--   _lastFocus_ `Object`: The last focused element.
-
-_Returns_
-
--   `Object`: Action object.
-
 ### setNavigationMode
 
 Action that enables or disables the navigation mode.
diff --git a/packages/block-editor/src/components/navigable-toolbar/index.js b/packages/block-editor/src/components/navigable-toolbar/index.js
index e97efb2a4b391..b5212497b287e 100644
--- a/packages/block-editor/src/components/navigable-toolbar/index.js
+++ b/packages/block-editor/src/components/navigable-toolbar/index.js
@@ -19,6 +19,7 @@ import { ESCAPE } from '@wordpress/keycodes';
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 function hasOnlyToolbarItem( elements ) {
 	const dataProp = 'toolbarItem';
@@ -169,7 +170,7 @@ function useToolbarFocus( {
 		};
 	}, [ initialIndex, initialFocusOnMount, onIndexChange, toolbarRef ] );
 
-	const { getLastFocus } = useSelect( blockEditorStore );
+	const { getLastFocus } = unlock( useSelect( blockEditorStore ) );
 	/**
 	 * Handles returning focus to the block editor canvas when pressing escape.
 	 */
diff --git a/packages/block-editor/src/components/writing-flow/use-tab-nav.js b/packages/block-editor/src/components/writing-flow/use-tab-nav.js
index b1fb1800a53ea..bfc64dde07153 100644
--- a/packages/block-editor/src/components/writing-flow/use-tab-nav.js
+++ b/packages/block-editor/src/components/writing-flow/use-tab-nav.js
@@ -12,6 +12,7 @@ import { useRef } from '@wordpress/element';
  */
 import { store as blockEditorStore } from '../../store';
 import { isInSameBlock, isInsideRootBlock } from '../../utils/dom';
+import { unlock } from '../../lock-unlock';
 
 export default function useTabNav() {
 	const container = useRef();
@@ -20,16 +21,15 @@ export default function useTabNav() {
 
 	const { hasMultiSelection, getSelectedBlockClientId, getBlockCount } =
 		useSelect( blockEditorStore );
-	const { setNavigationMode, setLastFocus } = useDispatch( blockEditorStore );
+	const { setNavigationMode, setLastFocus } = unlock(
+		useDispatch( blockEditorStore )
+	);
 	const isNavigationMode = useSelect(
 		( select ) => select( blockEditorStore ).isNavigationMode(),
 		[]
 	);
 
-	const lastFocus = useSelect(
-		( select ) => select( blockEditorStore ).getLastFocus(),
-		[]
-	);
+	const { getLastFocus } = unlock( useSelect( blockEditorStore ) );
 
 	// Don't allow tabbing to this element in Navigation mode.
 	const focusCaptureTabIndex = ! isNavigationMode ? '0' : undefined;
@@ -45,7 +45,7 @@ export default function useTabNav() {
 		} else if ( hasMultiSelection() ) {
 			container.current.focus();
 		} else if ( getSelectedBlockClientId() ) {
-			lastFocus.current.focus();
+			getLastFocus()?.current.focus();
 		} else {
 			setNavigationMode( true );
 
@@ -163,7 +163,7 @@ export default function useTabNav() {
 		}
 
 		function onFocusOut( event ) {
-			setLastFocus( { ...lastFocus, current: event.target } );
+			setLastFocus( { ...getLastFocus(), current: event.target } );
 
 			const { ownerDocument } = node;
 
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
index b21436161cb8c..da9beb0ba73a9 100644
--- a/packages/block-editor/src/store/actions.js
+++ b/packages/block-editor/src/store/actions.js
@@ -1919,18 +1919,3 @@ export function unsetBlockEditingMode( clientId = '' ) {
 		clientId,
 	};
 }
-
-/**
- * Action that sets the element that had focus when focus leaves the editor canvas.
- *
- * @param {Object} lastFocus The last focused element.
- *
- *
- * @return {Object} Action object.
- */
-export function setLastFocus( lastFocus = null ) {
-	return {
-		type: 'LAST_FOCUS',
-		lastFocus,
-	};
-}
diff --git a/packages/block-editor/src/store/private-actions.js b/packages/block-editor/src/store/private-actions.js
index 48c5d15d469be..43c392bc7ce8c 100644
--- a/packages/block-editor/src/store/private-actions.js
+++ b/packages/block-editor/src/store/private-actions.js
@@ -323,3 +323,18 @@ export function syncDerivedUpdates( callback ) {
 		} );
 	};
 }
+
+/**
+ * Action that sets the element that had focus when focus leaves the editor canvas.
+ *
+ * @param {Object} lastFocus The last focused element.
+ *
+ *
+ * @return {Object} Action object.
+ */
+export function setLastFocus( lastFocus = null ) {
+	return {
+		type: 'LAST_FOCUS',
+		lastFocus,
+	};
+}
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index 98a75122f4724..d31a710fd94fe 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -281,3 +281,14 @@ export const hasAllowedPatterns = createSelector(
 		),
 	]
 );
+
+/**
+ * Returns the element of the last element that had focus when focus left the editor canvas.
+ *
+ * @param {Object} state Block editor state.
+ *
+ * @return {Object} Element.
+ */
+export function getLastFocus( state ) {
+	return state.lastFocus;
+}
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 94eebd32837a5..55d157c6927a2 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -2946,14 +2946,3 @@ export const isGroupable = createRegistrySelector(
 			);
 		}
 );
-
-/**
- * Returns the element of the last element that had focus when focus left the editor canvas.
- *
- * @param {Object} state Block editor state.
- *
- * @return {Object} Element.
- */
-export function getLastFocus( state ) {
-	return state.lastFocus;
-}

From 6a2fda180a15d9b4a5daaa4a7f828c85b8415bc8 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:32:36 +0100
Subject: [PATCH 021/296] Blocks: Add handling for block.json viewModule
 (#57437)

Add viewModule support for registering blocks from block.json metadata.

This follows a similar pattern to how WordPress Core manages block scripts. Different module IDs are attached to the `WP_Block_Type` instance. Those modules are enqueued when the block is rendered.
---
 .../modules/class-gutenberg-modules.php       | 188 ++++++++++++++++++
 1 file changed, 188 insertions(+)

diff --git a/lib/experimental/modules/class-gutenberg-modules.php b/lib/experimental/modules/class-gutenberg-modules.php
index 5aa012f8e2f2c..f773e2c998c23 100644
--- a/lib/experimental/modules/class-gutenberg-modules.php
+++ b/lib/experimental/modules/class-gutenberg-modules.php
@@ -280,3 +280,191 @@ function gutenberg_dequeue_module( $module_identifier ) {
 
 // Prints the script that loads the import map polyfill in the footer.
 add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 );
+
+/**
+ * Add module fields from block metadata to WP_Block_Type settings.
+ *
+ * This filter allows us to register modules from block metadata and attach additional fields to
+ * WP_Block_Type instances.
+ *
+ * @param array $settings Array of determined settings for registering a block type.
+ * @param array $metadata Metadata provided for registering a block type.
+ */
+function gutenberg_filter_block_type_metadata_settings_register_modules( $settings, $metadata = null ) {
+	$module_fields = array(
+		'viewModule' => 'view_module_ids',
+	);
+	foreach ( $module_fields as $metadata_field_name => $settings_field_name ) {
+		if ( ! empty( $settings[ $metadata_field_name ] ) ) {
+			$metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ];
+		}
+		if ( ! empty( $metadata[ $metadata_field_name ] ) ) {
+			$modules           = $metadata[ $metadata_field_name ];
+			$processed_modules = array();
+			if ( is_array( $modules ) ) {
+				for ( $index = 0; $index < count( $modules ); $index++ ) {
+					$processed_modules[] = gutenberg_register_block_module_id(
+						$metadata,
+						$metadata_field_name,
+						$index
+					);
+				}
+			} else {
+				$processed_modules[] = gutenberg_register_block_module_id(
+					$metadata,
+					$metadata_field_name
+				);
+			}
+			$settings[ $settings_field_name ] = $processed_modules;
+		}
+	}
+
+	return $settings;
+}
+
+add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_modules', 10, 2 );
+
+/**
+ * Enqueue modules associated with the block.
+ *
+ * @param string   $block_content The block content.
+ * @param array    $block         The full block, including name and attributes.
+ * @param WP_Block $instance      The block instance.
+ */
+function gutenberg_filter_render_block_enqueue_view_modules( $block_content, $parsed_block, $block_instance ) {
+	$block_type = $block_instance->block_type;
+
+	if ( ! empty( $block_type->view_module_ids ) ) {
+		foreach ( $block_type->view_module_ids as $module_id ) {
+			gutenberg_enqueue_module( $module_id );
+		}
+	}
+
+	return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_filter_render_block_enqueue_view_modules', 10, 3 );
+
+/**
+ * Finds a module ID for the selected block metadata field. It detects
+ * when a path to file was provided and finds a corresponding asset file
+ * with details necessary to register the module under an automatically
+ * generated module ID.
+ *
+ * This is analogous to the `register_block_script_handle` in WordPress Core.
+ *
+ * @param array  $metadata   Block metadata.
+ * @param string $field_name Field name to pick from metadata.
+ * @param int    $index      Optional. Index of the script to register when multiple items passed.
+ *                           Default 0.
+ * @return string Module ID.
+ */
+function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) {
+	if ( empty( $metadata[ $field_name ] ) ) {
+		return false;
+	}
+
+	$module_id = $metadata[ $field_name ];
+	if ( is_array( $module_id ) ) {
+		if ( empty( $module_id[ $index ] ) ) {
+			return false;
+		}
+		$module_id = $module_id[ $index ];
+	}
+
+	$module_path = remove_block_asset_path_prefix( $module_id );
+	if ( $module_id === $module_path ) {
+		return $module_id;
+	}
+
+	$path                  = dirname( $metadata['file'] );
+	$module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) );
+	$module_id             = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index );
+	$module_asset_path     = wp_normalize_path( realpath( $module_asset_raw_path ) );
+
+	if ( empty( $module_asset_path ) ) {
+		_doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+				// This string is from WordPress Core. See `register_block_script_handle`.
+				// Translators: This is a translation from WordPress Core (default). No need to translate.
+				__( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.', 'default' ),
+				$module_asset_raw_path,
+				$field_name,
+				$metadata['name']
+			),
+			'6.5.0'
+		);
+		return false;
+	}
+
+	$module_path_norm    = wp_normalize_path( realpath( $path . '/' . $module_path ) );
+	$module_uri          = get_block_asset_url( $module_path_norm );
+	$module_asset        = require $module_asset_path;
+	$module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array();
+
+	gutenberg_register_module(
+		$module_id,
+		$module_uri,
+		$module_dependencies,
+		isset( $module_asset['version'] ) ? $module_asset['version'] : false
+	);
+
+	return $module_id;
+}
+
+/**
+ * Generates the module ID for an asset based on the name of the block
+ * and the field name provided.
+ *
+ * This is analogous to the `generate_block_asset_handle` in WordPress Core.
+ *
+ * @param string $block_name Name of the block.
+ * @param string $field_name Name of the metadata field.
+ * @param int    $index      Optional. Index of the asset when multiple items passed.
+ *                           Default 0.
+ * @return string Generated module ID for the block's field.
+ */
+function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) {
+	if ( str_starts_with( $block_name, 'core/' ) ) {
+		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
+		if ( str_starts_with( $field_name, 'editor' ) ) {
+			$asset_handle .= '-editor';
+		}
+		if ( str_starts_with( $field_name, 'view' ) ) {
+			$asset_handle .= '-view';
+		}
+		if ( $index > 0 ) {
+			$asset_handle .= '-' . ( $index + 1 );
+		}
+		return $asset_handle;
+	}
+
+	$field_mappings = array(
+		'viewModule' => 'view-module',
+	);
+	$asset_handle   = str_replace( '/', '-', $block_name ) .
+		'-' . $field_mappings[ $field_name ];
+	if ( $index > 0 ) {
+		$asset_handle .= '-' . ( $index + 1 );
+	}
+	return $asset_handle;
+}
+
+function gutenberg_register_view_module_ids_rest_field() {
+	register_rest_field(
+		'block-type',
+		'view_module_ids',
+		array(
+			'get_callback' => function ( $item ) {
+				$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] );
+				if ( isset( $block_type->view_module_ids ) ) {
+					return $block_type->view_module_ids;
+				}
+				return array();
+			},
+		)
+	);
+}
+
+add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' );

From 901950057bfbdcbdead63ef778de4b3fc19120bc Mon Sep 17 00:00:00 2001
From: Miguel Fonseca <150562+mcsf@users.noreply.github.com>
Date: Tue, 9 Jan 2024 17:49:38 +0000
Subject: [PATCH 022/296] DataViews: Use i18n._x to clarify term "Duplicate"
 (#57686)

These labels all refer to actions, where "duplicate" is meant as a verb.
For a translator, that context was not clear, as "duplicate" could have
been understood to be an adjective.
---
 .../page-patterns/dataviews-pattern-actions.js     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
index 19d4c93bb685f..bf5210beb49fb 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
@@ -8,7 +8,7 @@ import { paramCase as kebabCase } from 'change-case';
  */
 import { getQueryArgs } from '@wordpress/url';
 import { downloadBlob } from '@wordpress/blob';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, _x, sprintf } from '@wordpress/i18n';
 import {
 	Button,
 	TextControl,
@@ -251,9 +251,9 @@ export const resetAction = {
 
 export const duplicatePatternAction = {
 	id: 'duplicate-pattern',
-	label: __( 'Duplicate' ),
+	label: _x( 'Duplicate', 'action label' ),
 	isEligible: ( item ) => item.type !== TEMPLATE_PART_POST_TYPE,
-	modalHeader: __( 'Duplicate pattern' ),
+	modalHeader: _x( 'Duplicate pattern', 'action label' ),
 	RenderModal: ( { item, closeModal } ) => {
 		const { categoryId = PATTERN_DEFAULT_CATEGORY } = getQueryArgs(
 			window.location.href
@@ -276,7 +276,7 @@ export const duplicatePatternAction = {
 		return (
 			<CreatePatternModalContents
 				onClose={ closeModal }
-				confirmLabel={ __( 'Duplicate' ) }
+				confirmLabel={ _x( 'Duplicate', 'action label' ) }
 				{ ...duplicatedProps }
 			/>
 		);
@@ -285,9 +285,9 @@ export const duplicatePatternAction = {
 
 export const duplicateTemplatePartAction = {
 	id: 'duplicate-template-part',
-	label: __( 'Duplicate' ),
+	label: _x( 'Duplicate', 'action label' ),
 	isEligible: ( item ) => item.type === TEMPLATE_PART_POST_TYPE,
-	modalHeader: __( 'Duplicate template part' ),
+	modalHeader: _x( 'Duplicate template part', 'action label' ),
 	RenderModal: ( { item, closeModal } ) => {
 		const { createSuccessNotice } = useDispatch( noticesStore );
 		const { categoryId = PATTERN_DEFAULT_CATEGORY } = getQueryArgs(
@@ -322,7 +322,7 @@ export const duplicateTemplatePartAction = {
 				) }
 				onCreate={ onTemplatePartSuccess }
 				onError={ closeModal }
-				confirmLabel={ __( 'Duplicate' ) }
+				confirmLabel={ _x( 'Duplicate', 'action label' ) }
 			/>
 		);
 	},

From 9323cdda77f412f35ef3584c264d6ef5f5d146c2 Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Tue, 9 Jan 2024 12:30:01 -0600
Subject: [PATCH 023/296] Add links to additional local dev tools. (#57682)

---
 docs/getting-started/devenv/README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/getting-started/devenv/README.md b/docs/getting-started/devenv/README.md
index c891490437d43..47113c84d78da 100644
--- a/docs/getting-started/devenv/README.md
+++ b/docs/getting-started/devenv/README.md
@@ -48,3 +48,10 @@ Refer to the [Get started with `wp-env`](/docs/getting-started/devenv/get-starte
 <div class="callout callout-info">
     Throughout the Handbook, you may also see references to <code><a href="https://github.com/WordPress/playground-tools/tree/trunk/packages/wp-now">wp-now</a></code>. This is a lightweight tool powered by <a hre="https://developer.wordpress.org/playground/">WordPress Playground</a> that streamlines setting up a simple local WordPress environment. While still experimental, this tool is great for quickly testing WordPress releases, plugins, and themes. 
 </div>
+
+This list is not exhaustive, but here are several additional options to choose from if you prefer not to use `wp-env`:
+
+- [Local](https://localwp.com/)
+- [XAMPP](https://www.apachefriends.org/)
+- [MAMP](https://www.mamp.info/en/mamp/mac/)
+- [Varying Vagrant Vagrants](https://varyingvagrantvagrants.org/) (VVV)

From 76e1642271610678a1859839a4a2288e4b15b6c4 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Tue, 9 Jan 2024 19:33:46 +0100
Subject: [PATCH 024/296] Interactivity API: Implement `wp_initial_state()`
 (#57556)

* Update directive processing to handle namespaces

* Add required namespace param to evaluate reference

* Handle references with namespaces

* Rename parse_reference to parse_attribute_value

* Update directive implementations

* Improve comments in `parse_attribute_value`

* Restore changes from `store()` migration PR

* Do not make namespace optional in `get_state()`

* Replace Store with Initial_State

* Fix set up and tear down of Initial State tests

* Update directive tests after implementation changes

* Add TODO comment to derived state

* Refactor directive processing tests

* Move namespace logic to a directive

* Add tests for namespaces logic

* Fix typo in comments

* Handle empty attributes in wp-interactive

* Handle boolean attributes in wp-context

* Do not support derived state yet

* Add root blocks bail out quick by name

---------

Co-authored-by: Carlos Bravo <carlos.bravo@automattic.com>
---
 .../class-wp-directive-processor.php          |  53 +++-
 .../class-wp-interactivity-initial-state.php  |  82 +++++
 .../class-wp-interactivity-store.php          |  69 ----
 .../directive-processing.php                  |  76 +++--
 .../interactivity-api/directives/wp-bind.php  |   7 +-
 .../interactivity-api/directives/wp-class.php |   7 +-
 .../directives/wp-context.php                 |  16 +-
 .../directives/wp-interactive.php             |  44 +++
 .../interactivity-api/directives/wp-style.php |   7 +-
 .../interactivity-api/directives/wp-text.php  |   5 +-
 .../interactivity-api/initial-state.php       |  29 ++
 lib/experimental/interactivity-api/store.php  |  28 --
 lib/load.php                                  |   5 +-
 ...ss-wp-interactivity-initial-state-test.php | 115 +++++++
 .../class-wp-interactivity-store-test.php     | 186 -----------
 .../directive-processing-test.php             | 295 +++++++++++++++---
 .../directives/wp-bind-test.php               |  12 +-
 .../directives/wp-class-test.php              |  33 +-
 .../directives/wp-context-test.php            |  61 ++--
 .../directives/wp-style-test.php              |  12 +-
 .../directives/wp-text-test.php               |  12 +-
 21 files changed, 723 insertions(+), 431 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/directives/wp-interactive.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-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index bb70068aa9482..3b8a38f973815 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -35,7 +35,11 @@ class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_5 {
 	 * @param array $block The block to add.
 	 */
 	public static function mark_root_block( $block ) {
-		self::$root_block = md5( serialize( $block ) );
+		if ( null !== $block['blockName'] ) {
+			self::$root_block = $block['blockName'] . md5( serialize( $block ) );
+		} else {
+			self::$root_block = md5( serialize( $block ) );
+		}
 	}
 
 	/**
@@ -52,6 +56,14 @@ public static function unmark_root_block() {
 	 * @return bool True if block is a root block, false otherwise.
 	 */
 	public static function is_marked_as_root_block( $block ) {
+		// If self::$root_block is null, is impossible that any block has been marked as root.
+		if ( is_null( self::$root_block ) ) {
+			return false;
+		}
+		// Blocks whose blockName is null are specifically intended to convey - "this is a freeform HTML block."
+		if ( null !== $block['blockName'] ) {
+			return str_contains( self::$root_block, $block['blockName'] ) && $block['blockName'] . md5( serialize( $block ) ) === self::$root_block;
+		}
 		return md5( serialize( $block ) ) === self::$root_block;
 	}
 
@@ -256,4 +268,43 @@ public static function is_html_void_element( $tag_name ) {
 	public static function parse_attribute_name( $name ) {
 		return explode( '--', $name, 2 );
 	}
+
+	/**
+	 * Parse and extract the namespace and path from the given value.
+	 *
+	 * If the value contains a JSON instead of a path, the function parses it
+	 * and returns the resulting array.
+	 *
+	 * @param string $value Passed value.
+	 * @param string $ns Namespace fallback.
+	 * @return array The resulting array
+	 */
+	public static function parse_attribute_value( $value, $ns = null ) {
+		$matches = array();
+		$has_ns  = preg_match( '/^([\w\-_\/]+)::(.+)$/', $value, $matches );
+
+		/*
+		 * Overwrite both `$ns` and `$value` variables if `$value` explicitly
+		 * contains a namespace.
+		 */
+		if ( $has_ns ) {
+			list( , $ns, $value ) = $matches;
+		}
+
+		/*
+		 * Try to decode `$value` as a JSON object. If it works, `$value` is
+		 * replaced with the resulting array. The original string is preserved
+		 * otherwise.
+		 *
+		 * Note that `json_decode` returns `null` both for an invalid JSON or
+		 * the `'null'` string (a valid JSON). In the latter case, `$value` is
+		 * replaced with `null`.
+		 */
+		$data = json_decode( $value, true );
+		if ( null !== $data || 'null' === trim( $value ) ) {
+			$value = $data;
+		}
+
+		return array( $ns, $value );
+	}
 }
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..15e57edfa4a6a
--- /dev/null
+++ b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
@@ -0,0 +1,82 @@
+<?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 ) {
+		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 075d31d577634..b49ee538390ff 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -43,12 +43,13 @@ function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
 		$parsed_blocks     = parse_blocks( $block_content );
 		$context           = new WP_Directive_Context();
 		$processed_content = '';
+		$namespace_stack   = array();
 
 		foreach ( $parsed_blocks as $parsed_block ) {
 			if ( 'core/interactivity-wrapper' === $parsed_block['blockName'] ) {
-				$processed_content .= gutenberg_process_interactive_block( $parsed_block, $context );
+				$processed_content .= gutenberg_process_interactive_block( $parsed_block, $context, $namespace_stack );
 			} elseif ( 'core/non-interactivity-wrapper' === $parsed_block['blockName'] ) {
-				$processed_content .= gutenberg_process_non_interactive_block( $parsed_block, $context );
+				$processed_content .= gutenberg_process_non_interactive_block( $parsed_block, $context, $namespace_stack );
 			} else {
 				$processed_content .= $parsed_block['innerHTML'];
 			}
@@ -118,10 +119,11 @@ function gutenberg_mark_block_interactivity( $block_content, $block, $block_inst
  *
  * @param array                $interactive_block The interactive block to process.
  * @param WP_Directive_Context $context The context to use when processing.
+ * @param array                $namespace_stack Stack of namespackes passed by reference.
  *
  * @return string The processed HTML.
  */
-function gutenberg_process_interactive_block( $interactive_block, $context ) {
+function gutenberg_process_interactive_block( $interactive_block, $context, &$namespace_stack ) {
 	$block_index              = 0;
 	$content                  = '';
 	$interactive_inner_blocks = array();
@@ -137,7 +139,7 @@ function gutenberg_process_interactive_block( $interactive_block, $context ) {
 		}
 	}
 
-	return gutenberg_process_interactive_html( $content, $context, $interactive_inner_blocks );
+	return gutenberg_process_interactive_html( $content, $context, $interactive_inner_blocks, $namespace_stack );
 }
 
 /**
@@ -147,10 +149,11 @@ function gutenberg_process_interactive_block( $interactive_block, $context ) {
  *
  * @param array                $non_interactive_block The non-interactive block to process.
  * @param WP_Directive_Context $context The context to use when processing.
+ * @param array                $namespace_stack Stack of namespackes passed by reference.
  *
  * @return string The processed HTML.
  */
-function gutenberg_process_non_interactive_block( $non_interactive_block, $context ) {
+function gutenberg_process_non_interactive_block( $non_interactive_block, $context, &$namespace_stack ) {
 	$block_index = 0;
 	$content     = '';
 	foreach ( $non_interactive_block['innerContent'] as $inner_content ) {
@@ -164,9 +167,9 @@ function gutenberg_process_non_interactive_block( $non_interactive_block, $conte
 			$inner_block = $non_interactive_block['innerBlocks'][ $block_index++ ];
 
 			if ( 'core/interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_interactive_block( $inner_block, $context );
+				$content .= gutenberg_process_interactive_block( $inner_block, $context, $namespace_stack );
 			} elseif ( 'core/non-interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_non_interactive_block( $inner_block, $context );
+				$content .= gutenberg_process_non_interactive_block( $inner_block, $context, $namespace_stack );
 			}
 		}
 	}
@@ -184,16 +187,18 @@ function gutenberg_process_non_interactive_block( $non_interactive_block, $conte
  * @param string $html The HTML to process.
  * @param mixed  $context The context to use when processing.
  * @param array  $inner_blocks The inner blocks to process.
+ * @param array  $namespace_stack Stack of namespackes passed by reference.
  *
  * @return string The processed HTML.
  */
-function gutenberg_process_interactive_html( $html, $context, $inner_blocks = array() ) {
+function gutenberg_process_interactive_html( $html, $context, $inner_blocks = array(), &$namespace_stack = array() ) {
 	static $directives = array(
-		'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',
+		'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
+		'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',
 	);
 
 	$tags                   = new WP_Directive_Processor( $html );
@@ -207,9 +212,9 @@ function gutenberg_process_interactive_html( $html, $context, $inner_blocks = ar
 		// Processes the inner blocks.
 		if ( str_contains( $tag_name, 'WP-INNER-BLOCKS' ) && ! empty( $inner_blocks ) && ! $tags->is_tag_closer() ) {
 			if ( 'core/interactivity-wrapper' === $inner_blocks[ $inner_blocks_index ]['blockName'] ) {
-				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context );
+				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context, $namespace_stack );
 			} elseif ( 'core/non-interactivity-wrapper' === $inner_blocks[ $inner_blocks_index ]['blockName'] ) {
-				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_non_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context );
+				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_non_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context, $namespace_stack );
 			}
 		}
 		if ( $tags->is_tag_closer() ) {
@@ -270,7 +275,15 @@ function gutenberg_process_interactive_html( $html, $context, $inner_blocks = ar
 		);
 
 		foreach ( $sorted_attrs as $attribute ) {
-			call_user_func( $directives[ $attribute ], $tags, $context );
+			call_user_func_array(
+				$directives[ $attribute ],
+				array(
+					$tags,
+					$context,
+					end( $namespace_stack ),
+					&$namespace_stack,
+				)
+			);
 		}
 	}
 
@@ -290,17 +303,25 @@ function gutenberg_process_interactive_html( $html, $context, $inner_blocks = ar
 }
 
 /**
- * Resolves the reference using the store and the context from the provided
- * path.
+ * Resolves the passed reference from the store and the context under the given
+ * namespace.
  *
- * @param string $path Path.
+ * A reference could be either a single path or a namespace followed by a path,
+ * separated by two colons, i.e, `namespace::path.to.prop`. If the reference
+ * contains a namespace, that namespace overrides the one passed as argument.
+ *
+ * @param string $reference Reference value.
+ * @param string $ns Inherited namespace.
  * @param array  $context Context data.
- * @return mixed
+ * @return mixed Resolved value.
  */
-function gutenberg_interactivity_evaluate_reference( $path, array $context = array() ) {
-	$store = array_merge(
-		WP_Interactivity_Store::get_data(),
-		array( 'context' => $context )
+function gutenberg_interactivity_evaluate_reference( $reference, $ns, array $context = array() ) {
+	// Extract the namespace from the reference (if present).
+	list( $ns, $path ) = WP_Directive_Processor::parse_attribute_value( $reference, $ns );
+
+	$store = array(
+		'state'   => WP_Interactivity_Initial_State::get_state( $ns ),
+		'context' => $context[ $ns ] ?? array(),
 	);
 
 	/*
@@ -329,7 +350,12 @@ function gutenberg_interactivity_evaluate_reference( $path, array $context = arr
 	 * E.g., "file" is an string and a "callable" (the "file" function exists).
 	 */
 	if ( $current instanceof Closure ) {
-		$current = call_user_func( $current, $store );
+		/*
+		 * TODO: Figure out a way to implement derived state without having to
+		 * pass the store as argument:
+		 *
+		 * $current = call_user_func( $current );
+		 */
 	}
 
 	// Returns the opposite if it has a negator operator (!).
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
index 54be4a9faeb7d..57d2e5deb23ab 100644
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ b/lib/experimental/interactivity-api/directives/wp-bind.php
@@ -11,8 +11,9 @@
  *
  * @param WP_Directive_Processor $tags Tags.
  * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
  */
-function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
+function gutenberg_interactivity_process_wp_bind( $tags, $context, $ns ) {
 	if ( $tags->is_tag_closer() ) {
 		return;
 	}
@@ -25,8 +26,8 @@ function gutenberg_interactivity_process_wp_bind( $tags, $context ) {
 			continue;
 		}
 
-		$expr  = $tags->get_attribute( $attr );
-		$value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$reference = $tags->get_attribute( $attr );
+		$value     = gutenberg_interactivity_evaluate_reference( $reference, $ns, $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 741cc75b42c60..ef91835be86fc 100644
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ b/lib/experimental/interactivity-api/directives/wp-class.php
@@ -11,8 +11,9 @@
  *
  * @param WP_Directive_Processor $tags Tags.
  * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
  */
-function gutenberg_interactivity_process_wp_class( $tags, $context ) {
+function gutenberg_interactivity_process_wp_class( $tags, $context, $ns ) {
 	if ( $tags->is_tag_closer() ) {
 		return;
 	}
@@ -25,8 +26,8 @@ function gutenberg_interactivity_process_wp_class( $tags, $context ) {
 			continue;
 		}
 
-		$expr      = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$reference = $tags->get_attribute( $attr );
+		$add_class = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() );
 		if ( $add_class ) {
 			$tags->add_class( $class_name );
 		} else {
diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
index 7d92b0ac7b0c6..b41b47c86c78c 100644
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ b/lib/experimental/interactivity-api/directives/wp-context.php
@@ -10,19 +10,21 @@
  *
  * @param WP_Directive_Processor $tags Tags.
  * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
  */
-function gutenberg_interactivity_process_wp_context( $tags, $context ) {
+function gutenberg_interactivity_process_wp_context( $tags, $context, $ns ) {
 	if ( $tags->is_tag_closer() ) {
 		$context->rewind_context();
 		return;
 	}
 
-	$value = $tags->get_attribute( 'data-wp-context' );
+	$attr_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.
+	list( $ns, $data ) = is_string( $attr_value ) && ! empty( $attr_value )
+		? WP_Directive_Processor::parse_attribute_value( $attr_value, $ns )
+		: array( $ns, null );
 
-	$context->set_context( $new_context ?? array() );
+	// Add parsed data to the context under the corresponding namespace.
+	$context->set_context( array( $ns => is_array( $data ) ? $data : array() ) );
 }
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..9f3471a8b4e6a
--- /dev/null
+++ b/lib/experimental/interactivity-api/directives/wp-interactive.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Process the wp-interactive directive.
+ *
+ * @package Gutenberg
+ * @subpackage Interactivity API
+ */
+
+/**
+ * Process wp-interactive directive.
+ *
+ * @param WP_Directive_Processor $tags Tags.
+ * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
+ * @param array                  $ns_stack Namespace stack.
+ */
+function gutenberg_interactivity_process_wp_interactive( $tags, $context, $ns, &$ns_stack ) {
+	// Pop the current namespace if this is the closing tag of an island.
+	if ( $tags->is_tag_closer() ) {
+		array_pop( $ns_stack );
+		return;
+	}
+
+	/*
+	 * Decode the data-wp-interactive attribute. In the case it is not a valid
+	 * JSON string, NULL is stored in `$island_data`.
+	 */
+	$island      = $tags->get_attribute( 'data-wp-interactive' );
+	$island_data = is_string( $island ) && ! empty( $island )
+		? json_decode( $island, true )
+		: null;
+
+	/*
+	 * Push the newly defined namespace, or the current one if the island
+	 * definition was invalid or does not contain a namespace.
+	 *
+	 * This is done because the function pops out the current namespace from the
+	 * stack whenever it finds an island's closing tag, independently of whether
+	 * the island definition was correct or it contained a valid namespace.
+	 */
+	$ns_stack[] = isset( $island_data ) && $island_data['namespace']
+		? $island_data['namespace']
+		: $ns;
+}
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
index e5d7b269ace7c..16432e5728260 100644
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ b/lib/experimental/interactivity-api/directives/wp-style.php
@@ -11,8 +11,9 @@
  *
  * @param WP_Directive_Processor $tags Tags.
  * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
  */
-function gutenberg_interactivity_process_wp_style( $tags, $context ) {
+function gutenberg_interactivity_process_wp_style( $tags, $context, $ns ) {
 	if ( $tags->is_tag_closer() ) {
 		return;
 	}
@@ -25,8 +26,8 @@ function gutenberg_interactivity_process_wp_style( $tags, $context ) {
 			continue;
 		}
 
-		$expr        = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $expr, $context->get_context() );
+		$reference   = $tags->get_attribute( $attr );
+		$style_value = gutenberg_interactivity_evaluate_reference( $reference, $ns, $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 b0cfc98a74e70..c4c5bb27a31e1 100644
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ b/lib/experimental/interactivity-api/directives/wp-text.php
@@ -11,8 +11,9 @@
  *
  * @param WP_Directive_Processor $tags Tags.
  * @param WP_Directive_Context   $context Directive context.
+ * @param string                 $ns Namespace.
  */
-function gutenberg_interactivity_process_wp_text( $tags, $context ) {
+function gutenberg_interactivity_process_wp_text( $tags, $context, $ns ) {
 	if ( $tags->is_tag_closer() ) {
 		return;
 	}
@@ -22,6 +23,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, $ns, $context->get_context() );
 	$tags->set_inner_html( esc_html( $text ) );
 }
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 1aa55f7581c27..d413334227ee7 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -117,8 +117,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';
@@ -128,6 +128,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';
 
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..a95c3482ec80d
--- /dev/null
+++ b/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
@@ -0,0 +1,115 @@
+<?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() {
+		parent::set_up();
+		WP_Interactivity_Initial_State::reset();
+	}
+	public function tear_down() {
+		WP_Interactivity_Initial_State::reset();
+		parent::tear_down();
+	}
+
+	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
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index 99218f69a8fb7..d6b5bc3860a95 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -82,15 +82,42 @@ public function set_up() {
 				),
 			)
 		);
+
+		register_block_type(
+			'test/directives',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					$parsed_attributes = array();
+					foreach ( $attributes as $key => $value ) {
+						$parsed_attributes[ $key ] = is_array( $value )
+							? wp_json_encode( $value, JSON_HEX_APOS )
+							: esc_attr( $value );
+					}
+
+					$wrapper_attributes = get_block_wrapper_attributes(
+						$parsed_attributes
+					);
+
+					return "<div $wrapper_attributes>$content</div>";
+				},
+				'supports'        => array(
+					'interactivity' => true,
+				),
+			)
+		);
+
+		WP_Interactivity_Initial_State::reset();
 	}
 
 	public function tear_down() {
+		WP_Interactivity_Initial_State::reset();
 		unregister_block_type( 'test/context-level-1' );
 		unregister_block_type( 'test/context-level-2' );
 		unregister_block_type( 'test/context-read-only' );
 		unregister_block_type( 'test/non-interactive-with-directive' );
 		unregister_block_type( 'test/context-level-with-manual-inner-block-rendering' );
 		unregister_block_type( 'test/directives-ordering' );
+		unregister_block_type( 'test/directives' );
 		parent::tear_down();
 	}
 
@@ -228,29 +255,37 @@ public function test_directives_ordering() {
 
 	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() {
+		wp_initial_state(
+			'test',
+			array(
+				'number' => 1,
+				'bool'   => true,
+				'nested' => array(
+					'string' => 'hi',
+				),
+			)
+		);
+
 		$context = array(
-			'local' => array(
+			'test' => array(
 				'number' => 2,
 				'bool'   => false,
 				'nested' => array(
@@ -259,53 +294,231 @@ 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' ) );
+		// Defined state is also accessible.
+		$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' ) );
 	}
 
 	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', 'myblock' ) );
 	}
 
 	public function test_evaluate_function_should_execute_anonymous_functions() {
-		$context = new WP_Directive_Context( array( 'count' => 2 ) );
+		$this->markTestSkipped( 'Derived state was supported for `wp_store()` but not for `wp_initial_state()` yet.' );
 
-		wp_store(
+		$context = new WP_Directive_Context( array( 'myblock' => array( 'count' => 2 ) ) );
+
+		wp_initial_state(
+			'myblock',
 			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( $this, 'increment' ),
-					'class_static_method' => array( 'Tests_Process_Directives', '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( $this, 'increment' ),
+				'class_static_method' => array( 'Tests_Process_Directives', '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', 'myblock', $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', 'myblock', $context->get_context() )
 		);
 		$this->assertSame(
 			array( $this, 'increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_method', 'myblock', $context->get_context() )
 		);
 		$this->assertSame(
 			array( 'Tests_Process_Directives', 'static_increment' ),
-			gutenberg_interactivity_evaluate_reference( 'selectors.class_static_method', $context->get_context() )
+			gutenberg_interactivity_evaluate_reference( 'state.class_static_method', 'myblock', $context->get_context() )
 		);
 	}
+
+	public function test_namespace_should_be_inherited_from_ancestor() {
+		/*
+		 * This function call should be done inside block render functions. We
+		 * run it here instead just for conveninence.
+		 */
+		wp_initial_state( 'test-1', array( 'text' => 'state' ) );
+
+		$post_content = '
+			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
+				<!-- wp:test/directives { "data-wp-context": { "text": "context" } } -->
+					<!-- wp:test/directives {
+						"class": "bind-state",
+						"data-wp-bind--data-value": "state.text"
+					} /-->
+					<!-- wp:test/directives {
+						"class": "bind-context",
+						"data-wp-bind--data-value": "context.text"
+					} /-->
+				<!-- /wp:test/directives -->
+			<!-- /wp:test/directives -->
+		';
+
+		$html = do_blocks( $post_content );
+		$tags = new WP_HTML_Tag_Processor( $html );
+
+		$tags->next_tag( array( 'class_name' => 'bind-state' ) );
+		$this->assertSame( 'state', $tags->get_attribute( 'data-value' ) );
+
+		$tags->next_tag( array( 'class_name' => 'bind-context' ) );
+		$this->assertSame( 'context', $tags->get_attribute( 'data-value' ) );
+	}
+
+	public function test_namespace_should_be_inherited_from_same_element() {
+		/*
+		 * This function call should be done inside block render functions. We
+		 * run it here instead just for conveninence.
+		 */
+		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
+
+		$post_content = '
+			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
+				<!-- wp:test/directives { "data-wp-context": { "text": "context" } } -->
+					<!-- wp:test/directives {
+						"class": "bind-state",
+						"data-wp-interactive": { "namespace": "test-2" },
+						"data-wp-bind--data-value": "state.text"
+					} /-->
+					<!-- wp:test/directives {
+						"class": "bind-context",
+						"data-wp-interactive": { "namespace": "test-2" },
+						"data-wp-context": { "text": "context-2" },
+						"data-wp-bind--data-value": "context.text"
+					} /-->
+				<!-- /wp:test/directives -->
+			<!-- /wp:test/directives -->
+		';
+
+		$html = do_blocks( $post_content );
+		$tags = new WP_HTML_Tag_Processor( $html );
+
+		$tags->next_tag( array( 'class_name' => 'bind-state' ) );
+		$this->assertSame( 'state-2', $tags->get_attribute( 'data-value' ) );
+
+		$tags->next_tag( array( 'class_name' => 'bind-context' ) );
+		$this->assertSame( 'context-2', $tags->get_attribute( 'data-value' ) );
+	}
+
+	public function test_namespace_should_not_leak_from_descendant() {
+		/*
+		 * This function call should be done inside block render functions. We
+		 * run it here instead just for conveninence.
+		 */
+		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
+		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
+
+		$post_content = '
+			<!-- wp:test/directives {
+				"data-wp-interactive": { "namespace": "test-2" },
+				"data-wp-context": { "text": "context-2" }
+			} -->
+				<!-- wp:test/directives {
+					"class": "target",
+					"data-wp-interactive": { "namespace": "test-1" },
+					"data-wp-context": { "text": "context-1" },
+					"data-wp-bind--data-state": "state.text",
+					"data-wp-bind--data-context": "context.text"
+				} -->
+					<!-- wp:test/directives {
+						"data-wp-interactive": { "namespace": "test-2" }
+					} /-->
+				<!-- /wp:test/directives -->
+			<!-- /wp:test/directives -->
+		';
+
+		$html = do_blocks( $post_content );
+		$tags = new WP_HTML_Tag_Processor( $html );
+
+		$tags->next_tag( array( 'class_name' => 'target' ) );
+		$this->assertSame( 'state-1', $tags->get_attribute( 'data-state' ) );
+		$this->assertSame( 'context-1', $tags->get_attribute( 'data-context' ) );
+	}
+
+	public function test_namespace_should_not_leak_from_sibling() {
+		/*
+		 * This function call should be done inside block render functions. We
+		 * run it here instead just for conveninence.
+		 */
+		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
+		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
+
+		$post_content = '
+			<!-- wp:test/directives {
+				"data-wp-interactive": { "namespace": "test-2" },
+				"data-wp-context": { "text": "context-2" }
+			} -->
+				<!-- wp:test/directives {
+					"data-wp-interactive": { "namespace": "test-1" },
+					"data-wp-context": { "text": "context-1" }
+				} -->
+					<!-- wp:test/directives {
+						"data-wp-interactive": { "namespace": "test-2" }
+					} /-->
+					<!-- wp:test/directives {
+						"class": "target",
+						"data-wp-bind--data-from-state": "state.text",
+						"data-wp-bind--data-from-context": "context.text"
+					} /-->
+				<!-- /wp:test/directives -->
+			<!-- /wp:test/directives -->
+		';
+
+		$html = do_blocks( $post_content );
+		$tags = new WP_HTML_Tag_Processor( $html );
+
+		$tags->next_tag( array( 'class_name' => 'target' ) );
+		$this->assertSame( 'state-1', $tags->get_attribute( 'data-from-state' ) );
+		$this->assertSame( 'context-1', $tags->get_attribute( 'data-from-context' ) );
+	}
+
+	public function test_namespace_can_be_overwritten_in_directives() {
+		/*
+		 * This function call should be done inside block render functions. We
+		 * run it here instead just for conveninence.
+		 */
+		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
+		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
+
+		$post_content = '
+			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
+					<!-- wp:test/directives {
+						"class": "inherited-ns",
+						"data-wp-bind--data-value": "state.text"
+					} /-->
+					<!-- wp:test/directives {
+						"class": "custom-ns",
+						"data-wp-bind--data-value": "test-2::state.text"
+					} /-->
+					<!-- wp:test/directives {
+						"class": "mixed-ns",
+						"data-wp-bind--data-inherited-ns": "state.text",
+						"data-wp-bind--data-custom-ns": "test-2::state.text"
+					} /-->
+			<!-- /wp:test/directives -->
+		';
+
+		$html = do_blocks( $post_content );
+		$tags = new WP_HTML_Tag_Processor( $html );
+
+		$tags->next_tag( array( 'class_name' => 'inherited-ns' ) );
+		$this->assertSame( 'state-1', $tags->get_attribute( 'data-value' ) );
+
+		$tags->next_tag( array( 'class_name' => 'custom-ns' ) );
+		$this->assertSame( 'state-2', $tags->get_attribute( 'data-value' ) );
+
+		$tags->next_tag( array( 'class_name' => 'mixed-ns' ) );
+		$this->assertSame( 'state-1', $tags->get_attribute( 'data-inherited-ns' ) );
+		$this->assertSame( 'state-2', $tags->get_attribute( 'data-custom-ns' ) );
+	}
 }
diff --git a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
index bfb4c428cd946..8fe212bb8ed93 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
@@ -14,16 +14,17 @@
  */
 class Tests_Directives_WpBind extends WP_UnitTestCase {
 	public function test_directive_sets_attribute() {
-		$markup = '<img data-wp-bind--src="context.myblock.imageSource" />';
+		$markup = '<img data-wp-bind--src="context.imageSource" />';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_bind( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_bind( $tags, $context, $directive_ns );
 
 		$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,13 +32,14 @@ public function test_directive_sets_attribute() {
 	}
 
 	public function test_directive_ignores_empty_bound_attribute() {
-		$markup = '<img data-wp-bind.="context.myblock.imageSource" />';
+		$markup = '<img data-wp-bind.="context.imageSource" />';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_bind( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_bind( $tags, $context, $directive_ns );
 
 		$this->assertSame( $markup, $tags->get_updated_html() );
 		$this->assertNull( $tags->get_attribute( 'src' ) );
diff --git a/phpunit/experimental/interactivity-api/directives/wp-class-test.php b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
index 419546c6d9ef8..f40486647ff8b 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-class-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
@@ -14,16 +14,17 @@
  */
 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>';
+		$markup = '<div data-wp-class--red="context.isRed" class="blue">Test</div>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
 
 		$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,16 +32,17 @@ 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>';
+		$markup = '<div data-wp-class--blue="context.isBlue" class="red blue">Test</div>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
 
 		$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,17 +50,18 @@ 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>';
+		$markup = '<div data-wp-class--blue="context.isBlue" class="blue">Test</div>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
 
 		$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>',
+			'<div data-wp-class--blue="context.isBlue" >Test</div>',
 			$tags->get_updated_html()
 		);
 		$this->assertNull( $tags->get_attribute( 'class' ) );
@@ -66,16 +69,17 @@ 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>';
+		$markup = '<div data-wp-class--blue="context.isBlue" class="green red">Test</div>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
 
 		$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,13 +87,14 @@ 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>';
+		$markup = '<div data-wp-class.="context.isRed" class="blue">Test</div>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
 		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_class( $tags, $context );
+		$directive_ns   = 'myblock';
+		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
 
 		$this->assertSame( $markup, $tags->get_updated_html() );
 		$this->assertStringNotContainsString( 'red', $tags->get_attribute( 'class' ) );
diff --git a/phpunit/experimental/interactivity-api/directives/wp-context-test.php b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
index 1277b016848cc..788feec95fe7c 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-context-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
@@ -21,11 +21,12 @@ public function test_directive_merges_context_correctly_upon_wp_context_attribut
 			)
 		);
 
-		$markup = '<div data-wp-context=\'{ "myblock": { "open": true } }\'>';
+		$ns     = 'myblock';
+		$markup = '<div data-wp-context=\'{ "open": true }\'>';
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, $ns );
 
 		$this->assertSame(
 			array(
@@ -38,39 +39,39 @@ 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->next_tag( array( 'tag_closers' => 'visit' ) );
 
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			array( 'my-key' => 'original-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 	}
 
 	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->next_tag();
 
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 	}
 
@@ -87,36 +88,36 @@ public function test_directive_keeps_working_after_malformed_context_objects() {
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Now the context is empty.
 		$this->assertSame(
@@ -138,36 +139,36 @@ public function test_directive_keeps_working_with_a_directive_without_value() {
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Now the context is empty.
 		$this->assertSame(
@@ -189,36 +190,36 @@ public function test_directive_keeps_working_with_an_empty_directive() {
 
 		// Parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing children div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Still the same context.
 		$this->assertSame(
 			array( 'my-key' => 'some-value' ),
-			$context->get_context()
+			$context->get_context()['myblock']
 		);
 
 		// Closing parent div.
 		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context );
+		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
 
 		// Now the context is empty.
 		$this->assertSame(
diff --git a/phpunit/experimental/interactivity-api/directives/wp-style-test.php b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
index 51468bd8a2814..9625803ebca78 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-style-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
@@ -18,9 +18,9 @@ public function test_directive_adds_style() {
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
-		$context_before = new WP_Directive_Context( array( 'color' => 'green' ) );
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context );
+		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			'<div data-wp-style--color="context.color" style="background: blue;color: green;">Test</div>',
@@ -35,9 +35,9 @@ public function test_directive_ignores_empty_style() {
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
-		$context_before = new WP_Directive_Context( array( 'color' => 'green' ) );
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context );
+		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
 
 		$this->assertSame( $markup, $tags->get_updated_html() );
 		$this->assertStringNotContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
@@ -49,9 +49,9 @@ public function test_directive_works_without_style_attribute() {
 		$tags   = new WP_HTML_Tag_Processor( $markup );
 		$tags->next_tag();
 
-		$context_before = new WP_Directive_Context( array( 'color' => 'green' ) );
+		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
 		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context );
+		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
 
 		$this->assertSame(
 			'<div style="color: green;" data-wp-style--color="context.color">Test</div>',
diff --git a/phpunit/experimental/interactivity-api/directives/wp-text-test.php b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
index 81d2d0f370a64..9c889a3f0eb68 100644
--- a/phpunit/experimental/interactivity-api/directives/wp-text-test.php
+++ b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
@@ -14,31 +14,31 @@
  */
 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->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 );
+		gutenberg_interactivity_process_wp_text( $tags, $context, 'myblock' );
 
-		$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->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 );
+		gutenberg_interactivity_process_wp_text( $tags, $context, 'myblock' );
 
-		$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 e079d899a584b104370dc8f0347200b4e9d6b330 Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Tue, 9 Jan 2024 12:46:06 -0600
Subject: [PATCH 025/296] Fix formatting issue due to incorrect link parsing
 (#57693)

---
 docs/getting-started/quick-start-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/quick-start-guide.md b/docs/getting-started/quick-start-guide.md
index c6f22ce219136..736a56c006c9e 100644
--- a/docs/getting-started/quick-start-guide.md
+++ b/docs/getting-started/quick-start-guide.md
@@ -41,7 +41,7 @@ When you are finished making changes, run the `npm run build` command. This opti
 
 You can use any local WordPress development environment to test your new block, but the scaffolded plugin includes configuration for `wp-env`. You must have [Docker](https://www.docker.com/products/docker-desktop) already installed and running on your machine, but if you do, run the `npx wp-env start` command. 
 
-Once the script finishes running, you can access the local environment at: `http://localhost:8888`. Log into the WordPress dashboard using username `admin` and password `password`. The plugin will already be installed and activated. Open the Editor or Site Editor, and insert the Copyright Date Block as you would any other block.
+Once the script finishes running, you can access the local environment at: <code>http://localhost:8888</code>. Log into the WordPress dashboard using username `admin` and password `password`. The plugin will already be installed and activated. Open the Editor or Site Editor, and insert the Copyright Date Block as you would any other block.
 
 Visit the [Getting started](https://developer.wordpress.org/block-editor/getting-started/devenv/get-started-with-wp-env/) guide to learn more about `wp-env`.
 

From 16c12f3d66d2ab54601adbf8560255ac68b7197b Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Wed, 10 Jan 2024 10:57:54 +1100
Subject: [PATCH 026/296] Table: Remove unnecessary margin override (#57699)

---
 packages/block-library/src/table/editor.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/block-library/src/table/editor.scss b/packages/block-library/src/table/editor.scss
index 0367ed0a9c5d9..55652742a5ae9 100644
--- a/packages/block-library/src/table/editor.scss
+++ b/packages/block-library/src/table/editor.scss
@@ -1,7 +1,4 @@
 .wp-block-table {
-	// Remove default <figure> style.
-	margin: 0;
-
 	.wp-block[data-align="left"] > &,
 	.wp-block[data-align="right"] > &,
 	.wp-block[data-align="center"] > & {

From 8562a2831a986c0218759577afb26fde35b8d7d9 Mon Sep 17 00:00:00 2001
From: tellthemachines <tellthemachines@users.noreply.github.com>
Date: Wed, 10 Jan 2024 11:13:12 +1100
Subject: [PATCH 027/296] Try reducing the specificity of block style variation
 selectors. (#57659)

---
 lib/class-wp-theme-json-gutenberg.php        |  3 +--
 packages/block-library/src/button/style.scss | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index af750fa059979..aa8de83df9597 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -1021,8 +1021,7 @@ protected static function get_blocks_metadata() {
 			if ( ! empty( $block_type->styles ) ) {
 				$style_selectors = array();
 				foreach ( $block_type->styles as $style ) {
-					// The style variation classname is duplicated in the selector to ensure that it overrides core block styles.
-					$style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'] . '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
+					$style_selectors[ $style['name'] ] = static::append_to_selector( '.is-style-' . $style['name'], static::$blocks_metadata[ $block_name ]['selector'] );
 				}
 				static::$blocks_metadata[ $block_name ]['styleVariations'] = $style_selectors;
 			}
diff --git a/packages/block-library/src/button/style.scss b/packages/block-library/src/button/style.scss
index d9efc928c5b1c..f441152107973 100644
--- a/packages/block-library/src/button/style.scss
+++ b/packages/block-library/src/button/style.scss
@@ -98,19 +98,19 @@ $blocks-block__margin: 0.5em;
 	border-radius: 0 !important;
 }
 
-.wp-block-button.is-style-outline > .wp-block-button__link,
-.wp-block-button .wp-block-button__link.is-style-outline {
+.wp-block-button:where(.is-style-outline) > .wp-block-button__link,
+.wp-block-button .wp-block-button__link:where(.is-style-outline) {
 	border: 2px solid currentColor;
 	padding: 0.667em 1.333em;
 }
 
-.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-text-color),
-.wp-block-button .wp-block-button__link.is-style-outline:not(.has-text-color) {
+.wp-block-button:where(.is-style-outline) > .wp-block-button__link:not(.has-text-color),
+.wp-block-button .wp-block-button__link:where(.is-style-outline):not(.has-text-color) {
 	color: currentColor;
 }
 
-.wp-block-button.is-style-outline > .wp-block-button__link:not(.has-background),
-.wp-block-button .wp-block-button__link.is-style-outline:not(.has-background) {
+.wp-block-button:where(.is-style-outline) > .wp-block-button__link:not(.has-background),
+.wp-block-button .wp-block-button__link:where(.is-style-outline):not(.has-background) {
 	background-color: transparent;
 	// background-image is required to overwrite a gradient background
 	background-image: none;

From 5380b6c549668b94e38ae5619aa725f57ef7eb0f Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 10 Jan 2024 02:17:32 +0100
Subject: [PATCH 028/296] Label the HeightControl. (#57683)

---
 packages/block-editor/src/components/height-control/index.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/block-editor/src/components/height-control/index.js b/packages/block-editor/src/components/height-control/index.js
index e179752249744..23738378b6998 100644
--- a/packages/block-editor/src/components/height-control/index.js
+++ b/packages/block-editor/src/components/height-control/index.js
@@ -157,6 +157,8 @@ export default function HeightControl( {
 						onUnitChange={ handleUnitChange }
 						min={ 0 }
 						size={ '__unstable-large' }
+						label={ label }
+						hideLabelFromVision
 					/>
 				</FlexItem>
 				<FlexItem isBlock>
@@ -175,6 +177,8 @@ export default function HeightControl( {
 							withInputField={ false }
 							onChange={ handleSliderChange }
 							__nextHasNoMarginBottom
+							label={ label }
+							hideLabelFromVision
 						/>
 					</Spacer>
 				</FlexItem>

From d3f2c77d64a3ae2138e3788c38fecbe47f2f4d0d Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 10 Jan 2024 09:08:19 +0400
Subject: [PATCH 029/296] Migrate 'dropdown menu' e2e tests to Playwright
 (#57663)

* Migrate 'dropdown menu' e2e tests to Playwright

* Use test steps

* Remove old test file

* Use original selectors
---
 .../editor/various/dropdown-menu.test.js      | 143 ------------------
 .../editor/various/dropdown-menu.spec.js      |  62 ++++++++
 2 files changed, 62 insertions(+), 143 deletions(-)
 delete mode 100644 packages/e2e-tests/specs/editor/various/dropdown-menu.test.js
 create mode 100644 test/e2e/specs/editor/various/dropdown-menu.spec.js

diff --git a/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js b/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js
deleted file mode 100644
index 1ab5730ab6677..0000000000000
--- a/packages/e2e-tests/specs/editor/various/dropdown-menu.test.js
+++ /dev/null
@@ -1,143 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { createNewPost, pressKeyTimes } from '@wordpress/e2e-test-utils';
-
-const moreMenuButtonSelector = '.components-button[aria-label="Options"]';
-const moreMenuDropdownSelector =
-	'.components-dropdown-menu__menu[aria-label="Options"]';
-const menuItemsSelector = [ 'menuitem', 'menuitemcheckbox', 'menuitemradio' ]
-	.map( ( role ) => `${ moreMenuDropdownSelector } [role="${ role }"]` )
-	.join( ',' );
-
-describe( 'Dropdown Menu', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
-
-	it( 'allows navigation through each item using arrow keys', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Arrow down to the last item.
-		await pressKeyTimes( 'ArrowDown', menuItems.length - 1 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		const [ lastMenuItem ] = menuItems.slice( -1 );
-		const lastMenuItemText = await lastMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the last menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( lastMenuItemText );
-
-		// Arrow back up to the first item.
-		await pressKeyTimes( 'ArrowUp', menuItems.length - 1 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to be focused again.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-
-	it( 'loops to the beginning and end when navigating past the boundaries of the menu', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Arrow up to the last item.
-		await page.keyboard.press( 'ArrowUp' );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		const [ lastMenuItem ] = menuItems.slice( -1 );
-		const lastMenuItemText = await lastMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the last menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( lastMenuItemText );
-
-		// Arrow back down to the first item.
-		await page.keyboard.press( 'ArrowDown' );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to be focused again.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-
-	it( 'ignores arrow key navigation that is orthogonal to the orientation of the menu, but stays open', async () => {
-		await page.click( moreMenuButtonSelector );
-		const menuItems = await page.$$( menuItemsSelector );
-
-		// Catch any issues with the selector, which could cause a false positive test result.
-		expect( menuItems.length ).toBeGreaterThan( 0 );
-
-		let activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-		const [ firstMenuItem ] = menuItems;
-		const firstMenuItemText = await firstMenuItem.evaluate(
-			( element ) => element.textContent
-		);
-
-		// Expect the first menu item to be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-
-		// Press left and right keys an arbitrary (but > 1) number of times.
-		await pressKeyTimes( 'ArrowLeft', 5 );
-		await pressKeyTimes( 'ArrowRight', 5 );
-
-		activeElementText = await page.evaluate(
-			() => document.activeElement.textContent
-		);
-
-		// Expect the first menu item to still be focused.
-		expect( activeElementText ).toBeDefined();
-		expect( activeElementText ).toBe( firstMenuItemText );
-	} );
-} );
diff --git a/test/e2e/specs/editor/various/dropdown-menu.spec.js b/test/e2e/specs/editor/various/dropdown-menu.spec.js
new file mode 100644
index 0000000000000..916ef3447d80a
--- /dev/null
+++ b/test/e2e/specs/editor/various/dropdown-menu.spec.js
@@ -0,0 +1,62 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Dropdown Menu', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'keyboard navigiation', async ( { page, pageUtils } ) => {
+		await page
+			.getByRole( 'region', { name: 'Editor top bar' } )
+			.getByRole( 'button', { name: 'Options' } )
+			.click();
+		const menuItems = page.locator(
+			'[role="menuitem"], [role="menuitemcheckbox"], [role="menuitemradio"]'
+		);
+		const totalItems = await menuItems.count();
+
+		// Catch any issues with the selector, which could cause a false positive test result.
+		expect( totalItems ).toBeGreaterThan( 0 );
+
+		await test.step( 'allows navigation through each item using arrow keys', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Arrow down to the last item.
+			await pageUtils.pressKeys( 'ArrowDown', { times: totalItems - 1 } );
+			await expect( menuItems.last() ).toBeFocused();
+
+			// Arrow back up to the first item.
+			await pageUtils.pressKeys( 'ArrowUp', { times: totalItems - 1 } );
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+
+		await test.step( 'loops to the beginning and end when navigating past the boundaries of the menu', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Arrow up to the last item.
+			await page.keyboard.press( 'ArrowUp' );
+			await expect( menuItems.last() ).toBeFocused();
+
+			// Arrow back down to the first item.
+			await page.keyboard.press( 'ArrowDown' );
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+
+		await test.step( 'ignores arrow key navigation that is orthogonal to the orientation of the menu, but stays open', async () => {
+			// Expect the first menu item to be focused.
+			await expect( menuItems.first() ).toBeFocused();
+
+			// Press left and right keys an arbitrary (but > 1) number of times.
+			await pageUtils.pressKeys( 'ArrowLeft', { times: 5 } );
+			await pageUtils.pressKeys( 'ArrowRight', { times: 5 } );
+
+			// Expect the first menu item to still be focused.
+			await expect( menuItems.first() ).toBeFocused();
+		} );
+	} );
+} );

From 7c2110073c26fbedb74cf527e3ef3163ddc5039e Mon Sep 17 00:00:00 2001
From: Faisal Ahmed <faisalcse29@gmail.com>
Date: Wed, 10 Jan 2024 11:56:03 +0600
Subject: [PATCH 030/296] Migrate 'core settings' e2e tests to Playwright
 (#57581)

* Migrate 'core-settings' e2e tests to Playwright
* renamed test file
* Added role based selectors
---
 .../editor/various/core-settings.spec.js      | 36 ++++++++++++-------
 1 file changed, 23 insertions(+), 13 deletions(-)
 rename packages/e2e-tests/specs/editor/various/core-settings.test.js => test/e2e/specs/editor/various/core-settings.spec.js (58%)

diff --git a/packages/e2e-tests/specs/editor/various/core-settings.test.js b/test/e2e/specs/editor/various/core-settings.spec.js
similarity index 58%
rename from packages/e2e-tests/specs/editor/various/core-settings.test.js
rename to test/e2e/specs/editor/various/core-settings.spec.js
index 0eb98a2de050b..9dddc273e6b16 100644
--- a/packages/e2e-tests/specs/editor/various/core-settings.test.js
+++ b/test/e2e/specs/editor/various/core-settings.spec.js
@@ -1,10 +1,10 @@
 /**
  * WordPress dependencies
  */
-import { visitAdminPage } from '@wordpress/e2e-test-utils';
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
-async function getOptionsValues( selector ) {
-	await visitAdminPage( 'options.php' );
+async function getOptionsValues( selector, admin, page ) {
+	await admin.visitAdminPage( 'options.php' );
 	return page.evaluate( ( theSelector ) => {
 		const inputs = Array.from( document.querySelectorAll( theSelector ) );
 		return inputs.reduce( ( memo, input ) => {
@@ -16,22 +16,32 @@ async function getOptionsValues( selector ) {
 
 // It might make sense to include a similar test in WP core (or move this one over).
 // See discussion here: https://github.com/WordPress/gutenberg/pull/32797#issuecomment-864192088.
-describe( 'Settings', () => {
-	test( 'Regression: updating a specific option will only change its value and will not corrupt others', async () => {
+test.describe( 'Settings', () => {
+	test( 'Regression: updating a specific option will only change its value and will not corrupt others', async ( {
+		page,
+		admin,
+	} ) => {
 		// We won't select the option that we updated and will also remove some
 		// _transient options that seem to change at every update.
 		const optionsInputsSelector =
 			'form#all-options table.form-table input:not([id*="_transient"]):not([id="blogdescription"])';
-		const optionsBefore = await getOptionsValues( optionsInputsSelector );
-
-		await visitAdminPage( 'options-general.php' );
-		await page.type(
-			'input#blogdescription',
-			'Just another Gutenberg site'
+		const optionsBefore = await getOptionsValues(
+			optionsInputsSelector,
+			admin,
+			page
 		);
-		await page.click( 'input#submit' );
 
-		const optionsAfter = await getOptionsValues( optionsInputsSelector );
+		await admin.visitAdminPage( 'options-general.php' );
+		await page
+			.getByRole( 'textbox', { name: 'Tagline' } )
+			.fill( 'Just another Gutenberg site' );
+		await page.getByRole( 'button', { name: 'Save Changes' } ).click();
+
+		const optionsAfter = await getOptionsValues(
+			optionsInputsSelector,
+			admin,
+			page
+		);
 
 		Object.entries( optionsBefore ).forEach( ( optionBefore ) => {
 			const [ id ] = optionBefore;

From 5d063e3fbfbaaef0688e060ad16a1e5ed47fee26 Mon Sep 17 00:00:00 2001
From: Glen Davies <glendaviesnz@users.noreply.github.com>
Date: Wed, 10 Jan 2024 19:40:31 +1300
Subject: [PATCH 031/296] Patterns: Refactor the findOrCreate term method 
 (#57655)

* Refactor the findOrCreate term method to not call API if user category already exist, and fix bug that allowed different cased labels that could then not be selected

* Add missing lower casing

* Remove type as we can just use id to identify the user patterns in this context

* Add the duplicate term error handling back in as had a duplicate term once in testing, but haven't been able to replicate, but no disadvantage in having this code just in case
---
 .../src/components/create-pattern-modal.js    | 47 +++++++++++--------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/packages/patterns/src/components/create-pattern-modal.js b/packages/patterns/src/components/create-pattern-modal.js
index e69390b999752..137c14222ced3 100644
--- a/packages/patterns/src/components/create-pattern-modal.js
+++ b/packages/patterns/src/components/create-pattern-modal.js
@@ -77,24 +77,27 @@ export function CreatePatternModalContents( {
 	const categoryMap = useMemo( () => {
 		// Merge the user and core pattern categories and remove any duplicates.
 		const uniqueCategories = new Map();
-		[ ...userPatternCategories, ...corePatternCategories ].forEach(
-			( category ) => {
-				if (
-					! uniqueCategories.has( category.label ) &&
-					// There are two core categories with `Post` label so explicitly remove the one with
-					// the `query` slug to avoid any confusion.
-					category.name !== 'query'
-				) {
-					// We need to store the name separately as this is used as the slug in the
-					// taxonomy and may vary from the label.
-					uniqueCategories.set( category.label, {
-						label: category.label,
-						value: category.label,
-						name: category.name,
-					} );
-				}
+		userPatternCategories.forEach( ( category ) => {
+			uniqueCategories.set( category.label.toLowerCase(), {
+				label: category.label,
+				name: category.name,
+				id: category.id,
+			} );
+		} );
+
+		corePatternCategories.forEach( ( category ) => {
+			if (
+				! uniqueCategories.has( category.label.toLowerCase() ) &&
+				// There are two core categories with `Post` label so explicitly remove the one with
+				// the `query` slug to avoid any confusion.
+				category.name !== 'query'
+			) {
+				uniqueCategories.set( category.label.toLowerCase(), {
+					label: category.label,
+					name: category.name,
+				} );
 			}
-		);
+		} );
 		return uniqueCategories;
 	}, [ userPatternCategories, corePatternCategories ] );
 
@@ -140,9 +143,13 @@ export function CreatePatternModalContents( {
 	 */
 	async function findOrCreateTerm( term ) {
 		try {
-			// We need to match any existing term to the correct slug to prevent duplicates, eg.
-			// the core `Headers` category uses the singular `header` as the slug.
-			const existingTerm = categoryMap.get( term );
+			const existingTerm = categoryMap.get( term.toLowerCase() );
+			if ( existingTerm && existingTerm.id ) {
+				return existingTerm.id;
+			}
+			// If we have an existing core category we need to match the new user category to the
+			// correct slug rather than autogenerating it to prevent duplicates, eg. the core `Headers`
+			// category uses the singular `header` as the slug.
 			const termData = existingTerm
 				? { name: existingTerm.label, slug: existingTerm.name }
 				: { name: term };

From 5dcd9d1cf5e27f10b99d55c0d3d63f096a3030ad Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Wed, 10 Jan 2024 09:39:18 +0100
Subject: [PATCH 032/296] [RNMobile] Fix losing undo/redo history when using
 non-breaking space HTML entity (#57652)

* Stop removing non-breaking space HTML entity

The non-breaking space HTML entity is part of the RichText content, so we shouldn't remove it to preserve the original value, especially when pasting HTML. Otherwise, the removal leads to breaking the undo/redo history.

* Use `render` from test helpers in RichText unit tests

* Rename describe section in RichText unit tests

* Use `RichTextData.empty` to create empty value in RichText unit tests

* Add test case to cover non-breaking space HTML entity

* Update `describe` description in RichText unit tests

* Update snapshots of `RichText` unit tests
---
 .../rich-text/native/index.native.js          | 10 +---
 .../test/__snapshots__/index.native.js.snap   |  6 +-
 .../rich-text/native/test/index.native.js     | 58 ++++++++++++++++---
 3 files changed, 56 insertions(+), 18 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/native/index.native.js b/packages/block-editor/src/components/rich-text/native/index.native.js
index f83d03ece4798..1f536011b35b6 100644
--- a/packages/block-editor/src/components/rich-text/native/index.native.js
+++ b/packages/block-editor/src/components/rich-text/native/index.native.js
@@ -52,10 +52,6 @@ import { getFormatColors } from './get-format-colors';
 import styles from './style.scss';
 import ToolbarButtonWithOptions from './toolbar-button-with-options';
 
-const unescapeSpaces = ( text ) => {
-	return text.replace( /&nbsp;|&#160;/gi, ' ' );
-};
-
 // The flattened color palettes array is memoized to ensure that the same array instance is
 // returned for the colors palettes. This value might be used as a prop, so having the same
 // instance will prevent unnecessary re-renders of the RichText component.
@@ -318,7 +314,7 @@ export class RichText extends Component {
 		}
 
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
 		// On iOS, onChange can be triggered after selection changes, even though there are no content changes.
 		if ( contentWithoutRootTag === this.value.toString() ) {
@@ -333,7 +329,7 @@ export class RichText extends Component {
 
 	onTextUpdate( event ) {
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
 
 		this.debounceCreateUndoLevel();
@@ -660,7 +656,7 @@ export class RichText extends Component {
 
 		// Check and dicsard stray event, where the text and selection is equal to the ones already cached.
 		const contentWithoutRootTag = this.removeRootTagsProducedByAztec(
-			unescapeSpaces( event.nativeEvent.text )
+			event.nativeEvent.text
 		);
 		if (
 			contentWithoutRootTag === this.value.toString() &&
diff --git a/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap b/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
index c9d3d62e40ce9..84e9b46713271 100644
--- a/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
+++ b/packages/block-editor/src/components/rich-text/native/test/__snapshots__/index.native.js.snap
@@ -1,12 +1,12 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`<RichText/> Font Size renders component with style and font size 1`] = `
+exports[`<RichText/> when applying the font size renders component with style and font size 1`] = `
 "<!-- wp:paragraph {"style":{"color":{"text":"#fcb900"},"typography":{"fontSize":35.56}}} -->
 <p class="has-text-color" style="color:#fcb900;font-size:35.56px">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed imperdiet ut nibh vitae ornare. Sed auctor nec augue at blandit.</p>
 <!-- /wp:paragraph -->"
 `;
 
-exports[`<RichText/> Font Size should update the font size when style prop with font size property is provided 1`] = `
+exports[`<RichText/> when applying the font size should update the font size when style prop with font size property is provided 1`] = `
 <View
   style={
     [
@@ -42,7 +42,7 @@ exports[`<RichText/> Font Size should update the font size when style prop with
 </View>
 `;
 
-exports[`<RichText/> Font Size should update the font size with decimals when style prop with font size property is provided 1`] = `
+exports[`<RichText/> when applying the font size should update the font size with decimals when style prop with font size property is provided 1`] = `
 <View
   style={
     [
diff --git a/packages/block-editor/src/components/rich-text/native/test/index.native.js b/packages/block-editor/src/components/rich-text/native/test/index.native.js
index 6e7dc31fc74e7..8197952a116dd 100644
--- a/packages/block-editor/src/components/rich-text/native/test/index.native.js
+++ b/packages/block-editor/src/components/rich-text/native/test/index.native.js
@@ -5,15 +5,20 @@ import { Dimensions } from 'react-native';
 import {
 	fireEvent,
 	getEditorHtml,
-	render,
 	initializeEditor,
+	render,
+	screen,
 } from 'test/helpers';
 
 /**
  * WordPress dependencies
  */
 import { select } from '@wordpress/data';
-import { store as richTextStore, RichTextData } from '@wordpress/rich-text';
+import {
+	store as richTextStore,
+	RichTextData,
+	__unstableCreateElement,
+} from '@wordpress/rich-text';
 import { coreBlocks } from '@wordpress/block-library';
 import {
 	getBlockTypes,
@@ -83,11 +88,11 @@ describe( '<RichText/>', () => {
 		} );
 	} );
 
-	describe( 'when changes arrive from Aztec', () => {
+	describe( 'when the value changes', () => {
 		it( 'should avoid updating attributes when values are equal', async () => {
 			const handleChange = jest.fn();
-			const defaultEmptyValue = new RichTextData();
-			const screen = render(
+			const defaultEmptyValue = RichTextData.empty();
+			render(
 				<RichText
 					onChange={ handleChange }
 					value={ defaultEmptyValue }
@@ -101,9 +106,46 @@ describe( '<RichText/>', () => {
 
 			expect( handleChange ).not.toHaveBeenCalled();
 		} );
+
+		it( 'should preserve non-breaking space HTML entity', () => {
+			const onChange = jest.fn();
+			const onSelectionChange = jest.fn();
+			// The initial value is created using an HTML element to preserve
+			// the HTML entity.
+			const initialValue = RichTextData.fromHTMLElement(
+				__unstableCreateElement( document, '&nbsp;' )
+			);
+			render(
+				<RichText
+					onChange={ onChange }
+					onSelectionChange={ onSelectionChange }
+					value={ initialValue }
+					__unstableIsSelected
+				/>
+			);
+
+			// Trigger selection event with same text value as initial.
+			fireEvent(
+				screen.getByLabelText( /Text input/ ),
+				'onSelectionChange',
+				0,
+				0,
+				initialValue.toString(),
+				{
+					nativeEvent: {
+						eventCount: 0,
+						target: undefined,
+						text: initialValue.toString(),
+					},
+				}
+			);
+
+			expect( onChange ).not.toHaveBeenCalled();
+			expect( onSelectionChange ).toHaveBeenCalled();
+		} );
 	} );
 
-	describe( 'Font Size', () => {
+	describe( 'when applying the font size', () => {
 		it( 'should display rich text at the DEFAULT font size.', () => {
 			// Arrange.
 			const expectedFontSize = 16;
@@ -259,7 +301,7 @@ describe( '<RichText/>', () => {
 			const fontSize = '10';
 			const style = { fontSize: '12' };
 			// Act.
-			const screen = render( <RichText fontSize={ fontSize } /> );
+			render( <RichText fontSize={ fontSize } /> );
 			screen.update( <RichText fontSize={ fontSize } style={ style } /> );
 			// Assert.
 			expect( screen.toJSON() ).toMatchSnapshot();
@@ -281,7 +323,7 @@ describe( '<RichText/>', () => {
 			const fontSize = '10';
 			const style = { fontSize: '12.56px' };
 			// Act.
-			const screen = render( <RichText fontSize={ fontSize } /> );
+			render( <RichText fontSize={ fontSize } /> );
 			screen.update( <RichText fontSize={ fontSize } style={ style } /> );
 			// Assert.
 			expect( screen.toJSON() ).toMatchSnapshot();

From 66879a5a15dd558bf0d8fdf9cff7f8fb05ee7788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Wed, 10 Jan 2024 09:42:24 +0100
Subject: [PATCH 033/296] DataViews: add new page button in Pages page (#57685)

---
 .../src/components/page-pages/index.js        | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 9bf23100e5db5..45368c11833f3 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -4,6 +4,7 @@
 import {
 	__experimentalView as View,
 	__experimentalVStack as VStack,
+	Button,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
@@ -42,6 +43,7 @@ import {
 	useEditPostAction,
 } from '../actions';
 import PostPreview from '../post-preview';
+import AddNewPageModal from '../add-new-page';
 import Media from '../media';
 import { unlock } from '../../lock-unlock';
 const { useLocation, useHistory } = unlock( routerPrivateApis );
@@ -323,6 +325,29 @@ export default function PagePages() {
 		[ view.type, setView ]
 	);
 
+	const [ showAddPageModal, setShowAddPageModal ] = useState( false );
+	const openModal = useCallback( () => {
+		if ( ! showAddPageModal ) {
+			setShowAddPageModal( true );
+		}
+	}, [ showAddPageModal ] );
+	const closeModal = useCallback( () => {
+		if ( showAddPageModal ) {
+			setShowAddPageModal( false );
+		}
+	}, [ showAddPageModal ] );
+	const handleNewPage = useCallback(
+		( { type, id } ) => {
+			history.push( {
+				postId: id,
+				postType: type,
+				canvas: 'edit',
+			} );
+			closeModal();
+		},
+		[ history ]
+	);
+
 	// TODO: we need to handle properly `data={ data || EMPTY_ARRAY }` for when `isLoading`.
 	return (
 		<>
@@ -333,6 +358,19 @@ export default function PagePages() {
 						: null
 				}
 				title={ __( 'Pages' ) }
+				actions={
+					<>
+						<Button variant="primary" onClick={ openModal }>
+							{ __( 'Add new page' ) }
+						</Button>
+						{ showAddPageModal && (
+							<AddNewPageModal
+								onSave={ handleNewPage }
+								onClose={ closeModal }
+							/>
+						) }
+					</>
+				}
 			>
 				<DataViews
 					paginationInfo={ paginationInfo }

From e184f101523f7af92768e0b29d01372e61b8cbda Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Wed, 10 Jan 2024 17:57:07 +0900
Subject: [PATCH 034/296] Image Block: Change upload icon label (#57704)

---
 packages/block-library/src/image/image.js  | 2 +-
 test/e2e/specs/editor/blocks/image.spec.js | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index ea12457c2585d..d8788fde4844f 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -459,7 +459,7 @@ export default function Image( {
 						<ToolbarButton
 							onClick={ uploadExternal }
 							icon={ upload }
-							label={ __( 'Upload external image' ) }
+							label={ __( 'Upload image to media library' ) }
 						/>
 					</ToolbarGroup>
 				</BlockControls>
diff --git a/test/e2e/specs/editor/blocks/image.spec.js b/test/e2e/specs/editor/blocks/image.spec.js
index adeabc860c834..9080a6dc19402 100644
--- a/test/e2e/specs/editor/blocks/image.spec.js
+++ b/test/e2e/specs/editor/blocks/image.spec.js
@@ -696,7 +696,9 @@ test.describe( 'Image', () => {
 		await expect( linkDom ).toHaveAttribute( 'href', url );
 	} );
 
-	test( 'should upload external image', async ( { editor } ) => {
+	test( 'should upload external image to media library', async ( {
+		editor,
+	} ) => {
 		await editor.insertBlock( {
 			name: 'core/image',
 			attributes: {
@@ -704,7 +706,7 @@ test.describe( 'Image', () => {
 			},
 		} );
 
-		await editor.clickBlockToolbarButton( 'Upload external image' );
+		await editor.clickBlockToolbarButton( 'Upload image to media library' );
 
 		const imageBlock = editor.canvas.locator(
 			'role=document[name="Block: Image"i]'

From 3eb3eca08a90c36603ade6a754c1ab2fc4e6d92a Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 10 Jan 2024 10:18:54 +0100
Subject: [PATCH 035/296] Use full text instead of abbreviation for min height
 setting. (#57680)

---
 .../src/components/global-styles/dimensions-panel.js          | 4 ++--
 packages/block-editor/src/components/height-control/README.md | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/block-editor/src/components/global-styles/dimensions-panel.js b/packages/block-editor/src/components/global-styles/dimensions-panel.js
index 47b5bd329725a..47e50aa515e3c 100644
--- a/packages/block-editor/src/components/global-styles/dimensions-panel.js
+++ b/packages/block-editor/src/components/global-styles/dimensions-panel.js
@@ -603,7 +603,7 @@ export default function DimensionsPanel( {
 			{ showMinHeightControl && (
 				<ToolsPanelItem
 					hasValue={ hasMinHeightValue }
-					label={ __( 'Min. height' ) }
+					label={ __( 'Minimum height' ) }
 					onDeselect={ resetMinHeightValue }
 					isShownByDefault={
 						defaultControls.minHeight ?? DEFAULT_CONTROLS.minHeight
@@ -611,7 +611,7 @@ export default function DimensionsPanel( {
 					panelId={ panelId }
 				>
 					<HeightControl
-						label={ __( 'Min. height' ) }
+						label={ __( 'Minimum height' ) }
 						value={ minHeightValue }
 						onChange={ setMinHeightValue }
 					/>
diff --git a/packages/block-editor/src/components/height-control/README.md b/packages/block-editor/src/components/height-control/README.md
index 67b52f1d56f9b..9be1741e8cdd8 100644
--- a/packages/block-editor/src/components/height-control/README.md
+++ b/packages/block-editor/src/components/height-control/README.md
@@ -43,7 +43,7 @@ A callback function that handles the application of the height value.
 -   **Type:** `String`
 -   **Default:** `'Height'`
 
-A label for the height control. This is useful when using the height control for a feature that is controlled in the same way as height, but requires a different label. For example, "Min. height".
+A label for the height control. This is useful when using the height control for a feature that is controlled in the same way as height, but requires a different label. For example, "Minimum height".
 
 ## Related components
 

From 4c9b8cc09fc57f5d62b740b5eef3c6672f0b116a Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 10 Jan 2024 13:22:33 +0400
Subject: [PATCH 036/296] Editor: Use hooks instead of HoCs in
 'PostVisibilityCheck' (#57705)

---
 .../src/components/post-visibility/check.js   | 25 +++++--------
 .../components/post-visibility/test/check.js  | 37 ++++++++++++-------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/packages/editor/src/components/post-visibility/check.js b/packages/editor/src/components/post-visibility/check.js
index 4bf9bd03772da..116db0f546de2 100644
--- a/packages/editor/src/components/post-visibility/check.js
+++ b/packages/editor/src/components/post-visibility/check.js
@@ -1,26 +1,21 @@
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PostVisibilityCheck( { hasPublishAction, render } ) {
-	const canEdit = hasPublishAction;
+export default function PostVisibilityCheck( { render } ) {
+	const canEdit = useSelect( ( select ) => {
+		return (
+			select( editorStore ).getCurrentPost()._links?.[
+				'wp:action-publish'
+			] ?? false
+		);
+	} );
+
 	return render( { canEdit } );
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		const { getCurrentPost, getCurrentPostType } = select( editorStore );
-		return {
-			hasPublishAction:
-				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
-			postType: getCurrentPostType(),
-		};
-	} ),
-] )( PostVisibilityCheck );
diff --git a/packages/editor/src/components/post-visibility/test/check.js b/packages/editor/src/components/post-visibility/test/check.js
index 8ec0c2df04ec9..828e876cceb10 100644
--- a/packages/editor/src/components/post-visibility/test/check.js
+++ b/packages/editor/src/components/post-visibility/test/check.js
@@ -3,32 +3,43 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
 /**
  * Internal dependencies
  */
-import { PostVisibilityCheck } from '../check';
+import PostVisibilityCheck from '../check';
+
+function setupMockSelect( hasPublishAction ) {
+	useSelect.mockImplementation( ( mapSelect ) => {
+		return mapSelect( () => ( {
+			getCurrentPost: () => ( {
+				_links: {
+					'wp:action-publish': hasPublishAction,
+				},
+			} ),
+		} ) );
+	} );
+}
 
 describe( 'PostVisibilityCheck', () => {
 	const renderProp = ( { canEdit } ) => ( canEdit ? 'yes' : 'no' );
 
 	it( "should not render the edit link if the user doesn't have the right capability", () => {
-		render(
-			<PostVisibilityCheck
-				hasPublishAction={ false }
-				render={ renderProp }
-			/>
-		);
+		setupMockSelect( false );
+		render( <PostVisibilityCheck render={ renderProp } /> );
 		expect( screen.queryByText( 'yes' ) ).not.toBeInTheDocument();
 		expect( screen.getByText( 'no' ) ).toBeVisible();
 	} );
 
 	it( 'should render if the user has the correct capability', () => {
-		render(
-			<PostVisibilityCheck
-				hasPublishAction={ true }
-				render={ renderProp }
-			/>
-		);
+		setupMockSelect( true );
+		render( <PostVisibilityCheck render={ renderProp } /> );
 		expect( screen.queryByText( 'no' ) ).not.toBeInTheDocument();
 		expect( screen.getByText( 'yes' ) ).toBeVisible();
 	} );

From 6ef4629f77ab3da6502508b4c9539a3912300f0e Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 10 Jan 2024 10:35:55 +0100
Subject: [PATCH 037/296] Clean up code editor CSS. (#57519)

---
 packages/edit-post/src/components/text-editor/style.scss | 6 ------
 packages/edit-site/src/components/code-editor/style.scss | 4 ----
 2 files changed, 10 deletions(-)

diff --git a/packages/edit-post/src/components/text-editor/style.scss b/packages/edit-post/src/components/text-editor/style.scss
index c02e983057e6e..ab248317de1db 100644
--- a/packages/edit-post/src/components/text-editor/style.scss
+++ b/packages/edit-post/src/components/text-editor/style.scss
@@ -39,10 +39,8 @@
 	margin-right: auto;
 
 	@include break-large() {
-		padding: $grid-unit-20 $grid-unit-30 #{ $grid-unit-60 * 2 } $grid-unit-30;
 		padding: 0 $grid-unit-30 $grid-unit-30 $grid-unit-30;
 	}
-
 }
 
 // Exit code editor toolbar.
@@ -70,8 +68,4 @@
 		font-size: $default-font-size;
 		color: $gray-900;
 	}
-
-	.components-button svg {
-		order: 1;
-	}
 }
diff --git a/packages/edit-site/src/components/code-editor/style.scss b/packages/edit-site/src/components/code-editor/style.scss
index 0e79575c49f67..17431de27b896 100644
--- a/packages/edit-site/src/components/code-editor/style.scss
+++ b/packages/edit-site/src/components/code-editor/style.scss
@@ -41,10 +41,6 @@
 			font-size: $default-font-size;
 			color: $gray-900;
 		}
-
-		.components-button svg {
-			order: 1;
-		}
 	}
 }
 

From 73a4716f429b5dce0190638049f5bd30f0b242f6 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Wed, 10 Jan 2024 12:47:03 +0100
Subject: [PATCH 038/296] Scripts: Fix webpack not setting environment.module
 true (#57714)

Webpack (via wp-scripts) may refuse to output external modules
unless we set `output.environment.modules = true`:

> The target environment doesn't support EcmaScriptModule syntax so it's not possible to use external type 'module'
> while analyzing module external module "@wordpress/interactivity" for concatenation
---
 packages/scripts/config/webpack.config.js | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/scripts/config/webpack.config.js b/packages/scripts/config/webpack.config.js
index 3919558c2f05c..57bd258d32539 100644
--- a/packages/scripts/config/webpack.config.js
+++ b/packages/scripts/config/webpack.config.js
@@ -403,6 +403,10 @@ if ( hasExperimentalModulesFlag ) {
 			...baseConfig.output,
 			module: true,
 			chunkFormat: 'module',
+			environment: {
+				...baseConfig.output.environment,
+				module: true,
+			},
 			library: {
 				...baseConfig.output.library,
 				type: 'module',

From b3e534e636cc286ca79a796d3a47164ff362302b Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Wed, 10 Jan 2024 13:35:36 +0100
Subject: [PATCH 039/296] Add tests to cover enabling autoplay and loop setting
 in Audio block (#57715)

---
 .../test/__snapshots__/edit.native.js.snap    | 12 ++++++++
 .../src/audio/test/edit.native.js             | 29 +++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
index dca3f782efc67..4cf28f7063ad3 100644
--- a/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/audio/test/__snapshots__/edit.native.js.snap
@@ -532,3 +532,15 @@ exports[`Audio block renders placeholder without crashing 1`] = `
   </View>
 </View>
 `;
+
+exports[`Audio block should enable autoplay setting 1`] = `
+"<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3" autoplay></audio></figure>
+<!-- /wp:audio -->"
+`;
+
+exports[`Audio block should enable loop setting 1`] = `
+"<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3" loop></audio></figure>
+<!-- /wp:audio -->"
+`;
diff --git a/packages/block-library/src/audio/test/edit.native.js b/packages/block-library/src/audio/test/edit.native.js
index c191fd2fff798..7296d595d7aaa 100644
--- a/packages/block-library/src/audio/test/edit.native.js
+++ b/packages/block-library/src/audio/test/edit.native.js
@@ -5,7 +5,10 @@ import {
 	addBlock,
 	dismissModal,
 	fireEvent,
+	getBlock,
+	getEditorHtml,
 	initializeEditor,
+	openBlockSettings,
 	render,
 	screen,
 	setupCoreBlocks,
@@ -31,6 +34,10 @@ jest.unmock( '@wordpress/react-native-aztec' );
 
 const MEDIA_UPLOAD_STATE_FAILED = 3;
 
+const AUDIO_BLOCK = `<!-- wp:audio {"id":5} -->
+<figure class="wp-block-audio"><audio controls src="https://cldup.com/59IrU0WJtq.mp3"></audio></figure>
+<!-- /wp:audio -->`;
+
 let uploadCallBack;
 subscribeMediaUpload.mockImplementation( ( callback ) => {
 	uploadCallBack = callback;
@@ -100,4 +107,26 @@ describe( 'Audio block', () => {
 			screen.getByText( 'Invalid URL. Audio file not found.' )
 		).toBeVisible();
 	} );
+
+	it( 'should enable autoplay setting', async () => {
+		await initializeEditor( { initialHtml: AUDIO_BLOCK } );
+
+		const audioBlock = getBlock( screen, 'Audio' );
+		fireEvent.press( audioBlock );
+		await openBlockSettings( screen );
+
+		fireEvent.press( screen.getByText( 'Autoplay' ) );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
+
+	it( 'should enable loop setting', async () => {
+		await initializeEditor( { initialHtml: AUDIO_BLOCK } );
+
+		const audioBlock = getBlock( screen, 'Audio' );
+		fireEvent.press( audioBlock );
+		await openBlockSettings( screen );
+
+		fireEvent.press( screen.getByText( 'Loop' ) );
+		expect( getEditorHtml() ).toMatchSnapshot();
+	} );
 } );

From db067e16df101128fe7588e483112c7030dfa83e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Wed, 10 Jan 2024 13:51:21 +0100
Subject: [PATCH 040/296] DataViews: add footer to Pages sidebar (#57690)

---
 .../index.js                                  | 77 +++++++++++++++++++
 .../edit-site/src/components/sidebar/index.js |  9 +--
 2 files changed, 79 insertions(+), 7 deletions(-)
 create mode 100644 packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
new file mode 100644
index 0000000000000..171d59c108e9b
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
@@ -0,0 +1,77 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	__experimentalTruncate as Truncate,
+	__experimentalVStack as VStack,
+} from '@wordpress/components';
+import { layout } from '@wordpress/icons';
+import { useMemo } from '@wordpress/element';
+import { useEntityRecords } from '@wordpress/core-data';
+import { decodeEntities } from '@wordpress/html-entities';
+import { __ } from '@wordpress/i18n';
+
+/**
+ * Internal dependencies
+ */
+import { useLink } from '../routes/link';
+import { TEMPLATE_POST_TYPE } from '../../utils/constants';
+import SidebarNavigationItem from '../sidebar-navigation-item';
+import SidebarNavigationScreen from '../sidebar-navigation-screen';
+import DataViewsSidebarContent from '../sidebar-dataviews';
+
+const PageItem = ( { postType = 'page', postId, ...props } ) => {
+	const linkInfo = useLink(
+		{
+			postType,
+			postId,
+		},
+		{
+			backPath: '/page',
+		}
+	);
+	return <SidebarNavigationItem { ...linkInfo } { ...props } />;
+};
+
+export default function SidebarNavigationScreenPagesDataViews() {
+	const { records: templateRecords } = useEntityRecords(
+		'postType',
+		TEMPLATE_POST_TYPE,
+		{
+			per_page: -1,
+		}
+	);
+	const templates = useMemo(
+		() =>
+			templateRecords?.filter( ( { slug } ) =>
+				[ '404', 'search' ].includes( slug )
+			),
+		[ templateRecords ]
+	);
+
+	return (
+		<SidebarNavigationScreen
+			title={ __( 'Pages' ) }
+			content={ <DataViewsSidebarContent /> }
+			footer={
+				<VStack spacing={ 0 }>
+					{ templates?.map( ( item ) => (
+						<PageItem
+							postType={ TEMPLATE_POST_TYPE }
+							postId={ item.id }
+							key={ item.id }
+							icon={ layout }
+							withChevron
+						>
+							<Truncate numberOfLines={ 1 }>
+								{ decodeEntities(
+									item.title?.rendered || __( '(no title)' )
+								) }
+							</Truncate>
+						</PageItem>
+					) ) }
+				</VStack>
+			}
+		/>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 0f986d486fbb8..73c6aea7e328c 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -7,7 +7,6 @@ import classNames from 'classnames';
  * WordPress dependencies
  */
 import { memo, useRef } from '@wordpress/element';
-import { __ } from '@wordpress/i18n';
 import {
 	__experimentalNavigatorProvider as NavigatorProvider,
 	__experimentalNavigatorScreen as NavigatorScreen,
@@ -32,9 +31,8 @@ import SidebarNavigationScreenTemplatesBrowse from '../sidebar-navigation-screen
 import SaveHub from '../save-hub';
 import { unlock } from '../../lock-unlock';
 import SidebarNavigationScreenPages from '../sidebar-navigation-screen-pages';
+import SidebarNavigationScreenPagesDataViews from '../sidebar-navigation-screen-pages-dataviews';
 import SidebarNavigationScreenPage from '../sidebar-navigation-screen-page';
-import SidebarNavigationScreen from '../sidebar-navigation-screen';
-import DataViewsSidebarContent from '../sidebar-dataviews';
 
 const { useLocation } = unlock( routerPrivateApis );
 
@@ -69,10 +67,7 @@ function SidebarScreens() {
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/page">
 				{ window?.__experimentalAdminViews ? (
-					<SidebarNavigationScreen
-						title={ __( 'Pages' ) }
-						content={ <DataViewsSidebarContent /> }
-					/>
+					<SidebarNavigationScreenPagesDataViews />
 				) : (
 					<SidebarNavigationScreenPages />
 				) }

From 08f236d0319f503c1c784dc8050df058cbccdea9 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Wed, 10 Jan 2024 15:13:22 +0100
Subject: [PATCH 041/296] Interactive template: Use viewModule (#57712)

Use viewModule in the create-block interactivity template.

- Add `viewModule` support to `@wordpress/create-block`.
- Set the `--experimental-modules` option when building the templated block.
- The plugin php template is updated to register with block metadata.

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 .../CHANGELOG.md                                 | 14 +++++++++-----
 .../create-block-interactive-template/README.md  |  2 ++
 .../block-templates/render.php.mustache          |  5 -----
 .../create-block-interactive-template/index.js   |  6 ++++++
 .../plugin-templates/$slug.php.mustache          | 11 +----------
 packages/create-block/CHANGELOG.md               |  4 ++++
 packages/create-block/lib/init-block.js          |  2 ++
 packages/create-block/lib/scaffold.js            |  2 ++
 packages/interactivity/docs/1-getting-started.md | 16 ++--------------
 9 files changed, 28 insertions(+), 34 deletions(-)

diff --git a/packages/create-block-interactive-template/CHANGELOG.md b/packages/create-block-interactive-template/CHANGELOG.md
index 47a8aec6c92a3..159c65e9ada19 100644
--- a/packages/create-block-interactive-template/CHANGELOG.md
+++ b/packages/create-block-interactive-template/CHANGELOG.md
@@ -2,20 +2,24 @@
 
 ## Unreleased
 
+### Enhancement
+
+-   Update the template to use `viewModule` in block.json ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
+
 ## 1.11.0 (2023-12-13)
 
--   Add all files to the generated plugin zip. [#56943](https://github.com/WordPress/gutenberg/pull/56943)
--   Prevent crash when Gutenberg plugin is not installed. [#56941](https://github.com/WordPress/gutenberg/pull/56941)
+-   Add all files to the generated plugin zip ([#56943](https://github.com/WordPress/gutenberg/pull/56943)).
+-   Prevent crash when Gutenberg plugin is not installed ([#56941](https://github.com/WordPress/gutenberg/pull/56941)).
 
 ## 1.10.1 (2023-12-07)
 
--   Update template to use modules instead of scripts. [#56694](https://github.com/WordPress/gutenberg/pull/56694)
+-   Update template to use modules instead of scripts ([#56694](https://github.com/WordPress/gutenberg/pull/56694)).
 
 ## 1.10.0 (2023-11-29)
 
 ### Enhancement
 
--   Update `view.js` and `render.php` templates to the new `store()` API. [#56613](https://github.com/WordPress/gutenberg/pull/56613)
+-   Update `view.js` and `render.php` templates to the new `store()` API ([#56613](https://github.com/WordPress/gutenberg/pull/56613)).
 
 ## 1.9.0 (2023-11-16)
 
@@ -35,4 +39,4 @@
 
 ### Enhancement
 
--   Moves the `example` property into block.json by leveraging changes to create-block to now support `example`. [#52801](https://github.com/WordPress/gutenberg/pull/52801)
+-   Moves the `example` property into block.json by leveraging changes to create-block to now support `example` ([#52801](https://github.com/WordPress/gutenberg/pull/52801)).
diff --git a/packages/create-block-interactive-template/README.md b/packages/create-block-interactive-template/README.md
index cc0530c063054..adf3cab6594cc 100644
--- a/packages/create-block-interactive-template/README.md
+++ b/packages/create-block-interactive-template/README.md
@@ -10,6 +10,8 @@ This block template can be used by running the following command:
 npx  @wordpress/create-block --template @wordpress/create-block-interactive-template
 ```
 
+It requires Gutenberg 17.5 or higher.
+
 ## Contributing to this package
 
 This is an individual package that's part of the Gutenberg project. The project is organized as a monorepo. It's made up of multiple self-contained software packages, each with a specific purpose. The packages in this monorepo are published to [npm](https://www.npmjs.com/) and used by [WordPress](https://make.wordpress.org/core/) as well as other software projects.
diff --git a/packages/create-block-interactive-template/block-templates/render.php.mustache b/packages/create-block-interactive-template/block-templates/render.php.mustache
index 0f6883a936240..960da619f790a 100644
--- a/packages/create-block-interactive-template/block-templates/render.php.mustache
+++ b/packages/create-block-interactive-template/block-templates/render.php.mustache
@@ -13,11 +13,6 @@
 
 // Generate unique id for aria-controls.
 $unique_id = wp_unique_id( 'p-' );
-
-// Enqueue the view file.
-if (function_exists('gutenberg_enqueue_module')) {
-	gutenberg_enqueue_module( '{{namespace}}-view' );
-}
 ?>
 
 <div
diff --git a/packages/create-block-interactive-template/index.js b/packages/create-block-interactive-template/index.js
index 6e5ffcb9cc9ae..5fe9baa5c6ea4 100644
--- a/packages/create-block-interactive-template/index.js
+++ b/packages/create-block-interactive-template/index.js
@@ -14,8 +14,14 @@ module.exports = {
 		supports: {
 			interactivity: true,
 		},
+		viewScript: null,
+		viewModule: 'file:./view.js',
 		render: 'file:./render.php',
 		example: {},
+		customScripts: {
+			build: 'wp-scripts build --experimental-modules',
+			start: 'wp-scripts start --experimental-modules',
+		},
 	},
 	variants: {
 		basic: {},
diff --git a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
index 81e6b035b1d73..83890732cc41b 100644
--- a/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
+++ b/packages/create-block-interactive-template/plugin-templates/$slug.php.mustache
@@ -42,15 +42,6 @@ if ( ! defined( 'ABSPATH' ) ) {
  * @see https://developer.wordpress.org/reference/functions/register_block_type/
  */
 function {{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init() {
-	register_block_type( __DIR__ . '/build' );
-
-	if (function_exists('gutenberg_register_module')) {
-		gutenberg_register_module(
-			'{{namespace}}-view',
-			plugin_dir_url( __FILE__ ) . 'src/view.js',
-			array( '@wordpress/interactivity' ),
-			'{{version}}'
-		);
-	}
+	register_block_type_from_metadata( __DIR__ . '/build' );
 }
 add_action( 'init', '{{namespaceSnakeCase}}_{{slugSnakeCase}}_block_init' );
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index 7f6a5a0c42816..a3a1b01bc09fb 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### New Feature
+
+-   Add support for the `viewModule` property ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
+
 ## 4.32.0 (2023-12-13)
 
 ## 4.31.0 (2023-11-29)
diff --git a/packages/create-block/lib/init-block.js b/packages/create-block/lib/init-block.js
index 9c0bda20a4009..5a60e90197ee8 100644
--- a/packages/create-block/lib/init-block.js
+++ b/packages/create-block/lib/init-block.js
@@ -30,6 +30,7 @@ async function initBlockJSON( {
 	editorStyle,
 	style,
 	render,
+	viewModule,
 	viewScript,
 	customBlockJSON,
 	example,
@@ -62,6 +63,7 @@ async function initBlockJSON( {
 					editorStyle,
 					style,
 					render,
+					viewModule,
 					viewScript,
 					...customBlockJSON,
 				} ).filter( ( [ , value ] ) => !! value )
diff --git a/packages/create-block/lib/scaffold.js b/packages/create-block/lib/scaffold.js
index 49d3cbf794777..bd9ba0396b75e 100644
--- a/packages/create-block/lib/scaffold.js
+++ b/packages/create-block/lib/scaffold.js
@@ -44,6 +44,7 @@ module.exports = async (
 		editorStyle,
 		style,
 		render,
+		viewModule,
 		viewScript,
 		variantVars,
 		customPackageJSON,
@@ -84,6 +85,7 @@ module.exports = async (
 		editorStyle,
 		style,
 		render,
+		viewModule,
 		viewScript,
 		variantVars,
 		customPackageJSON,
diff --git a/packages/interactivity/docs/1-getting-started.md b/packages/interactivity/docs/1-getting-started.md
index 85af202180735..660671a8b10cd 100644
--- a/packages/interactivity/docs/1-getting-started.md
+++ b/packages/interactivity/docs/1-getting-started.md
@@ -26,18 +26,6 @@ We can scaffold a WordPress plugin that registers an interactive block (using th
 npx @wordpress/create-block@latest my-first-interactive-block --template @wordpress/create-block-interactive-template
 ```
 
-> **Note**
-> The Interactivity API recently switched from [using modules instead of scripts in the frontend](https://github.com/WordPress/gutenberg/pull/56143). Therefore, in order to test this scaffolded block, you will need to add the following line to the `package.json` file of the generated plugin:
-
-```json
-"files": [
-	"src/view.js"
-]
-```
-> This should be updated in the [scripts package](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-scripts/) soon.
-
-
-
 #### 2. Generate the build
 
 When the plugin folder is generated, we should launch the build process to get the final version of the interactive block that can be used from WordPress.
@@ -61,7 +49,7 @@ At this point you should be able to insert the "My First Interactive Block" bloc
 
 ## Requirements of the Interactivity API
 
-To start working with the Interactivity API you'll need to have a [proper WordPress development environment for blocks](https://developer.wordpress.org/block-editor/getting-started/devenv/)  and some specific code in your block, which should include:
+To start working with the Interactivity API you'll need to have a [proper WordPress development environment for blocks](https://developer.wordpress.org/block-editor/getting-started/devenv/) and some specific code in your block, which should include:
 
 #### A local WordPress installation
 
@@ -71,7 +59,7 @@ To get quickly started, [`wp-now`](https://www.npmjs.com/package/@wp-now/wp-now)
 
 #### Latest vesion of Gutenberg
 
-The Interactivity API is currently only available as an experimental feature from Gutenberg 17.2, so you'll need to have Gutenberg 17.2 or higher version installed and activated in your WordPress installation.
+The Interactivity API is currently only available as an experimental feature from Gutenberg, so you'll need to have Gutenberg 17.5 or higher version installed and activated in your WordPress installation.
 
 #### Node.js
 

From ba367dcc86de157f74eebf419f167381b5d797b2 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Wed, 10 Jan 2024 15:28:52 +0100
Subject: [PATCH 042/296] Update @ariakit/react to v0.3.12 and @ariakit/test to
 v0.3.7 (#57547)

* Update @ariakit/react to v0.3.12 and @ariakit/test to v0.3.7

* CHANGELOG

* Use @ariakit/test for AlignmentMatrixControl unit tests

* Use @ariakit/text for ToggleGroupControl unit tests

* Refactor 'hoverOutside' method

* Improve tooltip-related tests in `ToggleGroupControl`
---
 package-lock.json                             | 152 ++++++++----------
 package.json                                  |   2 +-
 packages/components/CHANGELOG.md              |   1 +
 packages/components/package.json              |   2 +-
 .../alignment-matrix-control/test/index.tsx   |  26 ++-
 .../src/toggle-group-control/test/index.tsx   | 103 ++++++------
 6 files changed, 140 insertions(+), 146 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d2c4a65342a35..02de0a60ff4c9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -86,7 +86,7 @@
 			"devDependencies": {
 				"@actions/core": "1.9.1",
 				"@actions/github": "5.0.0",
-				"@ariakit/test": "^0.3.5",
+				"@ariakit/test": "^0.3.7",
 				"@babel/core": "7.16.0",
 				"@babel/plugin-proposal-export-namespace-from": "7.18.9",
 				"@babel/plugin-syntax-jsx": "7.16.0",
@@ -1628,13 +1628,48 @@
 				"url": "https://github.com/sponsors/sindresorhus"
 			}
 		},
+		"node_modules/@ariakit/core": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.10.tgz",
+			"integrity": "sha512-AcN+GSoVXuUOzKx5d3xPL3YsEHevh4PIO6QIt/mg/nRX1XQ6cvxQEiAjO/BJQm+/MVl7/VbuGBoTFjr0tPU6NQ=="
+		},
+		"node_modules/@ariakit/react": {
+			"version": "0.3.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.12.tgz",
+			"integrity": "sha512-HxKMZZhWSkwwS/Sh9OdWyuNKQ2tjDAIQIy2KVI7IRa8ZQ6ze/4g3YLUHbfCxO7oDupXHfXaeZ4hWx8lP7l1U/g==",
+			"dependencies": {
+				"@ariakit/react-core": "0.3.12"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/ariakit"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0"
+			}
+		},
+		"node_modules/@ariakit/react-core": {
+			"version": "0.3.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.12.tgz",
+			"integrity": "sha512-w6P1A7TYb1fKUe9QbwaoTOWofl13g7TEuXdV4JyefJCQL1e9HQdEw9UL67I8aXRo8/cFHH94/z0N37t8hw5Ogg==",
+			"dependencies": {
+				"@ariakit/core": "0.3.10",
+				"@floating-ui/dom": "^1.0.0",
+				"use-sync-external-store": "^1.2.0"
+			},
+			"peerDependencies": {
+				"react": "^17.0.0 || ^18.0.0",
+				"react-dom": "^17.0.0 || ^18.0.0"
+			}
+		},
 		"node_modules/@ariakit/test": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.5.tgz",
-			"integrity": "sha512-7UCQBnJZ88JptkEnAXT7iSgtxEZiFwqdkKtxLCXDssTOJNatbFsnq0Jow324y41jGfAE2n4Lf5qY2FsZUPf9XQ==",
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.7.tgz",
+			"integrity": "sha512-rOa9pJA0ZfPPSI4SkDX41CsBcvxs6BmxgzFEElZWZo/uBBqtnr8ZL4oe5HySeZKEAHRH86XDqfxFISkhV76m5g==",
 			"dev": true,
 			"dependencies": {
-				"@ariakit/core": "0.3.8",
+				"@ariakit/core": "0.3.10",
 				"@testing-library/dom": "^8.0.0 || ^9.0.0"
 			},
 			"peerDependencies": {
@@ -1650,12 +1685,6 @@
 				}
 			}
 		},
-		"node_modules/@ariakit/test/node_modules/@ariakit/core": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.8.tgz",
-			"integrity": "sha512-LlSCwbyyozMX4ZEobpYGcv1LFqOdBTdTYPZw3lAVgLcFSNivsazi3NkKM9qNWNIu00MS+xTa0+RuIcuWAjlB2Q==",
-			"dev": true
-		},
 		"node_modules/@aw-web-design/x-default-browser": {
 			"version": "1.4.126",
 			"resolved": "https://registry.npmjs.org/@aw-web-design/x-default-browser/-/x-default-browser-1.4.126.tgz",
@@ -54244,7 +54273,7 @@
 			"version": "25.14.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@ariakit/react": "^0.3.10",
+				"@ariakit/react": "^0.3.12",
 				"@babel/runtime": "^7.16.0",
 				"@emotion/cache": "^11.7.1",
 				"@emotion/css": "^11.7.1",
@@ -54303,41 +54332,6 @@
 				"react-dom": "^18.0.0"
 			}
 		},
-		"packages/components/node_modules/@ariakit/core": {
-			"version": "0.3.8",
-			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.8.tgz",
-			"integrity": "sha512-LlSCwbyyozMX4ZEobpYGcv1LFqOdBTdTYPZw3lAVgLcFSNivsazi3NkKM9qNWNIu00MS+xTa0+RuIcuWAjlB2Q=="
-		},
-		"packages/components/node_modules/@ariakit/react": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.10.tgz",
-			"integrity": "sha512-XRY69IOm8Oy+HSPoaspcVLAhLo3ToLhhJKSLK1voTAZtSzu5kUeUf4nUPxTzYFsvirKORZgOLAeNwuo1gPr61g==",
-			"dependencies": {
-				"@ariakit/react-core": "0.3.10"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/ariakit"
-			},
-			"peerDependencies": {
-				"react": "^17.0.0 || ^18.0.0",
-				"react-dom": "^17.0.0 || ^18.0.0"
-			}
-		},
-		"packages/components/node_modules/@ariakit/react-core": {
-			"version": "0.3.10",
-			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.10.tgz",
-			"integrity": "sha512-CzSffcNlOyS2xuy21UB6fgJXi5LriJ9JrTSJzcgJmE+P9/WfQlplJC3L75d8O2yKgaGPeFnQ0hhDA6ItsI98eQ==",
-			"dependencies": {
-				"@ariakit/core": "0.3.8",
-				"@floating-ui/dom": "^1.0.0",
-				"use-sync-external-store": "^1.2.0"
-			},
-			"peerDependencies": {
-				"react": "^17.0.0 || ^18.0.0",
-				"react-dom": "^17.0.0 || ^18.0.0"
-			}
-		},
 		"packages/components/node_modules/@floating-ui/react-dom": {
 			"version": "2.0.1",
 			"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
@@ -57392,22 +57386,37 @@
 				}
 			}
 		},
+		"@ariakit/core": {
+			"version": "0.3.10",
+			"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.10.tgz",
+			"integrity": "sha512-AcN+GSoVXuUOzKx5d3xPL3YsEHevh4PIO6QIt/mg/nRX1XQ6cvxQEiAjO/BJQm+/MVl7/VbuGBoTFjr0tPU6NQ=="
+		},
+		"@ariakit/react": {
+			"version": "0.3.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.12.tgz",
+			"integrity": "sha512-HxKMZZhWSkwwS/Sh9OdWyuNKQ2tjDAIQIy2KVI7IRa8ZQ6ze/4g3YLUHbfCxO7oDupXHfXaeZ4hWx8lP7l1U/g==",
+			"requires": {
+				"@ariakit/react-core": "0.3.12"
+			}
+		},
+		"@ariakit/react-core": {
+			"version": "0.3.12",
+			"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.12.tgz",
+			"integrity": "sha512-w6P1A7TYb1fKUe9QbwaoTOWofl13g7TEuXdV4JyefJCQL1e9HQdEw9UL67I8aXRo8/cFHH94/z0N37t8hw5Ogg==",
+			"requires": {
+				"@ariakit/core": "0.3.10",
+				"@floating-ui/dom": "^1.0.0",
+				"use-sync-external-store": "^1.2.0"
+			}
+		},
 		"@ariakit/test": {
-			"version": "0.3.5",
-			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.5.tgz",
-			"integrity": "sha512-7UCQBnJZ88JptkEnAXT7iSgtxEZiFwqdkKtxLCXDssTOJNatbFsnq0Jow324y41jGfAE2n4Lf5qY2FsZUPf9XQ==",
+			"version": "0.3.7",
+			"resolved": "https://registry.npmjs.org/@ariakit/test/-/test-0.3.7.tgz",
+			"integrity": "sha512-rOa9pJA0ZfPPSI4SkDX41CsBcvxs6BmxgzFEElZWZo/uBBqtnr8ZL4oe5HySeZKEAHRH86XDqfxFISkhV76m5g==",
 			"dev": true,
 			"requires": {
-				"@ariakit/core": "0.3.8",
+				"@ariakit/core": "0.3.10",
 				"@testing-library/dom": "^8.0.0 || ^9.0.0"
-			},
-			"dependencies": {
-				"@ariakit/core": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.8.tgz",
-					"integrity": "sha512-LlSCwbyyozMX4ZEobpYGcv1LFqOdBTdTYPZw3lAVgLcFSNivsazi3NkKM9qNWNIu00MS+xTa0+RuIcuWAjlB2Q==",
-					"dev": true
-				}
 			}
 		},
 		"@aw-web-design/x-default-browser": {
@@ -69363,7 +69372,7 @@
 		"@wordpress/components": {
 			"version": "file:packages/components",
 			"requires": {
-				"@ariakit/react": "^0.3.10",
+				"@ariakit/react": "^0.3.12",
 				"@babel/runtime": "^7.16.0",
 				"@emotion/cache": "^11.7.1",
 				"@emotion/css": "^11.7.1",
@@ -69415,29 +69424,6 @@
 				"valtio": "1.7.0"
 			},
 			"dependencies": {
-				"@ariakit/core": {
-					"version": "0.3.8",
-					"resolved": "https://registry.npmjs.org/@ariakit/core/-/core-0.3.8.tgz",
-					"integrity": "sha512-LlSCwbyyozMX4ZEobpYGcv1LFqOdBTdTYPZw3lAVgLcFSNivsazi3NkKM9qNWNIu00MS+xTa0+RuIcuWAjlB2Q=="
-				},
-				"@ariakit/react": {
-					"version": "0.3.10",
-					"resolved": "https://registry.npmjs.org/@ariakit/react/-/react-0.3.10.tgz",
-					"integrity": "sha512-XRY69IOm8Oy+HSPoaspcVLAhLo3ToLhhJKSLK1voTAZtSzu5kUeUf4nUPxTzYFsvirKORZgOLAeNwuo1gPr61g==",
-					"requires": {
-						"@ariakit/react-core": "0.3.10"
-					}
-				},
-				"@ariakit/react-core": {
-					"version": "0.3.10",
-					"resolved": "https://registry.npmjs.org/@ariakit/react-core/-/react-core-0.3.10.tgz",
-					"integrity": "sha512-CzSffcNlOyS2xuy21UB6fgJXi5LriJ9JrTSJzcgJmE+P9/WfQlplJC3L75d8O2yKgaGPeFnQ0hhDA6ItsI98eQ==",
-					"requires": {
-						"@ariakit/core": "0.3.8",
-						"@floating-ui/dom": "^1.0.0",
-						"use-sync-external-store": "^1.2.0"
-					}
-				},
 				"@floating-ui/react-dom": {
 					"version": "2.0.1",
 					"resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.0.1.tgz",
diff --git a/package.json b/package.json
index e98ad7cb1587f..f2f239762de97 100644
--- a/package.json
+++ b/package.json
@@ -98,7 +98,7 @@
 	"devDependencies": {
 		"@actions/core": "1.9.1",
 		"@actions/github": "5.0.0",
-		"@ariakit/test": "^0.3.5",
+		"@ariakit/test": "^0.3.7",
 		"@babel/core": "7.16.0",
 		"@babel/plugin-proposal-export-namespace-from": "7.18.9",
 		"@babel/plugin-syntax-jsx": "7.16.0",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 8805736c2e440..c7c1a515a64ce 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -24,6 +24,7 @@
 ### Enhancements
 
 -   Update `ariakit` to version `0.3.10` ([#57325](https://github.com/WordPress/gutenberg/pull/57325)).
+-   Update `@ariakit/react` to version `0.3.12` and @ariakit/test to version `0.3.7` ([#57547](https://github.com/WordPress/gutenberg/pull/57547)).
 -   `DropdownMenuV2`: do not collapse suffix width ([#57238](https://github.com/WordPress/gutenberg/pull/57238)).
 -   `DateTimePicker`: Adjustment of the dot position on DayButton and expansion of the button area. ([#55502](https://github.com/WordPress/gutenberg/pull/55502)).
 -   `Modal`: Improve application of body class names ([#55430](https://github.com/WordPress/gutenberg/pull/55430)).
diff --git a/packages/components/package.json b/packages/components/package.json
index 885c1e455fea4..cd440998b9323 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -30,7 +30,7 @@
 	],
 	"types": "build-types",
 	"dependencies": {
-		"@ariakit/react": "^0.3.10",
+		"@ariakit/react": "^0.3.12",
 		"@babel/runtime": "^7.16.0",
 		"@emotion/cache": "^11.7.1",
 		"@emotion/css": "^11.7.1",
diff --git a/packages/components/src/alignment-matrix-control/test/index.tsx b/packages/components/src/alignment-matrix-control/test/index.tsx
index 6836bc7e45f95..a820b69b26c8f 100644
--- a/packages/components/src/alignment-matrix-control/test/index.tsx
+++ b/packages/components/src/alignment-matrix-control/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor, within } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, click } from '@ariakit/test';
 
 /**
  * Internal dependencies
@@ -37,11 +37,9 @@ describe( 'AlignmentMatrixControl', () => {
 		} );
 
 		it( 'should be centered by default', async () => {
-			const user = userEvent.setup();
-
 			await renderAndInitCompositeStore( <AlignmentMatrixControl /> );
 
-			await user.tab();
+			await press.Tab();
 
 			expect( getCell( 'center center' ) ).toHaveFocus();
 		} );
@@ -60,7 +58,6 @@ describe( 'AlignmentMatrixControl', () => {
 					'bottom center',
 					'bottom right',
 				] )( '%s', async ( alignment ) => {
-					const user = userEvent.setup();
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -72,14 +69,13 @@ describe( 'AlignmentMatrixControl', () => {
 
 					const cell = getCell( alignment );
 
-					await user.click( cell );
+					await click( cell );
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( alignment );
 				} );
 
 				it( 'unless already focused', async () => {
-					const user = userEvent.setup();
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -91,7 +87,7 @@ describe( 'AlignmentMatrixControl', () => {
 
 					const cell = getCell( 'center center' );
 
-					await user.click( cell );
+					await click( cell );
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).not.toHaveBeenCalled();
@@ -106,16 +102,15 @@ describe( 'AlignmentMatrixControl', () => {
 					[ 'ArrowLeft', 'center left' ],
 					[ 'ArrowDown', 'bottom center' ],
 					[ 'ArrowRight', 'center right' ],
-				] )( '%s', async ( keyRef, cellRef ) => {
-					const user = userEvent.setup();
+				] as const )( '%s', async ( keyRef, cellRef ) => {
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
 						<AlignmentMatrixControl onChange={ spy } />
 					);
 
-					await user.tab();
-					await user.keyboard( `[${ keyRef }]` );
+					await press.Tab();
+					await press[ keyRef ]();
 
 					expect( getCell( cellRef ) ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( cellRef );
@@ -128,8 +123,7 @@ describe( 'AlignmentMatrixControl', () => {
 					[ 'ArrowLeft', 'top left' ],
 					[ 'ArrowDown', 'bottom right' ],
 					[ 'ArrowRight', 'bottom right' ],
-				] )( '%s', async ( keyRef, cellRef ) => {
-					const user = userEvent.setup();
+				] as const )( '%s', async ( keyRef, cellRef ) => {
 					const spy = jest.fn();
 
 					await renderAndInitCompositeStore(
@@ -137,8 +131,8 @@ describe( 'AlignmentMatrixControl', () => {
 					);
 
 					const cell = getCell( cellRef );
-					await user.click( cell );
-					await user.keyboard( `[${ keyRef }]` );
+					await click( cell );
+					await press[ keyRef ]();
 
 					expect( cell ).toHaveFocus();
 					expect( spy ).toHaveBeenCalledWith( cellRef );
diff --git a/packages/components/src/toggle-group-control/test/index.tsx b/packages/components/src/toggle-group-control/test/index.tsx
index b54b5764d4e0f..99a2dd8a00421 100644
--- a/packages/components/src/toggle-group-control/test/index.tsx
+++ b/packages/components/src/toggle-group-control/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press, click, hover, sleep } from '@ariakit/test';
 
 /**
  * WordPress dependencies
@@ -19,8 +19,13 @@ import {
 	ToggleGroupControlOption,
 	ToggleGroupControlOptionIcon,
 } from '../index';
+import { TOOLTIP_DELAY } from '../../tooltip';
 import type { ToggleGroupControlProps } from '../types';
-import cleanupTooltip from '../../tooltip/test/utils';
+
+const hoverOutside = async () => {
+	await hover( document.body );
+	await hover( document.body, { clientX: 10, clientY: 10 } );
+};
 
 const ControlledToggleGroupControl = ( {
 	value: valueProp,
@@ -113,7 +118,6 @@ describe.each( [
 		} );
 	} );
 	it( 'should call onChange with proper value', async () => {
-		const user = userEvent.setup();
 		const mockOnChange = jest.fn();
 
 		render(
@@ -126,13 +130,12 @@ describe.each( [
 			</Component>
 		);
 
-		await user.click( screen.getByRole( 'radio', { name: 'R' } ) );
+		await click( screen.getByRole( 'radio', { name: 'R' } ) );
 
 		expect( mockOnChange ).toHaveBeenCalledWith( 'rigas' );
 	} );
 
 	it( 'should render tooltip where `showTooltip` === `true`', async () => {
-		const user = userEvent.setup();
 		render(
 			<Component label="Test Toggle Group Control">
 				{ optionsWithTooltip }
@@ -143,19 +146,26 @@ describe.each( [
 			'Click for Delicious Gnocchi'
 		);
 
-		await user.hover( firstRadio );
+		await hover( firstRadio );
 
-		const tooltip = await screen.findByText(
-			'Click for Delicious Gnocchi'
-		);
+		const tooltip = await screen.findByRole( 'tooltip', {
+			name: 'Click for Delicious Gnocchi',
+		} );
 
 		await waitFor( () => expect( tooltip ).toBeVisible() );
 
-		await cleanupTooltip( user );
+		// hover outside of radio
+		await hoverOutside();
+
+		// Tooltip should hide
+		expect(
+			screen.queryByRole( 'tooltip', {
+				name: 'Click for Delicious Gnocchi',
+			} )
+		).not.toBeInTheDocument();
 	} );
 
 	it( 'should not render tooltip', async () => {
-		const user = userEvent.setup();
 		render(
 			<Component label="Test Toggle Group Control">
 				{ optionsWithTooltip }
@@ -166,19 +176,24 @@ describe.each( [
 			'Click for Sumptuous Caponata'
 		);
 
-		await user.hover( secondRadio );
+		await hover( secondRadio );
 
-		await waitFor( () =>
-			expect(
-				screen.queryByText( 'Click for Sumptuous Caponata' )
-			).not.toBeInTheDocument()
-		);
+		// Tooltip shouldn't show
+		expect(
+			screen.queryByText( 'Click for Sumptuous Caponata' )
+		).not.toBeInTheDocument();
+
+		// Advance time by default delay
+		await sleep( TOOLTIP_DELAY );
+
+		// Tooltip shouldn't show.
+		expect(
+			screen.queryByText( 'Click for Sumptuous Caponata' )
+		).not.toBeInTheDocument();
 	} );
 
 	if ( mode === 'controlled' ) {
 		it( 'should reset values correctly', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Component label="Test Toggle Group Control">
 					{ options }
@@ -188,25 +203,23 @@ describe.each( [
 			const rigasOption = screen.getByRole( 'radio', { name: 'R' } );
 			const jackOption = screen.getByRole( 'radio', { name: 'J' } );
 
-			await user.click( rigasOption );
+			await click( rigasOption );
 
 			expect( jackOption ).not.toBeChecked();
 			expect( rigasOption ).toBeChecked();
 
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 
 			expect( rigasOption ).not.toBeChecked();
 			expect( jackOption ).toBeChecked();
 
-			await user.click( screen.getByRole( 'button', { name: 'Reset' } ) );
+			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
 
 			expect( rigasOption ).not.toBeChecked();
 			expect( jackOption ).not.toBeChecked();
 		} );
 
 		it( 'should update correctly when triggered by external updates', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<Component
 					value="rigas"
@@ -225,19 +238,19 @@ describe.each( [
 				screen.getByRole( 'radio', { name: 'J' } )
 			).not.toBeChecked();
 
-			await user.click( screen.getByRole( 'button', { name: 'Jack' } ) );
+			await click( screen.getByRole( 'button', { name: 'Jack' } ) );
 			expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
 			expect(
 				screen.getByRole( 'radio', { name: 'R' } )
 			).not.toBeChecked();
 
-			await user.click( screen.getByRole( 'button', { name: 'Rigas' } ) );
+			await click( screen.getByRole( 'button', { name: 'Rigas' } ) );
 			expect( screen.getByRole( 'radio', { name: 'R' } ) ).toBeChecked();
 			expect(
 				screen.getByRole( 'radio', { name: 'J' } )
 			).not.toBeChecked();
 
-			await user.click( screen.getByRole( 'button', { name: 'Reset' } ) );
+			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
 			expect(
 				screen.getByRole( 'radio', { name: 'R' } )
 			).not.toBeChecked();
@@ -251,7 +264,6 @@ describe.each( [
 		describe( 'isDeselectable = false', () => {
 			it( 'should not be deselectable', async () => {
 				const mockOnChange = jest.fn();
-				const user = userEvent.setup();
 
 				render(
 					<Component
@@ -267,31 +279,35 @@ describe.each( [
 					name: 'R',
 					checked: true,
 				} );
-				await user.click( rigas );
+				await click( rigas );
 				expect( mockOnChange ).toHaveBeenCalledTimes( 0 );
 			} );
 
 			it( 'should not tab to next radio option', async () => {
-				const user = userEvent.setup();
-
 				render(
-					<Component value="rigas" label="Test">
-						{ options }
-					</Component>
+					<>
+						<Component value="rigas" label="Test">
+							{ options }
+						</Component>
+						<button>After ToggleGroupControl</button>
+					</>
 				);
 
 				const rigas = screen.getByRole( 'radio', {
 					name: 'R',
 				} );
 
-				await user.tab();
+				await press.Tab();
 				expect( rigas ).toHaveFocus();
 
-				await user.tab();
+				await press.Tab();
 
+				// When in controlled mode, there is an additional "Reset" button.
 				const expectedFocusTarget =
 					mode === 'uncontrolled'
-						? rigas.ownerDocument.body
+						? screen.getByRole( 'button', {
+								name: 'After ToggleGroupControl',
+						  } )
 						: screen.getByRole( 'button', { name: 'Reset' } );
 
 				expect( expectedFocusTarget ).toHaveFocus();
@@ -301,7 +317,6 @@ describe.each( [
 		describe( 'isDeselectable = true', () => {
 			it( 'should be deselectable', async () => {
 				const mockOnChange = jest.fn();
-				const user = userEvent.setup();
 
 				render(
 					<Component
@@ -314,7 +329,7 @@ describe.each( [
 					</Component>
 				);
 
-				await user.click(
+				await click(
 					screen.getByRole( 'button', {
 						name: 'R',
 						pressed: true,
@@ -323,7 +338,7 @@ describe.each( [
 				expect( mockOnChange ).toHaveBeenCalledTimes( 1 );
 				expect( mockOnChange ).toHaveBeenLastCalledWith( undefined );
 
-				await user.click(
+				await click(
 					screen.getByRole( 'button', {
 						name: 'R',
 						pressed: false,
@@ -334,15 +349,13 @@ describe.each( [
 			} );
 
 			it( 'should tab to the next option button', async () => {
-				const user = userEvent.setup();
-
 				render(
 					<Component isDeselectable value="rigas" label="Test">
 						{ options }
 					</Component>
 				);
 
-				await user.tab();
+				await press.Tab();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'R',
@@ -350,7 +363,7 @@ describe.each( [
 					} )
 				).toHaveFocus();
 
-				await user.tab();
+				await press.Tab();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'J',
@@ -359,7 +372,7 @@ describe.each( [
 				).toHaveFocus();
 
 				// Focus should not move with arrow keys
-				await user.keyboard( '{ArrowLeft}' );
+				await press.ArrowLeft();
 				expect(
 					screen.getByRole( 'button', {
 						name: 'J',

From 6693377d080d8c581f279bfd7521f5b2bcf02149 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 10 Jan 2024 14:34:24 +0000
Subject: [PATCH 043/296] Bump plugin version to 17.5.0-rc.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 35e416006bea5..9559f838608da 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.4.1
+ * Version: 17.5.0-rc.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 02de0a60ff4c9..96a14ec8eeb50 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.4.1",
+	"version": "17.5.0-rc.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.4.1",
+			"version": "17.5.0-rc.1",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index f2f239762de97..684f35d408d3c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.4.1",
+	"version": "17.5.0-rc.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From e93f250746b14acaed14190cdb552960a6c490ce Mon Sep 17 00:00:00 2001
From: Gerardo Pacheco <gerardo.pacheco@automattic.com>
Date: Wed, 10 Jan 2024 15:49:08 +0100
Subject: [PATCH 044/296] [Mobile] - Fix missing custom gradient indicator in
 the color palette  (#57605)

* Mobile - Fix missing Custom indicator for custom gradients

* Pass enableCustomColor in Cover block as true

* Fix typo

* Update Changelog

* Fix condition

* Update test to use the openBlockSettings helper

* Simplify condition by adding optional chaining

* Use flatMap
---
 .../test/__snapshots__/edit.native.js.snap    |  6 +++
 .../src/buttons/test/edit.native.js           | 49 +++++++++++++++++++
 .../block-library/src/cover/edit.native.js    |  1 +
 .../src/color-palette/index.native.js         | 25 +++++++---
 .../color-settings/palette.screen.native.js   | 12 +++--
 packages/react-native-editor/CHANGELOG.md     |  1 +
 6 files changed, 82 insertions(+), 12 deletions(-)

diff --git a/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap b/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
index 1a55c807225d9..f04eacee4b91c 100644
--- a/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
+++ b/packages/block-library/src/buttons/test/__snapshots__/edit.native.js.snap
@@ -6,6 +6,12 @@ exports[`Buttons block color customization sets a background color 1`] = `
 <!-- /wp:buttons -->"
 `;
 
+exports[`Buttons block color customization sets a custom gradient background color 1`] = `
+"<!-- wp:buttons -->
+<div class="wp-block-buttons"><!-- wp:button {"style":{"color":{"gradient":"linear-gradient(200deg,rgb(122,220,180) 0%,rgb(0,208,130) 100%)"}}} /--></div>
+<!-- /wp:buttons -->"
+`;
+
 exports[`Buttons block color customization sets a gradient background color 1`] = `
 "<!-- wp:buttons -->
 <div class="wp-block-buttons"><!-- wp:button {"gradient":"light-green-cyan-to-vivid-green-cyan"} /--></div>
diff --git a/packages/block-library/src/buttons/test/edit.native.js b/packages/block-library/src/buttons/test/edit.native.js
index f393a31c7330a..af2ffe762e6a3 100644
--- a/packages/block-library/src/buttons/test/edit.native.js
+++ b/packages/block-library/src/buttons/test/edit.native.js
@@ -10,6 +10,7 @@ import {
 	initializeEditor,
 	triggerBlockListLayout,
 	typeInRichText,
+	openBlockSettings,
 	waitFor,
 } from 'test/helpers';
 
@@ -391,5 +392,53 @@ describe( 'Buttons block', () => {
 			// Assert
 			expect( getEditorHtml() ).toMatchSnapshot();
 		} );
+
+		it( 'sets a custom gradient background color', async () => {
+			// Arrange
+			const screen = await initializeEditor();
+			await addBlock( screen, 'Buttons' );
+
+			// Act
+			const buttonsBlock = getBlock( screen, 'Buttons' );
+			fireEvent.press( buttonsBlock );
+
+			// Trigger onLayout for the list
+			await triggerBlockListLayout( buttonsBlock );
+
+			const buttonBlock = await getBlock( screen, 'Button' );
+			fireEvent.press( buttonBlock );
+
+			// Open Block Settings.
+			await openBlockSettings( screen );
+
+			// Open Text color settings
+			fireEvent.press( screen.getByLabelText( 'Background, Default' ) );
+
+			// Tap on the gradient segment
+			fireEvent.press( screen.getByLabelText( 'Gradient' ) );
+
+			// Tap one gradient color
+			fireEvent.press(
+				screen.getByLabelText( 'Light green cyan to vivid green cyan' )
+			);
+
+			// Tap on Customize Gradient
+			fireEvent.press( screen.getByLabelText( /Customize Gradient/ ) );
+
+			// Change the current angle
+			fireEvent.press( screen.getByText( '135', { hidden: true } ) );
+			const angleTextInput = screen.getByDisplayValue( '135', {
+				hidden: true,
+			} );
+			fireEvent.changeText( angleTextInput, '200' );
+
+			// Go back to the settings list.
+			fireEvent.press( await screen.findByLabelText( 'Go back' ) );
+
+			// Assert
+			const customButton = await screen.findByText( 'CUSTOM' );
+			expect( customButton ).toBeVisible();
+			expect( getEditorHtml() ).toMatchSnapshot();
+		} );
 	} );
 } );
diff --git a/packages/block-library/src/cover/edit.native.js b/packages/block-library/src/cover/edit.native.js
index 81ff43128b1a3..989c5ec3a0d33 100644
--- a/packages/block-library/src/cover/edit.native.js
+++ b/packages/block-library/src/cover/edit.native.js
@@ -538,6 +538,7 @@ const Cover = ( {
 						<BottomSheetConsumer>
 							{ ( { shouldEnableBottomSheetScroll } ) => (
 								<ColorPalette
+									enableCustomColor={ true }
 									customColorIndicatorStyles={
 										styles.paletteColorIndicator
 									}
diff --git a/packages/components/src/color-palette/index.native.js b/packages/components/src/color-palette/index.native.js
index 51a61785df9af..a3d4175b31ac9 100644
--- a/packages/components/src/color-palette/index.native.js
+++ b/packages/components/src/color-palette/index.native.js
@@ -33,7 +33,7 @@ let scrollPosition = 0;
 let customIndicatorWidth = 0;
 
 function ColorPalette( {
-	enableCustomColor = true,
+	enableCustomColor = false,
 	setColor,
 	activeColor,
 	isGradientColor,
@@ -62,24 +62,35 @@ function ColorPalette( {
 	const scale = useRef( new Animated.Value( 1 ) ).current;
 	const opacity = useRef( new Animated.Value( 1 ) ).current;
 
-	const defaultColors = [
+	const mergedColors = [
 		...new Set(
 			( defaultSettings.colors ?? [] ).map( ( { color } ) => color )
 		),
 	];
-	const mergedColors = [
+	const mergedGradients = [
+		...new Set(
+			( defaultSettings.gradients ?? [] ).map(
+				( { gradient } ) => gradient
+			)
+		),
+	];
+	const allAvailableColors = [
 		...new Set(
 			( defaultSettings.allColors ?? [] ).map( ( { color } ) => color )
 		),
 	];
-	const defaultGradientColors = [
+	const allAvailableGradients = [
 		...new Set(
-			( defaultSettings.gradients ?? [] ).map(
+			( defaultSettings.allGradients ?? [] ).map(
 				( { gradient } ) => gradient
 			)
 		),
 	];
-	const colors = isGradientSegment ? defaultGradientColors : defaultColors;
+
+	const colors = isGradientSegment ? mergedGradients : mergedColors;
+	const allColors = isGradientSegment
+		? allAvailableGradients
+		: allAvailableColors;
 
 	const customIndicatorColor = isGradientSegment
 		? activeColor
@@ -110,7 +121,7 @@ function ColorPalette( {
 
 	function isSelectedCustom() {
 		const isWithinColors =
-			activeColor && mergedColors && mergedColors.includes( activeColor );
+			activeColor && allColors?.includes( activeColor );
 		if ( enableCustomColor && activeColor ) {
 			if ( isGradientSegment ) {
 				return isGradientColor && ! isWithinColors;
diff --git a/packages/components/src/mobile/color-settings/palette.screen.native.js b/packages/components/src/mobile/color-settings/palette.screen.native.js
index bc7187fd092b8..fcf03f9ecd448 100644
--- a/packages/components/src/mobile/color-settings/palette.screen.native.js
+++ b/packages/components/src/mobile/color-settings/palette.screen.native.js
@@ -29,7 +29,6 @@ import { colorsUtils } from './utils';
 import styles from './style.scss';
 
 const HIT_SLOP = { top: 8, bottom: 8, left: 8, right: 8 };
-const THEME_PALETTE_NAME = 'Theme';
 
 const PaletteScreen = () => {
 	const route = useRoute();
@@ -48,7 +47,6 @@ const PaletteScreen = () => {
 	const [ currentValue, setCurrentValue ] = useState( colorValue );
 	const isGradientColor = isGradient( currentValue );
 	const selectedSegmentIndex = isGradientColor ? 1 : 0;
-	const allAvailableColors = useMobileGlobalStylesColors();
 
 	const [ currentSegment, setCurrentSegment ] = useState(
 		segments[ selectedSegmentIndex ]
@@ -57,6 +55,10 @@ const PaletteScreen = () => {
 	const currentSegmentColors = ! isGradientSegment
 		? defaultSettings.colors
 		: defaultSettings.gradients;
+	const allAvailableColors = useMobileGlobalStylesColors();
+	const allAvailableGradients = currentSegmentColors
+		.flatMap( ( { gradients } ) => gradients )
+		.filter( Boolean );
 
 	const horizontalSeparatorStyle = usePreferredColorSchemeStyle(
 		styles.horizontalSeparator,
@@ -184,10 +186,10 @@ const PaletteScreen = () => {
 						colors: palette.colors,
 						gradients: palette.gradients,
 						allColors: allAvailableColors,
+						allGradients: allAvailableGradients,
 					};
-					const enableCustomColor =
-						! isGradientSegment &&
-						palette.name === THEME_PALETTE_NAME;
+					// Limit to show the custom indicator to the first available palette
+					const enableCustomColor = paletteKey === 0;
 
 					return (
 						<ColorPalette
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 381ce0e93e445..a62838b066bee 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -11,6 +11,7 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
+-   [*] Fix missing custom color indicator for custom gradients [#57605]
 
 ## 1.110.0
 -   [*] [internal] Move InserterButton from components package to block-editor package [#56494]

From 4b1beb40631553080a94522e8c021cec38d7aa66 Mon Sep 17 00:00:00 2001
From: Jeff Ong <jonger4@gmail.com>
Date: Wed, 10 Jan 2024 09:58:32 -0500
Subject: [PATCH 045/296] Font Library: filter fonts upload directory (#57697)

* add global configuration variables for font directory

* add multi-site based directory path for fonts

* add docblock for get_multi_site_font_sub_dir

* Rename function for accuracy.

* Use filter instead of constant to determine where fonts are uploaded.

* Format php.

* simplify the filters code  and output the same array as upload_filter does

* remove tests no longer used

* add a test case for the filter

* rename function. Replaces the misleading 'subdir' term by 'dir'.

---------

Co-authored-by: madhusudhand <madhusudhan.dollu@gmail.com>
Co-authored-by: Matias Benedetto <matias.benedetto@gmail.com>
---
 .../font-library/class-wp-font-family.php     |  4 +-
 .../font-library/class-wp-font-library.php    | 76 +++++++++++++------
 .../font-library/wpFontLibrary/fontsDir.php   | 70 +++++++++++++++++
 .../wpFontLibrary/getFontsDir.php             | 18 -----
 .../wpFontLibrary/setUploadDir.php            | 32 --------
 5 files changed, 126 insertions(+), 74 deletions(-)
 create mode 100644 phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php

diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
index a4204dfe1fa2c..e47cf0afdac1d 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family.php
@@ -599,9 +599,9 @@ private function create_or_update_font_post() {
 	 */
 	public function install( $files = null ) {
 		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-		add_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+		add_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
 		$were_assets_written = $this->download_or_move_font_faces( $files );
-		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'set_upload_dir' ) );
+		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
 		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
 
 		if ( ! $were_assets_written ) {
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index 59ec5e93fa787..99de81e0bd74a 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -141,40 +141,72 @@ public static function get_font_collection( $id ) {
 	}
 
 	/**
-	 * Gets the upload directory for fonts.
+	 * Returns an array containing the current fonts upload directory's path and URL.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return string Path of the upload directory for fonts.
+	 * @param array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
+	 *
+	 * @return array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
 	 */
-	public static function get_fonts_dir() {
-		return path_join( WP_CONTENT_DIR, 'fonts' );
+	public static function fonts_dir( $defaults = array() ) {
+		$site_path = self::get_multi_site_dir();
+
+		// Sets the defaults.
+		$defaults['path']    = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['url']     = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['subdir']  = '';
+		$defaults['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['error']   = false;
+
+		// Filters the fonts directory data.
+		return apply_filters( 'fonts_dir', $defaults );
 	}
 
 	/**
-	 * Sets the upload directory for fonts.
+	 * Gets the Site dir for fonts, using the blog ID if multi-site, empty otherwise.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array $defaults {
-	 *     Default upload directory.
+	 * @return string Site dir path.
+	 */
+	private static function get_multi_site_dir() {
+		$font_sub_dir = '';
+		if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+			$font_sub_dir = '/sites/' . get_current_blog_id();
+		}
+		return $font_sub_dir;
+	}
+
+	/**
+	 * Gets the upload directory for fonts.
 	 *
-	 *     @type string $path    Path to the directory.
-	 *     @type string $url     URL for the directory.
-	 *     @type string $subdir  Sub-directory of the directory.
-	 *     @type string $basedir Base directory.
-	 *     @type string $baseurl Base URL.
-	 * }
-	 * @return array Modified upload directory.
+	 * @since 6.5.0
+	 *
+	 * @return string Path of the upload directory for fonts.
 	 */
-	public static function set_upload_dir( $defaults ) {
-		$defaults['basedir'] = WP_CONTENT_DIR;
-		$defaults['baseurl'] = content_url();
-		$defaults['subdir']  = '/fonts';
-		$defaults['path']    = self::get_fonts_dir();
-		$defaults['url']     = $defaults['baseurl'] . '/fonts';
-
-		return $defaults;
+	public static function get_fonts_dir() {
+		$fonts_dir_settings = self::fonts_dir();
+		return $fonts_dir_settings['path'];
 	}
 
 	/**
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php
new file mode 100644
index 0000000000000..9926bb7409088
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php
@@ -0,0 +1,70 @@
+<?php
+/**
+ * Test WP_Font_Library::fonts_dir().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ *
+ * @covers WP_Font_Library::fonts_dir
+ */
+class Tests_Fonts_WpFontLibrary_FontsDir extends WP_Font_Library_UnitTestCase {
+	private $dir_defaults;
+
+	public function __construct() {
+		parent::__construct();
+		$this->dir_defaults = array(
+			'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
+			'url'     => content_url( 'fonts' ),
+			'subdir'  => '',
+			'basedir' => path_join( WP_CONTENT_DIR, 'fonts' ),
+			'baseurl' => content_url( 'fonts' ),
+			'error'   => false,
+		);
+	}
+
+	public function test_fonts_dir() {
+		$fonts_dir = WP_Font_Library::fonts_dir();
+		$this->assertEquals( $fonts_dir, $this->dir_defaults );
+	}
+
+	public function test_fonts_dir_with_filter() {
+		// Define a callback function to pass to the filter.
+		function set_new_values( $defaults ) {
+			$defaults['path']    = '/custom-path/fonts/my-custom-subdir';
+			$defaults['url']     = 'http://example.com/custom-path/fonts/my-custom-subdir';
+			$defaults['subdir']  = 'my-custom-subdir';
+			$defaults['basedir'] = '/custom-path/fonts';
+			$defaults['baseurl'] = 'http://example.com/custom-path/fonts';
+			$defaults['error']   = false;
+			return $defaults;
+		}
+
+		// Add the filter.
+		add_filter( 'fonts_dir', 'set_new_values' );
+
+		// Gets the fonts dir.
+		$fonts_dir = WP_Font_Library::fonts_dir();
+
+		$expected = array(
+			'path'    => '/custom-path/fonts/my-custom-subdir',
+			'url'     => 'http://example.com/custom-path/fonts/my-custom-subdir',
+			'subdir'  => 'my-custom-subdir',
+			'basedir' => '/custom-path/fonts',
+			'baseurl' => 'http://example.com/custom-path/fonts',
+			'error'   => false,
+		);
+
+		$this->assertEquals( $fonts_dir, $expected, 'The fonts_dir() method should return the expected values.' );
+
+		// Remove the filter.
+		remove_filter( 'fonts_dir', 'set_new_values' );
+
+		// Gets the fonts dir.
+		$fonts_dir = WP_Font_Library::fonts_dir();
+
+		$this->assertEquals( $fonts_dir, $this->dir_defaults, 'The fonts_dir() method should return the default values.' );
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
deleted file mode 100644
index 1200200d7160b..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontsDir.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::get_fonts_dir().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::get_fonts_dir
- */
-class Tests_Fonts_WpFontLibrary_GetFontsDir extends WP_Font_Library_UnitTestCase {
-
-	public function test_get_fonts_dir() {
-		$this->assertStringEndsWith( '/wp-content/fonts', WP_Font_Library::get_fonts_dir() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php b/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
deleted file mode 100644
index 29d481d8afd6b..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/setUploadDir.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Test WP_Font_Library::set_upload_dir().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Library::set_upload_dir
- */
-class Tests_Fonts_WpFontLibrary_SetUploadDir extends WP_Font_Library_UnitTestCase {
-
-	public function test_should_set_fonts_upload_dir() {
-		$defaults = array(
-			'subdir'  => '/abc',
-			'basedir' => '/any/path',
-			'baseurl' => 'http://example.com/an/arbitrary/url',
-			'path'    => '/any/path/abc',
-			'url'     => 'http://example.com/an/arbitrary/url/abc',
-		);
-		$expected = array(
-			'subdir'  => '/fonts',
-			'basedir' => WP_CONTENT_DIR,
-			'baseurl' => content_url(),
-			'path'    => path_join( WP_CONTENT_DIR, 'fonts' ),
-			'url'     => content_url() . '/fonts',
-		);
-		$this->assertSame( $expected, WP_Font_Library::set_upload_dir( $defaults ) );
-	}
-}

From 714e6b107670e5ee4d92b5126f99c54305fee03b Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Wed, 10 Jan 2024 16:08:05 +0100
Subject: [PATCH 046/296] Tooltip: no-op when nested inside another Tooltip
 component (#57202)

* Tooltip: no-op when nested inside another Tooltip component

* Fix Storybook control type

* Use internal components context system

* Add Storybook example

* Snapshots

* Add nested unit test

* CHANGELOG

* Avoid ESLint disable

* Keep nested tooltip storybook example

* isNestedInParentTooltip => isNestedInTooltip

* toBeInTheDocument => toBeVisible

* "inner" => "nested"

* Forward rest props to the tooltip instead of the ancor, update snapshots

* Format warning message

* Add paragraph in docs

* Complete comment
---
 packages/components/CHANGELOG.md              |  1 +
 packages/components/src/tooltip/README.md     |  4 ++
 packages/components/src/tooltip/index.tsx     | 56 ++++++++++++++++---
 .../src/tooltip/stories/index.story.tsx       | 19 ++++++-
 .../components/src/tooltip/test/index.tsx     | 46 +++++++++++++++
 packages/components/src/tooltip/types.ts      |  4 ++
 6 files changed, 120 insertions(+), 10 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index c7c1a515a64ce..a8dd57900cfae 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -32,6 +32,7 @@
 -   `InputControl`, `NumberControl`, `UnitControl`, `SelectControl`, `TreeSelect`: Add `compact` size variant ([#57398](https://github.com/WordPress/gutenberg/pull/57398)).
 -   `ToggleGroupControl`: Update button size in large variant to be 32px ([#57338](https://github.com/WordPress/gutenberg/pull/57338)).
 -   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
+-   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 
 ### Experimental
 
diff --git a/packages/components/src/tooltip/README.md b/packages/components/src/tooltip/README.md
index 9b214e8fc6b00..ef2cd35d25543 100644
--- a/packages/components/src/tooltip/README.md
+++ b/packages/components/src/tooltip/README.md
@@ -16,6 +16,10 @@ const MyTooltip = () => (
 );
 ```
 
+### Nested tooltips
+
+In case one or more `Tooltip` components are rendered inside another `Tooltip` component, only the tooltip associated to the outermost `Tooltip` component will be rendered in the browser and shown to the user appropriately. The rest of the nested `Tooltip` components will simply no-op and pass-through their anchor.
+
 ## Props
 
 The component accepts the following props:
diff --git a/packages/components/src/tooltip/index.tsx b/packages/components/src/tooltip/index.tsx
index 817d6d18812ee..1e652d9a42dbb 100644
--- a/packages/components/src/tooltip/index.tsx
+++ b/packages/components/src/tooltip/index.tsx
@@ -8,22 +8,37 @@ import * as Ariakit from '@ariakit/react';
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { Children } from '@wordpress/element';
+import { Children, cloneElement } from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
-import type { TooltipProps } from './types';
+import type { TooltipProps, TooltipInternalContext } from './types';
 import Shortcut from '../shortcut';
 import { positionToPlacement } from '../popover/utils';
+import {
+	contextConnect,
+	useContextSystem,
+	ContextSystemProvider,
+} from '../context';
+import type { WordPressComponentProps } from '../context';
 
 /**
  * Time over anchor to wait before showing tooltip
  */
 export const TOOLTIP_DELAY = 700;
 
-function Tooltip( props: TooltipProps ) {
+const CONTEXT_VALUE = {
+	Tooltip: {
+		isNestedInTooltip: true,
+	},
+};
+
+function UnconnectedTooltip(
+	props: WordPressComponentProps< TooltipProps, 'div', false >,
+	ref: React.ForwardedRef< any >
+) {
 	const {
 		children,
 		delay = TOOLTIP_DELAY,
@@ -32,7 +47,15 @@ function Tooltip( props: TooltipProps ) {
 		position,
 		shortcut,
 		text,
-	} = props;
+
+		// From Internal Context system
+		isNestedInTooltip,
+
+		...restProps
+	} = useContextSystem< typeof props & TooltipInternalContext >(
+		props,
+		'Tooltip'
+	);
 
 	const baseId = useInstanceId( Tooltip, 'tooltip' );
 	const describedById = text || shortcut ? baseId : undefined;
@@ -43,7 +66,7 @@ function Tooltip( props: TooltipProps ) {
 		if ( 'development' === process.env.NODE_ENV ) {
 			// eslint-disable-next-line no-console
 			console.error(
-				'Tooltip should be called with only a single child element.'
+				'wp-components.Tooltip should be called with only a single child element.'
 			);
 		}
 	}
@@ -64,24 +87,37 @@ function Tooltip( props: TooltipProps ) {
 	}
 	computedPlacement = computedPlacement || 'bottom';
 
-	const tooltipStore = Ariakit.useTooltipStore( {
+	// Removing the `Ariakit` namespace from the hook name allows ESLint to
+	// properly identify the hook, and apply the correct linting rules.
+	const useAriakitTooltipStore = Ariakit.useTooltipStore;
+	const tooltipStore = useAriakitTooltipStore( {
 		placement: computedPlacement,
 		showTimeout: delay,
 	} );
 
+	if ( isNestedInTooltip ) {
+		return isOnlyChild
+			? cloneElement( children, {
+					...restProps,
+					ref,
+			  } )
+			: children;
+	}
+
 	return (
-		<>
+		<ContextSystemProvider value={ CONTEXT_VALUE }>
 			<Ariakit.TooltipAnchor
 				onClick={ hideOnClick ? tooltipStore.hide : undefined }
 				store={ tooltipStore }
 				render={ isOnlyChild ? children : undefined }
+				ref={ ref }
 			>
 				{ isOnlyChild ? undefined : children }
 			</Ariakit.TooltipAnchor>
 			{ isOnlyChild && ( text || shortcut ) && (
 				<Ariakit.Tooltip
+					{ ...restProps }
 					unmountOnHide
-					className="components-tooltip"
 					gutter={ 4 }
 					id={ describedById }
 					overflowPadding={ 0.5 }
@@ -98,8 +134,10 @@ function Tooltip( props: TooltipProps ) {
 					) }
 				</Ariakit.Tooltip>
 			) }
-		</>
+		</ContextSystemProvider>
 	);
 }
 
+export const Tooltip = contextConnect( UnconnectedTooltip, 'Tooltip' );
+
 export default Tooltip;
diff --git a/packages/components/src/tooltip/stories/index.story.tsx b/packages/components/src/tooltip/stories/index.story.tsx
index 760f3dcc23e2f..b006bc03aced9 100644
--- a/packages/components/src/tooltip/stories/index.story.tsx
+++ b/packages/components/src/tooltip/stories/index.story.tsx
@@ -30,7 +30,7 @@ const meta: Meta< typeof Tooltip > = {
 				'bottom right',
 			],
 		},
-		shortcut: { control: { type: 'text' } },
+		shortcut: { control: { type: 'object' } },
 	},
 	parameters: {
 		controls: { expanded: true },
@@ -57,3 +57,20 @@ KeyboardShortcut.args = {
 		ariaLabel: shortcutAriaLabel.primaryShift( ',' ),
 	},
 };
+
+/**
+ * In case one or more `Tooltip` components are rendered inside another
+ * `Tooltip` component, only the tooltip associated to the outermost `Tooltip`
+ * component will be rendered in the browser and shown to the user
+ * appropriately. The rest of the nested `Tooltip` components will simply no-op
+ * and pass-through their anchor.
+ */
+export const Nested: StoryFn< typeof Tooltip > = Template.bind( {} );
+Nested.args = {
+	children: (
+		<Tooltip text="Nested tooltip text (that will never show)">
+			<Button variant="primary">Tooltip Anchor</Button>
+		</Tooltip>
+	),
+	text: 'Outer tooltip text',
+};
diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index cbe144cfa53d4..ed6f7b5f7b4a1 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -436,4 +436,50 @@ describe( 'Tooltip', () => {
 			await waitExpectTooltipToHide();
 		} );
 	} );
+
+	describe( 'nested', () => {
+		it( 'should render the outer tooltip and ignore nested tooltips', async () => {
+			render(
+				<Tooltip text="Outer tooltip">
+					<Tooltip text="Middle tooltip">
+						<Tooltip text="Inner tooltip">
+							<Button>Tooltip anchor</Button>
+						</Tooltip>
+					</Tooltip>
+				</Tooltip>
+			);
+
+			// Hover the anchor. Only the outer tooltip should show.
+			await hover(
+				screen.getByRole( 'button', {
+					name: 'Tooltip anchor',
+				} )
+			);
+
+			await waitFor( () =>
+				expect(
+					screen.getByRole( 'tooltip', { name: 'Outer tooltip' } )
+				).toBeVisible()
+			);
+			expect(
+				screen.queryByRole( 'tooltip', { name: 'Middle tooltip' } )
+			).not.toBeInTheDocument();
+			expect(
+				screen.queryByRole( 'tooltip', { name: 'Inner tooltip' } )
+			).not.toBeInTheDocument();
+			expect(
+				screen.getByRole( 'button', {
+					description: 'Outer tooltip',
+				} )
+			).toBeVisible();
+
+			// Hover outside of the anchor, tooltip should hide
+			await hoverOutside();
+			await waitFor( () =>
+				expect(
+					screen.queryByRole( 'tooltip', { name: 'Outer tooltip' } )
+				).not.toBeInTheDocument()
+			);
+		} );
+	} );
 } );
diff --git a/packages/components/src/tooltip/types.ts b/packages/components/src/tooltip/types.ts
index 8708ae7005f5b..3d28a1a0e96c6 100644
--- a/packages/components/src/tooltip/types.ts
+++ b/packages/components/src/tooltip/types.ts
@@ -59,3 +59,7 @@ export type TooltipProps = {
 	 */
 	text?: string;
 };
+
+export type TooltipInternalContext = {
+	isNestedInTooltip?: boolean;
+};

From c527d4d72949112f02ba3b9c106b538a4c20061e Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 10 Jan 2024 15:54:18 +0000
Subject: [PATCH 047/296] Update Changelog for 17.5.0-rc.1

---
 changelog.txt | 256 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 256 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index ba43ddc731d01..9268dc7edd1fb 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,261 @@
 == Changelog ==
 
+= 17.5.0-rc.1 =
+
+
+
+## Changelog
+
+### Enhancements
+
+#### Editor Unification
+- Editor: Add the show most used blocks preference to the site editor. ([57637](https://github.com/WordPress/gutenberg/pull/57637))
+- Editor: Migrate and unify the panel preferences. ([57529](https://github.com/WordPress/gutenberg/pull/57529))
+- Editor: Unify context text cursor preference. ([57479](https://github.com/WordPress/gutenberg/pull/57479))
+- Editor: Unify list view open preference. ([57504](https://github.com/WordPress/gutenberg/pull/57504))
+- Editor: Unify right click override preference. ([57468](https://github.com/WordPress/gutenberg/pull/57468))
+- Editor: Unify show icon labels preference. ([57480](https://github.com/WordPress/gutenberg/pull/57480))
+- Editor: Unify spotlight mode preference. ([57533](https://github.com/WordPress/gutenberg/pull/57533))
+- Editor: Unify the distraction free preference. ([57590](https://github.com/WordPress/gutenberg/pull/57590))
+- Editor: Unify the show block breadcrumbs preference. ([57506](https://github.com/WordPress/gutenberg/pull/57506))
+- Editor: Unify the top toolbar preference. ([57531](https://github.com/WordPress/gutenberg/pull/57531))
+
+#### Components
+- Components: Replace `TabPanel` with `Tabs` in inline color picker. ([57292](https://github.com/WordPress/gutenberg/pull/57292)
+- Add `compact` size variant to InputControl-based components. ([57398](https://github.com/WordPress/gutenberg/pull/57398))
+- BaseControl: Connect to context system. ([57408](https://github.com/WordPress/gutenberg/pull/57408))
+- Replace `TabPanel` with `Tabs` in the Style Book. ([57287](https://github.com/WordPress/gutenberg/pull/57287))
+- Tooltip: Improve tests. ([57345](https://github.com/WordPress/gutenberg/pull/57345))
+- Update @ariakit/react to v0.3.12 and @ariakit/test to v0.3.7. ([57547](https://github.com/WordPress/gutenberg/pull/57547))
+
+#### Font Library
+- Font Library: Remove "has_font_mime_type" function. ([57364](https://github.com/WordPress/gutenberg/pull/57364))
+- Font Library: Update font uninstall modal text. ([57368](https://github.com/WordPress/gutenberg/pull/57368))
+- Font Library: Add progress-bar while uploading font assets. ([57463](https://github.com/WordPress/gutenberg/pull/57463))
+- Font Library: Singularize install font families endpoint. ([57569](https://github.com/WordPress/gutenberg/pull/57569))
+- Font Library: Unregister font collection. ([54701](https://github.com/WordPress/gutenberg/pull/54701))
+
+#### Site Editor
+- Add Template Modal: Update scroll related layout. ([57617](https://github.com/WordPress/gutenberg/pull/57617))
+- Components: Replace `TabPanel` with `Tabs` in the Font Library `Modal`. ([57181](https://github.com/WordPress/gutenberg/pull/57181))
+
+#### Interactivity API
+- Implement `wp_initial_state()`. ([57556](https://github.com/WordPress/gutenberg/pull/57556))
+- Server directive processing: Stop processing non-interactive blocks. ([56302](https://github.com/WordPress/gutenberg/pull/56302))
+- Interactive template: Use viewModule. ([57712](https://github.com/WordPress/gutenberg/pull/57712))
+- Navigation Block: Use dom.focus for focus control. ([57362](https://github.com/WordPress/gutenberg/pull/57362))
+
+
+#### Site Editor
+- Site editor: Add padding to entity save panel header. ([57471](https://github.com/WordPress/gutenberg/pull/57471))
+- Site editor: Add margin to entity save panel header via a classname. ([57473](https://github.com/WordPress/gutenberg/pull/57473))
+
+
+#### Block Library
+- Post Featured Image: Add a useFirstImageFromPost attribute. ([56573](https://github.com/WordPress/gutenberg/pull/56573))
+- Gallery Block: Add random order setting. ([57477](https://github.com/WordPress/gutenberg/pull/57477))
+- Image Block: Change upload icon label. ([57704](https://github.com/WordPress/gutenberg/pull/57704))
+
+
+### Bug Fixes
+
+- Avoid using a memoized selector without dependencies. ([57257](https://github.com/WordPress/gutenberg/pull/57257))
+- Core Data: Pass the 'options' argument to data action shortcuts. ([57383](https://github.com/WordPress/gutenberg/pull/57383))
+- Preferences: Update accessibility scope to "core". ([57563](https://github.com/WordPress/gutenberg/pull/57563))
+
+#### Block Editor
+- Fix Link UI displaying out of sync results. ([57522](https://github.com/WordPress/gutenberg/pull/57522))
+- Give iframe fallback background color. ([57330](https://github.com/WordPress/gutenberg/pull/57330))
+- Rich text: Add HTML string methods to RichTextData. ([57322](https://github.com/WordPress/gutenberg/pull/57322))
+
+#### Block Library
+- Footnotes: Fix wrong link when adding more than 9 footnotes. ([57599](https://github.com/WordPress/gutenberg/pull/57599))
+- Table: Remove unnecessary margin override in editor styles. ([57699](https://github.com/WordPress/gutenberg/pull/57699))
+- Template Part block: Fix template part path arg missing from actions. ([56790](https://github.com/WordPress/gutenberg/pull/56790))
+
+#### Components
+- DuotonePicker: Fix top margin when no duotone options. ([57489](https://github.com/WordPress/gutenberg/pull/57489))
+- NavigatorProvider: Exclude size value from contain CSS rule. ([57498](https://github.com/WordPress/gutenberg/pull/57498))
+- Snackbar: Fix icon positioning. ([57377](https://github.com/WordPress/gutenberg/pull/57377))
+
+#### Patterns
+- Pattern Overrides: Add `template-lock: All` to pattern inner blocks to prevent deletion/insertion. ([57661](https://github.com/WordPress/gutenberg/pull/57661))
+- Refactor the findOrCreate term method. ([57655](https://github.com/WordPress/gutenberg/pull/57655))
+- Edit source pattern in focus mode in post and site editors. ([57036](https://github.com/WordPress/gutenberg/pull/57036))
+
+
+#### Site Editor
+- Make sure comamnd palette toggle does not disappear while being clicked. ([57420](https://github.com/WordPress/gutenberg/pull/57420))
+- Reinstate iframe CSS for editor canvas container. ([57503](https://github.com/WordPress/gutenberg/pull/57503))
+
+#### Global Styles
+- Use `is-layout` pattern on layout generated classname. ([57564](https://github.com/WordPress/gutenberg/pull/57564))
+- Global styles revisions: Add individual headings translations, update tests. ([57472](https://github.com/WordPress/gutenberg/pull/57472))
+- Global style revisions: Move change summary code and tests to block editor package. ([57411](https://github.com/WordPress/gutenberg/pull/57411))
+- Reduce specificity of block style variation selectors. ([57659](https://github.com/WordPress/gutenberg/pull/57659))
+- Background image block support: Add tests for size and repeat output. ([57474](https://github.com/WordPress/gutenberg/pull/57474))
+
+
+#### Post Editor
+- Fix Template preview menu item accessibility. ([57456](https://github.com/WordPress/gutenberg/pull/57456))
+- Fullscreen mode description: Use full text instead of abbreviation. ([57518](https://github.com/WordPress/gutenberg/pull/57518))
+- Improve pre-publish checks naming consistency. ([57019](https://github.com/WordPress/gutenberg/pull/57019))
+- Make the Replace featured image button perceivable by assistive technologies. ([57453](https://github.com/WordPress/gutenberg/pull/57453))
+
+#### Components
+- Label the HeightControl. ([57683](https://github.com/WordPress/gutenberg/pull/57683))
+- NumberControl: Make increment and decrement buttons keyboard accessible. ([57402](https://github.com/WordPress/gutenberg/pull/57402))
+
+#### Block Tools
+- Update the position of the patterns tab in the inserter menu. ([55688](https://github.com/WordPress/gutenberg/pull/55688))
+- Use full text instead of abbreviation for min height setting. ([57680](https://github.com/WordPress/gutenberg/pull/57680))
+- ResizableEditor: Fix tab order for resize handles. ([57475](https://github.com/WordPress/gutenberg/pull/57475))
+- Keep Lock button it in the toolbar until unmounted. ([57229](https://github.com/WordPress/gutenberg/pull/57229))
+- Custom field connections: Better description on Experiments page. ([57501](https://github.com/WordPress/gutenberg/pull/57501))
+
+### Performance
+
+#### Block Library
+- File: Remove 'block-editor' store subscription. ([57511](https://github.com/WordPress/gutenberg/pull/57511))
+- Remove store subscriptions from Audio and Video blocks. ([57449](https://github.com/WordPress/gutenberg/pull/57449))
+- Site Logo: Remove unnecessary  'block-editor' store subscription. ([57513](https://github.com/WordPress/gutenberg/pull/57513))
+- Send numerical post id when uploading image. ([57388](https://github.com/WordPress/gutenberg/pull/57388))
+- PostFeaturedImage: Remove unnecessary 'block-editor' store subscription. ([57554](https://github.com/WordPress/gutenberg/pull/57554))
+
+### Experiments
+
+#### Data Views
+- DataViews: Use DropdownMenuRadioItem component when possible. ([57505](https://github.com/WordPress/gutenberg/pull/57505))
+- Align icon size + placement in Patterns data view. ([57548](https://github.com/WordPress/gutenberg/pull/57548))
+- DataViews: Add `duplicate pattern` action in patterns page. ([57592](https://github.com/WordPress/gutenberg/pull/57592))
+- DataViews: Add duplicate template pattern action. ([57638](https://github.com/WordPress/gutenberg/pull/57638))
+- DataViews: Add footer to Pages sidebar. ([57690](https://github.com/WordPress/gutenberg/pull/57690))
+- DataViews: Add new page button in `Pages`. ([57685](https://github.com/WordPress/gutenberg/pull/57685))
+- DataViews: Add sync filter in patterns page. ([57532](https://github.com/WordPress/gutenberg/pull/57532))
+- DataViews: Consolidate CSS selectors naming schema. ([57651](https://github.com/WordPress/gutenberg/pull/57651))
+- DataViews: Fallback to `(no title)` is there's no rendered title. ([57434](https://github.com/WordPress/gutenberg/pull/57434))
+- DataViews: Hide actions menu upon selecting a layout. ([57418](https://github.com/WordPress/gutenberg/pull/57418))
+- DataViews: Make `fields` dependant on `view.type`. ([57450](https://github.com/WordPress/gutenberg/pull/57450))
+- DataViews: Memoize `onSetSelection`. ([57458](https://github.com/WordPress/gutenberg/pull/57458))
+- DataViews: Prevent unnecessary re-renders of Pagination. ([57454](https://github.com/WordPress/gutenberg/pull/57454))
+- DataViews: Prevent unnecessary re-renders. ([57452](https://github.com/WordPress/gutenberg/pull/57452))
+- DataViews: Update names for `DropdownMenuRadioItemCustom`. ([57416](https://github.com/WordPress/gutenberg/pull/57416))
+- DataViews: Use i18n._x to clarify term "Duplicate". ([57686](https://github.com/WordPress/gutenberg/pull/57686))
+- DataViews: Use in patterns page. ([57333](https://github.com/WordPress/gutenberg/pull/57333))
+- Dataview: Change the stacking order of table header. ([57565](https://github.com/WordPress/gutenberg/pull/57565))
+- Dataviews: Add some client side data handling utils. ([57488](https://github.com/WordPress/gutenberg/pull/57488))
+- Make title display in grid views consistent. ([57553](https://github.com/WordPress/gutenberg/pull/57553))
+- Update Table layout design details. ([57644](https://github.com/WordPress/gutenberg/pull/57644))
+- Update pagination spacing in List layout. ([57670](https://github.com/WordPress/gutenberg/pull/57670))
+- Update table header gap. ([57671](https://github.com/WordPress/gutenberg/pull/57671))
+- [Dataviews] Table layout: Ensure focus is not lost on interaction. ([57340](https://github.com/WordPress/gutenberg/pull/57340))
+
+#### Patterns
+- [Pattern Overrides] Fix duplication of inner blocks. ([57538](https://github.com/WordPress/gutenberg/pull/57538))
+- [Pattern overrides] Allow multiple attributes overrides. ([57573](https://github.com/WordPress/gutenberg/pull/57573))
+
+
+### Documentation
+
+- Add links to additional local dev tools in Block Developement Environment readme. ([57682](https://github.com/WordPress/gutenberg/pull/57682))
+- Add new section to the Quick Start Guide about wp-env. ([57559](https://github.com/WordPress/gutenberg/pull/57559))
+- Block JSON schema: Add renaming key to supports definition. ([57373](https://github.com/WordPress/gutenberg/pull/57373))
+- Break out the Curating the Editor Experience doc into its own How-to Guides section. ([57289](https://github.com/WordPress/gutenberg/pull/57289))
+- Change the slug for the theme.json doc to avoid conflicts. ([57410](https://github.com/WordPress/gutenberg/pull/57410))
+- Docs/tutorial: Fix opposite condition for content generation in render.php. ([57445](https://github.com/WordPress/gutenberg/pull/57445))
+- Docs: Fundamentals of Block Development - Static or Dynamic rendering of a block. ([57250](https://github.com/WordPress/gutenberg/pull/57250))
+- Docs: Update sample code to fix React warning error on Tutorial page. ([57412](https://github.com/WordPress/gutenberg/pull/57412))
+- Fix formatting issue due to incorrect link parsing in the Quick Start Guide. ([57693](https://github.com/WordPress/gutenberg/pull/57693))
+- Fix incorrect heading level in Editor curation documentation. ([57409](https://github.com/WordPress/gutenberg/pull/57409))
+- Fix two typos in tutorial.md. ([57627](https://github.com/WordPress/gutenberg/pull/57627))
+- Fix: Create block getting started links. ([57551](https://github.com/WordPress/gutenberg/pull/57551))
+- Improve the static vs dynamic rendering comment in the block tutorial. ([57284](https://github.com/WordPress/gutenberg/pull/57284))
+- Update copyright year to 2024 in `license.md`. ([57481](https://github.com/WordPress/gutenberg/pull/57481))
+- Update the "Build your first block" tutorial based on user feedback. ([57403](https://github.com/WordPress/gutenberg/pull/57403))
+- Update: Material design icons link. ([57550](https://github.com/WordPress/gutenberg/pull/57550))
+
+
+### Code Quality
+- Editor: Unify the DocumentTools component. ([57214](https://github.com/WordPress/gutenberg/pull/57214))
+- Make getLastFocus and setLastFocus private. ([57612](https://github.com/WordPress/gutenberg/pull/57612))
+- Remove deprecated `behaviors` syntax. ([57165](https://github.com/WordPress/gutenberg/pull/57165))
+- Avoid extra `useMarkPersistent` dispatch calls. ([57435](https://github.com/WordPress/gutenberg/pull/57435))
+- Clean up code editor CSS. ([57519](https://github.com/WordPress/gutenberg/pull/57519))
+- Combine selectors in 'useTransformCommands'. ([57424](https://github.com/WordPress/gutenberg/pull/57424))
+
+#### Block Library
+- Background image: Add has-background classname when background image is applied. ([57495](https://github.com/WordPress/gutenberg/pull/57495))
+- File: Remove unnecessary synchronization effect. ([57585](https://github.com/WordPress/gutenberg/pull/57585))
+- Navigation: Refactor mobile overlay breakpoints to JS. ([57520](https://github.com/WordPress/gutenberg/pull/57520))
+- Search Block: Remove unused `buttonBehavior` attribute. ([53467](https://github.com/WordPress/gutenberg/pull/53467))
+
+#### Patterns
+- Improve inserter pattern constants. ([57570](https://github.com/WordPress/gutenberg/pull/57570))
+- Remove duplicate setting for `getPostLinkProps` and prefer stable naming. ([57535](https://github.com/WordPress/gutenberg/pull/57535))
+- Rename `patternBlock` to `patternPost`. ([57568](https://github.com/WordPress/gutenberg/pull/57568))
+
+#### Post Editor
+- Editor: Use hooks instead of HoCs in 'PostVisibilityCheck'. ([57705](https://github.com/WordPress/gutenberg/pull/57705))
+- Quality: Avoid React warning when changing rendering mode. ([57413](https://github.com/WordPress/gutenberg/pull/57413))
+
+#### Block Editor
+- Editor: Unify the inserter sidebar. ([57466](https://github.com/WordPress/gutenberg/pull/57466))
+- Remove unused parameters from useOnBlockDrop. ([57527](https://github.com/WordPress/gutenberg/pull/57527))
+
+#### List View
+- Editor: Unify the list view sidebar between the post and site editors. ([57467](https://github.com/WordPress/gutenberg/pull/57467))
+- Add drag cursor to draggable list items. ([57493](https://github.com/WordPress/gutenberg/pull/57493))
+
+### Tools
+
+- Dependency Extraction Webpack Plugin: Use `import` for module externals. ([57577](https://github.com/WordPress/gutenberg/pull/57577))
+- DependencyExtractionWebpackPlugin: Add true shorthand for requestToExternalModule. ([57593](https://github.com/WordPress/gutenberg/pull/57593))
+- DependencyExtractionWebpackPlugin: Use module for @wordpress/interactivity. ([57602](https://github.com/WordPress/gutenberg/pull/57602))
+- Fix webpack not setting environment.module true. ([57714](https://github.com/WordPress/gutenberg/pull/57714))
+- Modules: Load the import map polyfill when needed. ([57256](https://github.com/WordPress/gutenberg/pull/57256))
+- Blocks: Add handling for block.json viewModule. ([57437](https://github.com/WordPress/gutenberg/pull/57437))
+
+#### Testing
+- Allowed Patterns end-to-end test - move tests that run with a subset of allowed blocks into a group. ([57496](https://github.com/WordPress/gutenberg/pull/57496))
+- Clean up end-to-end tests package. ([57575](https://github.com/WordPress/gutenberg/pull/57575))
+- Fix flaky 'Post publish button' end-to-end test. ([57407](https://github.com/WordPress/gutenberg/pull/57407))
+- Migrate 'allowed patterns' end-to-end tests to Playwright. ([57399](https://github.com/WordPress/gutenberg/pull/57399))
+- Migrate 'block editor keyboard shortcuts' end-to-end tests to Playwright. ([57422](https://github.com/WordPress/gutenberg/pull/57422))
+- Migrate 'core settings' end-to-end tests to Playwright. ([57581](https://github.com/WordPress/gutenberg/pull/57581))
+- Migrate 'datepicker' end-to-end tests to Playwright. ([57545](https://github.com/WordPress/gutenberg/pull/57545))
+- Migrate 'dropdown menu' end-to-end tests to Playwright. ([57663](https://github.com/WordPress/gutenberg/pull/57663))
+- Migrate 'editor modes' end-to-end tests to Playwright. ([57574](https://github.com/WordPress/gutenberg/pull/57574))
+- Migrate 'invalid blocks' end-to-end tests to Playwright. ([57508](https://github.com/WordPress/gutenberg/pull/57508))
+- Migrate 'nux' end-to-end tests to Playwright. ([57542](https://github.com/WordPress/gutenberg/pull/57542))
+- Migrate 'preferences' end-to-end tests to Playwright. ([57446](https://github.com/WordPress/gutenberg/pull/57446))
+- Migrate 'publishing' end-to-end tests to Playwright. ([57521](https://github.com/WordPress/gutenberg/pull/57521))
+- Migrate 'scheduling' end-to-end tests to Playwright. ([57539](https://github.com/WordPress/gutenberg/pull/57539))
+- Migrate 'sidebar' end-to-end tests to Playwright. ([57448](https://github.com/WordPress/gutenberg/pull/57448))
+- Migrate 'taxonomies' end-to-end tests to Playwright. ([57662](https://github.com/WordPress/gutenberg/pull/57662))
+- Migrate `editing-widgets` to Playwright. ([57483](https://github.com/WordPress/gutenberg/pull/57483))
+- Migrate remaining 'publish panel' end-to-end tests to Playwright. ([57432](https://github.com/WordPress/gutenberg/pull/57432))
+- Update 'missing block' end-to-end tests to use the 'setContent' helper. ([57509](https://github.com/WordPress/gutenberg/pull/57509))
+
+#### Build Tooling
+- Group GitHub Action Dependabot updates. ([57591](https://github.com/WordPress/gutenberg/pull/57591))
+- WP Scripts: Build block.json viewModule. ([57461](https://github.com/WordPress/gutenberg/pull/57461))
+- Dependency Extraction Webpack Plugin: Add Module support. ([57199](https://github.com/WordPress/gutenberg/pull/57199))
+
+## First time contributors
+
+The following PRs were merged by first time contributors:
+
+- @HrithikDalal: Font Library: Update font uninstall modal text. ([57368](https://github.com/WordPress/gutenberg/pull/57368))
+- @muhme: Fix two typos in tutorial.md. ([57627](https://github.com/WordPress/gutenberg/pull/57627))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@afercia @andrewhayward @andrewserong @atachibana @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @DAreRodz @dcalhoun @derekblank @desrosj @ellatrix @fai-sal @fluiddot @geriux @getdave @glendaviesnz @gziolo @hbhalodia @HrithikDalal @jameskoster @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mirka @muhme @ndiego @ntsekouras @oandregal @ockham @ramonjd @scruffian @sirreal @Soean @t-hamano @talldan @tellthemachines @youknowriad
+
+
 = 17.3.2 =
 
 ## Changelog

From d8ef7d615049afa5c6903530c8099ca7b69073c7 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Wed, 10 Jan 2024 16:05:09 -0300
Subject: [PATCH 048/296] Font Library: add wp_get_font_dir() function.
 (#57730)

* adding wp_font_dir() function

* use wp_font_dir() instead of Font Library method

* update php unit teests

* rename function
---
 .../font-library/class-wp-font-family.php     |  9 ++-
 .../font-library/class-wp-font-library.php    | 67 -------------------
 ...class-wp-rest-font-families-controller.php |  6 +-
 .../fonts/font-library/font-library.php       | 49 ++++++++++++++
 .../{wpFontLibrary => }/fontsDir.php          | 22 +++---
 .../fonts/font-library/wpFontFamily/base.php  |  2 +-
 .../wpRestFontFamiliesController/base.php     |  2 +-
 7 files changed, 69 insertions(+), 88 deletions(-)
 rename phpunit/tests/fonts/font-library/{wpFontLibrary => }/fontsDir.php (67%)

diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
index e47cf0afdac1d..f64aebc0c8efa 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family.php
@@ -135,7 +135,7 @@ public function uninstall() {
 	 */
 	private static function delete_asset( $src ) {
 		$filename  = basename( $src );
-		$file_path = path_join( WP_Font_Library::get_fonts_dir(), $filename );
+		$file_path = path_join( wp_get_font_dir()['path'], $filename );
 
 		wp_delete_file( $file_path );
 
@@ -163,7 +163,6 @@ private static function delete_font_face_assets( $font_face ) {
 		return true;
 	}
 
-
 	/**
 	 * Gets the overrides for the 'wp_handle_upload' function.
 	 *
@@ -394,7 +393,7 @@ private function download_or_move_font_faces( $files ) {
 
 			// If the font face requires the use of the filesystem, create the fonts dir if it doesn't exist.
 			if ( ! empty( $font_face['downloadFromUrl'] ) && ! empty( $font_face['uploadedFile'] ) ) {
-				wp_mkdir_p( WP_Font_Library::get_fonts_dir() );
+				wp_mkdir_p( wp_get_font_dir()['path'] );
 			}
 
 			// If installing google fonts, download the font face assets.
@@ -599,9 +598,9 @@ private function create_or_update_font_post() {
 	 */
 	public function install( $files = null ) {
 		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-		add_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
+		add_filter( 'upload_dir', 'wp_get_font_dir' );
 		$were_assets_written = $this->download_or_move_font_faces( $files );
-		remove_filter( 'upload_dir', array( 'WP_Font_Library', 'fonts_dir' ) );
+		remove_filter( 'upload_dir', 'wp_get_font_dir' );
 		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
 
 		if ( ! $were_assets_written ) {
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index 99de81e0bd74a..01ee702673e57 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -140,74 +140,7 @@ public static function get_font_collection( $id ) {
 		return new WP_Error( 'font_collection_not_found', 'Font collection not found.' );
 	}
 
-	/**
-	 * Returns an array containing the current fonts upload directory's path and URL.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $defaults {
-	 *     Array of information about the upload directory.
-	 *
-	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
-	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
-	 *     @type string       $subdir  Subdirectory
-	 *     @type string       $basedir Path without subdir.
-	 *     @type string       $baseurl URL path without subdir.
-	 *     @type string|false $error   False or error message.
-	 * }
-	 *
-	 * @return array $defaults {
-	 *     Array of information about the upload directory.
-	 *
-	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
-	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
-	 *     @type string       $subdir  Subdirectory
-	 *     @type string       $basedir Path without subdir.
-	 *     @type string       $baseurl URL path without subdir.
-	 *     @type string|false $error   False or error message.
-	 * }
-	 */
-	public static function fonts_dir( $defaults = array() ) {
-		$site_path = self::get_multi_site_dir();
-
-		// Sets the defaults.
-		$defaults['path']    = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
-		$defaults['url']     = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
-		$defaults['subdir']  = '';
-		$defaults['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
-		$defaults['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
-		$defaults['error']   = false;
-
-		// Filters the fonts directory data.
-		return apply_filters( 'fonts_dir', $defaults );
-	}
-
-	/**
-	 * Gets the Site dir for fonts, using the blog ID if multi-site, empty otherwise.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return string Site dir path.
-	 */
-	private static function get_multi_site_dir() {
-		$font_sub_dir = '';
-		if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
-			$font_sub_dir = '/sites/' . get_current_blog_id();
-		}
-		return $font_sub_dir;
-	}
 
-	/**
-	 * Gets the upload directory for fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return string Path of the upload directory for fonts.
-	 */
-	public static function get_fonts_dir() {
-		$fonts_dir_settings = self::fonts_dir();
-		return $fonts_dir_settings['path'];
-	}
 
 	/**
 	 * Sets the allowed mime types for fonts.
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
index 0147d80b7bde9..ede8762c88c6d 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
@@ -276,7 +276,7 @@ public function update_font_library_permissions_check() {
 	 * @return bool Whether the font directory exists.
 	 */
 	private function has_upload_directory() {
-		$upload_dir = WP_Font_Library::get_fonts_dir();
+		$upload_dir = wp_get_font_dir()['path'];
 		return is_dir( $upload_dir );
 	}
 
@@ -290,7 +290,7 @@ private function has_upload_directory() {
 	private function has_write_permission() {
 		// The update endpoints requires write access to the temp and the fonts directories.
 		$temp_dir   = get_temp_dir();
-		$upload_dir = WP_Font_Library::get_fonts_dir();
+		$upload_dir = wp_get_font_dir()['path'];
 		if ( ! is_writable( $temp_dir ) || ! wp_is_writable( $upload_dir ) ) {
 			return false;
 		}
@@ -353,7 +353,7 @@ public function install_fonts( $request ) {
 		}
 
 		if ( $this->needs_write_permission( $font_family_settings ) ) {
-			$upload_dir = WP_Font_Library::get_fonts_dir();
+			$upload_dir = wp_get_font_dir()['path'];
 			if ( ! $this->has_upload_directory() ) {
 				if ( ! wp_mkdir_p( $upload_dir ) ) {
 					$errors[] = new WP_Error(
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index 711a6bb40c282..4a2f1be69ef71 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -82,3 +82,52 @@ function wp_unregister_font_collection( $collection_id ) {
 );
 
 wp_register_font_collection( $default_font_collection );
+
+// @core-merge: This code should probably go into Core's src/wp-includes/functions.php.
+if ( ! function_exists( 'wp_get_font_dir' ) ) {
+	/**
+	 * Returns an array containing the current fonts upload directory's path and URL.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
+	 *
+	 * @return array $defaults {
+	 *     Array of information about the upload directory.
+	 *
+	 *     @type string       $path    Base directory and subdirectory or full path to the fonts upload directory.
+	 *     @type string       $url     Base URL and subdirectory or absolute URL to the fonts upload directory.
+	 *     @type string       $subdir  Subdirectory
+	 *     @type string       $basedir Path without subdir.
+	 *     @type string       $baseurl URL path without subdir.
+	 *     @type string|false $error   False or error message.
+	 * }
+	 */
+	function wp_get_font_dir( $defaults = array() ) {
+		// Multi site path
+		$site_path = '';
+		if ( is_multisite() && ! ( is_main_network() && is_main_site() ) ) {
+			$site_path = '/sites/' . get_current_blog_id();
+		}
+
+		// Sets the defaults.
+		$defaults['path']    = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['url']     = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['subdir']  = '';
+		$defaults['basedir'] = path_join( WP_CONTENT_DIR, 'fonts' ) . $site_path;
+		$defaults['baseurl'] = untrailingslashit( content_url( 'fonts' ) ) . $site_path;
+		$defaults['error']   = false;
+
+		// Filters the fonts directory data.
+		return apply_filters( 'font_dir', $defaults );
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php b/phpunit/tests/fonts/font-library/fontsDir.php
similarity index 67%
rename from phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php
rename to phpunit/tests/fonts/font-library/fontsDir.php
index 9926bb7409088..5c13f1d120f9a 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/fontsDir.php
+++ b/phpunit/tests/fonts/font-library/fontsDir.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test WP_Font_Library::fonts_dir().
+ * Test wp_get_font_dir().
  *
  * @package WordPress
  * @subpackage Font Library
@@ -8,9 +8,9 @@
  * @group fonts
  * @group font-library
  *
- * @covers WP_Font_Library::fonts_dir
+ * @covers wp_get_font_dir
  */
-class Tests_Fonts_WpFontLibrary_FontsDir extends WP_Font_Library_UnitTestCase {
+class Tests_Fonts_WpFontDir extends WP_UnitTestCase {
 	private $dir_defaults;
 
 	public function __construct() {
@@ -26,8 +26,8 @@ public function __construct() {
 	}
 
 	public function test_fonts_dir() {
-		$fonts_dir = WP_Font_Library::fonts_dir();
-		$this->assertEquals( $fonts_dir, $this->dir_defaults );
+		$font_dir = wp_get_font_dir();
+		$this->assertEquals( $font_dir, $this->dir_defaults );
 	}
 
 	public function test_fonts_dir_with_filter() {
@@ -43,10 +43,10 @@ function set_new_values( $defaults ) {
 		}
 
 		// Add the filter.
-		add_filter( 'fonts_dir', 'set_new_values' );
+		add_filter( 'font_dir', 'set_new_values' );
 
 		// Gets the fonts dir.
-		$fonts_dir = WP_Font_Library::fonts_dir();
+		$font_dir = wp_get_font_dir();
 
 		$expected = array(
 			'path'    => '/custom-path/fonts/my-custom-subdir',
@@ -57,14 +57,14 @@ function set_new_values( $defaults ) {
 			'error'   => false,
 		);
 
-		$this->assertEquals( $fonts_dir, $expected, 'The fonts_dir() method should return the expected values.' );
+		$this->assertEquals( $font_dir, $expected, 'The wp_get_font_dir() method should return the expected values.' );
 
 		// Remove the filter.
-		remove_filter( 'fonts_dir', 'set_new_values' );
+		remove_filter( 'font_dir', 'set_new_values' );
 
 		// Gets the fonts dir.
-		$fonts_dir = WP_Font_Library::fonts_dir();
+		$font_dir = wp_get_font_dir();
 
-		$this->assertEquals( $fonts_dir, $this->dir_defaults, 'The fonts_dir() method should return the default values.' );
+		$this->assertEquals( $font_dir, $this->dir_defaults, 'The wp_get_font_dir() method should return the default values.' );
 	}
 }
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/base.php b/phpunit/tests/fonts/font-library/wpFontFamily/base.php
index 3650ac7dab997..3f6ff153fa12f 100644
--- a/phpunit/tests/fonts/font-library/wpFontFamily/base.php
+++ b/phpunit/tests/fonts/font-library/wpFontFamily/base.php
@@ -28,7 +28,7 @@ abstract class WP_Font_Family_UnitTestCase extends WP_UnitTestCase {
 	public static function set_up_before_class() {
 		parent::set_up_before_class();
 
-		static::$fonts_dir = WP_Font_Library::get_fonts_dir();
+		static::$fonts_dir = wp_get_font_dir()['path'];
 		wp_mkdir_p( static::$fonts_dir );
 	}
 
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
index 5ab71a4379851..e2d190cd76af1 100644
--- a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
+++ b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
@@ -18,7 +18,7 @@ abstract class WP_REST_Font_Families_Controller_UnitTestCase extends WP_UnitTest
 	public function set_up() {
 		parent::set_up();
 
-		static::$fonts_dir = WP_Font_Library::get_fonts_dir();
+		static::$fonts_dir = wp_get_font_dir()['path'];
 
 		// Create a user with administrator role.
 		$admin_id = $this->factory->user->create(

From b892bd8be90d2ab26e4a3de9ae1fdbf7a3ec8542 Mon Sep 17 00:00:00 2001
From: Jerry Jones <jones.jeremydavid@gmail.com>
Date: Wed, 10 Jan 2024 13:50:09 -0600
Subject: [PATCH 049/296] Display a disabled lock button if user cannot control
 lock state (#57274)

---
 .../src/components/block-lock/toolbar.js             | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/block-lock/toolbar.js b/packages/block-editor/src/components/block-lock/toolbar.js
index ccf04c5e5262d..69f0825ed4be3 100644
--- a/packages/block-editor/src/components/block-lock/toolbar.js
+++ b/packages/block-editor/src/components/block-lock/toolbar.js
@@ -33,16 +33,24 @@ export default function BlockLockToolbar( { clientId } ) {
 		}
 	}, [ isLocked ] );
 
-	if ( ! canLock || ( ! isLocked && ! hasLockButtonShown.current ) ) {
+	if ( ! isLocked && ! hasLockButtonShown.current ) {
 		return null;
 	}
 
+	let label = isLocked ? __( 'Unlock' ) : __( 'Lock' );
+
+	if ( ! canLock && isLocked ) {
+		label = __( 'Locked' );
+	}
+
 	return (
 		<>
 			<ToolbarGroup className="block-editor-block-lock-toolbar">
 				<ToolbarButton
+					accessibleWhenDisabled
+					disabled={ ! canLock }
 					icon={ isLocked ? lock : unlock }
-					label={ isLocked ? __( 'Unlock' ) : __( 'Lock' ) }
+					label={ label }
 					onClick={ toggleModal }
 					aria-expanded={ isModalOpen }
 					aria-haspopup="dialog"

From 885f4651a198cc299b834949c52e01674cb45f39 Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Wed, 10 Jan 2024 20:28:26 -0500
Subject: [PATCH 050/296] docs: Note the mobile E2E tests `jq` dependency
 (#57741)

---
 packages/react-native-editor/__device-tests__/README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/react-native-editor/__device-tests__/README.md b/packages/react-native-editor/__device-tests__/README.md
index e917a297a491c..719adbbcf9426 100644
--- a/packages/react-native-editor/__device-tests__/README.md
+++ b/packages/react-native-editor/__device-tests__/README.md
@@ -6,6 +6,7 @@ The Mobile Gutenberg (MG) project maintains a suite of automated end-to-end (E2E
 
 1. Complete the [React Native Getting Started](https://reactnative.dev/docs/environment-setup) guide for both iOS and Android, which covers setting up Xcode, Android Studio, the Android SDK.
 1. Open [Xcode settings](https://developer.apple.com/documentation/xcode/installing-additional-simulator-runtimes#Install-and-manage-Simulator-runtimes-in-settings) to install the iOS 16.2 simulator runtime.
+1. Install [`jq`](https://jqlang.github.io/jq/download/) via [Homebrew](https://brew.sh/) or your preferred package manager.
 1. `npm run native test:e2e:setup`
 
 ## Running Tests

From d03285c8f6c75c0d6801186c992bc243ddf874ae Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Wed, 10 Jan 2024 21:01:07 -0500
Subject: [PATCH 051/296] chore: Enable offline media upload features (#57731)

* chore: Enable offline status indicator

* docs: Add change log entry
---
 packages/edit-post/src/components/layout/index.native.js | 5 +----
 packages/react-native-editor/CHANGELOG.md                | 1 +
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/edit-post/src/components/layout/index.native.js b/packages/edit-post/src/components/layout/index.native.js
index 50472f7924930..6821aa754eea7 100644
--- a/packages/edit-post/src/components/layout/index.native.js
+++ b/packages/edit-post/src/components/layout/index.native.js
@@ -152,10 +152,7 @@ class Layout extends Component {
 					onLayout={ this.onRootViewLayout }
 				>
 					<AutosaveMonitor disableIntervalChecks />
-					{
-						// eslint-disable-next-line no-undef
-						__DEV__ && <OfflineStatus />
-					}
+					<OfflineStatus />
 					<View style={ editorStyles }>
 						{ isHtmlView ? this.renderHTML() : this.renderVisual() }
 						{ ! isHtmlView && Platform.OS === 'android' && (
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index a62838b066bee..7a1f6997d2a13 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -12,6 +12,7 @@ For each user feature we should also add a importance categorization label  to i
 ## Unreleased
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
 -   [*] Fix missing custom color indicator for custom gradients [#57605]
+-   [**] Display a notice when a network connection unavailable [#56934]
 
 ## 1.110.0
 -   [*] [internal] Move InserterButton from components package to block-editor package [#56494]

From 19ad158863c86152b7fb26ae575696b031068078 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 11 Jan 2024 11:47:00 +0900
Subject: [PATCH 052/296] Add description to the save panel header when nothing
 is checked (#57716)

* Add description to the save panel header when nothing is checked

* Shortening the description
---
 .../src/components/entities-saved-states/index.js  | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/editor/src/components/entities-saved-states/index.js b/packages/editor/src/components/entities-saved-states/index.js
index b5f3ea5b433e1..8e531ce580101 100644
--- a/packages/editor/src/components/entities-saved-states/index.js
+++ b/packages/editor/src/components/entities-saved-states/index.js
@@ -213,13 +213,13 @@ export function EntitiesSavedStatesExtensible( {
 					{ __( 'Are you ready to save?' ) }
 				</strong>
 				{ additionalPrompt }
-				{ isDirty && (
-					<p>
-						{ __(
-							'The following changes have been made to your site, templates, and content.'
-						) }
-					</p>
-				) }
+				<p>
+					{ isDirty
+						? __(
+								'The following changes have been made to your site, templates, and content.'
+						  )
+						: __( 'Select the items you want to save.' ) }
+				</p>
 			</div>
 
 			{ sortedPartitionedSavables.map( ( list ) => {

From beb10327bc8942d5e0a7572242846d8d49d67aac Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 11 Jan 2024 13:18:21 +0900
Subject: [PATCH 053/296] Gallery Block: Remove duplicate return statement
 (#57746)

---
 packages/block-library/src/gallery/index.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/block-library/src/gallery/index.php b/packages/block-library/src/gallery/index.php
index 97877141ef333..342264de6fce3 100644
--- a/packages/block-library/src/gallery/index.php
+++ b/packages/block-library/src/gallery/index.php
@@ -42,9 +42,6 @@ function block_core_gallery_random_order( $parsed_block ) {
 	if ( 'core/gallery' === $parsed_block['blockName'] && ! empty( $parsed_block['attrs']['randomOrder'] ) ) {
 		shuffle( $parsed_block['innerBlocks'] );
 	}
-
-	return $parsed_block;
-
 	return $parsed_block;
 }
 

From d8676808e85f5e97e1c0bbca20145aaa791e7489 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Thu, 11 Jan 2024 12:47:45 +0200
Subject: [PATCH 054/296] Remove obsolete check from dataviews modal actions
 title (#57753)

---
 packages/dataviews/src/item-actions.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/dataviews/src/item-actions.js b/packages/dataviews/src/item-actions.js
index 974c5c5d0d5c3..d3d2c62f504fd 100644
--- a/packages/dataviews/src/item-actions.js
+++ b/packages/dataviews/src/item-actions.js
@@ -59,10 +59,7 @@ function ActionWithModal( { action, item, ActionTrigger } ) {
 			<ActionTrigger { ...actionTriggerProps } />
 			{ isModalOpen && (
 				<Modal
-					title={
-						( ! hideModalHeader && action.modalHeader ) ||
-						action.label
-					}
+					title={ action.modalHeader || action.label }
 					__experimentalHideHeader={ !! hideModalHeader }
 					onRequestClose={ () => {
 						setIsModalOpen( false );

From 940f0fe52cfd1e3599e507a7d3f83146914e978f Mon Sep 17 00:00:00 2001
From: Alex Lende <alex+github.com@lende.xyz>
Date: Thu, 11 Jan 2024 05:05:15 -0600
Subject: [PATCH 055/296] Add defaultFontSizes option to theme.json (#56661)

* Add defaultFontSizes option for theme.json

* Fix defaultFontSizes causing errors when missing

* Simplify useMergedSettings

* Simplify more

* Remove the memo because it's probably fine

* Try ignoring how overrides are handled in the dropdown

* Minor performance improvement using reverse instead of toReversed

* Link to a new issue with a more complete description

* Refactor hack into its own funtion
---
 .../theme-json-reference/theme-json-living.md |  1 +
 lib/class-wp-theme-json-gutenberg.php         | 29 +++++-----
 lib/theme.json                                |  1 +
 .../src/components/global-styles/hooks.js     |  2 +
 .../global-styles/typography-panel.js         | 58 ++++++++++++++-----
 packages/block-editor/src/hooks/utils.js      | 20 +++++--
 packages/block-editor/src/utils/object.js     | 16 +++++
 schemas/json/theme.json                       |  5 ++
 8 files changed, 101 insertions(+), 31 deletions(-)

diff --git a/docs/reference-guides/theme-json-reference/theme-json-living.md b/docs/reference-guides/theme-json-reference/theme-json-living.md
index 4baa5a6009ded..ee88f779ace1c 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-living.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-living.md
@@ -176,6 +176,7 @@ Settings related to typography.
 
 | Property  | Type   | Default | Props  |
 | ---       | ---    | ---    |---   |
+| defaultFontSizes | boolean | true |  |
 | customFontSize | boolean | true |  |
 | fontStyle | boolean | true |  |
 | fontWeight | boolean | true |  |
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index aa8de83df9597..a063ab34d9069 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -155,7 +155,7 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		array(
 			'path'              => array( 'typography', 'fontSizes' ),
-			'prevent_override'  => false,
+			'prevent_override'  => array( 'typography', 'defaultFontSizes' ),
 			'use_default_names' => true,
 			'value_func'        => 'gutenberg_get_typography_font_size_value',
 			'css_vars'          => '--wp--preset--font-size--$slug',
@@ -411,19 +411,20 @@ class WP_Theme_JSON_Gutenberg {
 			'defaultPresets' => null,
 		),
 		'typography'                    => array(
-			'fluid'          => null,
-			'customFontSize' => null,
-			'dropCap'        => null,
-			'fontFamilies'   => null,
-			'fontSizes'      => null,
-			'fontStyle'      => null,
-			'fontWeight'     => null,
-			'letterSpacing'  => null,
-			'lineHeight'     => null,
-			'textColumns'    => null,
-			'textDecoration' => null,
-			'textTransform'  => null,
-			'writingMode'    => null,
+			'fluid'            => null,
+			'customFontSize'   => null,
+			'defaultFontSizes' => null,
+			'dropCap'          => null,
+			'fontFamilies'     => null,
+			'fontSizes'        => null,
+			'fontStyle'        => null,
+			'fontWeight'       => null,
+			'letterSpacing'    => null,
+			'lineHeight'       => null,
+			'textColumns'      => null,
+			'textDecoration'   => null,
+			'textTransform'    => null,
+			'writingMode'      => null,
 		),
 	);
 
diff --git a/lib/theme.json b/lib/theme.json
index c2ed7fdca39ed..b7bc3cb89e60f 100644
--- a/lib/theme.json
+++ b/lib/theme.json
@@ -236,6 +236,7 @@
 		},
 		"typography": {
 			"customFontSize": true,
+			"defaultFontSizes": true,
 			"dropCap": true,
 			"fontSizes": [
 				{
diff --git a/packages/block-editor/src/components/global-styles/hooks.js b/packages/block-editor/src/components/global-styles/hooks.js
index 1fed98cfd229b..2652732807cfd 100644
--- a/packages/block-editor/src/components/global-styles/hooks.js
+++ b/packages/block-editor/src/components/global-styles/hooks.js
@@ -66,6 +66,7 @@ const VALID_SETTINGS = [
 	'spacing.units',
 	'typography.fluid',
 	'typography.customFontSize',
+	'typography.defaultFontSizes',
 	'typography.dropCap',
 	'typography.fontFamilies',
 	'typography.fontSizes',
@@ -238,6 +239,7 @@ export function useSettingsForBlockElement(
 				...updatedSettings.typography,
 				fontSizes: {},
 				customFontSize: false,
+				defaultFontSizes: false,
 			};
 		}
 
diff --git a/packages/block-editor/src/components/global-styles/typography-panel.js b/packages/block-editor/src/components/global-styles/typography-panel.js
index 8e6755a6e4c2c..668e8b101be92 100644
--- a/packages/block-editor/src/components/global-styles/typography-panel.js
+++ b/packages/block-editor/src/components/global-styles/typography-panel.js
@@ -22,7 +22,7 @@ import TextTransformControl from '../text-transform-control';
 import TextDecorationControl from '../text-decoration-control';
 import WritingModeControl from '../writing-mode-control';
 import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
-import { setImmutably } from '../../utils/object';
+import { setImmutably, uniqByProperty } from '../../utils/object';
 
 const MIN_TEXT_COLUMNS = 1;
 const MAX_TEXT_COLUMNS = 6;
@@ -53,7 +53,10 @@ export function useHasTypographyPanel( settings ) {
 
 function useHasFontSizeControl( settings ) {
 	return (
-		hasMergedOrigins( settings?.typography?.fontSizes ) ||
+		( settings?.typography?.defaultFontSizes !== false &&
+			settings?.typography?.fontSizes?.default?.length ) ||
+		settings?.typography?.fontSizes?.theme?.length ||
+		settings?.typography?.fontSizes?.custom?.length ||
 		settings?.typography?.customFontSize
 	);
 }
@@ -100,16 +103,45 @@ function useHasTextColumnsControl( settings ) {
 	return settings?.typography?.textColumns;
 }
 
-function getUniqueFontSizesBySlug( settings ) {
-	const fontSizes = settings?.typography?.fontSizes;
-	const mergedFontSizes = fontSizes ? mergeOrigins( fontSizes ) : [];
-	const uniqueSizes = [];
-	for ( const currentSize of mergedFontSizes ) {
-		if ( ! uniqueSizes.some( ( { slug } ) => slug === currentSize.slug ) ) {
-			uniqueSizes.push( currentSize );
-		}
-	}
-	return uniqueSizes;
+/**
+ * TODO: The reversing and filtering of default font sizes is a hack so the
+ * dropdown UI matches what is generated in the global styles CSS stylesheet.
+ *
+ * This is a temporary solution until #57733 is resolved. At which point,
+ * the mergedFontSizes would just need to be the concatenated array of all
+ * presets or a custom dropdown with sections for each.
+ *
+ * @see {@link https://github.com/WordPress/gutenberg/issues/57733}
+ *
+ * @param {Object} settings The global styles settings.
+ *
+ * @return {Array} The merged font sizes.
+ */
+function getMergedFontSizes( settings ) {
+	// The font size presets are merged in reverse order so that the duplicates
+	// that may defined later in the array have higher priority to match the CSS.
+	const mergedFontSizesAll = uniqByProperty(
+		[
+			settings?.typography?.fontSizes?.custom,
+			settings?.typography?.fontSizes?.theme,
+			settings?.typography?.fontSizes?.default,
+		].flatMap( ( presets ) => presets?.toReversed() ?? [] ),
+		'slug'
+	).reverse();
+
+	// Default presets exist in the global styles CSS no matter the setting, so
+	// filtering them out in the UI has to be done after merging.
+	const mergedFontSizes =
+		settings?.typography?.defaultFontSizes === false
+			? mergedFontSizesAll.filter(
+					( { slug } ) =>
+						! [ 'small', 'medium', 'large', 'x-large' ].includes(
+							slug
+						)
+			  )
+			: mergedFontSizesAll;
+
+	return mergedFontSizes;
 }
 
 function TypographyToolsPanel( {
@@ -185,7 +217,7 @@ export default function TypographyPanel( {
 	// Font Size
 	const hasFontSizeEnabled = useHasFontSizeControl( settings );
 	const disableCustomFontSizes = ! settings?.typography?.customFontSize;
-	const mergedFontSizes = getUniqueFontSizesBySlug( settings );
+	const mergedFontSizes = getMergedFontSizes( settings );
 
 	const fontSize = decodeValue( inheritedValue?.typography?.fontSize );
 	const setFontSize = ( newValue, metadata ) => {
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index 1c597836e9ec5..cd660c85826c2 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -177,7 +177,10 @@ export function useBlockSettings( name, parentLayout ) {
 		backgroundImage,
 		backgroundSize,
 		fontFamilies,
-		fontSizes,
+		userFontSizes,
+		themeFontSizes,
+		defaultFontSizes,
+		defaultFontSizesEnabled,
 		customFontSize,
 		fontStyle,
 		fontWeight,
@@ -222,7 +225,10 @@ export function useBlockSettings( name, parentLayout ) {
 		'background.backgroundImage',
 		'background.backgroundSize',
 		'typography.fontFamilies',
-		'typography.fontSizes',
+		'typography.fontSizes.custom',
+		'typography.fontSizes.theme',
+		'typography.fontSizes.default',
+		'typography.defaultFontSizes',
 		'typography.customFontSize',
 		'typography.fontStyle',
 		'typography.fontWeight',
@@ -304,9 +310,12 @@ export function useBlockSettings( name, parentLayout ) {
 					custom: fontFamilies,
 				},
 				fontSizes: {
-					custom: fontSizes,
+					custom: userFontSizes,
+					theme: themeFontSizes,
+					default: defaultFontSizes,
 				},
 				customFontSize,
+				defaultFontSizes: defaultFontSizesEnabled,
 				fontStyle,
 				fontWeight,
 				lineHeight,
@@ -341,7 +350,10 @@ export function useBlockSettings( name, parentLayout ) {
 		backgroundImage,
 		backgroundSize,
 		fontFamilies,
-		fontSizes,
+		userFontSizes,
+		themeFontSizes,
+		defaultFontSizes,
+		defaultFontSizesEnabled,
 		customFontSize,
 		fontStyle,
 		fontWeight,
diff --git a/packages/block-editor/src/utils/object.js b/packages/block-editor/src/utils/object.js
index 8f6c82a9c3991..c78fe0e656dfe 100644
--- a/packages/block-editor/src/utils/object.js
+++ b/packages/block-editor/src/utils/object.js
@@ -49,3 +49,19 @@ export const getValueFromObjectPath = ( object, path, defaultValue ) => {
 	} );
 	return value ?? defaultValue;
 };
+
+/**
+ * Helper util to filter out objects with duplicate values for a given property.
+ *
+ * @param {Object[]} array    Array of objects to filter.
+ * @param {string}   property Property to filter unique values by.
+ *
+ * @return {Object[]} Array of objects with unique values for the specified property.
+ */
+export function uniqByProperty( array, property ) {
+	const seen = new Set();
+	return array.filter( ( item ) => {
+		const value = item[ property ];
+		return seen.has( value ) ? false : seen.add( value );
+	} );
+}
diff --git a/schemas/json/theme.json b/schemas/json/theme.json
index 10695f493c40d..9f633fc77ec75 100644
--- a/schemas/json/theme.json
+++ b/schemas/json/theme.json
@@ -484,6 +484,11 @@
 					"description": "Settings related to typography.",
 					"type": "object",
 					"properties": {
+						"defaultFontSizes": {
+							"description": "Allow users to choose font sizes from the default font size presets.",
+							"type": "boolean",
+							"default": true
+						},
 						"customFontSize": {
 							"description": "Allow users to set custom font sizes.",
 							"type": "boolean",

From 2762ec45309469c37d2c90aaf587c25f65b15965 Mon Sep 17 00:00:00 2001
From: Jason Crist <jcrist@pbking.com>
Date: Thu, 11 Jan 2024 07:20:05 -0500
Subject: [PATCH 056/296] Font Library: Use data or src file to define font
 collection data (#57734)

* Add ability to use data rather than a file to define font collection

* format php

* avoid returning data when getting the font collection config

* fix rest endpoint get_font_collection

---------

Co-authored-by: Matias Benedetto <matias.benedetto@gmail.com>
---
 .../font-library/class-wp-font-collection.php | 59 +++++++++++---
 ...ss-wp-rest-font-collections-controller.php | 15 ++--
 .../fonts/font-library/font-library.php       |  3 +-
 .../wpFontCollection/__construct.php          |  2 +-
 .../wpFontCollection/getConfig.php            | 76 +++++++++++++++++++
 .../{getData.php => getConfigAndData.php}     | 28 +++++--
 6 files changed, 156 insertions(+), 27 deletions(-)
 create mode 100644 phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
 rename phpunit/tests/fonts/font-library/wpFontCollection/{getData.php => getConfigAndData.php} (71%)

diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
index e8cc7c98fe730..79b0691ede273 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -35,7 +35,7 @@ class WP_Font_Collection {
 	 * @since 6.5.0
 	 *
 	 * @param array $config Font collection config options.
-	 *                      See {@see wp_register_font_collection()} for the supported fields.
+	 *  See {@see wp_register_font_collection()} for the supported fields.
 	 * @throws Exception If the required parameters are missing.
 	 */
 	public function __construct( $config ) {
@@ -51,8 +51,8 @@ public function __construct( $config ) {
 			throw new Exception( 'Font Collection config name is required as a non-empty string.' );
 		}
 
-		if ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) {
-			throw new Exception( 'Font Collection config "src" option is required as a non-empty string.' );
+		if ( ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) && ( empty( $config['data'] ) ) ) {
+			throw new Exception( 'Font Collection config "src" option OR "data" option is required.' );
 		}
 
 		$this->config = $config;
@@ -63,21 +63,59 @@ public function __construct( $config ) {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return array An array containing the font collection config.
+	 * @return array {
+	 *     An array of font collection config.
+	 *
+	 *     @type string $id          The font collection's unique ID.
+	 *     @type string $name        The font collection's name.
+	 *     @type string $description The font collection's description.
+	 * }
 	 */
 	public function get_config() {
-		return $this->config;
+		return array(
+			'id'          => $this->config['id'],
+			'name'        => $this->config['name'],
+			'description' => $this->config['description'] ?? '',
+		);
 	}
 
 	/**
-	 * Gets the font collection data.
+	 * Gets the font collection config and data.
+	 *
+	 * This function returns an array containing the font collection's unique ID,
+	 * name, and its data as a PHP array.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return array|WP_Error An array containing the list of font families in theme.json format on success,
+	 * @return array {
+	 *     An array of font collection config and data.
+	 *
+	 *     @type string $id          The font collection's unique ID.
+	 *     @type string $name        The font collection's name.
+	 *     @type string $description The font collection's description.
+	 *     @type array  $data        The font collection's data as a PHP array.
+	 * }
+	 */
+	public function get_config_and_data() {
+		$config_and_data         = $this->get_config();
+		$config_and_data['data'] = $this->load_data();
+		return $config_and_data;
+	}
+
+	/**
+	 * Loads the font collection data.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return array|WP_Error An array containing the list of font families in font-collection.json format on success,
 	 *                        else an instance of WP_Error on failure.
 	 */
-	public function get_data() {
+	public function load_data() {
+
+		if ( ! empty( $this->config['data'] ) ) {
+			return $this->config['data'];
+		}
+
 		// If the src is a URL, fetch the data from the URL.
 		if ( str_contains( $this->config['src'], 'http' ) && str_contains( $this->config['src'], '://' ) ) {
 			if ( ! wp_http_validate_url( $this->config['src'] ) ) {
@@ -104,9 +142,6 @@ public function get_data() {
 			}
 		}
 
-		$collection_data         = $this->get_config();
-		$collection_data['data'] = $data;
-		unset( $collection_data['src'] );
-		return $collection_data;
+		return $data;
 	}
 }
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
index 2367cba0b870a..0efd56f61d43e 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
@@ -77,13 +77,16 @@ public function get_font_collection( $request ) {
 			$collection->add_data( array( 'status' => 404 ) );
 			return $collection;
 		}
-		$collection_with_data = $collection->get_data();
+		$config_and_data = $collection->get_config_and_data();
+		$collection_data = $config_and_data['data'];
+
 		// If there was an error getting the collection data, return the error.
-		if ( is_wp_error( $collection_with_data ) ) {
-			$collection_with_data->add_data( array( 'status' => 500 ) );
-			return $collection_with_data;
+		if ( is_wp_error( $collection_data ) ) {
+			$collection_data->add_data( array( 'status' => 500 ) );
+			return $collection_data;
 		}
-		return new WP_REST_Response( $collection_with_data );
+
+		return new WP_REST_Response( $config_and_data );
 	}
 
 	/**
@@ -96,7 +99,7 @@ public function get_font_collection( $request ) {
 	public function get_font_collections() {
 		$collections = array();
 		foreach ( WP_Font_Library::get_font_collections() as $collection ) {
-			$collections[] = $collection->get_config();
+			$collections[] = $collection->get_config_and_data();
 		}
 
 		return new WP_REST_Response( $collections, 200 );
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index 4a2f1be69ef71..c2545171dace0 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -50,7 +50,8 @@ function gutenberg_init_font_library_routes() {
 	 *     Font collection associative array of configuration options.
 	 *
 	 *     @type string $id             The font collection's unique ID.
-	 *     @type string $src The font collection's data JSON file.
+	 *     @type string $src            The font collection's data as a JSON file path.
+	 *     @type array  $data           The font collection's data as a PHP array.
 	 * }
 	 * @return WP_Font_Collection|WP_Error A font collection is it was registered
 	 *                                     successfully, else WP_Error.
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
index 5c2b7b5c02793..21f529d71a297 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
@@ -84,7 +84,7 @@ public function data_should_throw_exception() {
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 				),
-				'Font Collection config "src" option is required as a non-empty string.',
+				'Font Collection config "src" option OR "data" option is required.',
 			),
 
 		);
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
new file mode 100644
index 0000000000000..03f59b6a1a6eb
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
@@ -0,0 +1,76 @@
+<?php
+/**
+ * Test WP_Font_Collection::get_config().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ *
+ * @covers WP_Font_Collection::get_config
+ */
+class Tests_Fonts_WpFontCollection_GetConfig extends WP_UnitTestCase {
+	/**
+	 * @dataProvider data_should_get_config
+	 *
+	 * @param array $config Font collection config options.
+	 * @param array $expected_data Expected data.
+	 */
+	public function test_should_get_config( $config, $expected_data ) {
+		$collection = new WP_Font_Collection( $config );
+		$this->assertSame( $expected_data, $collection->get_config() );
+	}
+
+	/**
+	 * Data provider.
+	 *
+	 * @return array[]
+	 */
+	public function data_should_get_config() {
+		$mock_file = wp_tempnam( 'my-collection-data-' );
+		file_put_contents( $mock_file, '{"this is mock data":true}' );
+
+		return array(
+			'with a file' => array(
+				'config'        => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'src'         => $mock_file,
+				),
+				'expected_data' => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+				),
+			),
+			'with a url'  => array(
+				'config'        => array(
+					'id'          => 'my-collection-with-url',
+					'name'        => 'My Collection with URL',
+					'description' => 'My collection description',
+					'src'         => 'https://localhost/fonts/mock-font-collection.json',
+				),
+				'expected_data' => array(
+					'id'          => 'my-collection-with-url',
+					'name'        => 'My Collection with URL',
+					'description' => 'My collection description',
+				),
+			),
+			'with data'   => array(
+				'config'        => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'data'        => array( 'this is mock data' => true ),
+				),
+				'expected_data' => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+				),
+			),
+		);
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getData.php b/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
similarity index 71%
rename from phpunit/tests/fonts/font-library/wpFontCollection/getData.php
rename to phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
index 4d0b2eb92b595..a71928193c9aa 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getData.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test WP_Font_Collection::get_data().
+ * Test WP_Font_Collection::get_config_and_data().
  *
  * @package WordPress
  * @subpackage Font Library
@@ -8,9 +8,9 @@
  * @group fonts
  * @group font-library
  *
- * @covers WP_Font_Collection::get_data
+ * @covers WP_Font_Collection::get_config_and_data
  */
-class Tests_Fonts_WpFontCollection_GetData extends WP_UnitTestCase {
+class Tests_Fonts_WpFontCollection_GetConfigAndData extends WP_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -47,14 +47,14 @@ public function mock_request( $preempt, $args, $url ) {
 	}
 
 	/**
-	 * @dataProvider data_should_get_data
+	 * @dataProvider data_should_get_config_and_data
 	 *
 	 * @param array $config Font collection config options.
 	 * @param array $expected_data Expected data.
 	 */
-	public function test_should_get_data( $config, $expected_data ) {
+	public function test_should_get_config_and_data( $config, $expected_data ) {
 		$collection = new WP_Font_Collection( $config );
-		$this->assertSame( $expected_data, $collection->get_data() );
+		$this->assertSame( $expected_data, $collection->get_config_and_data() );
 	}
 
 	/**
@@ -62,7 +62,7 @@ public function test_should_get_data( $config, $expected_data ) {
 	 *
 	 * @return array[]
 	 */
-	public function data_should_get_data() {
+	public function data_should_get_config_and_data() {
 		$mock_file = wp_tempnam( 'my-collection-data-' );
 		file_put_contents( $mock_file, '{"this is mock data":true}' );
 
@@ -98,6 +98,20 @@ public function data_should_get_data() {
 					),
 				),
 			),
+			'with data'   => array(
+				'config'        => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'data'        => array( 'this is mock data' => true ),
+				),
+				'expected_data' => array(
+					'id'          => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'data'        => array( 'this is mock data' => true ),
+				),
+			),
 		);
 	}
 }

From 8599e15cd2d80da4f213b0c7e56884ab8171d6ad Mon Sep 17 00:00:00 2001
From: Jason Crist <jcrist@pbking.com>
Date: Thu, 11 Jan 2024 08:04:17 -0500
Subject: [PATCH 057/296] Use `slug` instead of `id` for Font Collection
 (#57735)

* Add ability to use data rather than a file to define font collection

* Use slug instead of id for Font Collections

* format php

* merge file changes

* format php

---------

Co-authored-by: Matias Benedetto <matias.benedetto@gmail.com>
---
 .../font-library/class-wp-font-collection.php | 10 +++---
 .../font-library/class-wp-font-library.php    | 36 +++++++++----------
 ...ss-wp-rest-font-collections-controller.php |  6 ++--
 .../fonts/font-library/font-library.php       |  2 +-
 .../wpFontCollection/__construct.php          |  6 ++--
 .../wpFontCollection/getConfig.php            | 12 +++----
 .../wpFontCollection/getConfigAndData.php     | 12 +++----
 .../wpFontLibrary/getFontCollection.php       |  4 +--
 .../wpFontLibrary/getFontCollections.php      |  2 +-
 .../wpFontLibrary/registerFontCollection.php  | 16 ++++-----
 .../unregisterFontCollection.php              |  4 +--
 .../getFontCollection.php                     |  8 ++---
 .../getFontCollections.php                    |  4 +--
 .../registerRoutes.php                        |  4 +--
 14 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
index 79b0691ede273..6189da5fa984b 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -43,8 +43,8 @@ public function __construct( $config ) {
 			throw new Exception( 'Font Collection config options is required as a non-empty array.' );
 		}
 
-		if ( empty( $config['id'] ) || ! is_string( $config['id'] ) ) {
-			throw new Exception( 'Font Collection config ID is required as a non-empty string.' );
+		if ( empty( $config['slug'] ) || ! is_string( $config['slug'] ) ) {
+			throw new Exception( 'Font Collection config slug is required as a non-empty string.' );
 		}
 
 		if ( empty( $config['name'] ) || ! is_string( $config['name'] ) ) {
@@ -66,14 +66,14 @@ public function __construct( $config ) {
 	 * @return array {
 	 *     An array of font collection config.
 	 *
-	 *     @type string $id          The font collection's unique ID.
+	 *     @type string $slug        The font collection's unique slug.
 	 *     @type string $name        The font collection's name.
 	 *     @type string $description The font collection's description.
 	 * }
 	 */
 	public function get_config() {
 		return array(
-			'id'          => $this->config['id'],
+			'slug'        => $this->config['slug'],
 			'name'        => $this->config['name'],
 			'description' => $this->config['description'] ?? '',
 		);
@@ -90,7 +90,7 @@ public function get_config() {
 	 * @return array {
 	 *     An array of font collection config and data.
 	 *
-	 *     @type string $id          The font collection's unique ID.
+	 *     @type string $slug          The font collection's unique ID.
 	 *     @type string $name        The font collection's name.
 	 *     @type string $description The font collection's description.
 	 *     @type array  $data        The font collection's data as a PHP array.
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index 01ee702673e57..fd36f6ba073c4 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -63,11 +63,11 @@ public static function get_expected_font_mime_types_per_php_version( $php_versio
 	 */
 	public static function register_font_collection( $config ) {
 		$new_collection = new WP_Font_Collection( $config );
-		if ( self::is_collection_registered( $config['id'] ) ) {
+		if ( self::is_collection_registered( $config['slug'] ) ) {
 			$error_message = sprintf(
-				/* translators: %s: Font collection id. */
-				__( 'Font collection with id: "%s" is already registered.', 'default' ),
-				$config['id']
+				/* translators: %s: Font collection slug. */
+				__( 'Font collection with slug: "%s" is already registered.', 'default' ),
+				$config['slug']
 			);
 			_doing_it_wrong(
 				__METHOD__,
@@ -76,7 +76,7 @@ public static function register_font_collection( $config ) {
 			);
 			return new WP_Error( 'font_collection_registration_error', $error_message );
 		}
-		self::$collections[ $config['id'] ] = $new_collection;
+		self::$collections[ $config['slug'] ] = $new_collection;
 		return $new_collection;
 	}
 
@@ -85,20 +85,20 @@ public static function register_font_collection( $config ) {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param string $collection_id Font collection ID.
+	 * @param string $collection_slug Font collection slug.
 	 * @return bool True if the font collection was unregistered successfully and false otherwise.
 	 */
-	public static function unregister_font_collection( $collection_id ) {
-		if ( ! self::is_collection_registered( $collection_id ) ) {
+	public static function unregister_font_collection( $slug ) {
+		if ( ! self::is_collection_registered( $slug ) ) {
 			_doing_it_wrong(
 				__METHOD__,
-				/* translators: %s: Font collection id. */
-				sprintf( __( 'Font collection "%s" not found.', 'default' ), $collection_id ),
+				/* translators: %s: Font collection slug. */
+				sprintf( __( 'Font collection "%s" not found.', 'default' ), $slug ),
 				'6.5.0'
 			);
 			return false;
 		}
-		unset( self::$collections[ $collection_id ] );
+		unset( self::$collections[ $slug ] );
 		return true;
 	}
 
@@ -107,11 +107,11 @@ public static function unregister_font_collection( $collection_id ) {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param string $collection_id Font collection ID.
+	 * @param string $slug Font collection slug.
 	 * @return bool True if the font collection is registered and false otherwise.
 	 */
-	private static function is_collection_registered( $collection_id ) {
-		return array_key_exists( $collection_id, self::$collections );
+	private static function is_collection_registered( $slug ) {
+		return array_key_exists( $slug, self::$collections );
 	}
 
 	/**
@@ -130,12 +130,12 @@ public static function get_font_collections() {
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param string $id Font collection id.
+	 * @param string $slug Font collection slug.
 	 * @return array List of font collections.
 	 */
-	public static function get_font_collection( $id ) {
-		if ( array_key_exists( $id, self::$collections ) ) {
-			return self::$collections[ $id ];
+	public static function get_font_collection( $slug ) {
+		if ( array_key_exists( $slug, self::$collections ) ) {
+			return self::$collections[ $slug ];
 		}
 		return new WP_Error( 'font_collection_not_found', 'Font collection not found.' );
 	}
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
index 0efd56f61d43e..c7595a56413b9 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
@@ -50,7 +50,7 @@ public function register_routes() {
 
 		register_rest_route(
 			$this->namespace,
-			'/' . $this->rest_base . '/(?P<id>[\/\w-]+)',
+			'/' . $this->rest_base . '/(?P<slug>[\/\w-]+)',
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
@@ -70,8 +70,8 @@ public function register_routes() {
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
 	public function get_font_collection( $request ) {
-		$id         = $request->get_param( 'id' );
-		$collection = WP_Font_Library::get_font_collection( $id );
+		$slug       = $request->get_param( 'slug' );
+		$collection = WP_Font_Library::get_font_collection( $slug );
 		// If the collection doesn't exist returns a 404.
 		if ( is_wp_error( $collection ) ) {
 			$collection->add_data( array( 'status' => 404 ) );
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index c2545171dace0..d1ad8e1447ad9 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -76,7 +76,7 @@ function wp_unregister_font_collection( $collection_id ) {
 }
 
 $default_font_collection = array(
-	'id'          => 'default-font-collection',
+	'slug'        => 'default-font-collection',
 	'name'        => 'Google Fonts',
 	'description' => __( 'Add from Google Fonts. Fonts are copied to and served from your site.', 'gutenberg' ),
 	'src'         => 'https://s.w.org/images/fonts/16.7/collections/google-fonts-with-preview.json',
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
index 21f529d71a297..380226ee8af8a 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
@@ -17,7 +17,7 @@ public function test_should_initialize_data() {
 		$property->setAccessible( true );
 
 		$config          = array(
-			'id'          => 'my-collection',
+			'slug'        => 'my-collection',
 			'name'        => 'My Collection',
 			'description' => 'My collection description',
 			'src'         => 'my-collection-data.json',
@@ -55,7 +55,7 @@ public function data_should_throw_exception() {
 					'description' => 'My collection description',
 					'src'         => 'my-collection-data.json',
 				),
-				'Font Collection config ID is required as a non-empty string.',
+				'Font Collection config slug is required as a non-empty string.',
 			),
 
 			'no config'                       => array(
@@ -80,7 +80,7 @@ public function data_should_throw_exception() {
 
 			'missing src'                     => array(
 				array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 				),
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
index 03f59b6a1a6eb..5f1f082297d41 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
@@ -34,39 +34,39 @@ public function data_should_get_config() {
 		return array(
 			'with a file' => array(
 				'config'        => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'src'         => $mock_file,
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 				),
 			),
 			'with a url'  => array(
 				'config'        => array(
-					'id'          => 'my-collection-with-url',
+					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
 					'description' => 'My collection description',
 					'src'         => 'https://localhost/fonts/mock-font-collection.json',
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection-with-url',
+					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
 					'description' => 'My collection description',
 				),
 			),
 			'with data'   => array(
 				'config'        => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'data'        => array( 'this is mock data' => true ),
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 				),
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php b/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
index a71928193c9aa..885b0a0b9036c 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
@@ -69,13 +69,13 @@ public function data_should_get_config_and_data() {
 		return array(
 			'with a file' => array(
 				'config'        => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'src'         => $mock_file,
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'data'        => array( 'this is mock data' => true ),
@@ -83,13 +83,13 @@ public function data_should_get_config_and_data() {
 			),
 			'with a url'  => array(
 				'config'        => array(
-					'id'          => 'my-collection-with-url',
+					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
 					'description' => 'My collection description',
 					'src'         => 'https://localhost/fonts/mock-font-collection.json',
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection-with-url',
+					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
 					'description' => 'My collection description',
 					'data'        => array(
@@ -100,13 +100,13 @@ public function data_should_get_config_and_data() {
 			),
 			'with data'   => array(
 				'config'        => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'data'        => array( 'this is mock data' => true ),
 				),
 				'expected_data' => array(
-					'id'          => 'my-collection',
+					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 					'data'        => array( 'this is mock data' => true ),
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
index 00d5ca2dcb2e7..082ca89211465 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollection.php
@@ -14,7 +14,7 @@ class Tests_Fonts_WpFontLibrary_GetFontCollection extends WP_Font_Library_UnitTe
 
 	public function test_should_get_font_collection() {
 		$my_font_collection_config = array(
-			'id'          => 'my-font-collection',
+			'slug'        => 'my-font-collection',
 			'name'        => 'My Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
@@ -24,7 +24,7 @@ public function test_should_get_font_collection() {
 		$this->assertInstanceOf( 'WP_Font_Collection', $font_collection );
 	}
 
-	public function test_should_get_no_font_collection_if_the_id_is_not_registered() {
+	public function test_should_get_no_font_collection_if_the_slug_is_not_registered() {
 		$font_collection = WP_Font_Library::get_font_collection( 'not-registered-font-collection' );
 		$this->assertWPError( $font_collection );
 	}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
index 40eacba8e18c5..a405584efccc2 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/getFontCollections.php
@@ -18,7 +18,7 @@ public function test_should_get_an_empty_list() {
 
 	public function test_should_get_mock_font_collection() {
 		$my_font_collection_config = array(
-			'id'          => 'my-font-collection',
+			'slug'        => 'my-font-collection',
 			'name'        => 'My Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => path_join( __DIR__, 'my-font-collection-data.json' ),
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
index 2569830f6bf2a..a7ea2870957e9 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
@@ -14,7 +14,7 @@ class Tests_Fonts_WpFontLibrary_RegisterFontCollection extends WP_Font_Library_U
 
 	public function test_should_register_font_collection() {
 		$config     = array(
-			'id'          => 'my-collection',
+			'slug'        => 'my-collection',
 			'name'        => 'My Collection',
 			'description' => 'My Collection Description',
 			'src'         => 'my-collection-data.json',
@@ -23,20 +23,20 @@ public function test_should_register_font_collection() {
 		$this->assertInstanceOf( 'WP_Font_Collection', $collection );
 	}
 
-	public function test_should_return_error_if_id_is_missing() {
+	public function test_should_return_error_if_slug_is_missing() {
 		$config = array(
 			'name'        => 'My Collection',
 			'description' => 'My Collection Description',
 			'src'         => 'my-collection-data.json',
 		);
 		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config ID is required as a non-empty string.' );
+		$this->expectExceptionMessage( 'Font Collection config slug is required as a non-empty string.' );
 		WP_Font_Library::register_font_collection( $config );
 	}
 
 	public function test_should_return_error_if_name_is_missing() {
 		$config = array(
-			'id'          => 'my-collection',
+			'slug'        => 'my-collection',
 			'description' => 'My Collection Description',
 			'src'         => 'my-collection-data.json',
 		);
@@ -52,15 +52,15 @@ public function test_should_return_error_if_config_is_empty() {
 		WP_Font_Library::register_font_collection( $config );
 	}
 
-	public function test_should_return_error_if_id_is_repeated() {
+	public function test_should_return_error_if_slug_is_repeated() {
 		$config1 = array(
-			'id'          => 'my-collection-1',
+			'slug'        => 'my-collection-1',
 			'name'        => 'My Collection 1',
 			'description' => 'My Collection 1 Description',
 			'src'         => 'my-collection-1-data.json',
 		);
 		$config2 = array(
-			'id'          => 'my-collection-1',
+			'slug'        => 'my-collection-1',
 			'name'        => 'My Collection 2',
 			'description' => 'My Collection 2 Description',
 			'src'         => 'my-collection-2-data.json',
@@ -72,7 +72,7 @@ public function test_should_return_error_if_id_is_repeated() {
 
 		// Expects a _doing_it_wrong notice.
 		$this->setExpectedIncorrectUsage( 'WP_Font_Library::register_font_collection' );
-		// Try to register a second collection with same id.
+		// Try to register a second collection with same slug.
 		$collection2 = WP_Font_Library::register_font_collection( $config2 );
 		$this->assertWPError( $collection2, 'A WP_Error should be returned.' );
 	}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
index e6e16956814fb..3c19a1d2089e7 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/unregisterFontCollection.php
@@ -15,7 +15,7 @@ class Tests_Fonts_WpFontLibrary_UnregisterFontCollection extends WP_Font_Library
 	public function test_should_unregister_font_collection() {
 		// Registers two mock font collections.
 		$config = array(
-			'id'          => 'mock-font-collection-1',
+			'slug'        => 'mock-font-collection-1',
 			'name'        => 'Mock Collection to be unregistered',
 			'description' => 'A mock font collection to be unregistered.',
 			'src'         => 'my-collection-data.json',
@@ -23,7 +23,7 @@ public function test_should_unregister_font_collection() {
 		WP_Font_Library::register_font_collection( $config );
 
 		$config = array(
-			'id'          => 'mock-font-collection-2',
+			'slug'        => 'mock-font-collection-2',
 			'name'        => 'Mock Collection',
 			'description' => 'A mock font collection.',
 			'src'         => 'my-mock-data.json',
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
index 94e7daaa16634..c9d003389997b 100644
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
@@ -25,7 +25,7 @@ public function set_up() {
 		add_filter( 'pre_http_request', array( $this, 'mock_request' ), 10, 3 );
 
 		$config_with_file = array(
-			'id'          => 'one-collection',
+			'slug'        => 'one-collection',
 			'name'        => 'One Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => $mock_file,
@@ -33,7 +33,7 @@ public function set_up() {
 		wp_register_font_collection( $config_with_file );
 
 		$config_with_url = array(
-			'id'          => 'collection-with-url',
+			'slug'        => 'collection-with-url',
 			'name'        => 'Another Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => 'https://wordpress.org/fonts/mock-font-collection.json',
@@ -42,7 +42,7 @@ public function set_up() {
 		wp_register_font_collection( $config_with_url );
 
 		$config_with_non_existing_file = array(
-			'id'          => 'collection-with-non-existing-file',
+			'slug'        => 'collection-with-non-existing-file',
 			'name'        => 'Another Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => '/home/non-existing-file.json',
@@ -51,7 +51,7 @@ public function set_up() {
 		wp_register_font_collection( $config_with_non_existing_file );
 
 		$config_with_non_existing_url = array(
-			'id'          => 'collection-with-non-existing-url',
+			'slug'        => 'collection-with-non-existing-url',
 			'name'        => 'Another Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => 'https://non-existing-url-1234x.com.ar/fake-path/missing-file.json',
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
index 224dab07cf0b7..0a8d24e8f392b 100644
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
+++ b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
@@ -27,7 +27,7 @@ public function test_get_font_collections() {
 
 		// Add a font collection.
 		$config = array(
-			'id'          => 'my-font-collection',
+			'slug'        => 'my-font-collection',
 			'name'        => 'My Font Collection',
 			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
 			'src'         => $mock_file,
@@ -39,7 +39,7 @@ public function test_get_font_collections() {
 		$data     = $response->get_data();
 		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
 		$this->assertCount( 1, $data, 'The response data is not an array with one element.' );
-		$this->assertArrayHasKey( 'id', $data[0], 'The response data does not have the key with the collection ID.' );
+		$this->assertArrayHasKey( 'slug', $data[0], 'The response data does not have the key with the collection slug.' );
 		$this->assertArrayHasKey( 'name', $data[0], 'The response data does not have the key with the collection name.' );
 	}
 }
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
index c2c019fa70a02..fb100a400fb4c 100644
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
+++ b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
@@ -16,9 +16,9 @@ class Tests_Fonts_WPRESTFontCollectionsController_RegisterRoutes extends WP_Unit
 	public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
 		$this->assertCount( 1, $routes['/wp/v2/font-collections'], 'Rest server has not the collections path initialized.' );
-		$this->assertCount( 1, $routes['/wp/v2/font-collections/(?P<id>[\/\w-]+)'], 'Rest server has not the collection path initialized.' );
+		$this->assertCount( 1, $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'], 'Rest server has not the collection path initialized.' );
 
 		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections'][0]['methods'], 'Rest server has not the GET method for collections intialized.' );
-		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections/(?P<id>[\/\w-]+)'][0]['methods'], 'Rest server has not the GET method for collection intialized.' );
+		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'][0]['methods'], 'Rest server has not the GET method for collection intialized.' );
 	}
 }

From 47026abfabe59f9baa89e18931d457a85c72ff65 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Thu, 11 Jan 2024 16:15:10 +0200
Subject: [PATCH 058/296] Group templates in sidebar list (#57711)

* Group templates in sidebar list

* address feedback

* Section heading styling

---------

Co-authored-by: James Koster <james@jameskoster.co.uk>
---
 .../index.js                                  | 113 +++++++++++++-----
 .../style.scss                                |   9 ++
 packages/edit-site/src/style.scss             |   1 +
 3 files changed, 95 insertions(+), 28 deletions(-)
 create mode 100644 packages/edit-site/src/components/sidebar-navigation-screen-templates/style.scss

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
index 527cb37ceddaf..3ff934ac100a8 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates/index.js
@@ -4,6 +4,7 @@
 import {
 	__experimentalItemGroup as ItemGroup,
 	__experimentalItem as Item,
+	__experimentalVStack as VStack,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useEntityRecords } from '@wordpress/core-data';
@@ -30,20 +31,11 @@ const TemplateItem = ( { postType, postId, ...props } ) => {
 
 export default function SidebarNavigationScreenTemplates() {
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
-
 	const { records: templates, isResolving: isLoading } = useEntityRecords(
 		'postType',
 		TEMPLATE_POST_TYPE,
-		{
-			per_page: -1,
-		}
-	);
-
-	const sortedTemplates = templates ? [ ...templates ] : [];
-	sortedTemplates.sort( ( a, b ) =>
-		a.title.rendered.localeCompare( b.title.rendered )
+		{ per_page: -1 }
 	);
-
 	const browseAllLink = useLink( { path: '/wp_template/all' } );
 	const canCreate = ! isMobileViewport;
 	return (
@@ -66,24 +58,7 @@ export default function SidebarNavigationScreenTemplates() {
 				<>
 					{ isLoading && __( 'Loading templates…' ) }
 					{ ! isLoading && (
-						<ItemGroup>
-							{ ! templates?.length && (
-								<Item>{ __( 'No templates found' ) }</Item>
-							) }
-							{ sortedTemplates.map( ( template ) => (
-								<TemplateItem
-									postType={ TEMPLATE_POST_TYPE }
-									postId={ template.id }
-									key={ template.id }
-									withChevron
-								>
-									{ decodeEntities(
-										template.title?.rendered ||
-											template.slug
-									) }
-								</TemplateItem>
-							) ) }
-						</ItemGroup>
+						<SidebarTemplatesList templates={ templates } />
 					) }
 				</>
 			}
@@ -97,3 +72,85 @@ export default function SidebarNavigationScreenTemplates() {
 		/>
 	);
 }
+
+function TemplatesGroup( { title, templates } ) {
+	return (
+		<ItemGroup>
+			{ !! title && (
+				<Item className="edit-site-sidebar-navigation-screen-templates__templates-group-title">
+					{ title }
+				</Item>
+			) }
+			{ templates.map( ( template ) => (
+				<TemplateItem
+					postType={ TEMPLATE_POST_TYPE }
+					postId={ template.id }
+					key={ template.id }
+					withChevron
+				>
+					{ decodeEntities(
+						template.title?.rendered || template.slug
+					) }
+				</TemplateItem>
+			) ) }
+		</ItemGroup>
+	);
+}
+function SidebarTemplatesList( { templates } ) {
+	if ( ! templates?.length ) {
+		return (
+			<ItemGroup>
+				<Item>{ __( 'No templates found' ) }</Item>
+			</ItemGroup>
+		);
+	}
+	const sortedTemplates = templates ? [ ...templates ] : [];
+	sortedTemplates.sort( ( a, b ) =>
+		a.title.rendered.localeCompare( b.title.rendered )
+	);
+	const { hierarchyTemplates, customTemplates, ...plugins } =
+		sortedTemplates.reduce(
+			( accumulator, template ) => {
+				const {
+					original_source: originalSource,
+					author_text: authorText,
+				} = template;
+				if ( originalSource === 'plugin' ) {
+					if ( ! accumulator[ authorText ] ) {
+						accumulator[ authorText ] = [];
+					}
+					accumulator[ authorText ].push( template );
+				} else if ( template.is_custom ) {
+					accumulator.customTemplates.push( template );
+				} else {
+					accumulator.hierarchyTemplates.push( template );
+				}
+				return accumulator;
+			},
+			{ hierarchyTemplates: [], customTemplates: [] }
+		);
+	return (
+		<VStack spacing={ 3 }>
+			{ !! hierarchyTemplates.length && (
+				<TemplatesGroup templates={ hierarchyTemplates } />
+			) }
+			{ !! customTemplates.length && (
+				<TemplatesGroup
+					title={ __( 'Custom' ) }
+					templates={ customTemplates }
+				/>
+			) }
+			{ Object.entries( plugins ).map(
+				( [ plugin, pluginTemplates ] ) => {
+					return (
+						<TemplatesGroup
+							key={ plugin }
+							title={ plugin }
+							templates={ pluginTemplates }
+						/>
+					);
+				}
+			) }
+		</VStack>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates/style.scss b/packages/edit-site/src/components/sidebar-navigation-screen-templates/style.scss
new file mode 100644
index 0000000000000..ec2b7744d4e23
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates/style.scss
@@ -0,0 +1,9 @@
+.edit-site-sidebar-navigation-screen-templates__templates-group-title.components-item {
+	text-transform: uppercase;
+	color: $gray-200;
+	// 6px right padding to align with + button
+	padding: $grid-unit-30 6px $grid-unit-20 $grid-unit-20;
+	border-top: 1px solid $gray-800;
+	font-size: 11px;
+	font-weight: 500;
+}
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
index c7d0609b4e771..164a8523b1962 100644
--- a/packages/edit-site/src/style.scss
+++ b/packages/edit-site/src/style.scss
@@ -34,6 +34,7 @@
 @import "./components/sidebar-navigation-screen-details-footer/style.scss";
 @import "./components/sidebar-navigation-screen-navigation-menu/style.scss";
 @import "./components/sidebar-navigation-screen-page/style.scss";
+@import "./components/sidebar-navigation-screen-templates/style.scss";
 @import "components/sidebar-navigation-screen-details-panel/style.scss";
 @import "./components/sidebar-navigation-screen-pattern/style.scss";
 @import "./components/sidebar-navigation-screen-patterns/style.scss";

From b64eec7b536e83b72b24c776a8181889f96a9abd Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Thu, 11 Jan 2024 15:17:15 +0100
Subject: [PATCH 059/296] Fix Widgets page Undo and Redo accessibility and
 keyboard interaction (#57677)

* Fix styling and focus style.

* Fix Widgets toolbar Undo and Redo buttons keyboard interaction.
---
 .../src/components/header/document-tools/index.js     |  5 +++--
 .../edit-widgets/src/components/header/style.scss     |  3 +--
 .../src/components/header/undo-redo/redo.js           | 11 ++++++++---
 .../src/components/header/undo-redo/undo.js           | 11 ++++++++---
 4 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/packages/edit-widgets/src/components/header/document-tools/index.js b/packages/edit-widgets/src/components/header/document-tools/index.js
index a9799ac993f9a..4391ece0b89e2 100644
--- a/packages/edit-widgets/src/components/header/document-tools/index.js
+++ b/packages/edit-widgets/src/components/header/document-tools/index.js
@@ -83,6 +83,7 @@ function DocumentTools() {
 			className="edit-widgets-header-toolbar"
 			aria-label={ __( 'Document tools' ) }
 			shouldUseKeyboardFocusShortcut={ ! blockToolbarCanBeFocused }
+			variant="unstyled"
 		>
 			<ToolbarItem
 				ref={ inserterButton }
@@ -104,8 +105,8 @@ function DocumentTools() {
 			/>
 			{ isMediumViewport && (
 				<>
-					<UndoButton />
-					<RedoButton />
+					<ToolbarItem as={ UndoButton } />
+					<ToolbarItem as={ RedoButton } />
 					<ToolbarItem
 						as={ Button }
 						className="edit-widgets-header-toolbar__list-view-toggle"
diff --git a/packages/edit-widgets/src/components/header/style.scss b/packages/edit-widgets/src/components/header/style.scss
index 2dd4b88eebddf..c5bdc2561d5d5 100644
--- a/packages/edit-widgets/src/components/header/style.scss
+++ b/packages/edit-widgets/src/components/header/style.scss
@@ -45,7 +45,6 @@
 	align-items: center;
 	justify-content: center;
 	flex-shrink: 2;
-	overflow-x: hidden;
 	padding-left: $grid-unit-20;
 }
 
@@ -67,7 +66,7 @@
 }
 
 .edit-widgets-header-toolbar {
-	border: none;
+	gap: $grid-unit-10;
 
 	// The Toolbar component adds different styles to buttons, so we reset them
 	// here to the original button styles
diff --git a/packages/edit-widgets/src/components/header/undo-redo/redo.js b/packages/edit-widgets/src/components/header/undo-redo/redo.js
index c4f4e6df37b91..17d0ecb892d0a 100644
--- a/packages/edit-widgets/src/components/header/undo-redo/redo.js
+++ b/packages/edit-widgets/src/components/header/undo-redo/redo.js
@@ -2,13 +2,14 @@
  * WordPress dependencies
  */
 import { __, isRTL } from '@wordpress/i18n';
-import { ToolbarButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { redo as redoIcon, undo as undoIcon } from '@wordpress/icons';
 import { displayShortcut, isAppleOS } from '@wordpress/keycodes';
 import { store as coreStore } from '@wordpress/core-data';
+import { forwardRef } from '@wordpress/element';
 
-export default function RedoButton() {
+function RedoButton( props, ref ) {
 	const shortcut = isAppleOS()
 		? displayShortcut.primaryShift( 'z' )
 		: displayShortcut.primary( 'y' );
@@ -19,7 +20,9 @@ export default function RedoButton() {
 	);
 	const { redo } = useDispatch( coreStore );
 	return (
-		<ToolbarButton
+		<Button
+			{ ...props }
+			ref={ ref }
 			icon={ ! isRTL() ? redoIcon : undoIcon }
 			label={ __( 'Redo' ) }
 			shortcut={ shortcut }
@@ -31,3 +34,5 @@ export default function RedoButton() {
 		/>
 	);
 }
+
+export default forwardRef( RedoButton );
diff --git a/packages/edit-widgets/src/components/header/undo-redo/undo.js b/packages/edit-widgets/src/components/header/undo-redo/undo.js
index 827ed1a415d74..271c73a452d9e 100644
--- a/packages/edit-widgets/src/components/header/undo-redo/undo.js
+++ b/packages/edit-widgets/src/components/header/undo-redo/undo.js
@@ -2,20 +2,23 @@
  * WordPress dependencies
  */
 import { __, isRTL } from '@wordpress/i18n';
-import { ToolbarButton } from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { undo as undoIcon, redo as redoIcon } from '@wordpress/icons';
 import { displayShortcut } from '@wordpress/keycodes';
 import { store as coreStore } from '@wordpress/core-data';
+import { forwardRef } from '@wordpress/element';
 
-export default function UndoButton() {
+function UndoButton( props, ref ) {
 	const hasUndo = useSelect(
 		( select ) => select( coreStore ).hasUndo(),
 		[]
 	);
 	const { undo } = useDispatch( coreStore );
 	return (
-		<ToolbarButton
+		<Button
+			{ ...props }
+			ref={ ref }
 			icon={ ! isRTL() ? undoIcon : redoIcon }
 			label={ __( 'Undo' ) }
 			shortcut={ displayShortcut.primary( 'z' ) }
@@ -27,3 +30,5 @@ export default function UndoButton() {
 		/>
 	);
 }
+
+export default forwardRef( UndoButton );

From cd548afcc23253e4be4b5ca382d3f4b19b9267f4 Mon Sep 17 00:00:00 2001
From: Mario Santos <34552881+SantosGuillamot@users.noreply.github.com>
Date: Thu, 11 Jan 2024 15:17:40 +0100
Subject: [PATCH 060/296] Block Bindings API: Add block bindings PHP
 registration mechanisms and "Post meta" source under the experimental flag
 (#57249)

* Change block bindings experiment name

* Remove old custom fields UI

* Add block bindings PHP logic

* Add pattern source

* Add post meta source

* Adapt partially synced patterns experiment

* Add domain to the translations in sources

* Remove unused post_meta attrs

* Change variable name

* Remove a couple of comments

* Add image alt to permitted attributes

* Rename variables and clean up code

* Fix bug wherein original pattern values were not being displayed

* fix typo

* Format a comment

* fix comment indentation

* remove the .vscode/settings.json file that sneaked in

* Sync with added support for multiple attributes in patterns

* Remove block supports requirement for partial syncing

* Remove __experimentalBlockBindings supports from paragraph

* Simplify source callback and update comments

* Remove erroneous comment

* Revert "Remove block supports requirement for partial syncing"

This reverts commit 7fb646cae16f1703cfdee25a7f8629e6b020fec3.

* Revert "Remove __experimentalBlockBindings supports from paragraph"

This reverts commit 34e3f29078e9f9196befda3ded01a200509266d5.

* Remove block supports dependency

* Update signature and docblock of register function

* Empty-Commit

* Update the PHPDoc string

---------

Co-authored-by: Ricardo Artemio Morales <ric.morales22@gmail.com>
Co-authored-by: Michal Czaplinski <mmczaplinski@gmail.com>
---
 lib/block-supports/pattern.php                |   2 +-
 .../block-bindings/html-processing.php        | 110 ++++++++++++
 lib/experimental/block-bindings/index.php     |  20 +++
 .../block-bindings/sources/index.php          |  32 ++++
 .../block-bindings/sources/pattern.php        |  21 +++
 .../block-bindings/sources/post-meta.php      |  25 +++
 lib/experimental/blocks.php                   | 170 ++++++++----------
 lib/experimental/connection-sources/index.php |  23 ---
 lib/experimental/editor-settings.php          |   4 +-
 lib/experiments-page.php                      |   6 +-
 .../block-editor/src/hooks/custom-fields.js   | 115 ------------
 packages/block-editor/src/hooks/index.js      |   2 -
 packages/block-library/src/block/edit.js      |  14 +-
 .../block-library/src/paragraph/block.json    |   1 -
 .../src/hooks/pattern-partial-syncing.js      |   7 -
 .../components/partial-syncing-controls.js    |  44 +++--
 16 files changed, 317 insertions(+), 279 deletions(-)
 create mode 100644 lib/experimental/block-bindings/html-processing.php
 create mode 100644 lib/experimental/block-bindings/index.php
 create mode 100644 lib/experimental/block-bindings/sources/index.php
 create mode 100644 lib/experimental/block-bindings/sources/pattern.php
 create mode 100644 lib/experimental/block-bindings/sources/post-meta.php
 delete mode 100644 lib/experimental/connection-sources/index.php
 delete mode 100644 packages/block-editor/src/hooks/custom-fields.js

diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
index a783135c793e3..2f7717091ff50 100644
--- a/lib/block-supports/pattern.php
+++ b/lib/block-supports/pattern.php
@@ -13,7 +13,7 @@
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	function gutenberg_register_pattern_support( $block_type ) {
-		$pattern_support = property_exists( $block_type, 'supports' ) ? _wp_array_get( $block_type->supports, array( '__experimentalConnections' ), false ) : false;
+		$pattern_support = 'core/paragraph' === $block_type->name ? true : false;
 
 		if ( $pattern_support ) {
 			if ( ! $block_type->uses_context ) {
diff --git a/lib/experimental/block-bindings/html-processing.php b/lib/experimental/block-bindings/html-processing.php
new file mode 100644
index 0000000000000..515749d0a8e75
--- /dev/null
+++ b/lib/experimental/block-bindings/html-processing.php
@@ -0,0 +1,110 @@
+<?php
+/**
+ * Define the mechanism to replace the HTML depending on the block attributes.
+ *
+ * @package gutenberg
+ */
+
+if ( ! function_exists( 'block_bindings_replace_html' ) ) {
+	/**
+	 * Depending on the block attributes, replace the proper HTML based on the value returned by the source.
+	 *
+	 * @param string $block_content Block Content.
+	 * @param string $block_name The name of the block to process.
+	 * @param string $block_attr The attribute of the block we want to process.
+	 * @param string $source_value The value used to replace the HTML.
+	 */
+	function block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+		if ( null === $block_type ) {
+			return;
+		}
+
+		// Depending on the attribute source, the processing will be different.
+		switch ( $block_type->attributes[ $block_attr ]['source'] ) {
+			case 'html':
+			case 'rich-text':
+				$block_reader = new WP_HTML_Tag_Processor( $block_content );
+
+				// TODO: Support for CSS selectors whenever they are ready in the HTML API.
+				// In the meantime, support comma-separated selectors by exploding them into an array.
+				$selectors = explode( ',', $block_type->attributes[ $block_attr ]['selector'] );
+				// Add a bookmark to the first tag to be able to iterate over the selectors.
+				$block_reader->next_tag();
+				$block_reader->set_bookmark( 'iterate-selectors' );
+
+				// TODO: This shouldn't be needed when the `set_inner_html` function is ready.
+				// Store the parent tag and its attributes to be able to restore them later in the button.
+				// The button block has a wrapper while the paragraph and heading blocks don't.
+				if ( 'core/button' === $block_name ) {
+					$button_wrapper                 = $block_reader->get_tag();
+					$button_wrapper_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
+					$button_wrapper_attrs           = array();
+					foreach ( $button_wrapper_attribute_names as $name ) {
+						$button_wrapper_attrs[ $name ] = $block_reader->get_attribute( $name );
+					}
+				}
+
+				foreach ( $selectors as $selector ) {
+					// If the parent tag, or any of its children, matches the selector, replace the HTML.
+					if ( strcasecmp( $block_reader->get_tag( $selector ), $selector ) === 0 || $block_reader->next_tag(
+						array(
+							'tag_name' => $selector,
+						)
+					) ) {
+						$block_reader->release_bookmark( 'iterate-selectors' );
+
+						// TODO: Use `set_inner_html` method whenever it's ready in the HTML API.
+						// Until then, it is hardcoded for the paragraph, heading, and button blocks.
+						// Store the tag and its attributes to be able to restore them later.
+						$selector_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
+						$selector_attrs           = array();
+						foreach ( $selector_attribute_names as $name ) {
+							$selector_attrs[ $name ] = $block_reader->get_attribute( $name );
+						}
+						$selector_markup = "<$selector>" . esc_html( $source_value ) . "</$selector>";
+						$amended_content = new WP_HTML_Tag_Processor( $selector_markup );
+						$amended_content->next_tag();
+						foreach ( $selector_attrs as $attribute_key => $attribute_value ) {
+							$amended_content->set_attribute( $attribute_key, $attribute_value );
+						}
+						if ( 'core/paragraph' === $block_name || 'core/heading' === $block_name ) {
+							return $amended_content->get_updated_html();
+						}
+						if ( 'core/button' === $block_name ) {
+							$button_markup  = "<$button_wrapper>{$amended_content->get_updated_html()}</$button_wrapper>";
+							$amended_button = new WP_HTML_Tag_Processor( $button_markup );
+							$amended_button->next_tag();
+							foreach ( $button_wrapper_attrs as $attribute_key => $attribute_value ) {
+								$amended_button->set_attribute( $attribute_key, $attribute_value );
+							}
+							return $amended_button->get_updated_html();
+						}
+					} else {
+						$block_reader->seek( 'iterate-selectors' );
+					}
+				}
+				$block_reader->release_bookmark( 'iterate-selectors' );
+				return $block_content;
+
+			case 'attribute':
+				$amended_content = new WP_HTML_Tag_Processor( $block_content );
+				if ( ! $amended_content->next_tag(
+					array(
+						// TODO: build the query from CSS selector.
+						'tag_name' => $block_type->attributes[ $block_attr ]['selector'],
+					)
+				) ) {
+					return $block_content;
+				}
+				$amended_content->set_attribute( $block_type->attributes[ $block_attr ]['attribute'], esc_attr( $source_value ) );
+				return $amended_content->get_updated_html();
+				break;
+
+			default:
+				return $block_content;
+				break;
+		}
+		return;
+	}
+}
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
new file mode 100644
index 0000000000000..cca857e93702f
--- /dev/null
+++ b/lib/experimental/block-bindings/index.php
@@ -0,0 +1,20 @@
+<?php
+/**
+ * Require the necessary files.
+ *
+ * @package gutenberg
+ */
+
+require_once __DIR__ . '/sources/index.php';
+require_once __DIR__ . '/html-processing.php';
+
+// Register the sources.
+$gutenberg_experiments = get_option( 'gutenberg-experiments' );
+if ( $gutenberg_experiments ) {
+	if ( array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
+		require_once __DIR__ . '/sources/pattern.php';
+	}
+	if ( array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
+		require_once __DIR__ . '/sources/post-meta.php';
+	}
+}
diff --git a/lib/experimental/block-bindings/sources/index.php b/lib/experimental/block-bindings/sources/index.php
new file mode 100644
index 0000000000000..6d14bc96d86ba
--- /dev/null
+++ b/lib/experimental/block-bindings/sources/index.php
@@ -0,0 +1,32 @@
+<?php
+/**
+ * Define the mechanism to add new sources available in the block bindings API.
+ *
+ * @package gutenberg
+ */
+
+global $block_bindings_sources;
+$block_bindings_sources = array();
+if ( ! function_exists( 'register_block_bindings_source' ) ) {
+	/**
+	 * Function to register a new source.
+	 *
+	 * @param string   $source_name The name of the source.
+	 * @param string   $label The label of the source.
+	 * @param callable(object, object, string): string $apply - The callback executed when the source is processed during block rendering.
+	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+	 *                        - object $block_instance: The block instance.
+	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+	 *                        The callable should return a string that will be used to override the block's original value.
+	 *
+	 *
+	 * @return void
+	 */
+	function register_block_bindings_source( $source_name, $label, $apply ) {
+		global $block_bindings_sources;
+		$block_bindings_sources[ $source_name ] = array(
+			'label' => $label,
+			'apply' => $apply,
+		);
+	}
+}
diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
new file mode 100644
index 0000000000000..e3456aa468d3e
--- /dev/null
+++ b/lib/experimental/block-bindings/sources/pattern.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Add the metadata source to the block bindings API.
+ *
+ * @package gutenberg
+ */
+
+if ( function_exists( 'register_block_bindings_source' ) ) {
+	$pattern_source_callback = function ( $source_attrs, $block_instance, $attribute_name ) {
+		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
+			return null;
+		}
+		$block_id = $block_instance->attributes['metadata']['id'];
+		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
+	};
+	register_block_bindings_source(
+		'pattern_attributes',
+		__( 'Pattern Attributes', 'gutenberg' ),
+		$pattern_source_callback
+	);
+}
diff --git a/lib/experimental/block-bindings/sources/post-meta.php b/lib/experimental/block-bindings/sources/post-meta.php
new file mode 100644
index 0000000000000..99b6afc03c0d4
--- /dev/null
+++ b/lib/experimental/block-bindings/sources/post-meta.php
@@ -0,0 +1,25 @@
+<?php
+/**
+ * Add the post_meta source to the block bindings API.
+ *
+ * @package gutenberg
+ */
+
+if ( function_exists( 'register_block_bindings_source' ) ) {
+	$post_meta_source_callback = function ( $source_attrs ) {
+		// Use the postId attribute if available
+		if ( isset( $source_attrs['postId'] ) ) {
+			$post_id = $source_attrs['postId'];
+		} else {
+			// I tried using $block_instance->context['postId'] but it wasn't available in the image block.
+			$post_id = get_the_ID();
+		}
+
+		return get_post_meta( $post_id, $source_attrs['value'], true );
+	};
+	register_block_bindings_source(
+		'post_meta',
+		__( 'Post Meta', 'gutenberg' ),
+		$post_meta_source_callback
+	);
+}
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index d4bb6c9b4586e..42663e127870c 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -83,118 +83,90 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments && (
-	array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ||
+	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ||
 	array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
 ) ) {
-	/**
-	 * Renders the block meta attributes.
-	 *
-	 * @param string   $block_content Block Content.
-	 * @param array    $block Block attributes.
-	 * @param WP_Block $block_instance The block instance.
-	 */
-	function gutenberg_render_block_connections( $block_content, $block, $block_instance ) {
-		$connection_sources = require __DIR__ . '/connection-sources/index.php';
-		$block_type         = $block_instance->block_type;
-
-		// Allowlist of blocks that support block connections.
-		// Currently, we only allow the following blocks and attributes:
-		// - Paragraph: content.
-		// - Image: url.
-		$blocks_attributes_allowlist = array(
-			'core/paragraph' => array( 'content' ),
-			'core/image'     => array( 'url' ),
-		);
-
-		// Whitelist of the block types that support block connections.
-		// Currently, we only allow the Paragraph and Image blocks to use block connections.
-		if ( ! in_array( $block['blockName'], array_keys( $blocks_attributes_allowlist ), true ) ) {
-			return $block_content;
-		}
-
-		// If for some reason, the block type is not found, skip it.
-		if ( null === $block_type ) {
-			return $block_content;
-		}
-
-		// If the block does not have support for block connections, skip it.
-		if ( ! block_has_support( $block_type, array( '__experimentalConnections' ), false ) ) {
-			return $block_content;
-		}
-
-		// Get all the attributes that have a connection.
-		$connected_attributes = $block['attrs']['connections']['attributes'] ?? false;
-		if ( ! $connected_attributes ) {
-			return $block_content;
-		}
-
-		foreach ( $connected_attributes as $attribute_name => $attribute_value ) {
-
-			// If the attribute is not in the allowlist, skip it.
-			if ( ! in_array( $attribute_name, $blocks_attributes_allowlist[ $block['blockName'] ], true ) ) {
-				continue;
-			}
-
-			// Skip if the source value is not "meta_fields" or "pattern_attributes".
-			if ( 'meta_fields' !== $attribute_value['source'] && 'pattern_attributes' !== $attribute_value['source'] ) {
-				continue;
-			}
 
-			// If the attribute does not have a source, skip it.
-			if ( ! isset( $block_type->attributes[ $attribute_name ]['source'] ) ) {
-				continue;
+	require_once __DIR__ . '/block-bindings/index.php';
+		// Allowed blocks that support block bindings.
+	// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
+	global $block_bindings_allowed_blocks;
+	$block_bindings_allowed_blocks = array(
+		'core/paragraph' => array( 'content' ),
+		'core/heading'   => array( 'content' ),
+		'core/image'     => array( 'url', 'title', 'alt' ),
+		'core/button'    => array( 'url', 'text' ),
+	);
+	if ( ! function_exists( 'process_block_bindings' ) ) {
+		/**
+		 * Process the block bindings attribute.
+		 *
+		 * @param string   $block_content Block Content.
+		 * @param array    $block Block attributes.
+		 * @param WP_Block $block_instance The block instance.
+		 */
+		function process_block_bindings( $block_content, $block, $block_instance ) {
+			// If the block doesn't have the bindings property, return.
+			if ( ! isset( $block['attrs']['metadata']['bindings'] ) ) {
+				return $block_content;
 			}
 
-			if ( 'pattern_attributes' === $attribute_value['source'] ) {
-				if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
+			// Assuming the following format for the bindings property of the "metadata" attribute:
+			//
+			// "bindings": {
+			//   "title": {
+			//     "source": {
+			//       "name": "post_meta",
+			//       "attributes": { "value": "text_custom_field" }
+			//     }
+			//   },
+			//   "url": {
+			//     "source": {
+			//       "name": "post_meta",
+			//       "attributes": { "value": "text_custom_field" }
+			//     }
+			//   }
+			// }
+			//
+			global $block_bindings_allowed_blocks;
+			global $block_bindings_sources;
+			$modified_block_content = $block_content;
+			foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
+				// If the block is not in the list, stop processing.
+				if ( ! isset( $block_bindings_allowed_blocks[ $block['blockName'] ] ) ) {
+					return $block_content;
+				}
+				// If the attribute is not in the list, process next attribute.
+				if ( ! in_array( $binding_attribute, $block_bindings_allowed_blocks[ $block['blockName'] ], true ) ) {
 					continue;
 				}
-
-				$custom_value = $connection_sources[ $attribute_value['source'] ]( $block_instance, $attribute_name );
-			} else {
-				// If the attribute does not specify the name of the custom field, skip it.
-				if ( ! isset( $attribute_value['value'] ) ) {
+				// If no source is provided, or that source is not registered, process next attribute.
+				if ( ! isset( $binding_source['source'] ) || ! isset( $binding_source['source']['name'] ) || ! isset( $block_bindings_sources[ $binding_source['source']['name'] ] ) ) {
 					continue;
 				}
 
-				// Get the content from the connection source.
-				$custom_value = $connection_sources[ $attribute_value['source'] ](
-					$block_instance,
-					$attribute_value['value']
-				);
-			}
-
-			if ( false === $custom_value ) {
-				continue;
-			}
+				$source_callback = $block_bindings_sources[ $binding_source['source']['name'] ]['apply'];
+				// Get the value based on the source.
+				if ( ! isset( $binding_source['source']['attributes'] ) ) {
+					$source_args = array();
+				} else {
+					$source_args = $binding_source['source']['attributes'];
+				}
+				$source_value = $source_callback( $source_args, $block_instance, $binding_attribute );
+				// If the value is null, process next attribute.
+				if ( is_null( $source_value ) ) {
+					continue;
+				}
 
-			$tags  = new WP_HTML_Tag_Processor( $block_content );
-			$found = $tags->next_tag(
-				array(
-					// TODO: In the future, when blocks other than Paragraph and Image are
-					// supported, we should build the full query from CSS selector.
-					'tag_name' => $block_type->attributes[ $attribute_name ]['selector'],
-				)
-			);
-			if ( ! $found ) {
-				return $block_content;
+				// Process the HTML based on the block and the attribute.
+				$modified_block_content = block_bindings_replace_html( $modified_block_content, $block['blockName'], $binding_attribute, $source_value );
 			}
-			$tag_name     = $tags->get_tag();
-			$markup       = "<$tag_name>$custom_value</$tag_name>";
-			$updated_tags = new WP_HTML_Tag_Processor( $markup );
-			$updated_tags->next_tag();
-
-			// Get all the attributes from the original block and add them to the new markup.
-			$names = $tags->get_attribute_names_with_prefix( '' );
-			foreach ( $names as $name ) {
-				$updated_tags->set_attribute( $name, $tags->get_attribute( $name ) );
-			}
-
-			return $updated_tags->get_updated_html();
+			return $modified_block_content;
 		}
 
-		return $block_content;
+		// Add filter only to the blocks in the list.
+		foreach ( $block_bindings_allowed_blocks as $block_name => $attributes ) {
+			add_filter( 'render_block_' . $block_name, 'process_block_bindings', 20, 3 );
+		}
 	}
-
-	add_filter( 'render_block', 'gutenberg_render_block_connections', 10, 3 );
 }
diff --git a/lib/experimental/connection-sources/index.php b/lib/experimental/connection-sources/index.php
deleted file mode 100644
index 4f9e06cb13b94..0000000000000
--- a/lib/experimental/connection-sources/index.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-/**
- * Connection sources that block attributes can be connected to.
- *
- * @package gutenberg
- */
-
-return array(
-	'name'               => 'meta',
-	'meta_fields'        => function ( $block_instance, $meta_field ) {
-		// We should probably also check if the meta field exists but for now it's okay because
-		// if it doesn't, `get_post_meta()` will just return an empty string.
-		return get_post_meta( $block_instance->context['postId'], $meta_field, true );
-	},
-	'pattern_attributes' => function ( $block_instance, $attribute_name ) {
-		$block_id = $block_instance->attributes['metadata']['id'];
-		return _wp_array_get(
-			$block_instance->context,
-			array( 'pattern/overrides', $block_id, $attribute_name ),
-			false
-		);
-	},
-);
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 5f61684e8b134..729376cf030dd 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -26,8 +26,8 @@ function gutenberg_enable_experiments() {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
 	}
 
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-connections', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalConnections = true', 'before' );
+	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
+		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalBlockBindings = true', 'before' );
 	}
 
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
index 2d2e76273d2d5..8af1eb82c6bed 100644
--- a/lib/experiments-page.php
+++ b/lib/experiments-page.php
@@ -128,13 +128,13 @@ function gutenberg_initialize_experiments_settings() {
 
 	add_settings_field(
 		'gutenberg-custom-fields',
-		__( 'Connections', 'gutenberg' ),
+		__( 'Block Bindings & Custom Fields', 'gutenberg' ),
 		'gutenberg_display_experiment_field',
 		'gutenberg-experiments',
 		'gutenberg_experiments_section',
 		array(
-			'label' => __( 'Test connecting block attribute values to a custom field value', 'gutenberg' ),
-			'id'    => 'gutenberg-connections',
+			'label' => __( 'Test connecting block attributes to different sources like custom fields', 'gutenberg' ),
+			'id'    => 'gutenberg-block-bindings',
 		)
 	);
 
diff --git a/packages/block-editor/src/hooks/custom-fields.js b/packages/block-editor/src/hooks/custom-fields.js
deleted file mode 100644
index 9b677933adc13..0000000000000
--- a/packages/block-editor/src/hooks/custom-fields.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { addFilter } from '@wordpress/hooks';
-import { PanelBody, TextControl } from '@wordpress/components';
-import { __, sprintf } from '@wordpress/i18n';
-import { hasBlockSupport } from '@wordpress/blocks';
-
-/**
- * Internal dependencies
- */
-import { InspectorControls } from '../components';
-import { useBlockEditingMode } from '../components/block-editing-mode';
-
-/**
- * Filters registered block settings, extending attributes to include `connections`.
- *
- * @param {Object} settings Original block settings.
- *
- * @return {Object} Filtered block settings.
- */
-function addAttribute( settings ) {
-	if ( hasBlockSupport( settings, '__experimentalConnections', true ) ) {
-		// Gracefully handle if settings.attributes.connections is undefined.
-		settings.attributes = {
-			...settings.attributes,
-			connections: {
-				type: 'object',
-			},
-		};
-	}
-
-	return settings;
-}
-
-function CustomFieldsControlPure( { name, connections, setAttributes } ) {
-	const blockEditingMode = useBlockEditingMode();
-	if ( blockEditingMode !== 'default' ) {
-		return null;
-	}
-
-	// If the block is a paragraph or image block, we need to know which
-	// attribute to use for the connection. Only the `content` attribute
-	// of the paragraph block and the `url` attribute of the image block are supported.
-	let attributeName;
-	if ( name === 'core/paragraph' ) attributeName = 'content';
-	if ( name === 'core/image' ) attributeName = 'url';
-
-	return (
-		<InspectorControls>
-			<PanelBody title={ __( 'Connections' ) } initialOpen={ true }>
-				<TextControl
-					__nextHasNoMarginBottom
-					autoComplete="off"
-					label={ __( 'Custom field meta_key' ) }
-					value={
-						connections?.attributes?.[ attributeName ]?.value || ''
-					}
-					onChange={ ( nextValue ) => {
-						if ( nextValue === '' ) {
-							setAttributes( {
-								connections: undefined,
-								[ attributeName ]: undefined,
-								placeholder: undefined,
-							} );
-						} else {
-							setAttributes( {
-								connections: {
-									attributes: {
-										// The attributeName will be either `content` or `url`.
-										[ attributeName ]: {
-											// Source will be variable, could be post_meta, user_meta, term_meta, etc.
-											// Could even be a custom source like a social media attribute.
-											source: 'meta_fields',
-											value: nextValue,
-										},
-									},
-								},
-								[ attributeName ]: undefined,
-								placeholder: sprintf(
-									'This content will be replaced on the frontend by the value of "%s" custom field.',
-									nextValue
-								),
-							} );
-						}
-					} }
-				/>
-			</PanelBody>
-		</InspectorControls>
-	);
-}
-
-export default {
-	edit: CustomFieldsControlPure,
-	attributeKeys: [ 'connections' ],
-	hasSupport( name ) {
-		return (
-			hasBlockSupport( name, '__experimentalConnections', false ) &&
-			// Check if the current block is a paragraph or image block.
-			// Currently, only these two blocks are supported.
-			[ 'core/paragraph', 'core/image' ].includes( name )
-		);
-	},
-};
-
-if (
-	window.__experimentalConnections ||
-	window.__experimentalPatternPartialSyncing
-) {
-	addFilter(
-		'blocks.registerBlockType',
-		'core/editor/connections/attribute',
-		addAttribute
-	);
-}
diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js
index 385b9fe6b1511..f17c0a22166e4 100644
--- a/packages/block-editor/src/hooks/index.js
+++ b/packages/block-editor/src/hooks/index.js
@@ -25,7 +25,6 @@ import layout from './layout';
 import childLayout from './layout-child';
 import contentLockUI from './content-lock-ui';
 import './metadata';
-import customFields from './custom-fields';
 import blockHooks from './block-hooks';
 import blockRenaming from './block-renaming';
 
@@ -39,7 +38,6 @@ createBlockEditFilter(
 		position,
 		layout,
 		contentLockUI,
-		window.__experimentalConnections ? customFields : null,
 		blockHooks,
 		blockRenaming,
 	].filter( Boolean )
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 57db2d166f9f9..6331d33c27a7b 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -27,7 +27,7 @@ import {
 	store as blockEditorStore,
 	BlockControls,
 } from '@wordpress/block-editor';
-import { getBlockSupport, parse, cloneBlock } from '@wordpress/blocks';
+import { parse, cloneBlock } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -38,17 +38,17 @@ const { useLayoutClasses } = unlock( blockEditorPrivateApis );
 
 function isPartiallySynced( block ) {
 	return (
-		!! getBlockSupport( block.name, '__experimentalConnections', false ) &&
-		!! block.attributes.connections?.attributes &&
-		Object.values( block.attributes.connections.attributes ).some(
-			( connection ) => connection.source === 'pattern_attributes'
+		'core/paragraph' === block.name &&
+		!! block.attributes.metadata?.bindings &&
+		Object.values( block.attributes.metadata.bindings ).some(
+			( binding ) => binding.source.name === 'pattern_attributes'
 		)
 	);
 }
 function getPartiallySyncedAttributes( block ) {
-	return Object.entries( block.attributes.connections.attributes )
+	return Object.entries( block.attributes.metadata.bindings )
 		.filter(
-			( [ , connection ] ) => connection.source === 'pattern_attributes'
+			( [ , binding ] ) => binding.source.name === 'pattern_attributes'
 		)
 		.map( ( [ attributeKey ] ) => attributeKey );
 }
diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index 3fe4fbb34e102..a81d754d8ca1b 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -41,7 +41,6 @@
 				"text": true
 			}
 		},
-		"__experimentalConnections": true,
 		"spacing": {
 			"margin": true,
 			"padding": true,
diff --git a/packages/editor/src/hooks/pattern-partial-syncing.js b/packages/editor/src/hooks/pattern-partial-syncing.js
index 40bd1e16dfc00..a940890dfa693 100644
--- a/packages/editor/src/hooks/pattern-partial-syncing.js
+++ b/packages/editor/src/hooks/pattern-partial-syncing.js
@@ -5,7 +5,6 @@ import { addFilter } from '@wordpress/hooks';
 import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
 import { createHigherOrderComponent } from '@wordpress/compose';
 import { useBlockEditingMode } from '@wordpress/block-editor';
-import { hasBlockSupport } from '@wordpress/blocks';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -32,11 +31,6 @@ const {
 const withPartialSyncingControls = createHigherOrderComponent(
 	( BlockEdit ) => ( props ) => {
 		const blockEditingMode = useBlockEditingMode();
-		const hasCustomFieldsSupport = hasBlockSupport(
-			props.name,
-			'__experimentalConnections',
-			false
-		);
 		const isEditingPattern = useSelect(
 			( select ) =>
 				select( editorStore ).getCurrentPostType() ===
@@ -45,7 +39,6 @@ const withPartialSyncingControls = createHigherOrderComponent(
 		);
 
 		const shouldShowPartialSyncingControls =
-			hasCustomFieldsSupport &&
 			props.isSelected &&
 			isEditingPattern &&
 			blockEditingMode === 'default' &&
diff --git a/packages/patterns/src/components/partial-syncing-controls.js b/packages/patterns/src/components/partial-syncing-controls.js
index d20bd1d347012..f5ac19bc05f3d 100644
--- a/packages/patterns/src/components/partial-syncing-controls.js
+++ b/packages/patterns/src/components/partial-syncing-controls.js
@@ -19,7 +19,7 @@ function PartialSyncingControls( { name, attributes, setAttributes } ) {
 	const syncedAttributes = PARTIAL_SYNCING_SUPPORTED_BLOCKS[ name ];
 	const attributeSources = Object.keys( syncedAttributes ).map(
 		( attributeName ) =>
-			attributes.connections?.attributes?.[ attributeName ]?.source
+			attributes.metadata?.bindings?.[ attributeName ]?.source?.name
 	);
 	const isConnectedToOtherSources = attributeSources.every(
 		( source ) => source && source !== 'pattern_attributes'
@@ -30,52 +30,58 @@ function PartialSyncingControls( { name, attributes, setAttributes } ) {
 		return null;
 	}
 
-	function updateConnections( isChecked ) {
-		let updatedConnections = {
-			...attributes.connections,
-			attributes: { ...attributes.connections?.attributes },
+	function updateBindings( isChecked ) {
+		let updatedBindings = {
+			...attributes?.metadata?.bindings,
 		};
 
 		if ( ! isChecked ) {
 			for ( const attributeName of Object.keys( syncedAttributes ) ) {
 				if (
-					updatedConnections.attributes[ attributeName ]?.source ===
+					updatedBindings[ attributeName ]?.source?.name ===
 					'pattern_attributes'
 				) {
-					delete updatedConnections.attributes[ attributeName ];
+					delete updatedBindings[ attributeName ];
 				}
 			}
-			if ( ! Object.keys( updatedConnections.attributes ).length ) {
-				delete updatedConnections.attributes;
-			}
-			if ( ! Object.keys( updatedConnections ).length ) {
-				updatedConnections = undefined;
+			if ( ! Object.keys( updatedBindings ).length ) {
+				updatedBindings = undefined;
 			}
 			setAttributes( {
-				connections: updatedConnections,
+				metadata: {
+					...attributes.metadata,
+					bindings: updatedBindings,
+				},
 			} );
 			return;
 		}
 
 		for ( const attributeName of Object.keys( syncedAttributes ) ) {
-			if ( ! updatedConnections.attributes[ attributeName ] ) {
-				updatedConnections.attributes[ attributeName ] = {
-					source: 'pattern_attributes',
+			if ( ! updatedBindings[ attributeName ] ) {
+				updatedBindings[ attributeName ] = {
+					source: {
+						name: 'pattern_attributes',
+					},
 				};
 			}
 		}
 
 		if ( typeof attributes.metadata?.id === 'string' ) {
-			setAttributes( { connections: updatedConnections } );
+			setAttributes( {
+				metadata: {
+					...attributes.metadata,
+					bindings: updatedBindings,
+				},
+			} );
 			return;
 		}
 
 		const id = nanoid( 6 );
 		setAttributes( {
-			connections: updatedConnections,
 			metadata: {
 				...attributes.metadata,
 				id,
+				bindings: updatedBindings,
 			},
 		} );
 	}
@@ -93,7 +99,7 @@ function PartialSyncingControls( { name, attributes, setAttributes } ) {
 						( source ) => source === 'pattern_attributes'
 					) }
 					onChange={ ( isChecked ) => {
-						updateConnections( isChecked );
+						updateBindings( isChecked );
 					} }
 				/>
 			</BaseControl>

From ea90b753197c6cc39a400b31bd68e5b4d648ccd4 Mon Sep 17 00:00:00 2001
From: Takashi Kitajima <inc@2inc.org>
Date: Fri, 12 Jan 2024 01:12:27 +0900
Subject: [PATCH 061/296] Display guidance text when there is no font (#56825)

* #56734 When there is no font, the border should not appear. Display further guidance text.

* update text

* Fix formatting in font-families.js

* Improve readability

---------

Co-authored-by: Matias Benedetto <matias.benedetto@gmail.com>
Co-authored-by: Sarah Norris <sarah@sekai.co.uk>
---
 .../components/global-styles/font-families.js | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/font-families.js b/packages/edit-site/src/components/global-styles/font-families.js
index 06bf595328332..7a7597878eacd 100644
--- a/packages/edit-site/src/components/global-styles/font-families.js
+++ b/packages/edit-site/src/components/global-styles/font-families.js
@@ -26,6 +26,8 @@ function FontFamilies() {
 	const { modalTabOpen, toggleModal, themeFonts, customFonts } =
 		useContext( FontLibraryContext );
 
+	const hasFonts = 0 < customFonts.length || 0 < themeFonts.length;
+
 	return (
 		<>
 			{ !! modalTabOpen && (
@@ -51,14 +53,18 @@ function FontFamilies() {
 						</Tooltip>
 					</HStack>
 				</HStack>
-				<ItemGroup isBordered isSeparated>
-					{ customFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-					{ themeFonts.map( ( font ) => (
-						<FontFamilyItem key={ font.slug } font={ font } />
-					) ) }
-				</ItemGroup>
+				{ hasFonts ? (
+					<ItemGroup isBordered isSeparated>
+						{ customFonts.map( ( font ) => (
+							<FontFamilyItem key={ font.slug } font={ font } />
+						) ) }
+						{ themeFonts.map( ( font ) => (
+							<FontFamilyItem key={ font.slug } font={ font } />
+						) ) }
+					</ItemGroup>
+				) : (
+					<>{ __( 'No fonts installed.' ) }</>
+				) }
 			</VStack>
 		</>
 	);

From 4f97a3fcebffb0eb5ce18ae3bc0182a66f0e03fa Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Thu, 11 Jan 2024 17:48:41 +0100
Subject: [PATCH 062/296] ColorPicker: store internal HSLA state for better
 slider UX (#57555)

* ColorPicker: store internal HSLA state for better slider UX

* CHANGELOG

* Comments

* Memoize `colorPropHSL`, rename to `colorPropHSLA`

* Add unit test

* Set internal SLA only when not calling onChange to reduce visual glitches

* More test
---
 packages/components/CHANGELOG.md              |   1 +
 .../components/src/color-picker/hsl-input.tsx |  86 +++++---
 .../src/color-picker/test/index.tsx           | 206 ++++++++++++++++--
 3 files changed, 247 insertions(+), 46 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index a8dd57900cfae..5856259e47730 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -23,6 +23,7 @@
 
 ### Enhancements
 
+-   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
 -   Update `ariakit` to version `0.3.10` ([#57325](https://github.com/WordPress/gutenberg/pull/57325)).
 -   Update `@ariakit/react` to version `0.3.12` and @ariakit/test to version `0.3.7` ([#57547](https://github.com/WordPress/gutenberg/pull/57547)).
 -   `DropdownMenuV2`: do not collapse suffix width ([#57238](https://github.com/WordPress/gutenberg/pull/57238)).
diff --git a/packages/components/src/color-picker/hsl-input.tsx b/packages/components/src/color-picker/hsl-input.tsx
index 3331a97b3d4de..8d2b0c7c44489 100644
--- a/packages/components/src/color-picker/hsl-input.tsx
+++ b/packages/components/src/color-picker/hsl-input.tsx
@@ -3,6 +3,11 @@
  */
 import { colord } from 'colord';
 
+/**
+ * WordPress dependencies
+ */
+import { useState, useEffect, useMemo } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
@@ -10,7 +15,49 @@ import { InputWithSlider } from './input-with-slider';
 import type { HslInputProps } from './types';
 
 export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
-	const { h, s, l, a } = color.toHsl();
+	const colorPropHSLA = useMemo( () => color.toHsl(), [ color ] );
+
+	const [ internalHSLA, setInternalHSLA ] = useState( { ...colorPropHSLA } );
+
+	const isInternalColorSameAsReceivedColor = color.isEqual(
+		colord( internalHSLA )
+	);
+
+	useEffect( () => {
+		if ( ! isInternalColorSameAsReceivedColor ) {
+			// Keep internal HSLA color up to date with the received color prop
+			setInternalHSLA( colorPropHSLA );
+		}
+	}, [ colorPropHSLA, isInternalColorSameAsReceivedColor ] );
+
+	// If the internal color is equal to the received color prop, we can use the
+	// HSLA values from the local state which, compared to the received color prop,
+	// retain more details about the actual H and S values that the user selected,
+	// and thus allow for better UX when interacting with the H and S sliders.
+	const colorValue = isInternalColorSameAsReceivedColor
+		? internalHSLA
+		: colorPropHSLA;
+
+	const updateHSLAValue = (
+		partialNewValue: Partial< typeof colorPropHSLA >
+	) => {
+		const nextOnChangeValue = colord( {
+			...colorValue,
+			...partialNewValue,
+		} );
+
+		// Fire `onChange` only if the resulting color is different from the
+		// current one.
+		// Otherwise, update the internal HSLA color to cause a re-render.
+		if ( ! color.isEqual( nextOnChangeValue ) ) {
+			onChange( nextOnChangeValue );
+		} else {
+			setInternalHSLA( ( prevHSLA ) => ( {
+				...prevHSLA,
+				...partialNewValue,
+			} ) );
+		}
+	};
 
 	return (
 		<>
@@ -19,9 +66,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 359 }
 				label="Hue"
 				abbreviation="H"
-				value={ h }
+				value={ colorValue.h }
 				onChange={ ( nextH: number ) => {
-					onChange( colord( { h: nextH, s, l, a } ) );
+					updateHSLAValue( { h: nextH } );
 				} }
 			/>
 			<InputWithSlider
@@ -29,16 +76,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 100 }
 				label="Saturation"
 				abbreviation="S"
-				value={ s }
+				value={ colorValue.s }
 				onChange={ ( nextS: number ) => {
-					onChange(
-						colord( {
-							h,
-							s: nextS,
-							l,
-							a,
-						} )
-					);
+					updateHSLAValue( { s: nextS } );
 				} }
 			/>
 			<InputWithSlider
@@ -46,16 +86,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 				max={ 100 }
 				label="Lightness"
 				abbreviation="L"
-				value={ l }
+				value={ colorValue.l }
 				onChange={ ( nextL: number ) => {
-					onChange(
-						colord( {
-							h,
-							s,
-							l: nextL,
-							a,
-						} )
-					);
+					updateHSLAValue( { l: nextL } );
 				} }
 			/>
 			{ enableAlpha && (
@@ -64,16 +97,9 @@ export const HslInput = ( { color, onChange, enableAlpha }: HslInputProps ) => {
 					max={ 100 }
 					label="Alpha"
 					abbreviation="A"
-					value={ Math.trunc( 100 * a ) }
+					value={ Math.trunc( 100 * colorValue.a ) }
 					onChange={ ( nextA: number ) => {
-						onChange(
-							colord( {
-								h,
-								s,
-								l,
-								a: nextA / 100,
-							} )
-						);
+						updateHSLAValue( { a: nextA / 100 } );
 					} }
 				/>
 			) }
diff --git a/packages/components/src/color-picker/test/index.tsx b/packages/components/src/color-picker/test/index.tsx
index 8d584d626487a..98e059d5994de 100644
--- a/packages/components/src/color-picker/test/index.tsx
+++ b/packages/components/src/color-picker/test/index.tsx
@@ -1,13 +1,19 @@
 /**
  * External dependencies
  */
-import { screen, render } from '@testing-library/react';
+import { fireEvent, screen, render, waitFor } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
+/**
+ * WordPress dependencies
+ */
+import { useState } from '@wordpress/element';
+
 /**
  * Internal dependencies
  */
 import { ColorPicker } from '..';
+import { click } from '@ariakit/test';
 
 const hslaMatcher = expect.objectContaining( {
 	h: expect.any( Number ),
@@ -133,20 +139,39 @@ describe( 'ColorPicker', () => {
 		} );
 	} );
 
-	describe.each( [
-		[ 'hue', 'Hue', '#aad52a' ],
-		[ 'saturation', 'Saturation', '#20dfdf' ],
-		[ 'lightness', 'Lightness', '#95eaea' ],
-	] )( 'HSL inputs', ( colorInput, inputLabel, expected ) => {
-		it( `should fire onChange with the correct value when the ${ colorInput } value is updated`, async () => {
+	describe( 'HSL inputs', () => {
+		it( 'sliders should use accurate H and S values based on user interaction when possible', async () => {
 			const user = userEvent.setup();
 			const onChange = jest.fn();
-			const color = '#2ad5d5';
+
+			const ControlledColorPicker = ( {
+				onChange: onChangeProp,
+				...restProps
+			}: React.ComponentProps< typeof ColorPicker > ) => {
+				const [ colorState, setColorState ] = useState( '#000000' );
+
+				const internalOnChange: typeof onChangeProp = ( newColor ) => {
+					onChangeProp?.( newColor );
+					setColorState( newColor );
+				};
+
+				return (
+					<>
+						<ColorPicker
+							{ ...restProps }
+							onChange={ internalOnChange }
+							color={ colorState }
+						/>
+						<button onClick={ () => setColorState( '#4d87ba' ) }>
+							Set color to #4d87ba
+						</button>
+					</>
+				);
+			};
 
 			render(
-				<ColorPicker
+				<ControlledColorPicker
 					onChange={ onChange }
-					color={ color }
 					enableAlpha={ false }
 				/>
 			);
@@ -156,16 +181,165 @@ describe( 'ColorPicker', () => {
 
 			await user.selectOptions( formatSelector, 'hsl' );
 
-			const inputElement = screen.getByRole( 'spinbutton', {
-				name: inputLabel,
+			const hueSliders = screen.getAllByRole( 'slider', {
+				name: 'Hue',
 			} );
-			expect( inputElement ).toBeVisible();
+			expect( hueSliders ).toHaveLength( 2 );
 
-			await user.clear( inputElement );
-			await user.type( inputElement, '75' );
+			// Reason for the `!` post-fix expression operator: if the check above
+			// doesn't fail, we're guaranteed that `hueSlider` is not undefined.
+			const hueSlider = hueSliders.at( -1 )!;
+			const saturationSlider = screen.getByRole( 'slider', {
+				name: 'Saturation',
+			} );
+			const lightnessSlider = screen.getByRole( 'slider', {
+				name: 'Lightness',
+			} );
+			const hueNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Hue',
+			} );
+			const saturationNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Saturation',
+			} );
+			const lightnessNumberInput = screen.getByRole( 'spinbutton', {
+				name: 'Lightness',
+			} );
+
+			// All initial inputs should have a value of `0` since the color is black.
+			expect( hueSlider ).toHaveValue( '0' );
+			expect( saturationSlider ).toHaveValue( '0' );
+			expect( lightnessSlider ).toHaveValue( '0' );
+			expect( hueNumberInput ).toHaveValue( 0 );
+			expect( saturationNumberInput ).toHaveValue( 0 );
+			expect( lightnessNumberInput ).toHaveValue( 0 );
+
+			// Interact with the Hue slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still black.
+			fireEvent.change( hueSlider, { target: { value: 80 } } );
+
+			expect( hueSlider ).toHaveValue( '80' );
+			expect( hueNumberInput ).toHaveValue( 80 );
+			expect( onChange ).not.toHaveBeenCalled();
+
+			// Interact with the Saturation slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still black.
+			fireEvent.change( saturationSlider, { target: { value: 50 } } );
+
+			expect( saturationSlider ).toHaveValue( '50' );
+			expect( saturationNumberInput ).toHaveValue( 50 );
+			expect( onChange ).not.toHaveBeenCalled();
+
+			// Interact with the Lightness slider, it should change its value (and the
+			// value of the associated number input). It should also cause the
+			// `onChange` callback to fire, since changing the lightness actually
+			// causes the color to change.
+			fireEvent.change( lightnessSlider, { target: { value: 30 } } );
 
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '30' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 30 );
+			expect( onChange ).toHaveBeenCalledTimes( 1 );
+			expect( onChange ).toHaveBeenLastCalledWith( '#597326' );
+
+			// Interact with the Lightness slider, setting to 100 (ie. white).
+			// It should also cause the `onChange` callback to fire, and reset the
+			// hue and saturation inputs to `0`.
+			fireEvent.change( lightnessSlider, { target: { value: 100 } } );
+
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '100' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 100 );
+			expect( hueSlider ).toHaveValue( '0' );
+			expect( saturationSlider ).toHaveValue( '0' );
+			expect( hueNumberInput ).toHaveValue( 0 );
+			expect( saturationNumberInput ).toHaveValue( 0 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+			expect( onChange ).toHaveBeenLastCalledWith( '#ffffff' );
+
+			// Interact with the Hue slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still white.
+			fireEvent.change( hueSlider, { target: { value: 147 } } );
+
+			expect( hueSlider ).toHaveValue( '147' );
+			expect( hueNumberInput ).toHaveValue( 147 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+
+			// Interact with the Saturation slider, it should change its value (and the
+			// value of the associated number input), but it shouldn't cause the
+			// `onChange` callback to fire, since the resulting color is still white.
+			fireEvent.change( saturationSlider, { target: { value: 82 } } );
+
+			expect( saturationSlider ).toHaveValue( '82' );
+			expect( saturationNumberInput ).toHaveValue( 82 );
+			expect( onChange ).toHaveBeenCalledTimes( 2 );
+
+			// Interact with the Lightness slider, it should change its value (and the
+			// value of the associated number input). It should also cause the
+			// `onChange` callback to fire, since changing the lightness actually
+			// causes the color to change.
+			fireEvent.change( lightnessSlider, { target: { value: 14 } } );
+
+			await waitFor( () =>
+				expect( lightnessSlider ).toHaveValue( '14' )
+			);
+			expect( lightnessNumberInput ).toHaveValue( 14 );
 			expect( onChange ).toHaveBeenCalledTimes( 3 );
-			expect( onChange ).toHaveBeenLastCalledWith( expected );
+			expect( onChange ).toHaveBeenLastCalledWith( '#064121' );
+
+			// Set the color externally. All inputs should update to match the H/S/L
+			// value of the new color.
+			const setColorButton = screen.getByRole( 'button', {
+				name: /set color/i,
+			} );
+			await click( setColorButton );
+
+			expect( hueSlider ).toHaveValue( '208' );
+			expect( hueNumberInput ).toHaveValue( 208 );
+			expect( saturationSlider ).toHaveValue( '44' );
+			expect( saturationNumberInput ).toHaveValue( 44 );
+			expect( lightnessSlider ).toHaveValue( '52' );
+			expect( lightnessNumberInput ).toHaveValue( 52 );
+		} );
+
+		describe.each( [
+			[ 'hue', 'Hue', '#aad52a' ],
+			[ 'saturation', 'Saturation', '#20dfdf' ],
+			[ 'lightness', 'Lightness', '#95eaea' ],
+		] )( 'HSL inputs', ( colorInput, inputLabel, expected ) => {
+			it( `should fire onChange with the correct value when the ${ colorInput } value is updated`, async () => {
+				const user = userEvent.setup();
+				const onChange = jest.fn();
+				const color = '#2ad5d5';
+
+				render(
+					<ColorPicker
+						onChange={ onChange }
+						color={ color }
+						enableAlpha={ false }
+					/>
+				);
+
+				const formatSelector = screen.getByRole( 'combobox' );
+				expect( formatSelector ).toBeVisible();
+
+				await user.selectOptions( formatSelector, 'hsl' );
+
+				const inputElement = screen.getByRole( 'spinbutton', {
+					name: inputLabel,
+				} );
+				expect( inputElement ).toBeVisible();
+
+				await user.clear( inputElement );
+				await user.type( inputElement, '75' );
+
+				expect( onChange ).toHaveBeenCalledTimes( 3 );
+				expect( onChange ).toHaveBeenLastCalledWith( expected );
+			} );
 		} );
 	} );
 } );

From 50ac86a8d530c8673e9ce5f3eeadbca437c40d98 Mon Sep 17 00:00:00 2001
From: Jason Crist <jcrist@pbking.com>
Date: Thu, 11 Jan 2024 12:06:31 -0500
Subject: [PATCH 063/296] Download then upload font face assets when installing
 from a collection (#57694)

* Download then upload font face assets when installing from a collection

* Add error handling to font download-then-upload

* Check for downloadFromUrl property before downloading to upload

* Simplify downloadFontFaceAsset and move to utils.

* Add error handling to downloadFontFaceAsset

* Use Promise.all to handle multiple asynchronous font face downloads.
>
>
Co-authored-by: Sarah Norris <sarah@sekai.co.uk>

---------

Co-authored-by: Jeff Ong <jonger4@gmail.com>
Co-authored-by: Sarah Norris <sarah@sekai.co.uk>
---
 .../font-library-modal/font-collection.js     | 30 +++++++++++++++-
 .../font-library-modal/utils/index.js         | 35 +++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
index fc39e2e009653..f7f33032f1e3f 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -31,6 +31,7 @@ import { toggleFont } from './utils/toggleFont';
 import { getFontsOutline } from './utils/fonts-outline';
 import GoogleFontsConfirmDialog from './google-fonts-confirm-dialog';
 import { getNoticeFromInstallResponse } from './utils/get-notice-from-response';
+import { downloadFontFaceAsset } from './utils';
 
 const DEFAULT_CATEGORY = {
 	id: 'all',
@@ -154,7 +155,34 @@ function FontCollection( { id } ) {
 	};
 
 	const handleInstall = async () => {
-		const response = await installFont( fontsToInstall[ 0 ] );
+		const fontFamily = fontsToInstall[ 0 ];
+
+		try {
+			if ( fontFamily?.fontFace ) {
+				await Promise.all(
+					fontFamily.fontFace.map( async ( fontFace ) => {
+						if ( fontFace.downloadFromUrl ) {
+							fontFace.file = await downloadFontFaceAsset(
+								fontFace.downloadFromUrl
+							);
+							delete fontFace.downloadFromUrl;
+						}
+					} )
+				);
+			}
+		} catch ( error ) {
+			// If any of the fonts fail to download,
+			// show an error notice and stop the request from being sent.
+			setNotice( {
+				type: 'error',
+				message: __(
+					'Error installing the fonts, could not be downloaded.'
+				),
+			} );
+			return;
+		}
+
+		const response = await installFont( fontFamily );
 		const installNotice = getNoticeFromInstallResponse( response );
 		setNotice( installNotice );
 		resetFontsToInstall();
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
index 2874dd446efb4..0aa0f7edb4aec 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
@@ -9,6 +9,11 @@ import { privateApis as componentsPrivateApis } from '@wordpress/components';
 import { FONT_WEIGHTS, FONT_STYLES } from './constants';
 import { unlock } from '../../../../lock-unlock';
 
+/**
+ * Browser dependencies
+ */
+const { File } = window;
+
 export function setUIValuesNeeded( font, extraValues = {} ) {
 	if ( ! font.name && ( font.fontFamily || font.slug ) ) {
 		font.name = font.fontFamily || font.slug;
@@ -164,3 +169,33 @@ export function makeFormDataFromFontFamily( fontFamily ) {
 	formData.append( 'font_family_settings', JSON.stringify( newFontFamily ) );
 	return formData;
 }
+
+/*
+ * Downloads a font face asset from a URL to the client and returns a File object.
+ */
+export async function downloadFontFaceAsset( url ) {
+	return fetch( new Request( url ) )
+		.then( ( response ) => {
+			if ( ! response.ok ) {
+				throw new Error(
+					`Error downloading font face asset from ${ url }. Server responded with status: ${ response.status }`
+				);
+			}
+			return response.blob();
+		} )
+		.then( ( blob ) => {
+			const filename = url.split( '/' ).pop();
+			const file = new File( [ blob ], filename, {
+				type: blob.type,
+			} );
+			return file;
+		} )
+		.catch( ( error ) => {
+			// eslint-disable-next-line no-console
+			console.error(
+				`Error downloading font face asset from ${ url }:`,
+				error
+			);
+			throw error;
+		} );
+}

From 7dd920589ab5abe5ec7a53e4b5c98a17add9cc4a Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Thu, 11 Jan 2024 17:13:07 +0000
Subject: [PATCH 064/296] Fix: Typos on __unstableSetTemporarilyEditingAsBlocks
 documentation. (#57768)

---
 packages/block-editor/src/store/actions.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
index da9beb0ba73a9..4b396045a73c2 100644
--- a/packages/block-editor/src/store/actions.js
+++ b/packages/block-editor/src/store/actions.js
@@ -1679,13 +1679,13 @@ export function setBlockVisibility( updates ) {
 }
 
 /**
- * Action that sets whether a block is being temporaritly edited as blocks.
+ * Action that sets whether a block is being temporarily edited as blocks.
  *
  * DO-NOT-USE in production.
  * This action is created for internal/experimental only usage and may be
  * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
  *
- * @param {?string} temporarilyEditingAsBlocks The block's clientId being temporaritly edited as blocks.
+ * @param {?string} temporarilyEditingAsBlocks The block's clientId being temporarily edited as blocks.
  */
 export function __unstableSetTemporarilyEditingAsBlocks(
 	temporarilyEditingAsBlocks

From 167c439e2f899337ee510d35b05b23b97b8aa091 Mon Sep 17 00:00:00 2001
From: Miguel Fonseca <150562+mcsf@users.noreply.github.com>
Date: Thu, 11 Jan 2024 17:19:15 +0000
Subject: [PATCH 065/296] Scripts: Remove unused variable in
 bin/list-experimental-api-matches.sh (#57771)

---
 bin/list-experimental-api-matches.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/list-experimental-api-matches.sh b/bin/list-experimental-api-matches.sh
index 156464c4e7375..d9399e63e5cf6 100755
--- a/bin/list-experimental-api-matches.sh
+++ b/bin/list-experimental-api-matches.sh
@@ -31,7 +31,7 @@ namespace() {
 	awk -F: '
 		{ print module($1), $2 }
 		function module(path) {
-			n = split(path, parts, "/")
+			split(path, parts, "/")
 			if (parts[1] == "lib") return "lib"
 			return parts[1] "/" parts[2]
 		}'

From f154dc7f2cdec6d6253132e388cf60a64692ee9a Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Thu, 11 Jan 2024 17:31:52 +0000
Subject: [PATCH 066/296] Add: Bulk actions to dataviews with the new design.
 (#57255)

* Add: Bulk actions to dataviews with the new design.

* post rebase fixes.

* Add missing secondary variant

* Move bulk actions button position

* Don't render bulk actions functionality when there are no bulk actions avaliable.

* Fix button padding

* Fix focus loss

* fix flex shring

* Fix focus issues

* remove data items meanwhile removed from the selection

* remove line accidently added

* Fix vertical alignment post rebase.

* Fix unrequired decodeEntities usage.

* Apply feedback to the promises

* lint fix

* Feedback application

* Labels object instead of function

* Introduce removeTemplates action

* fix css rebase issue

* lint fixes.

* remove labels

* simplify logic condition

* fix some classnames

* multiple small changes of feedback

* remove getItemTitle

* Inspect Promise.allSettled result

* typo

* case fixing

* update patterns actions

* Added a selection mark

* lint fixes

* Style adjustments

---------

Co-authored-by: James Koster <james@jameskoster.co.uk>
---
 packages/dataviews/src/bulk-actions.js        | 187 ++++++++++++++++++
 packages/dataviews/src/dataviews.js           |  31 ++-
 packages/dataviews/src/item-actions.js        |   6 +-
 packages/dataviews/src/style.scss             |  56 +++++-
 packages/dataviews/src/view-table.js          | 146 +++++++++++++-
 .../edit-site/src/components/actions/index.js |  21 +-
 .../dataviews-pattern-actions.js              |  17 +-
 .../src/components/page-templates/index.js    |   6 +-
 .../page-templates/template-actions.js        | 114 +++++++----
 packages/edit-site/src/store/actions.js       |  56 +-----
 .../edit-site/src/store/private-actions.js    | 103 ++++++++++
 11 files changed, 628 insertions(+), 115 deletions(-)
 create mode 100644 packages/dataviews/src/bulk-actions.js

diff --git a/packages/dataviews/src/bulk-actions.js b/packages/dataviews/src/bulk-actions.js
new file mode 100644
index 0000000000000..9fd9f628286e0
--- /dev/null
+++ b/packages/dataviews/src/bulk-actions.js
@@ -0,0 +1,187 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	privateApis as componentsPrivateApis,
+	Button,
+	Modal,
+} from '@wordpress/components';
+import { __, sprintf, _n } from '@wordpress/i18n';
+import { useMemo, useState, useCallback } from '@wordpress/element';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from './lock-unlock';
+
+const {
+	DropdownMenuV2: DropdownMenu,
+	DropdownMenuGroupV2: DropdownMenuGroup,
+	DropdownMenuItemV2: DropdownMenuItem,
+	DropdownMenuSeparatorV2: DropdownMenuSeparator,
+} = unlock( componentsPrivateApis );
+
+function ActionWithModal( {
+	action,
+	selectedItems,
+	setActionWithModal,
+	onMenuOpenChange,
+} ) {
+	const eligibleItems = useMemo( () => {
+		return selectedItems.filter( ( item ) => action.isEligible( item ) );
+	}, [ action, selectedItems ] );
+	const { RenderModal, hideModalHeader } = action;
+	const onCloseModal = useCallback( () => {
+		setActionWithModal( undefined );
+	}, [ setActionWithModal ] );
+	return (
+		<Modal
+			title={ ! hideModalHeader && action.label }
+			__experimentalHideHeader={ !! hideModalHeader }
+			onRequestClose={ onCloseModal }
+			overlayClassName="dataviews-action-modal"
+		>
+			<RenderModal
+				items={ eligibleItems }
+				closeModal={ onCloseModal }
+				onPerform={ () => onMenuOpenChange( false ) }
+			/>
+		</Modal>
+	);
+}
+
+function BulkActionItem( { action, selectedItems, setActionWithModal } ) {
+	const eligibleItems = useMemo( () => {
+		return selectedItems.filter( ( item ) => action.isEligible( item ) );
+	}, [ action, selectedItems ] );
+
+	const shouldShowModal = !! action.RenderModal;
+
+	return (
+		<DropdownMenuItem
+			key={ action.id }
+			disabled={ eligibleItems.length === 0 }
+			hideOnClick={ ! shouldShowModal }
+			onClick={ async () => {
+				if ( shouldShowModal ) {
+					setActionWithModal( action );
+				} else {
+					await action.callback( eligibleItems );
+				}
+			} }
+			suffix={
+				eligibleItems.length > 0 ? eligibleItems.length : undefined
+			}
+		>
+			{ action.label }
+		</DropdownMenuItem>
+	);
+}
+
+function ActionsMenuGroup( { actions, selectedItems, setActionWithModal } ) {
+	return (
+		<>
+			<DropdownMenuGroup>
+				{ actions.map( ( action ) => (
+					<BulkActionItem
+						key={ action.id }
+						action={ action }
+						selectedItems={ selectedItems }
+						setActionWithModal={ setActionWithModal }
+					/>
+				) ) }
+			</DropdownMenuGroup>
+			<DropdownMenuSeparator />
+		</>
+	);
+}
+
+export default function BulkActions( {
+	data,
+	actions,
+	selection,
+	onSelectionChange,
+	getItemId,
+} ) {
+	const bulkActions = useMemo(
+		() => actions.filter( ( action ) => action.supportsBulk ),
+		[ actions ]
+	);
+	const areAllSelected = selection && selection.length === data.length;
+	const [ isMenuOpen, onMenuOpenChange ] = useState( false );
+	const [ actionWithModal, setActionWithModal ] = useState();
+	const selectedItems = useMemo( () => {
+		return data.filter( ( item ) =>
+			selection.includes( getItemId( item ) )
+		);
+	}, [ selection, data, getItemId ] );
+
+	if ( bulkActions.length === 0 ) {
+		return null;
+	}
+	return (
+		<>
+			<DropdownMenu
+				open={ isMenuOpen }
+				onOpenChange={ onMenuOpenChange }
+				label={ __( 'Bulk actions' ) }
+				style={ { minWidth: '240px' } }
+				trigger={
+					<Button
+						className="dataviews-bulk-edit-button"
+						__next40pxDefaultSize
+						variant="tertiary"
+						size="compact"
+					>
+						{ selection.length
+							? sprintf(
+									/* translators: %d: Number of items. */
+									_n(
+										'Edit %d item',
+										'Edit %d items',
+										selection.length
+									),
+									selection.length
+							  )
+							: __( 'Bulk edit' ) }
+					</Button>
+				}
+			>
+				<ActionsMenuGroup
+					actions={ bulkActions }
+					setActionWithModal={ setActionWithModal }
+					selectedItems={ selectedItems }
+				/>
+				<DropdownMenuGroup>
+					<DropdownMenuItem
+						disabled={ areAllSelected }
+						hideOnClick={ false }
+						onClick={ () => {
+							onSelectionChange( data );
+						} }
+						suffix={ data.length }
+					>
+						{ __( 'Select all' ) }
+					</DropdownMenuItem>
+					<DropdownMenuItem
+						disabled={ selection.length === 0 }
+						hideOnClick={ false }
+						onClick={ () => {
+							onSelectionChange( [] );
+						} }
+					>
+						{ __( 'Deselect' ) }
+					</DropdownMenuItem>
+				</DropdownMenuGroup>
+			</DropdownMenu>
+			{ actionWithModal && (
+				<ActionWithModal
+					action={ actionWithModal }
+					selectedItems={ selectedItems }
+					setActionWithModal={ setActionWithModal }
+					onMenuOpenChange={ onMenuOpenChange }
+				/>
+			) }
+		</>
+	);
+}
diff --git a/packages/dataviews/src/dataviews.js b/packages/dataviews/src/dataviews.js
index 61837e4f8fc96..64a70d46c7d12 100644
--- a/packages/dataviews/src/dataviews.js
+++ b/packages/dataviews/src/dataviews.js
@@ -5,7 +5,7 @@ import {
 	__experimentalVStack as VStack,
 	__experimentalHStack as HStack,
 } from '@wordpress/components';
-import { useMemo, useState, useCallback } from '@wordpress/element';
+import { useMemo, useState, useCallback, useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -14,7 +14,8 @@ import Pagination from './pagination';
 import ViewActions from './view-actions';
 import Filters from './filters';
 import Search from './search';
-import { VIEW_LAYOUTS } from './constants';
+import { VIEW_LAYOUTS, LAYOUT_TABLE } from './constants';
+import BulkActions from './bulk-actions';
 
 const defaultGetItemId = ( item ) => item.id;
 const defaultOnSelectionChange = () => {};
@@ -37,6 +38,23 @@ export default function DataViews( {
 } ) {
 	const [ selection, setSelection ] = useState( [] );
 
+	useEffect( () => {
+		if (
+			selection.length > 0 &&
+			selection.some(
+				( id ) => ! data.some( ( item ) => item.id === id )
+			)
+		) {
+			const newSelection = selection.filter( ( id ) =>
+				data.some( ( item ) => item.id === id )
+			);
+			setSelection( newSelection );
+			onSelectionChange(
+				data.filter( ( item ) => newSelection.includes( item.id ) )
+			);
+		}
+	}, [ selection, data, onSelectionChange ] );
+
 	const onSetSelection = useCallback(
 		( items ) => {
 			setSelection( items.map( ( item ) => item.id ) );
@@ -75,6 +93,15 @@ export default function DataViews( {
 							onChangeView={ onChangeView }
 						/>
 					</HStack>
+					{ view.type === LAYOUT_TABLE && (
+						<BulkActions
+							actions={ actions }
+							data={ data }
+							onSelectionChange={ onSetSelection }
+							selection={ selection }
+							getItemId={ getItemId }
+						/>
+					) }
 					<ViewActions
 						fields={ _fields }
 						view={ view }
diff --git a/packages/dataviews/src/item-actions.js b/packages/dataviews/src/item-actions.js
index d3d2c62f504fd..ce4dd6abef056 100644
--- a/packages/dataviews/src/item-actions.js
+++ b/packages/dataviews/src/item-actions.js
@@ -69,7 +69,7 @@ function ActionWithModal( { action, item, ActionTrigger } ) {
 					) }` }
 				>
 					<RenderModal
-						item={ item }
+						items={ [ item ] }
 						closeModal={ () => setIsModalOpen( false ) }
 					/>
 				</Modal>
@@ -96,7 +96,7 @@ function ActionsDropdownMenuGroup( { actions, item } ) {
 					<DropdownMenuItemTrigger
 						key={ action.id }
 						action={ action }
-						onClick={ () => action.callback( item ) }
+						onClick={ () => action.callback( [ item ] ) }
 					/>
 				);
 			} ) }
@@ -157,7 +157,7 @@ export default function ItemActions( { item, actions, isCompact } ) {
 						<ButtonTrigger
 							key={ action.id }
 							action={ action }
-							onClick={ () => action.callback( item ) }
+							onClick={ () => action.callback( [ item ] ) }
 						/>
 					);
 				} ) }
diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 80630050b68ef..d934ea0df62d0 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -18,6 +18,10 @@
 	}
 }
 
+.dataviews-filters__view-actions.components-h-stack {
+	align-items: center;
+}
+
 .dataviews-filters-button {
 	position: relative;
 }
@@ -81,6 +85,14 @@
 		&[data-field-id="actions"] {
 			text-align: right;
 		}
+
+		&.dataviews-view-table__checkbox-column {
+			padding-right: 0;
+		}
+
+		.components-checkbox-control__input-container {
+			margin: $grid-unit-05;
+		}
 	}
 	tr {
 		border-bottom: 1px solid $gray-100;
@@ -109,8 +121,32 @@
 		}
 
 		&:hover {
-			td {
-				background-color: #f8f8f8;
+			background-color: #f8f8f8;
+		}
+
+		.components-checkbox-control__input {
+			opacity: 0;
+
+			&:checked,
+			&:indeterminate,
+			&:focus {
+				opacity: 1;
+			}
+		}
+
+		&:focus-within,
+		&:hover {
+			.components-checkbox-control__input {
+				opacity: 1;
+			}
+		}
+
+		&.is-selected {
+			background-color: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+			color: $gray-700;
+
+			&:hover {
+				background-color: rgba(var(--wp-admin-theme-color--rgb), 0.08);
 			}
 		}
 	}
@@ -373,7 +409,23 @@
 	padding: 0 $grid-unit-40;
 }
 
+.dataviews-view-table-selection-checkbox label {
+	position: absolute;
+	width: 1px;
+	height: 1px;
+	padding: 0;
+	margin: -1px;
+	overflow: hidden;
+	clip: rect(0, 0, 0, 0);
+	white-space: nowrap;
+	border: 0;
+}
+
 .dataviews-filters__custom-menu-radio-item-prefix {
 	display: block;
 	width: 24px;
 }
+
+.dataviews-bulk-edit-button.components-button {
+	flex-shrink: 0;
+}
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index dc76572e30494..e59c4e001919c 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -1,18 +1,19 @@
 /**
  * External dependencies
  */
-import classNames from 'classnames';
+import classnames from 'classnames';
 
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
+import { __, sprintf } from '@wordpress/i18n';
 import { useAsyncList } from '@wordpress/compose';
 import { unseen, funnel } from '@wordpress/icons';
 import {
 	Button,
 	Icon,
 	privateApis as componentsPrivateApis,
+	CheckboxControl,
 } from '@wordpress/components';
 import {
 	Children,
@@ -306,6 +307,80 @@ function WithSeparators( { children } ) {
 		) );
 }
 
+function BulkSelectionCheckbox( { selection, onSelectionChange, data } ) {
+	const areAllSelected = selection.length === data.length;
+	return (
+		<CheckboxControl
+			className="dataviews-view-table-selection-checkbox"
+			__nextHasNoMarginBottom
+			checked={ areAllSelected }
+			indeterminate={ ! areAllSelected && selection.length }
+			onChange={ () => {
+				if ( areAllSelected ) {
+					onSelectionChange( [] );
+				} else {
+					onSelectionChange( data );
+				}
+			} }
+			label={ areAllSelected ? __( 'Deselect all' ) : __( 'Select all' ) }
+		/>
+	);
+}
+
+function SingleSelectionCheckbox( {
+	selection,
+	onSelectionChange,
+	item,
+	data,
+	getItemId,
+	primaryField,
+} ) {
+	const id = getItemId( item );
+	const isSelected = selection.includes( id );
+	let selectionLabel;
+	if ( primaryField?.getValue && item ) {
+		// eslint-disable-next-line @wordpress/valid-sprintf
+		selectionLabel = sprintf(
+			/* translators: %s: item title. */
+			isSelected ? __( 'Deselect item: %s' ) : __( 'Select item: %s' ),
+			primaryField.getValue( { item } )
+		);
+	} else {
+		selectionLabel = isSelected
+			? __( 'Select a new item' )
+			: __( 'Deselect item' );
+	}
+	return (
+		<CheckboxControl
+			className="dataviews-view-table-selection-checkbox"
+			__nextHasNoMarginBottom
+			checked={ isSelected }
+			label={ selectionLabel }
+			onChange={ () => {
+				if ( ! isSelected ) {
+					onSelectionChange(
+						data.filter( ( _item ) => {
+							const itemId = getItemId?.( _item );
+							return (
+								itemId === id || selection.includes( itemId )
+							);
+						} )
+					);
+				} else {
+					onSelectionChange(
+						data.filter( ( _item ) => {
+							const itemId = getItemId?.( _item );
+							return (
+								itemId !== id && selection.includes( itemId )
+							);
+						} )
+					);
+				}
+			} }
+		/>
+	);
+}
+
 function ViewTable( {
 	view,
 	onChangeView,
@@ -315,7 +390,10 @@ function ViewTable( {
 	getItemId,
 	isLoading = false,
 	deferredRendering,
+	selection,
+	onSelectionChange,
 } ) {
+	const hasBulkActions = actions?.some( ( action ) => action.supportsBulk );
 	const headerMenuRefs = useRef( new Map() );
 	const headerMenuToFocusRef = useRef();
 	const [ nextHeaderMenuToFocus, setNextHeaderMenuToFocus ] = useState();
@@ -348,14 +426,16 @@ function ViewTable( {
 	const visibleFields = fields.filter(
 		( field ) =>
 			! view.hiddenFields.includes( field.id ) &&
-			! [ view.layout.mediaField, view.layout.primaryField ].includes(
-				field.id
-			)
+			! [ view.layout.mediaField ].includes( field.id )
 	);
 	const usedData = deferredRendering ? asyncData : data;
 	const hasData = !! usedData?.length;
 	const sortValues = { asc: 'ascending', desc: 'descending' };
 
+	const primaryField = fields.find(
+		( field ) => field.id === view.layout.primaryField
+	);
+
 	return (
 		<div>
 			<table
@@ -364,7 +444,24 @@ function ViewTable( {
 				aria-describedby={ tableNoticeId }
 			>
 				<thead>
-					<tr>
+					<tr className="dataviews-view-table__row">
+						{ hasBulkActions && (
+							<th
+								className="dataviews-view-table__checkbox-column"
+								style={ {
+									width: 20,
+									minWidth: 20,
+								} }
+								data-field-id="selection"
+								scope="col"
+							>
+								<BulkSelectionCheckbox
+									selection={ selection }
+									onSelectionChange={ onSelectionChange }
+									data={ data }
+								/>
+							</th>
+						) }
 						{ visibleFields.map( ( field, index ) => (
 							<th
 								key={ field.id }
@@ -419,8 +516,39 @@ function ViewTable( {
 				</thead>
 				<tbody>
 					{ hasData &&
-						usedData.map( ( item ) => (
-							<tr key={ getItemId( item ) }>
+						usedData.map( ( item, index ) => (
+							<tr
+								key={ getItemId( item ) }
+								className={ classnames(
+									'dataviews-view-table__row',
+									{
+										'is-selected': selection.includes(
+											getItemId( item ) || index
+										),
+									}
+								) }
+							>
+								{ hasBulkActions && (
+									<td
+										className="dataviews-view-table__checkbox-column"
+										style={ {
+											width: 20,
+											minWidth: 20,
+										} }
+									>
+										<SingleSelectionCheckbox
+											id={ getItemId( item ) || index }
+											item={ item }
+											selection={ selection }
+											onSelectionChange={
+												onSelectionChange
+											}
+											getItemId={ getItemId }
+											data={ data }
+											primaryField={ primaryField }
+										/>
+									</td>
+								) }
 								{ visibleFields.map( ( field ) => (
 									<td
 										key={ field.id }
@@ -450,7 +578,7 @@ function ViewTable( {
 				</tbody>
 			</table>
 			<div
-				className={ classNames( {
+				className={ classnames( {
 					'dataviews-loading': isLoading,
 					'dataviews-no-results': ! hasData && ! isLoading,
 				} ) }
diff --git a/packages/edit-site/src/components/actions/index.js b/packages/edit-site/src/components/actions/index.js
index ca673e3867bda..efe6762095c73 100644
--- a/packages/edit-site/src/components/actions/index.js
+++ b/packages/edit-site/src/components/actions/index.js
@@ -33,7 +33,9 @@ export const trashPostAction = {
 		return status !== 'trash';
 	},
 	hideModalHeader: true,
-	RenderModal: ( { item: post, closeModal } ) => {
+	RenderModal: ( { items: posts, closeModal } ) => {
+		// Todo - handle multiple posts
+		const post = posts[ 0 ];
 		const { createSuccessNotice, createErrorNotice } =
 			useDispatch( noticesStore );
 		const { deleteEntityRecord } = useDispatch( coreStore );
@@ -109,7 +111,9 @@ export function usePermanentlyDeletePostAction() {
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
-			async callback( post ) {
+			async callback( posts ) {
+				// Todo - handle multiple posts
+				const post = posts[ 0 ];
 				try {
 					await deleteEntityRecord(
 						'postType',
@@ -160,7 +164,9 @@ export function useRestorePostAction() {
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
-			async callback( post ) {
+			async callback( posts ) {
+				// Todo - handle multiple posts
+				const post = posts[ 0 ];
 				await editEntityRecord( 'postType', post.type, post.id, {
 					status: 'draft',
 				} );
@@ -211,7 +217,8 @@ export const viewPostAction = {
 	isEligible( post ) {
 		return post.status !== 'trash';
 	},
-	callback( post ) {
+	callback( posts ) {
+		const post = posts[ 0 ];
 		document.location.href = post.link;
 	},
 };
@@ -225,7 +232,8 @@ export function useEditPostAction() {
 			isEligible( { status } ) {
 				return status !== 'trash';
 			},
-			callback( post ) {
+			callback( posts ) {
+				const post = posts[ 0 ];
 				history.push( {
 					postId: post.id,
 					postType: post.type,
@@ -250,7 +258,8 @@ export const postRevisionsAction = {
 			post?._links?.[ 'version-history' ]?.[ 0 ]?.count ?? 0;
 		return lastRevisionId && revisionsCount > 1;
 	},
-	callback( post ) {
+	callback( posts ) {
+		const post = posts[ 0 ];
 		const href = addQueryArgs( 'revision.php', {
 			revision: post?._links?.[ 'predecessor-version' ]?.[ 0 ]?.id,
 		} );
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
index bf5210beb49fb..0c44c996ed373 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-pattern-actions.js
@@ -45,7 +45,7 @@ export const exportJSONaction = {
 	id: 'export-pattern',
 	label: __( 'Export as JSON' ),
 	isEligible: ( item ) => item.type === PATTERN_TYPES.user,
-	callback: ( item ) => {
+	callback: ( [ item ] ) => {
 		const json = {
 			__file: item.type,
 			title: item.title || item.name,
@@ -71,7 +71,8 @@ export const renameAction = {
 		const hasThemeFile = isTemplatePart && item.templatePart.has_theme_file;
 		return isCustomPattern && ! hasThemeFile;
 	},
-	RenderModal: ( { item, closeModal } ) => {
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
 		const [ title, setTitle ] = useState( () => item.title );
 		const { editEntityRecord, saveEditedEntityRecord } =
 			useDispatch( coreStore );
@@ -160,7 +161,8 @@ export const deleteAction = {
 		return canDeleteOrReset( item ) && ! hasThemeFile;
 	},
 	hideModalHeader: true,
-	RenderModal: ( { item, closeModal } ) => {
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
 		const { __experimentalDeleteReusableBlock } =
 			useDispatch( reusableBlocksStore );
 		const { createErrorNotice, createSuccessNotice } =
@@ -224,7 +226,8 @@ export const resetAction = {
 		return canDeleteOrReset( item ) && hasThemeFile;
 	},
 	hideModalHeader: true,
-	RenderModal: ( { item, closeModal } ) => {
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
 		const { removeTemplate } = useDispatch( editSiteStore );
 		return (
 			<VStack spacing="5">
@@ -254,7 +257,8 @@ export const duplicatePatternAction = {
 	label: _x( 'Duplicate', 'action label' ),
 	isEligible: ( item ) => item.type !== TEMPLATE_PART_POST_TYPE,
 	modalHeader: _x( 'Duplicate pattern', 'action label' ),
-	RenderModal: ( { item, closeModal } ) => {
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
 		const { categoryId = PATTERN_DEFAULT_CATEGORY } = getQueryArgs(
 			window.location.href
 		);
@@ -288,7 +292,8 @@ export const duplicateTemplatePartAction = {
 	label: _x( 'Duplicate', 'action label' ),
 	isEligible: ( item ) => item.type === TEMPLATE_PART_POST_TYPE,
 	modalHeader: _x( 'Duplicate template part', 'action label' ),
-	RenderModal: ( { item, closeModal } ) => {
+	RenderModal: ( { items, closeModal } ) => {
+		const [ item ] = items;
 		const { createSuccessNotice } = useDispatch( noticesStore );
 		const { categoryId = PATTERN_DEFAULT_CATEGORY } = getQueryArgs(
 			window.location.href
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index c0e0289311db6..ddc48542ee1b7 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -65,7 +65,9 @@ const { useHistory } = unlock( routerPrivateApis );
 const EMPTY_ARRAY = [];
 
 const defaultConfigPerViewType = {
-	[ LAYOUT_TABLE ]: {},
+	[ LAYOUT_TABLE ]: {
+		primaryField: 'title',
+	},
 	[ LAYOUT_GRID ]: {
 		mediaField: 'preview',
 		primaryField: 'title',
@@ -84,7 +86,7 @@ const DEFAULT_VIEW = {
 	// All fields are visible by default, so it's
 	// better to keep track of the hidden ones.
 	hiddenFields: [ 'preview' ],
-	layout: {},
+	layout: defaultConfigPerViewType[ LAYOUT_TABLE ],
 	filters: [],
 };
 
diff --git a/packages/edit-site/src/components/page-templates/template-actions.js b/packages/edit-site/src/components/page-templates/template-actions.js
index 9f5897e31fb93..7029d464ca867 100644
--- a/packages/edit-site/src/components/page-templates/template-actions.js
+++ b/packages/edit-site/src/components/page-templates/template-actions.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { backup, trash } from '@wordpress/icons';
-import { __, sprintf } from '@wordpress/i18n';
+import { __, sprintf, _n } from '@wordpress/i18n';
 import { useDispatch } from '@wordpress/data';
 import { useMemo, useState } from '@wordpress/element';
 import { store as coreStore } from '@wordpress/core-data';
@@ -19,6 +19,7 @@ import {
 /**
  * Internal dependencies
  */
+import { unlock } from '../../lock-unlock';
 import { store as editSiteStore } from '../../store';
 import isTemplateRevertable from '../../utils/is-template-revertable';
 import isTemplateRemovable from '../../utils/is-template-removable';
@@ -32,39 +33,64 @@ export function useResetTemplateAction() {
 	return useMemo(
 		() => ( {
 			id: 'reset-template',
-			label: __( 'Reset template' ),
+			label: __( 'Reset' ),
 			isPrimary: true,
 			icon: backup,
 			isEligible: isTemplateRevertable,
-			async callback( template ) {
+			supportsBulk: true,
+			async callback( templates ) {
 				try {
-					await revertTemplate( template, { allowUndo: false } );
-					await saveEditedEntityRecord(
-						'postType',
-						template.type,
-						template.id
-					);
+					for ( const template of templates ) {
+						await revertTemplate( template, {
+							allowUndo: false,
+						} );
+						await saveEditedEntityRecord(
+							'postType',
+							template.type,
+							template.id
+						);
+					}
 
 					createSuccessNotice(
-						sprintf(
-							/* translators: The template/part's name. */
-							__( '"%s" reverted.' ),
-							decodeEntities( template.title.rendered )
-						),
+						templates.length > 1
+							? sprintf(
+									/* translators: The number of items. */
+									__( '%s items reverted.' ),
+									templates.length
+							  )
+							: sprintf(
+									/* translators: The template/part's name. */
+									__( '"%s" reverted.' ),
+									decodeEntities(
+										templates[ 0 ].title.rendered
+									)
+							  ),
 						{
 							type: 'snackbar',
 							id: 'edit-site-template-reverted',
 						}
 					);
 				} catch ( error ) {
-					const fallbackErrorMessage =
-						template.type === TEMPLATE_POST_TYPE
-							? __(
-									'An error occurred while reverting the template.'
-							  )
-							: __(
-									'An error occurred while reverting the template part.'
-							  );
+					let fallbackErrorMessage;
+					if ( templates[ 0 ].type === TEMPLATE_POST_TYPE ) {
+						fallbackErrorMessage =
+							templates.length === 1
+								? __(
+										'An error occurred while reverting the template.'
+								  )
+								: __(
+										'An error occurred while reverting the templates.'
+								  );
+					} else {
+						fallbackErrorMessage =
+							templates.length === 1
+								? __(
+										'An error occurred while reverting the template part.'
+								  )
+								: __(
+										'An error occurred while reverting the template parts.'
+								  );
+					}
 					const errorMessage =
 						error.message && error.code !== 'unknown_error'
 							? error.message
@@ -85,21 +111,34 @@ export function useResetTemplateAction() {
 
 export const deleteTemplateAction = {
 	id: 'delete-template',
-	label: __( 'Delete template' ),
+	label: __( 'Delete' ),
 	isPrimary: true,
 	icon: trash,
 	isEligible: isTemplateRemovable,
+	supportsBulk: true,
 	hideModalHeader: true,
-	RenderModal: ( { item: template, closeModal } ) => {
-		const { removeTemplate } = useDispatch( editSiteStore );
+	RenderModal: ( { items: templates, closeModal, onPerform } ) => {
+		const { removeTemplates } = unlock( useDispatch( editSiteStore ) );
 		return (
 			<VStack spacing="5">
 				<Text>
-					{ sprintf(
-						// translators: %s: The template or template part's title.
-						__( 'Are you sure you want to delete "%s"?' ),
-						decodeEntities( template.title.rendered )
-					) }
+					{ templates.length > 1
+						? sprintf(
+								// translators: %d: number of items to delete.
+								_n(
+									'Delete %d item?',
+									'Delete %d items?',
+									templates.length
+								),
+								templates.length
+						  )
+						: sprintf(
+								// translators: %s: The template or template part's titles
+								__( 'Delete "%s"?' ),
+								decodeEntities(
+									templates?.[ 0 ]?.title?.rendered
+								)
+						  ) }
 				</Text>
 				<HStack justify="right">
 					<Button variant="tertiary" onClick={ closeModal }>
@@ -107,11 +146,15 @@ export const deleteTemplateAction = {
 					</Button>
 					<Button
 						variant="primary"
-						onClick={ () =>
-							removeTemplate( template, {
+						onClick={ async () => {
+							await removeTemplates( templates, {
 								allowUndo: false,
-							} )
-						}
+							} );
+							if ( onPerform ) {
+								onPerform();
+							}
+							closeModal();
+						} }
 					>
 						{ __( 'Delete' ) }
 					</Button>
@@ -126,7 +169,8 @@ export const renameTemplateAction = {
 	label: __( 'Rename' ),
 	isEligible: ( template ) =>
 		isTemplateRemovable( template ) && template.is_custom,
-	RenderModal: ( { item: template, closeModal } ) => {
+	RenderModal: ( { items: templates, closeModal } ) => {
+		const template = templates[ 0 ];
 		const title = decodeEntities( template.title.rendered );
 		const [ editedTitle, setEditedTitle ] = useState( title );
 		const {
diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
index 5a8adad8e198b..e7f2671784e1d 100644
--- a/packages/edit-site/src/store/actions.js
+++ b/packages/edit-site/src/store/actions.js
@@ -5,7 +5,7 @@ import apiFetch from '@wordpress/api-fetch';
 import { parse, __unstableSerializeAndClean } from '@wordpress/blocks';
 import deprecated from '@wordpress/deprecated';
 import { addQueryArgs } from '@wordpress/url';
-import { __, sprintf } from '@wordpress/i18n';
+import { __ } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as interfaceStore } from '@wordpress/interface';
@@ -13,7 +13,6 @@ import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as editorStore } from '@wordpress/editor';
 import { speak } from '@wordpress/a11y';
 import { store as preferencesStore } from '@wordpress/preferences';
-import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Internal dependencies
@@ -25,6 +24,8 @@ import {
 	TEMPLATE_PART_POST_TYPE,
 	NAVIGATION_POST_TYPE,
 } from '../utils/constants';
+import { removeTemplates } from './private-actions';
+
 /**
  * Dispatches an action that toggles a feature flag.
  *
@@ -133,54 +134,9 @@ export const addTemplate =
  *
  * @param {Object} template The template object.
  */
-export const removeTemplate =
-	( template ) =>
-	async ( { registry } ) => {
-		try {
-			await registry
-				.dispatch( coreStore )
-				.deleteEntityRecord( 'postType', template.type, template.id, {
-					force: true,
-				} );
-
-			const lastError = registry
-				.select( coreStore )
-				.getLastEntityDeleteError(
-					'postType',
-					template.type,
-					template.id
-				);
-
-			if ( lastError ) {
-				throw lastError;
-			}
-
-			// Depending on how the entity was retrieved it's title might be
-			// an object or simple string.
-			const templateTitle =
-				typeof template.title === 'string'
-					? template.title
-					: template.title?.rendered;
-
-			registry.dispatch( noticesStore ).createSuccessNotice(
-				sprintf(
-					/* translators: The template/part's name. */
-					__( '"%s" deleted.' ),
-					decodeEntities( templateTitle )
-				),
-				{ type: 'snackbar', id: 'site-editor-template-deleted-success' }
-			);
-		} catch ( error ) {
-			const errorMessage =
-				error.message && error.code !== 'unknown_error'
-					? error.message
-					: __( 'An error occurred while deleting the template.' );
-
-			registry
-				.dispatch( noticesStore )
-				.createErrorNotice( errorMessage, { type: 'snackbar' } );
-		}
-	};
+export const removeTemplate = ( template ) => {
+	return removeTemplates( [ template ] );
+};
 
 /**
  * Action that sets a template part.
diff --git a/packages/edit-site/src/store/private-actions.js b/packages/edit-site/src/store/private-actions.js
index 7354f7b9b8843..71f35dc66399e 100644
--- a/packages/edit-site/src/store/private-actions.js
+++ b/packages/edit-site/src/store/private-actions.js
@@ -4,6 +4,10 @@
 import { store as blockEditorStore } from '@wordpress/block-editor';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { store as editorStore } from '@wordpress/editor';
+import { store as coreStore } from '@wordpress/core-data';
+import { store as noticesStore } from '@wordpress/notices';
+import { __, sprintf } from '@wordpress/i18n';
+import { decodeEntities } from '@wordpress/html-entities';
 
 /**
  * Action that switches the canvas mode.
@@ -49,3 +53,102 @@ export const setEditorCanvasContainerView =
 			view,
 		} );
 	};
+
+/**
+ * Action that removes an array of templates.
+ *
+ * @param {Array} templates An array of template objects to remove.
+ */
+export const removeTemplates =
+	( templates ) =>
+	async ( { registry } ) => {
+		const promiseResult = await Promise.allSettled(
+			templates.map( ( template ) => {
+				return registry
+					.dispatch( coreStore )
+					.deleteEntityRecord(
+						'postType',
+						template.type,
+						template.id,
+						{ force: true },
+						{ throwOnError: true }
+					);
+			} )
+		);
+
+		// If all the promises were fulfilled with sucess.
+		if ( promiseResult.every( ( { status } ) => status === 'fulfilled' ) ) {
+			let successMessage;
+
+			if ( templates.length === 1 ) {
+				// Depending on how the entity was retrieved its title might be
+				// an object or simple string.
+				const templateTitle =
+					typeof templates[ 0 ].title === 'string'
+						? templates[ 0 ].title
+						: templates[ 0 ].title?.rendered;
+				successMessage = sprintf(
+					/* translators: The template/part's name. */
+					__( '"%s" deleted.' ),
+					decodeEntities( templateTitle )
+				);
+			} else {
+				successMessage = __( 'Templates deleted.' );
+			}
+
+			registry
+				.dispatch( noticesStore )
+				.createSuccessNotice( successMessage, {
+					type: 'snackbar',
+					id: 'site-editor-template-deleted-success',
+				} );
+		} else {
+			// If there was at lease one failure.
+			let errorMessage;
+			// If we were trying to delete a single template.
+			if ( promiseResult.length === 1 ) {
+				if ( promiseResult[ 0 ].reason?.message ) {
+					errorMessage = promiseResult[ 0 ].reason.message;
+				} else {
+					errorMessage = __(
+						'An error occurred while deleting the template.'
+					);
+				}
+				// If we were trying to delete a multiple templates
+			} else {
+				const errorMessages = new Set();
+				const failedPromises = promiseResult.filter(
+					( { status } ) => status === 'rejected'
+				);
+				for ( const failedPromise of failedPromises ) {
+					if ( failedPromise.reason?.message ) {
+						errorMessages.add( failedPromise.reason.message );
+					}
+				}
+				if ( errorMessages.size === 0 ) {
+					errorMessage = __(
+						'An error occurred while deleting the templates.'
+					);
+				} else if ( errorMessages.size === 1 ) {
+					errorMessage = sprintf(
+						/* translators: %s: an error message */
+						__(
+							'An error occurred while deleting the templates: %s'
+						),
+						[ ...errorMessages ][ 0 ]
+					);
+				} else {
+					errorMessage = sprintf(
+						/* translators: %s: a list of comma separated error messages */
+						__(
+							'Some errors occurred while deleting the templates: %s'
+						),
+						[ ...errorMessages ].join( ',' )
+					);
+				}
+			}
+			registry
+				.dispatch( noticesStore )
+				.createErrorNotice( errorMessage, { type: 'snackbar' } );
+		}
+	};

From 512027e45181778e508aea99abfafc2254700962 Mon Sep 17 00:00:00 2001
From: Glen Davies <glendaviesnz@users.noreply.github.com>
Date: Fri, 12 Jan 2024 09:01:03 +1300
Subject: [PATCH 067/296] Patterns: Add black border back when editing synced
 pattern in the post editor (#57631)

---
 .../block-editor/src/components/block-canvas/style.scss  | 9 ++++++++-
 packages/editor/src/components/editor-canvas/style.scss  | 5 -----
 packages/editor/src/style.scss                           | 1 -
 3 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 packages/editor/src/components/editor-canvas/style.scss

diff --git a/packages/block-editor/src/components/block-canvas/style.scss b/packages/block-editor/src/components/block-canvas/style.scss
index 54ccd407d74a2..631024b7c3aec 100644
--- a/packages/block-editor/src/components/block-canvas/style.scss
+++ b/packages/block-editor/src/components/block-canvas/style.scss
@@ -1,6 +1,13 @@
 iframe[name="editor-canvas"] {
 	width: 100%;
 	height: 100%;
-	background-color: $white;
 	display: block;
 }
+
+iframe[name="editor-canvas"]:not(.has-history) {
+	background-color: $white;
+}
+
+iframe[name="editor-canvas"].has-history {
+	padding: $grid-unit-60 $grid-unit-60 0;
+}
diff --git a/packages/editor/src/components/editor-canvas/style.scss b/packages/editor/src/components/editor-canvas/style.scss
deleted file mode 100644
index d5baf48012452..0000000000000
--- a/packages/editor/src/components/editor-canvas/style.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-.editor-canvas__iframe {
-	&.has-history {
-		padding: $grid-unit-60 $grid-unit-60 0;
-	}
-}
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index ff5a55a3881f9..09e50d1abed79 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -29,4 +29,3 @@
 @import "./components/preview-dropdown/style.scss";
 @import "./components/table-of-contents/style.scss";
 @import "./components/template-validation-notice/style.scss";
-@import "./components/editor-canvas/style.scss";

From 8ef45064a7ee07c2bea0ce32cc0f54eae430355f Mon Sep 17 00:00:00 2001
From: Chad Chadbourne <13856531+chad1008@users.noreply.github.com>
Date: Thu, 11 Jan 2024 15:25:25 -0500
Subject: [PATCH 068/296] Components: replace `TabPanel` with `Tabs` in the
 Editor Preferences Modal (#57293)

* add support for private apis

* implement Tabs

* update styles

* update code comment

* classnames rather than role selectors

* remove style nesting
---
 package-lock.json                             |  2 +
 packages/interface/lock-unlock.js             | 10 +++
 packages/interface/package.json               |  1 +
 .../preferences-modal-tabs/index.js           | 60 +++++++++++-----
 .../preferences-modal-tabs/style.scss         | 69 +++++++++----------
 packages/private-apis/src/implementation.js   |  1 +
 6 files changed, 89 insertions(+), 54 deletions(-)
 create mode 100644 packages/interface/lock-unlock.js

diff --git a/package-lock.json b/package-lock.json
index 96a14ec8eeb50..dc84ae2fba494 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55297,6 +55297,7 @@
 				"@wordpress/icons": "file:../icons",
 				"@wordpress/plugins": "file:../plugins",
 				"@wordpress/preferences": "file:../preferences",
+				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/viewport": "file:../viewport",
 				"classnames": "^2.3.1"
 			},
@@ -70104,6 +70105,7 @@
 				"@wordpress/icons": "file:../icons",
 				"@wordpress/plugins": "file:../plugins",
 				"@wordpress/preferences": "file:../preferences",
+				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/viewport": "file:../viewport",
 				"classnames": "^2.3.1"
 			}
diff --git a/packages/interface/lock-unlock.js b/packages/interface/lock-unlock.js
new file mode 100644
index 0000000000000..b6e29bb71c7c0
--- /dev/null
+++ b/packages/interface/lock-unlock.js
@@ -0,0 +1,10 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'@wordpress/interface'
+	);
diff --git a/packages/interface/package.json b/packages/interface/package.json
index df3d53990e0f5..7356a7b52d1d4 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -42,6 +42,7 @@
 		"@wordpress/icons": "file:../icons",
 		"@wordpress/plugins": "file:../plugins",
 		"@wordpress/preferences": "file:../preferences",
+		"@wordpress/private-apis": "file:../private-apis",
 		"@wordpress/viewport": "file:../viewport",
 		"classnames": "^2.3.1"
 	},
diff --git a/packages/interface/src/components/preferences-modal-tabs/index.js b/packages/interface/src/components/preferences-modal-tabs/index.js
index bc8f7358b834d..985d963227257 100644
--- a/packages/interface/src/components/preferences-modal-tabs/index.js
+++ b/packages/interface/src/components/preferences-modal-tabs/index.js
@@ -13,15 +13,22 @@ import {
 	__experimentalText as Text,
 	__experimentalTruncate as Truncate,
 	FlexItem,
-	TabPanel,
 	Card,
 	CardHeader,
 	CardBody,
+	privateApis as componentsPrivateApis,
 } from '@wordpress/components';
-import { useMemo, useCallback, useState } from '@wordpress/element';
+import { useMemo, useState } from '@wordpress/element';
 import { chevronLeft, chevronRight, Icon } from '@wordpress/icons';
 import { isRTL, __ } from '@wordpress/i18n';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../../lock-unlock';
+
+const { Tabs } = unlock( componentsPrivateApis );
+
 const PREFERENCES_MENU = 'preferences-menu';
 
 export default function PreferencesModalTabs( { sections } ) {
@@ -32,7 +39,7 @@ export default function PreferencesModalTabs( { sections } ) {
 	const [ activeMenu, setActiveMenu ] = useState( PREFERENCES_MENU );
 	/**
 	 * Create helper objects from `sections` for easier data handling.
-	 * `tabs` is used for creating the `TabPanel` and `sectionsContentMap`
+	 * `tabs` is used for creating the `Tabs` and `sectionsContentMap`
 	 * is used for easier access to active tab's content.
 	 */
 	const { tabs, sectionsContentMap } = useMemo( () => {
@@ -53,26 +60,41 @@ export default function PreferencesModalTabs( { sections } ) {
 		return mappedTabs;
 	}, [ sections ] );
 
-	const getCurrentTab = useCallback(
-		( tab ) => sectionsContentMap[ tab.name ] || null,
-		[ sectionsContentMap ]
-	);
-
 	let modalContent;
 	// We render different components based on the viewport size.
 	if ( isLargeViewport ) {
 		modalContent = (
-			<TabPanel
-				className="interface-preferences__tabs"
-				tabs={ tabs }
-				initialTabName={
-					activeMenu !== PREFERENCES_MENU ? activeMenu : undefined
-				}
-				onSelect={ setActiveMenu }
-				orientation="vertical"
-			>
-				{ getCurrentTab }
-			</TabPanel>
+			<div className="interface-preferences__tabs">
+				<Tabs
+					initialTabId={
+						activeMenu !== PREFERENCES_MENU ? activeMenu : undefined
+					}
+					onSelect={ setActiveMenu }
+					orientation="vertical"
+				>
+					<Tabs.TabList className="interface-preferences__tabs-tablist">
+						{ tabs.map( ( tab ) => (
+							<Tabs.Tab
+								tabId={ tab.name }
+								key={ tab.name }
+								className="interface-preferences__tabs-tab"
+							>
+								{ tab.title }
+							</Tabs.Tab>
+						) ) }
+					</Tabs.TabList>
+					{ tabs.map( ( tab ) => (
+						<Tabs.TabPanel
+							tabId={ tab.name }
+							key={ tab.name }
+							className="interface-preferences__tabs-tabpanel"
+							focusable={ false }
+						>
+							{ sectionsContentMap[ tab.name ] || null }
+						</Tabs.TabPanel>
+					) ) }
+				</Tabs>
+			</div>
 		);
 	} else {
 		modalContent = (
diff --git a/packages/interface/src/components/preferences-modal-tabs/style.scss b/packages/interface/src/components/preferences-modal-tabs/style.scss
index 04b71f0a773a2..f598545d69c25 100644
--- a/packages/interface/src/components/preferences-modal-tabs/style.scss
+++ b/packages/interface/src/components/preferences-modal-tabs/style.scss
@@ -1,45 +1,44 @@
 $vertical-tabs-width: 160px;
 
-.interface-preferences__tabs {
-	.components-tab-panel__tabs {
-		position: absolute;
-		top: $header-height + $grid-unit-30;
-		// Aligns button text instead of button box.
-		left: $grid-unit-20;
-		width: $vertical-tabs-width;
-
-		.components-tab-panel__tabs-item {
-			border-radius: $radius-block-ui;
-			font-weight: 400;
-
-			&.is-active {
-				background: $gray-100;
-				box-shadow: none;
-				font-weight: 500;
-			}
-
-			&.is-active::after {
-				content: none;
-			}
-
-			&:focus:not(:disabled) {
-				box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
-				// Windows high contrast mode.
-				outline: 2px solid transparent;
-			}
-
-			&:focus-visible::before {
-				content: none;
-			}
-		}
+.interface-preferences__tabs-tablist {
+	position: absolute;
+	top: $header-height + $grid-unit-30;
+	// Aligns button text instead of button box.
+	left: $grid-unit-20;
+	width: $vertical-tabs-width;
+
+}
+
+.interface-preferences__tabs-tab {
+	border-radius: $radius-block-ui;
+	font-weight: 400;
+
+	&[aria-selected="true"] {
+		background: $gray-100;
+		box-shadow: none;
+		font-weight: 500;
+	}
+
+	&[aria-selected="true"]::after {
+		content: none;
+	}
+
+	&[role="tab"]:focus:not(:disabled) {
+		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		// Windows high contrast mode.
+		outline: 2px solid transparent;
 	}
 
-	.components-tab-panel__tab-content {
-		padding-left: $grid-unit-30;
-		margin-left: $vertical-tabs-width;
+	&:focus-visible::before {
+		content: none;
 	}
 }
 
+.interface-preferences__tabs-tabpanel {
+	padding-left: $grid-unit-30;
+	margin-left: $vertical-tabs-width;
+}
+
 @media (max-width: #{ ($break-medium - 1) }) {
 	// Keep the navigator component from overflowing the modal content area
 	// to ensure that sticky position elements stick where intended.
diff --git a/packages/private-apis/src/implementation.js b/packages/private-apis/src/implementation.js
index 619478cf76386..4195991381d02 100644
--- a/packages/private-apis/src/implementation.js
+++ b/packages/private-apis/src/implementation.js
@@ -25,6 +25,7 @@ const CORE_MODULES_USING_PRIVATE_APIS = [
 	'@wordpress/edit-widgets',
 	'@wordpress/editor',
 	'@wordpress/format-library',
+	'@wordpress/interface',
 	'@wordpress/patterns',
 	'@wordpress/reusable-blocks',
 	'@wordpress/router',

From 2d5baf49f43d1cc3adae0a414aad991f9457c39f Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 12 Jan 2024 00:19:38 +0100
Subject: [PATCH 069/296] Scripts: Fix misplaced ReactRefreshWebpackPlugin
 (#57777)

Restore ReactRefreshWebpackPlugin to @wordpress/scripts webpack config.

#57461 accidentally moved the plugin to the modules config. It should have remained in the scripts webpack config and not been included in the modules config.
---
 packages/scripts/config/webpack.config.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/scripts/config/webpack.config.js b/packages/scripts/config/webpack.config.js
index 57bd258d32539..cc76568f6fb1b 100644
--- a/packages/scripts/config/webpack.config.js
+++ b/packages/scripts/config/webpack.config.js
@@ -380,6 +380,8 @@ const scriptConfig = {
 		process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
 		// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
 		new MiniCSSExtractPlugin( { filename: '[name].css' } ),
+		// React Fast Refresh.
+		hasReactFastRefresh && new ReactRefreshWebpackPlugin(),
 		// WP_NO_EXTERNALS global variable controls whether scripts' assets get
 		// generated, and the default externals set.
 		! process.env.WP_NO_EXTERNALS &&
@@ -423,8 +425,6 @@ if ( hasExperimentalModulesFlag ) {
 			process.env.WP_BUNDLE_ANALYZER && new BundleAnalyzerPlugin(),
 			// MiniCSSExtractPlugin to extract the CSS thats gets imported into JavaScript.
 			new MiniCSSExtractPlugin( { filename: '[name].css' } ),
-			// React Fast Refresh.
-			hasReactFastRefresh && new ReactRefreshWebpackPlugin(),
 			// WP_NO_EXTERNALS global variable controls whether scripts' assets get
 			// generated, and the default externals set.
 			! process.env.WP_NO_EXTERNALS &&

From d439f8ba42855b5d11c8c652a63405a95c3af484 Mon Sep 17 00:00:00 2001
From: tellthemachines <tellthemachines@users.noreply.github.com>
Date: Fri, 12 Jan 2024 10:55:26 +1100
Subject: [PATCH 070/296] Only prioritise Quote transform where relevant
 (#57749)

* Only prioritise Quote transform where relevant

* Add explanatory comment.
---
 .../block-transformations-menu.js             | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-switcher/block-transformations-menu.js b/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
index 033201d7facad..271b7fabd5173 100644
--- a/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
+++ b/packages/block-editor/src/components/block-switcher/block-transformations-menu.js
@@ -37,7 +37,7 @@ function useGroupedTransforms( possibleBlockTransformations ) {
 		const priorityTextTranformsNames = Object.keys(
 			priorityContentTranformationBlocks
 		);
-		return possibleBlockTransformations.reduce(
+		const groupedPossibleTransforms = possibleBlockTransformations.reduce(
 			( accumulator, item ) => {
 				const { name } = item;
 				if ( priorityTextTranformsNames.includes( name ) ) {
@@ -49,6 +49,23 @@ function useGroupedTransforms( possibleBlockTransformations ) {
 			},
 			{ priorityTextTransformations: [], restTransformations: [] }
 		);
+		/**
+		 * If there is only one priority text transformation and it's a Quote,
+		 * is should move to the rest transformations. This is because Quote can
+		 * be a container for any block type, so in multi-block selection it will
+		 * always be suggested, even for non-text blocks.
+		 */
+		if (
+			groupedPossibleTransforms.priorityTextTransformations.length ===
+				1 &&
+			groupedPossibleTransforms.priorityTextTransformations[ 0 ].name ===
+				'core/quote'
+		) {
+			const singleQuote =
+				groupedPossibleTransforms.priorityTextTransformations.pop();
+			groupedPossibleTransforms.restTransformations.push( singleQuote );
+		}
+		return groupedPossibleTransforms;
 	}, [ possibleBlockTransformations ] );
 
 	// Order the priority text transformations.

From b41c08fb3fec22743b4dcdd23a37b9e4df55b054 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Thu, 11 Jan 2024 21:04:40 -0300
Subject: [PATCH 071/296] Font Library: Add font collection JSON schema
 (#57736)

* move font family to their on definition

* adding font-collection.json schema

* adding settings

* updating README

* update property name

* resolve json schema references

* throw error on definition not found

* add description

* disallow additional properties

* fix typo in function name

Co-authored-by: Jeff Ong <jonger4@gmail.com>

* fix typo in function name

Co-authored-by: Jeff Ong <jonger4@gmail.com>

* fix wording

Co-authored-by: Jeff Ong <jonger4@gmail.com>

* remove unwanted comment

Co-authored-by: Jeff Ong <jonger4@gmail.com>

* format  js

---------

Co-authored-by: Jeff Ong <jonger4@gmail.com>
---
 bin/api-docs/gen-theme-reference.js |  40 ++++-
 schemas/README.md                   |  20 ++-
 schemas/json/font-collection.json   |  59 +++++++
 schemas/json/theme.json             | 236 ++++++++++++++--------------
 4 files changed, 236 insertions(+), 119 deletions(-)
 create mode 100644 schemas/json/font-collection.json

diff --git a/bin/api-docs/gen-theme-reference.js b/bin/api-docs/gen-theme-reference.js
index f638bb708890a..0ea9e282e5463 100644
--- a/bin/api-docs/gen-theme-reference.js
+++ b/bin/api-docs/gen-theme-reference.js
@@ -74,6 +74,42 @@ const keys = ( maybeObject ) => {
 	return Object.keys( maybeObject );
 };
 
+/**
+ * Get definition from ref.
+ *
+ * @param {string} ref
+ * @return {Object} definition
+ * @throws {Error} If the referenced definition is not found in 'themejson.definitions'.
+ *
+ * @example
+ * getDefinition( '#/definitions/typographyProperties/properties/fontFamily' )
+ *  // returns themejson.definitions.typographyProperties.properties.fontFamily
+ */
+const resolveDefinitionRef = ( ref ) => {
+	const refParts = ref.split( '/' );
+	const definition = refParts[ refParts.length - 1 ];
+	if ( ! themejson.definitions[ definition ] ) {
+		throw new Error( `Can't resolve '${ ref }'. Definition not found` );
+	}
+	return themejson.definitions[ definition ];
+};
+
+/**
+ * Get properties from an array.
+ *
+ * @param {Object} items
+ * @return {Object} properties
+ */
+const getPropertiesFromArray = ( items ) => {
+	// if its a $ref resolve it
+	if ( items.$ref ) {
+		return resolveDefinitionRef( items.$ref ).properties;
+	}
+
+	// otherwise just return the properties
+	return items.properties;
+};
+
 /**
  * Convert settings properties to markup.
  *
@@ -96,7 +132,9 @@ const getSettingsPropertiesMarkup = ( struct ) => {
 		const def = 'default' in props[ key ] ? props[ key ].default : '';
 		const ps =
 			props[ key ].type === 'array'
-				? keys( props[ key ].items.properties ).sort().join( ', ' )
+				? keys( getPropertiesFromArray( props[ key ].items ) )
+						.sort()
+						.join( ', ' )
 				: '';
 		markup += `| ${ key } | ${ props[ key ].type } | ${ def } | ${ ps } |\n`;
 	} );
diff --git a/schemas/README.md b/schemas/README.md
index 1b2d8992cccb9..fa695115f33ab 100644
--- a/schemas/README.md
+++ b/schemas/README.md
@@ -1,6 +1,6 @@
 # Schemas
 
-The collection of schemas used in WordPress, including the `theme.json` and `block.json` schemas.
+The collection of schemas used in WordPress, including the `theme.json`, `block.json` and `font-collection.json` schemas.
 
 JSON schemas are used by code editors to offer tooltips, autocomplete, and validation.
 
@@ -24,6 +24,14 @@ Or in your `theme.json`:
 }
 ```
 
+Or in your `font-collection.json`:
+
+```json
+{
+	"$schema": "https://schemas.wp.org/trunk/font-collection.json"
+}
+```
+
 For a specific version of the schema, replace `trunk` with `wp/X.X`:
 
 ```json
@@ -56,8 +64,16 @@ To allow this you will need to:
 }
 ```
 
+-   update your font collections's `font-collection.json` to include:
+
+```json
+{
+	"$schema": "file://{{FULL_FILE_PATH}}/schemas/json/font-collection.json"
+}
+```
+
 Be sure to replace `{{FULL_FILE_PATH}}` with the full local path to your Gutenberg repo.
 
-With this in place you should now be able to edit either `schemas/json/theme .json` or `schemas/json/block.json` in order to see changes reflected in `theme.json` or `block.json` in your IDE.
+With this in place you should now be able to edit either `schemas/json/theme .json`, `schemas/json/block.json` or `schemas/json/font-collection.json` in order to see changes reflected in `theme.json`, `block.json` or `font-collection.json` in your IDE.
 
 <br/><br/><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/schemas/json/font-collection.json b/schemas/json/font-collection.json
new file mode 100644
index 0000000000000..a6ca2b1412e6d
--- /dev/null
+++ b/schemas/json/font-collection.json
@@ -0,0 +1,59 @@
+{
+	"title": "JSON schema for WordPress Font Collections",
+	"$schema": "http://json-schema.org/draft-04/schema#",
+	"type": "object",
+	"properties": {
+		"$schema": {
+			"description": "JSON schema URI for font-collection.json.",
+			"type": "string"
+		},
+		"version": {
+			"description": "Version of font-collection.json schema to use.",
+			"type": "integer",
+			"enum": [ 1 ]
+		},
+		"font_families": {
+			"type": "array",
+			"description": "Array of font families ready to be installed",
+			"items": {
+				"type": "object",
+				"properties": {
+					"font_family_settings": {
+						"description": "Font family settings as in theme.json",
+						"allOf": [
+							{ "$ref": "./theme.json#/definitions/fontFamily" }
+						]
+					},
+					"categories": {
+						"type": "array",
+						"description": "Array of category slugs",
+						"items": {
+							"type": "string"
+						}
+					}
+				},
+				"required": [ "font_family_settings" ],
+				"additionalProperties": false
+			}
+		},
+		"categories": {
+			"type": "array",
+			"description": "Array of category objects",
+			"items": {
+				"type": "object",
+				"properties": {
+					"slug": {
+						"type": "string"
+					},
+					"name": {
+						"type": "string"
+					}
+				},
+				"required": [ "slug", "name" ],
+				"additionalProperties": false
+			}
+		}
+	},
+	"additionalProperties": false,
+	"required": [ "$schema", "version", "font_families" ]
+}
diff --git a/schemas/json/theme.json b/schemas/json/theme.json
index 9f633fc77ec75..6ae8d15df63d2 100644
--- a/schemas/json/theme.json
+++ b/schemas/json/theme.json
@@ -614,132 +614,136 @@
 							"description": "Font family presets for the font family selector.\nGenerates a single custom property (`--wp--preset--font-family--{slug}`) per preset value.",
 							"type": "array",
 							"items": {
-								"type": "object",
-								"properties": {
-									"name": {
-										"description": "Name of the font family preset, translatable.",
-										"type": "string"
-									},
-									"slug": {
-										"description": "Kebab-case unique identifier for the font family preset.",
-										"type": "string"
-									},
-									"fontFamily": {
-										"description": "CSS font-family value.",
+								"$ref": "#/definitions/fontFamily"
+							}
+						}
+					},
+					"additionalProperties": false
+				}
+			}
+		},
+		"fontFamily": {
+			"type": "object",
+			"description": "Font family preset",
+			"properties": {
+				"name": {
+					"description": "Name of the font family preset, translatable.",
+					"type": "string"
+				},
+				"slug": {
+					"description": "Kebab-case unique identifier for the font family preset.",
+					"type": "string"
+				},
+				"fontFamily": {
+					"description": "CSS font-family value.",
+					"type": "string"
+				},
+				"preview": {
+					"description": "URL to a preview image of the font family.",
+					"type": "string"
+				},
+				"fontFace": {
+					"description": "Array of font-face declarations.",
+					"type": "array",
+					"items": {
+						"type": "object",
+						"properties": {
+							"fontFamily": {
+								"description": "CSS font-family value.",
+								"type": "string",
+								"default": ""
+							},
+							"fontStyle": {
+								"description": "CSS font-style value.",
+								"type": "string",
+								"default": "normal"
+							},
+							"fontWeight": {
+								"description": "List of available font weights, separated by a space.",
+								"default": "400",
+								"oneOf": [
+									{
 										"type": "string"
 									},
-									"preview": {
-										"description": "URL to a preview image of the font family.",
+									{
+										"type": "integer"
+									}
+								]
+							},
+							"fontDisplay": {
+								"description": "CSS font-display value.",
+								"type": "string",
+								"default": "fallback",
+								"enum": [
+									"auto",
+									"block",
+									"fallback",
+									"swap",
+									"optional"
+								]
+							},
+							"src": {
+								"description": "Paths or URLs to the font files.",
+								"oneOf": [
+									{
 										"type": "string"
 									},
-									"fontFace": {
-										"description": "Array of font-face declarations.",
+									{
 										"type": "array",
 										"items": {
-											"type": "object",
-											"properties": {
-												"fontFamily": {
-													"description": "CSS font-family value.",
-													"type": "string",
-													"default": ""
-												},
-												"fontStyle": {
-													"description": "CSS font-style value.",
-													"type": "string",
-													"default": "normal"
-												},
-												"fontWeight": {
-													"description": "List of available font weights, separated by a space.",
-													"default": "400",
-													"oneOf": [
-														{
-															"type": "string"
-														},
-														{
-															"type": "integer"
-														}
-													]
-												},
-												"fontDisplay": {
-													"description": "CSS font-display value.",
-													"type": "string",
-													"default": "fallback",
-													"enum": [
-														"auto",
-														"block",
-														"fallback",
-														"swap",
-														"optional"
-													]
-												},
-												"src": {
-													"description": "Paths or URLs to the font files.",
-													"oneOf": [
-														{
-															"type": "string"
-														},
-														{
-															"type": "array",
-															"items": {
-																"type": "string"
-															}
-														}
-													],
-													"default": []
-												},
-												"fontStretch": {
-													"description": "CSS font-stretch value.",
-													"type": "string"
-												},
-												"ascentOverride": {
-													"description": "CSS ascent-override value.",
-													"type": "string"
-												},
-												"descentOverride": {
-													"description": "CSS descent-override value.",
-													"type": "string"
-												},
-												"fontVariant": {
-													"description": "CSS font-variant value.",
-													"type": "string"
-												},
-												"fontFeatureSettings": {
-													"description": "CSS font-feature-settings value.",
-													"type": "string"
-												},
-												"fontVariationSettings": {
-													"description": "CSS font-variation-settings value.",
-													"type": "string"
-												},
-												"lineGapOverride": {
-													"description": "CSS line-gap-override value.",
-													"type": "string"
-												},
-												"sizeAdjust": {
-													"description": "CSS size-adjust value.",
-													"type": "string"
-												},
-												"unicodeRange": {
-													"description": "CSS unicode-range value.",
-													"type": "string"
-												},
-												"preview": {
-													"description": "URL to a preview image of the font face.",
-													"type": "string"
-												}
-											},
-											"required": [ "fontFamily", "src" ],
-											"additionalProperties": false
+											"type": "string"
 										}
 									}
-								},
-								"additionalProperties": false
+								],
+								"default": []
+							},
+							"fontStretch": {
+								"description": "CSS font-stretch value.",
+								"type": "string"
+							},
+							"ascentOverride": {
+								"description": "CSS ascent-override value.",
+								"type": "string"
+							},
+							"descentOverride": {
+								"description": "CSS descent-override value.",
+								"type": "string"
+							},
+							"fontVariant": {
+								"description": "CSS font-variant value.",
+								"type": "string"
+							},
+							"fontFeatureSettings": {
+								"description": "CSS font-feature-settings value.",
+								"type": "string"
+							},
+							"fontVariationSettings": {
+								"description": "CSS font-variation-settings value.",
+								"type": "string"
+							},
+							"lineGapOverride": {
+								"description": "CSS line-gap-override value.",
+								"type": "string"
+							},
+							"sizeAdjust": {
+								"description": "CSS size-adjust value.",
+								"type": "string"
+							},
+							"unicodeRange": {
+								"description": "CSS unicode-range value.",
+								"type": "string"
+							},
+							"preview": {
+								"description": "URL to a preview image of the font face.",
+								"type": "string"
 							}
-						}
-					},
-					"additionalProperties": false
+						},
+						"required": [ "fontFamily", "src" ],
+						"additionalProperties": false
+					}
 				}
-			}
+			},
+			"additionalProperties": false
 		},
 		"settingsPropertiesCustom": {
 			"type": "object",

From 3dba5c9f37cf4700252cda58f5b818215b356625 Mon Sep 17 00:00:00 2001
From: Ramon <ramonjd@users.noreply.github.com>
Date: Fri, 12 Jan 2024 12:46:59 +1100
Subject: [PATCH 072/296] Remove the unnecessary padding from preview iframe
 body tags (#57748)

---
 packages/edit-site/src/components/revisions/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/revisions/index.js b/packages/edit-site/src/components/revisions/index.js
index 3d69788089579..bb2cc8feabb93 100644
--- a/packages/edit-site/src/components/revisions/index.js
+++ b/packages/edit-site/src/components/revisions/index.js
@@ -78,7 +78,7 @@ function Revisions( { userConfig, blocks } ) {
 					{
 						// Forming a "block formatting context" to prevent margin collapsing.
 						// @see https://developer.mozilla.org/en-US/docs/Web/Guide/CSS/Block_formatting_context
-						`.is-root-container { display: flow-root; } body { position: relative; padding: 32px; }`
+						`.is-root-container { display: flow-root; }`
 					}
 				</style>
 				<Disabled className="edit-site-revisions__example-preview__content">

From 9dcd4ccdee77893b29212bec42e309ea95a1152d Mon Sep 17 00:00:00 2001
From: Brooke <35543432+brookewp@users.noreply.github.com>
Date: Thu, 11 Jan 2024 19:04:17 -0800
Subject: [PATCH 073/296] `BoxControl`: update design (#56665)

---
 packages/components/CHANGELOG.md              |   1 +
 .../src/box-control/all-input-control.tsx     |  88 +++++---
 .../src/box-control/axial-input-controls.tsx  | 145 ++++++-------
 packages/components/src/box-control/index.tsx |  99 ++++-----
 .../src/box-control/input-controls.tsx        | 194 ++++++++++--------
 .../box-control/styles/box-control-styles.ts  |  82 ++------
 .../styles/box-control-visualizer-styles.ts   |  75 -------
 .../components/src/box-control/test/index.tsx | 144 +++++++++++--
 packages/components/src/box-control/types.ts  |  25 +--
 .../src/box-control/unit-control.tsx          |  74 -------
 packages/components/src/box-control/utils.ts  |  51 ++++-
 11 files changed, 481 insertions(+), 497 deletions(-)
 delete mode 100644 packages/components/src/box-control/styles/box-control-visualizer-styles.ts
 delete mode 100644 packages/components/src/box-control/unit-control.tsx

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 5856259e47730..646fc6eaa9dd0 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -41,6 +41,7 @@
 -   `Tabs`: do not render hidden content ([#57046](https://github.com/WordPress/gutenberg/pull/57046)).
 -   `Tabs`: improve hover and text alignment styles ([#57275](https://github.com/WordPress/gutenberg/pull/57275)).
 -   `Tabs`: make sure `Tab`s are associated to the right `TabPanel`s, regardless of the order they're rendered in ([#57033](https://github.com/WordPress/gutenberg/pull/57033)).
+-   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
 
 ## 25.14.0 (2023-12-13)
 
diff --git a/packages/components/src/box-control/all-input-control.tsx b/packages/components/src/box-control/all-input-control.tsx
index b66e10fdb4ce3..9c18694bbd0b6 100644
--- a/packages/components/src/box-control/all-input-control.tsx
+++ b/packages/components/src/box-control/all-input-control.tsx
@@ -1,15 +1,25 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
 import type { UnitControlProps } from '../unit-control/types';
+import {
+	FlexedRangeControl,
+	StyledUnitControl,
+} from './styles/box-control-styles';
+import { HStack } from '../h-stack';
 import type { BoxControlInputControlProps } from './types';
-import UnitControl from './unit-control';
+import { parseQuantityAndUnitFromRawValue } from '../unit-control';
 import {
 	LABELS,
 	applyValueToSides,
 	getAllValue,
 	isValuesMixed,
 	isValuesDefined,
+	CUSTOM_VALUE_SETTINGS,
 } from './utils';
 
 const noop = () => {};
@@ -17,26 +27,29 @@ const noop = () => {};
 export default function AllInputControl( {
 	onChange = noop,
 	onFocus = noop,
-	onHoverOn = noop,
-	onHoverOff = noop,
 	values,
 	sides,
 	selectedUnits,
 	setSelectedUnits,
 	...props
 }: BoxControlInputControlProps ) {
+	const inputId = useInstanceId( AllInputControl, 'box-control-input-all' );
+
 	const allValue = getAllValue( values, selectedUnits, sides );
 	const hasValues = isValuesDefined( values );
 	const isMixed = hasValues && isValuesMixed( values, selectedUnits, sides );
 	const allPlaceholder = isMixed ? LABELS.mixed : undefined;
 
+	const [ parsedQuantity, parsedUnit ] =
+		parseQuantityAndUnitFromRawValue( allValue );
+
 	const handleOnFocus: React.FocusEventHandler< HTMLInputElement > = (
 		event
 	) => {
 		onFocus( event, { side: 'all' } );
 	};
 
-	const handleOnChange: UnitControlProps[ 'onChange' ] = ( next ) => {
+	const onValueChange = ( next?: string ) => {
 		const isNumeric = next !== undefined && ! isNaN( parseFloat( next ) );
 		const nextValue = isNumeric ? next : undefined;
 		const nextValues = applyValueToSides( values, nextValue, sides );
@@ -44,6 +57,12 @@ export default function AllInputControl( {
 		onChange( nextValues );
 	};
 
+	const sliderOnChange = ( next?: number ) => {
+		onValueChange(
+			next !== undefined ? [ next, parsedUnit ].join( '' ) : undefined
+		);
+	};
+
 	// Set selected unit so it can be used as fallback by unlinked controls
 	// when individual sides do not have a value containing a unit.
 	const handleOnUnitChange: UnitControlProps[ 'onUnitChange' ] = ( unit ) => {
@@ -51,36 +70,37 @@ export default function AllInputControl( {
 		setSelectedUnits( newUnits );
 	};
 
-	const handleOnHoverOn = () => {
-		onHoverOn( {
-			top: true,
-			bottom: true,
-			left: true,
-			right: true,
-		} );
-	};
-
-	const handleOnHoverOff = () => {
-		onHoverOff( {
-			top: false,
-			bottom: false,
-			left: false,
-			right: false,
-		} );
-	};
-
 	return (
-		<UnitControl
-			{ ...props }
-			disableUnits={ isMixed }
-			isOnly
-			value={ allValue }
-			onChange={ handleOnChange }
-			onUnitChange={ handleOnUnitChange }
-			onFocus={ handleOnFocus }
-			onHoverOn={ handleOnHoverOn }
-			onHoverOff={ handleOnHoverOff }
-			placeholder={ allPlaceholder }
-		/>
+		<HStack>
+			<StyledUnitControl
+				{ ...props }
+				className="component-box-control__unit-control"
+				disableUnits={ isMixed }
+				id={ inputId }
+				isPressEnterToChange
+				value={ allValue }
+				onChange={ onValueChange }
+				onUnitChange={ handleOnUnitChange }
+				onFocus={ handleOnFocus }
+				placeholder={ allPlaceholder }
+				label={ LABELS.all }
+				hideLabelFromVision
+			/>
+
+			<FlexedRangeControl
+				__nextHasNoMarginBottom
+				aria-controls={ inputId }
+				label={ LABELS.all }
+				hideLabelFromVision
+				onChange={ sliderOnChange }
+				min={ 0 }
+				max={ CUSTOM_VALUE_SETTINGS[ parsedUnit ?? 'px' ]?.max ?? 10 }
+				step={
+					CUSTOM_VALUE_SETTINGS[ parsedUnit ?? 'px' ]?.step ?? 0.1
+				}
+				value={ parsedQuantity ?? 0 }
+				withInputField={ false }
+			/>
+		</HStack>
 	);
 }
diff --git a/packages/components/src/box-control/axial-input-controls.tsx b/packages/components/src/box-control/axial-input-controls.tsx
index bc8a4bd420bbd..173605f68a872 100644
--- a/packages/components/src/box-control/axial-input-controls.tsx
+++ b/packages/components/src/box-control/axial-input-controls.tsx
@@ -1,10 +1,19 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import UnitControl from './unit-control';
-import { LABELS } from './utils';
-import { Layout } from './styles/box-control-styles';
+import Tooltip from '../tooltip';
+import { CUSTOM_VALUE_SETTINGS, LABELS } from './utils';
+import {
+	FlexedBoxControlIcon,
+	FlexedRangeControl,
+	InputWrapper,
+	StyledUnitControl,
+} from './styles/box-control-styles';
 import type { BoxControlInputControlProps } from './types';
 
 const groupedSides = [ 'vertical', 'horizontal' ] as const;
@@ -13,14 +22,17 @@ type GroupedSide = ( typeof groupedSides )[ number ];
 export default function AxialInputControls( {
 	onChange,
 	onFocus,
-	onHoverOn,
-	onHoverOff,
 	values,
 	selectedUnits,
 	setSelectedUnits,
 	sides,
 	...props
 }: BoxControlInputControlProps ) {
+	const generatedId = useInstanceId(
+		AxialInputControls,
+		`box-control-input`
+	);
+
 	const createHandleOnFocus =
 		( side: GroupedSide ) =>
 		( event: React.FocusEvent< HTMLInputElement > ) => {
@@ -30,43 +42,7 @@ export default function AxialInputControls( {
 			onFocus( event, { side } );
 		};
 
-	const createHandleOnHoverOn = ( side: GroupedSide ) => () => {
-		if ( ! onHoverOn ) {
-			return;
-		}
-		if ( side === 'vertical' ) {
-			onHoverOn( {
-				top: true,
-				bottom: true,
-			} );
-		}
-		if ( side === 'horizontal' ) {
-			onHoverOn( {
-				left: true,
-				right: true,
-			} );
-		}
-	};
-
-	const createHandleOnHoverOff = ( side: GroupedSide ) => () => {
-		if ( ! onHoverOff ) {
-			return;
-		}
-		if ( side === 'vertical' ) {
-			onHoverOff( {
-				top: false,
-				bottom: false,
-			} );
-		}
-		if ( side === 'horizontal' ) {
-			onHoverOff( {
-				left: false,
-				right: false,
-			} );
-		}
-	};
-
-	const createHandleOnChange = ( side: GroupedSide ) => ( next?: string ) => {
+	const handleOnValueChange = ( side: GroupedSide, next?: string ) => {
 		if ( ! onChange ) {
 			return;
 		}
@@ -109,16 +85,8 @@ export default function AxialInputControls( {
 		? groupedSides.filter( ( side ) => sides.includes( side ) )
 		: groupedSides;
 
-	const first = filteredSides[ 0 ];
-	const last = filteredSides[ filteredSides.length - 1 ];
-	const only = first === last && first;
-
 	return (
-		<Layout
-			gap={ 0 }
-			align="top"
-			className="component-box-control__vertical-horizontal-input-controls"
-		>
+		<>
 			{ filteredSides.map( ( side ) => {
 				const [ parsedQuantity, parsedUnit ] =
 					parseQuantityAndUnitFromRawValue(
@@ -128,26 +96,65 @@ export default function AxialInputControls( {
 					side === 'vertical'
 						? selectedUnits.top
 						: selectedUnits.left;
+
+				const inputId = [ generatedId, side ].join( '-' );
+
 				return (
-					<UnitControl
-						{ ...props }
-						isFirst={ first === side }
-						isLast={ last === side }
-						isOnly={ only === side }
-						value={ [
-							parsedQuantity,
-							selectedUnit ?? parsedUnit,
-						].join( '' ) }
-						onChange={ createHandleOnChange( side ) }
-						onUnitChange={ createHandleOnUnitChange( side ) }
-						onFocus={ createHandleOnFocus( side ) }
-						onHoverOn={ createHandleOnHoverOn( side ) }
-						onHoverOff={ createHandleOnHoverOff( side ) }
-						label={ LABELS[ side ] }
-						key={ side }
-					/>
+					<InputWrapper key={ side }>
+						<FlexedBoxControlIcon side={ side } sides={ sides } />
+						<Tooltip placement="top-end" text={ LABELS[ side ] }>
+							<StyledUnitControl
+								{ ...props }
+								className="component-box-control__unit-control"
+								id={ inputId }
+								isPressEnterToChange
+								value={ [
+									parsedQuantity,
+									selectedUnit ?? parsedUnit,
+								].join( '' ) }
+								onChange={ ( newValue ) =>
+									handleOnValueChange( side, newValue )
+								}
+								onUnitChange={ createHandleOnUnitChange(
+									side
+								) }
+								onFocus={ createHandleOnFocus( side ) }
+								label={ LABELS[ side ] }
+								hideLabelFromVision
+								key={ side }
+							/>
+						</Tooltip>
+						<FlexedRangeControl
+							__nextHasNoMarginBottom
+							aria-controls={ inputId }
+							label={ LABELS[ side ] }
+							hideLabelFromVision
+							onChange={ ( newValue ) =>
+								handleOnValueChange(
+									side,
+									newValue !== undefined
+										? [
+												newValue,
+												selectedUnit ?? parsedUnit,
+										  ].join( '' )
+										: undefined
+								)
+							}
+							min={ 0 }
+							max={
+								CUSTOM_VALUE_SETTINGS[ selectedUnit ?? 'px' ]
+									?.max ?? 10
+							}
+							step={
+								CUSTOM_VALUE_SETTINGS[ selectedUnit ?? 'px' ]
+									?.step ?? 0.1
+							}
+							value={ parsedQuantity ?? 0 }
+							withInputField={ false }
+						/>
+					</InputWrapper>
 				);
 			} ) }
-		</Layout>
+		</>
 	);
 }
diff --git a/packages/components/src/box-control/index.tsx b/packages/components/src/box-control/index.tsx
index c7fcf066c545c..dcc890e8e3c51 100644
--- a/packages/components/src/box-control/index.tsx
+++ b/packages/components/src/box-control/index.tsx
@@ -9,17 +9,16 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { BaseControl } from '../base-control';
-import Button from '../button';
-import { FlexItem, FlexBlock } from '../flex';
 import AllInputControl from './all-input-control';
 import InputControls from './input-controls';
 import AxialInputControls from './axial-input-controls';
-import BoxControlIcon from './icon';
 import LinkedButton from './linked-button';
+import { Grid } from '../grid';
 import {
-	Root,
-	Header,
-	HeaderControlWrapper,
+	FlexedBoxControlIcon,
+	InputWrapper,
+	ResetButton,
+	LinkedButtonWrapper,
 } from './styles/box-control-styles';
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
 import {
@@ -155,57 +154,49 @@ function BoxControl( {
 	};
 
 	return (
-		<Root id={ id } role="group" aria-labelledby={ headingId }>
-			<Header className="component-box-control__header">
-				<FlexItem>
-					<BaseControl.VisualLabel id={ headingId }>
-						{ label }
-					</BaseControl.VisualLabel>
-				</FlexItem>
-				{ allowReset && (
-					<FlexItem>
-						<Button
-							className="component-box-control__reset-button"
-							variant="secondary"
-							size="small"
-							onClick={ handleOnReset }
-							disabled={ ! isDirty }
-						>
-							{ __( 'Reset' ) }
-						</Button>
-					</FlexItem>
-				) }
-			</Header>
-			<HeaderControlWrapper className="component-box-control__header-control-wrapper">
-				<FlexItem>
-					<BoxControlIcon side={ side } sides={ sides } />
-				</FlexItem>
-				{ isLinked && (
-					<FlexBlock>
-						<AllInputControl
-							aria-label={ label }
-							{ ...inputControlProps }
-						/>
-					</FlexBlock>
-				) }
-				{ ! isLinked && splitOnAxis && (
-					<FlexBlock>
-						<AxialInputControls { ...inputControlProps } />
-					</FlexBlock>
-				) }
-				{ ! hasOneSide && (
-					<FlexItem>
-						<LinkedButton
-							onClick={ toggleLinked }
-							isLinked={ isLinked }
-						/>
-					</FlexItem>
-				) }
-			</HeaderControlWrapper>
+		<Grid
+			id={ id }
+			columns={ 3 }
+			templateColumns="1fr min-content min-content"
+			role="group"
+			aria-labelledby={ headingId }
+		>
+			<BaseControl.VisualLabel id={ headingId }>
+				{ label }
+			</BaseControl.VisualLabel>
+			{ isLinked && (
+				<InputWrapper>
+					<FlexedBoxControlIcon side={ side } sides={ sides } />
+					<AllInputControl { ...inputControlProps } />
+				</InputWrapper>
+			) }
+			{ ! hasOneSide && (
+				<LinkedButtonWrapper>
+					<LinkedButton
+						onClick={ toggleLinked }
+						isLinked={ isLinked }
+					/>
+				</LinkedButtonWrapper>
+			) }
+
+			{ ! isLinked && splitOnAxis && (
+				<AxialInputControls { ...inputControlProps } />
+			) }
 			{ ! isLinked && ! splitOnAxis && (
 				<InputControls { ...inputControlProps } />
 			) }
-		</Root>
+			{ allowReset && (
+				<ResetButton
+					className="component-box-control__reset-button"
+					variant="secondary"
+					size="small"
+					onClick={ handleOnReset }
+					disabled={ ! isDirty }
+				>
+					{ __( 'Reset' ) }
+				</ResetButton>
+			) }
+		</Grid>
 	);
 }
 
diff --git a/packages/components/src/box-control/input-controls.tsx b/packages/components/src/box-control/input-controls.tsx
index f72179f0d18c1..c8aaeae222749 100644
--- a/packages/components/src/box-control/input-controls.tsx
+++ b/packages/components/src/box-control/input-controls.tsx
@@ -1,82 +1,81 @@
+/**
+ * WordPress dependencies
+ */
+import { useInstanceId } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import UnitControl from './unit-control';
+import Tooltip from '../tooltip';
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import { ALL_SIDES, LABELS } from './utils';
-import { LayoutContainer, Layout } from './styles/box-control-styles';
+import { ALL_SIDES, CUSTOM_VALUE_SETTINGS, LABELS } from './utils';
+import {
+	FlexedBoxControlIcon,
+	FlexedRangeControl,
+	InputWrapper,
+	StyledUnitControl,
+} from './styles/box-control-styles';
 import type { BoxControlInputControlProps, BoxControlValue } from './types';
-import type { UnitControlProps } from '../unit-control/types';
 
 const noop = () => {};
 
 export default function BoxInputControls( {
 	onChange = noop,
 	onFocus = noop,
-	onHoverOn = noop,
-	onHoverOff = noop,
 	values,
 	selectedUnits,
 	setSelectedUnits,
 	sides,
 	...props
 }: BoxControlInputControlProps ) {
+	const generatedId = useInstanceId( BoxInputControls, 'box-control-input' );
+
 	const createHandleOnFocus =
 		( side: keyof BoxControlValue ) =>
 		( event: React.FocusEvent< HTMLInputElement > ) => {
 			onFocus( event, { side } );
 		};
 
-	const createHandleOnHoverOn = ( side: keyof BoxControlValue ) => () => {
-		onHoverOn( { [ side ]: true } );
-	};
-
-	const createHandleOnHoverOff = ( side: keyof BoxControlValue ) => () => {
-		onHoverOff( { [ side ]: false } );
-	};
-
 	const handleOnChange = ( nextValues: BoxControlValue ) => {
 		onChange( nextValues );
 	};
 
-	const createHandleOnChange: (
-		side: keyof BoxControlValue
-	) => UnitControlProps[ 'onChange' ] =
-		( side ) =>
-		( next, { event } ) => {
-			const nextValues = { ...values };
-			const isNumeric =
-				next !== undefined && ! isNaN( parseFloat( next ) );
-			const nextValue = isNumeric ? next : undefined;
+	const handleOnValueChange = (
+		side: keyof BoxControlValue,
+		next?: string,
+		extra?: { event: React.SyntheticEvent< Element, Event > }
+	) => {
+		const nextValues = { ...values };
+		const isNumeric = next !== undefined && ! isNaN( parseFloat( next ) );
+		const nextValue = isNumeric ? next : undefined;
 
-			nextValues[ side ] = nextValue;
+		nextValues[ side ] = nextValue;
 
-			/**
-			 * Supports changing pair sides. For example, holding the ALT key
-			 * when changing the TOP will also update BOTTOM.
-			 */
-			// @ts-expect-error - TODO: event.altKey is only present when the change event was
-			// triggered by a keyboard event. Should this feature be implemented differently so
-			// it also works with drag events?
-			if ( event.altKey ) {
-				switch ( side ) {
-					case 'top':
-						nextValues.bottom = nextValue;
-						break;
-					case 'bottom':
-						nextValues.top = nextValue;
-						break;
-					case 'left':
-						nextValues.right = nextValue;
-						break;
-					case 'right':
-						nextValues.left = nextValue;
-						break;
-				}
+		/**
+		 * Supports changing pair sides. For example, holding the ALT key
+		 * when changing the TOP will also update BOTTOM.
+		 */
+		// @ts-expect-error - TODO: event.altKey is only present when the change event was
+		// triggered by a keyboard event. Should this feature be implemented differently so
+		// it also works with drag events?
+		if ( extra?.event.altKey ) {
+			switch ( side ) {
+				case 'top':
+					nextValues.bottom = nextValue;
+					break;
+				case 'bottom':
+					nextValues.top = nextValue;
+					break;
+				case 'left':
+					nextValues.right = nextValue;
+					break;
+				case 'right':
+					nextValues.left = nextValue;
+					break;
 			}
+		}
 
-			handleOnChange( nextValues );
-		};
+		handleOnChange( nextValues );
+	};
 
 	const createHandleOnUnitChange =
 		( side: keyof BoxControlValue ) => ( next?: string ) => {
@@ -90,45 +89,74 @@ export default function BoxInputControls( {
 		? ALL_SIDES.filter( ( side ) => sides.includes( side ) )
 		: ALL_SIDES;
 
-	const first = filteredSides[ 0 ];
-	const last = filteredSides[ filteredSides.length - 1 ];
-	const only = first === last && first;
-
 	return (
-		<LayoutContainer className="component-box-control__input-controls-wrapper">
-			<Layout
-				gap={ 0 }
-				align="top"
-				className="component-box-control__input-controls"
-			>
-				{ filteredSides.map( ( side ) => {
-					const [ parsedQuantity, parsedUnit ] =
-						parseQuantityAndUnitFromRawValue( values[ side ] );
+		<>
+			{ filteredSides.map( ( side ) => {
+				const [ parsedQuantity, parsedUnit ] =
+					parseQuantityAndUnitFromRawValue( values[ side ] );
+
+				const computedUnit = values[ side ]
+					? parsedUnit
+					: selectedUnits[ side ];
+
+				const inputId = [ generatedId, side ].join( '-' );
 
-					const computedUnit = values[ side ]
-						? parsedUnit
-						: selectedUnits[ side ];
+				return (
+					<InputWrapper key={ `box-control-${ side }` } expanded>
+						<FlexedBoxControlIcon side={ side } sides={ sides } />
+						<Tooltip placement="top-end" text={ LABELS[ side ] }>
+							<StyledUnitControl
+								{ ...props }
+								className="component-box-control__unit-control"
+								id={ inputId }
+								isPressEnterToChange
+								value={ [ parsedQuantity, computedUnit ].join(
+									''
+								) }
+								onChange={ ( nextValue, extra ) =>
+									handleOnValueChange(
+										side,
+										nextValue,
+										extra
+									)
+								}
+								onUnitChange={ createHandleOnUnitChange(
+									side
+								) }
+								onFocus={ createHandleOnFocus( side ) }
+								label={ LABELS[ side ] }
+								hideLabelFromVision
+							/>
+						</Tooltip>
 
-					return (
-						<UnitControl
-							{ ...props }
-							isFirst={ first === side }
-							isLast={ last === side }
-							isOnly={ only === side }
-							value={ [ parsedQuantity, computedUnit ].join(
-								''
-							) }
-							onChange={ createHandleOnChange( side ) }
-							onUnitChange={ createHandleOnUnitChange( side ) }
-							onFocus={ createHandleOnFocus( side ) }
-							onHoverOn={ createHandleOnHoverOn( side ) }
-							onHoverOff={ createHandleOnHoverOff( side ) }
+						<FlexedRangeControl
+							__nextHasNoMarginBottom
+							aria-controls={ inputId }
 							label={ LABELS[ side ] }
-							key={ `box-control-${ side }` }
+							hideLabelFromVision
+							onChange={ ( newValue ) => {
+								handleOnValueChange(
+									side,
+									newValue !== undefined
+										? [ newValue, computedUnit ].join( '' )
+										: undefined
+								);
+							} }
+							min={ 0 }
+							max={
+								CUSTOM_VALUE_SETTINGS[ computedUnit ?? 'px' ]
+									?.max ?? 10
+							}
+							step={
+								CUSTOM_VALUE_SETTINGS[ computedUnit ?? 'px' ]
+									?.step ?? 0.1
+							}
+							value={ parsedQuantity ?? 0 }
+							withInputField={ false }
 						/>
-					);
-				} ) }
-			</Layout>
-		</LayoutContainer>
+					</InputWrapper>
+				);
+			} ) }
+		</>
 	);
 }
diff --git a/packages/components/src/box-control/styles/box-control-styles.ts b/packages/components/src/box-control/styles/box-control-styles.ts
index d961d4322ba5a..ce2c8aa227e58 100644
--- a/packages/components/src/box-control/styles/box-control-styles.ts
+++ b/packages/components/src/box-control/styles/box-control-styles.ts
@@ -1,80 +1,40 @@
 /**
  * External dependencies
  */
-import { css } from '@emotion/react';
 import styled from '@emotion/styled';
 /**
  * Internal dependencies
  */
-import { Flex } from '../../flex';
-import BaseUnitControl from '../../unit-control';
-import { rtl } from '../../utils';
-import type { BoxUnitControlProps } from '../types';
-
-export const Root = styled.div`
-	box-sizing: border-box;
-	max-width: 235px;
-	padding-bottom: 12px;
-	width: 100%;
+import BoxControlIcon from '../icon';
+import Button from '../../button';
+import { HStack } from '../../h-stack';
+import RangeControl from '../../range-control';
+import UnitControl from '../../unit-control';
+import { space } from '../../utils/space';
+
+export const StyledUnitControl = styled( UnitControl )`
+	max-width: 90px;
 `;
 
-export const Header = styled( Flex )`
-	margin-bottom: 8px;
+export const InputWrapper = styled( HStack )`
+	grid-column: 1 / span 3;
 `;
 
-export const HeaderControlWrapper = styled( Flex )`
-	min-height: 30px;
-	gap: 0;
+export const ResetButton = styled( Button )`
+	grid-area: 1 / 2;
+	justify-self: end;
 `;
 
-export const UnitControlWrapper = styled.div`
-	box-sizing: border-box;
-	max-width: 80px;
+export const LinkedButtonWrapper = styled.div`
+	grid-area: 1 / 3;
+	justify-self: end;
 `;
 
-export const LayoutContainer = styled( Flex )`
-	justify-content: center;
-	padding-top: 8px;
+export const FlexedBoxControlIcon = styled( BoxControlIcon )`
+	flex: 0 0 auto;
 `;
 
-export const Layout = styled( Flex )`
-	position: relative;
-	height: 100%;
+export const FlexedRangeControl = styled( RangeControl )`
 	width: 100%;
-	justify-content: flex-start;
-`;
-
-const unitControlBorderRadiusStyles = ( {
-	isFirst,
-	isLast,
-	isOnly,
-}: Pick< BoxUnitControlProps, 'isFirst' | 'isLast' | 'isOnly' > ) => {
-	if ( isFirst ) {
-		return rtl( { borderTopRightRadius: 0, borderBottomRightRadius: 0 } )();
-	}
-	if ( isLast ) {
-		return rtl( { borderTopLeftRadius: 0, borderBottomLeftRadius: 0 } )();
-	}
-	if ( isOnly ) {
-		return css( { borderRadius: 2 } );
-	}
-
-	return css( {
-		borderRadius: 0,
-	} );
-};
-
-const unitControlMarginStyles = ( {
-	isFirst,
-	isOnly,
-}: Pick< BoxUnitControlProps, 'isFirst' | 'isOnly' > ) => {
-	const marginLeft = isFirst || isOnly ? 0 : -1;
-
-	return rtl( { marginLeft } )();
-};
-
-export const UnitControl = styled( BaseUnitControl )`
-	max-width: 60px;
-	${ unitControlBorderRadiusStyles };
-	${ unitControlMarginStyles };
+	margin-inline-end: ${ space( 2 ) };
 `;
diff --git a/packages/components/src/box-control/styles/box-control-visualizer-styles.ts b/packages/components/src/box-control/styles/box-control-visualizer-styles.ts
deleted file mode 100644
index bbfe66c9a71e9..0000000000000
--- a/packages/components/src/box-control/styles/box-control-visualizer-styles.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * External dependencies
- */
-import { css } from '@emotion/react';
-import styled from '@emotion/styled';
-
-/**
- * Internal dependencies
- */
-import { COLORS, rtl } from '../../utils';
-
-const containerPositionStyles = ( {
-	isPositionAbsolute,
-}: {
-	isPositionAbsolute: boolean;
-} ) => {
-	if ( ! isPositionAbsolute ) return '';
-
-	return css`
-		bottom: 0;
-		left: 0;
-		pointer-events: none;
-		position: absolute;
-		right: 0;
-		top: 0;
-		z-index: 1;
-	`;
-};
-
-export const Container = styled.div`
-	box-sizing: border-box;
-	position: relative;
-	${ containerPositionStyles };
-`;
-
-export const Side = styled.div`
-	box-sizing: border-box;
-	background: ${ COLORS.theme.accent };
-	filter: brightness( 1 );
-	opacity: 0;
-	position: absolute;
-	pointer-events: none;
-	transition: opacity 120ms linear;
-	z-index: 1;
-
-	${ ( { isActive }: { isActive: boolean } ) =>
-		isActive &&
-		`
-		opacity: 0.3;
-	` }
-`;
-
-export const TopView = styled( Side )`
-	top: 0;
-	left: 0;
-	right: 0;
-`;
-
-export const RightView = styled( Side )`
-	top: 0;
-	bottom: 0;
-	${ rtl( { right: 0 } ) };
-`;
-
-export const BottomView = styled( Side )`
-	bottom: 0;
-	left: 0;
-	right: 0;
-`;
-
-export const LeftView = styled( Side )`
-	top: 0;
-	bottom: 0;
-	${ rtl( { left: 0 } ) };
-`;
diff --git a/packages/components/src/box-control/test/index.tsx b/packages/components/src/box-control/test/index.tsx
index 8a861eff37e1b..1ea3c84aae922 100644
--- a/packages/components/src/box-control/test/index.tsx
+++ b/packages/components/src/box-control/test/index.tsx
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { render, screen } from '@testing-library/react';
+import { fireEvent, render, screen } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 /**
@@ -33,7 +33,10 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ () => {} } /> );
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Box Control' } )
+				screen.getByRole( 'group', { name: 'Box Control' } )
+			).toBeVisible();
+			expect(
+				screen.getByRole( 'textbox', { name: 'All sides' } )
 			).toBeVisible();
 		} );
 
@@ -42,15 +45,41 @@ describe( 'BoxControl', () => {
 
 			render( <BoxControl onChange={ () => {} } /> );
 
-			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
-			} );
+			const input = screen.getByRole( 'textbox', { name: 'All sides' } );
 
 			await user.type( input, '100' );
 			await user.keyboard( '{Enter}' );
 
 			expect( input ).toHaveValue( '100' );
 		} );
+
+		it( 'should update input values when interacting with slider', () => {
+			render( <BoxControl onChange={ () => {} } /> );
+
+			const slider = screen.getByRole( 'slider' );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'All sides' } )
+			).toHaveValue( '50' );
+		} );
+
+		it( 'should update slider values when interacting with input', async () => {
+			const user = userEvent.setup();
+			render( <BoxControl onChange={ () => {} } /> );
+
+			const input = screen.getByRole( 'textbox', {
+				name: 'All sides',
+			} );
+
+			await user.type( input, '50' );
+			await user.keyboard( '{Enter}' );
+
+			expect( input ).toHaveValue( '50' );
+			expect( screen.getByRole( 'slider' ) ).toHaveValue( '50' );
+		} );
 	} );
 
 	describe( 'Reset', () => {
@@ -60,7 +89,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ () => {} } /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -79,7 +108,7 @@ describe( 'BoxControl', () => {
 			render( <Example /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -98,7 +127,7 @@ describe( 'BoxControl', () => {
 			render( <Example /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -118,7 +147,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ ( v ) => spyChange( v ) } /> );
 
 			const input = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 
 			await user.type( input, '100' );
@@ -152,21 +181,49 @@ describe( 'BoxControl', () => {
 			);
 
 			await user.type(
-				screen.getByRole( 'textbox', { name: 'Top' } ),
+				screen.getByRole( 'textbox', { name: 'Top side' } ),
 				'100'
 			);
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Top' } )
+				screen.getByRole( 'textbox', { name: 'Top side' } )
 			).toHaveValue( '100' );
 			expect(
-				screen.getByRole( 'textbox', { name: 'Right' } )
+				screen.getByRole( 'textbox', { name: 'Right side' } )
 			).not.toHaveValue();
 			expect(
-				screen.getByRole( 'textbox', { name: 'Bottom' } )
+				screen.getByRole( 'textbox', { name: 'Bottom side' } )
 			).not.toHaveValue();
 			expect(
-				screen.getByRole( 'textbox', { name: 'Left' } )
+				screen.getByRole( 'textbox', { name: 'Left side' } )
+			).not.toHaveValue();
+		} );
+
+		it( 'should update a single side value when using slider unlinked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example /> );
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Unlink sides' } )
+			);
+
+			const slider = screen.getByRole( 'slider', { name: 'Right side' } );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Top side' } )
+			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Right side' } )
+			).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Bottom side' } )
+			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Left side' } )
 			).not.toHaveValue();
 		} );
 
@@ -181,17 +238,68 @@ describe( 'BoxControl', () => {
 
 			await user.type(
 				screen.getByRole( 'textbox', {
-					name: 'Vertical',
+					name: 'Top and bottom sides',
 				} ),
 				'100'
 			);
 
 			expect(
-				screen.getByRole( 'textbox', { name: 'Vertical' } )
+				screen.getByRole( 'textbox', { name: 'Top and bottom sides' } )
 			).toHaveValue( '100' );
 			expect(
-				screen.getByRole( 'textbox', { name: 'Horizontal' } )
+				screen.getByRole( 'textbox', { name: 'Left and right sides' } )
+			).not.toHaveValue();
+		} );
+
+		it( 'should update a whole axis using a slider when value is changed when unlinked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example splitOnAxis /> );
+
+			await user.click(
+				screen.getByRole( 'button', { name: 'Unlink sides' } )
+			);
+
+			const slider = screen.getByRole( 'slider', {
+				name: 'Left and right sides',
+			} );
+
+			fireEvent.change( slider, { target: { value: 50 } } );
+
+			expect( slider ).toHaveValue( '50' );
+			expect(
+				screen.getByRole( 'textbox', { name: 'Top and bottom sides' } )
 			).not.toHaveValue();
+			expect(
+				screen.getByRole( 'textbox', { name: 'Left and right sides' } )
+			).toHaveValue( '50' );
+		} );
+
+		it( 'should show "Mixed" label when sides have different values but are linked', async () => {
+			const user = userEvent.setup();
+
+			render( <Example /> );
+
+			const unlinkButton = screen.getByRole( 'button', {
+				name: 'Unlink sides',
+			} );
+
+			await user.click( unlinkButton );
+
+			await user.type(
+				screen.getByRole( 'textbox', {
+					name: 'Right side',
+				} ),
+				'13'
+			);
+
+			expect(
+				screen.getByRole( 'textbox', { name: 'Right side' } )
+			).toHaveValue( '13' );
+
+			await user.click( unlinkButton );
+
+			expect( screen.getByPlaceholderText( 'Mixed' ) ).toHaveValue( '' );
 		} );
 	} );
 
@@ -287,7 +395,7 @@ describe( 'BoxControl', () => {
 			render( <BoxControl onChange={ onChangeSpy } /> );
 
 			const valueInput = screen.getByRole( 'textbox', {
-				name: 'Box Control',
+				name: 'All sides',
 			} );
 			const unitSelect = screen.getByRole( 'combobox', {
 				name: 'Select unit',
diff --git a/packages/components/src/box-control/types.ts b/packages/components/src/box-control/types.ts
index 0eba0e58fd33c..12524559564ab 100644
--- a/packages/components/src/box-control/types.ts
+++ b/packages/components/src/box-control/types.ts
@@ -1,8 +1,3 @@
-/**
- * External dependencies
- */
-import type { useHover } from '@use-gesture/react';
-
 /**
  * Internal dependencies
  */
@@ -16,6 +11,10 @@ export type BoxControlValue = {
 	left?: string;
 };
 
+export type CustomValueUnits = {
+	[ key: string ]: { max: number; step: number };
+};
+
 type UnitControlPassthroughProps = Omit<
 	UnitControlProps,
 	'label' | 'onChange' | 'onFocus' | 'onMouseOver' | 'onMouseOut' | 'units'
@@ -92,22 +91,6 @@ export type BoxControlInputControlProps = UnitControlPassthroughProps & {
 	values: BoxControlValue;
 };
 
-export type BoxUnitControlProps = UnitControlPassthroughProps &
-	Pick< UnitControlProps, 'onChange' | 'onFocus' > & {
-		isFirst?: boolean;
-		isLast?: boolean;
-		isOnly?: boolean;
-		label?: string;
-		onHoverOff?: (
-			event: ReturnType< typeof useHover >[ 'event' ],
-			state: Omit< ReturnType< typeof useHover >, 'event' >
-		) => void;
-		onHoverOn?: (
-			event: ReturnType< typeof useHover >[ 'event' ],
-			state: Omit< ReturnType< typeof useHover >, 'event' >
-		) => void;
-	};
-
 export type BoxControlIconProps = {
 	/**
 	 * @default 24
diff --git a/packages/components/src/box-control/unit-control.tsx b/packages/components/src/box-control/unit-control.tsx
deleted file mode 100644
index 24d71cf0d6cd3..0000000000000
--- a/packages/components/src/box-control/unit-control.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * External dependencies
- */
-import { useHover } from '@use-gesture/react';
-
-/**
- * Internal dependencies
- */
-import BaseTooltip from '../tooltip';
-import { UnitControlWrapper, UnitControl } from './styles/box-control-styles';
-import type { BoxUnitControlProps } from './types';
-
-const noop = () => {};
-
-export default function BoxUnitControl( {
-	isFirst,
-	isLast,
-	isOnly,
-	onHoverOn = noop,
-	onHoverOff = noop,
-	label,
-	value,
-	...props
-}: BoxUnitControlProps ) {
-	const bindHoverGesture = useHover( ( { event, ...state } ) => {
-		if ( state.hovering ) {
-			onHoverOn( event, state );
-		} else {
-			onHoverOff( event, state );
-		}
-	} );
-
-	return (
-		<UnitControlWrapper { ...bindHoverGesture() }>
-			<Tooltip text={ label }>
-				<UnitControl
-					aria-label={ label }
-					className="component-box-control__unit-control"
-					isFirst={ isFirst }
-					isLast={ isLast }
-					isOnly={ isOnly }
-					isPressEnterToChange
-					isResetValueOnUnitChange={ false }
-					value={ value }
-					{ ...props }
-				/>
-			</Tooltip>
-		</UnitControlWrapper>
-	);
-}
-
-function Tooltip( {
-	children,
-	text,
-}: {
-	children: JSX.Element;
-	text?: string;
-} ) {
-	if ( ! text ) return children;
-
-	/**
-	 * Wrapping the children in a `<div />` as Tooltip as it attempts
-	 * to render the <UnitControl />. Using a plain `<div />` appears to
-	 * resolve this issue.
-	 *
-	 * Originally discovered and referenced here:
-	 * https://github.com/WordPress/gutenberg/pull/24966#issuecomment-685875026
-	 */
-	return (
-		<BaseTooltip text={ text } placement="top">
-			<div>{ children }</div>
-		</BaseTooltip>
-	);
-}
diff --git a/packages/components/src/box-control/utils.ts b/packages/components/src/box-control/utils.ts
index 6614342d3da6d..e480c9a9f4674 100644
--- a/packages/components/src/box-control/utils.ts
+++ b/packages/components/src/box-control/utils.ts
@@ -7,17 +7,52 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { parseQuantityAndUnitFromRawValue } from '../unit-control/utils';
-import type { BoxControlProps, BoxControlValue } from './types';
+import type {
+	BoxControlProps,
+	BoxControlValue,
+	CustomValueUnits,
+} from './types';
+
+export const CUSTOM_VALUE_SETTINGS: CustomValueUnits = {
+	px: { max: 300, step: 1 },
+	'%': { max: 100, step: 1 },
+	vw: { max: 100, step: 1 },
+	vh: { max: 100, step: 1 },
+	em: { max: 10, step: 0.1 },
+	rm: { max: 10, step: 0.1 },
+	svw: { max: 100, step: 1 },
+	lvw: { max: 100, step: 1 },
+	dvw: { max: 100, step: 1 },
+	svh: { max: 100, step: 1 },
+	lvh: { max: 100, step: 1 },
+	dvh: { max: 100, step: 1 },
+	vi: { max: 100, step: 1 },
+	svi: { max: 100, step: 1 },
+	lvi: { max: 100, step: 1 },
+	dvi: { max: 100, step: 1 },
+	vb: { max: 100, step: 1 },
+	svb: { max: 100, step: 1 },
+	lvb: { max: 100, step: 1 },
+	dvb: { max: 100, step: 1 },
+	vmin: { max: 100, step: 1 },
+	svmin: { max: 100, step: 1 },
+	lvmin: { max: 100, step: 1 },
+	dvmin: { max: 100, step: 1 },
+	vmax: { max: 100, step: 1 },
+	svmax: { max: 100, step: 1 },
+	lvmax: { max: 100, step: 1 },
+	dvmax: { max: 100, step: 1 },
+};
 
 export const LABELS = {
-	all: __( 'All' ),
-	top: __( 'Top' ),
-	bottom: __( 'Bottom' ),
-	left: __( 'Left' ),
-	right: __( 'Right' ),
+	all: __( 'All sides' ),
+	top: __( 'Top side' ),
+	bottom: __( 'Bottom side' ),
+	left: __( 'Left side' ),
+	right: __( 'Right side' ),
 	mixed: __( 'Mixed' ),
-	vertical: __( 'Vertical' ),
-	horizontal: __( 'Horizontal' ),
+	vertical: __( 'Top and bottom sides' ),
+	horizontal: __( 'Left and right sides' ),
 };
 
 export const DEFAULT_VALUES = {

From 876bf2bd41957ecf02abf45b68e865cfe29d0215 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Fri, 12 Jan 2024 12:09:20 +0900
Subject: [PATCH 074/296] Remove right negative margin from pinned items
 (#57666)

---
 packages/interface/src/components/pinned-items/style.scss | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/interface/src/components/pinned-items/style.scss b/packages/interface/src/components/pinned-items/style.scss
index 66062b7fa3dbb..420b94e2994b1 100644
--- a/packages/interface/src/components/pinned-items/style.scss
+++ b/packages/interface/src/components/pinned-items/style.scss
@@ -27,7 +27,4 @@
 
 	// Gap between pinned items.
 	gap: $grid-unit-10;
-
-	// Account for larger grid from parent container gap.
-	margin-right: -$grid-unit-05;
 }

From d0287db174947e81fa4cb7350daf8303fa01b609 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Fri, 12 Jan 2024 12:18:59 +0900
Subject: [PATCH 075/296] PaletteEdit: improve unit tests (#57645)

* PaletteEdit: improve unit tests

* Update changelog

* Use toBeVisible instead of toBeInTheDocument

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Update test name

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Update test name

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Update test name

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Update test name

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Update test name

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Remove Unnecessary uerr click event

Co-authored-by: Lena Morita <lena@jaguchi.com>

* Use toBeVisible instead of toBeInTheDocument

* use a fresh onChange mock for each test

---------

Co-authored-by: Lena Morita <lena@jaguchi.com>
---
 packages/components/CHANGELOG.md              |   1 +
 .../src/palette-edit/test/index.tsx           | 329 +++++++++++++++++-
 2 files changed, 320 insertions(+), 10 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 646fc6eaa9dd0..022248e3706cb 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -34,6 +34,7 @@
 -   `ToggleGroupControl`: Update button size in large variant to be 32px ([#57338](https://github.com/WordPress/gutenberg/pull/57338)).
 -   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
+-   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
 
 ### Experimental
 
diff --git a/packages/components/src/palette-edit/test/index.tsx b/packages/components/src/palette-edit/test/index.tsx
index 1bf2802709de7..31b712225a8dc 100644
--- a/packages/components/src/palette-edit/test/index.tsx
+++ b/packages/components/src/palette-edit/test/index.tsx
@@ -1,7 +1,8 @@
 /**
  * External dependencies
  */
-import { render, fireEvent, screen } from '@testing-library/react';
+import { render, screen, waitFor } from '@testing-library/react';
+import userEvent from '@testing-library/user-event';
 
 /**
  * Internal dependencies
@@ -9,6 +10,8 @@ import { render, fireEvent, screen } from '@testing-library/react';
 import PaletteEdit, { getNameForPosition } from '..';
 import type { PaletteElement } from '../types';
 
+const noop = () => {};
+
 describe( 'getNameForPosition', () => {
 	test( 'should return 1 by default', () => {
 		const slugPrefix = 'test-';
@@ -82,18 +85,324 @@ describe( 'getNameForPosition', () => {
 
 describe( 'PaletteEdit', () => {
 	const defaultProps = {
-		colors: [ { color: '#ffffff', name: 'Base', slug: 'base' } ],
-		onChange: jest.fn(),
 		paletteLabel: 'Test label',
-		emptyMessage: 'Test empty message',
-		canOnlyChangeValues: true,
-		canReset: true,
 		slugPrefix: '',
+		onChange: noop,
 	};
 
-	it( 'opens color selector for color palettes', () => {
-		render( <PaletteEdit { ...defaultProps } /> );
-		fireEvent.click( screen.getByLabelText( 'Color: Base' ) );
-		expect( screen.getByLabelText( 'Hex color' ) ).toBeInTheDocument();
+	const colors = [
+		{ color: '#1a4548', name: 'Primary', slug: 'primary' },
+		{ color: '#0000ff', name: 'Secondary', slug: 'secondary' },
+	];
+	const gradients = [
+		{
+			gradient:
+				'linear-gradient(135deg,rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)',
+			name: 'Pale ocean',
+			slug: 'pale-ocean',
+		},
+		{
+			gradient:
+				'linear-gradient(135deg,rgb(2,3,129) 0%,rgb(40,116,252) 100%)',
+			name: 'Midnight',
+			slug: 'midnight',
+		},
+	];
+
+	it( 'shows heading label', () => {
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		const paletteLabel = screen.getByRole( 'heading', {
+			level: 2,
+			name: 'Test label',
+		} );
+
+		expect( paletteLabel ).toBeVisible();
+	} );
+
+	it( 'shows heading label with custom heading level', () => {
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				paletteLabelHeadingLevel={ 5 }
+			/>
+		);
+
+		expect(
+			screen.getByRole( 'heading', {
+				level: 5,
+				name: 'Test label',
+			} )
+		).toBeVisible();
+	} );
+
+	it( 'shows empty message', () => {
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				emptyMessage={ 'Test empty message' }
+			/>
+		);
+
+		expect( screen.getByText( 'Test empty message' ) ).toBeVisible();
+	} );
+
+	it( 'shows an option to remove all colors', async () => {
+		const user = userEvent.setup();
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Remove all colors',
+			} )
+		).toBeVisible();
+	} );
+
+	it( 'shows a reset option when the `canReset` prop is enabled', async () => {
+		const user = userEvent.setup();
+		render(
+			<PaletteEdit { ...defaultProps } colors={ colors } canReset />
+		);
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Reset colors',
+			} )
+		).toBeVisible();
+	} );
+
+	it( 'does not show a reset colors option when `canReset` is disabled', async () => {
+		const user = userEvent.setup();
+		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		expect(
+			screen.queryByRole( 'button', {
+				name: 'Reset colors',
+			} )
+		).not.toBeInTheDocument();
+	} );
+
+	it( 'calls the `onChange` with the new color appended', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Add color',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				...colors,
+				{
+					color: '#000',
+					name: 'Color 1',
+					slug: 'color-1',
+				},
+			] );
+		} );
+	} );
+
+	it( 'calls the `onChange` with the new gradient appended', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				gradients={ gradients }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Add gradient',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				...gradients,
+				{
+					gradient:
+						'linear-gradient(135deg, rgba(6, 147, 227, 1) 0%, rgb(155, 81, 224) 100%)',
+					name: 'Color 1',
+					slug: 'color-1',
+				},
+			] );
+		} );
+	} );
+
+	it( 'can not add new colors when `canOnlyChangeValues` is enabled', () => {
+		render( <PaletteEdit { ...defaultProps } canOnlyChangeValues /> );
+
+		expect(
+			screen.queryByRole( 'button', {
+				name: 'Add color',
+			} )
+		).not.toBeInTheDocument();
+	} );
+
+	it( 'can remove a color', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Show details',
+			} )
+		);
+		await user.click( screen.getByText( 'Primary' ) );
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Remove color',
+			} )
+		);
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [ colors[ 1 ] ] );
+		} );
+	} );
+
+	it( 'can update palette name', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Color options',
+			} )
+		);
+		await user.click(
+			screen.getByRole( 'button', {
+				name: 'Show details',
+			} )
+		);
+		await user.click( screen.getByText( 'Primary' ) );
+		const nameInput = screen.getByRole( 'textbox', {
+			name: 'Color name',
+		} );
+		await user.clear( nameInput );
+		await user.type( nameInput, 'Primary Updated' );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...colors[ 0 ],
+					name: 'Primary Updated',
+					slug: 'primary-updated',
+				},
+				colors[ 1 ],
+			] );
+		} );
+	} );
+
+	it( 'can update color palette value', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				colors={ colors }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click( screen.getByLabelText( 'Color: Primary' ) );
+		const hexInput = screen.getByRole( 'textbox', {
+			name: 'Hex color',
+		} );
+		await user.clear( hexInput );
+		await user.type( hexInput, '000000' );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...colors[ 0 ],
+					color: '#000000',
+				},
+				colors[ 1 ],
+			] );
+		} );
+	} );
+
+	it( 'can update gradient palette value', async () => {
+		const user = userEvent.setup();
+		const onChange = jest.fn();
+
+		render(
+			<PaletteEdit
+				{ ...defaultProps }
+				gradients={ gradients }
+				onChange={ onChange }
+			/>
+		);
+
+		await user.click( screen.getByLabelText( 'Gradient: Pale ocean' ) );
+
+		const typeSelectElement = screen.getByRole( 'combobox', {
+			name: 'Type',
+		} );
+		await user.selectOptions( typeSelectElement, 'radial-gradient' );
+
+		await waitFor( () => {
+			expect( onChange ).toHaveBeenCalledWith( [
+				{
+					...gradients[ 0 ],
+					gradient:
+						'radial-gradient(rgb(255,245,203) 0%,rgb(182,227,212) 50%,rgb(51,167,181) 100%)',
+				},
+				gradients[ 1 ],
+			] );
+		} );
 	} );
 } );

From eec8951360a8e4a5205f592a972cb32628cd2002 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 12 Jan 2024 11:32:38 +0400
Subject: [PATCH 076/296] Migrate 'typewriter' e2e tests to Playwright (#57673)

* Migrate 'typewriter' e2e tests to Playwright

* Remove old test file
---
 .../specs/editor/various/typewriter.spec.js   | 169 +++++++++++-------
 1 file changed, 106 insertions(+), 63 deletions(-)
 rename packages/e2e-tests/specs/editor/various/typewriter.test.js => test/e2e/specs/editor/various/typewriter.spec.js (58%)

diff --git a/packages/e2e-tests/specs/editor/various/typewriter.test.js b/test/e2e/specs/editor/various/typewriter.spec.js
similarity index 58%
rename from packages/e2e-tests/specs/editor/various/typewriter.test.js
rename to test/e2e/specs/editor/various/typewriter.spec.js
index d935197b14f87..abf24cbfc298e 100644
--- a/packages/e2e-tests/specs/editor/various/typewriter.test.js
+++ b/test/e2e/specs/editor/various/typewriter.spec.js
@@ -1,40 +1,40 @@
 /**
  * WordPress dependencies
  */
-import { createNewPost } from '@wordpress/e2e-test-utils';
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
 
-describe( 'TypeWriter', () => {
-	beforeEach( async () => {
-		await createNewPost();
-	} );
+/** @typedef {import('@playwright/test').Page} Page */
 
-	const getCaretPosition = async () =>
-		await page.evaluate(
-			() =>
-				wp.dom.computeCaretRect(
-					document.activeElement?.contentWindow ?? window
-				).y
-		);
+// Allow the scroll position to be 1px off.
+const BUFFER = 1;
 
-	// Allow the scroll position to be 1px off.
-	const BUFFER = 1;
+test.use( {
+	typewriterUtils: async ( { page }, use ) => {
+		await use( new TypewriterUtils( { page } ) );
+	},
+} );
 
-	const getDiff = async ( caretPosition ) =>
-		Math.abs( ( await getCaretPosition() ) - caretPosition );
+test.describe( 'Typewriter', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
 
-	it( 'should maintain caret position', async () => {
-		// Create first block.
+	test( 'should maintain caret position', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create test blocks.
 		await page.keyboard.press( 'Enter' );
-
-		// Create second block.
 		await page.keyboard.press( 'Enter' );
 
-		const initialPosition = await getCaretPosition();
+		const initialPosition = await typewriterUtils.getCaretPosition();
 
 		// The page shouldn't be scrolled when it's being filled.
 		await page.keyboard.press( 'Enter' );
 
-		expect( await getCaretPosition() ).toBeGreaterThan( initialPosition );
+		expect( await typewriterUtils.getCaretPosition() ).toBeGreaterThan(
+			initialPosition
+		);
 
 		// Create blocks until the typewriter effect kicks in.
 		while (
@@ -42,19 +42,22 @@ describe( 'TypeWriter', () => {
 				const { activeElement } =
 					document.activeElement?.contentDocument ?? document;
 				return (
-					wp.dom.getScrollContainer( activeElement ).scrollTop === 0
+					window.wp.dom.getScrollContainer( activeElement )
+						.scrollTop === 0
 				);
 			} )
 		) {
 			await page.keyboard.press( 'Enter' );
 		}
 
-		const newPosition = await getCaretPosition();
+		const newPosition = await typewriterUtils.getCaretPosition();
 
 		// Now the scroll position should be maintained.
 		await page.keyboard.press( 'Enter' );
 
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
 
 		// Type until the text wraps.
 		while (
@@ -63,37 +66,47 @@ describe( 'TypeWriter', () => {
 					document.activeElement?.contentDocument ?? document;
 				return (
 					activeElement.clientHeight <=
-					parseInt( getComputedStyle( activeElement ).lineHeight, 10 )
+					parseInt(
+						window.getComputedStyle( activeElement ).lineHeight,
+						10
+					)
 				);
 			} )
 		) {
 			await page.keyboard.type( 'a' );
 		}
 
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
 
 		// Pressing backspace will reposition the caret to the previous line.
 		// Scroll position should be adjusted again.
 		await page.keyboard.press( 'Backspace' );
 
-		expect( await getDiff( newPosition ) ).toBeLessThanOrEqual( BUFFER );
+		expect(
+			await typewriterUtils.getDiff( newPosition )
+		).toBeLessThanOrEqual( BUFFER );
 
 		// Should reset scroll position to maintain.
 		await page.keyboard.press( 'ArrowUp' );
 
-		const positionAfterArrowUp = await getCaretPosition();
+		const positionAfterArrowUp = await typewriterUtils.getCaretPosition();
 
 		expect( positionAfterArrowUp ).toBeLessThanOrEqual( newPosition );
 
 		// Should be scrolled to new position.
 		await page.keyboard.press( 'Enter' );
 
-		expect( await getDiff( positionAfterArrowUp ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
+		expect(
+			await typewriterUtils.getDiff( positionAfterArrowUp )
+		).toBeLessThanOrEqual( BUFFER );
 	} );
 
-	it( 'should maintain caret position after scroll', async () => {
+	test( 'should maintain caret position after scroll', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
 		// Create first block.
 		await page.keyboard.press( 'Enter' );
 
@@ -104,7 +117,7 @@ describe( 'TypeWriter', () => {
 				const { activeElement } =
 					document.activeElement?.contentDocument ?? document;
 				const scrollContainer =
-					wp.dom.getScrollContainer( activeElement );
+					window.wp.dom.getScrollContainer( activeElement );
 				return (
 					scrollContainer.scrollHeight ===
 					scrollContainer.clientHeight
@@ -117,8 +130,9 @@ describe( 'TypeWriter', () => {
 		const scrollPosition = await page.evaluate( () => {
 			const { activeElement } =
 				document.activeElement?.contentDocument ?? document;
-			return wp.dom.getScrollContainer( activeElement ).scrollTop;
+			return window.wp.dom.getScrollContainer( activeElement ).scrollTop;
 		} );
+
 		// Expect scrollbar to be at the top.
 		expect( scrollPosition ).toBe( 0 );
 
@@ -127,7 +141,7 @@ describe( 'TypeWriter', () => {
 		await page.evaluate( () => {
 			const { activeElement } =
 				document.activeElement?.contentDocument ?? document;
-			wp.dom.getScrollContainer( activeElement ).scrollTop += 2;
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop += 2;
 		} );
 		// Wait for the caret rectangle to be recalculated.
 		await page.evaluate(
@@ -136,39 +150,44 @@ describe( 'TypeWriter', () => {
 
 		// After hitting Enter to create a new block, the caret screen
 		// coordinates should be the same.
-		const initialPosition = await getCaretPosition();
+		const initialPosition = await typewriterUtils.getCaretPosition();
 		await page.keyboard.press( 'Enter' );
 		await page.waitForFunction( () => {
 			const { activeElement } =
 				document.activeElement?.contentDocument ?? document;
 			// Wait for the Typewriter to scroll down past the initial position.
-			return wp.dom.getScrollContainer( activeElement ).scrollTop > 2;
+			return (
+				window.wp.dom.getScrollContainer( activeElement ).scrollTop > 2
+			);
 		} );
-		expect( await getDiff( initialPosition ) ).toBe( 0 );
+
+		expect( await typewriterUtils.getDiff( initialPosition ) ).toBe( 0 );
 	} );
 
-	it( 'should maintain caret position after leaving last editable', async () => {
-		// Create first block.
+	test( 'should maintain caret position after leaving last editable', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
+		// Create test blocks.
 		await page.keyboard.press( 'Enter' );
-		// Create second block.
 		await page.keyboard.press( 'Enter' );
-		// Create third block.
 		await page.keyboard.press( 'Enter' );
 		// Move to first block.
 		await page.keyboard.press( 'ArrowUp' );
 		await page.keyboard.press( 'ArrowUp' );
 
-		const initialPosition = await getCaretPosition();
+		const initialPosition = await typewriterUtils.getCaretPosition();
 
 		// Should maintain scroll position.
-		await page.keyboard.press( 'Enter' );
-
-		expect( await getDiff( initialPosition ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
+		expect(
+			await typewriterUtils.getDiff( initialPosition )
+		).toBeLessThanOrEqual( BUFFER );
 	} );
 
-	it( 'should scroll caret into view from the top', async () => {
+	test( 'should scroll caret into view from the top', async ( {
+		page,
+		typewriterUtils,
+	} ) => {
 		// Create first block.
 		await page.keyboard.press( 'Enter' );
 
@@ -177,7 +196,7 @@ describe( 'TypeWriter', () => {
 			await page.evaluate( () => {
 				const { activeElement } =
 					document.activeElement?.contentDocument ?? document;
-				return ! wp.dom.getScrollContainer( activeElement );
+				return ! window.wp.dom.getScrollContainer( activeElement );
 			} )
 		) {
 			await page.keyboard.press( 'Enter' );
@@ -186,13 +205,14 @@ describe( 'TypeWriter', () => {
 		let count = 0;
 
 		// Create blocks until the typewriter effect kicks in, create at
-		// least 10 blocks to properly test the .
+		// least 10 blocks to properly test it.
 		while (
 			( await page.evaluate( () => {
 				const { activeElement } =
 					document.activeElement?.contentDocument ?? document;
 				return (
-					wp.dom.getScrollContainer( activeElement ).scrollTop === 0
+					window.wp.dom.getScrollContainer( activeElement )
+						.scrollTop === 0
 				);
 			} ) ) ||
 			count < 10
@@ -207,25 +227,25 @@ describe( 'TypeWriter', () => {
 			const { activeElement } =
 				document.activeElement?.contentDocument ?? document;
 			activeElement.scrollIntoView( false );
-			wp.dom.getScrollContainer( activeElement ).scrollTop -=
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop -=
 				activeElement.offsetHeight + 10;
 		} );
 
-		const bottomPostition = await getCaretPosition();
+		const bottomPostition = await typewriterUtils.getCaretPosition();
 
 		// Should scroll the caret back into view (preserve browser behaviour).
 		await page.keyboard.type( 'a' );
 
-		const newBottomPosition = await getCaretPosition();
+		const newBottomPosition = await typewriterUtils.getCaretPosition();
 
 		expect( newBottomPosition ).toBeLessThanOrEqual( bottomPostition );
 
 		// Should maintain new caret position.
 		await page.keyboard.press( 'Enter' );
 
-		expect( await getDiff( newBottomPosition ) ).toBeLessThanOrEqual(
-			BUFFER
-		);
+		expect(
+			await typewriterUtils.getDiff( newBottomPosition )
+		).toBeLessThanOrEqual( BUFFER );
 
 		await page.keyboard.press( 'Backspace' );
 
@@ -239,22 +259,45 @@ describe( 'TypeWriter', () => {
 			const { activeElement } =
 				document.activeElement?.contentDocument ?? document;
 			activeElement.scrollIntoView();
-			wp.dom.getScrollContainer( activeElement ).scrollTop +=
+			window.wp.dom.getScrollContainer( activeElement ).scrollTop +=
 				activeElement.offsetHeight + 10;
 		} );
 
-		const topPostition = await getCaretPosition();
+		const topPostition = await typewriterUtils.getCaretPosition();
 
 		// Should scroll the caret back into view (preserve browser behaviour).
 		await page.keyboard.type( 'a' );
 
-		const newTopPosition = await getCaretPosition();
+		const newTopPosition = await typewriterUtils.getCaretPosition();
 
 		expect( newTopPosition ).toBeGreaterThan( topPostition );
 
 		// Should maintain new caret position.
 		await page.keyboard.press( 'Enter' );
 
-		expect( await getDiff( newTopPosition ) ).toBeLessThanOrEqual( BUFFER );
+		expect(
+			await typewriterUtils.getDiff( newTopPosition )
+		).toBeLessThanOrEqual( BUFFER );
 	} );
 } );
+
+class TypewriterUtils {
+	/** @type {Page} */
+	#page;
+
+	constructor( { page } ) {
+		this.#page = page;
+	}
+
+	async getCaretPosition() {
+		return await this.#page.evaluate( () => {
+			return window.wp.dom.computeCaretRect(
+				document.activeElement?.contentWindow ?? window
+			).y;
+		} );
+	}
+
+	async getDiff( caretPosition ) {
+		return Math.abs( ( await this.getCaretPosition() ) - caretPosition );
+	}
+}

From d6aaa3f1e320238ac6f5ca0b02a097911461f151 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Fri, 12 Jan 2024 09:07:26 +0100
Subject: [PATCH 077/296] DataViews: show loading / no result message for the
 list layout (#57764)

---
 packages/dataviews/src/view-list.js | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
index 70755c4aa35c5..df4297334d178 100644
--- a/packages/dataviews/src/view-list.js
+++ b/packages/dataviews/src/view-list.js
@@ -20,6 +20,7 @@ export default function ViewList( {
 	view,
 	fields,
 	data,
+	isLoading,
 	getItemId,
 	onSelectionChange,
 	onDetailsChange,
@@ -49,6 +50,22 @@ export default function ViewList( {
 		}
 	};
 
+	const hasData = usedData?.length;
+	if ( ! hasData ) {
+		return (
+			<div
+				className={ classNames( {
+					'dataviews-loading': isLoading,
+					'dataviews-no-results': ! hasData && ! isLoading,
+				} ) }
+			>
+				{ ! hasData && (
+					<p>{ isLoading ? __( 'Loading…' ) : __( 'No results' ) }</p>
+				) }
+			</div>
+		);
+	}
+
 	return (
 		<ul className="dataviews-view-list">
 			{ usedData.map( ( item ) => {

From 44ba13d4c26cb6e9dfea65d92530414345dad00a Mon Sep 17 00:00:00 2001
From: arthur791004 <arthur.chu@automattic.com>
Date: Fri, 12 Jan 2024 16:16:46 +0800
Subject: [PATCH 078/296] Live Preview: Show the current theme name on the
 theme activation modal (#57588)

* Live Preview: Show the current theme name on the theme activation modal

* Handle error

* Update comments

* Add missing period
---
 .../src/middlewares/theme-preview.js          | 37 +++++++++++--------
 .../src/components/save-panel/index.js        | 25 +++++++------
 .../src/utils/use-actual-current-theme.js     | 27 ++++++++++++++
 3 files changed, 62 insertions(+), 27 deletions(-)
 create mode 100644 packages/edit-site/src/utils/use-actual-current-theme.js

diff --git a/packages/api-fetch/src/middlewares/theme-preview.js b/packages/api-fetch/src/middlewares/theme-preview.js
index 8ab21fc328476..56098c88cb351 100644
--- a/packages/api-fetch/src/middlewares/theme-preview.js
+++ b/packages/api-fetch/src/middlewares/theme-preview.js
@@ -1,32 +1,39 @@
 /**
  * WordPress dependencies
  */
-import { addQueryArgs, hasQueryArg } from '@wordpress/url';
+import { addQueryArgs, getQueryArg, removeQueryArgs } from '@wordpress/url';
 
 /**
  * This appends a `wp_theme_preview` parameter to the REST API request URL if
  * the admin URL contains a `theme` GET parameter.
  *
+ * If the REST API request URL has contained the `wp_theme_preview` parameter as `''`,
+ * then bypass this middleware.
+ *
  * @param {Record<string, any>} themePath
  * @return {import('../types').APIFetchMiddleware} Preloading middleware.
  */
 const createThemePreviewMiddleware = ( themePath ) => ( options, next ) => {
-	if (
-		typeof options.url === 'string' &&
-		! hasQueryArg( options.url, 'wp_theme_preview' )
-	) {
-		options.url = addQueryArgs( options.url, {
-			wp_theme_preview: themePath,
-		} );
+	if ( typeof options.url === 'string' ) {
+		const wpThemePreview = getQueryArg( options.url, 'wp_theme_preview' );
+		if ( wpThemePreview === undefined ) {
+			options.url = addQueryArgs( options.url, {
+				wp_theme_preview: themePath,
+			} );
+		} else if ( wpThemePreview === '' ) {
+			options.url = removeQueryArgs( options.url, 'wp_theme_preview' );
+		}
 	}
 
-	if (
-		typeof options.path === 'string' &&
-		! hasQueryArg( options.path, 'wp_theme_preview' )
-	) {
-		options.path = addQueryArgs( options.path, {
-			wp_theme_preview: themePath,
-		} );
+	if ( typeof options.path === 'string' ) {
+		const wpThemePreview = getQueryArg( options.path, 'wp_theme_preview' );
+		if ( wpThemePreview === undefined ) {
+			options.path = addQueryArgs( options.path, {
+				wp_theme_preview: themePath,
+			} );
+		} else if ( wpThemePreview === '' ) {
+			options.path = removeQueryArgs( options.path, 'wp_theme_preview' );
+		}
 	}
 
 	return next( options );
diff --git a/packages/edit-site/src/components/save-panel/index.js b/packages/edit-site/src/components/save-panel/index.js
index 5c1bcc1df281e..2840191b4849f 100644
--- a/packages/edit-site/src/components/save-panel/index.js
+++ b/packages/edit-site/src/components/save-panel/index.js
@@ -23,10 +23,8 @@ import { store as coreStore } from '@wordpress/core-data';
 import { store as editSiteStore } from '../../store';
 import { unlock } from '../../lock-unlock';
 import { useActivateTheme } from '../../utils/use-activate-theme';
-import {
-	currentlyPreviewingTheme,
-	isPreviewingTheme,
-} from '../../utils/is-previewing-theme';
+import { useActualCurrentTheme } from '../../utils/use-actual-current-theme';
+import { isPreviewingTheme } from '../../utils/is-previewing-theme';
 
 const { EntitiesSavedStatesExtensible } = unlock( privateApis );
 
@@ -39,19 +37,22 @@ const EntitiesSavedStatesForPreview = ( { onClose } ) => {
 		activateSaveLabel = __( 'Activate' );
 	}
 
-	const themeName = useSelect( ( select ) => {
-		const theme = select( coreStore ).getTheme(
-			currentlyPreviewingTheme()
-		);
+	const currentTheme = useActualCurrentTheme();
 
-		return theme?.name?.rendered;
-	}, [] );
+	const previewingTheme = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme(),
+		[]
+	);
 
 	const additionalPrompt = (
 		<p>
 			{ sprintf(
-				'Saving your changes will change your active theme to %s.',
-				themeName
+				/* translators: %1$s: The name of active theme, %2$s: The name of theme to be activated. */
+				__(
+					'Saving your changes will change your active theme from %1$s to %2$s.'
+				),
+				currentTheme?.name?.rendered ?? '...',
+				previewingTheme?.name?.rendered ?? '...'
 			) }
 		</p>
 	);
diff --git a/packages/edit-site/src/utils/use-actual-current-theme.js b/packages/edit-site/src/utils/use-actual-current-theme.js
new file mode 100644
index 0000000000000..6f8310c2f7de1
--- /dev/null
+++ b/packages/edit-site/src/utils/use-actual-current-theme.js
@@ -0,0 +1,27 @@
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+import { useState, useEffect } from '@wordpress/element';
+import { addQueryArgs } from '@wordpress/url';
+
+const ACTIVE_THEMES_URL = '/wp/v2/themes?status=active';
+
+export function useActualCurrentTheme() {
+	const [ currentTheme, setCurrentTheme ] = useState();
+
+	useEffect( () => {
+		// Set the `wp_theme_preview` to empty string to bypass the createThemePreviewMiddleware.
+		const path = addQueryArgs( ACTIVE_THEMES_URL, {
+			context: 'edit',
+			wp_theme_preview: '',
+		} );
+
+		apiFetch( { path } )
+			.then( ( activeThemes ) => setCurrentTheme( activeThemes[ 0 ] ) )
+			// Do nothing
+			.catch( () => {} );
+	}, [] );
+
+	return currentTheme;
+}

From 75acb7e7035040283a309566070b4f707d111854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Fri, 12 Jan 2024 09:18:29 +0100
Subject: [PATCH 079/296] DataViews: add front page to sidebar (#57759)

---
 .../index.js                                  | 36 +++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
index 171d59c108e9b..1ef4cbddee884 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
@@ -7,9 +7,10 @@ import {
 } from '@wordpress/components';
 import { layout } from '@wordpress/icons';
 import { useMemo } from '@wordpress/element';
-import { useEntityRecords } from '@wordpress/core-data';
+import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { __ } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -41,13 +42,36 @@ export default function SidebarNavigationScreenPagesDataViews() {
 			per_page: -1,
 		}
 	);
-	const templates = useMemo(
-		() =>
-			templateRecords?.filter( ( { slug } ) =>
+
+	const { frontPage, postsPage } = useSelect( ( select ) => {
+		const { getEntityRecord } = select( coreStore );
+		const siteSettings = getEntityRecord( 'root', 'site' );
+		return {
+			frontPage: siteSettings?.page_on_front,
+			postsPage: siteSettings?.page_for_posts,
+		};
+	}, [] );
+
+	const templates = useMemo( () => {
+		if ( ! templateRecords ) {
+			return [];
+		}
+
+		const isHomePageBlog = frontPage === postsPage;
+		const homeTemplate =
+			templateRecords?.find(
+				( template ) => template.slug === 'front-page'
+			) ||
+			templateRecords?.find( ( template ) => template.slug === 'home' ) ||
+			templateRecords?.find( ( template ) => template.slug === 'index' );
+
+		return [
+			isHomePageBlog ? homeTemplate : null,
+			...templateRecords?.filter( ( { slug } ) =>
 				[ '404', 'search' ].includes( slug )
 			),
-		[ templateRecords ]
-	);
+		].filter( Boolean );
+	}, [ templateRecords, frontPage, postsPage ] );
 
 	return (
 		<SidebarNavigationScreen

From 7fce392ac694f4dc66ba6300f7b3356e9cdc2123 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 12 Jan 2024 09:30:59 +0100
Subject: [PATCH 080/296] Restore visual separator between mover buttons when
 show button label is on (#57640)

* Restore visual separator between mover buttons when show button labels is on.

* Style block movers separator for Top toolbar.

* Reuse existing CSS selector.

* Improve horizontal separator positioning.
---
 .../src/components/block-toolbar/style.scss   | 31 +++++++++++--------
 .../src/components/header/style.scss          | 17 +++++++---
 .../components/header-edit-mode/style.scss    | 20 +++++++++---
 .../src/components/header/style.scss          |  2 +-
 4 files changed, 47 insertions(+), 23 deletions(-)

diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index 85020cea2aa23..fc18dba7cc2cf 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -203,6 +203,24 @@
 
 	.block-editor-block-mover .block-editor-block-mover__move-button-container {
 		width: auto;
+
+		@include break-small() {
+			position: relative;
+
+			&::before {
+				content: "";
+				height: $border-width;
+				width: 100%;
+				background: $gray-900;
+				position: absolute;
+				top: 50%;
+				left: 50%;
+				// With Top toolbar enabled, this separator has a smaller width. Translating the
+				// X axis allows to make the separator always centered regardless of its width.
+				transform: translate(-50%, 0);
+				margin-top: -$border-width * 0.5;
+			}
+		}
 	}
 
 	.block-editor-block-mover.is-horizontal {
@@ -231,19 +249,6 @@
 		padding-right: $grid-unit-15;
 	}
 
-	@include break-small() {
-		// Specificity override for https://github.com/WordPress/gutenberg/blob/try/block-toolbar-labels/packages/block-editor/src/components/block-mover/style.scss#L69
-		.is-up-button.is-up-button.is-up-button {
-			margin-right: 0;
-			border-radius: 0;
-			order: 1;
-		}
-
-		.is-down-button.is-down-button.is-down-button {
-			order: 2;
-		}
-	}
-
 	.block-editor-block-contextual-toolbar .block-editor-block-mover.is-horizontal .block-editor-block-mover-button.block-editor-block-mover-button {
 		width: auto;
 	}
diff --git a/packages/edit-post/src/components/header/style.scss b/packages/edit-post/src/components/header/style.scss
index a3cf623a2d1aa..84e8328393d7a 100644
--- a/packages/edit-post/src/components/header/style.scss
+++ b/packages/edit-post/src/components/header/style.scss
@@ -69,7 +69,7 @@
 			margin-left: $grid-unit;
 		}
 
-		// Modified group borders
+		// Modified group borders.
 		.components-toolbar-group,
 		.components-toolbar {
 			border-right: none;
@@ -194,18 +194,27 @@
 }
 
 .show-icon-labels {
-
 	.edit-post-header__toolbar .block-editor-block-mover {
+		// Modified group borders.
 		border-left: none;
 
 		&::before {
 			content: "";
 			width: $border-width;
-			margin-top: $grid-unit + $grid-unit-05;
-			margin-bottom: $grid-unit + $grid-unit-05;
+			margin-top: $grid-unit-15;
+			margin-bottom: $grid-unit-15;
 			background-color: $gray-300;
 			margin-left: $grid-unit;
 		}
+
+		// Modified block movers horizontal separator.
+		.block-editor-block-mover__move-button-container {
+			&::before {
+				width: calc(100% - #{$grid-unit-30});
+				background: $gray-300;
+				left: calc(50% + 1px);
+			}
+		}
 	}
 }
 
diff --git a/packages/edit-site/src/components/header-edit-mode/style.scss b/packages/edit-site/src/components/header-edit-mode/style.scss
index 44b762a667bb7..710c20b4e15f1 100644
--- a/packages/edit-site/src/components/header-edit-mode/style.scss
+++ b/packages/edit-site/src/components/header-edit-mode/style.scss
@@ -143,16 +143,26 @@ $header-toolbar-min-width: 335px;
 	}
 
 	.block-editor-block-mover {
+		// Modified group borders.
 		border-left: none;
 
 		&::before {
 			content: "";
 			width: $border-width;
-			margin-top: $grid-unit + $grid-unit-05;
-			margin-bottom: $grid-unit + $grid-unit-05;
+			margin-top: $grid-unit-15;
+			margin-bottom: $grid-unit-15;
 			background-color: $gray-300;
 			margin-left: $grid-unit;
 		}
+
+		// Modified block movers horizontal separator.
+		.block-editor-block-mover__move-button-container {
+			&::before {
+				width: calc(100% - #{$grid-unit-30});
+				background: $gray-300;
+				left: calc(50% + 1px);
+			}
+		}
 	}
 }
 
@@ -164,7 +174,7 @@ $header-toolbar-min-width: 335px;
 			border-bottom: 0;
 		}
 
-		// Modified group borders
+		// Modified group borders.
 		.components-toolbar-group,
 		.components-toolbar {
 			border-right: none;
@@ -172,8 +182,8 @@ $header-toolbar-min-width: 335px;
 			&::after {
 				content: "";
 				width: $border-width;
-				margin-top: $grid-unit + $grid-unit-05;
-				margin-bottom: $grid-unit + $grid-unit-05;
+				margin-top: $grid-unit-15;
+				margin-bottom: $grid-unit-15;
 				background-color: $gray-300;
 				margin-left: $grid-unit;
 			}
diff --git a/packages/edit-widgets/src/components/header/style.scss b/packages/edit-widgets/src/components/header/style.scss
index c5bdc2561d5d5..2a3e3509cb412 100644
--- a/packages/edit-widgets/src/components/header/style.scss
+++ b/packages/edit-widgets/src/components/header/style.scss
@@ -17,7 +17,7 @@
 			border-bottom: 0;
 		}
 
-		// Modified group borders
+		// Modified group borders.
 		.components-toolbar-group,
 		.components-toolbar {
 			border-right: none;

From f89e323c4332833696556f157d16bf8062e581cb Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 12 Jan 2024 11:31:15 +0100
Subject: [PATCH 081/296] Editor: Unify the Editor Mode preference. (#57642)

---
 packages/edit-post/src/index.js               |  2 +-
 packages/edit-post/src/store/actions.js       |  4 +---
 packages/edit-post/src/store/selectors.js     | 19 ++++++++++++++++---
 packages/edit-site/src/index.js               |  2 +-
 packages/edit-site/src/store/actions.js       |  2 +-
 packages/edit-site/src/store/selectors.js     |  2 +-
 .../convert-editor-settings.js                |  1 +
 .../preferences-package-data/test/index.js    |  2 +-
 8 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
index a3831047457be..b9409f22f6ab3 100644
--- a/packages/edit-post/src/index.js
+++ b/packages/edit-post/src/index.js
@@ -53,7 +53,6 @@ export function initializeEditor(
 	const root = createRoot( target );
 
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
-		editorMode: 'visual',
 		fullscreenMode: true,
 		hiddenBlockTypes: [],
 		isPublishSidebarEnabled: true,
@@ -65,6 +64,7 @@ export function initializeEditor(
 
 	dispatch( preferencesStore ).setDefaults( 'core', {
 		allowRightClickOverrides: true,
+		editorMode: 'visual',
 		fixedToolbar: false,
 		inactivePanels: [],
 		openPanels: [ 'post-status' ],
diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
index a4ca78f95e59c..642640335d053 100644
--- a/packages/edit-post/src/store/actions.js
+++ b/packages/edit-post/src/store/actions.js
@@ -194,9 +194,7 @@ export const toggleFeature =
 export const switchEditorMode =
 	( mode ) =>
 	( { dispatch, registry } ) => {
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'editorMode', mode );
+		registry.dispatch( preferencesStore ).set( 'core', 'editorMode', mode );
 
 		// Unselect blocks when we switch to the code editor.
 		if ( mode !== 'visual' ) {
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index 0d879493f995b..26f888999e9fb 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -30,8 +30,7 @@ const EMPTY_OBJECT = {};
  */
 export const getEditorMode = createRegistrySelector(
 	( select ) => () =>
-		select( preferencesStore ).get( 'core/edit-post', 'editorMode' ) ??
-		'visual'
+		select( preferencesStore ).get( 'core', 'editorMode' ) ?? 'visual'
 );
 
 /**
@@ -167,7 +166,6 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 	// editor preferences.
 	const preferences = [
 		'hiddenBlockTypes',
-		'editorMode',
 		'preferredStyleVariations',
 	].reduce( ( accumulatedPrefs, preferenceKey ) => {
 		const value = select( preferencesStore ).get(
@@ -180,6 +178,20 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 			[ preferenceKey ]: value,
 		};
 	}, {} );
+	const corePreferences = [ 'editorMode' ].reduce(
+		( accumulatedPrefs, preferenceKey ) => {
+			const value = select( preferencesStore ).get(
+				'core',
+				preferenceKey
+			);
+
+			return {
+				...accumulatedPrefs,
+				[ preferenceKey ]: value,
+			};
+		},
+		{}
+	);
 
 	// Panels were a preference, but the data structure changed when the state
 	// was migrated to the preferences store. They need to be converted from
@@ -194,6 +206,7 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 
 	return {
 		...preferences,
+		...corePreferences,
 		panels,
 	};
 } );
diff --git a/packages/edit-site/src/index.js b/packages/edit-site/src/index.js
index 29b7df32e6d69..fccf8cb02bc54 100644
--- a/packages/edit-site/src/index.js
+++ b/packages/edit-site/src/index.js
@@ -52,7 +52,6 @@ export function initializeEditor( id, settings ) {
 	// We dispatch actions and update the store synchronously before rendering
 	// so that we won't trigger unnecessary re-renders with useEffect.
 	dispatch( preferencesStore ).setDefaults( 'core/edit-site', {
-		editorMode: 'visual',
 		welcomeGuide: true,
 		welcomeGuideStyles: true,
 		welcomeGuidePage: true,
@@ -62,6 +61,7 @@ export function initializeEditor( id, settings ) {
 	dispatch( preferencesStore ).setDefaults( 'core', {
 		allowRightClickOverrides: true,
 		distractionFree: false,
+		editorMode: 'visual',
 		fixedToolbar: false,
 		focusMode: false,
 		inactivePanels: [],
diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
index e7f2671784e1d..f5f4ae7ba3fae 100644
--- a/packages/edit-site/src/store/actions.js
+++ b/packages/edit-site/src/store/actions.js
@@ -505,7 +505,7 @@ export const switchEditorMode =
 	( { dispatch, registry } ) => {
 		registry
 			.dispatch( 'core/preferences' )
-			.set( 'core/edit-site', 'editorMode', mode );
+			.set( 'core', 'editorMode', mode );
 
 		// Unselect blocks when we switch to a non visual mode.
 		if ( mode !== 'visual' ) {
diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
index 4d7adaaa848fe..becc066a45d24 100644
--- a/packages/edit-site/src/store/selectors.js
+++ b/packages/edit-site/src/store/selectors.js
@@ -268,7 +268,7 @@ export const getCurrentTemplateTemplateParts = createRegistrySelector(
  * @return {string} Editing mode.
  */
 export const getEditorMode = createRegistrySelector( ( select ) => () => {
-	return select( preferencesStore ).get( 'core/edit-site', 'editorMode' );
+	return select( preferencesStore ).get( 'core', 'editorMode' );
 } );
 
 /**
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
index 84542937563ac..5def03bb348fa 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
@@ -7,6 +7,7 @@ export default function convertEditorSettings( data ) {
 	const settingsToMoveToCore = [
 		'allowRightClickOverrides',
 		'distractionFree',
+		'editorMode',
 		'fixedToolbar',
 		'focusMode',
 		'inactivePanels',
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
index ffa39e630f509..5ea8cd45e0676 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
@@ -43,6 +43,7 @@ describe( 'convertPreferencesPackageData', () => {
 			.toMatchInlineSnapshot( `
 		{
 		  "core": {
+		    "editorMode": "visual",
 		    "fixedToolbar": true,
 		    "inactivePanels": [],
 		    "openPanels": [
@@ -54,7 +55,6 @@ describe( 'convertPreferencesPackageData', () => {
 		    "welcomeGuide": false,
 		  },
 		  "core/edit-post": {
-		    "editorMode": "visual",
 		    "fullscreenMode": false,
 		    "hiddenBlockTypes": [
 		      "core/audio",

From 7ca256c2793a5d225381d29faea44832c58dbd53 Mon Sep 17 00:00:00 2001
From: Ramon <ramonjd@users.noreply.github.com>
Date: Fri, 12 Jan 2024 22:00:15 +1100
Subject: [PATCH 082/296] Site editor: add global styles changes to save flow
 (#57470)

* Comparing current user global styles with saved record.

* Added a "Changes made to" h3 heading.
---
 .../entities-saved-states/entity-type-list.js | 52 +++++++++++++++++--
 .../entities-saved-states/style.scss          |  4 ++
 2 files changed, 51 insertions(+), 5 deletions(-)

diff --git a/packages/editor/src/components/entities-saved-states/entity-type-list.js b/packages/editor/src/components/entities-saved-states/entity-type-list.js
index dffac536a1d22..d422c2ae9bfdb 100644
--- a/packages/editor/src/components/entities-saved-states/entity-type-list.js
+++ b/packages/editor/src/components/entities-saved-states/entity-type-list.js
@@ -5,11 +5,18 @@ import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
 import { PanelBody, PanelRow } from '@wordpress/components';
 import { store as coreStore } from '@wordpress/core-data';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import { useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import EntityRecordItem from './entity-record-item';
+import { unlock } from '../../lock-unlock';
+
+const { getGlobalStylesChanges, GlobalStylesContext } = unlock(
+	blockEditorPrivateApis
+);
 
 function getEntityDescription( entity, count ) {
 	switch ( entity ) {
@@ -27,6 +34,44 @@ function getEntityDescription( entity, count ) {
 	}
 }
 
+function GlobalStylesDescription( { record } ) {
+	const { user: currentEditorGlobalStyles } =
+		useContext( GlobalStylesContext );
+	const savedRecord = useSelect(
+		( select ) =>
+			select( coreStore ).getEntityRecord(
+				record.kind,
+				record.name,
+				record.key
+			),
+		[ record.kind, record.name, record.key ]
+	);
+
+	const globalStylesChanges = getGlobalStylesChanges(
+		currentEditorGlobalStyles,
+		savedRecord,
+		{
+			maxResults: 10,
+		}
+	);
+	return globalStylesChanges.length ? (
+		<>
+			<h3 className="entities-saved-states__description-heading">
+				{ __( 'Changes made to:' ) }
+			</h3>
+			<PanelRow>{ globalStylesChanges.join( ', ' ) }</PanelRow>
+		</>
+	) : null;
+}
+
+function EntityDescription( { record, count } ) {
+	if ( 'globalStyles' === record?.name ) {
+		return <GlobalStylesDescription record={ record } />;
+	}
+	const description = getEntityDescription( record?.name, count );
+	return description ? <PanelRow>{ description }</PanelRow> : null;
+}
+
 export default function EntityTypeList( {
 	list,
 	unselectedEntities,
@@ -42,19 +87,16 @@ export default function EntityTypeList( {
 			),
 		[ firstRecord.kind, firstRecord.name ]
 	);
-	const { name } = firstRecord;
 
 	let entityLabel = entityConfig.label;
-	if ( name === 'wp_template_part' ) {
+	if ( firstRecord?.name === 'wp_template_part' ) {
 		entityLabel =
 			1 === count ? __( 'Template Part' ) : __( 'Template Parts' );
 	}
-	// Set description based on type of entity.
-	const description = getEntityDescription( name, count );
 
 	return (
 		<PanelBody title={ entityLabel } initialOpen={ true }>
-			{ description && <PanelRow>{ description }</PanelRow> }
+			<EntityDescription record={ firstRecord } count={ count } />
 			{ list.map( ( record ) => {
 				return (
 					<EntityRecordItem
diff --git a/packages/editor/src/components/entities-saved-states/style.scss b/packages/editor/src/components/entities-saved-states/style.scss
index 8dc3d55a2bd28..6fb981c22f960 100644
--- a/packages/editor/src/components/entities-saved-states/style.scss
+++ b/packages/editor/src/components/entities-saved-states/style.scss
@@ -15,3 +15,7 @@
 		margin-bottom: $grid-unit-15;
 	}
 }
+
+.entities-saved-states__description-heading {
+	font-size: $default-font-size;
+}

From 3c5727810bdd1417b09639a05a3d21afd9c59b71 Mon Sep 17 00:00:00 2001
From: Marin Atanasov <8436925+tyxla@users.noreply.github.com>
Date: Fri, 12 Jan 2024 13:58:21 +0200
Subject: [PATCH 083/296] Editor: Use hooks instead of HoCs for `EditorNotices`
 (#57772)

* Editor: Use hooks instead of HoCs for EditorNotices

* Minor optimizations as per feedback
---
 .../src/components/editor-notices/index.js    | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/editor/src/components/editor-notices/index.js b/packages/editor/src/components/editor-notices/index.js
index ec4bd04d68920..a25d3fa40a204 100644
--- a/packages/editor/src/components/editor-notices/index.js
+++ b/packages/editor/src/components/editor-notices/index.js
@@ -2,8 +2,7 @@
  * WordPress dependencies
  */
 import { NoticeList } from '@wordpress/components';
-import { withSelect, withDispatch } from '@wordpress/data';
-import { compose } from '@wordpress/compose';
+import { useDispatch, useSelect } from '@wordpress/data';
 import { store as noticesStore } from '@wordpress/notices';
 
 /**
@@ -11,7 +10,14 @@ import { store as noticesStore } from '@wordpress/notices';
  */
 import TemplateValidationNotice from '../template-validation-notice';
 
-export function EditorNotices( { notices, onRemove } ) {
+export function EditorNotices() {
+	const { notices } = useSelect(
+		( select ) => ( {
+			notices: select( noticesStore ).getNotices(),
+		} ),
+		[]
+	);
+	const { removeNotice } = useDispatch( noticesStore );
 	const dismissibleNotices = notices.filter(
 		( { isDismissible, type } ) => isDismissible && type === 'default'
 	);
@@ -28,7 +34,7 @@ export function EditorNotices( { notices, onRemove } ) {
 			<NoticeList
 				notices={ dismissibleNotices }
 				className="components-editor-notices__dismissible"
-				onRemove={ onRemove }
+				onRemove={ removeNotice }
 			>
 				<TemplateValidationNotice />
 			</NoticeList>
@@ -36,11 +42,4 @@ export function EditorNotices( { notices, onRemove } ) {
 	);
 }
 
-export default compose( [
-	withSelect( ( select ) => ( {
-		notices: select( noticesStore ).getNotices(),
-	} ) ),
-	withDispatch( ( dispatch ) => ( {
-		onRemove: dispatch( noticesStore ).removeNotice,
-	} ) ),
-] )( EditorNotices );
+export default EditorNotices;

From 1b6948a98e4b0600783397cad48a45a098c6a917 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 12 Jan 2024 14:15:56 +0100
Subject: [PATCH 084/296] Unify the preferences modal UI between post and site
 editor (#57639)

Co-authored-by: ntsekouras <ntsekouras@outlook.com>
---
 lib/client-assets.php                         |  21 +-
 package-lock.json                             |   4 +
 packages/base-styles/_z-index.scss            |   4 +-
 .../{options => }/enable-custom-fields.js     |  13 +-
 .../{options => }/enable-panel.js             |  11 +-
 .../{options => }/enable-publish-sidebar.js   |  11 +-
 .../src/components/preferences-modal/index.js | 311 +++---------------
 .../preferences-modal/meta-boxes-section.js   |   8 +-
 .../options/enable-feature.js                 |  31 --
 .../preferences-modal/options/index.js        |   5 -
 .../enable-custom-fields.js.snap              |   8 +-
 .../__snapshots__/meta-boxes-section.js.snap  |  36 +-
 .../test/enable-custom-fields.js              |   0
 .../plugin-document-setting-panel/index.js    |   8 +-
 packages/edit-post/src/editor.js              | 140 ++++----
 packages/edit-post/src/editor.native.js       |  37 +--
 packages/edit-post/src/index.js               |   2 +-
 packages/edit-post/src/index.native.js        |   2 +-
 packages/edit-post/src/store/actions.js       |  33 +-
 packages/edit-post/src/store/selectors.js     |  34 +-
 packages/edit-post/src/store/test/actions.js  |  18 +-
 packages/edit-post/src/style.scss             |   1 -
 .../src/components/preferences-modal/index.js | 219 +-----------
 .../src/components/block-manager/category.js  |  62 ++--
 .../src/components/block-manager/checklist.js |   4 +-
 .../src/components/block-manager/index.js     |  32 +-
 .../src/components/block-manager/style.scss   |  28 +-
 .../preferences-modal/enable-panel.js}        |  13 +-
 .../enable-plugin-document-setting-panel.js   |   2 +-
 .../src/components/preferences-modal/index.js | 269 +++++++++++++++
 .../preferences-modal/test/index.js           |  28 ++
 .../provider/use-block-editor-settings.js     |  29 +-
 packages/editor/src/private-apis.js           |   8 +-
 packages/editor/src/store/private-actions.js  |  49 +++
 packages/editor/src/style.scss                |   1 +
 packages/interface/src/components/index.js    |   4 -
 .../preferences-modal-section/index.js        |  19 --
 packages/interface/src/style.scss             |   4 -
 .../convert-editor-settings.js                |   1 +
 .../preferences-package-data/test/index.js    |   8 +-
 packages/preferences/package.json             |   2 +
 .../preference-base-option}/README.md         |  10 +-
 .../preference-base-option}/index.js          |   2 +-
 .../preference-base-option}/style.scss        |   2 +-
 .../preference-toggle-control/index.js}       |  17 +-
 .../preferences-modal-section/README.md       |   1 +
 .../preferences-modal-section/index.js        |  15 +
 .../preferences-modal-section/style.scss      |  10 +-
 .../preferences-modal-tabs/README.md          |   0
 .../preferences-modal-tabs/index.js           |  12 +-
 .../preferences-modal-tabs/style.scss         |   8 +-
 .../components/preferences-modal/README.md    |   2 +-
 .../src/components/preferences-modal/index.js |   2 +-
 .../components/preferences-modal/style.scss   |   2 +-
 packages/preferences/src/index.js             |   1 +
 packages/preferences/src/lock-unlock.js       |   9 +
 packages/preferences/src/private-apis.js      |  18 +
 packages/preferences/src/store/index.js       |   2 +-
 packages/preferences/src/style.scss           |   4 +
 packages/private-apis/src/implementation.js   |   1 +
 60 files changed, 773 insertions(+), 865 deletions(-)
 rename packages/edit-post/src/components/preferences-modal/{options => }/enable-custom-fields.js (87%)
 rename packages/edit-post/src/components/preferences-modal/{options => }/enable-panel.js (72%)
 rename packages/edit-post/src/components/preferences-modal/{options => }/enable-publish-sidebar.js (75%)
 delete mode 100644 packages/edit-post/src/components/preferences-modal/options/enable-feature.js
 delete mode 100644 packages/edit-post/src/components/preferences-modal/options/index.js
 rename packages/edit-post/src/components/preferences-modal/{options => }/test/__snapshots__/enable-custom-fields.js.snap (98%)
 rename packages/edit-post/src/components/preferences-modal/{options => }/test/enable-custom-fields.js (100%)
 rename packages/{edit-post => editor}/src/components/block-manager/category.js (57%)
 rename packages/{edit-post => editor}/src/components/block-manager/checklist.js (85%)
 rename packages/{edit-post => editor}/src/components/block-manager/index.js (83%)
 rename packages/{edit-post => editor}/src/components/block-manager/style.scss (66%)
 rename packages/{edit-site/src/components/preferences-modal/enable-panel-option.js => editor/src/components/preferences-modal/enable-panel.js} (66%)
 rename packages/{edit-post/src/components/preferences-modal/options => editor/src/components/preferences-modal}/enable-plugin-document-setting-panel.js (90%)
 create mode 100644 packages/editor/src/components/preferences-modal/index.js
 create mode 100644 packages/editor/src/components/preferences-modal/test/index.js
 delete mode 100644 packages/interface/src/components/preferences-modal-section/index.js
 rename packages/{interface/src/components/preferences-modal-base-option => preferences/src/components/preference-base-option}/README.md (69%)
 rename packages/{interface/src/components/preferences-modal-base-option => preferences/src/components/preference-base-option}/index.js (86%)
 rename packages/{interface/src/components/preferences-modal-base-option => preferences/src/components/preference-base-option}/style.scss (75%)
 rename packages/{edit-site/src/components/preferences-modal/enable-feature.js => preferences/src/components/preference-toggle-control/index.js} (66%)
 rename packages/{interface => preferences}/src/components/preferences-modal-section/README.md (94%)
 create mode 100644 packages/preferences/src/components/preferences-modal-section/index.js
 rename packages/{interface => preferences}/src/components/preferences-modal-section/style.scss (50%)
 rename packages/{interface => preferences}/src/components/preferences-modal-tabs/README.md (100%)
 rename packages/{interface => preferences}/src/components/preferences-modal-tabs/index.js (93%)
 rename packages/{interface => preferences}/src/components/preferences-modal-tabs/style.scss (85%)
 rename packages/{interface => preferences}/src/components/preferences-modal/README.md (96%)
 rename packages/{interface => preferences}/src/components/preferences-modal/index.js (87%)
 rename packages/{interface => preferences}/src/components/preferences-modal/style.scss (94%)
 create mode 100644 packages/preferences/src/lock-unlock.js
 create mode 100644 packages/preferences/src/private-apis.js
 create mode 100644 packages/preferences/src/style.scss

diff --git a/lib/client-assets.php b/lib/client-assets.php
index c5b03b6833d03..717267a5e2a50 100644
--- a/lib/client-assets.php
+++ b/lib/client-assets.php
@@ -266,7 +266,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-block-editor',
 		gutenberg_url( 'build/block-editor/style.css' ),
-		array( 'wp-components' ),
+		array( 'wp-components', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-block-editor', 'rtl', 'replace' );
@@ -275,7 +275,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-editor',
 		gutenberg_url( 'build/editor/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-patterns', 'wp-reusable-blocks' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-patterns', 'wp-reusable-blocks', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-editor', 'rtl', 'replace' );
@@ -284,7 +284,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-post',
 		gutenberg_url( 'build/edit-post/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-block-library', 'wp-commands', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-post', 'rtl', 'replace' );
@@ -409,7 +409,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-site',
 		gutenberg_url( 'build/edit-site/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-commands' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-commands', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-site', 'rtl', 'replace' );
@@ -418,7 +418,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-edit-widgets',
 		gutenberg_url( 'build/edit-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-reusable-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-patterns', 'wp-reusable-blocks', 'wp-widgets', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-edit-widgets', 'rtl', 'replace' );
@@ -436,7 +436,7 @@ function gutenberg_register_packages_styles( $styles ) {
 		$styles,
 		'wp-customize-widgets',
 		gutenberg_url( 'build/customize-widgets/style.css' ),
-		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets' ),
+		array( 'wp-components', 'wp-block-editor', 'wp-editor', 'wp-edit-blocks', 'wp-widgets', 'wp-preferences' ),
 		$version
 	);
 	$styles->add_data( 'wp-customize-widgets', 'rtl', 'replace' );
@@ -466,6 +466,15 @@ function gutenberg_register_packages_styles( $styles ) {
 		array( 'wp-components' )
 	);
 	$styles->add_data( 'wp-widgets', 'rtl', 'replace' );
+
+	gutenberg_override_style(
+		$styles,
+		'wp-preferences',
+		gutenberg_url( 'build/preferences/style.css' ),
+		array( 'wp-components' ),
+		$version
+	);
+	$styles->add_data( 'wp-preferences', 'rtl', 'replace' );
 }
 add_action( 'wp_default_styles', 'gutenberg_register_packages_styles' );
 
diff --git a/package-lock.json b/package-lock.json
index dc84ae2fba494..626b31a3ee9f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55595,10 +55595,12 @@
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "file:../a11y",
 				"@wordpress/components": "file:../components",
+				"@wordpress/compose": "file:../compose",
 				"@wordpress/data": "file:../data",
 				"@wordpress/element": "file:../element",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
+				"@wordpress/private-apis": "file:../private-apis",
 				"classnames": "^2.3.1"
 			},
 			"engines": {
@@ -70260,10 +70262,12 @@
 				"@babel/runtime": "^7.16.0",
 				"@wordpress/a11y": "file:../a11y",
 				"@wordpress/components": "file:../components",
+				"@wordpress/compose": "file:../compose",
 				"@wordpress/data": "file:../data",
 				"@wordpress/element": "file:../element",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
+				"@wordpress/private-apis": "file:../private-apis",
 				"classnames": "^2.3.1"
 			}
 		},
diff --git a/packages/base-styles/_z-index.scss b/packages/base-styles/_z-index.scss
index 36d01c843c1c7..e6d8d12769e70 100644
--- a/packages/base-styles/_z-index.scss
+++ b/packages/base-styles/_z-index.scss
@@ -161,9 +161,9 @@ $z-layers: (
 	".components-resizable-box__corner-handle": 2,
 
 	// Make sure block manager sticky category titles appear above the options
-	".edit-post-block-manager__category-title": 1,
+	".editor-block-manager__category-title": 1,
 	// And block manager sticky disabled block count is higher still
-	".edit-post-block-manager__disabled-blocks-count": 2,
+	".editor-block-manager__disabled-blocks-count": 2,
 
 	// Needs to appear below other color circular picker related UI elements.
 	".components-circular-option-picker__option-wrapper::before": -1,
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js b/packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
similarity index 87%
rename from packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js
rename to packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
index 15521b80b361b..e3ba4a1568420 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-custom-fields.js
+++ b/packages/edit-post/src/components/preferences-modal/enable-custom-fields.js
@@ -6,9 +6,16 @@ import { __ } from '@wordpress/i18n';
 import { Button } from '@wordpress/components';
 import { withSelect } from '@wordpress/data';
 import { store as editorStore } from '@wordpress/editor';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
 import { getPathAndQueryString } from '@wordpress/url';
 
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
+
 function submitCustomFieldsForm() {
 	const customFieldsForm = document.getElementById(
 		'toggle-custom-fields-form'
@@ -53,7 +60,7 @@ export function EnableCustomFieldsOption( { label, areCustomFieldsEnabled } ) {
 	const [ isChecked, setIsChecked ] = useState( areCustomFieldsEnabled );
 
 	return (
-		<BaseOption
+		<PreferenceBaseOption
 			label={ label }
 			isChecked={ isChecked }
 			onChange={ setIsChecked }
@@ -61,7 +68,7 @@ export function EnableCustomFieldsOption( { label, areCustomFieldsEnabled } ) {
 			{ isChecked !== areCustomFieldsEnabled && (
 				<CustomFieldsConfirmation willEnable={ isChecked } />
 			) }
-		</BaseOption>
+		</PreferenceBaseOption>
 	);
 }
 
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-panel.js b/packages/edit-post/src/components/preferences-modal/enable-panel.js
similarity index 72%
rename from packages/edit-post/src/components/preferences-modal/options/enable-panel.js
rename to packages/edit-post/src/components/preferences-modal/enable-panel.js
index 6c9ea22b7f17d..d698cdc360cae 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-panel.js
+++ b/packages/edit-post/src/components/preferences-modal/enable-panel.js
@@ -3,8 +3,15 @@
  */
 import { compose, ifCondition } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
 import { store as editorStore } from '@wordpress/editor';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
 
 export default compose(
 	withSelect( ( select, { panelName } ) => {
@@ -20,4 +27,4 @@ export default compose(
 		onChange: () =>
 			dispatch( editorStore ).toggleEditorPanelEnabled( panelName ),
 	} ) )
-)( BaseOption );
+)( PreferenceBaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js b/packages/edit-post/src/components/preferences-modal/enable-publish-sidebar.js
similarity index 75%
rename from packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js
rename to packages/edit-post/src/components/preferences-modal/enable-publish-sidebar.js
index fa309bedf2461..84f4e72a94609 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-publish-sidebar.js
+++ b/packages/edit-post/src/components/preferences-modal/enable-publish-sidebar.js
@@ -5,7 +5,14 @@ import { compose } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
 import { ifViewportMatches } from '@wordpress/viewport';
 import { store as editorStore } from '@wordpress/editor';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
 
 export default compose(
 	withSelect( ( select ) => ( {
@@ -22,4 +29,4 @@ export default compose(
 	// In < medium viewports we override this option and always show the publish sidebar.
 	// See the edit-post's header component for the specific logic.
 	ifViewportMatches( 'medium' )
-)( BaseOption );
+)( PreferenceBaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/index.js b/packages/edit-post/src/components/preferences-modal/index.js
index a422e4d0a207a..326677aeffc5a 100644
--- a/packages/edit-post/src/components/preferences-modal/index.js
+++ b/packages/edit-post/src/components/preferences-modal/index.js
@@ -5,294 +5,71 @@
 import { __ } from '@wordpress/i18n';
 import { useViewportMatch } from '@wordpress/compose';
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
-import {
-	PostTaxonomies,
-	PostExcerptCheck,
-	PageAttributesCheck,
-	PostFeaturedImageCheck,
-	PostTypeSupportCheck,
-	store as editorStore,
-} from '@wordpress/editor';
-import {
-	PreferencesModal,
-	PreferencesModalTabs,
-	PreferencesModalSection,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
+import { store as interfaceStore } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-
-import {
-	EnablePluginDocumentSettingPanelOption,
-	EnablePublishSidebarOption,
-	EnablePanelOption,
-	EnableFeature,
-} from './options';
+import { unlock } from '../../lock-unlock';
 import MetaBoxesSection from './meta-boxes-section';
-import { store as editPostStore } from '../../store';
-import BlockManager from '../block-manager';
+import EnablePublishSidebarOption from './enable-publish-sidebar';
+
+const { PreferencesModalSection, PreferenceToggleControl } = unlock(
+	preferencesPrivateApis
+);
+const { PreferencesModal } = unlock( editorPrivateApis );
 
 export const PREFERENCES_MODAL_NAME = 'edit-post/preferences';
 
 export default function EditPostPreferencesModal() {
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const { closeModal } = useDispatch( interfaceStore );
-	const [ isModalActive, showBlockBreadcrumbsOption ] = useSelect(
-		( select ) => {
-			const { getEditorSettings } = select( editorStore );
-			const { getEditorMode } = select( editPostStore );
-			const { get } = select( preferencesStore );
-			const modalActive = select( interfaceStore ).isModalActive(
-				PREFERENCES_MODAL_NAME
-			);
-			const mode = getEditorMode();
-			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
-			const isDistractionFreeEnabled = get( 'core', 'distractionFree' );
-			return [
-				modalActive,
-				! isDistractionFreeEnabled &&
-					isLargeViewport &&
-					isRichEditingEnabled &&
-					mode === 'visual',
-				isDistractionFreeEnabled,
-			];
-		},
-		[ isLargeViewport ]
-	);
-
-	const { closeGeneralSidebar } = useDispatch( editPostStore );
-	const { setIsListViewOpened, setIsInserterOpened } =
-		useDispatch( editorStore );
-	const { set: setPreference } = useDispatch( preferencesStore );
-
-	const toggleDistractionFree = () => {
-		setPreference( 'core', 'fixedToolbar', true );
-		setIsInserterOpened( false );
-		setIsListViewOpened( false );
-		closeGeneralSidebar();
-	};
+	const { isModalActive } = useSelect( ( select ) => {
+		const modalActive = select( interfaceStore ).isModalActive(
+			PREFERENCES_MODAL_NAME
+		);
+		return {
+			isModalActive: modalActive,
+		};
+	}, [] );
 
-	const turnOffDistractionFree = () => {
-		setPreference( 'core', 'distractionFree', false );
-	};
-
-	const sections = useMemo(
-		() => [
-			{
-				name: 'general',
-				tabLabel: __( 'General' ),
-				content: (
-					<>
-						{ isLargeViewport && (
-							<PreferencesModalSection
-								title={ __( 'Publishing' ) }
-							>
-								<EnablePublishSidebarOption
-									help={ __(
-										'Review settings, such as visibility and tags.'
-									) }
-									label={ __( 'Enable pre-publish checks' ) }
-								/>
-							</PreferencesModalSection>
-						) }
-						<PreferencesModalSection title={ __( 'Interface' ) }>
-							<EnableFeature
-								scope="core"
-								featureName="showListViewByDefault"
-								help={ __(
-									'Opens the block list view sidebar by default.'
-								) }
-								label={ __( 'Always open list view' ) }
-							/>
-							{ showBlockBreadcrumbsOption && (
-								<EnableFeature
-									scope="core"
-									featureName="showBlockBreadcrumbs"
-									help={ __(
-										'Display the block hierarchy trail at the bottom of the editor.'
-									) }
-									label={ __( 'Show block breadcrumbs' ) }
-								/>
-							) }
-							<EnableFeature
-								scope="core"
-								featureName="allowRightClickOverrides"
-								help={ __(
-									'Allows contextual list view menus via right-click, overriding browser defaults.'
-								) }
-								label={ __(
-									'Allow right-click contextual menus'
-								) }
-							/>
-						</PreferencesModalSection>
-						<PreferencesModalSection
-							title={ __( 'Document settings' ) }
-							description={ __(
-								'Select what settings are shown in the document panel.'
-							) }
-						>
-							<EnablePluginDocumentSettingPanelOption.Slot />
-							<PostTaxonomies
-								taxonomyWrapper={ ( content, taxonomy ) => (
-									<EnablePanelOption
-										label={ taxonomy.labels.menu_name }
-										panelName={ `taxonomy-panel-${ taxonomy.slug }` }
-									/>
-								) }
-							/>
-							<PostFeaturedImageCheck>
-								<EnablePanelOption
-									label={ __( 'Featured image' ) }
-									panelName="featured-image"
-								/>
-							</PostFeaturedImageCheck>
-							<PostExcerptCheck>
-								<EnablePanelOption
-									label={ __( 'Excerpt' ) }
-									panelName="post-excerpt"
-								/>
-							</PostExcerptCheck>
-							<PostTypeSupportCheck
-								supportKeys={ [ 'comments', 'trackbacks' ] }
-							>
-								<EnablePanelOption
-									label={ __( 'Discussion' ) }
-									panelName="discussion-panel"
-								/>
-							</PostTypeSupportCheck>
-							<PageAttributesCheck>
-								<EnablePanelOption
-									label={ __( 'Page attributes' ) }
-									panelName="page-attributes"
-								/>
-							</PageAttributesCheck>
-						</PreferencesModalSection>
-						<MetaBoxesSection title={ __( 'Advanced' ) } />
-					</>
-				),
-			},
-			{
-				name: 'appearance',
-				tabLabel: __( 'Appearance' ),
-				content: (
-					<PreferencesModalSection
-						title={ __( 'Appearance' ) }
-						description={ __(
-							'Customize the editor interface to suit your needs.'
-						) }
-					>
-						<EnableFeature
-							scope="core"
-							featureName="fixedToolbar"
-							onToggle={ turnOffDistractionFree }
+	const extraSections = {
+		general: (
+			<>
+				{ isLargeViewport && (
+					<PreferencesModalSection title={ __( 'Publishing' ) }>
+						<EnablePublishSidebarOption
 							help={ __(
-								'Access all block and document tools in a single place.'
+								'Review settings, such as visibility and tags.'
 							) }
-							label={ __( 'Top toolbar' ) }
-						/>
-						<EnableFeature
-							scope="core"
-							featureName="distractionFree"
-							onToggle={ toggleDistractionFree }
-							help={ __(
-								'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
-							) }
-							label={ __( 'Distraction free' ) }
-						/>
-						<EnableFeature
-							scope="core"
-							featureName="focusMode"
-							help={ __(
-								'Highlights the current block and fades other content.'
-							) }
-							label={ __( 'Spotlight mode' ) }
-						/>
-						<EnableFeature
-							featureName="themeStyles"
-							help={ __(
-								'Make the editor look like your theme.'
-							) }
-							label={ __( 'Use theme styles' ) }
+							label={ __( 'Enable pre-publish checks' ) }
 						/>
 					</PreferencesModalSection>
-				),
-			},
-			{
-				name: 'accessibility',
-				tabLabel: __( 'Accessibility' ),
-				content: (
-					<>
-						<PreferencesModalSection
-							title={ __( 'Navigation' ) }
-							description={ __(
-								'Optimize the editing experience for enhanced control.'
-							) }
-						>
-							<EnableFeature
-								scope="core"
-								featureName="keepCaretInsideBlock"
-								help={ __(
-									'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
-								) }
-								label={ __(
-									'Contain text cursor inside block'
-								) }
-							/>
-						</PreferencesModalSection>
-						<PreferencesModalSection title={ __( 'Interface' ) }>
-							<EnableFeature
-								scope="core"
-								featureName="showIconLabels"
-								label={ __( 'Show button text labels' ) }
-								help={ __(
-									'Show text instead of icons on buttons across the interface.'
-								) }
-							/>
-						</PreferencesModalSection>
-					</>
-				),
-			},
-			{
-				name: 'blocks',
-				tabLabel: __( 'Blocks' ),
-				content: (
-					<>
-						<PreferencesModalSection title={ __( 'Inserter' ) }>
-							<EnableFeature
-								scope="core"
-								featureName="mostUsedBlocks"
-								help={ __(
-									'Adds a category with the most frequently used blocks in the inserter.'
-								) }
-								label={ __( 'Show most used blocks' ) }
-							/>
-						</PreferencesModalSection>
-						<PreferencesModalSection
-							title={ __( 'Manage block visibility' ) }
-							description={ __(
-								"Disable blocks that you don't want to appear in the inserter. They can always be toggled back on later."
-							) }
-						>
-							<BlockManager />
-						</PreferencesModalSection>
-					</>
-				),
-			},
-		],
-		[ isLargeViewport, showBlockBreadcrumbsOption ]
-	);
+				) }
+				<MetaBoxesSection title={ __( 'Advanced' ) } />
+			</>
+		),
+		appearance: (
+			<PreferenceToggleControl
+				scope="core/edit-post"
+				featureName="themeStyles"
+				help={ __( 'Make the editor look like your theme.' ) }
+				label={ __( 'Use theme styles' ) }
+			/>
+		),
+	};
 
 	if ( ! isModalActive ) {
 		return null;
 	}
 
 	return (
-		<PreferencesModal closeModal={ closeModal }>
-			<PreferencesModalTabs sections={ sections } />
-		</PreferencesModal>
+		<PreferencesModal
+			extraSections={ extraSections }
+			isActive={ isModalActive }
+			onClose={ closeModal }
+		/>
 	);
 }
diff --git a/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js b/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
index c160137cfa451..2974e81547dbd 100644
--- a/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
+++ b/packages/edit-post/src/components/preferences-modal/meta-boxes-section.js
@@ -4,13 +4,17 @@
 import { __ } from '@wordpress/i18n';
 import { withSelect } from '@wordpress/data';
 import { store as editorStore } from '@wordpress/editor';
-import { PreferencesModalSection } from '@wordpress/interface';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
-import { EnableCustomFieldsOption, EnablePanelOption } from './options';
+import EnableCustomFieldsOption from './enable-custom-fields';
+import EnablePanelOption from './enable-panel';
 import { store as editPostStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { PreferencesModalSection } = unlock( preferencesPrivateApis );
 
 export function MetaBoxesSection( {
 	areCustomFieldsRegistered,
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-feature.js b/packages/edit-post/src/components/preferences-modal/options/enable-feature.js
deleted file mode 100644
index b3f3a4bbe6923..0000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/enable-feature.js
+++ /dev/null
@@ -1,31 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useSelect, useDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
-
-export default function EnableFeature( props ) {
-	const {
-		scope = 'core/edit-post',
-		featureName,
-		onToggle = () => {},
-		...remainingProps
-	} = props;
-	const isChecked = useSelect(
-		( select ) => !! select( preferencesStore ).get( scope, featureName ),
-		[ scope, featureName ]
-	);
-	const { toggle } = useDispatch( preferencesStore );
-	const onChange = () => {
-		onToggle();
-		toggle( scope, featureName );
-	};
-	return (
-		<BaseOption
-			onChange={ onChange }
-			isChecked={ isChecked }
-			{ ...remainingProps }
-		/>
-	);
-}
diff --git a/packages/edit-post/src/components/preferences-modal/options/index.js b/packages/edit-post/src/components/preferences-modal/options/index.js
deleted file mode 100644
index b5cb1c6c4fe1b..0000000000000
--- a/packages/edit-post/src/components/preferences-modal/options/index.js
+++ /dev/null
@@ -1,5 +0,0 @@
-export { default as EnableCustomFieldsOption } from './enable-custom-fields';
-export { default as EnablePanelOption } from './enable-panel';
-export { default as EnablePluginDocumentSettingPanelOption } from './enable-plugin-document-setting-panel';
-export { default as EnablePublishSidebarOption } from './enable-publish-sidebar';
-export { default as EnableFeature } from './enable-feature';
diff --git a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
similarity index 98%
rename from packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
rename to packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
index 781cff283f164..1ecf664fa091f 100644
--- a/packages/edit-post/src/components/preferences-modal/options/test/__snapshots__/enable-custom-fields.js.snap
+++ b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/enable-custom-fields.js.snap
@@ -54,7 +54,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox and a confirmation
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -160,7 +160,7 @@ exports[`EnableCustomFieldsOption renders a checked checkbox when custom fields
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -256,7 +256,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox and a confirmati
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -363,7 +363,7 @@ exports[`EnableCustomFieldsOption renders an unchecked checkbox when custom fiel
 
 <div>
   <div
-    class="interface-preferences-modal__option"
+    class="preference-base-option"
   >
     <div
       class="components-base-control components-toggle-control emotion-0 emotion-1"
diff --git a/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
index c39f90d4aa0e5..a872e7e0c1945 100644
--- a/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
+++ b/packages/edit-post/src/components/preferences-modal/test/__snapshots__/meta-boxes-section.js.snap
@@ -53,22 +53,22 @@ exports[`MetaBoxesSection renders a Custom Fields option 1`] = `
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__section-content"
+    class="preferences-modal__section-content"
   >
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -165,22 +165,22 @@ exports[`MetaBoxesSection renders a Custom Fields option and meta box options 1`
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__section-content"
+    class="preferences-modal__section-content"
   >
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -221,7 +221,7 @@ exports[`MetaBoxesSection renders a Custom Fields option and meta box options 1`
       </div>
     </div>
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -263,7 +263,7 @@ exports[`MetaBoxesSection renders a Custom Fields option and meta box options 1`
       </div>
     </div>
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -361,22 +361,22 @@ exports[`MetaBoxesSection renders meta box options 1`] = `
 }
 
 <fieldset
-  class="interface-preferences-modal__section"
+  class="preferences-modal__section"
 >
   <legend
-    class="interface-preferences-modal__section-legend"
+    class="preferences-modal__section-legend"
   >
     <h2
-      class="interface-preferences-modal__section-title"
+      class="preferences-modal__section-title"
     >
       Advanced panels
     </h2>
   </legend>
   <div
-    class="interface-preferences-modal__section-content"
+    class="preferences-modal__section-content"
   >
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
@@ -418,7 +418,7 @@ exports[`MetaBoxesSection renders meta box options 1`] = `
       </div>
     </div>
     <div
-      class="interface-preferences-modal__option"
+      class="preference-base-option"
     >
       <div
         class="components-base-control components-toggle-control emotion-0 emotion-1"
diff --git a/packages/edit-post/src/components/preferences-modal/options/test/enable-custom-fields.js b/packages/edit-post/src/components/preferences-modal/test/enable-custom-fields.js
similarity index 100%
rename from packages/edit-post/src/components/preferences-modal/options/test/enable-custom-fields.js
rename to packages/edit-post/src/components/preferences-modal/test/enable-custom-fields.js
diff --git a/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js b/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js
index e77b1ce71160d..09460b8d8624e 100644
--- a/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js
+++ b/packages/edit-post/src/components/sidebar/plugin-document-setting-panel/index.js
@@ -5,14 +5,18 @@ import { createSlotFill, PanelBody } from '@wordpress/components';
 import { usePluginContext } from '@wordpress/plugins';
 import { useDispatch, useSelect } from '@wordpress/data';
 import warning from '@wordpress/warning';
-import { store as editorStore } from '@wordpress/editor';
+import {
+	store as editorStore,
+	privateApis as editorPrivateApis,
+} from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-import { EnablePluginDocumentSettingPanelOption } from '../../preferences-modal/options';
+import { unlock } from '../../../lock-unlock';
 
 const { Fill, Slot } = createSlotFill( 'PluginDocumentSettingPanel' );
+const { EnablePluginDocumentSettingPanelOption } = unlock( editorPrivateApis );
 
 /**
  * Renders items below the Status & Availability panel in the Document Sidebar.
diff --git a/packages/edit-post/src/editor.js b/packages/edit-post/src/editor.js
index d1c7cdbade44f..45bdd88318e49 100644
--- a/packages/edit-post/src/editor.js
+++ b/packages/edit-post/src/editor.js
@@ -1,7 +1,6 @@
 /**
  * WordPress dependencies
  */
-import { store as blocksStore } from '@wordpress/blocks';
 import { useSelect, useDispatch } from '@wordpress/data';
 import {
 	ErrorBoundary,
@@ -38,68 +37,61 @@ function Editor( {
 		initialPostType
 	);
 
-	const {
-		hasInlineToolbar,
-		post,
-		preferredStyleVariations,
-		hiddenBlockTypes,
-		blockTypes,
-		template,
-	} = useSelect(
-		( select ) => {
-			const {
-				isFeatureActive,
-				getEditedPostTemplate,
-				getHiddenBlockTypes,
-			} = select( editPostStore );
-			const { getEntityRecord, getPostType, getEntityRecords, canUser } =
-				select( coreStore );
-			const { getEditorSettings } = select( editorStore );
-			const { getBlockTypes } = select( blocksStore );
-			const isTemplate = [ 'wp_template', 'wp_template_part' ].includes(
-				currentPost.postType
-			);
-			// Ideally the initializeEditor function should be called using the ID of the REST endpoint.
-			// to avoid the special case.
-			let postObject;
-			if ( isTemplate ) {
-				const posts = getEntityRecords(
-					'postType',
-					currentPost.postType,
-					{
-						wp_id: currentPost.postId,
-					}
-				);
-				postObject = posts?.[ 0 ];
-			} else {
-				postObject = getEntityRecord(
-					'postType',
-					currentPost.postType,
-					currentPost.postId
-				);
-			}
-			const supportsTemplateMode =
-				getEditorSettings().supportsTemplateMode;
-			const isViewable =
-				getPostType( currentPost.postType )?.viewable ?? false;
-			const canEditTemplate = canUser( 'create', 'templates' );
-			return {
-				hasInlineToolbar: isFeatureActive( 'inlineToolbar' ),
-				preferredStyleVariations: select( preferencesStore ).get(
-					'core/edit-post',
-					'preferredStyleVariations'
-				),
-				hiddenBlockTypes: getHiddenBlockTypes(),
-				blockTypes: getBlockTypes(),
-				template:
-					supportsTemplateMode && isViewable && canEditTemplate
-						? getEditedPostTemplate()
-						: null,
-				post: postObject,
-			};
-		},
-		[ currentPost.postType, currentPost.postId ]
-	);
+	const { hasInlineToolbar, post, preferredStyleVariations, template } =
+		useSelect(
+			( select ) => {
+				const { isFeatureActive, getEditedPostTemplate } =
+					select( editPostStore );
+				const {
+					getEntityRecord,
+					getPostType,
+					getEntityRecords,
+					canUser,
+				} = select( coreStore );
+				const { getEditorSettings } = select( editorStore );
+				const isTemplate = [
+					'wp_template',
+					'wp_template_part',
+				].includes( currentPost.postType );
+				// Ideally the initializeEditor function should be called using the ID of the REST endpoint.
+				// to avoid the special case.
+				let postObject;
+				if ( isTemplate ) {
+					const posts = getEntityRecords(
+						'postType',
+						currentPost.postType,
+						{
+							wp_id: currentPost.postId,
+						}
+					);
+					postObject = posts?.[ 0 ];
+				} else {
+					postObject = getEntityRecord(
+						'postType',
+						currentPost.postType,
+						currentPost.postId
+					);
+				}
+				const supportsTemplateMode =
+					getEditorSettings().supportsTemplateMode;
+				const isViewable =
+					getPostType( currentPost.postType )?.viewable ?? false;
+				const canEditTemplate = canUser( 'create', 'templates' );
+				return {
+					hasInlineToolbar: isFeatureActive( 'inlineToolbar' ),
+					preferredStyleVariations: select( preferencesStore ).get(
+						'core/edit-post',
+						'preferredStyleVariations'
+					),
+					template:
+						supportsTemplateMode && isViewable && canEditTemplate
+							? getEditedPostTemplate()
+							: null,
+					post: postObject,
+				};
+			},
+			[ currentPost.postType, currentPost.postId ]
+		);
 
 	const { updatePreferredStyleVariations } = useDispatch( editPostStore );
 
@@ -113,33 +105,11 @@ function Editor( {
 				onChange: updatePreferredStyleVariations,
 			},
 			hasInlineToolbar,
-
-			// Keep a reference of the `allowedBlockTypes` from the server to handle use cases
-			// where we need to differentiate if a block is disabled by the user or some plugin.
-			defaultAllowedBlockTypes: settings.allowedBlockTypes,
 		};
-
-		// Omit hidden block types if exists and non-empty.
-		if ( hiddenBlockTypes.length > 0 ) {
-			// Defer to passed setting for `allowedBlockTypes` if provided as
-			// anything other than `true` (where `true` is equivalent to allow
-			// all block types).
-			const defaultAllowedBlockTypes =
-				true === settings.allowedBlockTypes
-					? blockTypes.map( ( { name } ) => name )
-					: settings.allowedBlockTypes || [];
-
-			result.allowedBlockTypes = defaultAllowedBlockTypes.filter(
-				( type ) => ! hiddenBlockTypes.includes( type )
-			);
-		}
-
 		return result;
 	}, [
 		settings,
 		hasInlineToolbar,
-		hiddenBlockTypes,
-		blockTypes,
 		preferredStyleVariations,
 		updatePreferredStyleVariations,
 		getPostLinkProps,
diff --git a/packages/edit-post/src/editor.native.js b/packages/edit-post/src/editor.native.js
index 74d4299a2a1fd..1e49673540e37 100644
--- a/packages/edit-post/src/editor.native.js
+++ b/packages/edit-post/src/editor.native.js
@@ -10,7 +10,7 @@ import { GestureHandlerRootView } from 'react-native-gesture-handler';
  */
 import { Component } from '@wordpress/element';
 import { EditorProvider } from '@wordpress/editor';
-import { parse, serialize, store as blocksStore } from '@wordpress/blocks';
+import { parse, serialize } from '@wordpress/blocks';
 import { withDispatch, withSelect } from '@wordpress/data';
 import { compose } from '@wordpress/compose';
 import {
@@ -47,32 +47,12 @@ class Editor extends Component {
 		this.setTitleRef = this.setTitleRef.bind( this );
 	}
 
-	getEditorSettings( settings, hiddenBlockTypes, blockTypes ) {
+	getEditorSettings( settings ) {
 		settings = {
 			...settings,
 			isRTL: I18nManager.isRTL,
 		};
 
-		// Omit hidden block types if exists and non-empty.
-		if ( hiddenBlockTypes.length > 0 ) {
-			if ( settings.allowedBlockTypes === undefined ) {
-				// If no specific flags for allowedBlockTypes are set, assume `true`
-				// meaning allow all block types.
-				settings.allowedBlockTypes = true;
-			}
-			// Defer to passed setting for `allowedBlockTypes` if provided as
-			// anything other than `true` (where `true` is equivalent to allow
-			// all block types).
-			const defaultAllowedBlockTypes =
-				true === settings.allowedBlockTypes
-					? blockTypes.map( ( { name } ) => name )
-					: settings.allowedBlockTypes || [];
-
-			settings.allowedBlockTypes = defaultAllowedBlockTypes.filter(
-				( type ) => ! hiddenBlockTypes.includes( type )
-			);
-		}
-
 		return settings;
 	}
 
@@ -127,8 +107,6 @@ class Editor extends Component {
 		const {
 			settings,
 			initialEdits,
-			hiddenBlockTypes,
-			blockTypes,
 			post,
 			postId,
 			postType,
@@ -137,11 +115,7 @@ class Editor extends Component {
 			...props
 		} = this.props;
 
-		const editorSettings = this.getEditorSettings(
-			settings,
-			hiddenBlockTypes,
-			blockTypes
-		);
+		const editorSettings = this.getEditorSettings( settings );
 
 		const normalizedPost = post || {
 			id: postId,
@@ -180,13 +154,10 @@ class Editor extends Component {
 
 export default compose( [
 	withSelect( ( select ) => {
-		const { getEditorMode, getHiddenBlockTypes } = select( editPostStore );
-		const { getBlockTypes } = select( blocksStore );
+		const { getEditorMode } = select( editPostStore );
 
 		return {
 			mode: getEditorMode(),
-			hiddenBlockTypes: getHiddenBlockTypes(),
-			blockTypes: getBlockTypes(),
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
diff --git a/packages/edit-post/src/index.js b/packages/edit-post/src/index.js
index b9409f22f6ab3..78c79227c9d89 100644
--- a/packages/edit-post/src/index.js
+++ b/packages/edit-post/src/index.js
@@ -54,7 +54,6 @@ export function initializeEditor(
 
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
 		fullscreenMode: true,
-		hiddenBlockTypes: [],
 		isPublishSidebarEnabled: true,
 		preferredStyleVariations: {},
 		themeStyles: true,
@@ -66,6 +65,7 @@ export function initializeEditor(
 		allowRightClickOverrides: true,
 		editorMode: 'visual',
 		fixedToolbar: false,
+		hiddenBlockTypes: [],
 		inactivePanels: [],
 		openPanels: [ 'post-status' ],
 		showBlockBreadcrumbs: true,
diff --git a/packages/edit-post/src/index.native.js b/packages/edit-post/src/index.native.js
index 974f617d609f2..c1b5126dba3b1 100644
--- a/packages/edit-post/src/index.native.js
+++ b/packages/edit-post/src/index.native.js
@@ -24,7 +24,6 @@ export function initializeEditor( id, postType, postId ) {
 	dispatch( preferencesStore ).setDefaults( 'core/edit-post', {
 		editorMode: 'visual',
 		fullscreenMode: true,
-		hiddenBlockTypes: [],
 		inactivePanels: [],
 		isPublishSidebarEnabled: true,
 		openPanels: [ 'post-status' ],
@@ -32,6 +31,7 @@ export function initializeEditor( id, postType, postId ) {
 		welcomeGuide: true,
 	} );
 	dispatch( preferencesStore ).setDefaults( 'core', {
+		hiddenBlockTypes: [],
 		inactivePanels: [],
 		openPanels: [ 'post-status' ],
 	} );
diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
index 642640335d053..b6d8e437ccabf 100644
--- a/packages/edit-post/src/store/actions.js
+++ b/packages/edit-post/src/store/actions.js
@@ -17,6 +17,7 @@ import { addFilter } from '@wordpress/hooks';
  */
 import { getMetaBoxContainer } from '../utils/meta-boxes';
 import { store as editPostStore } from '.';
+import { unlock } from '../lock-unlock';
 
 /**
  * Returns an action object used in signalling that the user opened an editor sidebar.
@@ -287,21 +288,7 @@ export const updatePreferredStyleVariations =
 export const showBlockTypes =
 	( blockNames ) =>
 	( { registry } ) => {
-		const existingBlockNames =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'hiddenBlockTypes' ) ?? [];
-
-		const newBlockNames = existingBlockNames.filter(
-			( type ) =>
-				! (
-					Array.isArray( blockNames ) ? blockNames : [ blockNames ]
-				).includes( type )
-		);
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'hiddenBlockTypes', newBlockNames );
+		unlock( registry.dispatch( editorStore ) ).showBlockTypes( blockNames );
 	};
 
 /**
@@ -312,21 +299,7 @@ export const showBlockTypes =
 export const hideBlockTypes =
 	( blockNames ) =>
 	( { registry } ) => {
-		const existingBlockNames =
-			registry
-				.select( preferencesStore )
-				.get( 'core/edit-post', 'hiddenBlockTypes' ) ?? [];
-
-		const mergedBlockNames = new Set( [
-			...existingBlockNames,
-			...( Array.isArray( blockNames ) ? blockNames : [ blockNames ] ),
-		] );
-
-		registry
-			.dispatch( preferencesStore )
-			.set( 'core/edit-post', 'hiddenBlockTypes', [
-				...mergedBlockNames,
-			] );
+		unlock( registry.dispatch( editorStore ) ).hideBlockTypes( blockNames );
 	};
 
 /**
diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index 26f888999e9fb..b6a54dfd0de2c 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -164,21 +164,21 @@ export const getPreferences = createRegistrySelector( ( select ) => () => {
 	// These preferences now exist in the preferences store.
 	// Fetch them so that they can be merged into the post
 	// editor preferences.
-	const preferences = [
-		'hiddenBlockTypes',
-		'preferredStyleVariations',
-	].reduce( ( accumulatedPrefs, preferenceKey ) => {
-		const value = select( preferencesStore ).get(
-			'core/edit-post',
-			preferenceKey
-		);
+	const preferences = [ 'preferredStyleVariations' ].reduce(
+		( accumulatedPrefs, preferenceKey ) => {
+			const value = select( preferencesStore ).get(
+				'core/edit-post',
+				preferenceKey
+			);
 
-		return {
-			...accumulatedPrefs,
-			[ preferenceKey ]: value,
-		};
-	}, {} );
-	const corePreferences = [ 'editorMode' ].reduce(
+			return {
+				...accumulatedPrefs,
+				[ preferenceKey ]: value,
+			};
+		},
+		{}
+	);
+	const corePreferences = [ 'editorMode', 'hiddenBlockTypes' ].reduce(
 		( accumulatedPrefs, preferenceKey ) => {
 			const value = select( preferencesStore ).get(
 				'core',
@@ -238,10 +238,8 @@ export function getPreference( state, preferenceKey, defaultValue ) {
  */
 export const getHiddenBlockTypes = createRegistrySelector( ( select ) => () => {
 	return (
-		select( preferencesStore ).get(
-			'core/edit-post',
-			'hiddenBlockTypes'
-		) ?? EMPTY_ARRAY
+		select( preferencesStore ).get( 'core', 'hiddenBlockTypes' ) ??
+		EMPTY_ARRAY
 	);
 } );
 
diff --git a/packages/edit-post/src/store/test/actions.js b/packages/edit-post/src/store/test/actions.js
index f702d412d55da..f1db11d26bafc 100644
--- a/packages/edit-post/src/store/test/actions.js
+++ b/packages/edit-post/src/store/test/actions.js
@@ -154,16 +154,13 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expected );
 
 			expect(
 				registry.select( editPostStore ).getHiddenBlockTypes()
 			).toEqual( expected );
-
-			// Expect a deprecation message for `getPreference`.
-			expect( console ).toHaveWarned();
 		} );
 	} );
 
@@ -177,8 +174,8 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expectedA );
 
 			expect(
@@ -193,8 +190,8 @@ describe( 'actions', () => {
 
 			expect(
 				registry
-					.select( editPostStore )
-					.getPreference( 'hiddenBlockTypes' )
+					.select( preferencesStore )
+					.get( 'core', 'hiddenBlockTypes' )
 			).toEqual( expectedB );
 
 			expect(
@@ -220,6 +217,9 @@ describe( 'actions', () => {
 				'core/paragraph': 'fancy',
 				'core/quote': 'posh',
 			} );
+
+			// Expect a deprecation message for `getPreference`.
+			expect( console ).toHaveWarned();
 		} );
 
 		it( 'removes a preferred style variation for a block when a style name is omitted', () => {
diff --git a/packages/edit-post/src/style.scss b/packages/edit-post/src/style.scss
index adfd7218c4c12..adb5e08da5e84 100644
--- a/packages/edit-post/src/style.scss
+++ b/packages/edit-post/src/style.scss
@@ -3,7 +3,6 @@
 @import "./components/header/fullscreen-mode-close/style.scss";
 @import "./components/keyboard-shortcut-help-modal/style.scss";
 @import "./components/layout/style.scss";
-@import "./components/block-manager/style.scss";
 @import "./components/meta-boxes/meta-boxes-area/style.scss";
 @import "./components/sidebar/style.scss";
 @import "./components/sidebar/post-format/style.scss";
diff --git a/packages/edit-site/src/components/preferences-modal/index.js b/packages/edit-site/src/components/preferences-modal/index.js
index 8634e3e18b23e..4d719fedad234 100644
--- a/packages/edit-site/src/components/preferences-modal/index.js
+++ b/packages/edit-site/src/components/preferences-modal/index.js
@@ -1,30 +1,16 @@
 /**
  * WordPress dependencies
  */
-import {
-	PreferencesModal,
-	PreferencesModalTabs,
-	PreferencesModalSection,
-	store as interfaceStore,
-} from '@wordpress/interface';
-import { __ } from '@wordpress/i18n';
-import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
-import { store as preferencesStore } from '@wordpress/preferences';
-import {
-	PostTaxonomies,
-	PostExcerptCheck,
-	PageAttributesCheck,
-	PostFeaturedImageCheck,
-	PostTypeSupportCheck,
-	store as editorStore,
-} from '@wordpress/editor';
+import { store as interfaceStore } from '@wordpress/interface';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { privateApis as editorPrivateApis } from '@wordpress/editor';
 
 /**
  * Internal dependencies
  */
-import EnableFeature from './enable-feature';
-import EnablePanelOption from './enable-panel-option';
-import { store as editSiteStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const { PreferencesModal } = unlock( editorPrivateApis );
 
 export const PREFERENCES_MODAL_NAME = 'edit-site/preferences';
 
@@ -32,201 +18,12 @@ export default function EditSitePreferencesModal() {
 	const isModalActive = useSelect( ( select ) =>
 		select( interfaceStore ).isModalActive( PREFERENCES_MODAL_NAME )
 	);
-	const { closeModal, openModal } = useDispatch( interfaceStore );
-	const toggleModal = () =>
-		isModalActive ? closeModal() : openModal( PREFERENCES_MODAL_NAME );
-	const registry = useRegistry();
-	const { closeGeneralSidebar } = useDispatch( editSiteStore );
-	const { setIsListViewOpened, setIsInserterOpened } =
-		useDispatch( editorStore );
-
-	const { set: setPreference } = useDispatch( preferencesStore );
-	const toggleDistractionFree = () => {
-		registry.batch( () => {
-			setPreference( 'core', 'fixedToolbar', true );
-			setIsInserterOpened( false );
-			setIsListViewOpened( false );
-			closeGeneralSidebar();
-		} );
-	};
-
-	const turnOffDistractionFree = () => {
-		setPreference( 'core', 'distractionFree', false );
-	};
+	const { closeModal } = useDispatch( interfaceStore );
 
-	const sections = [
-		{
-			name: 'general',
-			tabLabel: __( 'General' ),
-			content: (
-				<>
-					<PreferencesModalSection title={ __( 'Interface' ) }>
-						<EnableFeature
-							scope="core"
-							featureName="showListViewByDefault"
-							help={ __(
-								'Opens the block list view sidebar by default.'
-							) }
-							label={ __( 'Always open list view' ) }
-						/>
-						<EnableFeature
-							scope="core"
-							featureName="showBlockBreadcrumbs"
-							help={ __(
-								'Shows block breadcrumbs at the bottom of the editor.'
-							) }
-							label={ __( 'Display block breadcrumbs' ) }
-						/>
-						<EnableFeature
-							scope="core"
-							featureName="allowRightClickOverrides"
-							help={ __(
-								'Allows contextual list view menus via right-click, overriding browser defaults.'
-							) }
-							label={ __( 'Allow right-click contextual menus' ) }
-						/>
-					</PreferencesModalSection>
-					<PreferencesModalSection
-						title={ __( 'Document settings' ) }
-						description={ __(
-							'Select what settings are shown in the document panel.'
-						) }
-					>
-						<PostTaxonomies
-							taxonomyWrapper={ ( content, taxonomy ) => (
-								<EnablePanelOption
-									label={ taxonomy.labels.menu_name }
-									panelName={ `taxonomy-panel-${ taxonomy.slug }` }
-								/>
-							) }
-						/>
-						<PostFeaturedImageCheck>
-							<EnablePanelOption
-								label={ __( 'Featured image' ) }
-								panelName="featured-image"
-							/>
-						</PostFeaturedImageCheck>
-						<PostExcerptCheck>
-							<EnablePanelOption
-								label={ __( 'Excerpt' ) }
-								panelName="post-excerpt"
-							/>
-						</PostExcerptCheck>
-						<PostTypeSupportCheck
-							supportKeys={ [ 'comments', 'trackbacks' ] }
-						>
-							<EnablePanelOption
-								label={ __( 'Discussion' ) }
-								panelName="discussion-panel"
-							/>
-						</PostTypeSupportCheck>
-						<PageAttributesCheck>
-							<EnablePanelOption
-								label={ __( 'Page attributes' ) }
-								panelName="page-attributes"
-							/>
-						</PageAttributesCheck>
-					</PreferencesModalSection>
-				</>
-			),
-		},
-		{
-			name: 'appearance',
-			tabLabel: __( 'Appearance' ),
-			content: (
-				<PreferencesModalSection
-					title={ __( 'Appearance' ) }
-					description={ __(
-						'Customize the editor interface to suit your needs.'
-					) }
-				>
-					<EnableFeature
-						scope="core"
-						featureName="fixedToolbar"
-						onToggle={ turnOffDistractionFree }
-						help={ __(
-							'Access all block and document tools in a single place.'
-						) }
-						label={ __( 'Top toolbar' ) }
-					/>
-					<EnableFeature
-						scope="core"
-						featureName="distractionFree"
-						onToggle={ toggleDistractionFree }
-						help={ __(
-							'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
-						) }
-						label={ __( 'Distraction free' ) }
-					/>
-					<EnableFeature
-						scope="core"
-						featureName="focusMode"
-						help={ __(
-							'Highlights the current block and fades other content.'
-						) }
-						label={ __( 'Spotlight mode' ) }
-					/>
-				</PreferencesModalSection>
-			),
-		},
-		{
-			name: 'accessibility',
-			tabLabel: __( 'Accessibility' ),
-			content: (
-				<>
-					<PreferencesModalSection
-						title={ __( 'Navigation' ) }
-						description={ __(
-							'Optimize the editing experience for enhanced control.'
-						) }
-					>
-						<EnableFeature
-							scope="core"
-							featureName="keepCaretInsideBlock"
-							help={ __(
-								'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
-							) }
-							label={ __( 'Contain text cursor inside block' ) }
-						/>
-					</PreferencesModalSection>
-					<PreferencesModalSection title={ __( 'Interface' ) }>
-						<EnableFeature
-							scope="core"
-							featureName="showIconLabels"
-							label={ __( 'Show button text labels' ) }
-							help={ __(
-								'Show text instead of icons on buttons across the interface.'
-							) }
-						/>
-					</PreferencesModalSection>
-				</>
-			),
-		},
-		{
-			name: 'blocks',
-			tabLabel: __( 'Blocks' ),
-			content: (
-				<>
-					<PreferencesModalSection title={ __( 'Inserter' ) }>
-						<EnableFeature
-							scope="core"
-							featureName="mostUsedBlocks"
-							help={ __(
-								'Adds a category with the most frequently used blocks in the inserter.'
-							) }
-							label={ __( 'Show most used blocks' ) }
-						/>
-					</PreferencesModalSection>
-				</>
-			),
-		},
-	];
 	if ( ! isModalActive ) {
 		return null;
 	}
 	return (
-		<PreferencesModal closeModal={ toggleModal }>
-			<PreferencesModalTabs sections={ sections } />
-		</PreferencesModal>
+		<PreferencesModal isActive={ isModalActive } onClose={ closeModal } />
 	);
 }
diff --git a/packages/edit-post/src/components/block-manager/category.js b/packages/editor/src/components/block-manager/category.js
similarity index 57%
rename from packages/edit-post/src/components/block-manager/category.js
rename to packages/editor/src/components/block-manager/category.js
index 6a64563366d63..e7125fa151f72 100644
--- a/packages/edit-post/src/components/block-manager/category.js
+++ b/packages/editor/src/components/block-manager/category.js
@@ -5,44 +5,46 @@ import { useMemo, useCallback } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useInstanceId } from '@wordpress/compose';
 import { CheckboxControl } from '@wordpress/components';
-import { store as editorStore } from '@wordpress/editor';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
 import BlockTypesChecklist from './checklist';
-import { store as editPostStore } from '../../store';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
 
 function BlockManagerCategory( { title, blockTypes } ) {
 	const instanceId = useInstanceId( BlockManagerCategory );
-	const { defaultAllowedBlockTypes, hiddenBlockTypes } = useSelect(
-		( select ) => {
-			const { getEditorSettings } = select( editorStore );
-			const { getHiddenBlockTypes } = select( editPostStore );
-			return {
-				defaultAllowedBlockTypes:
-					getEditorSettings().defaultAllowedBlockTypes,
-				hiddenBlockTypes: getHiddenBlockTypes(),
-			};
-		},
-		[]
-	);
+	const { allowedBlockTypes, hiddenBlockTypes } = useSelect( ( select ) => {
+		const { getEditorSettings } = select( editorStore );
+		const { get } = select( preferencesStore );
+		return {
+			allowedBlockTypes: getEditorSettings().allowedBlockTypes,
+			hiddenBlockTypes: get( 'core', 'hiddenBlockTypes' ),
+		};
+	}, [] );
 	const filteredBlockTypes = useMemo( () => {
-		if ( defaultAllowedBlockTypes === true ) {
+		if ( allowedBlockTypes === true ) {
 			return blockTypes;
 		}
 		return blockTypes.filter( ( { name } ) => {
-			return defaultAllowedBlockTypes?.includes( name );
+			return allowedBlockTypes?.includes( name );
 		} );
-	}, [ defaultAllowedBlockTypes, blockTypes ] );
-	const { showBlockTypes, hideBlockTypes } = useDispatch( editPostStore );
-	const toggleVisible = useCallback( ( blockName, nextIsChecked ) => {
-		if ( nextIsChecked ) {
-			showBlockTypes( blockName );
-		} else {
-			hideBlockTypes( blockName );
-		}
-	}, [] );
+	}, [ allowedBlockTypes, blockTypes ] );
+	const { showBlockTypes, hideBlockTypes } = unlock(
+		useDispatch( editorStore )
+	);
+	const toggleVisible = useCallback(
+		( blockName, nextIsChecked ) => {
+			if ( nextIsChecked ) {
+				showBlockTypes( blockName );
+			} else {
+				hideBlockTypes( blockName );
+			}
+		},
+		[ showBlockTypes, hideBlockTypes ]
+	);
 	const toggleAllVisible = useCallback(
 		( nextIsChecked ) => {
 			const blockNames = blockTypes.map( ( { name } ) => name );
@@ -52,7 +54,7 @@ function BlockManagerCategory( { title, blockTypes } ) {
 				hideBlockTypes( blockNames );
 			}
 		},
-		[ blockTypes ]
+		[ blockTypes, showBlockTypes, hideBlockTypes ]
 	);
 
 	if ( ! filteredBlockTypes.length ) {
@@ -61,9 +63,9 @@ function BlockManagerCategory( { title, blockTypes } ) {
 
 	const checkedBlockNames = filteredBlockTypes
 		.map( ( { name } ) => name )
-		.filter( ( type ) => ! hiddenBlockTypes.includes( type ) );
+		.filter( ( type ) => ! ( hiddenBlockTypes ?? [] ).includes( type ) );
 
-	const titleId = 'edit-post-block-manager__category-title-' + instanceId;
+	const titleId = 'editor-block-manager__category-title-' + instanceId;
 
 	const isAllChecked = checkedBlockNames.length === filteredBlockTypes.length;
 	const isIndeterminate = ! isAllChecked && checkedBlockNames.length > 0;
@@ -72,13 +74,13 @@ function BlockManagerCategory( { title, blockTypes } ) {
 		<div
 			role="group"
 			aria-labelledby={ titleId }
-			className="edit-post-block-manager__category"
+			className="editor-block-manager__category"
 		>
 			<CheckboxControl
 				__nextHasNoMarginBottom
 				checked={ isAllChecked }
 				onChange={ toggleAllVisible }
-				className="edit-post-block-manager__category-title"
+				className="editor-block-manager__category-title"
 				indeterminate={ isIndeterminate }
 				label={ <span id={ titleId }>{ title }</span> }
 			/>
diff --git a/packages/edit-post/src/components/block-manager/checklist.js b/packages/editor/src/components/block-manager/checklist.js
similarity index 85%
rename from packages/edit-post/src/components/block-manager/checklist.js
rename to packages/editor/src/components/block-manager/checklist.js
index aa21fefb1c818..01bd06abdeba8 100644
--- a/packages/edit-post/src/components/block-manager/checklist.js
+++ b/packages/editor/src/components/block-manager/checklist.js
@@ -6,11 +6,11 @@ import { CheckboxControl } from '@wordpress/components';
 
 function BlockTypesChecklist( { blockTypes, value, onItemChange } ) {
 	return (
-		<ul className="edit-post-block-manager__checklist">
+		<ul className="editor-block-manager__checklist">
 			{ blockTypes.map( ( blockType ) => (
 				<li
 					key={ blockType.name }
-					className="edit-post-block-manager__checklist-item"
+					className="editor-block-manager__checklist-item"
 				>
 					<CheckboxControl
 						__nextHasNoMarginBottom
diff --git a/packages/edit-post/src/components/block-manager/index.js b/packages/editor/src/components/block-manager/index.js
similarity index 83%
rename from packages/edit-post/src/components/block-manager/index.js
rename to packages/editor/src/components/block-manager/index.js
index 685c274f03a84..910eeda4470b0 100644
--- a/packages/edit-post/src/components/block-manager/index.js
+++ b/packages/editor/src/components/block-manager/index.js
@@ -8,12 +8,14 @@ import { __, _n, sprintf } from '@wordpress/i18n';
 import { useEffect, useState } from '@wordpress/element';
 import { useDebounce, compose } from '@wordpress/compose';
 import { speak } from '@wordpress/a11y';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Internal dependencies
  */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
 import BlockManagerCategory from './category';
-import { store as editPostStore } from '../../store';
 
 function BlockManager( {
 	blockTypes,
@@ -52,9 +54,9 @@ function BlockManager( {
 	}, [ blockTypes.length, search, debouncedSpeak ] );
 
 	return (
-		<div className="edit-post-block-manager__content">
+		<div className="editor-block-manager__content">
 			{ !! numberOfHiddenBlocks && (
-				<div className="edit-post-block-manager__disabled-blocks-count">
+				<div className="editor-block-manager__disabled-blocks-count">
 					{ sprintf(
 						/* translators: %d: number of blocks. */
 						_n(
@@ -78,16 +80,16 @@ function BlockManager( {
 				placeholder={ __( 'Search for a block' ) }
 				value={ search }
 				onChange={ ( nextSearch ) => setSearch( nextSearch ) }
-				className="edit-post-block-manager__search"
+				className="editor-block-manager__search"
 			/>
 			<div
 				tabIndex="0"
 				role="region"
 				aria-label={ __( 'Available block types' ) }
-				className="edit-post-block-manager__results"
+				className="editor-block-manager__results"
 			>
 				{ blockTypes.length === 0 && (
-					<p className="edit-post-block-manager__no-results">
+					<p className="editor-block-manager__no-results">
 						{ __( 'No blocks found.' ) }
 					</p>
 				) }
@@ -120,7 +122,7 @@ export default compose( [
 			hasBlockSupport,
 			isMatchingSearchTerm,
 		} = select( blocksStore );
-		const { getHiddenBlockTypes } = select( editPostStore );
+		const { get } = select( preferencesStore );
 
 		// Some hidden blocks become unregistered
 		// by removing for instance the plugin that registered them, yet
@@ -128,13 +130,13 @@ export default compose( [
 		// We consider "hidden", blocks which were hidden and
 		// are still registered.
 		const blockTypes = getBlockTypes();
-		const hiddenBlockTypes = getHiddenBlockTypes().filter(
-			( hiddenBlock ) => {
-				return blockTypes.some(
-					( registeredBlock ) => registeredBlock.name === hiddenBlock
-				);
-			}
-		);
+		const hiddenBlockTypes = (
+			get( 'core', 'hiddenBlockTypes' ) ?? []
+		).filter( ( hiddenBlock ) => {
+			return blockTypes.some(
+				( registeredBlock ) => registeredBlock.name === hiddenBlock
+			);
+		} );
 		const numberOfHiddenBlocks =
 			Array.isArray( hiddenBlockTypes ) && hiddenBlockTypes.length;
 
@@ -147,7 +149,7 @@ export default compose( [
 		};
 	} ),
 	withDispatch( ( dispatch ) => {
-		const { showBlockTypes } = dispatch( editPostStore );
+		const { showBlockTypes } = unlock( dispatch( editorStore ) );
 		return {
 			enableAllBlockTypes: ( blockTypes ) => {
 				const blockNames = blockTypes.map( ( { name } ) => name );
diff --git a/packages/edit-post/src/components/block-manager/style.scss b/packages/editor/src/components/block-manager/style.scss
similarity index 66%
rename from packages/edit-post/src/components/block-manager/style.scss
rename to packages/editor/src/components/block-manager/style.scss
index e1b92c7c4da43..62e5c9d60cb17 100644
--- a/packages/edit-post/src/components/block-manager/style.scss
+++ b/packages/editor/src/components/block-manager/style.scss
@@ -1,14 +1,14 @@
-.edit-post-block-manager__no-results {
+.editor-block-manager__no-results {
 	font-style: italic;
 	padding: $grid-unit-30 0;
 	text-align: center;
 }
 
-.edit-post-block-manager__search {
+.editor-block-manager__search {
 	margin: $grid-unit-20 0;
 }
 
-.edit-post-block-manager__disabled-blocks-count {
+.editor-block-manager__disabled-blocks-count {
 	border: 1px solid $gray-300;
 	border-width: 1px 0;
 	// Cover up horizontal areas off the sides of the box rectangle
@@ -19,10 +19,10 @@
 	position: sticky;
 	// When sticking, tuck the top border beneath the modal header border
 	top: ($grid-unit-05 + 1) * -1;
-	z-index: z-index(".edit-post-block-manager__disabled-blocks-count");
+	z-index: z-index(".editor-block-manager__disabled-blocks-count");
 
 	// Stick the category titles to the bottom
-	~ .edit-post-block-manager__results .edit-post-block-manager__category-title {
+	~ .editor-block-manager__results .editor-block-manager__category-title {
 		top: $grid-unit-40 - 1;
 	}
 	.is-link {
@@ -30,32 +30,32 @@
 	}
 }
 
-.edit-post-block-manager__category {
+.editor-block-manager__category {
 	margin: 0 0 $grid-unit-30 0;
 }
 
-.edit-post-block-manager__category-title {
+.editor-block-manager__category-title {
 	position: sticky;
 	top: - $grid-unit-05; // Offsets the top padding on the modal content container
 	padding: $grid-unit-20 0;
 	background-color: $white;
-	z-index: z-index(".edit-post-block-manager__category-title");
+	z-index: z-index(".editor-block-manager__category-title");
 
 	.components-checkbox-control__label {
 		font-weight: 600;
 	}
 }
 
-.edit-post-block-manager__checklist {
+.editor-block-manager__checklist {
 	margin-top: 0;
 }
 
-.edit-post-block-manager__category-title,
-.edit-post-block-manager__checklist-item {
+.editor-block-manager__category-title,
+.editor-block-manager__checklist-item {
 	border-bottom: 1px solid $gray-300;
 }
 
-.edit-post-block-manager__checklist-item {
+.editor-block-manager__checklist-item {
 	display: flex;
 	justify-content: space-between;
 	align-items: center;
@@ -72,11 +72,11 @@
 	}
 }
 
-.edit-post-block-manager__results {
+.editor-block-manager__results {
 	border-top: $border-width solid $gray-300;
 }
 
 // Remove the top border from results when adjacent to the disabled block count
-.edit-post-block-manager__disabled-blocks-count + .edit-post-block-manager__results {
+.editor-block-manager__disabled-blocks-count + .editor-block-manager__results {
 	border-top-width: 0;
 }
diff --git a/packages/edit-site/src/components/preferences-modal/enable-panel-option.js b/packages/editor/src/components/preferences-modal/enable-panel.js
similarity index 66%
rename from packages/edit-site/src/components/preferences-modal/enable-panel-option.js
rename to packages/editor/src/components/preferences-modal/enable-panel.js
index 6c9ea22b7f17d..66c9140943441 100644
--- a/packages/edit-site/src/components/preferences-modal/enable-panel-option.js
+++ b/packages/editor/src/components/preferences-modal/enable-panel.js
@@ -3,8 +3,15 @@
  */
 import { compose, ifCondition } from '@wordpress/compose';
 import { withSelect, withDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-import { store as editorStore } from '@wordpress/editor';
+import { privateApis as preferencesPrivateApis } from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { store as editorStore } from '../../store';
+
+const { PreferenceBaseOption } = unlock( preferencesPrivateApis );
 
 export default compose(
 	withSelect( ( select, { panelName } ) => {
@@ -20,4 +27,4 @@ export default compose(
 		onChange: () =>
 			dispatch( editorStore ).toggleEditorPanelEnabled( panelName ),
 	} ) )
-)( BaseOption );
+)( PreferenceBaseOption );
diff --git a/packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js b/packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
similarity index 90%
rename from packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js
rename to packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
index b18b0436579bc..4dd2e55eba007 100644
--- a/packages/edit-post/src/components/preferences-modal/options/enable-plugin-document-setting-panel.js
+++ b/packages/editor/src/components/preferences-modal/enable-plugin-document-setting-panel.js
@@ -6,7 +6,7 @@ import { createSlotFill } from '@wordpress/components';
 /**
  * Internal dependencies
  */
-import { EnablePanelOption } from './index';
+import EnablePanelOption from './enable-panel';
 
 const { Fill, Slot } = createSlotFill(
 	'EnablePluginDocumentSettingPanelOption'
diff --git a/packages/editor/src/components/preferences-modal/index.js b/packages/editor/src/components/preferences-modal/index.js
new file mode 100644
index 0000000000000..044c0eb426e22
--- /dev/null
+++ b/packages/editor/src/components/preferences-modal/index.js
@@ -0,0 +1,269 @@
+/**
+ * WordPress dependencies
+ */
+
+import { __ } from '@wordpress/i18n';
+import { useViewportMatch } from '@wordpress/compose';
+import { useSelect, useDispatch } from '@wordpress/data';
+import { useMemo } from '@wordpress/element';
+import {
+	store as preferencesStore,
+	privateApis as preferencesPrivateApis,
+} from '@wordpress/preferences';
+
+/**
+ * Internal dependencies
+ */
+import EnablePanelOption from './enable-panel';
+import EnablePluginDocumentSettingPanelOption from './enable-plugin-document-setting-panel';
+import BlockManager from '../block-manager';
+import PostTaxonomies from '../post-taxonomies';
+import PostFeaturedImageCheck from '../post-featured-image/check';
+import PostExcerptCheck from '../post-excerpt/check';
+import PageAttributesCheck from '../page-attributes/check';
+import PostTypeSupportCheck from '../post-type-support-check';
+import { store as editorStore } from '../../store';
+import { unlock } from '../../lock-unlock';
+
+const {
+	PreferencesModal,
+	PreferencesModalTabs,
+	PreferencesModalSection,
+	PreferenceToggleControl,
+} = unlock( preferencesPrivateApis );
+
+export default function EditorPreferencesModal( {
+	extraSections = {},
+	isActive,
+	onClose,
+} ) {
+	const isLargeViewport = useViewportMatch( 'medium' );
+	const { showBlockBreadcrumbsOption } = useSelect(
+		( select ) => {
+			const { getEditorSettings } = select( editorStore );
+			const { get } = select( preferencesStore );
+			const isRichEditingEnabled = getEditorSettings().richEditingEnabled;
+			const isDistractionFreeEnabled = get( 'core', 'distractionFree' );
+			return {
+				showBlockBreadcrumbsOption:
+					! isDistractionFreeEnabled &&
+					isLargeViewport &&
+					isRichEditingEnabled,
+			};
+		},
+		[ isLargeViewport ]
+	);
+
+	const { setIsListViewOpened, setIsInserterOpened } =
+		useDispatch( editorStore );
+	const { set: setPreference } = useDispatch( preferencesStore );
+
+	const toggleDistractionFree = () => {
+		setPreference( 'core', 'fixedToolbar', true );
+		setIsInserterOpened( false );
+		setIsListViewOpened( false );
+		// Todo: Check sidebar when closing/opening distraction free.
+	};
+
+	const turnOffDistractionFree = () => {
+		setPreference( 'core', 'distractionFree', false );
+	};
+
+	const sections = useMemo(
+		() => [
+			{
+				name: 'general',
+				tabLabel: __( 'General' ),
+				content: (
+					<>
+						<PreferencesModalSection title={ __( 'Interface' ) }>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="showListViewByDefault"
+								help={ __(
+									'Opens the block list view sidebar by default.'
+								) }
+								label={ __( 'Always open list view' ) }
+							/>
+							{ showBlockBreadcrumbsOption && (
+								<PreferenceToggleControl
+									scope="core"
+									featureName="showBlockBreadcrumbs"
+									help={ __(
+										'Display the block hierarchy trail at the bottom of the editor.'
+									) }
+									label={ __( 'Show block breadcrumbs' ) }
+								/>
+							) }
+							<PreferenceToggleControl
+								scope="core"
+								featureName="allowRightClickOverrides"
+								help={ __(
+									'Allows contextual list view menus via right-click, overriding browser defaults.'
+								) }
+								label={ __(
+									'Allow right-click contextual menus'
+								) }
+							/>
+						</PreferencesModalSection>
+						<PreferencesModalSection
+							title={ __( 'Document settings' ) }
+							description={ __(
+								'Select what settings are shown in the document panel.'
+							) }
+						>
+							<EnablePluginDocumentSettingPanelOption.Slot />
+							<PostTaxonomies
+								taxonomyWrapper={ ( content, taxonomy ) => (
+									<EnablePanelOption
+										label={ taxonomy.labels.menu_name }
+										panelName={ `taxonomy-panel-${ taxonomy.slug }` }
+									/>
+								) }
+							/>
+							<PostFeaturedImageCheck>
+								<EnablePanelOption
+									label={ __( 'Featured image' ) }
+									panelName="featured-image"
+								/>
+							</PostFeaturedImageCheck>
+							<PostExcerptCheck>
+								<EnablePanelOption
+									label={ __( 'Excerpt' ) }
+									panelName="post-excerpt"
+								/>
+							</PostExcerptCheck>
+							<PostTypeSupportCheck
+								supportKeys={ [ 'comments', 'trackbacks' ] }
+							>
+								<EnablePanelOption
+									label={ __( 'Discussion' ) }
+									panelName="discussion-panel"
+								/>
+							</PostTypeSupportCheck>
+							<PageAttributesCheck>
+								<EnablePanelOption
+									label={ __( 'Page attributes' ) }
+									panelName="page-attributes"
+								/>
+							</PageAttributesCheck>
+						</PreferencesModalSection>
+						{ extraSections?.general }
+					</>
+				),
+			},
+			{
+				name: 'appearance',
+				tabLabel: __( 'Appearance' ),
+				content: (
+					<PreferencesModalSection
+						title={ __( 'Appearance' ) }
+						description={ __(
+							'Customize the editor interface to suit your needs.'
+						) }
+					>
+						<PreferenceToggleControl
+							scope="core"
+							featureName="fixedToolbar"
+							onToggle={ turnOffDistractionFree }
+							help={ __(
+								'Access all block and document tools in a single place.'
+							) }
+							label={ __( 'Top toolbar' ) }
+						/>
+						<PreferenceToggleControl
+							scope="core"
+							featureName="distractionFree"
+							onToggle={ toggleDistractionFree }
+							help={ __(
+								'Reduce visual distractions by hiding the toolbar and other elements to focus on writing.'
+							) }
+							label={ __( 'Distraction free' ) }
+						/>
+						<PreferenceToggleControl
+							scope="core"
+							featureName="focusMode"
+							help={ __(
+								'Highlights the current block and fades other content.'
+							) }
+							label={ __( 'Spotlight mode' ) }
+						/>
+						{ extraSections?.appearance }
+					</PreferencesModalSection>
+				),
+			},
+			{
+				name: 'accessibility',
+				tabLabel: __( 'Accessibility' ),
+				content: (
+					<>
+						<PreferencesModalSection
+							title={ __( 'Navigation' ) }
+							description={ __(
+								'Optimize the editing experience for enhanced control.'
+							) }
+						>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="keepCaretInsideBlock"
+								help={ __(
+									'Keeps the text cursor within the block boundaries, aiding users with screen readers by preventing unintentional cursor movement outside the block.'
+								) }
+								label={ __(
+									'Contain text cursor inside block'
+								) }
+							/>
+						</PreferencesModalSection>
+						<PreferencesModalSection title={ __( 'Interface' ) }>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="showIconLabels"
+								label={ __( 'Show button text labels' ) }
+								help={ __(
+									'Show text instead of icons on buttons across the interface.'
+								) }
+							/>
+						</PreferencesModalSection>
+					</>
+				),
+			},
+			{
+				name: 'blocks',
+				tabLabel: __( 'Blocks' ),
+				content: (
+					<>
+						<PreferencesModalSection title={ __( 'Inserter' ) }>
+							<PreferenceToggleControl
+								scope="core"
+								featureName="mostUsedBlocks"
+								help={ __(
+									'Adds a category with the most frequently used blocks in the inserter.'
+								) }
+								label={ __( 'Show most used blocks' ) }
+							/>
+						</PreferencesModalSection>
+						<PreferencesModalSection
+							title={ __( 'Manage block visibility' ) }
+							description={ __(
+								"Disable blocks that you don't want to appear in the inserter. They can always be toggled back on later."
+							) }
+						>
+							<BlockManager />
+						</PreferencesModalSection>
+					</>
+				),
+			},
+		],
+		[ isLargeViewport, showBlockBreadcrumbsOption, extraSections ]
+	);
+
+	if ( ! isActive ) {
+		return null;
+	}
+
+	return (
+		<PreferencesModal closeModal={ onClose }>
+			<PreferencesModalTabs sections={ sections } />
+		</PreferencesModal>
+	);
+}
diff --git a/packages/editor/src/components/preferences-modal/test/index.js b/packages/editor/src/components/preferences-modal/test/index.js
new file mode 100644
index 0000000000000..01ac1a88fbe7d
--- /dev/null
+++ b/packages/editor/src/components/preferences-modal/test/index.js
@@ -0,0 +1,28 @@
+/**
+ * External dependencies
+ */
+import { render, screen } from '@testing-library/react';
+
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import EditPostPreferencesModal from '../';
+
+// This allows us to tweak the returned value on each test.
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+jest.mock( '@wordpress/compose/src/hooks/use-viewport-match', () => jest.fn() );
+
+describe( 'EditPostPreferencesModal', () => {
+	it( 'should not render when the modal is not active', () => {
+		useSelect.mockImplementation( () => [ false, false, false ] );
+		render( <EditPostPreferencesModal /> );
+		expect(
+			screen.queryByRole( 'dialog', { name: 'Preferences' } )
+		).not.toBeInTheDocument();
+	} );
+} );
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index eddc295766f8c..5a9b3a82b1bdb 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -11,6 +11,7 @@ import {
 import { __ } from '@wordpress/i18n';
 import { store as preferencesStore } from '@wordpress/preferences';
 import { useViewportMatch } from '@wordpress/compose';
+import { store as blocksStore } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -29,7 +30,6 @@ const BLOCK_EDITOR_SETTINGS = [
 	'__experimentalPreferredStyleVariations',
 	'__unstableGalleryWithImageBlocks',
 	'alignWide',
-	'allowedBlockTypes',
 	'blockInspectorTabs',
 	'allowedMimeTypes',
 	'bodyPlaceholder',
@@ -88,12 +88,14 @@ function useBlockEditorSettings( settings, postType, postId ) {
 	const isLargeViewport = useViewportMatch( 'medium' );
 	const {
 		allowRightClickOverrides,
+		blockTypes,
 		focusMode,
 		hasFixedToolbar,
 		isDistractionFree,
 		keepCaretInsideBlock,
 		reusableBlocks,
 		hasUploadPermissions,
+		hiddenBlockTypes,
 		canUseUnfilteredHTML,
 		userCanCreatePages,
 		pageOnFront,
@@ -114,7 +116,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 				getBlockPatternCategories,
 			} = select( coreStore );
 			const { get } = select( preferencesStore );
-
+			const { getBlockTypes } = select( blocksStore );
 			const siteSettings = canUser( 'read', 'settings' )
 				? getEntityRecord( 'root', 'site' )
 				: undefined;
@@ -124,6 +126,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 					'core',
 					'allowRightClickOverrides'
 				),
+				blockTypes: getBlockTypes(),
 				canUseUnfilteredHTML: getRawEntityRecord(
 					'postType',
 					postType,
@@ -132,6 +135,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 				focusMode: get( 'core', 'focusMode' ),
 				hasFixedToolbar:
 					get( 'core', 'fixedToolbar' ) || ! isLargeViewport,
+				hiddenBlockTypes: get( 'core', 'hiddenBlockTypes' ),
 				isDistractionFree: get( 'core', 'distractionFree' ),
 				keepCaretInsideBlock: get( 'core', 'keepCaretInsideBlock' ),
 				reusableBlocks: isWeb
@@ -215,6 +219,25 @@ function useBlockEditorSettings( settings, postType, postId ) {
 		[ saveEntityRecord, userCanCreatePages ]
 	);
 
+	const allowedBlockTypes = useMemo( () => {
+		// Omit hidden block types if exists and non-empty.
+		if ( hiddenBlockTypes && hiddenBlockTypes.length > 0 ) {
+			// Defer to passed setting for `allowedBlockTypes` if provided as
+			// anything other than `true` (where `true` is equivalent to allow
+			// all block types).
+			const defaultAllowedBlockTypes =
+				true === settings.allowedBlockTypes
+					? blockTypes.map( ( { name } ) => name )
+					: settings.allowedBlockTypes || [];
+
+			return defaultAllowedBlockTypes.filter(
+				( type ) => ! hiddenBlockTypes.includes( type )
+			);
+		}
+
+		return settings.allowedBlockTypes;
+	}, [ settings.allowedBlockTypes, hiddenBlockTypes, blockTypes ] );
+
 	const forceDisableFocusMode = settings.focusMode === false;
 
 	return useMemo(
@@ -224,6 +247,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 					BLOCK_EDITOR_SETTINGS.includes( key )
 				)
 			),
+			allowedBlockTypes,
 			allowRightClickOverrides,
 			focusMode: focusMode && ! forceDisableFocusMode,
 			hasFixedToolbar,
@@ -261,6 +285,7 @@ function useBlockEditorSettings( settings, postType, postId ) {
 			__experimentalSetIsInserterOpened: setIsInserterOpened,
 		} ),
 		[
+			allowedBlockTypes,
 			allowRightClickOverrides,
 			focusMode,
 			forceDisableFocusMode,
diff --git a/packages/editor/src/private-apis.js b/packages/editor/src/private-apis.js
index 5f8fc7ccf7318..16c27b1b57c19 100644
--- a/packages/editor/src/private-apis.js
+++ b/packages/editor/src/private-apis.js
@@ -4,28 +4,32 @@
 import EditorCanvas from './components/editor-canvas';
 import { ExperimentalEditorProvider } from './components/provider';
 import { lock } from './lock-unlock';
+import EnablePluginDocumentSettingPanelOption from './components/preferences-modal/enable-plugin-document-setting-panel';
 import { EntitiesSavedStatesExtensible } from './components/entities-saved-states';
 import useBlockEditorSettings from './components/provider/use-block-editor-settings';
 import DocumentTools from './components/document-tools';
 import InserterSidebar from './components/inserter-sidebar';
 import ListViewSidebar from './components/list-view-sidebar';
+import PluginPostExcerpt from './components/post-excerpt/plugin';
 import PostPanelRow from './components/post-panel-row';
 import PostViewLink from './components/post-view-link';
 import PreviewDropdown from './components/preview-dropdown';
-import PluginPostExcerpt from './components/post-excerpt/plugin';
+import PreferencesModal from './components/preferences-modal';
 
 export const privateApis = {};
 lock( privateApis, {
 	DocumentTools,
 	EditorCanvas,
 	ExperimentalEditorProvider,
+	EnablePluginDocumentSettingPanelOption,
 	EntitiesSavedStatesExtensible,
 	InserterSidebar,
 	ListViewSidebar,
+	PluginPostExcerpt,
 	PostPanelRow,
 	PostViewLink,
 	PreviewDropdown,
-	PluginPostExcerpt,
+	PreferencesModal,
 
 	// This is a temporary private API while we're updating the site editor to use EditorProvider.
 	useBlockEditorSettings,
diff --git a/packages/editor/src/store/private-actions.js b/packages/editor/src/store/private-actions.js
index 7ddeab5f35734..0d7c0a2186421 100644
--- a/packages/editor/src/store/private-actions.js
+++ b/packages/editor/src/store/private-actions.js
@@ -4,6 +4,7 @@
 import { store as coreStore } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
 import { store as noticesStore } from '@wordpress/notices';
+import { store as preferencesStore } from '@wordpress/preferences';
 
 /**
  * Returns an action object used to set which template is currently being used/edited.
@@ -59,3 +60,51 @@ export const createTemplate =
 				}
 			);
 	};
+
+/**
+ * Update the provided block types to be visible.
+ *
+ * @param {string[]} blockNames Names of block types to show.
+ */
+export const showBlockTypes =
+	( blockNames ) =>
+	( { registry } ) => {
+		const existingBlockNames =
+			registry
+				.select( preferencesStore )
+				.get( 'core', 'hiddenBlockTypes' ) ?? [];
+
+		const newBlockNames = existingBlockNames.filter(
+			( type ) =>
+				! (
+					Array.isArray( blockNames ) ? blockNames : [ blockNames ]
+				).includes( type )
+		);
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'hiddenBlockTypes', newBlockNames );
+	};
+
+/**
+ * Update the provided block types to be hidden.
+ *
+ * @param {string[]} blockNames Names of block types to hide.
+ */
+export const hideBlockTypes =
+	( blockNames ) =>
+	( { registry } ) => {
+		const existingBlockNames =
+			registry
+				.select( preferencesStore )
+				.get( 'core', 'hiddenBlockTypes' ) ?? [];
+
+		const mergedBlockNames = new Set( [
+			...existingBlockNames,
+			...( Array.isArray( blockNames ) ? blockNames : [ blockNames ] ),
+		] );
+
+		registry
+			.dispatch( preferencesStore )
+			.set( 'core', 'hiddenBlockTypes', [ ...mergedBlockNames ] );
+	};
diff --git a/packages/editor/src/style.scss b/packages/editor/src/style.scss
index 09e50d1abed79..450c61fd0bb7e 100644
--- a/packages/editor/src/style.scss
+++ b/packages/editor/src/style.scss
@@ -1,4 +1,5 @@
 @import "./components/autocompleters/style.scss";
+@import "./components/block-manager/style.scss";
 @import "./components/document-bar/style.scss";
 @import "./components/document-outline/style.scss";
 @import "./components/document-tools/style.scss";
diff --git a/packages/interface/src/components/index.js b/packages/interface/src/components/index.js
index c9c2d09b3b3ab..6f986e138838e 100644
--- a/packages/interface/src/components/index.js
+++ b/packages/interface/src/components/index.js
@@ -6,8 +6,4 @@ export { default as PinnedItems } from './pinned-items';
 export { default as MoreMenuDropdown } from './more-menu-dropdown';
 export { default as MoreMenuFeatureToggle } from './more-menu-feature-toggle';
 export { default as ActionItem } from './action-item';
-export { default as PreferencesModal } from './preferences-modal';
-export { default as PreferencesModalTabs } from './preferences-modal-tabs';
-export { default as PreferencesModalSection } from './preferences-modal-section';
-export { default as ___unstablePreferencesModalBaseOption } from './preferences-modal-base-option';
 export { default as NavigableRegion } from './navigable-region';
diff --git a/packages/interface/src/components/preferences-modal-section/index.js b/packages/interface/src/components/preferences-modal-section/index.js
deleted file mode 100644
index 8ea2ca2652d6d..0000000000000
--- a/packages/interface/src/components/preferences-modal-section/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-const Section = ( { description, title, children } ) => (
-	<fieldset className="interface-preferences-modal__section">
-		<legend className="interface-preferences-modal__section-legend">
-			<h2 className="interface-preferences-modal__section-title">
-				{ title }
-			</h2>
-			{ description && (
-				<p className="interface-preferences-modal__section-description">
-					{ description }
-				</p>
-			) }
-		</legend>
-		<div className="interface-preferences-modal__section-content">
-			{ children }
-		</div>
-	</fieldset>
-);
-
-export default Section;
diff --git a/packages/interface/src/style.scss b/packages/interface/src/style.scss
index be111640a0a79..e6950de411156 100644
--- a/packages/interface/src/style.scss
+++ b/packages/interface/src/style.scss
@@ -4,7 +4,3 @@
 @import "./components/interface-skeleton/style.scss";
 @import "./components/more-menu-dropdown/style.scss";
 @import "./components/pinned-items/style.scss";
-@import "./components/preferences-modal/style.scss";
-@import "./components/preferences-modal-tabs/style.scss";
-@import "./components/preferences-modal-section/style.scss";
-@import "./components/preferences-modal-base-option/style.scss";
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
index 5def03bb348fa..01986803579b6 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/convert-editor-settings.js
@@ -10,6 +10,7 @@ export default function convertEditorSettings( data ) {
 		'editorMode',
 		'fixedToolbar',
 		'focusMode',
+		'hiddenBlockTypes',
 		'inactivePanels',
 		'keepCaretInsideBlock',
 		'mostUsedBlocks',
diff --git a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
index 5ea8cd45e0676..fefde528402ca 100644
--- a/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
+++ b/packages/preferences-persistence/src/migrations/preferences-package-data/test/index.js
@@ -45,6 +45,10 @@ describe( 'convertPreferencesPackageData', () => {
 		  "core": {
 		    "editorMode": "visual",
 		    "fixedToolbar": true,
+		    "hiddenBlockTypes": [
+		      "core/audio",
+		      "core/cover",
+		    ],
 		    "inactivePanels": [],
 		    "openPanels": [
 		      "post-status",
@@ -56,10 +60,6 @@ describe( 'convertPreferencesPackageData', () => {
 		  },
 		  "core/edit-post": {
 		    "fullscreenMode": false,
-		    "hiddenBlockTypes": [
-		      "core/audio",
-		      "core/cover",
-		    ],
 		    "pinnedItems": {
 		      "my-sidebar-plugin/title-sidebar": false,
 		    },
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index dc44878577aaf..e1164a7a1306c 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -31,10 +31,12 @@
 		"@babel/runtime": "^7.16.0",
 		"@wordpress/a11y": "file:../a11y",
 		"@wordpress/components": "file:../components",
+		"@wordpress/compose": "file:../compose",
 		"@wordpress/data": "file:../data",
 		"@wordpress/element": "file:../element",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
+		"@wordpress/private-apis": "file:../private-apis",
 		"classnames": "^2.3.1"
 	},
 	"peerDependencies": {
diff --git a/packages/interface/src/components/preferences-modal-base-option/README.md b/packages/preferences/src/components/preference-base-option/README.md
similarity index 69%
rename from packages/interface/src/components/preferences-modal-base-option/README.md
rename to packages/preferences/src/components/preference-base-option/README.md
index 03c89960b6850..8ff438ba322dc 100644
--- a/packages/interface/src/components/preferences-modal-base-option/README.md
+++ b/packages/preferences/src/components/preference-base-option/README.md
@@ -1,17 +1,15 @@
-#__unstablePreferencesModalBaseOption
+# PreferenceBaseOption
 
-`__unstablePreferencesModalBaseOption` renders a toggle meant to be used with `PreferencesModal`. 
+`PreferenceBaseOption` renders a toggle meant to be used within `PreferencesModal`. 
 
 This component implements a `ToggleControl` component from the `@wordpress/components` package.
 
-**It is an unstable component so is subject to breaking changes at any moment. Use at own risk.**
-
 ## Example
 
 ```jsx
 function MyEditorPreferencesOption() {
 	return (
-		<__unstablePreferencesModalBaseOption
+		<PreferenceBaseOption
 			label={ label }
 			isChecked={ isChecked }
 			onChange={ setIsChecked }
@@ -19,7 +17,7 @@ function MyEditorPreferencesOption() {
 			{ isChecked !== areCustomFieldsEnabled && (
 				<CustomFieldsConfirmation willEnable={ isChecked } />
 			) }
-		</__unstablePreferencesModalBaseOption>
+		</PreferenceBaseOption>
 	)				
 }
 ```
diff --git a/packages/interface/src/components/preferences-modal-base-option/index.js b/packages/preferences/src/components/preference-base-option/index.js
similarity index 86%
rename from packages/interface/src/components/preferences-modal-base-option/index.js
rename to packages/preferences/src/components/preference-base-option/index.js
index 92346630d98aa..f2d1b4936c97f 100644
--- a/packages/interface/src/components/preferences-modal-base-option/index.js
+++ b/packages/preferences/src/components/preference-base-option/index.js
@@ -5,7 +5,7 @@ import { ToggleControl } from '@wordpress/components';
 
 function BaseOption( { help, label, isChecked, onChange, children } ) {
 	return (
-		<div className="interface-preferences-modal__option">
+		<div className="preference-base-option">
 			<ToggleControl
 				__nextHasNoMarginBottom
 				help={ help }
diff --git a/packages/interface/src/components/preferences-modal-base-option/style.scss b/packages/preferences/src/components/preference-base-option/style.scss
similarity index 75%
rename from packages/interface/src/components/preferences-modal-base-option/style.scss
rename to packages/preferences/src/components/preference-base-option/style.scss
index 99587847193d3..d3caa60f8c803 100644
--- a/packages/interface/src/components/preferences-modal-base-option/style.scss
+++ b/packages/preferences/src/components/preference-base-option/style.scss
@@ -1,4 +1,4 @@
-.interface-preferences-modal__option {
+.preference-base-option {
 	& + & {
 		margin-top: $grid-unit-20;
 	}
diff --git a/packages/edit-site/src/components/preferences-modal/enable-feature.js b/packages/preferences/src/components/preference-toggle-control/index.js
similarity index 66%
rename from packages/edit-site/src/components/preferences-modal/enable-feature.js
rename to packages/preferences/src/components/preference-toggle-control/index.js
index efda1c67352fc..70ff51a8a8474 100644
--- a/packages/edit-site/src/components/preferences-modal/enable-feature.js
+++ b/packages/preferences/src/components/preference-toggle-control/index.js
@@ -2,12 +2,16 @@
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { ___unstablePreferencesModalBaseOption as BaseOption } from '@wordpress/interface';
-import { store as preferencesStore } from '@wordpress/preferences';
 
-export default function EnableFeature( props ) {
+/**
+ * Internal dependencies
+ */
+import { store as preferencesStore } from '../../store';
+import PreferenceBaseOption from '../preference-base-option';
+
+function PreferenceToggleControl( props ) {
 	const {
-		scope = 'core/edit-site',
+		scope,
 		featureName,
 		onToggle = () => {},
 		...remainingProps
@@ -21,11 +25,14 @@ export default function EnableFeature( props ) {
 		onToggle();
 		toggle( scope, featureName );
 	};
+
 	return (
-		<BaseOption
+		<PreferenceBaseOption
 			onChange={ onChange }
 			isChecked={ isChecked }
 			{ ...remainingProps }
 		/>
 	);
 }
+
+export default PreferenceToggleControl;
diff --git a/packages/interface/src/components/preferences-modal-section/README.md b/packages/preferences/src/components/preferences-modal-section/README.md
similarity index 94%
rename from packages/interface/src/components/preferences-modal-section/README.md
rename to packages/preferences/src/components/preferences-modal-section/README.md
index 6e78ca05c0aa8..4b032b5db0497 100644
--- a/packages/interface/src/components/preferences-modal-section/README.md
+++ b/packages/preferences/src/components/preferences-modal-section/README.md
@@ -1,3 +1,4 @@
+# PreferencesModalSection
 
 `PreferencesModalSection` renders a section (as a fieldset) meant to be used with `PreferencesModal`.
 
diff --git a/packages/preferences/src/components/preferences-modal-section/index.js b/packages/preferences/src/components/preferences-modal-section/index.js
new file mode 100644
index 0000000000000..1a3f6f64ef4e7
--- /dev/null
+++ b/packages/preferences/src/components/preferences-modal-section/index.js
@@ -0,0 +1,15 @@
+const Section = ( { description, title, children } ) => (
+	<fieldset className="preferences-modal__section">
+		<legend className="preferences-modal__section-legend">
+			<h2 className="preferences-modal__section-title">{ title }</h2>
+			{ description && (
+				<p className="preferences-modal__section-description">
+					{ description }
+				</p>
+			) }
+		</legend>
+		<div className="preferences-modal__section-content">{ children }</div>
+	</fieldset>
+);
+
+export default Section;
diff --git a/packages/interface/src/components/preferences-modal-section/style.scss b/packages/preferences/src/components/preferences-modal-section/style.scss
similarity index 50%
rename from packages/interface/src/components/preferences-modal-section/style.scss
rename to packages/preferences/src/components/preferences-modal-section/style.scss
index a1259af3430d5..2f6480dd71dab 100644
--- a/packages/interface/src/components/preferences-modal-section/style.scss
+++ b/packages/preferences/src/components/preferences-modal-section/style.scss
@@ -1,4 +1,4 @@
-.interface-preferences-modal__section {
+.preferences-modal__section {
 	margin: 0 0 2.5rem 0;
 
 	&:last-child {
@@ -6,23 +6,23 @@
 	}
 }
 
-.interface-preferences-modal__section-legend {
+.preferences-modal__section-legend {
 	margin-bottom: $grid-unit-10;
 }
 
-.interface-preferences-modal__section-title {
+.preferences-modal__section-title {
 	font-size: 0.9rem;
 	font-weight: 600;
 	margin-top: 0;
 }
 
-.interface-preferences-modal__section-description {
+.preferences-modal__section-description {
 	margin: -$grid-unit-10 0 $grid-unit-10 0;
 	font-size: $helptext-font-size;
 	font-style: normal;
 	color: $gray-700;
 }
 
-.interface-preferences-modal__section:has(.interface-preferences-modal__section-content:empty) {
+.preferences-modal__section:has(.preferences-modal__section-content:empty) {
 	display: none;
 }
diff --git a/packages/interface/src/components/preferences-modal-tabs/README.md b/packages/preferences/src/components/preferences-modal-tabs/README.md
similarity index 100%
rename from packages/interface/src/components/preferences-modal-tabs/README.md
rename to packages/preferences/src/components/preferences-modal-tabs/README.md
diff --git a/packages/interface/src/components/preferences-modal-tabs/index.js b/packages/preferences/src/components/preferences-modal-tabs/index.js
similarity index 93%
rename from packages/interface/src/components/preferences-modal-tabs/index.js
rename to packages/preferences/src/components/preferences-modal-tabs/index.js
index 985d963227257..4797b50985f03 100644
--- a/packages/interface/src/components/preferences-modal-tabs/index.js
+++ b/packages/preferences/src/components/preferences-modal-tabs/index.js
@@ -25,7 +25,7 @@ import { isRTL, __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import { unlock } from '../../../lock-unlock';
+import { unlock } from '../../lock-unlock';
 
 const { Tabs } = unlock( componentsPrivateApis );
 
@@ -64,7 +64,7 @@ export default function PreferencesModalTabs( { sections } ) {
 	// We render different components based on the viewport size.
 	if ( isLargeViewport ) {
 		modalContent = (
-			<div className="interface-preferences__tabs">
+			<div className="preferences__tabs">
 				<Tabs
 					initialTabId={
 						activeMenu !== PREFERENCES_MENU ? activeMenu : undefined
@@ -72,12 +72,12 @@ export default function PreferencesModalTabs( { sections } ) {
 					onSelect={ setActiveMenu }
 					orientation="vertical"
 				>
-					<Tabs.TabList className="interface-preferences__tabs-tablist">
+					<Tabs.TabList className="preferences__tabs-tablist">
 						{ tabs.map( ( tab ) => (
 							<Tabs.Tab
 								tabId={ tab.name }
 								key={ tab.name }
-								className="interface-preferences__tabs-tab"
+								className="preferences__tabs-tab"
 							>
 								{ tab.title }
 							</Tabs.Tab>
@@ -87,7 +87,7 @@ export default function PreferencesModalTabs( { sections } ) {
 						<Tabs.TabPanel
 							tabId={ tab.name }
 							key={ tab.name }
-							className="interface-preferences__tabs-tabpanel"
+							className="preferences__tabs-tabpanel"
 							focusable={ false }
 						>
 							{ sectionsContentMap[ tab.name ] || null }
@@ -100,7 +100,7 @@ export default function PreferencesModalTabs( { sections } ) {
 		modalContent = (
 			<NavigatorProvider
 				initialPath="/"
-				className="interface-preferences__provider"
+				className="preferences__provider"
 			>
 				<NavigatorScreen path="/">
 					<Card isBorderless size="small">
diff --git a/packages/interface/src/components/preferences-modal-tabs/style.scss b/packages/preferences/src/components/preferences-modal-tabs/style.scss
similarity index 85%
rename from packages/interface/src/components/preferences-modal-tabs/style.scss
rename to packages/preferences/src/components/preferences-modal-tabs/style.scss
index f598545d69c25..d3afd4174cd0c 100644
--- a/packages/interface/src/components/preferences-modal-tabs/style.scss
+++ b/packages/preferences/src/components/preferences-modal-tabs/style.scss
@@ -1,6 +1,6 @@
 $vertical-tabs-width: 160px;
 
-.interface-preferences__tabs-tablist {
+.preferences__tabs-tablist {
 	position: absolute;
 	top: $header-height + $grid-unit-30;
 	// Aligns button text instead of button box.
@@ -9,7 +9,7 @@ $vertical-tabs-width: 160px;
 
 }
 
-.interface-preferences__tabs-tab {
+.preferences__tabs-tab {
 	border-radius: $radius-block-ui;
 	font-weight: 400;
 
@@ -34,7 +34,7 @@ $vertical-tabs-width: 160px;
 	}
 }
 
-.interface-preferences__tabs-tabpanel {
+.preferences__tabs-tabpanel {
 	padding-left: $grid-unit-30;
 	margin-left: $vertical-tabs-width;
 }
@@ -42,7 +42,7 @@ $vertical-tabs-width: 160px;
 @media (max-width: #{ ($break-medium - 1) }) {
 	// Keep the navigator component from overflowing the modal content area
 	// to ensure that sticky position elements stick where intended.
-	.interface-preferences__provider {
+	.preferences__provider {
 		height: 100%;
 	}
 }
diff --git a/packages/interface/src/components/preferences-modal/README.md b/packages/preferences/src/components/preferences-modal/README.md
similarity index 96%
rename from packages/interface/src/components/preferences-modal/README.md
rename to packages/preferences/src/components/preferences-modal/README.md
index 4327a59a7905a..4814fc12e5898 100644
--- a/packages/interface/src/components/preferences-modal/README.md
+++ b/packages/preferences/src/components/preferences-modal/README.md
@@ -4,7 +4,7 @@
 
 This component implements a `Modal` component from the `@wordpress/components` package.
 
-Sections passed to this component should use `PreferencesModalSection` component from the `@wordpress/interface` package.
+Sections passed to this component should use `PreferencesModalSection` component from the `@wordpress/preferences` package.
 
 
 ## Example
diff --git a/packages/interface/src/components/preferences-modal/index.js b/packages/preferences/src/components/preferences-modal/index.js
similarity index 87%
rename from packages/interface/src/components/preferences-modal/index.js
rename to packages/preferences/src/components/preferences-modal/index.js
index 99bb9d3c25dcf..8dc4f1020c036 100644
--- a/packages/interface/src/components/preferences-modal/index.js
+++ b/packages/preferences/src/components/preferences-modal/index.js
@@ -7,7 +7,7 @@ import { __ } from '@wordpress/i18n';
 export default function PreferencesModal( { closeModal, children } ) {
 	return (
 		<Modal
-			className="interface-preferences-modal"
+			className="preferences-modal"
 			title={ __( 'Preferences' ) }
 			onRequestClose={ closeModal }
 		>
diff --git a/packages/interface/src/components/preferences-modal/style.scss b/packages/preferences/src/components/preferences-modal/style.scss
similarity index 94%
rename from packages/interface/src/components/preferences-modal/style.scss
rename to packages/preferences/src/components/preferences-modal/style.scss
index 4e70f9f817e64..ca185ac4258e0 100644
--- a/packages/interface/src/components/preferences-modal/style.scss
+++ b/packages/preferences/src/components/preferences-modal/style.scss
@@ -1,4 +1,4 @@
-.interface-preferences-modal {
+.preferences-modal {
 	// To keep modal dimensions consistent as subsections are navigated, width
 	// and height are used instead of max-(width/height).
 	@include break-small() {
diff --git a/packages/preferences/src/index.js b/packages/preferences/src/index.js
index 72531a0824c17..856b93b21105d 100644
--- a/packages/preferences/src/index.js
+++ b/packages/preferences/src/index.js
@@ -1,2 +1,3 @@
 export * from './components';
 export { store } from './store';
+export * from './private-apis';
diff --git a/packages/preferences/src/lock-unlock.js b/packages/preferences/src/lock-unlock.js
new file mode 100644
index 0000000000000..981f244881ed0
--- /dev/null
+++ b/packages/preferences/src/lock-unlock.js
@@ -0,0 +1,9 @@
+/**
+ * WordPress dependencies
+ */
+import { __dangerousOptInToUnstableAPIsOnlyForCoreModules } from '@wordpress/private-apis';
+export const { lock, unlock } =
+	__dangerousOptInToUnstableAPIsOnlyForCoreModules(
+		'I know using unstable features means my theme or plugin will inevitably break in the next version of WordPress.',
+		'@wordpress/preferences'
+	);
diff --git a/packages/preferences/src/private-apis.js b/packages/preferences/src/private-apis.js
new file mode 100644
index 0000000000000..110d134f86b82
--- /dev/null
+++ b/packages/preferences/src/private-apis.js
@@ -0,0 +1,18 @@
+/**
+ * Internal dependencies
+ */
+import PreferenceBaseOption from './components/preference-base-option';
+import PreferenceToggleControl from './components/preference-toggle-control';
+import PreferencesModal from './components/preferences-modal';
+import PreferencesModalSection from './components/preferences-modal-section';
+import PreferencesModalTabs from './components/preferences-modal-tabs';
+import { lock } from './lock-unlock';
+
+export const privateApis = {};
+lock( privateApis, {
+	PreferenceBaseOption,
+	PreferenceToggleControl,
+	PreferencesModal,
+	PreferencesModalSection,
+	PreferencesModalTabs,
+} );
diff --git a/packages/preferences/src/store/index.js b/packages/preferences/src/store/index.js
index 0c2421966a0d7..7e57dac5e712c 100644
--- a/packages/preferences/src/store/index.js
+++ b/packages/preferences/src/store/index.js
@@ -12,7 +12,7 @@ import * as selectors from './selectors';
 import { STORE_NAME } from './constants';
 
 /**
- * Store definition for the interface namespace.
+ * Store definition for the preferences namespace.
  *
  * @see https://github.com/WordPress/gutenberg/blob/HEAD/packages/data/README.md#createReduxStore
  *
diff --git a/packages/preferences/src/style.scss b/packages/preferences/src/style.scss
new file mode 100644
index 0000000000000..c6769c44b00ba
--- /dev/null
+++ b/packages/preferences/src/style.scss
@@ -0,0 +1,4 @@
+@import "./components/preference-base-option/style.scss";
+@import "./components/preferences-modal/style.scss";
+@import "./components/preferences-modal-tabs/style.scss";
+@import "./components/preferences-modal-section/style.scss";
diff --git a/packages/private-apis/src/implementation.js b/packages/private-apis/src/implementation.js
index 4195991381d02..a31fd91ce094d 100644
--- a/packages/private-apis/src/implementation.js
+++ b/packages/private-apis/src/implementation.js
@@ -27,6 +27,7 @@ const CORE_MODULES_USING_PRIVATE_APIS = [
 	'@wordpress/format-library',
 	'@wordpress/interface',
 	'@wordpress/patterns',
+	'@wordpress/preferences',
 	'@wordpress/reusable-blocks',
 	'@wordpress/router',
 	'@wordpress/dataviews',

From 295ebf53c868ae8b71f0baef08041ee1fc5e7b63 Mon Sep 17 00:00:00 2001
From: Fabian Todt <mail@fabiantodt.at>
Date: Fri, 12 Jan 2024 14:23:05 +0100
Subject: [PATCH 085/296] Better navigation link variations for post types /
 taxonomies (#56100)

* better naming + code comments

* add unit tests for private post types / taxonomies

* handle unregistering of post types / taxonomies

* Fix typo in code comment

Co-authored-by: Andrei Draganescu <me@andreidraganescu.info>

---------

Co-authored-by: Andrei Draganescu <me@andreidraganescu.info>
---
 .../src/navigation-link/index.php             |  68 +++++++++--
 .../block-navigation-link-variations-test.php | 112 +++++++++++++++++-
 2 files changed, 165 insertions(+), 15 deletions(-)

diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index 1165ce94b5921..f7c26afd1f88d 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Server-side rendering of the `core/navigation-link` block.
+ * Server-side registering and rendering of the `core/navigation-link` block.
  *
  * @package WordPress
  */
@@ -323,12 +323,12 @@ function build_variation_for_navigation_link( $entity, $kind ) {
 }
 
 /**
- * Register a variation for a post type / taxonomy for the navigation link block
+ * Register a variation for a post type / taxonomy for the navigation link block.
  *
  * @param array $variation Variation array from build_variation_for_navigation_link.
  * @return void
  */
-function register_block_core_navigation_link_variation( $variation ) {
+function block_core_navigation_link_register_variation( $variation ) {
 	// Directly set the variations on the registered block type
 	// because there's no server side registration for variations (see #47170).
 	$navigation_block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/navigation-link' );
@@ -341,6 +341,31 @@ function register_block_core_navigation_link_variation( $variation ) {
 	$navigation_block_type->variations[] = $variation;
 }
 
+/**
+ * Unregister a variation for a post type / taxonomy for the navigation link block.
+ *
+ * @param string $name Name of the post type / taxonomy (which was used as variation name).
+ * @return void
+ */
+function block_core_navigation_link_unregister_variation( $name ) {
+	// Directly get the variations from the registered block type
+	// because there's no server side (un)registration for variations (see #47170).
+	$navigation_block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/navigation-link' );
+	// If the block is not registered (yet), there's no need to remove a variation.
+	if ( ! $navigation_block_type || empty( $navigation_block_type->variations ) ) {
+		return;
+	}
+	// Search for the variation and remove it from the array.
+	foreach ( $navigation_block_type->variations as $i => $variation ) {
+		if ( $variation['name'] === $name ) {
+			unset( $navigation_block_type->variations[ $i ] );
+			break;
+		}
+	}
+	// Reindex array after removing one variation.
+	$navigation_block_type->variations = array_values( $navigation_block_type->variations );
+}
+
 /**
  * Register the navigation link block.
  *
@@ -393,21 +418,24 @@ function register_block_core_navigation_link() {
 add_action( 'init', 'register_block_core_navigation_link' );
 // Register actions for all post types and taxonomies, to add variations when they are registered.
 // All post types/taxonomies registered before register_block_core_navigation_link, will be handled by that function.
-add_action( 'registered_post_type', 'register_block_core_navigation_link_post_type_variation', 10, 2 );
-add_action( 'registered_taxonomy', 'register_block_core_navigation_link_taxonomy_variation', 10, 3 );
+add_action( 'registered_post_type', 'block_core_navigation_link_register_post_type_variation', 10, 2 );
+add_action( 'registered_taxonomy', 'block_core_navigation_link_register_taxonomy_variation', 10, 3 );
+// Handle unregistering of post types and taxonomies and remove the variations.
+add_action( 'unregistered_post_type', 'block_core_navigation_link_unregister_post_type_variation' );
+add_action( 'unregistered_taxonomy', 'block_core_navigation_link_unregister_taxonomy_variation' );
 
 /**
  * Register custom post type variations for navigation link on post type registration
  * Handles all post types registered after the block is registered in register_navigation_link_post_type_variations
  *
- * @param string       $post_type The post type name passed from registered_post_type filter.
+ * @param string       $post_type The post type name passed from registered_post_type action hook.
  * @param WP_Post_Type $post_type_object The post type object passed from registered_post_type.
  * @return void
  */
-function register_block_core_navigation_link_post_type_variation( $post_type, $post_type_object ) {
+function block_core_navigation_link_register_post_type_variation( $post_type, $post_type_object ) {
 	if ( $post_type_object->show_in_nav_menus ) {
 		$variation = build_variation_for_navigation_link( $post_type_object, 'post-type' );
-		register_block_core_navigation_link_variation( $variation );
+		block_core_navigation_link_register_variation( $variation );
 	}
 }
 
@@ -420,9 +448,29 @@ function register_block_core_navigation_link_post_type_variation( $post_type, $p
  * @param array        $args Array of taxonomy registration arguments.
  * @return void
  */
-function register_block_core_navigation_link_taxonomy_variation( $taxonomy, $object_type, $args ) {
+function block_core_navigation_link_register_taxonomy_variation( $taxonomy, $object_type, $args ) {
 	if ( isset( $args['show_in_nav_menus'] ) && $args['show_in_nav_menus'] ) {
 		$variation = build_variation_for_navigation_link( (object) $args, 'post-type' );
-		register_block_core_navigation_link_variation( $variation );
+		block_core_navigation_link_register_variation( $variation );
 	}
 }
+
+/**
+ * Unregisters a custom post type variation for navigation link on post type unregistration.
+ *
+ * @param string $post_type The post type name passed from unregistered_post_type action hook.
+ * @return void
+ */
+function block_core_navigation_link_unregister_post_type_variation( $post_type ) {
+	block_core_navigation_link_unregister_variation( $post_type );
+}
+
+/**
+ * Unregisters a custom taxonomy variation for navigation link on taxonomy unregistration.
+ *
+ * @param string $taxonomy The taxonomy name passed from unregistered_taxonomy action hook.
+ * @return void
+ */
+function block_core_navigation_link_unregister_taxonomy_variation( $taxonomy ) {
+	block_core_navigation_link_unregister_variation( $taxonomy );
+}
diff --git a/phpunit/blocks/block-navigation-link-variations-test.php b/phpunit/blocks/block-navigation-link-variations-test.php
index c5082e0f4c878..8eef5c393148b 100644
--- a/phpunit/blocks/block-navigation-link-variations-test.php
+++ b/phpunit/blocks/block-navigation-link-variations-test.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Navigation block rendering tests.
+ * Navigation block post type/taxonomies variations tests.
  *
  * @package WordPress
  * @subpackage Blocks
@@ -25,6 +25,17 @@ public function set_up() {
 				'show_in_nav_menus' => true,
 			)
 		);
+		register_post_type(
+			'private_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Custom Book',
+				),
+				'public'            => false,
+				'show_in_rest'      => true,
+				'show_in_nav_menus' => false,
+			)
+		);
 		register_taxonomy(
 			'book_type',
 			'custom_book',
@@ -35,40 +46,131 @@ public function set_up() {
 				'show_in_nav_menus' => true,
 			)
 		);
+		register_taxonomy(
+			'private_book_type',
+			'private_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Book Type',
+				),
+				'show_in_nav_menus' => false,
+			)
+		);
 	}
 
 	public function tear_down() {
 		unregister_post_type( 'custom_book' );
+		unregister_post_type( 'private_custom_book' );
 		unregister_taxonomy( 'book_type' );
+		unregister_taxonomy( 'private_book_type' );
+		unregister_post_type( 'temp_custom_book' );
+		unregister_taxonomy( 'temp_book_type' );
 		parent::tear_down();
 	}
 
 	/**
-	 * @covers ::register_block_core_navigation_link_post_type_variation
+	 * @covers ::block_core_navigation_link_register_post_type_variation
 	 */
 	public function test_navigation_link_variations_custom_post_type() {
 		$registry       = WP_Block_Type_Registry::get_instance();
 		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
 		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
 		$variation = $this->get_variation_by_name( 'custom_book', $nav_link_block->variations );
-		$this->assertIsArray( $variation, 'Block variation is not an array' );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
 		$this->assertArrayHasKey( 'title', $variation, 'Block variation has no title' );
 		$this->assertEquals( 'Custom Book', $variation['title'], 'Variation title is different than the post type label' );
 	}
 
 	/**
-	 * @covers ::register_block_core_navigation_link_taxonomy_variation
+	 * @covers ::block_core_navigation_link_register_post_type_variation
+	 */
+	public function test_navigation_link_variations_private_custom_post_type() {
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'private_custom_book', $nav_link_block->variations );
+		$this->assertEmpty( $variation, 'Block variation for private post type exists.' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_register_taxonomy_variation
 	 */
 	public function test_navigation_link_variations_custom_taxonomy() {
 		$registry       = WP_Block_Type_Registry::get_instance();
 		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
 		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
 		$variation = $this->get_variation_by_name( 'book_type', $nav_link_block->variations );
-		$this->assertIsArray( $variation, 'Block variation is not an array' );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
 		$this->assertArrayHasKey( 'title', $variation, 'Block variation has no title' );
 		$this->assertEquals( 'Book Type', $variation['title'], 'Variation title is different than the post type label' );
 	}
 
+	/**
+	 * @covers ::block_core_navigation_link_register_taxonomy_variation
+	 */
+	public function test_navigation_link_variations_private_custom_taxonomy() {
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'private_book_type', $nav_link_block->variations );
+		$this->assertEmpty( $variation, 'Block variation for private taxonomy exists.' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_unregister_post_type_variation
+	 */
+	public function test_navigation_link_variations_unregister_post_type() {
+		register_post_type(
+			'temp_custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Custom Book',
+				),
+				'public'            => true,
+				'show_in_rest'      => true,
+				'show_in_nav_menus' => true,
+			)
+		);
+
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'temp_custom_book', $nav_link_block->variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
+
+		unregister_post_type( 'temp_custom_book' );
+
+		$variation = $this->get_variation_by_name( 'temp_custom_book', $nav_link_block->variations );
+		$this->assertEmpty( $variation, 'Block variation still exists' );
+	}
+
+	/**
+	 * @covers ::block_core_navigation_link_unregister_taxonomy_variation
+	 */
+	public function test_navigation_link_variations_unregister_taxonomy() {
+		register_taxonomy(
+			'temp_book_type',
+			'custom_book',
+			array(
+				'labels'            => array(
+					'item_link' => 'Book Type',
+				),
+				'show_in_nav_menus' => true,
+			)
+		);
+
+		$registry       = WP_Block_Type_Registry::get_instance();
+		$nav_link_block = $registry->get_registered( 'core/navigation-link' );
+		$this->assertNotEmpty( $nav_link_block->variations, 'Block has no variations' );
+		$variation = $this->get_variation_by_name( 'temp_book_type', $nav_link_block->variations );
+		$this->assertIsArray( $variation, 'Block variation does not exist' );
+
+		unregister_taxonomy( 'temp_book_type' );
+
+		$variation = $this->get_variation_by_name( 'temp_book_type', $nav_link_block->variations );
+		$this->assertEmpty( $variation, 'Block variation still exists' );
+	}
+
 	/**
 	 * Get a variation by its name from an array of variations.
 	 *

From 7e74cc84c2f641f1c4d4e71171a8d02728fd10fb Mon Sep 17 00:00:00 2001
From: Derek Blank <derekpblank@gmail.com>
Date: Fri, 12 Jan 2024 23:39:04 +1000
Subject: [PATCH 086/296] fix: Add space to text string to workaround RN text
 display bug (#57783)

See also:
  https://github.com/facebook/react-native/issues/21729
---
 .../editor/src/components/offline-status/index.native.js    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/editor/src/components/offline-status/index.native.js b/packages/editor/src/components/offline-status/index.native.js
index b136fdae1d5b2..2e514abb6e091 100644
--- a/packages/editor/src/components/offline-status/index.native.js
+++ b/packages/editor/src/components/offline-status/index.native.js
@@ -90,10 +90,8 @@ const OfflineStatus = () => {
 			) }
 			style={ containerStyle }
 		>
-			<View style={ containerStyle }>
-				<Icon fill={ iconStyle.fill } icon={ offlineIcon } />
-				<Text style={ textStyle }>{ __( 'Working Offline' ) }</Text>
-			</View>
+			<Icon fill={ iconStyle.fill } icon={ offlineIcon } />
+			<Text style={ textStyle }>{ __( 'Working Offline' ) } </Text>
 		</View>
 	) : null;
 };

From f461b177d87a865ecbc9f6a064f5f06f5416b354 Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Fri, 12 Jan 2024 14:45:17 +0100
Subject: [PATCH 087/296] Add more taxonomy options to the post navigation link
 (#48912)

* Add 3 options to the post navigation link

* Update core__post-navigation-link.json

* Support custom post types and custom taxonomies

* fix CS issues

* Update index.php

* Update index.php

* Update edit.js

* try to fix spacing in core-blocks.md

* Remove the taxonomy filter toggle and update the PHP conditions.

* Update core__post-navigation-link.json

* Update help text about excluding terms

* Update help text again.

* Remove the exclude terms feature, move filter to advanced panel

* Try to fix CS issues

* Update docs

* Try to fix CS issues

* Use context to get the postType
---
 docs/reference-guides/core-blocks.md          |  2 +-
 .../src/post-navigation-link/block.json       |  8 +++
 .../src/post-navigation-link/edit.js          | 64 ++++++++++++++++++-
 .../src/post-navigation-link/index.php        | 20 +++++-
 .../blocks/core__post-navigation-link.json    |  3 +-
 5 files changed, 91 insertions(+), 6 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index c05cdd3eb009b..84396caefbf47 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -639,7 +639,7 @@ Displays the next or previous post link that is adjacent to the current post. ([
 -	**Name:** core/post-navigation-link
 -	**Category:** theme
 -	**Supports:** color (background, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** arrow, label, linkLabel, showTitle, textAlign, type
+-	**Attributes:** arrow, inSameTerm, label, linkLabel, showTitle, taxonomy, textAlign, type
 
 ## Post Template
 
diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json
index e1b6d4fa90a40..61d42f0e55f20 100644
--- a/packages/block-library/src/post-navigation-link/block.json
+++ b/packages/block-library/src/post-navigation-link/block.json
@@ -28,8 +28,16 @@
 		"arrow": {
 			"type": "string",
 			"default": "none"
+		},
+		"inSameTerm": {
+			"type": "boolean"
+		},
+		"taxonomy": {
+			"type": "string",
+			"default": ""
 		}
 	},
+	"usesContext": [ "postType" ],
 	"supports": {
 		"reusable": false,
 		"html": false,
diff --git a/packages/block-library/src/post-navigation-link/edit.js b/packages/block-library/src/post-navigation-link/edit.js
index f899788428bcd..464531f9d4546 100644
--- a/packages/block-library/src/post-navigation-link/edit.js
+++ b/packages/block-library/src/post-navigation-link/edit.js
@@ -10,6 +10,7 @@ import {
 	__experimentalToggleGroupControl as ToggleGroupControl,
 	__experimentalToggleGroupControlOption as ToggleGroupControlOption,
 	ToggleControl,
+	SelectControl,
 	PanelBody,
 } from '@wordpress/components';
 import {
@@ -20,9 +21,20 @@ import {
 	useBlockProps,
 } from '@wordpress/block-editor';
 import { __, _x } from '@wordpress/i18n';
+import { useSelect } from '@wordpress/data';
+import { store as coreStore } from '@wordpress/core-data';
 
 export default function PostNavigationLinkEdit( {
-	attributes: { type, label, showTitle, textAlign, linkLabel, arrow },
+	context: { postType },
+	attributes: {
+		type,
+		label,
+		showTitle,
+		textAlign,
+		linkLabel,
+		arrow,
+		taxonomy,
+	},
 	setAttributes,
 } ) {
 	const isNext = type === 'next';
@@ -47,6 +59,40 @@ export default function PostNavigationLinkEdit( {
 			[ `has-text-align-${ textAlign }` ]: textAlign,
 		} ),
 	} );
+
+	const taxonomies = useSelect(
+		( select ) => {
+			const { getTaxonomies } = select( coreStore );
+			const filteredTaxonomies = getTaxonomies( {
+				type: postType,
+				per_page: -1,
+				context: 'view',
+			} );
+			return filteredTaxonomies;
+		},
+		[ postType ]
+	);
+	const getTaxonomyOptions = () => {
+		const selectOption = {
+			label: __( 'Unfiltered' ),
+			value: '',
+		};
+		const taxonomyOptions = ( taxonomies ?? [] )
+			.filter(
+				( tax ) =>
+					tax.slug !== 'nav_menu' &&
+					tax.slug !== 'wp_pattern_category'
+			)
+			.map( ( item ) => {
+				return {
+					value: item.slug,
+					label: item.name,
+				};
+			} );
+
+		return [ selectOption, ...taxonomyOptions ];
+	};
+
 	return (
 		<>
 			<InspectorControls>
@@ -114,6 +160,22 @@ export default function PostNavigationLinkEdit( {
 					</ToggleGroupControl>
 				</PanelBody>
 			</InspectorControls>
+			<InspectorControls group="advanced">
+				<SelectControl
+					label={ __( 'Filter by taxonomy' ) }
+					value={ taxonomy }
+					options={ getTaxonomyOptions() }
+					onChange={ ( value ) =>
+						setAttributes( {
+							taxonomy: value,
+							inSameTerm: value === '' ? false : true,
+						} )
+					}
+					help={ __(
+						'Only link to posts that have the same taxonomy terms as the current post. For example the same tags or categories.'
+					) }
+				/>
+			</InspectorControls>
 			<BlockControls>
 				<AlignmentToolbar
 					value={ textAlign }
diff --git a/packages/block-library/src/post-navigation-link/index.php b/packages/block-library/src/post-navigation-link/index.php
index add112c388c6e..50106bdd7cce5 100644
--- a/packages/block-library/src/post-navigation-link/index.php
+++ b/packages/block-library/src/post-navigation-link/index.php
@@ -99,10 +99,24 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 		}
 	}
 
-	// The dynamic portion of the function name, `$navigation_type`,
-	// refers to the type of adjacency, 'next' or 'previous'.
+	$in_same_term = isset( $attributes['inSameTerm'] ) ? $attributes['inSameTerm'] : false;
+	$taxonomy     = isset( $attributes['taxonomy'] ) && $in_same_term ? $attributes['taxonomy'] : '';
+
+	/**
+	 * The dynamic portion of the function name, `$navigation_type`,
+	 * Refers to the type of adjacency, 'next' or 'previous'.
+	 *
+	 * @See https://developer.wordpress.org/reference/functions/get_previous_post_link/
+	 * @See https://developer.wordpress.org/reference/functions/get_next_post_link/
+	 */
 	$get_link_function = "get_{$navigation_type}_post_link";
-	$content           = $get_link_function( $format, $link );
+
+	if ( $in_same_term ) {
+		$content = $get_link_function( $format, $link, $in_same_term, '', $taxonomy );
+	} else {
+		$content = $get_link_function( $format, $link );
+	}
+
 	return sprintf(
 		'<div %1$s>%2$s</div>',
 		$wrapper_attributes,
diff --git a/test/integration/fixtures/blocks/core__post-navigation-link.json b/test/integration/fixtures/blocks/core__post-navigation-link.json
index 9689f956f1150..b226c04855e35 100644
--- a/test/integration/fixtures/blocks/core__post-navigation-link.json
+++ b/test/integration/fixtures/blocks/core__post-navigation-link.json
@@ -6,7 +6,8 @@
 			"type": "next",
 			"showTitle": false,
 			"linkLabel": false,
-			"arrow": "none"
+			"arrow": "none",
+			"taxonomy": ""
 		},
 		"innerBlocks": []
 	}

From 0b4edfa5f31f99e7eecaa28e95ffc157b2b64046 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Fri, 12 Jan 2024 14:46:12 +0100
Subject: [PATCH 088/296] Fix parent selector button focus style and metrics
 (#57728)

* Fix parent selector button focus style and positioning.

* Fix left and right padding.

* Fix block switcher font size.
---
 .../src/components/block-switcher/style.scss      |  4 ----
 .../src/components/block-toolbar/style.scss       |  9 ++++-----
 .../src/components/block-tools/style.scss         | 15 ++++++++-------
 3 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index b8503a0811e42..d30c6587a520f 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -35,10 +35,6 @@
 	}
 }
 
-.show-icon-labels .block-editor-block-toolbar .block-editor-block-switcher .components-button.has-icon::after {
-	font-size: 14px;
-}
-
 .components-button.block-editor-block-switcher__no-switcher-icon {
 	display: flex;
 
diff --git a/packages/block-editor/src/components/block-toolbar/style.scss b/packages/block-editor/src/components/block-toolbar/style.scss
index fc18dba7cc2cf..cff75008d355f 100644
--- a/packages/block-editor/src/components/block-toolbar/style.scss
+++ b/packages/block-editor/src/components/block-toolbar/style.scss
@@ -98,6 +98,10 @@
 
 	.block-editor-block-parent-selector {
 		position: relative;
+		// Must use the same negative margins of the .components-toolbar-group
+		// https://github.com/WordPress/gutenberg/blob/73a4716f429b5dce0190638049f5bd30f0b242f6/packages/block-editor/src/components/block-toolbar/style.scss#L32-L33
+		margin-top: -$border-width;
+		margin-bottom: -$border-width;
 
 		// Parent selector dot divider
 		&::after {
@@ -108,11 +112,6 @@
 			bottom: $grid-unit-20;
 		}
 	}
-
-	.block-editor-block-parent-selector__button {
-		position: relative;
-		top: -1px;
-	}
 }
 
 
diff --git a/packages/block-editor/src/components/block-tools/style.scss b/packages/block-editor/src/components/block-tools/style.scss
index 3371d795e6c03..c5920bdf2f7d3 100644
--- a/packages/block-editor/src/components/block-tools/style.scss
+++ b/packages/block-editor/src/components/block-tools/style.scss
@@ -235,6 +235,11 @@
 			padding-right: 6px;
 			padding-left: 6px;
 			background-color: $white;
+
+			.show-icon-labels & {
+				padding-right: $grid-unit-15;
+				padding-left: $grid-unit-15;
+			}
 		}
 	}
 
@@ -242,15 +247,11 @@
 	.show-icon-labels & {
 
 		.block-editor-block-parent-selector {
-			position: static;
-			margin-top: -$border-width;
+			position: relative;
+			left: auto;
 			margin-left: -$border-width;
-			margin-bottom: -$border-width;
-
-			.block-editor-block-parent-selector__button {
-				position: static;
-			}
 		}
+
 		.block-editor-block-mover__move-button-container,
 		.block-editor-block-toolbar__block-controls .block-editor-block-mover {
 			border-left: 1px solid $gray-900;

From e7128cd0eb382a1566c3791721f210e83d9d5435 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Fri, 12 Jan 2024 23:06:27 +0900
Subject: [PATCH 089/296] LinkControl: Remove unnecessary right padding of
 input fields (#57784)

---
 .../src/components/link-control/search-input.js       | 10 +---------
 .../src/components/link-control/style.scss            | 11 ++++-------
 2 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/search-input.js b/packages/block-editor/src/components/link-control/search-input.js
index d6023b9220d63..70cd896ccabfa 100644
--- a/packages/block-editor/src/components/link-control/search-input.js
+++ b/packages/block-editor/src/components/link-control/search-input.js
@@ -1,7 +1,3 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
@@ -119,10 +115,6 @@ const LinkControlSearchInput = forwardRef(
 			}
 		};
 
-		const inputClasses = classnames( className, {
-			// 'has-no-label': ! hideLabelFromVision,
-		} );
-
 		return (
 			<div className="block-editor-link-control__search-input-container">
 				<URLInput
@@ -130,7 +122,7 @@ const LinkControlSearchInput = forwardRef(
 					__nextHasNoMarginBottom
 					label={ __( 'Link' ) }
 					hideLabelFromVision={ hideLabelFromVision }
-					className={ inputClasses }
+					className={ className }
 					value={ value }
 					onChange={ onInputChange }
 					placeholder={ placeholder ?? __( 'Search or type url' ) }
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 4821359cab8fc..1a053eabf265c 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -51,13 +51,6 @@ $preview-image-height: 140px;
 	position: relative;
 }
 
-// If the input doesn't have a visible label then
-// we need to expand the input itself to occupy
-// the full available horizontal space.
-.block-editor-link-control__search-input.has-no-label .block-editor-url-input__input {
-	flex: 1;
-}
-
 .block-editor-link-control__field {
 	margin: $grid-unit-20; // allow margin collapse for vertical spacing.
 
@@ -77,6 +70,10 @@ $preview-image-height: 140px;
 		padding: $grid-unit-10 $button-size-next-default-40px $grid-unit-10 $grid-unit-20;
 		position: relative;
 		width: 100%;
+
+		.has-actions & {
+			padding-right: $grid-unit-20;
+		}
 	}
 }
 

From 55b4e9b7f3861b7d782dec4a4b839ace0e30f300 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Fri, 12 Jan 2024 14:35:01 +0000
Subject: [PATCH 090/296] Data view list layout: Fix thumbnail dimensions
 (#57774)

---
 packages/dataviews/src/style.scss | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index d934ea0df62d0..680fcf6a480d4 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -335,11 +335,18 @@
 	}
 
 	.dataviews-view-list__media-wrapper {
-		min-width: $grid-unit-40;
+		width: $grid-unit-40;
 		height: $grid-unit-40;
 		border-radius: $grid-unit-05;
 		overflow: hidden;
 		position: relative;
+		flex-shrink: 0;
+
+		img {
+			width: 100%;
+			height: 100%;
+			object-fit: cover;
+		}
 
 		&::after {
 			content: "";

From 858bc3b7c216b1cab8d00405cd5e0ece452d2bae Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 12 Jan 2024 16:47:09 +0100
Subject: [PATCH 091/296] DependencyExtractionWebpackPlugin: Throw when using
 scripts from modules (#57795)

WordPress Script dependencies are not currently available as dependencies of WordPress Modules. Using e.g. lodash or @wordpress/api-fetch in a module build would result in bundling that dependency. For a package like lodash that's undesirable but should work. However, many @wordpress/* packages are not intended to be bundle or duplicated and will not work as expected.

It's likely an error to use WordPress Scripts inside modules at this time.

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 .../lib/index.js                              | 50 ++++++----
 .../lib/util.js                               | 16 ++-
 .../test/__snapshots__/build.js.snap          | 99 ++++++++++++++++---
 .../test/build.js                             | 10 ++
 .../fixtures/combine-assets/webpack.config.js |  4 +-
 .../test/fixtures/error/index.js              | 10 ++
 .../test/fixtures/error/webpack.config.js     | 15 +++
 .../webpack.config.js                         |  4 +-
 .../has-extension-suffix/webpack.config.js    |  4 +-
 .../webpack.config.js                         |  4 +-
 .../option-output-filename/webpack.config.js  |  4 +-
 .../output-format-json/webpack.config.js      |  7 +-
 .../runtime-chunk-single/webpack.config.js    |  4 +-
 .../fixtures/style-imports/webpack.config.js  |  4 +-
 .../wordpress-interactivity/webpack.config.js |  8 +-
 .../wordpress-require/webpack.config.js       |  4 +-
 .../test/fixtures/wordpress/webpack.config.js |  4 +-
 17 files changed, 205 insertions(+), 46 deletions(-)
 create mode 100644 packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js
 create mode 100644 packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js

diff --git a/packages/dependency-extraction-webpack-plugin/lib/index.js b/packages/dependency-extraction-webpack-plugin/lib/index.js
index e8d9fc9bfee1d..344d4de9a0572 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/index.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/index.js
@@ -62,28 +62,38 @@ class DependencyExtractionWebpackPlugin {
 	externalizeWpDeps( { request }, callback ) {
 		let externalRequest;
 
-		// Handle via options.requestToExternal(Module)  first.
-		if ( this.useModules ) {
-			if ( typeof this.options.requestToExternalModule === 'function' ) {
-				externalRequest =
-					this.options.requestToExternalModule( request );
+		try {
+			// Handle via options.requestToExternal(Module)  first.
+			if ( this.useModules ) {
+				if (
+					typeof this.options.requestToExternalModule === 'function'
+				) {
+					externalRequest =
+						this.options.requestToExternalModule( request );
+
+					// requestToExternalModule allows a boolean shorthand
+					if ( externalRequest === false ) {
+						externalRequest = undefined;
+					}
+					if ( externalRequest === true ) {
+						externalRequest = request;
+					}
+				}
+			} else if ( typeof this.options.requestToExternal === 'function' ) {
+				externalRequest = this.options.requestToExternal( request );
 			}
-		} else if ( typeof this.options.requestToExternal === 'function' ) {
-			externalRequest = this.options.requestToExternal( request );
-		}
-
-		// Cascade to default if unhandled and enabled.
-		if (
-			typeof externalRequest === 'undefined' &&
-			this.options.useDefaults
-		) {
-			externalRequest = this.useModules
-				? defaultRequestToExternalModule( request )
-				: defaultRequestToExternal( request );
-		}
 
-		if ( this.useModules && externalRequest === true ) {
-			externalRequest = request;
+			// Cascade to default if unhandled and enabled.
+			if (
+				typeof externalRequest === 'undefined' &&
+				this.options.useDefaults
+			) {
+				externalRequest = this.useModules
+					? defaultRequestToExternalModule( request )
+					: defaultRequestToExternal( request );
+			}
+		} catch ( err ) {
+			return callback( err );
 		}
 
 		if ( externalRequest ) {
diff --git a/packages/dependency-extraction-webpack-plugin/lib/util.js b/packages/dependency-extraction-webpack-plugin/lib/util.js
index 50b7eaa8db98f..39b2f4b4bca58 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/util.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/util.js
@@ -61,9 +61,13 @@ function defaultRequestToExternal( request ) {
  *
  * Currently only @wordpress/interactivity
  *
+ * Do not use the boolean shorthand here, it's only handled for the `requestToExternalModule` option.
+ *
  * @param {string} request Module request (the module name in `import from`) to be transformed
- * @return {string|undefined} The resulting external definition. Return `undefined`
- *   to ignore the request. Return `string` to map the request to an external. This may simply be returning the request, e.g. `@wordpress/interactivity` maps to the external `@wordpress/interactivity`.
+ * @return {string|Error|undefined} The resulting external definition.
+ *   - Return `undefined` to ignore the request (do not externalize).
+ *   - Return `string` to map the request to an external.
+ *   - Return `Error` to emit an error.
  */
 function defaultRequestToExternalModule( request ) {
 	if ( request === '@wordpress/interactivity' ) {
@@ -73,6 +77,14 @@ function defaultRequestToExternalModule( request ) {
 		// which forces @wordpress/interactivity imports to be hoisted to static imports.
 		return `module ${ request }`;
 	}
+
+	const isWordPressScript = Boolean( defaultRequestToExternal( request ) );
+
+	if ( isWordPressScript ) {
+		throw new Error(
+			`Attempted to use WordPress script in a module: ${ request }, which is not supported yet.`
+		);
+	}
 }
 
 /**
diff --git a/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap b/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
index 84ed7660802ba..a595a948ba108 100644
--- a/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
+++ b/packages/dependency-extraction-webpack-plugin/test/__snapshots__/build.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`combine-assets\` should produce expected output: Asset file 'assets.php' should match snapshot 1`] = `
-"<?php return array('fileA.mjs' => array('dependencies' => array('@wordpress/blob'), 'version' => 'b2c5cea79a32b3d91bf8', 'type' => 'module'), 'fileB.mjs' => array('dependencies' => array('@wordpress/token-list'), 'version' => '5c4197fd48811f25807f', 'type' => 'module'));
+"<?php return array('fileA.mjs' => array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '4ab8cc4b6b7619053443', 'type' => 'module'), 'fileB.mjs' => array('dependencies' => array('@wordpress/token-list'), 'version' => '5c4197fd48811f25807f', 'type' => 'module'));
 "
 `;
 
@@ -17,6 +17,11 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`combine-assets\` sh
     "request": "@wordpress/token-list",
     "userRequest": "@wordpress/token-list",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
@@ -65,8 +70,17 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`dynamic-import\` sh
 ]
 `;
 
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`error\` should produce expected output 1`] = `
+"ERROR in ./index.js 5:0-23
+Module not found: Error: Attempted to use WordPress script in a module: jquery, which is not supported yet.
+
+ERROR in ./index.js 6:23-55
+Module not found: Error: Attempted to use WordPress script in a module: @wordpress/api-fetch, which is not supported yet.
+"
+`;
+
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '2925e30449840a5a80f8', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
 "
 `;
 
@@ -77,11 +91,16 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`function-output-fil
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`has-extension-suffix\` should produce expected output: Asset file 'index.min.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '26d6da43027f3522b0ca', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '8308f1ac78c21f09c721', 'type' => 'module');
 "
 `;
 
@@ -92,6 +111,11 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`has-extension-suffi
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
@@ -130,7 +154,7 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-deps\` should pr
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`no-deps\` should produce expected output: External modules should match snapshot 1`] = `[]`;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '2925e30449840a5a80f8', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
 "
 `;
 
@@ -141,11 +165,16 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-function-out
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-output-filename\` should produce expected output: Asset file 'main-foo.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '2925e30449840a5a80f8', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
 "
 `;
 
@@ -156,12 +185,25 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`option-output-filen
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
-exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: Asset file 'main.asset.json' should match snapshot 1`] = `"{"dependencies":[],"version":"34504aa793c63cd3d73a","type":"module"}"`;
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: Asset file 'main.asset.json' should match snapshot 1`] = `"{"dependencies":["lodash"],"version":"4e62c01516f9dab8041f","type":"module"}"`;
 
-exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: External modules should match snapshot 1`] = `[]`;
+exports[`DependencyExtractionWebpackPlugin modules Webpack \`output-format-json\` should produce expected output: External modules should match snapshot 1`] = `
+[
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
+]
+`;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`overrides\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
 "<?php return array('dependencies' => array('@wordpress/blob', '@wordpress/url', 'rxjs', 'rxjs/operators'), 'version' => '259fc706528651fc00c1', 'type' => 'module');
@@ -199,12 +241,12 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-singl
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'b.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => 'a0ec8ef279476bb51e19', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e14dfa7260edaee86a85', 'type' => 'module');
 "
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-single\` should produce expected output: Asset file 'runtime.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array(), 'version' => '0bb8a9fae3dcfcc1ac38', 'type' => 'module');
+"<?php return array('dependencies' => array(), 'version' => 'e7402f5608a888d8fd66', 'type' => 'module');
 "
 `;
 
@@ -215,11 +257,16 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`runtime-chunk-singl
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`style-imports\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '38479966fb62d588f05e', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => '22d18a3461df47fbaa79', 'type' => 'module');
 "
 `;
 
@@ -230,11 +277,16 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`style-imports\` sho
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '2925e30449840a5a80f8', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'e325da3aa7dbb0c0c151', 'type' => 'module');
 "
 `;
 
@@ -245,16 +297,26 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress\` should
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-interactivity\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array(array('id' => '@wordpress/interactivity', 'type' => 'dynamic')), 'version' => 'f0242eb6da78af6ca4b8', 'type' => 'module');
+"<?php return array('dependencies' => array('lodash', array('id' => '@wordpress/interactivity', 'type' => 'dynamic')), 'version' => 'fcc07ce68574cdc2a6a5', 'type' => 'module');
 "
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-interactivity\` should produce expected output: External modules should match snapshot 1`] = `
 [
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
   {
     "externalType": "module",
     "request": "@wordpress/interactivity",
@@ -264,7 +326,7 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-interacti
 `;
 
 exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-require\` should produce expected output: Asset file 'main.asset.php' should match snapshot 1`] = `
-"<?php return array('dependencies' => array('@wordpress/blob'), 'version' => '52c1849898b74d94f025', 'type' => 'module');
+"<?php return array('dependencies' => array('@wordpress/blob', 'lodash'), 'version' => 'f40de15d66b54da440d2', 'type' => 'module');
 "
 `;
 
@@ -275,6 +337,11 @@ exports[`DependencyExtractionWebpackPlugin modules Webpack \`wordpress-require\`
     "request": "@wordpress/blob",
     "userRequest": "@wordpress/blob",
   },
+  {
+    "externalType": "import",
+    "request": "lodash",
+    "userRequest": "lodash",
+  },
 ]
 `;
 
@@ -363,6 +430,12 @@ exports[`DependencyExtractionWebpackPlugin scripts Webpack \`dynamic-import\` sh
 ]
 `;
 
+exports[`DependencyExtractionWebpackPlugin scripts Webpack \`error\` should produce expected output 1`] = `
+"ERROR in main
+Module not found: Error: Ensure error in script build.
+"
+`;
+
 exports[`DependencyExtractionWebpackPlugin scripts Webpack \`function-output-filename\` should produce expected output: Asset file 'chunk--main--main.asset.php' should match snapshot 1`] = `
 "<?php return array('dependencies' => array('lodash', 'wp-blob'), 'version' => 'fc2d750fc9e08c5749db');
 "
diff --git a/packages/dependency-extraction-webpack-plugin/test/build.js b/packages/dependency-extraction-webpack-plugin/test/build.js
index 3b29d55caf2bb..0b28b679bba92 100644
--- a/packages/dependency-extraction-webpack-plugin/test/build.js
+++ b/packages/dependency-extraction-webpack-plugin/test/build.js
@@ -72,6 +72,16 @@ describe.each( /** @type {const} */ ( [ 'scripts', 'modules' ] ) )(
 					} )
 				);
 
+				/* eslint-disable jest/no-conditional-expect */
+				if ( configCase.includes( 'error' ) ) {
+					expect( stats.hasErrors() ).toBe( true );
+					expect(
+						stats.toString( { errors: true, all: false } )
+					).toMatchSnapshot();
+					return;
+				}
+				/* eslint-enable jest/no-conditional-expect */
+
 				if ( stats.hasErrors() ) {
 					throw new Error(
 						stats.toString( { errors: true, all: false } )
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
index 420d5030ab1a6..ab407815bbee4 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/combine-assets/webpack.config.js
@@ -12,7 +12,9 @@ module.exports = {
 		new DependencyExtractionWebpackPlugin( {
 			combineAssets: true,
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js
new file mode 100644
index 0000000000000..388963c34de89
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/index.js
@@ -0,0 +1,10 @@
+/* eslint-disable eslint-comments/disable-enable-pair */
+/* eslint-disable eslint-comments/no-unlimited-disable */
+/* eslint-disable */
+
+import $ from 'jquery';
+const apiFetch = await import( '@wordpress/api-fetch' );
+
+$( () => {
+	apiFetch( { path: '/' } );
+} );
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js
new file mode 100644
index 0000000000000..5f2e5f899237c
--- /dev/null
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/error/webpack.config.js
@@ -0,0 +1,15 @@
+/**
+ * Internal dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '../../..' );
+
+module.exports = {
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			// eslint-disable-next-line no-unused-vars
+			requestToExternal( request ) {
+				throw new Error( 'Ensure error in script build.' );
+			},
+		} ),
+	],
+};
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
index 0aea733327a54..7ec1c7ce8a5de 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/function-output-filename/webpack.config.js
@@ -12,7 +12,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
index 4ef05f6986b9c..4816746976c5b 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/has-extension-suffix/webpack.config.js
@@ -10,7 +10,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
index 40123021ae404..f65d51ffa5152 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-function-output-filename/webpack.config.js
@@ -10,7 +10,9 @@ module.exports = {
 				return `chunk--${ chunkData.chunk.name }--[name].asset.php`;
 			},
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
index fb02bc3c5bcd0..30aa1f0233e93 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/option-output-filename/webpack.config.js
@@ -8,7 +8,9 @@ module.exports = {
 		new DependencyExtractionWebpackPlugin( {
 			outputFilename: '[name]-foo.asset.php',
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
index b82f422f949f8..3a6099354c86b 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/output-format-json/webpack.config.js
@@ -5,6 +5,11 @@ const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
 	plugins: [
-		new DependencyExtractionWebpackPlugin( { outputFormat: 'json' } ),
+		new DependencyExtractionWebpackPlugin( {
+			outputFormat: 'json',
+			requestToExternalModule( request ) {
+				return request === 'lodash';
+			},
+		} ),
 	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
index b8fa673995e9b..0c6608a814b45 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/runtime-chunk-single/webpack.config.js
@@ -11,7 +11,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
index bb412af5c61b8..0f5ac2b955538 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/style-imports/webpack.config.js
@@ -12,7 +12,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 		new MiniCSSExtractPlugin(),
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js
index bfffff3ae7831..7d18e80a8d4ea 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-interactivity/webpack.config.js
@@ -4,5 +4,11 @@
 const DependencyExtractionWebpackPlugin = require( '../../..' );
 
 module.exports = {
-	plugins: [ new DependencyExtractionWebpackPlugin() ],
+	plugins: [
+		new DependencyExtractionWebpackPlugin( {
+			requestToExternalModule( request ) {
+				return request === 'lodash';
+			},
+		} ),
+	],
 };
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
index 59d4c5d2ead3a..bf6cb387dbd18 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress-require/webpack.config.js
@@ -7,7 +7,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],
diff --git a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
index 59d4c5d2ead3a..bf6cb387dbd18 100644
--- a/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
+++ b/packages/dependency-extraction-webpack-plugin/test/fixtures/wordpress/webpack.config.js
@@ -7,7 +7,9 @@ module.exports = {
 	plugins: [
 		new DependencyExtractionWebpackPlugin( {
 			requestToExternalModule( request ) {
-				return request.startsWith( '@wordpress/' );
+				return (
+					request.startsWith( '@wordpress/' ) || request === 'lodash'
+				);
 			},
 		} ),
 	],

From 1ce444fb69edc0f03f15dabed989932f973f1942 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Fri, 12 Jan 2024 17:20:56 +0100
Subject: [PATCH 092/296] Migrate ColorPalette and CircularOptionPicker tests
 from user-event to ariakit/test (#57809)

* Migrate ColorPalette tests from user-event to ariakit/test

* Migrate CircularOptionPicker tests from user-event to ariakit/test
---
 packages/components/CHANGELOG.md              |  1 +
 .../src/circular-option-picker/test/index.tsx | 26 +++----
 .../src/palette-edit/test/index.tsx           | 71 ++++++++++---------
 packages/components/src/tabs/test/index.tsx   |  4 +-
 4 files changed, 53 insertions(+), 49 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 022248e3706cb..acf1ae3dd165a 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -35,6 +35,7 @@
 -   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 -   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
+-   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
 
 ### Experimental
 
diff --git a/packages/components/src/circular-option-picker/test/index.tsx b/packages/components/src/circular-option-picker/test/index.tsx
index 48a0aca40faf3..0a168432629f8 100644
--- a/packages/components/src/circular-option-picker/test/index.tsx
+++ b/packages/components/src/circular-option-picker/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { press } from '@ariakit/test';
 
 /**
  * Internal dependencies
@@ -71,8 +71,6 @@ describe( 'CircularOptionPicker', () => {
 
 	describe( 'when `loop` is not set', () => {
 		it( 'should loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
@@ -80,19 +78,17 @@ describe( 'CircularOptionPicker', () => {
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
 		} );
 	} );
 
 	describe( 'when `loop` is true', () => {
 		it( 'should loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
@@ -101,19 +97,17 @@ describe( 'CircularOptionPicker', () => {
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
 		} );
 	} );
 
 	describe( 'when `loop` is false', () => {
 		it( 'should not loop', async () => {
-			const user = userEvent.setup();
-
 			render(
 				<CircularOptionPicker
 					{ ...DEFAULT_PROPS }
@@ -122,11 +116,11 @@ describe( 'CircularOptionPicker', () => {
 				/>
 			);
 
-			await user.tab();
+			await press.Tab();
 			expect( getOption( 'Option One' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
-			await user.keyboard( '[ArrowRight]' );
+			await press.ArrowRight();
 			expect( getOption( 'Option Two' ) ).toHaveFocus();
 		} );
 	} );
diff --git a/packages/components/src/palette-edit/test/index.tsx b/packages/components/src/palette-edit/test/index.tsx
index 31b712225a8dc..b37db91607f8e 100644
--- a/packages/components/src/palette-edit/test/index.tsx
+++ b/packages/components/src/palette-edit/test/index.tsx
@@ -2,7 +2,7 @@
  * External dependencies
  */
 import { render, screen, waitFor } from '@testing-library/react';
-import userEvent from '@testing-library/user-event';
+import { click, type, press } from '@ariakit/test';
 
 /**
  * Internal dependencies
@@ -12,6 +12,15 @@ import type { PaletteElement } from '../types';
 
 const noop = () => {};
 
+async function clearInput( input: HTMLInputElement ) {
+	await click( input );
+
+	// Press backspace as many times as the input's current value
+	for ( const _ of Array( input.value.length ) ) {
+		await press.Backspace();
+	}
+}
+
 describe( 'getNameForPosition', () => {
 	test( 'should return 1 by default', () => {
 		const slugPrefix = 'test-';
@@ -149,10 +158,9 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'shows an option to remove all colors', async () => {
-		const user = userEvent.setup();
 		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Color options',
 			} )
@@ -166,12 +174,11 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'shows a reset option when the `canReset` prop is enabled', async () => {
-		const user = userEvent.setup();
 		render(
 			<PaletteEdit { ...defaultProps } colors={ colors } canReset />
 		);
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Color options',
 			} )
@@ -184,10 +191,9 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'does not show a reset colors option when `canReset` is disabled', async () => {
-		const user = userEvent.setup();
 		render( <PaletteEdit { ...defaultProps } colors={ colors } /> );
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Color options',
 			} )
@@ -200,7 +206,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'calls the `onChange` with the new color appended', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -211,7 +216,7 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Add color',
 			} )
@@ -230,7 +235,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'calls the `onChange` with the new gradient appended', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -241,7 +245,7 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Add gradient',
 			} )
@@ -271,7 +275,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'can remove a color', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -282,18 +285,18 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Color options',
 			} )
 		);
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Show details',
 			} )
 		);
-		await user.click( screen.getByText( 'Primary' ) );
-		await user.click(
+		await click( screen.getByText( 'Primary' ) );
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Remove color',
 			} )
@@ -305,7 +308,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'can update palette name', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -316,22 +318,24 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Color options',
 			} )
 		);
-		await user.click(
+		await click(
 			screen.getByRole( 'button', {
 				name: 'Show details',
 			} )
 		);
-		await user.click( screen.getByText( 'Primary' ) );
+		await click( screen.getByText( 'Primary' ) );
 		const nameInput = screen.getByRole( 'textbox', {
 			name: 'Color name',
 		} );
-		await user.clear( nameInput );
-		await user.type( nameInput, 'Primary Updated' );
+
+		await clearInput( nameInput as HTMLInputElement );
+
+		await type( 'Primary Updated' );
 
 		await waitFor( () => {
 			expect( onChange ).toHaveBeenCalledWith( [
@@ -346,7 +350,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'can update color palette value', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -357,12 +360,14 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click( screen.getByLabelText( 'Color: Primary' ) );
+		await click( screen.getByLabelText( 'Color: Primary' ) );
 		const hexInput = screen.getByRole( 'textbox', {
 			name: 'Hex color',
 		} );
-		await user.clear( hexInput );
-		await user.type( hexInput, '000000' );
+
+		await clearInput( hexInput as HTMLInputElement );
+
+		await type( '000000' );
 
 		await waitFor( () => {
 			expect( onChange ).toHaveBeenCalledWith( [
@@ -376,7 +381,6 @@ describe( 'PaletteEdit', () => {
 	} );
 
 	it( 'can update gradient palette value', async () => {
-		const user = userEvent.setup();
 		const onChange = jest.fn();
 
 		render(
@@ -387,12 +391,15 @@ describe( 'PaletteEdit', () => {
 			/>
 		);
 
-		await user.click( screen.getByLabelText( 'Gradient: Pale ocean' ) );
+		await click( screen.getByLabelText( 'Gradient: Pale ocean' ) );
 
-		const typeSelectElement = screen.getByRole( 'combobox', {
-			name: 'Type',
-		} );
-		await user.selectOptions( typeSelectElement, 'radial-gradient' );
+		// Select radial gradient option
+		await click(
+			screen.getByRole( 'combobox', {
+				name: 'Type',
+			} )
+		);
+		await click( screen.getByRole( 'option', { name: 'Radial' } ) );
 
 		await waitFor( () => {
 			expect( onChange ).toHaveBeenCalledWith( [
diff --git a/packages/components/src/tabs/test/index.tsx b/packages/components/src/tabs/test/index.tsx
index 24b7e75b6e72b..8c2c2d0fd2fa2 100644
--- a/packages/components/src/tabs/test/index.tsx
+++ b/packages/components/src/tabs/test/index.tsx
@@ -1260,7 +1260,9 @@ describe( 'Tabs', () => {
 
 				// Tab key should focus the currently selected tab, which is Beta.
 				await press.Tab();
-				expect( await getSelectedTab() ).toHaveFocus();
+				await waitFor( async () =>
+					expect( await getSelectedTab() ).toHaveFocus()
+				);
 
 				rerender(
 					<ControlledTabs

From d6072ce501f63fe06f86530cfcca5188ca2fa7a3 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Fri, 12 Jan 2024 17:21:24 +0100
Subject: [PATCH 093/296] Remove check-latest-npm validation (#57797)

Package publishing via GitHub Actions is currently broken because the actions are not passing the npm version check.

This check was introduced when package-lock formats were changing frequently and causing issues. Those difficulties seem to have passed for the most part.
---
 bin/check-latest-npm.js | 134 ----------------------------------------
 bin/tsconfig.json       |   1 -
 package.json            |   3 +-
 3 files changed, 1 insertion(+), 137 deletions(-)
 delete mode 100644 bin/check-latest-npm.js

diff --git a/bin/check-latest-npm.js b/bin/check-latest-npm.js
deleted file mode 100644
index 8b9f86e95dd56..0000000000000
--- a/bin/check-latest-npm.js
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env node
-
-/**
- * External dependencies
- */
-const { green, red, yellow } = require( 'chalk' );
-const { get } = require( 'https' );
-const { spawn } = require( 'child_process' );
-const semver = require( 'semver' );
-
-/**
- * Internal dependencies
- */
-const {
-	engines: { npm: npmRange },
-	// Ignore reason: `package.json` exists outside `bin` `rootDir`.
-	// @ts-ignore
-} = require( '../package.json' );
-
-/**
- * Returns a promise resolving with the version number of the latest available
- * version of npm.
- *
- * @return {Promise<string>} Promise resolving with latest npm version.
- */
-async function getLatestNPMVersion() {
-	return new Promise( ( resolve, reject ) => {
-		get(
-			'https://registry.npmjs.org/npm',
-			{
-				headers: {
-					// By passing a specialized `Accept` header, the registry
-					// will return an abbreviated form of the package data which
-					// includes enough detail to determine the latest version.
-					//
-					// See: https://github.com/npm/registry/blob/HEAD/docs/responses/package-metadata.md
-					Accept: 'application/vnd.npm.install-v1+json',
-				},
-			},
-			async ( response ) => {
-				if ( response.statusCode !== 200 ) {
-					return reject(
-						new Error( 'Package data for npm not found' )
-					);
-				}
-
-				let body = '';
-				for await ( const chunk of response ) {
-					body += chunk.toString();
-				}
-
-				let data;
-				try {
-					data = JSON.parse( body );
-				} catch {
-					return reject(
-						new Error(
-							'Package data for npm returned invalid response body'
-						)
-					);
-				}
-
-				const versions = Object.values( data[ 'dist-tags' ] );
-
-				resolve( semver.maxSatisfying( versions, npmRange ) );
-			}
-		).on( 'error', ( error ) => {
-			if (
-				/** @type {NodeJS.ErrnoException} */ ( error ).code ===
-				'ENOTFOUND'
-			) {
-				error =
-					new Error( `Could not contact the npm registry to determine latest version.
-
-This could be due to an intermittent outage of the service, or because you are not connected to the internet.
-
-Because it is important that \`package-lock.json\` files only be committed while running the latest version of npm, this commit has been blocked.
-
-If you are certain of your changes and desire to commit anyways, you should either connect to the internet or bypass commit verification using ${ yellow(
-						'git commit --no-verify'
-					) } .` );
-			}
-
-			reject( error );
-		} );
-	} );
-}
-
-/**
- * Returns a promise resolving with the version number of the local installed
- * version of npm.
- *
- * @return {Promise<string>} Promise resolving with local installed npm version.
- */
-async function getLocalNPMVersion() {
-	return new Promise( async ( resolve ) => {
-		// 'npm' doesn't work correctly on Windows.
-		// https://github.com/WordPress/gutenberg/issues/22484
-		const command = process.platform === 'win32' ? 'npm.cmd' : 'npm';
-		const childProcess = spawn( command, [ '-v' ] );
-
-		let output = '';
-		for await ( const chunk of childProcess.stdout ) {
-			output += chunk.toString();
-		}
-
-		resolve( output.trim() );
-	} );
-}
-
-Promise.all( [ getLatestNPMVersion(), getLocalNPMVersion() ] )
-	.then( ( [ latest, local ] ) => {
-		if ( latest !== local ) {
-			throw new Error(
-				`The local npm version does not match the expected latest version. Expected ${ green(
-					latest
-				) }, found ${ red( local ) }.
-
-It is required that you have the expected latest version of npm installed in order to commit a change to the package-lock.json file.
-
-Run ${ yellow(
-					`npm install --global npm@${ latest }`
-				) } to install the expected latest version of npm. Before retrying your commit, run ${ yellow(
-					'npm install'
-				) } once more to ensure the package-lock.json contents are correct. If there are any changes to the file, they should be included in your commit.`
-			);
-		}
-	} )
-	.catch( ( error ) => {
-		console.error(
-			'Latest npm check failed!\n\n' + error.toString() + '\n'
-		);
-		process.exitCode = 1;
-	} );
diff --git a/bin/tsconfig.json b/bin/tsconfig.json
index f3d576c178d0c..48fd553e4c049 100644
--- a/bin/tsconfig.json
+++ b/bin/tsconfig.json
@@ -17,7 +17,6 @@
 	},
 	"files": [
 		"./api-docs/update-api-docs.js",
-		"./check-latest-npm.js",
 		"./plugin/config.js",
 		"./plugin/commands/changelog.js",
 		"./plugin/commands/performance.js",
diff --git a/package.json b/package.json
index 684f35d408d3c..aae8275e714ab 100644
--- a/package.json
+++ b/package.json
@@ -359,8 +359,7 @@
 			"wp-scripts lint-style"
 		],
 		"package-lock.json": [
-			"npm run lint:lockfile",
-			"node ./bin/check-latest-npm.js"
+			"npm run lint:lockfile"
 		],
 		"packages/*/package.json": [
 			"wp-scripts lint-pkg-json"

From 49a63d36798fd9dd3fd3009bf49eee91277ff927 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Fri, 12 Jan 2024 17:08:14 +0000
Subject: [PATCH 094/296] Fix regression: Content locking does not stops when
 an outside block is selected (#57737)

* Fix regression: Content locking does not stops automatically when an outside block is selected.

* Make the new action private
---
 .../src/components/block-list/index.js        | 68 +++++++++++++-----
 .../block-editor/src/hooks/content-lock-ui.js | 70 ++++---------------
 packages/block-editor/src/store/actions.js    |  5 +-
 .../block-editor/src/store/private-actions.js | 22 ++++++
 packages/block-editor/src/store/reducer.js    | 16 +++++
 packages/block-editor/src/store/selectors.js  | 11 +++
 6 files changed, 120 insertions(+), 72 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index ab57605563e1d..09a4712a3dd6d 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -17,7 +17,12 @@ import {
 	useMergeRefs,
 	useDebounce,
 } from '@wordpress/compose';
-import { createContext, useMemo, useCallback } from '@wordpress/element';
+import {
+	createContext,
+	useMemo,
+	useCallback,
+	useEffect,
+} from '@wordpress/element';
 
 /**
  * Internal dependencies
@@ -34,6 +39,7 @@ import {
 	DEFAULT_BLOCK_EDIT_CONTEXT,
 } from '../block-edit/context';
 import { useTypingObserver } from '../observe-typing';
+import { unlock } from '../../lock-unlock';
 
 export const IntersectionObserver = createContext();
 const pendingBlockVisibilityUpdatesPerRegistry = new WeakMap();
@@ -113,6 +119,27 @@ function Root( { className, ...settings } ) {
 	);
 }
 
+function StopEditingAsBlocksOnOutsideSelect( { clientId } ) {
+	const { stopEditingAsBlocks } = unlock( useDispatch( blockEditorStore ) );
+	const isBlockOrDescendantSelected = useSelect(
+		( select ) => {
+			const { isBlockSelected, hasSelectedInnerBlock } =
+				select( blockEditorStore );
+			return (
+				isBlockSelected( clientId ) ||
+				hasSelectedInnerBlock( clientId, true )
+			);
+		},
+		[ clientId ]
+	);
+	useEffect( () => {
+		if ( ! isBlockOrDescendantSelected ) {
+			stopEditingAsBlocks( clientId );
+		}
+	}, [ isBlockOrDescendantSelected, clientId, stopEditingAsBlocks ] );
+	return null;
+}
+
 export default function BlockList( settings ) {
 	return (
 		<BlockEditContextProvider value={ DEFAULT_BLOCK_EDIT_CONTEXT }>
@@ -128,21 +155,25 @@ function Items( {
 	__experimentalAppenderTagName,
 	layout = defaultLayout,
 } ) {
-	const { order, selectedBlocks, visibleBlocks } = useSelect(
-		( select ) => {
-			const {
-				getBlockOrder,
-				getSelectedBlockClientIds,
-				__unstableGetVisibleBlocks,
-			} = select( blockEditorStore );
-			return {
-				order: getBlockOrder( rootClientId ),
-				selectedBlocks: getSelectedBlockClientIds(),
-				visibleBlocks: __unstableGetVisibleBlocks(),
-			};
-		},
-		[ rootClientId ]
-	);
+	const { order, selectedBlocks, visibleBlocks, temporarilyEditingAsBlocks } =
+		useSelect(
+			( select ) => {
+				const {
+					getBlockOrder,
+					getSelectedBlockClientIds,
+					__unstableGetVisibleBlocks,
+					__unstableGetTemporarilyEditingAsBlocks,
+				} = select( blockEditorStore );
+				return {
+					order: getBlockOrder( rootClientId ),
+					selectedBlocks: getSelectedBlockClientIds(),
+					visibleBlocks: __unstableGetVisibleBlocks(),
+					temporarilyEditingAsBlocks:
+						__unstableGetTemporarilyEditingAsBlocks(),
+				};
+			},
+			[ rootClientId ]
+		);
 
 	return (
 		<LayoutProvider value={ layout }>
@@ -163,6 +194,11 @@ function Items( {
 				</AsyncModeProvider>
 			) ) }
 			{ order.length < 1 && placeholder }
+			{ !! temporarilyEditingAsBlocks && (
+				<StopEditingAsBlocksOnOutsideSelect
+					clientId={ temporarilyEditingAsBlocks }
+				/>
+			) }
 			<BlockListAppender
 				tagName={ __experimentalAppenderTagName }
 				rootClientId={ rootClientId }
diff --git a/packages/block-editor/src/hooks/content-lock-ui.js b/packages/block-editor/src/hooks/content-lock-ui.js
index 1bcd0d7ce8016..2dd31fe8729e0 100644
--- a/packages/block-editor/src/hooks/content-lock-ui.js
+++ b/packages/block-editor/src/hooks/content-lock-ui.js
@@ -4,40 +4,23 @@
 import { ToolbarButton, MenuItem } from '@wordpress/components';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { __ } from '@wordpress/i18n';
-import { useEffect, useRef, useCallback } from '@wordpress/element';
+import { useCallback } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../store';
 import { BlockControls, BlockSettingsMenuControls } from '../components';
+import { unlock } from '../lock-unlock';
 
-function StopEditingAsBlocksOnOutsideSelect( {
-	clientId,
-	stopEditingAsBlock,
-} ) {
-	const isBlockOrDescendantSelected = useSelect(
-		( select ) => {
-			const { isBlockSelected, hasSelectedInnerBlock } =
-				select( blockEditorStore );
-			return (
-				isBlockSelected( clientId ) ||
-				hasSelectedInnerBlock( clientId, true )
-			);
-		},
-		[ clientId ]
-	);
-	useEffect( () => {
-		if ( ! isBlockOrDescendantSelected ) {
-			stopEditingAsBlock();
-		}
-	}, [ isBlockOrDescendantSelected, stopEditingAsBlock ] );
-	return null;
-}
+// The implementation of content locking is mainly in this file, although the mechanism
+// to stop temporarily editing as blocks when an outside block is selected is on component StopEditingAsBlocksOnOutsideSelect
+// at block-editor/src/components/block-list/index.js.
+// Besides the components on this file and the file referenced above the implementation
+// also includes artifacts on the store (actions, reducers, and selector).
 
 function ContentLockControlsPure( { clientId, isSelected } ) {
 	const { getBlockListSettings, getSettings } = useSelect( blockEditorStore );
-	const focusModeToRevert = useRef();
 	const { templateLock, isLockedByParent, isEditingAsBlocks } = useSelect(
 		( select ) => {
 			const {
@@ -61,31 +44,15 @@ function ContentLockControlsPure( { clientId, isSelected } ) {
 		updateBlockListSettings,
 		__unstableSetTemporarilyEditingAsBlocks,
 	} = useDispatch( blockEditorStore );
+	const { stopEditingAsBlocks } = unlock( useDispatch( blockEditorStore ) );
 	const isContentLocked =
 		! isLockedByParent && templateLock === 'contentOnly';
 	const { __unstableMarkNextChangeAsNotPersistent, updateBlockAttributes } =
 		useDispatch( blockEditorStore );
 
-	const stopEditingAsBlock = useCallback( () => {
-		__unstableMarkNextChangeAsNotPersistent();
-		updateBlockAttributes( clientId, {
-			templateLock: 'contentOnly',
-		} );
-		updateBlockListSettings( clientId, {
-			...getBlockListSettings( clientId ),
-			templateLock: 'contentOnly',
-		} );
-		updateSettings( { focusMode: focusModeToRevert.current } );
-		__unstableSetTemporarilyEditingAsBlocks();
-	}, [
-		clientId,
-		updateSettings,
-		updateBlockListSettings,
-		getBlockListSettings,
-		__unstableMarkNextChangeAsNotPersistent,
-		updateBlockAttributes,
-		__unstableSetTemporarilyEditingAsBlocks,
-	] );
+	const stopEditingAsBlockCallback = useCallback( () => {
+		stopEditingAsBlocks( clientId );
+	}, [ clientId, stopEditingAsBlocks ] );
 
 	if ( ! isContentLocked && ! isEditingAsBlocks ) {
 		return null;
@@ -99,16 +66,8 @@ function ContentLockControlsPure( { clientId, isSelected } ) {
 		<>
 			{ showStopEditingAsBlocks && (
 				<>
-					<StopEditingAsBlocksOnOutsideSelect
-						clientId={ clientId }
-						stopEditingAsBlock={ stopEditingAsBlock }
-					/>
 					<BlockControls group="other">
-						<ToolbarButton
-							onClick={ () => {
-								stopEditingAsBlock();
-							} }
-						>
+						<ToolbarButton onClick={ stopEditingAsBlockCallback }>
 							{ __( 'Done' ) }
 						</ToolbarButton>
 					</BlockControls>
@@ -127,11 +86,12 @@ function ContentLockControlsPure( { clientId, isSelected } ) {
 									...getBlockListSettings( clientId ),
 									templateLock: false,
 								} );
-								focusModeToRevert.current =
+								const focusModeToRevert =
 									getSettings().focusMode;
 								updateSettings( { focusMode: true } );
 								__unstableSetTemporarilyEditingAsBlocks(
-									clientId
+									clientId,
+									focusModeToRevert
 								);
 								onClose();
 							} }
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
index 4b396045a73c2..47d530c8319a2 100644
--- a/packages/block-editor/src/store/actions.js
+++ b/packages/block-editor/src/store/actions.js
@@ -1686,13 +1686,16 @@ export function setBlockVisibility( updates ) {
  * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
  *
  * @param {?string} temporarilyEditingAsBlocks The block's clientId being temporarily edited as blocks.
+ * @param {?string} focusModeToRevert          The focus mode to revert after temporarily edit as blocks finishes.
  */
 export function __unstableSetTemporarilyEditingAsBlocks(
-	temporarilyEditingAsBlocks
+	temporarilyEditingAsBlocks,
+	focusModeToRevert
 ) {
 	return {
 		type: 'SET_TEMPORARILY_EDITING_AS_BLOCKS',
 		temporarilyEditingAsBlocks,
+		focusModeToRevert,
 	};
 }
 
diff --git a/packages/block-editor/src/store/private-actions.js b/packages/block-editor/src/store/private-actions.js
index 43c392bc7ce8c..a31455a0b7e7b 100644
--- a/packages/block-editor/src/store/private-actions.js
+++ b/packages/block-editor/src/store/private-actions.js
@@ -338,3 +338,25 @@ export function setLastFocus( lastFocus = null ) {
 		lastFocus,
 	};
 }
+
+/**
+ * Action that stops temporarily editing as blocks.
+ *
+ * @param {string} clientId The block's clientId.
+ */
+export function stopEditingAsBlocks( clientId ) {
+	return ( { select, dispatch } ) => {
+		const focusModeToRevert =
+			select.__unstableGetTemporarilyEditingFocusModeToRevert();
+		dispatch.__unstableMarkNextChangeAsNotPersistent();
+		dispatch.updateBlockAttributes( clientId, {
+			templateLock: 'contentOnly',
+		} );
+		dispatch.updateBlockListSettings( clientId, {
+			...select.getBlockListSettings( clientId ),
+			templateLock: 'contentOnly',
+		} );
+		dispatch.updateSettings( { focusMode: focusModeToRevert } );
+		dispatch.__unstableSetTemporarilyEditingAsBlocks();
+	};
+}
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
index 11811afd83f6f..fa6c8942e66ad 100644
--- a/packages/block-editor/src/store/reducer.js
+++ b/packages/block-editor/src/store/reducer.js
@@ -1906,6 +1906,21 @@ export function temporarilyEditingAsBlocks( state = '', action ) {
 	return state;
 }
 
+/**
+ * Reducer returning the focus mode that should be used when temporarily edit as blocks finishes.
+ *
+ * @param {Object} state  Current state.
+ * @param {Object} action Dispatched action.
+ *
+ * @return {Object} Updated state.
+ */
+export function temporarilyEditingFocusModeRevert( state = '', action ) {
+	if ( action.type === 'SET_TEMPORARILY_EDITING_AS_BLOCKS' ) {
+		return action.focusModeToRevert;
+	}
+	return state;
+}
+
 /**
  * Reducer returning a map of block client IDs to block editing modes.
  *
@@ -2024,6 +2039,7 @@ const combinedReducers = combineReducers( {
 	highlightedBlock,
 	lastBlockInserted,
 	temporarilyEditingAsBlocks,
+	temporarilyEditingFocusModeRevert,
 	blockVisibility,
 	blockEditingModes,
 	styleOverrides,
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 55d157c6927a2..1cf3705454f9b 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -2767,6 +2767,17 @@ export function __unstableGetTemporarilyEditingAsBlocks( state ) {
 	return state.temporarilyEditingAsBlocks;
 }
 
+/**
+ * DO-NOT-USE in production.
+ * This selector is created for internal/experimental only usage and may be
+ * removed anytime without any warning, causing breakage on any plugin or theme invoking it.
+ *
+ * @param {Object} state Global application state.
+ */
+export function __unstableGetTemporarilyEditingFocusModeToRevert( state ) {
+	return state.temporarilyEditingFocusModeRevert;
+}
+
 export function __unstableHasActiveBlockOverlayActive( state, clientId ) {
 	// Prevent overlay on blocks with a non-default editing mode. If the mdoe is
 	// 'disabled' then the overlay is redundant since the block can't be

From f4e8d485f8e496d2c9aa8eb3fb81f16b92de53ef Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Fri, 12 Jan 2024 17:21:46 +0000
Subject: [PATCH 095/296] Fix: Typo on BlockListBlock comments. (#57814)

---
 packages/block-editor/src/components/block-list/block.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
index c053235c2d0d3..0bfc940865a09 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -482,7 +482,7 @@ BlockListBlock = compose(
 )( BlockListBlock );
 
 // This component provides all the information we need through a single store
-// subscription (useSelect mapping). Only the necesssary props are passed down
+// subscription (useSelect mapping). Only the necessary props are passed down
 // to the BlockListBlock component, which is a filtered component, so these
 // props are public API. To avoid adding to the public API, we use a private
 // context to pass the rest of the information to the filtered BlockListBlock

From 2be3711fef483d764156d0f56780b54591709285 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Fri, 12 Jan 2024 17:25:32 +0000
Subject: [PATCH 096/296] Add: End to end test to content locking stop editing
 as blocks behaviour. (#57812)

---
 .../editor/various/content-only-lock.spec.js  | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/test/e2e/specs/editor/various/content-only-lock.spec.js b/test/e2e/specs/editor/various/content-only-lock.spec.js
index e7d52562636f3..9784aea1ee068 100644
--- a/test/e2e/specs/editor/various/content-only-lock.spec.js
+++ b/test/e2e/specs/editor/various/content-only-lock.spec.js
@@ -76,4 +76,56 @@ test.describe( 'Content-only lock', () => {
 			},
 		] );
 	} );
+
+	test( 'should be able to automatically stop temporarily modify as blocks when an outside block is selected', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Add content only locked block in the code editor
+		await pageUtils.pressKeys( 'secondary+M' ); // Emulates CTRL+Shift+Alt + M => toggle code editor
+
+		await page.getByPlaceholder( 'Start writing with text or HTML' )
+			.fill( `<!-- wp:group {"templateLock":"contentOnly","layout":{"type":"constrained"}} -->
+			<div class="wp-block-group"><!-- wp:paragraph -->
+			<p>Locked block a</p>
+			<!-- /wp:paragraph -->
+			
+			<!-- wp:paragraph -->
+			<p>Locked block b</p>
+			<!-- /wp:paragraph --></div>
+			<!-- /wp:group -->
+			
+			<!-- wp:heading -->
+			<h2 class="wp-block-heading"><strong>outside block</strong></h2>
+			<!-- /wp:heading -->` );
+
+		await pageUtils.pressKeys( 'secondary+M' );
+		// Select the content locked block.
+		await editor.canvas
+			.locator( 'role=document[name="Block: Group"i]' )
+			.click();
+		// Press modify to temporarily edit as blocks.
+		await editor.clickBlockOptionsMenuItem( 'Modify' );
+		// Selected a nest paragraph verify Block is not content locked
+		// Styles can be changed and nested blocks can be removed
+		await editor.canvas
+			.locator( 'role=document[name="Block: Paragraph"i]' )
+			.first()
+			.click();
+		await expect(
+			page.locator( '.color-block-support-panel' )
+		).toBeAttached();
+		await editor.clickBlockOptionsMenuItem( 'Delete' );
+		// Select an outside block
+		await editor.canvas
+			.locator( 'role=document[name="Block: Heading"i]' )
+			.click();
+		// Select a locked nested paragraph block again
+		await pageUtils.pressKeys( 'ArrowUp' );
+		// Block is content locked again simple styles like position can not be changed.
+		await expect(
+			page.locator( '.color-block-support-panel' )
+		).not.toBeAttached();
+	} );
 } );

From 0e48342278e3991f474759e2a537b3ad15d58b37 Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Sat, 13 Jan 2024 01:50:38 +0800
Subject: [PATCH 097/296] Fix flaky create new pattern test (#57747)

---
 test/e2e/specs/site-editor/patterns.spec.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/test/e2e/specs/site-editor/patterns.spec.js b/test/e2e/specs/site-editor/patterns.spec.js
index 79bd8b782ecc4..e4fffe14fcc9a 100644
--- a/test/e2e/specs/site-editor/patterns.spec.js
+++ b/test/e2e/specs/site-editor/patterns.spec.js
@@ -70,9 +70,6 @@ test.describe( 'Patterns', () => {
 			.getByRole( 'textbox', { name: 'Name' } )
 			.fill( 'My pattern' );
 		await page.keyboard.press( 'Enter' );
-		await expect(
-			createPatternDialog.getByRole( 'button', { name: 'Create' } )
-		).toBeDisabled();
 
 		await expect( page ).toHaveTitle( /^My pattern/ );
 		await expect(

From 203ca9e84fb0f5ae73c2495dd33b4555f368ae72 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Fri, 12 Jan 2024 17:22:06 -0300
Subject: [PATCH 098/296] Font Library: disable font library UI using a PHP
 filter (#57818)

* disable font library UI

Co-authored-by: Jeff Ong <5375500+jffng@users.noreply.github.com>

* remove php code no longer used

Co-authored-by: Jeff Ong <5375500+jffng@users.noreply.github.com>

---------

Co-authored-by: Jeff Ong <5375500+jffng@users.noreply.github.com>
---
 lib/load.php                                         |  9 ---------
 .../components/global-styles/screen-typography.js    | 12 +++++++++---
 packages/editor/src/store/defaults.js                |  2 ++
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/lib/load.php b/lib/load.php
index d413334227ee7..8988a05820425 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -185,15 +185,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php';
 } elseif ( ! class_exists( 'WP_Fonts' ) ) {
 
-	// Disables the Font Library.
-	// @core-merge: this should not go to core.
-	add_action(
-		'enqueue_block_editor_assets',
-		function () {
-			wp_add_inline_script( 'wp-block-editor', 'window.__experimentalDisableFontLibrary = true', 'before' );
-		}
-	);
-
 	// Turns off Font Face hooks in Core.
 	// @since 6.4.0.
 	remove_action( 'wp_head', 'wp_print_font_faces', 50 );
diff --git a/packages/edit-site/src/components/global-styles/screen-typography.js b/packages/edit-site/src/components/global-styles/screen-typography.js
index 2a895b68fa717..f76dc6fb38100 100644
--- a/packages/edit-site/src/components/global-styles/screen-typography.js
+++ b/packages/edit-site/src/components/global-styles/screen-typography.js
@@ -3,6 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { __experimentalVStack as VStack } from '@wordpress/components';
+import { store as editorStore } from '@wordpress/editor';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
@@ -12,6 +14,12 @@ import FontFamilies from './font-families';
 import ScreenHeader from './header';
 
 function ScreenTypography() {
+	const fontLibraryEnabled = useSelect(
+		( select ) =>
+			select( editorStore ).getEditorSettings().fontLibraryEnabled,
+		[]
+	);
+
 	return (
 		<>
 			<ScreenHeader
@@ -22,9 +30,7 @@ function ScreenTypography() {
 			/>
 			<div className="edit-site-global-styles-screen-typography">
 				<VStack spacing={ 6 }>
-					{ ! window.__experimentalDisableFontLibrary && (
-						<FontFamilies />
-					) }
+					{ fontLibraryEnabled && <FontFamilies /> }
 					<TypographyElements />
 				</VStack>
 			</div>
diff --git a/packages/editor/src/store/defaults.js b/packages/editor/src/store/defaults.js
index 686888f91de3d..485b65d24d3ad 100644
--- a/packages/editor/src/store/defaults.js
+++ b/packages/editor/src/store/defaults.js
@@ -10,6 +10,7 @@ import { SETTINGS_DEFAULTS } from '@wordpress/block-editor';
  * @property {boolean}       richEditingEnabled    Whether rich editing is enabled or not
  * @property {boolean}       codeEditingEnabled    Whether code editing is enabled or not
  * @property {boolean}       enableCustomFields    Whether the WordPress custom fields are enabled or not.
+ * @property {boolean}       fontLibraryEnabled    Whether the font library is enabled or not.
  *                                                 true  = the user has opted to show the Custom Fields panel at the bottom of the editor.
  *                                                 false = the user has opted to hide the Custom Fields panel at the bottom of the editor.
  *                                                 undefined = the current environment does not support Custom Fields, so the option toggle in Preferences -> Panels to enable the Custom Fields panel is not displayed.
@@ -27,5 +28,6 @@ export const EDITOR_SETTINGS_DEFAULTS = {
 	richEditingEnabled: true,
 	codeEditingEnabled: true,
 	enableCustomFields: undefined,
+	fontLibraryEnabled: true,
 	defaultRenderingMode: 'post-only',
 };

From 22617edda082e73c00d9a0242df7b9df7a5be5f6 Mon Sep 17 00:00:00 2001
From: Rich Tabor <hi@richtabor.com>
Date: Fri, 12 Jan 2024 17:04:43 -0500
Subject: [PATCH 099/296] Remove "blocks" from copy and delete labels (#57769)

---
 .../block-settings-menu/block-settings-dropdown.js       | 9 ++-------
 test/e2e/specs/editor/various/list-view.spec.js          | 2 +-
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
index 4d43865a7f83a..657d685b966e0 100644
--- a/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
+++ b/packages/block-editor/src/components/block-settings-menu/block-settings-dropdown.js
@@ -41,9 +41,7 @@ const POPOVER_PROPS = {
 
 function CopyMenuItem( { blocks, onCopy, label } ) {
 	const ref = useCopyToClipboard( () => serialize( blocks ), onCopy );
-	const copyMenuItemBlocksLabel =
-		blocks.length > 1 ? __( 'Copy blocks' ) : __( 'Copy' );
-	const copyMenuItemLabel = label ? label : copyMenuItemBlocksLabel;
+	const copyMenuItemLabel = label ? label : __( 'Copy' );
 	return <MenuItem ref={ ref }>{ copyMenuItemLabel }</MenuItem>;
 }
 
@@ -202,9 +200,6 @@ export function BlockSettingsDropdown( {
 		getSelectedBlockClientIds,
 	] );
 
-	const removeBlockLabel =
-		count === 1 ? __( 'Delete' ) : __( 'Delete blocks' );
-
 	// This can occur when the selected block (the parent)
 	// displays child blocks within a List View.
 	const parentBlockIsSelected =
@@ -411,7 +406,7 @@ export function BlockSettingsDropdown( {
 										) }
 										shortcut={ shortcuts.remove }
 									>
-										{ removeBlockLabel }
+										{ __( 'Delete' ) }
 									</MenuItem>
 								</MenuGroup>
 							) }
diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index f05b7760c4cc7..674801cf94aba 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -820,7 +820,7 @@ test.describe( 'List View', () => {
 			.click();
 		await page
 			.getByRole( 'menu', { name: 'Options for Heading' } )
-			.getByRole( 'menuitem', { name: 'Delete blocks' } )
+			.getByRole( 'menuitem', { name: 'Delete' } )
 			.click();
 		await expect
 			.poll(

From 1e11103505416b4ca6a366b9afa1dd9962acdf69 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Sat, 13 Jan 2024 20:38:59 +0900
Subject: [PATCH 100/296] ToggleGroupControl: Improve controlled value
 detection (#57770)

* Add tests

* ToggleGroupControl: Improve controlled value detection

* Update changelog

* Improve test descriptions

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>

---------

Co-authored-by: Marco Ciampini <marco.ciampo@gmail.com>
---
 packages/components/CHANGELOG.md              |   1 +
 .../test/__snapshots__/index.tsx.snap         |  12 +-
 .../src/toggle-group-control/test/index.tsx   | 109 ++++++++++++------
 .../toggle-group-control/utils.ts             |  11 +-
 4 files changed, 88 insertions(+), 45 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index acf1ae3dd165a..4152b3c654bab 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -19,6 +19,7 @@
 -   `DuotonePicker`: Remove top margin when no duotone options ([#57489](https://github.com/WordPress/gutenberg/pull/57489)).
 -   `Snackbar`: Fix icon positioning ([#57377](https://github.com/WordPress/gutenberg/pull/57377)).
 -   `GradientPicker`: Use slug while iterating over gradient entries to avoid React "duplicated key" warning ([#57361](https://github.com/WordPress/gutenberg/pull/57361)).
+-   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 -   `NavigatorProvider`: Exclude `size` value from `contain` CSS rule ([#57498](https://github.com/WordPress/gutenberg/pull/57498)).
 
 ### Enhancements
diff --git a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
index 990d8144ff33c..bac30669f1851 100644
--- a/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
+++ b/packages/components/src/toggle-group-control/test/__snapshots__/index.tsx.snap
@@ -240,7 +240,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
         class="components-toggle-group-control emotion-8 emotion-9"
         data-wp-c16t="true"
         data-wp-component="ToggleGroupControl"
-        id="toggle-group-control-as-radio-group-8"
+        id="toggle-group-control-as-radio-group-10"
         role="radiogroup"
       >
         <div
@@ -254,7 +254,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
             data-value="uppercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-8-20"
+            id="toggle-group-control-as-radio-group-10-24"
             role="radio"
             type="button"
             value="uppercase"
@@ -292,7 +292,7 @@ exports[`ToggleGroupControl controlled should render correctly with icons 1`] =
             data-value="lowercase"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-8-21"
+            id="toggle-group-control-as-radio-group-10-25"
             role="radio"
             type="button"
             value="lowercase"
@@ -488,7 +488,7 @@ exports[`ToggleGroupControl controlled should render correctly with text options
         class="components-toggle-group-control emotion-8 emotion-9"
         data-wp-c16t="true"
         data-wp-component="ToggleGroupControl"
-        id="toggle-group-control-as-radio-group-7"
+        id="toggle-group-control-as-radio-group-9"
         role="radiogroup"
       >
         <div
@@ -501,7 +501,7 @@ exports[`ToggleGroupControl controlled should render correctly with text options
             data-value="rigas"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-7-18"
+            id="toggle-group-control-as-radio-group-9-22"
             role="radio"
             type="button"
             value="rigas"
@@ -523,7 +523,7 @@ exports[`ToggleGroupControl controlled should render correctly with text options
             data-value="jack"
             data-wp-c16t="true"
             data-wp-component="ToggleGroupControlOptionBase"
-            id="toggle-group-control-as-radio-group-7-19"
+            id="toggle-group-control-as-radio-group-9-23"
             role="radio"
             type="button"
             value="jack"
diff --git a/packages/components/src/toggle-group-control/test/index.tsx b/packages/components/src/toggle-group-control/test/index.tsx
index 99a2dd8a00421..a8835bc66c58d 100644
--- a/packages/components/src/toggle-group-control/test/index.tsx
+++ b/packages/components/src/toggle-group-control/test/index.tsx
@@ -117,6 +117,22 @@ describe.each( [
 			expect( container ).toMatchSnapshot();
 		} );
 	} );
+	it( 'should render with the correct option initially selected when `value` is defined', () => {
+		render(
+			<Component value="jack" label="Test Toggle Group Control">
+				{ options }
+			</Component>
+		);
+		expect( screen.getByRole( 'radio', { name: 'R' } ) ).not.toBeChecked();
+		expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
+	} );
+	it( 'should render without a selected option when `value` is `undefined`', () => {
+		render(
+			<Component label="Test Toggle Group Control">{ options }</Component>
+		);
+		expect( screen.getByRole( 'radio', { name: 'R' } ) ).not.toBeChecked();
+		expect( screen.getByRole( 'radio', { name: 'J' } ) ).not.toBeChecked();
+	} );
 	it( 'should call onChange with proper value', async () => {
 		const mockOnChange = jest.fn();
 
@@ -193,7 +209,7 @@ describe.each( [
 	} );
 
 	if ( mode === 'controlled' ) {
-		it( 'should reset values correctly', async () => {
+		it( 'should reset values correctly when default value is undefined', async () => {
 			render(
 				<Component label="Test Toggle Group Control">
 					{ options }
@@ -208,56 +224,77 @@ describe.each( [
 			expect( jackOption ).not.toBeChecked();
 			expect( rigasOption ).toBeChecked();
 
-			await press.ArrowRight();
-
-			expect( rigasOption ).not.toBeChecked();
-			expect( jackOption ).toBeChecked();
-
 			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
 
 			expect( rigasOption ).not.toBeChecked();
 			expect( jackOption ).not.toBeChecked();
 		} );
 
-		it( 'should update correctly when triggered by external updates', async () => {
+		it( 'should reset values correctly when default value is defined', async () => {
 			render(
-				<Component
-					value="rigas"
-					label="Test Toggle Group Control"
-					extraButtonOptions={ [
-						{ name: 'Rigas', value: 'rigas' },
-						{ name: 'Jack', value: 'jack' },
-					] }
-				>
+				<Component label="Test Toggle Group Control" value="rigas">
 					{ options }
 				</Component>
 			);
 
-			expect( screen.getByRole( 'radio', { name: 'R' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
-
-			await click( screen.getByRole( 'button', { name: 'Jack' } ) );
-			expect( screen.getByRole( 'radio', { name: 'J' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'R' } )
-			).not.toBeChecked();
+			const rigasOption = screen.getByRole( 'radio', {
+				name: 'R',
+			} );
+			const jackOption = screen.getByRole( 'radio', {
+				name: 'J',
+			} );
 
-			await click( screen.getByRole( 'button', { name: 'Rigas' } ) );
-			expect( screen.getByRole( 'radio', { name: 'R' } ) ).toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
+			expect( rigasOption ).toBeChecked();
+			expect( jackOption ).not.toBeChecked();
 
 			await click( screen.getByRole( 'button', { name: 'Reset' } ) );
-			expect(
-				screen.getByRole( 'radio', { name: 'R' } )
-			).not.toBeChecked();
-			expect(
-				screen.getByRole( 'radio', { name: 'J' } )
-			).not.toBeChecked();
+
+			expect( rigasOption ).not.toBeChecked();
+			expect( jackOption ).not.toBeChecked();
 		} );
+
+		describe.each( [
+			[ 'undefined', undefined ],
+			[ 'defined', 'rigas' ],
+		] )(
+			'should update correctly when triggered by external updates',
+			( defaultValueType, defaultValue ) => {
+				it( `when default value is ${ defaultValueType }`, async () => {
+					render(
+						<Component
+							value={ defaultValue }
+							label="Test Toggle Group Control"
+							extraButtonOptions={ [
+								{ name: 'Rigas', value: 'rigas' },
+								{ name: 'Jack', value: 'jack' },
+							] }
+						>
+							{ options }
+						</Component>
+					);
+
+					await click(
+						screen.getByRole( 'button', { name: 'Jack' } )
+					);
+					expect(
+						screen.getByRole( 'radio', { name: 'J' } )
+					).toBeChecked();
+					expect(
+						screen.getByRole( 'radio', { name: 'R' } )
+					).not.toBeChecked();
+
+					await click(
+						screen.getByRole( 'button', { name: 'Rigas' } )
+					);
+					expect(
+						screen.getByRole( 'radio', { name: 'R' } )
+					).toBeChecked();
+					expect(
+						screen.getByRole( 'radio', { name: 'J' } )
+					).not.toBeChecked();
+				} );
+			}
+		);
 	}
 
 	describe( 'isDeselectable', () => {
diff --git a/packages/components/src/toggle-group-control/toggle-group-control/utils.ts b/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
index 3f6d6e135a0df..fe2b84c5b8123 100644
--- a/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
+++ b/packages/components/src/toggle-group-control/toggle-group-control/utils.ts
@@ -21,16 +21,21 @@ type ValueProp = ToggleGroupControlProps[ 'value' ];
 export function useComputeControlledOrUncontrolledValue(
 	valueProp: ValueProp
 ): { value: ValueProp; defaultValue: ValueProp } {
+	const isInitialRender = useRef( true );
 	const prevValueProp = usePrevious( valueProp );
 	const prevIsControlled = useRef( false );
 
+	useEffect( () => {
+		if ( isInitialRender.current ) {
+			isInitialRender.current = false;
+		}
+	}, [] );
+
 	// Assume the component is being used in controlled mode on the first re-render
 	// that has a different `valueProp` from the previous render.
 	const isControlled =
 		prevIsControlled.current ||
-		( prevValueProp !== undefined &&
-			valueProp !== undefined &&
-			prevValueProp !== valueProp );
+		( ! isInitialRender.current && prevValueProp !== valueProp );
 	useEffect( () => {
 		prevIsControlled.current = isControlled;
 	}, [ isControlled ] );

From 181e3b39d638f9c7f0db05aac2cf1a806cf91bc8 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Sat, 13 Jan 2024 14:19:40 +0000
Subject: [PATCH 101/296] Fix: Link to the nodejs release page. (#57816)

---
 docs/getting-started/devenv/README.md                         | 2 +-
 docs/getting-started/devenv/nodejs-development-environment.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/getting-started/devenv/README.md b/docs/getting-started/devenv/README.md
index 47113c84d78da..b9acda48eab7f 100644
--- a/docs/getting-started/devenv/README.md
+++ b/docs/getting-started/devenv/README.md
@@ -30,7 +30,7 @@ Node.js and its accompanying development tools allow you to:
 
 The list goes on. While modern JavaScript development can be challenging, WordPress provides several tools, like [`wp-scripts`](/docs/getting-started/devenv/get-started-with-wp-scripts.md) and [`create-block`](/docs/getting-started/devenv/get-started-with-create-block.md), that streamline the process and are made possible by Node.js development tools.
 
-**The recommended Node.js version for block development is [Active LTS](https://nodejs.dev/en/about/releases/) (Long Term Support)**. However, there are times when you need to use different versions. A Node.js version manager tool like `nvm` is strongly recommended and allows you to easily change your `node` version when required. You will also need Node Package Manager (`npm`) and the Node Package eXecute (`npx`) to work with some WordPress packages. Both are installed automatically with Node.js.
+**The recommended Node.js version for block development is [Active LTS](https://nodejs.org/en/about/previous-releases) (Long Term Support)**. However, there are times when you need to use different versions. A Node.js version manager tool like `nvm` is strongly recommended and allows you to easily change your `node` version when required. You will also need Node Package Manager (`npm`) and the Node Package eXecute (`npx`) to work with some WordPress packages. Both are installed automatically with Node.js.
 
 To be able to use the Node.js tools and [packages provided by WordPress](https://github.com/WordPress/gutenberg/tree/trunk/packages) for block development, you'll need to set a proper Node.js runtime environment on your machine. To learn more about how to do this, refer to the links below.
 
diff --git a/docs/getting-started/devenv/nodejs-development-environment.md b/docs/getting-started/devenv/nodejs-development-environment.md
index 6e1d3638f5f03..8eb72bd88268d 100644
--- a/docs/getting-started/devenv/nodejs-development-environment.md
+++ b/docs/getting-started/devenv/nodejs-development-environment.md
@@ -22,7 +22,7 @@ curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.5/install.sh | bash
 ```
 
 2. Quit and restart the terminal.
-3. Run `nvm install --lts` in the terminal to install the latest [LTS](https://nodejs.dev/en/about/releases/) (Long Term Support) version of Node.js.
+3. Run `nvm install --lts` in the terminal to install the latest [LTS](https://nodejs.org/en/about/previous-releases) (Long Term Support) version of Node.js.
 4. Run `node -v` and `npm -v` in the terminal to verify the installed `node` and `npm` versions.
 
 If needed, you can also install specific versions of `node`. For example, install version 18 by running `nvm install 18`, and switch between different versions by running `nvm use [version-number]`. See the `nvm` [usage guide](https://github.com/nvm-sh/nvm#usage) for more details.

From e821cc96299c1b4ae83163306ba7db5ebd71407f Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Sat, 13 Jan 2024 19:17:32 +0100
Subject: [PATCH 102/296] Performance: add patterns load test (#57828)

---
 .../config/performance-reporter.ts            |   3 +
 test/performance/fixtures/perf-utils.ts       |   9 +-
 test/performance/specs/post-editor.spec.js    | 173 ++++++++++++++++++
 3 files changed, 181 insertions(+), 4 deletions(-)

diff --git a/test/performance/config/performance-reporter.ts b/test/performance/config/performance-reporter.ts
index 7b1f171230c59..6f9229be866a0 100644
--- a/test/performance/config/performance-reporter.ts
+++ b/test/performance/config/performance-reporter.ts
@@ -32,6 +32,7 @@ export interface WPRawPerformanceResults {
 	inserterOpen: number[];
 	inserterSearch: number[];
 	inserterHover: number[];
+	loadPatterns: number[];
 	listViewOpen: number[];
 	navigate: number[];
 }
@@ -65,6 +66,7 @@ export interface WPPerformanceResults {
 	inserterHover?: number;
 	minInserterHover?: number;
 	maxInserterHover?: number;
+	loadPatterns?: number;
 	listViewOpen?: number;
 	minListViewOpen?: number;
 	maxListViewOpen?: number;
@@ -110,6 +112,7 @@ export function curateResults(
 		inserterHover: average( results.inserterHover ),
 		minInserterHover: minimum( results.inserterHover ),
 		maxInserterHover: maximum( results.inserterHover ),
+		loadPatterns: average( results.loadPatterns ),
 		listViewOpen: average( results.listViewOpen ),
 		minListViewOpen: minimum( results.listViewOpen ),
 		maxListViewOpen: maximum( results.listViewOpen ),
diff --git a/test/performance/fixtures/perf-utils.ts b/test/performance/fixtures/perf-utils.ts
index d17eec2c935b1..83213a59520dd 100644
--- a/test/performance/fixtures/perf-utils.ts
+++ b/test/performance/fixtures/perf-utils.ts
@@ -30,13 +30,14 @@ export class PerfUtils {
 	 * Returns the locator for the editor canvas element. This supports both the
 	 * legacy and the iframed canvas.
 	 *
+	 * @param canvasLocator
 	 * @return Locator for the editor canvas element.
 	 */
-	async getCanvas() {
-		const canvasLocator = this.page.locator(
+	async getCanvas(
+		canvasLocator = this.page.locator(
 			'.wp-block-post-content, iframe[name=editor-canvas]'
-		);
-
+		)
+	) {
 		const isFramed = await canvasLocator.evaluate(
 			( node ) => node.tagName === 'IFRAME'
 		);
diff --git a/test/performance/specs/post-editor.spec.js b/test/performance/specs/post-editor.spec.js
index cf2610baa1f9e..105a4bd9a80ca 100644
--- a/test/performance/specs/post-editor.spec.js
+++ b/test/performance/specs/post-editor.spec.js
@@ -29,6 +29,7 @@ const results = {
 	inserterOpen: [],
 	inserterHover: [],
 	inserterSearch: [],
+	loadPatterns: [],
 };
 
 test.describe( 'Post Editor Performance', () => {
@@ -484,6 +485,178 @@ test.describe( 'Post Editor Performance', () => {
 			}
 		} );
 	} );
+
+	test.describe( 'Loading Patterns', () => {
+		test( 'Run the test', async ( { page, admin, perfUtils } ) => {
+			await admin.createNewPost();
+			await perfUtils.disableAutosave();
+			const globalInserterToggle = page.getByRole( 'button', {
+				name: 'Toggle block inserter',
+			} );
+
+			const testPatterns = [
+				{
+					name: 'core/query-standard-posts',
+					title: 'Standard',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-featured-image {"isLink":true,"align":"wide"} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /-->\n\t\t\t\t\t<!-- wp:separator -->\n\t\t\t\t\t<hr class="wp-block-separator"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-medium-posts',
+					title: 'Image at left',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:columns {"align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide"><!-- wp:column {"width":"66.66%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:66.66%"><!-- wp:post-featured-image {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"33.33%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:33.33%"><!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-small-posts',
+					title: 'Small image and title',
+					content:
+						'<!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center"} -->\n\t\t\t\t\t<div class="wp-block-columns are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"25%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:25%"><!-- wp:post-featured-image {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"75%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:75%"><!-- wp:post-title {"isLink":true} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-grid-posts',
+					title: 'Grid',
+					content:
+						'<!-- wp:query {"query":{"perPage":6,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"flex","columns":3}} -->\n\t\t\t\t\t<div class="wp-block-query">\n\t\t\t\t\t<!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:post-title {"isLink":true} /-->\n\t\t\t\t\t<!-- wp:post-excerpt /-->\n\t\t\t\t\t<!-- wp:post-date /--></div>\n\t\t\t\t\t<!-- /wp:group -->\n\t\t\t\t\t<!-- /wp:post-template -->\n\t\t\t\t\t</div>\n\t\t\t\t\t<!-- /wp:query -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-large-title-posts',
+					title: 'Large title',
+					content:
+						'<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->\n\t\t\t\t\t<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->\n\t\t\t\t\t<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-offset-posts',
+					title: 'Offset',
+					content:
+						'<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->\n\t\t\t\t\t<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/social-links-shared-background-color',
+					title: 'Social links with a shared background color',
+					content:
+						'<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->\n\t\t\t\t\t\t<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"chain"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>\n\t\t\t\t\t\t<!-- /wp:social-links -->',
+					viewportWidth: 500,
+					categories: [ 'test' ],
+					blockTypes: [ 'core/social-links' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-large-title-posts-2',
+					title: 'Large title 2',
+					content:
+						'<!-- wp:group {"align":"full","style":{"spacing":{"padding":{"top":"100px","right":"100px","bottom":"100px","left":"100px"}},"color":{"text":"#ffffff","background":"#000000"}}} -->\n\t\t\t\t\t<div class="wp-block-group alignfull has-text-color has-background" style="background-color:#000000;color:#ffffff;padding-top:100px;padding-right:100px;padding-bottom:100px;padding-left:100px"><!-- wp:query {"query":{"perPage":3,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"","inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:separator {"customColor":"#ffffff","align":"wide","className":"is-style-wide"} -->\n\t\t\t\t\t<hr class="wp-block-separator alignwide has-text-color has-background is-style-wide" style="background-color:#ffffff;color:#ffffff"/>\n\t\t\t\t\t<!-- /wp:separator -->\n\n\t\t\t\t\t<!-- wp:columns {"verticalAlignment":"center","align":"wide"} -->\n\t\t\t\t\t<div class="wp-block-columns alignwide are-vertically-aligned-center"><!-- wp:column {"verticalAlignment":"center","width":"20%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:20%"><!-- wp:post-date {"style":{"color":{"text":"#ffffff"}},"fontSize":"extra-small"} /--></div>\n\t\t\t\t\t<!-- /wp:column -->\n\n\t\t\t\t\t<!-- wp:column {"verticalAlignment":"center","width":"80%"} -->\n\t\t\t\t\t<div class="wp-block-column is-vertically-aligned-center" style="flex-basis:80%"><!-- wp:post-title {"isLink":true,"style":{"typography":{"fontSize":"72px","lineHeight":"1.1"},"color":{"text":"#ffffff","link":"#ffffff"}}} /--></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/query-offset-posts-2',
+					title: 'Offset 2',
+					content:
+						'<!-- wp:group {"style":{"spacing":{"padding":{"top":"30px","right":"30px","bottom":"30px","left":"30px"}}},"layout":{"inherit":false}} -->\n\t\t\t\t\t<div class="wp-block-group" style="padding-top:30px;padding-right:30px;padding-bottom:30px;padding-left:30px"><!-- wp:columns -->\n\t\t\t\t\t<div class="wp-block-columns"><!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":0,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column -->\n\t\t\t\t\t<!-- wp:column {"width":"50%"} -->\n\t\t\t\t\t<div class="wp-block-column" style="flex-basis:50%"><!-- wp:query {"query":{"perPage":2,"pages":0,"offset":2,"postType":"post","order":"desc","orderBy":"date","author":"","search":"","exclude":[],"sticky":"exclude","inherit":false},"displayLayout":{"type":"list"}} -->\n\t\t\t\t\t<div class="wp-block-query"><!-- wp:post-template -->\n\t\t\t\t\t<!-- wp:spacer {"height":200} -->\n\t\t\t\t\t<div style="height:200px" aria-hidden="true" class="wp-block-spacer"></div>\n\t\t\t\t\t<!-- /wp:spacer -->\n\t\t\t\t\t<!-- wp:post-featured-image /-->\n\t\t\t\t\t<!-- wp:post-title /-->\n\t\t\t\t\t<!-- wp:post-date /-->\n\t\t\t\t\t<!-- /wp:post-template --></div>\n\t\t\t\t\t<!-- /wp:query --></div>\n\t\t\t\t\t<!-- /wp:column --></div>\n\t\t\t\t\t<!-- /wp:columns --></div>\n\t\t\t\t\t<!-- /wp:group -->',
+					categories: [ 'test' ],
+					blockTypes: [ 'core/query' ],
+					source: 'core',
+				},
+				{
+					name: 'core/social-links-shared-background-color-2',
+					title: 'Social links with a shared background color 2',
+					content:
+						'<!-- wp:social-links {"customIconColor":"#ffffff","iconColorValue":"#ffffff","customIconBackgroundColor":"#3962e3","iconBackgroundColorValue":"#3962e3","className":"has-icon-color"} -->\n\t\t\t\t\t\t<ul class="wp-block-social-links has-icon-color has-icon-background-color"><!-- wp:social-link {"url":"https://wordpress.org","service":"wordpress"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"chain"} /-->\n\t\t\t\t\t\t<!-- wp:social-link {"url":"#","service":"mail"} /--></ul>\n\t\t\t\t\t\t<!-- /wp:social-links -->',
+					viewportWidth: 500,
+					categories: [ 'test' ],
+					blockTypes: [ 'core/social-links' ],
+					source: 'core',
+				},
+			];
+
+			await page.evaluate( ( _testPatterns ) => {
+				const settings = window.wp.data
+					.select( 'core/editor' )
+					.getEditorSettings();
+				window.wp.data.dispatch( 'core/editor' ).updateEditorSettings( {
+					...settings,
+					__experimentalAdditionalBlockPatternCategories: [
+						...settings.__experimentalAdditionalBlockPatternCategories,
+						{ name: 'test', label: 'Test' },
+					],
+					__experimentalAdditionalBlockPatterns: [
+						...settings.__experimentalAdditionalBlockPatterns,
+						..._testPatterns,
+					],
+				} );
+			}, testPatterns );
+
+			const samples = 10;
+			const throwaway = 1;
+			const iterations = samples + throwaway;
+			for ( let i = 1; i <= iterations; i++ ) {
+				// Wait for the browser to be idle before starting the monitoring.
+				// eslint-disable-next-line no-restricted-syntax
+				await page.waitForTimeout( BROWSER_IDLE_WAIT );
+
+				await globalInserterToggle.click();
+				await perfUtils.expectExpandedState(
+					globalInserterToggle,
+					'true'
+				);
+				await page.getByRole( 'tab', { name: 'Patterns' } ).click();
+
+				const startTime = performance.now();
+
+				await page.getByRole( 'button', { name: 'Test' } ).click();
+
+				await Promise.all(
+					testPatterns.map( async ( pattern ) => {
+						const canvas = await perfUtils.getCanvas(
+							page
+								.getByRole( 'option', {
+									name: pattern.title,
+									exact: true,
+								} )
+								.getByTitle( 'Editor canvas' )
+						);
+
+						// Wait for the first block.
+						await canvas.locator( '.wp-block' ).first().waitFor();
+					} )
+				);
+
+				const endTime = performance.now();
+
+				// Save the results.
+				if ( i > throwaway ) {
+					results.loadPatterns.push( endTime - startTime );
+				}
+
+				// Close Inserter.
+				await globalInserterToggle.click();
+				await perfUtils.expectExpandedState(
+					globalInserterToggle,
+					'false'
+				);
+			}
+		} );
+	} );
 } );
 
 /* eslint-enable playwright/no-conditional-in-test, playwright/expect-expect */

From b90555e9e32f7652d7f8c20a1519904cf45f14ed Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Sun, 14 Jan 2024 07:24:39 -0600
Subject: [PATCH 103/296] Remove the unnecessary TOC and fix grammar/formatting
 in the Patterns doc (#57825)

* Remove the unnecessary TOC and fix grammar/formatting.

* Update docs/reference-guides/block-api/block-patterns.md

Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com>

---------

Co-authored-by: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
---
 .../block-api/block-patterns.md               | 47 +++++++------------
 1 file changed, 17 insertions(+), 30 deletions(-)

diff --git a/docs/reference-guides/block-api/block-patterns.md b/docs/reference-guides/block-api/block-patterns.md
index 87e268a49f6f5..b0096e24791de 100644
--- a/docs/reference-guides/block-api/block-patterns.md
+++ b/docs/reference-guides/block-api/block-patterns.md
@@ -1,18 +1,6 @@
 # Patterns
 
-Block Patterns are predefined block layouts, available from the patterns tab of the block inserter. Once inserted into content, the blocks are ready for additional or modified content and configuration.
-
-In this Document:
-- [Patterns](#patterns)
-	- [Block Patterns](#block-patterns)
-		- [register_block_pattern](#register_block_pattern)
-	- [Unregistering Block Patterns](#unregistering-block-patterns)
-		- [unregister_block_pattern](#unregister_block_pattern)
-	- [Block Pattern Categories](#block-pattern-categories)
-		- [register_block_pattern_category](#register_block_pattern_category)
-		- [unregister_block_pattern_category](#unregister_block_pattern_category)
-	- [Block patterns contextual to block types and pattern transformations](#block-patterns-contextual-to-block-types-and-pattern-transformations)
-	- [Semantic block patterns](#semantic-block-patterns)
+Block Patterns are predefined block layouts available from the patterns tab of the block inserter. Once inserted into content, the blocks are ready for additional or modified content and configuration.
 
 ## Block patterns
 
@@ -33,12 +21,12 @@ The properties available for block patterns are:
 -   `keywords` (optional): An array of aliases or keywords that help users discover the pattern while searching.
 -   `viewportWidth` (optional): An integer specifying the intended width of the pattern to allow for a scaled preview of the pattern in the inserter.
 -   `blockTypes` (optional): An array of block types that the pattern is intended to be used with. Each value needs to be the declared block's `name`.
--   `postTypes` (optional): An array of post types that the pattern is restricted to be used with. The pattern will only be available when editing one of the post types passed on the array, for all the other post types the pattern is not available at all.
--   `templateTypes` (optional): An array of template types where the pattern makes sense e.g: '404' if the pattern is for a 404 page, single-post if the pattern is for showing a single post.
+-   `postTypes` (optional): An array of post types that the pattern is restricted to be used with. The pattern will only be available when editing one of the post types passed on the array. For all the other post types, the pattern is not available at all.
+-   `templateTypes` (optional): An array of template types where the pattern makes sense, for example, `404` if the pattern is for a 404 page, `single-post` if the pattern is for showing a single post.
 -   `inserter` (optional): By default, all patterns will appear in the inserter. To hide a pattern so that it can only be inserted programmatically, set the `inserter` to `false`.
--   `source` (optional): A string that denotes the source of the pattern. For a plugin registering a pattern, pass the string 'plugin'. For a theme, pass the string 'theme'.
+-   `source` (optional): A string that denotes the source of the pattern. For a plugin registering a pattern, pass the string `plugin`. For a theme, pass the string `theme`.
 
-The following code sample registers a block pattern named 'my-plugin/my-awesome-pattern':
+The following code sample registers a block pattern named `my-plugin/my-awesome-pattern`:
 
 ```php
 register_block_pattern(
@@ -51,9 +39,7 @@ register_block_pattern(
 );
 ```
 
-_Note:_
-
-`register_block_pattern()` should be called from a handler attached to the init hook.
+Note that `register_block_pattern()` should be called from a handler attached to the `init` hook.
 
 ```php
 function my_plugin_register_my_patterns() {
@@ -67,10 +53,11 @@ add_action( 'init', 'my_plugin_register_my_patterns' );
 
 ### unregister_block_pattern
 
-The `unregister_block_pattern` helper function allows for a previously registered block pattern to be unregistered from a theme or plugin and receives one argument.
+The `unregister_block_pattern` helper function allows a previously registered block pattern to be unregistered from a theme or plugin and receives one argument.
+
 -   `title`: The name of the block pattern to be unregistered.
 
-The following code sample unregisters the block pattern named 'my-plugin/my-awesome-pattern':
+The following code sample unregisters the block pattern named `my-plugin/my-awesome-pattern`:
 
 ```php
 unregister_block_pattern( 'my-plugin/my-awesome-pattern' );
@@ -95,6 +82,7 @@ Block patterns can be grouped using categories. The block editor comes with bund
 ### register_block_pattern_category
 
 The `register_block_pattern_category` helper function receives two arguments.
+
 -   `title`: A machine-readable title for the block pattern category.
 -	`properties`: An array describing properties of the pattern category.
 
@@ -102,7 +90,7 @@ The properties of the pattern categories include:
 
 -   `label` (required): A human-readable label for the pattern category.
 
-The following code sample registers the category named 'hero':
+The following code sample registers the category named `hero`:
 
 ```php
 register_block_pattern_category(
@@ -127,12 +115,11 @@ add_action( 'init', 'my_plugin_register_my_pattern_categories' );
 
 ### unregister_block_pattern_category
 
-`unregister_block_pattern_category` allows unregistering a pattern category.
-
 The `unregister_block_pattern_category` helper function allows for a previously registered block pattern category to be unregistered from a theme or plugin and receives one argument.
+
 -   `title`: The name of the block pattern category to be unregistered.
 
-The following code sample unregisters the category named 'hero':
+The following code sample unregisters the category named `hero`:
 
 ```php
 unregister_block_pattern_category( 'hero' );
@@ -154,7 +141,7 @@ add_action( 'init', 'my_plugin_unregister_my_pattern_categories' );
 
 It is possible to attach a block pattern to one or more block types. This adds the block pattern as an available transform for that block type.
 
-Currently these transformations are available only to simple blocks (blocks without inner blocks). In order for a pattern to be suggested, **every selected block must be present in the block pattern**.
+Currently, these transformations are available only to simple blocks (blocks without inner blocks). In order for a pattern to be suggested, **every selected block must be present in the block pattern**.
 
 For instance:
 
@@ -171,9 +158,9 @@ register_block_pattern(
 );
 ```
 
-The above code registers a block pattern named 'my-plugin/powered-by-wordpress' and also shows the pattern in the "transform menu" of paragraph blocks. The transformation result will be keeping the paragraph's existing content and also apply the other attributes - in this case the background and text color.
+The above code registers a block pattern named `my-plugin/powered-by-wordpress` and shows the pattern in the "transform menu" of paragraph blocks. The transformation result will keep the paragraph's existing content and apply the other attributes - in this case, the background and text color.
 
-As mentioned above pattern transformations for simple blocks can also work if we have selected multiple blocks and there are matching contextual patterns to these blocks. Let's see an example of a pattern where two block types are attached.
+As mentioned above, pattern transformations for simple blocks can also work if we have selected multiple blocks and there are matching contextual patterns to these blocks. Let's see an example of a pattern where two block types are attached.
 
 ```php
 register_block_pattern(
@@ -194,7 +181,7 @@ register_block_pattern(
 );
 ```
 
-In the above example if we select **one of the two** block types, either a paragraph or a heading block, this pattern will be suggested by transforming the selected block using its content and will also add the remaining blocks from the pattern. If on the other hand we multi select one paragraph and one heading block, both blocks will be transformed.
+In the above example, if we select **one of the two** block types, either a paragraph or a heading block, this pattern will be suggested by transforming the selected block using its content and will also add the remaining blocks from the pattern. If, on the other hand, we multi-select one paragraph and one heading block, both blocks will be transformed.
 
 Blocks can also use these contextual block patterns in other places. For instance, when inserting a new Query Loop block, the user is provided with a list of all patterns attached to the block.
 

From 194d5c1209341ce180f5f7022e01dd49a74f4013 Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Sun, 14 Jan 2024 14:17:16 -0600
Subject: [PATCH 104/296] Add a video demonstration to the Quick Start Guide
 (#57834)

* Add video shortcode.

* Add the correct video markup for YouTube.
---
 docs/getting-started/quick-start-guide.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/getting-started/quick-start-guide.md b/docs/getting-started/quick-start-guide.md
index 736a56c006c9e..75f68e1e6cd49 100644
--- a/docs/getting-started/quick-start-guide.md
+++ b/docs/getting-started/quick-start-guide.md
@@ -1,6 +1,8 @@
 # Quick Start Guide
 
-This guide is designed to demonstrate the basic principles of block development in WordPress using a hands-on approach. Following the steps below, you will create a custom block plugin that uses modern JavaScript (ESNext and JSX) in a matter of minutes. The example block displays the copyright symbol (©) and the current year, the perfect addition to any website's footer.
+This guide is designed to demonstrate the basic principles of block development in WordPress using a hands-on approach. Following the steps below, you will create a custom block plugin that uses modern JavaScript (ESNext and JSX) in a matter of minutes. The example block displays the copyright symbol (©) and the current year, the perfect addition to any website's footer. You can see these steps in action through this short video demonstration.
+
+<div style="position:relative;overflow:hidden;padding-top:56.25%;"><iframe src="https://www.youtube.com/embed/nrut8SfXA44?si=YxvmHmAoYx-BDCog" title="WordPress Block Development: Quick Start Guide Video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="true" style="position:absolute;top:0;left:0;width:100%;max-width:960px;height:100%;max-height:540px;"></iframe></div>
 
 ## Scaffold the block plugin
 

From 5a5da270d5050a154bca21d080d55db1dfd387dc Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Mon, 15 Jan 2024 07:21:45 +0000
Subject: [PATCH 105/296] Update cell vertical alignment (#57804)

---
 packages/dataviews/src/style.scss    | 11 ++++++++-
 packages/dataviews/src/view-table.js | 34 ++++++++++++++++------------
 2 files changed, 30 insertions(+), 15 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 680fcf6a480d4..06997fee49a05 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -168,7 +168,16 @@
 			padding-left: $grid-unit-05;
 		}
 	}
-
+	tbody {
+		td {
+			vertical-align: top;
+		}
+		.dataviews-view-table__cell-content-wrapper {
+			min-height: $grid-unit-40;
+			display: flex;
+			align-items: center;
+		}
+	}
 	.dataviews-view-table-header-button {
 		padding: $grid-unit-05 $grid-unit-10;
 		font-size: 11px;
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index e59c4e001919c..22e68b4f56331 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -536,17 +536,21 @@ function ViewTable( {
 											minWidth: 20,
 										} }
 									>
-										<SingleSelectionCheckbox
-											id={ getItemId( item ) || index }
-											item={ item }
-											selection={ selection }
-											onSelectionChange={
-												onSelectionChange
-											}
-											getItemId={ getItemId }
-											data={ data }
-											primaryField={ primaryField }
-										/>
+										<span className="dataviews-view-table__cell-content-wrapper">
+											<SingleSelectionCheckbox
+												id={
+													getItemId( item ) || index
+												}
+												item={ item }
+												selection={ selection }
+												onSelectionChange={
+													onSelectionChange
+												}
+												getItemId={ getItemId }
+												data={ data }
+												primaryField={ primaryField }
+											/>
+										</span>
 									</td>
 								) }
 								{ visibleFields.map( ( field ) => (
@@ -560,9 +564,11 @@ function ViewTable( {
 												field.maxWidth || undefined,
 										} }
 									>
-										{ field.render( {
-											item,
-										} ) }
+										<span className="dataviews-view-table__cell-content-wrapper">
+											{ field.render( {
+												item,
+											} ) }
+										</span>
 									</td>
 								) ) }
 								{ !! actions?.length && (

From a85fbc492f00ed181925250517edf179ed1530eb Mon Sep 17 00:00:00 2001
From: Sarah Norris <1645628+mikachan@users.noreply.github.com>
Date: Mon, 15 Jan 2024 09:22:15 +0000
Subject: [PATCH 106/296] Font Library Modal: Reset the selected font when
 installing a new font (#57817)

* Reset the selected font when installing a new font

* Use setLibraryFontSelected directly

* Add finally block to installFonts

* Move setLibraryFontSelected to success block

* Set library selected font in installed-fonts useEffect
---
 .../components/global-styles/font-library-modal/context.js   | 5 ++---
 .../global-styles/font-library-modal/installed-fonts.js      | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/context.js b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
index e0749845788d6..364742901bd5f 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/context.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
@@ -213,14 +213,13 @@ function FontLibraryProvider( { children } ) {
 				'settings.typography.fontFamilies',
 			] );
 			refreshLibrary();
-			setIsInstalling( false );
-
 			return response;
 		} catch ( error ) {
-			setIsInstalling( false );
 			return {
 				errors: [ error ],
 			};
+		} finally {
+			setIsInstalling( false );
 		}
 	}
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
index d493a2a297b18..0a9e29892be47 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
@@ -77,6 +77,7 @@ function InstalledFonts() {
 		!! libraryFontSelected && libraryFontSelected?.source !== 'theme';
 
 	useEffect( () => {
+		handleSelectFont( libraryFontSelected );
 		refreshLibrary();
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [] );

From 939c49a70fa5b123c494c22bf507d8a74273cd5b Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 15 Jan 2024 13:56:14 +0400
Subject: [PATCH 107/296] Try: Measing typing with the top toolbar enabled
 (#57709)

---
 .../config/performance-reporter.ts            |  3 ++
 test/performance/specs/post-editor.spec.js    | 34 +++++++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/test/performance/config/performance-reporter.ts b/test/performance/config/performance-reporter.ts
index 6f9229be866a0..e80f75e92eedd 100644
--- a/test/performance/config/performance-reporter.ts
+++ b/test/performance/config/performance-reporter.ts
@@ -27,6 +27,7 @@ export interface WPRawPerformanceResults {
 	firstBlock: number[];
 	type: number[];
 	typeWithoutInspector: number[];
+	typeWithTopToolbar: number[];
 	typeContainer: number[];
 	focus: number[];
 	inserterOpen: number[];
@@ -51,6 +52,7 @@ export interface WPPerformanceResults {
 	minType?: number;
 	maxType?: number;
 	typeWithoutInspector?: number;
+	typeWithTopToolbar?: number;
 	typeContainer?: number;
 	minTypeContainer?: number;
 	maxTypeContainer?: number;
@@ -97,6 +99,7 @@ export function curateResults(
 		minType: minimum( results.type ),
 		maxType: maximum( results.type ),
 		typeWithoutInspector: average( results.typeWithoutInspector ),
+		typeWithTopToolbar: average( results.typeWithTopToolbar ),
 		typeContainer: average( results.typeContainer ),
 		minTypeContainer: minimum( results.typeContainer ),
 		maxTypeContainer: maximum( results.typeContainer ),
diff --git a/test/performance/specs/post-editor.spec.js b/test/performance/specs/post-editor.spec.js
index 105a4bd9a80ca..e720396afe5da 100644
--- a/test/performance/specs/post-editor.spec.js
+++ b/test/performance/specs/post-editor.spec.js
@@ -23,6 +23,7 @@ const results = {
 	firstBlock: [],
 	type: [],
 	typeWithoutInspector: [],
+	typeWithTopToolbar: [],
 	typeContainer: [],
 	focus: [],
 	listViewOpen: [],
@@ -186,6 +187,39 @@ test.describe( 'Post Editor Performance', () => {
 		} );
 	} );
 
+	test.describe( 'Typing (with top toolbar)', () => {
+		let draftId = null;
+
+		test( 'Setup the test post', async ( { admin, perfUtils, editor } ) => {
+			await admin.createNewPost();
+			await perfUtils.loadBlocksForLargePost();
+			await editor.insertBlock( { name: 'core/paragraph' } );
+			draftId = await perfUtils.saveDraft();
+		} );
+
+		test( 'Run the test', async ( {
+			admin,
+			perfUtils,
+			metrics,
+			editor,
+		} ) => {
+			await admin.editPost( draftId );
+			await perfUtils.disableAutosave();
+			// Enable fixed toolbar.
+			await editor.setIsFixedToolbar( true );
+			const canvas = await perfUtils.getCanvas();
+
+			const paragraph = canvas.getByRole( 'document', {
+				name: /Empty block/i,
+			} );
+
+			await type( paragraph, metrics, 'typeWithTopToolbar' );
+
+			// Disabled fixed toolbar. Default state.
+			await editor.setIsFixedToolbar( false );
+		} );
+	} );
+
 	test.describe( 'Typing within containers', () => {
 		let draftId = null;
 

From c3d72183a694391a9042417534fff1cfbc5867c2 Mon Sep 17 00:00:00 2001
From: Akira Tachibana <atachibana@unofficialtokyo.com>
Date: Mon, 15 Jan 2024 21:06:09 +0900
Subject: [PATCH 108/296] Remove unused argument from sprintf in pagination.js
 (#57823)

* Remove unused argument from sprintf

* Fix for the lint error
---
 packages/dataviews/src/pagination.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/packages/dataviews/src/pagination.js b/packages/dataviews/src/pagination.js
index 2c9cade42d89b..f69d7c7a12e19 100644
--- a/packages/dataviews/src/pagination.js
+++ b/packages/dataviews/src/pagination.js
@@ -30,12 +30,8 @@ const Pagination = memo( function Pagination( {
 				<HStack justify="flex-start" expanded={ false } spacing={ 2 }>
 					{ createInterpolateElement(
 						sprintf(
-							// translators: %1$s: Current page number, %2$s: Total number of pages.
-							_x(
-								'Page <CurrenPageControl /> of %2$s',
-								'paging'
-							),
-							view.page,
+							// translators: %s: Total number of pages.
+							_x( 'Page <CurrenPageControl /> of %s', 'paging' ),
 							totalPages
 						),
 						{

From 075fe63a9e048d8bacabe68cf68d6bea52713cc5 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Mon, 15 Jan 2024 21:40:25 +0900
Subject: [PATCH 109/296] Video Block: add raw transformation from video html
 (#47159)

---
 .../block-library/src/video/transforms.js     | 32 +++++++++++++++++++
 .../api/raw-handling/test/paste-handler.js    | 27 ++++++++++++++++
 packages/dom/src/phrasing-content.js          |  1 +
 3 files changed, 60 insertions(+)

diff --git a/packages/block-library/src/video/transforms.js b/packages/block-library/src/video/transforms.js
index 246032422d643..6ec1f9096fa86 100644
--- a/packages/block-library/src/video/transforms.js
+++ b/packages/block-library/src/video/transforms.js
@@ -63,6 +63,38 @@ const transforms = {
 				},
 			},
 		},
+		{
+			type: 'raw',
+			isMatch: ( node ) =>
+				node.nodeName === 'P' &&
+				node.children.length === 1 &&
+				node.firstChild.nodeName === 'VIDEO',
+			transform: ( node ) => {
+				const videoElement = node.firstChild;
+				const attributes = {
+					autoplay: videoElement.hasAttribute( 'autoplay' )
+						? true
+						: undefined,
+					controls: videoElement.hasAttribute( 'controls' )
+						? undefined
+						: false,
+					loop: videoElement.hasAttribute( 'loop' )
+						? true
+						: undefined,
+					muted: videoElement.hasAttribute( 'muted' )
+						? true
+						: undefined,
+					preload:
+						videoElement.getAttribute( 'preload' ) || undefined,
+					playsInline: videoElement.hasAttribute( 'playsinline' )
+						? true
+						: undefined,
+					poster: videoElement.getAttribute( 'poster' ) || undefined,
+					src: videoElement.getAttribute( 'src' ) || undefined,
+				};
+				return createBlock( 'core/video', attributes );
+			},
+		},
 	],
 };
 
diff --git a/packages/blocks/src/api/raw-handling/test/paste-handler.js b/packages/blocks/src/api/raw-handling/test/paste-handler.js
index 9b3dad39a0a5b..ffd98fd4dadab 100644
--- a/packages/blocks/src/api/raw-handling/test/paste-handler.js
+++ b/packages/blocks/src/api/raw-handling/test/paste-handler.js
@@ -6,6 +6,7 @@ import { pasteHandler } from '@wordpress/blocks';
  * Internal dependencies
  */
 import { init as initAndRegisterTableBlock } from '../../../../../block-library/src/table';
+import { init as initAndRegisterVideoBlock } from '../../../../../block-library/src/video';
 
 const tableWithHeaderFooterAndBodyUsingColspan = `
 <table>
@@ -63,6 +64,7 @@ const tableWithHeaderFooterAndBodyUsingRowspan = `
 describe( 'pasteHandler', () => {
 	beforeAll( () => {
 		initAndRegisterTableBlock();
+		initAndRegisterVideoBlock();
 	} );
 
 	it( 'can handle a table with thead, tbody and tfoot using colspan', () => {
@@ -153,4 +155,29 @@ describe( 'pasteHandler', () => {
 		expect( result.name ).toEqual( 'core/table' );
 		expect( result.isValid ).toBeTruthy();
 	} );
+
+	it( 'can handle a video', () => {
+		const [ result ] = pasteHandler( {
+			HTML: '<video controls src="https://example.com/media.mp4" autoplay loop muted controls playsinline preload="auto" poster="https://example.com/media.jpg"></video>',
+			tagName: 'p',
+			preserveWhiteSpace: false,
+		} );
+
+		expect( console ).toHaveLogged();
+
+		delete result.attributes.caption;
+		expect( result.attributes ).toEqual( {
+			autoplay: true,
+			loop: true,
+			muted: true,
+			controls: true,
+			playsInline: true,
+			preload: 'auto',
+			poster: 'https://example.com/media.jpg',
+			src: 'https://example.com/media.mp4',
+			tracks: [],
+		} );
+		expect( result.name ).toEqual( 'core/video' );
+		expect( result.isValid ).toBeTruthy();
+	} );
 } );
diff --git a/packages/dom/src/phrasing-content.js b/packages/dom/src/phrasing-content.js
index 571d081c2843a..c9ed098162974 100644
--- a/packages/dom/src/phrasing-content.js
+++ b/packages/dom/src/phrasing-content.js
@@ -114,6 +114,7 @@ const embeddedContentSchema = {
 			'src',
 			'poster',
 			'preload',
+			'playsinline',
 			'autoplay',
 			'mediagroup',
 			'loop',

From 32a73d12571b1b3cabbd13391134317428f6df2d Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 15 Jan 2024 16:56:49 +0400
Subject: [PATCH 110/296] Editor: Use hooks instead of HoCs in
 'PostScheduleCheck' (#57833)

---
 .../src/components/post-schedule/check.js     | 24 ++++++--------
 .../components/post-schedule/test/check.js    | 33 ++++++++++++++-----
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/packages/editor/src/components/post-schedule/check.js b/packages/editor/src/components/post-schedule/check.js
index 050e5a82e8c45..716d75efc9d40 100644
--- a/packages/editor/src/components/post-schedule/check.js
+++ b/packages/editor/src/components/post-schedule/check.js
@@ -1,29 +1,25 @@
 /**
  * WordPress dependencies
  */
-import { compose } from '@wordpress/compose';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 
 /**
  * Internal dependencies
  */
 import { store as editorStore } from '../../store';
 
-export function PostScheduleCheck( { hasPublishAction, children } ) {
+export default function PostScheduleCheck( { children } ) {
+	const hasPublishAction = useSelect( ( select ) => {
+		return (
+			select( editorStore ).getCurrentPost()._links?.[
+				'wp:action-publish'
+			] ?? false
+		);
+	}, [] );
+
 	if ( ! hasPublishAction ) {
 		return null;
 	}
 
 	return children;
 }
-
-export default compose( [
-	withSelect( ( select ) => {
-		const { getCurrentPost, getCurrentPostType } = select( editorStore );
-		return {
-			hasPublishAction:
-				getCurrentPost()._links?.[ 'wp:action-publish' ] ?? false,
-			postType: getCurrentPostType(),
-		};
-	} ),
-] )( PostScheduleCheck );
diff --git a/packages/editor/src/components/post-schedule/test/check.js b/packages/editor/src/components/post-schedule/test/check.js
index 26fc0193ece8d..b892842e3ef8d 100644
--- a/packages/editor/src/components/post-schedule/test/check.js
+++ b/packages/editor/src/components/post-schedule/test/check.js
@@ -3,25 +3,40 @@
  */
 import { render, screen } from '@testing-library/react';
 
+/**
+ * WordPress dependencies
+ */
+import { useSelect } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
-import { PostScheduleCheck } from '../check';
+import PostScheduleCheck from '../check';
+
+jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
+
+function setupMockSelect( hasPublishAction ) {
+	useSelect.mockImplementation( ( mapSelect ) => {
+		return mapSelect( () => ( {
+			getCurrentPost: () => ( {
+				_links: {
+					'wp:action-publish': hasPublishAction,
+				},
+			} ),
+		} ) );
+	} );
+}
 
 describe( 'PostScheduleCheck', () => {
 	it( "should not render anything if the user doesn't have the right capabilities", () => {
-		render(
-			<PostScheduleCheck hasPublishAction={ false }>
-				yes
-			</PostScheduleCheck>
-		);
+		setupMockSelect( false );
+		render( <PostScheduleCheck>yes</PostScheduleCheck> );
 		expect( screen.queryByText( 'yes' ) ).not.toBeInTheDocument();
 	} );
 
 	it( 'should render if the user has the correct capability', () => {
-		render(
-			<PostScheduleCheck hasPublishAction={ true }>yes</PostScheduleCheck>
-		);
+		setupMockSelect( true );
+		render( <PostScheduleCheck>yes</PostScheduleCheck> );
 		expect( screen.getByText( 'yes' ) ).toBeVisible();
 	} );
 } );

From cb71ab814aef59970f480888a691fd21a9d552bd Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 15 Jan 2024 17:01:12 +0400
Subject: [PATCH 111/296] Migrate 'block grouping' e2e tests to Playwright
 (#57684)

* Migrate 'block grouping' e2e tests to Playwright

* Remove old test files

* fix typo

Co-authored-by: Bart Kalisz <bartlomiej.kalisz@gmail.com>
---
 .../__snapshots__/block-grouping.test.js.snap | 115 -----
 .../editor/various/block-grouping.test.js     | 283 -----------
 .../editor/various/block-grouping.spec.js     | 462 ++++++++++++++++++
 3 files changed, 462 insertions(+), 398 deletions(-)
 delete mode 100644 packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap
 delete mode 100644 packages/e2e-tests/specs/editor/various/block-grouping.test.js
 create mode 100644 test/e2e/specs/editor/various/block-grouping.spec.js

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap
deleted file mode 100644
index 5ffca68763f42..0000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/block-grouping.test.js.snap
+++ /dev/null
@@ -1,115 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of different types via block transforms 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of the same type via block transforms 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation creates a group from multiple blocks of the same type via options toolbar 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation groups and ungroups multiple blocks of different types via options toolbar 1`] = `
-"<!-- wp:group {"layout":{"type":"constrained"}} -->
-<div class="wp-block-group"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Group creation groups and ungroups multiple blocks of different types via options toolbar 2`] = `
-"<!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image -->
-<figure class="wp-block-image"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Block Grouping Preserving selected blocks attributes preserves width alignment settings of selected blocks 1`] = `
-"<!-- wp:group {"align":"full","layout":{"type":"constrained"}} -->
-<div class="wp-block-group alignfull"><!-- wp:heading -->
-<h2 class="wp-block-heading">Group Heading</h2>
-<!-- /wp:heading -->
-
-<!-- wp:image {"align":"full"} -->
-<figure class="wp-block-image alignfull"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:image {"align":"wide"} -->
-<figure class="wp-block-image alignwide"><img alt=""/></figure>
-<!-- /wp:image -->
-
-<!-- wp:paragraph -->
-<p>Some paragraph</p>
-<!-- /wp:paragraph --></div>
-<!-- /wp:group -->"
-`;
-
-exports[`Block Grouping Registering alternative Blocks to handle Grouping interactions should use registered grouping block for grouping interactions 1`] = `
-"<!-- wp:test/alternative-group-block -->
-<!-- wp:paragraph -->
-<p>First Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Second Paragraph</p>
-<!-- /wp:paragraph -->
-
-<!-- wp:paragraph -->
-<p>Third Paragraph</p>
-<!-- /wp:paragraph -->
-<!-- /wp:test/alternative-group-block -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/block-grouping.test.js b/packages/e2e-tests/specs/editor/various/block-grouping.test.js
deleted file mode 100644
index f67273a550d1c..0000000000000
--- a/packages/e2e-tests/specs/editor/various/block-grouping.test.js
+++ /dev/null
@@ -1,283 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	insertBlock,
-	createNewPost,
-	clickBlockToolbarButton,
-	clickMenuItem,
-	pressKeyWithModifier,
-	getEditedPostContent,
-	transformBlockTo,
-	getAllBlocks,
-	getAvailableBlockTransforms,
-	activatePlugin,
-	deactivatePlugin,
-	createReusableBlock,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-async function insertBlocksOfSameType() {
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'First Paragraph' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Second Paragraph' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Third Paragraph' );
-}
-
-async function insertBlocksOfMultipleTypes() {
-	await insertBlock( 'Heading' );
-	await page.keyboard.type( 'Group Heading' );
-
-	await insertBlock( 'Image' );
-
-	await insertBlock( 'Paragraph' );
-	await page.keyboard.type( 'Some paragraph' );
-}
-
-describe( 'Block Grouping', () => {
-	beforeEach( async () => {
-		// Posts are auto-removed at the end of each test run.
-		await createNewPost();
-	} );
-
-	describe( 'Group creation', () => {
-		it( 'creates a group from multiple blocks of the same type via block transforms', async () => {
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'creates a group from multiple blocks of different types via block transforms', async () => {
-			// Creating test blocks.
-			await insertBlocksOfMultipleTypes();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'creates a group from multiple blocks of the same type via options toolbar', async () => {
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'groups and ungroups multiple blocks of different types via options toolbar', async () => {
-			// Creating test blocks.
-			await insertBlocksOfMultipleTypes();
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			// Group.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-
-			// UnGroup.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Ungroup' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-
-		it( 'does not allow ungrouping a group block that has no children', async () => {
-			await insertBlock( 'Group' );
-			await clickBlockToolbarButton( 'Options' );
-			const ungroupButtons = await page.$x(
-				'//button/span[text()="Ungroup"]'
-			);
-			expect( ungroupButtons ).toHaveLength( 0 );
-		} );
-		it( 'should group and ungroup a controlled block properly', async () => {
-			const getParagraphText = async () => {
-				const paragraphInReusableSelector =
-					'.block-editor-block-list__block[data-type="core/block"] p';
-				await canvas().waitForSelector( paragraphInReusableSelector );
-				return canvas().$eval(
-					paragraphInReusableSelector,
-					( element ) => element.innerText
-				);
-			};
-
-			const paragraphText = 'hi';
-			await createReusableBlock( paragraphText, 'Block' );
-			// Group
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			let group = await canvas().$$( '[data-type="core/group"]' );
-			expect( group ).toHaveLength( 1 );
-			// Make sure the paragraph in reusable block exists.
-			expect( await getParagraphText() ).toMatch( paragraphText );
-
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Ungroup' );
-			group = await canvas().$$( '[data-type="core/group"]' );
-			expect( group ).toHaveLength( 0 );
-			// Make sure the paragraph in reusable block exists.
-			expect( await getParagraphText() ).toEqual( paragraphText );
-		} );
-		it( 'should group another Group block via options toolbar', async () => {
-			await insertBlock( 'Paragraph' );
-			await page.keyboard.type( '1' );
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-			expect( await getEditedPostContent() ).toMatchInlineSnapshot( `
-			"<!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group"><!-- wp:group {"layout":{"type":"constrained"}} -->
-			<div class="wp-block-group"><!-- wp:paragraph -->
-			<p>1</p>
-			<!-- /wp:paragraph --></div>
-			<!-- /wp:group --></div>
-			<!-- /wp:group -->"
-		` );
-		} );
-	} );
-
-	describe( 'Grouping Block availability', () => {
-		beforeEach( async () => {
-			// Disable the Group block.
-			await page.evaluate( () => {
-				const { dispatch } = wp.data;
-				dispatch( 'core/edit-post' ).hideBlockTypes( [ 'core/group' ] );
-			} );
-
-			// Create a Group.
-			await insertBlocksOfMultipleTypes();
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-		} );
-
-		afterAll( async () => {
-			// Re-enable the Group block.
-			await page.evaluate( () => {
-				const { dispatch } = wp.data;
-				dispatch( 'core/edit-post' ).showBlockTypes( [ 'core/group' ] );
-			} );
-		} );
-
-		it( 'does not show group transform if Grouping block is disabled', async () => {
-			const availableTransforms = await getAvailableBlockTransforms();
-
-			expect( availableTransforms ).not.toContain( 'Group' );
-		} );
-
-		it( 'does not show group option in the options toolbar if Grouping block is disabled', async () => {
-			await clickBlockToolbarButton( 'Options' );
-
-			const blockOptionsDropdownHTML = await page.evaluate(
-				() =>
-					document.querySelector(
-						'.block-editor-block-settings-menu__popover'
-					).innerHTML
-			);
-
-			expect( blockOptionsDropdownHTML ).not.toContain( 'Group' );
-		} );
-	} );
-
-	describe( 'Preserving selected blocks attributes', () => {
-		it( 'preserves width alignment settings of selected blocks', async () => {
-			await insertBlock( 'Heading' );
-			await page.keyboard.type( 'Group Heading' );
-
-			// Full width image.
-			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Align' );
-			const fullButton = await page.waitForXPath(
-				`//button[contains(@class,'components-dropdown-menu__menu-item')]//span[contains(text(), 'Full width')]`
-			);
-			await fullButton.evaluate( ( element ) =>
-				element.scrollIntoView()
-			);
-			await fullButton.click();
-
-			// Wide width image.
-			await insertBlock( 'Image' );
-			await clickBlockToolbarButton( 'Align' );
-			const wideButton = await page.waitForXPath(
-				`//button[contains(@class,'components-dropdown-menu__menu-item')]//span[contains(text(), 'Wide width')]`
-			);
-			await wideButton.evaluate( ( element ) =>
-				element.scrollIntoView()
-			);
-			await wideButton.click();
-
-			await insertBlock( 'Paragraph' );
-			await page.keyboard.type( 'Some paragraph' );
-
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			await transformBlockTo( 'Group' );
-
-			const allBlocks = await getAllBlocks();
-
-			// We expect Group block align setting to match that
-			// of the widest of it's "child" innerBlocks
-			expect( allBlocks[ 0 ].attributes.align ).toBe( 'full' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-	} );
-
-	describe( 'Registering alternative Blocks to handle Grouping interactions', () => {
-		beforeAll( async () => {
-			await activatePlugin( 'gutenberg-test-custom-grouping-block' );
-		} );
-
-		afterAll( async () => {
-			await deactivatePlugin( 'gutenberg-test-custom-grouping-block' );
-		} );
-
-		it( 'should use registered grouping block for grouping interactions', async () => {
-			// Set custom Block as the Block to use for Grouping.
-			await page.evaluate( () => {
-				window.wp.blocks.setGroupingBlockName(
-					'test/alternative-group-block'
-				);
-			} );
-
-			// Creating test blocks.
-			await insertBlocksOfSameType();
-
-			// Multiselect via keyboard.
-			await pressKeyWithModifier( 'primary', 'a' );
-			await pressKeyWithModifier( 'primary', 'a' );
-
-			// Group - this will use whichever Block is registered as the Grouping Block
-			// as opposed to "transformTo()" which uses whatever is passed to it. To
-			// ensure this test is meaningful we must rely on what is registered.
-			await clickBlockToolbarButton( 'Options' );
-			await clickMenuItem( 'Group' );
-
-			expect( await getEditedPostContent() ).toMatchSnapshot();
-		} );
-	} );
-} );
diff --git a/test/e2e/specs/editor/various/block-grouping.spec.js b/test/e2e/specs/editor/various/block-grouping.spec.js
new file mode 100644
index 0000000000000..ec09edc4160d0
--- /dev/null
+++ b/test/e2e/specs/editor/various/block-grouping.spec.js
@@ -0,0 +1,462 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@playwright/test').Page} Page */
+/** @typedef {import('@wordpress/e2e-test-utils-playwright').Editor} Editor */
+
+test.use( {
+	groupingUtils: async ( { page, editor }, use ) => {
+		await use( new GroupingUtils( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Block Grouping', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test.describe( 'Group creation', () => {
+		test( 'creates a group from multiple blocks of the same type via block transforms', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfSameType();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+			await page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Group' } )
+				.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'creates a group from multiple blocks of different types via block transforms', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfMultipleTypes();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+			await page
+				.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+				.getByRole( 'menuitem', { name: 'Group' } )
+				.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/heading',
+							attributes: { content: 'Group Heading', level: 2 },
+						},
+						{
+							name: 'core/image',
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Some paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'creates a group from multiple blocks of the same type via options toolbar', async ( {
+			editor,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfSameType();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+
+		test( 'groups and ungroups multiple blocks of different types via options toolbar', async ( {
+			editor,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			await groupingUtils.insertBlocksOfMultipleTypes();
+
+			// Multiselect via keyboard.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/heading',
+							attributes: { content: 'Group Heading', level: 2 },
+						},
+						{
+							name: 'core/image',
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Some paragraph' },
+						},
+					],
+				},
+			] );
+
+			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/heading',
+					attributes: { content: 'Group Heading', level: 2 },
+				},
+				{
+					name: 'core/image',
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: 'Some paragraph' },
+				},
+			] );
+		} );
+
+		test( 'does not allow ungrouping a group block that has no children', async ( {
+			editor,
+			page,
+		} ) => {
+			await editor.insertBlock( { name: 'core/group' } );
+			await editor.clickBlockToolbarButton( 'Options' );
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Options' } )
+					.getByRole( 'menuitem', { name: 'Ungroup' } )
+			).toBeHidden();
+		} );
+
+		test( 'should group and ungroup a controlled block properly', async ( {
+			editor,
+			requestUtils,
+		} ) => {
+			const { id: ref } = await requestUtils.createBlock( {
+				title: 'Block',
+				status: 'publish',
+				content: `<!-- wp:paragraph -->\n<p>Hey!</p>\n<!-- /wp:paragraph -->`,
+				wp_pattern_category: [],
+			} );
+
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref },
+			} );
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Block: Group',
+				} )
+			).toContainText( 'Hey!' );
+
+			await editor.clickBlockOptionsMenuItem( 'Ungroup' );
+			await expect(
+				editor.canvas.getByRole( 'document', {
+					name: 'Block: Pattern',
+				} )
+			).toContainText( 'Hey!' );
+		} );
+
+		test( 'should group another Group block via options toolbar', async ( {
+			page,
+			editor,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: { content: '1' },
+			} );
+
+			const group = page
+				.getByRole( 'menu', { name: 'Options' } )
+				.getByRole( 'menuitem', { name: 'Group', exact: true } );
+
+			await editor.clickBlockToolbarButton( 'Options' );
+			await group.click();
+			await editor.clickBlockToolbarButton( 'Options' );
+			await group.click();
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/group',
+					innerBlocks: [
+						{
+							name: 'core/group',
+							innerBlocks: [
+								{
+									name: 'core/paragraph',
+									attributes: { content: '1' },
+								},
+							],
+						},
+					],
+				},
+			] );
+		} );
+	} );
+
+	test.describe( 'Grouping Block availability', () => {
+		test.beforeEach( async ( { page, pageUtils, groupingUtils } ) => {
+			// Disable the Group block.
+			await page.evaluate( () => {
+				window.wp.data
+					.dispatch( 'core/edit-post' )
+					.hideBlockTypes( [ 'core/group' ] );
+			} );
+
+			await groupingUtils.insertBlocksOfMultipleTypes();
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+		} );
+
+		test.afterEach( async ( { page } ) => {
+			// Re-enable the Group block.
+			await page.evaluate( () => {
+				window.wp.data
+					.dispatch( 'core/edit-post' )
+					.showBlockTypes( [ 'core/group' ] );
+			} );
+		} );
+
+		test( 'does not show group transform if Grouping block is disabled', async ( {
+			page,
+		} ) => {
+			await page
+				.getByRole( 'toolbar', { name: 'Block tools' } )
+				.getByRole( 'button', { name: 'Multiple blocks selected' } )
+				.click();
+
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Multiple blocks selected' } )
+					.getByRole( 'menuitem', { name: 'Group' } )
+			).toBeHidden();
+		} );
+
+		test( 'does not show group option in the options toolbar if Grouping block is disabled', async ( {
+			page,
+			editor,
+		} ) => {
+			await editor.clickBlockToolbarButton( 'Options' );
+
+			await expect(
+				page
+					.getByRole( 'menu', { name: 'Options' } )
+					.getByRole( 'menuitem', { name: 'Group' } )
+			).toBeHidden();
+		} );
+	} );
+
+	test.describe( 'Preserving selected blocks attributes', () => {
+		test( 'preserves width alignment settings of selected blocks', async ( {
+			editor,
+			page,
+			pageUtils,
+		} ) => {
+			await editor.insertBlock( {
+				name: 'core/heading',
+				attributes: { content: 'Heading', level: 2 },
+			} );
+			const alignOptions = page.getByRole( 'menu', { name: 'Align' } );
+
+			// Full width image.
+			await editor.insertBlock( { name: 'core/image' } );
+			await editor.clickBlockToolbarButton( 'Align' );
+			await alignOptions
+				.getByRole( 'menuitemradio', { name: 'Full width' } )
+				.click();
+
+			// Wide width image.
+			await editor.insertBlock( { name: 'core/image' } );
+			await editor.clickBlockToolbarButton( 'Align' );
+			await alignOptions
+				.getByRole( 'menuitemradio', {
+					name: 'Wide width',
+				} )
+				.click();
+
+			await editor.insertBlock( {
+				name: 'core/paragraph',
+				attributes: { content: 'Some paragraph' },
+			} );
+
+			// Select everythinga and group.
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+			await editor.transformBlockTo( 'core/group' );
+
+			// We expect Group block align setting to match that
+			// of the widest of it's "child" innerBlocks
+			await editor.clickBlockToolbarButton( 'Align' );
+			await expect(
+				alignOptions.getByRole( 'menuitemradio', { checked: true } )
+			).toHaveText( 'Full width' );
+		} );
+	} );
+
+	test.describe( 'Registering alternative Blocks to handle Grouping interactions', () => {
+		test.beforeAll( async ( { requestUtils } ) => {
+			await requestUtils.activatePlugin(
+				'gutenberg-test-custom-grouping-block'
+			);
+		} );
+
+		test.afterAll( async ( { requestUtils } ) => {
+			await requestUtils.deactivatePlugin(
+				'gutenberg-test-custom-grouping-block'
+			);
+		} );
+
+		test( 'should use registered grouping block for grouping interactions', async ( {
+			editor,
+			page,
+			pageUtils,
+			groupingUtils,
+		} ) => {
+			// Set custom Block as the Block to use for Grouping.
+			await page.evaluate( () => {
+				window.wp.blocks.setGroupingBlockName(
+					'test/alternative-group-block'
+				);
+			} );
+
+			await groupingUtils.insertBlocksOfSameType();
+			await pageUtils.pressKeys( 'primary+a', { times: 2 } );
+
+			// Group - this will use whichever Block is registered as the Grouping Block
+			// as opposed to "transformTo()" which uses whatever is passed to it. To
+			// ensure this test is meaningful we must rely on what is registered.
+			await editor.clickBlockOptionsMenuItem( 'Group' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'test/alternative-group-block',
+					innerBlocks: [
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'First Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Second Paragraph' },
+						},
+						{
+							name: 'core/paragraph',
+							attributes: { content: 'Third Paragraph' },
+						},
+					],
+				},
+			] );
+		} );
+	} );
+} );
+
+class GroupingUtils {
+	/** @type {import('@playwright/test').Page} */
+	#page;
+	/** @type {Editor} */
+	#editor;
+
+	constructor( { page, editor } ) {
+		this.#page = page;
+		this.#editor = editor;
+	}
+
+	async insertBlocksOfSameType() {
+		await test.step(
+			'insert blocks of the same type',
+			async () => {
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'First Paragraph' },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Second Paragraph' },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Third Paragraph' },
+				} );
+			},
+			{ box: true }
+		);
+	}
+
+	async insertBlocksOfMultipleTypes() {
+		await test.step(
+			'insert blocks of multiple types',
+			async () => {
+				await this.#editor.insertBlock( {
+					name: 'core/heading',
+					attributes: { content: 'Group Heading', level: 2 },
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/image',
+				} );
+				await this.#editor.insertBlock( {
+					name: 'core/paragraph',
+					attributes: { content: 'Some paragraph' },
+				} );
+			},
+			{ box: true }
+		);
+	}
+}

From 4782f6488060e70ed819d0ca25d02a80a60cb67a Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Mon, 15 Jan 2024 14:44:16 +0100
Subject: [PATCH 112/296] Interactivity API: add `wp-run` directive and
 `useInit` & `useWatch` hooks (#57805)

* Implement tests for wp-run

* Implement wp-run

* Rename useSignalEffect to useWatch and add useInit

* Export useLayoutEffect

* Expose cloneElement

* Pass the scope to useWatch and useInit

* Add tests for hooks inside wp-run

* Document useWatch and useInit

* Update changelog

* Always reset scope inside `withScope`

* Expose scoped versions of preact hooks

* Add docs for `wp-run`

* Removed `runs` from `wp-run` store

* Improve `wp-init` documentation

* Expose `useState` and `useRef` from preact
---
 .../directive-run/block.json                  |  15 ++
 .../directive-run/render.php                  |  54 ++++++++
 .../interactive-blocks/directive-run/view.js  | 108 +++++++++++++++
 packages/interactivity/CHANGELOG.md           |   4 +
 .../interactivity/docs/2-api-reference.md     |  59 +++++++-
 packages/interactivity/src/directives.js      |  23 ++--
 packages/interactivity/src/index.js           |  13 +-
 packages/interactivity/src/utils.js           | 129 +++++++++++++++++-
 .../specs/interactivity/directive-run.spec.ts |  61 +++++++++
 9 files changed, 452 insertions(+), 14 deletions(-)
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
 create mode 100644 test/e2e/specs/interactivity/directive-run.spec.ts

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json
new file mode 100644
index 0000000000000..5242ca2c872ae
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-run",
+	"title": "E2E Interactivity tests - directive run",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "directive-run-view",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
new file mode 100644
index 0000000000000..a7eaaa984035e
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
@@ -0,0 +1,54 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-run`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-run-view' );
+?>
+
+<div
+	data-wp-interactive='{ "namespace": "directive-run" }'
+	data-wp-navigation-id='test-directive-run'
+>
+	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
+	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
+	<div data-testid="renderCount" data-wp-text="state.renderCount"></div>
+	<div data-testid="navigated">no</div>
+
+	<div
+		data-wp-run--hydrated="callbacks.updateIsHydrated"
+		data-wp-run--renderCount="callbacks.updateRenderCount"
+		data-wp-text="state.clickCount"
+	></div>
+</div>
+
+<div data-wp-interactive='{ "namespace": "directive-run" }' >
+	<button data-testid="toggle" data-wp-on--click="actions.toggle">
+		Toggle
+	</button>
+
+	<button data-testid="increment" data-wp-on--click="actions.increment">
+		Increment
+	</button>
+
+	<button data-testid="navigate" data-wp-on--click="actions.navigate">
+		Navigate
+	</button>
+
+	<!-- Hook execution results are stored in this element as attributes. -->
+	<div
+		data-testid="wp-run hooks results"
+		data-wp-show-children="state.isOpen"
+		data-init=""
+		data-watch=""
+	>
+		<div
+			data-wp-run--mounted="callbacks.updateIsMounted"
+			data-wp-run--hooks="callbacks.useHooks"
+		>
+			Element with wp-run using hooks
+		</div>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
new file mode 100644
index 0000000000000..b6dd68154d716
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
@@ -0,0 +1,108 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	store,
+	directive,
+	navigate,
+	useInit,
+	useWatch,
+	cloneElement,
+	getElement,
+} from '@wordpress/interactivity';
+
+// Custom directive to show hide the content elements in which it is placed.
+directive(
+	'show-children',
+	( { directives: { 'show-children': showChildren }, element, evaluate } ) => {
+		const entry = showChildren.find(
+			( { suffix } ) => suffix === 'default'
+		);
+		return evaluate( entry )
+			? element
+			: cloneElement( element, { children: null } );
+	},
+	{ priority: 9 }
+);
+
+const html = `
+<div
+	data-wp-interactive='{ "namespace": "directive-run" }'
+	data-wp-navigation-id='test-directive-run'
+>
+	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
+	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
+	<div data-testid="renderCount" data-wp-text="state.renderCount"></div>
+	<div data-testid="navigated">yes</div>
+
+	<div
+		data-wp-run--hydrated="callbacks.updateIsHydrated"
+		data-wp-run--renderCount="callbacks.updateRenderCount"
+		data-wp-text="state.clickCount"
+	></div>
+</div>
+`;
+
+const { state } = store( 'directive-run', {
+	state: {
+		isOpen: false,
+		isHydrated: 'no',
+		isMounted: 'no',
+		renderCount: 0,
+		clickCount: 0
+	},
+	actions: {
+		toggle() {
+			state.isOpen = ! state.isOpen;
+		},
+		increment() {
+			state.clickCount = state.clickCount + 1;
+		},
+		navigate() {
+			navigate( window.location, {
+				force: true,
+				html,
+			} );
+		},
+	},
+	callbacks: {
+		updateIsHydrated() {
+			setTimeout( () => ( state.isHydrated = 'yes' ) );
+		},
+		updateIsMounted() {
+			setTimeout( () => ( state.isMounted = 'yes' ) );
+		},
+		updateRenderCount() {
+			setTimeout( () => ( state.renderCount = state.renderCount + 1 ) );
+		},
+		useHooks() {
+			// Runs only on first render.
+			useInit( () => {
+				const { ref } = getElement();
+				ref
+					.closest( '[data-testid="wp-run hooks results"]')
+					.setAttribute( 'data-init', 'initialized' );
+				return () => {
+					ref
+						.closest( '[data-testid="wp-run hooks results"]')
+						.setAttribute( 'data-init', 'cleaned up' );
+				};
+			} );
+
+			// Runs whenever a signal consumed inside updates its value. Also
+			// executes for the first render.
+			useWatch( () => {
+				const { ref } = getElement();
+				const { clickCount } = state;
+				ref
+					.closest( '[data-testid="wp-run hooks results"]')
+					.setAttribute( 'data-watch', clickCount );
+				return () => {
+					ref
+						.closest( '[data-testid="wp-run hooks results"]')
+						.setAttribute( 'data-watch', 'cleaned up' );
+				};
+			} );
+		}
+	}
+} );
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 8c03cfc314efe..ff0c4942abb3f 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### New Features
+
+-   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
+
 ### Bug Fix
 
 -   Fix namespaces when there are nested interactive regions. ([#57029](https://github.com/WordPress/gutenberg/pull/57029))
diff --git a/packages/interactivity/docs/2-api-reference.md b/packages/interactivity/docs/2-api-reference.md
index 3c8f179861f52..7980c31b984f8 100644
--- a/packages/interactivity/docs/2-api-reference.md
+++ b/packages/interactivity/docs/2-api-reference.md
@@ -22,6 +22,7 @@ DOM elements are connected to data stored in the state and context through direc
     - [`wp-on`](#wp-on) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
     - [`wp-watch`](#wp-watch) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-init`](#wp-init) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
+    - [`wp-run`](#wp-run) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-key`](#wp-key) ![](https://img.shields.io/badge/TEMPLATING-afd2e3.svg)
   - [Values of directives are references to store properties](#values-of-directives-are-references-to-store-properties)
 - [The store](#the-store)
@@ -471,6 +472,62 @@ store( "myPlugin", {
 
 The `wp-init` can return a function. If it does, the returned function will run when the element is removed from the DOM.
 
+#### `wp-run` 
+
+It runs the passed callback **during node's render execution**.
+
+You can use and compose hooks like `useState`, `useWatch` or `useEffect` inside inside the passed callback and create your own logic, providing more flexibility than previous directives.
+
+You can attach several `wp-run` to the same DOM element by using the syntax `data-wp-run--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-run` directives of that DOM element._
+
+_Example of `data-wp-run` directive_ 
+
+```html
+<div data-wp-run="callbacks.logInView">
+  <p>Hi!</p>
+</div>
+```
+
+<details>
+  <summary><em>See store used with the directive above</em></summary>
+
+```js
+import { store, useState, useEffect } from '@wordpress/interactivity';
+
+// Unlike `data-wp-init` and `data-wp-watch`, you can use any hooks inside
+// `data-wp-run` callbacks.
+const useInView = ( ref ) => {
+  const [ inView, setInView ] = useState( false );
+  useEffect( () => {
+    const observer = new IntersectionObserver( ( [ entry ] ) => {
+      setInView( entry.isIntersecting );
+    } );
+    if ( ref ) observer.observe( ref );
+    return () => ref && observer.unobserve( ref );
+  }, []);
+  return inView;
+};
+
+store( 'myPlugin', {
+  callbacks: {
+    logInView: () => {
+      const { ref } = getElement();
+      const isInView = useInView( ref );
+      useEffect( () => {
+        if ( isInView ) {
+          console.log( 'Inside' );
+        } else {
+          console.log( 'Outside' );
+        }
+      });
+    }
+  },
+} );
+```
+
+</details>
+<br/>
+
 #### `wp-key` 
 
 The `wp-key` directive assigns a unique key to an element to help the Interactivity API identify it when iterating through arrays of elements. This becomes important if your array elements can move (e.g., due to sorting), get inserted, or get deleted. A well-chosen key value helps the Interactivity API infer what exactly has changed in the array, allowing it to make the correct updates to the DOM.
@@ -528,7 +585,7 @@ In the example below, we get `state.isPlaying` from `otherPlugin` instead of `my
 
 ```html
 <div data-wp-interactive='{ "namespace": "myPlugin" }'>
-	<div data-bind--hidden="otherPlugin::!state.isPlaying" ... >
+  <div data-bind--hidden="otherPlugin::!state.isPlaying" ... >
 		<iframe ...></iframe>
 	</div>
 </div>
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index 0793dc0cc5d5b..e9cc66fa50a6f 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -14,7 +14,7 @@ import { deepSignal, peek } from 'deepsignal';
  * Internal dependencies
  */
 import { createPortal } from './portals';
-import { useSignalEffect } from './utils';
+import { useWatch, useInit } from './utils';
 import { directive } from './hooks';
 import { SlotProvider, Slot, Fill } from './slots';
 import { navigate } from './router';
@@ -75,14 +75,14 @@ export default () => {
 	// data-wp-watch--[name]
 	directive( 'watch', ( { directives: { watch }, evaluate } ) => {
 		watch.forEach( ( entry ) => {
-			useSignalEffect( () => evaluate( entry ) );
+			useWatch( () => evaluate( entry ) );
 		} );
 	} );
 
 	// data-wp-init--[name]
 	directive( 'init', ( { directives: { init }, evaluate } ) => {
 		init.forEach( ( entry ) => {
-			useEffect( () => evaluate( entry ), [] );
+			useInit( () => evaluate( entry ) );
 		} );
 	} );
 
@@ -118,7 +118,7 @@ export default () => {
 							? `${ currentClass } ${ name }`
 							: name;
 
-					useEffect( () => {
+					useInit( () => {
 						// This seems necessary because Preact doesn't change the class
 						// names on the hydration, so we have to do it manually. It doesn't
 						// need deps because it only needs to do it the first time.
@@ -127,7 +127,7 @@ export default () => {
 						} else {
 							element.ref.current.classList.add( name );
 						}
-					}, [] );
+					} );
 				} );
 		}
 	);
@@ -182,7 +182,7 @@ export default () => {
 				if ( ! result ) delete element.props.style[ key ];
 				else element.props.style[ key ] = result;
 
-				useEffect( () => {
+				useInit( () => {
 					// This seems necessary because Preact doesn't change the styles on
 					// the hydration, so we have to do it manually. It doesn't need deps
 					// because it only needs to do it the first time.
@@ -191,7 +191,7 @@ export default () => {
 					} else {
 						element.ref.current.style[ key ] = result;
 					}
-				}, [] );
+				} );
 			} );
 	} );
 
@@ -217,7 +217,7 @@ export default () => {
 				// This seems necessary because Preact doesn't change the attributes
 				// on the hydration, so we have to do it manually. It doesn't need
 				// deps because it only needs to do it the first time.
-				useEffect( () => {
+				useInit( () => {
 					const el = element.ref.current;
 
 					// We set the value directly to the corresponding
@@ -260,7 +260,7 @@ export default () => {
 					} else {
 						el.removeAttribute( attribute );
 					}
-				}, [] );
+				} );
 			}
 		);
 	} );
@@ -390,4 +390,9 @@ export default () => {
 		),
 		{ priority: 4 }
 	);
+
+	// data-wp-run
+	directive( 'run', ( { directives: { run }, evaluate } ) => {
+		run.forEach( ( entry ) => evaluate( entry ) );
+	} );
 };
diff --git a/packages/interactivity/src/index.js b/packages/interactivity/src/index.js
index 6c7b98e8e7a79..cf0b4c88cac4b 100644
--- a/packages/interactivity/src/index.js
+++ b/packages/interactivity/src/index.js
@@ -7,8 +7,17 @@ import { init } from './router';
 export { store } from './store';
 export { directive, getContext, getElement } from './hooks';
 export { navigate, prefetch } from './router';
-export { h as createElement } from 'preact';
-export { useEffect, useContext, useMemo } from 'preact/hooks';
+export {
+	useWatch,
+	useInit,
+	useEffect,
+	useLayoutEffect,
+	useCallback,
+	useMemo,
+} from './utils';
+
+export { h as createElement, cloneElement } from 'preact';
+export { useContext, useState, useRef } from 'preact/hooks';
 export { deepSignal } from 'deepsignal';
 
 document.addEventListener( 'DOMContentLoaded', async () => {
diff --git a/packages/interactivity/src/utils.js b/packages/interactivity/src/utils.js
index 10b53104fb9c8..021df983cb4f0 100644
--- a/packages/interactivity/src/utils.js
+++ b/packages/interactivity/src/utils.js
@@ -1,9 +1,19 @@
 /**
  * External dependencies
  */
-import { useEffect } from 'preact/hooks';
+import {
+	useMemo as _useMemo,
+	useCallback as _useCallback,
+	useEffect as _useEffect,
+	useLayoutEffect as _useLayoutEffect,
+} from 'preact/hooks';
 import { effect } from '@preact/signals';
 
+/**
+ * Internal dependencies
+ */
+import { getScope, setScope, resetScope } from './hooks';
+
 const afterNextFrame = ( callback ) => {
 	return new Promise( ( resolve ) => {
 		const done = () => {
@@ -38,7 +48,7 @@ function createFlusher( compute, notify ) {
 // implementation comes from this PR, but we added short-cirtuiting to avoid
 // infinite loops: https://github.com/preactjs/signals/pull/290
 export function useSignalEffect( callback ) {
-	useEffect( () => {
+	_useEffect( () => {
 		let eff = null;
 		let isExecuting = false;
 		const notify = async () => {
@@ -53,6 +63,121 @@ export function useSignalEffect( callback ) {
 	}, [] );
 }
 
+/**
+ * Returns the passed function wrapped with the current scope so it is
+ * accessible whenever the function runs. This is primarily to make the scope
+ * available inside hook callbacks.
+ *
+ * @param {Function} func The passed function.
+ * @return {Function} The wrapped function.
+ */
+const withScope = ( func ) => {
+	const scope = getScope();
+	return ( ...args ) => {
+		setScope( scope );
+		try {
+			return func( ...args );
+		} finally {
+			resetScope();
+		}
+	};
+};
+
+/**
+ * Accepts a function that contains imperative code which runs whenever any of
+ * the accessed _reactive_ properties (e.g., values from the global state or the
+ * context) is modified.
+ *
+ * This hook makes the element's scope available so functions like
+ * `getElement()` and `getContext()` can be used inside the passed callback.
+ *
+ * @param {Function} callback The hook callback.
+ */
+export function useWatch( callback ) {
+	useSignalEffect( withScope( callback ) );
+}
+
+/**
+ * Accepts a function that contains imperative code which runs only after the
+ * element's first render, mainly useful for intialization logic.
+ *
+ * This hook makes the element's scope available so functions like
+ * `getElement()` and `getContext()` can be used inside the passed callback.
+ *
+ * @param {Function} callback The hook callback.
+ */
+export function useInit( callback ) {
+	_useEffect( withScope( callback ), [] );
+}
+
+/**
+ * Accepts a function that contains imperative, possibly effectful code. The
+ * effects run after browser paint, without blocking it.
+ *
+ * This hook is equivalent to Preact's `useEffect` and makes the element's scope
+ * available so functions like `getElement()` and `getContext()` can be used
+ * inside the passed callback.
+ *
+ * @param {Function} callback Imperative function that can return a cleanup
+ *                            function.
+ * @param {any[]}    inputs   If present, effect will only activate if the
+ *                            values in the list change (using `===`).
+ */
+export function useEffect( callback, inputs ) {
+	_useEffect( withScope( callback ), inputs );
+}
+
+/**
+ * Accepts a function that contains imperative, possibly effectful code. Use
+ * this to read layout from the DOM and synchronously re-render.
+ *
+ * This hook is equivalent to Preact's `useLayoutEffect` and makes the element's
+ * scope available so functions like `getElement()` and `getContext()` can be
+ * used inside the passed callback.
+ *
+ * @param {Function} callback Imperative function that can return a cleanup
+ *                            function.
+ * @param {any[]}    inputs   If present, effect will only activate if the
+ *                            values in the list change (using `===`).
+ */
+export function useLayoutEffect( callback, inputs ) {
+	_useLayoutEffect( withScope( callback ), inputs );
+}
+
+/**
+ * Returns a memoized version of the callback that only changes if one of the
+ * inputs has changed (using `===`).
+ *
+ * This hook is equivalent to Preact's `useCallback` and makes the element's
+ * scope available so functions like `getElement()` and `getContext()` can be
+ * used inside the passed callback.
+ *
+ * @param {Function} callback Imperative function that can return a cleanup
+ *                            function.
+ * @param {any[]}    inputs   If present, effect will only activate if the
+ *                            values in the list change (using `===`).
+ */
+export function useCallback( callback, inputs ) {
+	_useCallback( withScope( callback ), inputs );
+}
+
+/**
+ * Pass a factory function and an array of inputs. `useMemo` will only recompute
+ * the memoized value when one of the inputs has changed.
+ *
+ * This hook is equivalent to Preact's `useMemo` and makes the element's scope
+ * available so functions like `getElement()` and `getContext()` can be used
+ * inside the passed factory function.
+ *
+ * @param {Function} factory Imperative function that can return a cleanup
+ *                           function.
+ * @param {any[]}    inputs  If present, effect will only activate if the
+ *                           values in the list change (using `===`).
+ */
+export function useMemo( factory, inputs ) {
+	_useMemo( withScope( factory ), inputs );
+}
+
 // For wrapperless hydration.
 // See https://gist.github.com/developit/f4c67a2ede71dc2fab7f357f39cff28c
 export const createRootFragment = ( parent, replaceNode ) => {
diff --git a/test/e2e/specs/interactivity/directive-run.spec.ts b/test/e2e/specs/interactivity/directive-run.spec.ts
new file mode 100644
index 0000000000000..0348bdb95c2ab
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-run.spec.ts
@@ -0,0 +1,61 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-run', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-run' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-run' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should execute each element render', async ( { page } ) => {
+		await expect( page.getByTestId( 'hydrated' ) ).toHaveText( 'yes' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '1' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '2' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '3' );
+	} );
+
+	test( 'should execute when an element is mounted', async ( { page } ) => {
+		await expect( page.getByTestId( 'mounted' ) ).toHaveText( 'no' );
+		await page.getByTestId( 'toggle' ).click();
+		await expect( page.getByTestId( 'mounted' ) ).toHaveText( 'yes' );
+	} );
+
+	test( 'should work with client-side navigation', async ( { page } ) => {
+		await page.getByTestId( 'increment' ).click();
+		await page.getByTestId( 'increment' ).click();
+		await expect( page.getByTestId( 'navigated' ) ).toHaveText( 'no' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '3' );
+		await page.getByTestId( 'navigate' ).click();
+		await expect( page.getByTestId( 'navigated' ) ).toHaveText( 'yes' );
+		await expect( page.getByTestId( 'renderCount' ) ).toHaveText( '4' );
+	} );
+
+	test( 'should allow executing hooks', async ( { page } ) => {
+		await page.getByTestId( 'toggle' ).click();
+		const results = page.getByTestId( 'wp-run hooks results' );
+		await expect( results ).toHaveAttribute( 'data-init', 'initialized' );
+
+		await expect( results ).toHaveAttribute( 'data-watch', '0' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( results ).toHaveAttribute( 'data-watch', '1' );
+		await page.getByTestId( 'increment' ).click();
+		await expect( results ).toHaveAttribute( 'data-watch', '2' );
+
+		await page.getByTestId( 'toggle' ).click();
+		await expect( results ).toHaveAttribute( 'data-init', 'cleaned up' );
+		await expect( results ).toHaveAttribute( 'data-watch', 'cleaned up' );
+	} );
+} );

From 0760faa19ccd219eebd72e1afd1e005d27277b3f Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Mon, 15 Jan 2024 17:59:01 +0400
Subject: [PATCH 113/296] Remove unused Navigation block e2e test fixtures
 (#57848)

---
 .../fixtures/menu-items-request-fixture.json  |   84 --
 .../fixtures/menu-items-response-fixture.json | 1261 -----------------
 2 files changed, 1345 deletions(-)
 delete mode 100644 packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json
 delete mode 100644 packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json

diff --git a/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json b/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json
deleted file mode 100644
index 01b844c45ceee..0000000000000
--- a/packages/e2e-tests/specs/editor/fixtures/menu-items-request-fixture.json
+++ /dev/null
@@ -1,84 +0,0 @@
-[
-	{
-		"title": "Home",
-		"url": "http://localhost:8889/",
-		"menu_order": 1
-	},
-	{
-		"title": "About",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 2
-	},
-	{
-		"title": "Our team",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 3,
-		"parent": 1
-	},
-	{
-		"title": "Shop",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 4
-	},
-	{
-		"title": "Winter apparel",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 5,
-		"parent": 3
-	},
-	{
-		"title": "Chunky socks",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 6,
-		"parent": 4
-	},
-	{
-		"title": "Hideous hats",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 7,
-		"parent": 4
-	},
-	{
-		"title": "Glorious gloves",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 8,
-		"parent": 4
-	},
-	{
-		"title": "Jazzy Jumpers",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 9,
-		"parent": 4
-	},
-	{
-		"title": "Shipping",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 10
-	},
-	{
-		"title": "Contact Us",
-		"type": "post_type",
-		"object": "page",
-		"menu_order": 11
-	},
-	{
-		"title": "WordPress.org",
-		"url": "https://wordpress.org",
-		"menu_order": 12
-	},
-	{
-		"title": "Google",
-		"url": "https://google.com",
-		"menu_order": 13,
-		"parent": 11
-	}
-]
diff --git a/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json b/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json
deleted file mode 100644
index 4de75a5c0bacc..0000000000000
--- a/packages/e2e-tests/specs/editor/fixtures/menu-items-response-fixture.json
+++ /dev/null
@@ -1,1261 +0,0 @@
-[
-	{
-		"id": 94,
-		"title": {
-			"raw": "Home",
-			"rendered": "Home"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 94,
-		"parent": 0,
-		"menu_order": 1,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=94"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/94"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 95,
-		"title": {
-			"raw": "",
-			"rendered": "Accusamus quo repellat illum magnam quas"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=41",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 41,
-		"parent": 0,
-		"menu_order": 2,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=95"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/41"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/95"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 96,
-		"title": {
-			"raw": "",
-			"rendered": "Debitis cum consequatur sit doloremque"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=51",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 51,
-		"parent": 95,
-		"menu_order": 3,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=96"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/51"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/96"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 97,
-		"title": {
-			"raw": "",
-			"rendered": "Est ea vero non nihil officiis in"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=53",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 53,
-		"parent": 0,
-		"menu_order": 4,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=97"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/53"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/97"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 98,
-		"title": {
-			"raw": "",
-			"rendered": "Fuga odio quis tempora"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=56",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 56,
-		"parent": 97,
-		"menu_order": 5,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=98"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/56"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/98"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 99,
-		"title": {
-			"raw": "",
-			"rendered": "In consectetur repellendus eveniet maiores aperiam"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=15",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 15,
-		"parent": 98,
-		"menu_order": 6,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=99"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/15"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/99"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 100,
-		"title": {
-			"raw": "",
-			"rendered": "Mollitia maiores consequatur ea dolorem blanditiis"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=45",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 45,
-		"parent": 99,
-		"menu_order": 7,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=100"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/45"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/100"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 101,
-		"title": {
-			"raw": "",
-			"rendered": "Necessitatibus nisi qui qui necessitatibus quaerat possimus"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=27",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 27,
-		"parent": 100,
-		"menu_order": 8,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=101"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/27"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/101"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 102,
-		"title": {
-			"raw": "",
-			"rendered": "Nulla omnis autem dolores eligendi"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=43",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 43,
-		"parent": 0,
-		"menu_order": 9,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=102"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/43"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/102"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 103,
-		"title": {
-			"raw": "",
-			"rendered": "Sample Page"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?page_id=2",
-		"attr_title": "",
-		"description": "",
-		"type": "post_type",
-		"type_label": "Page",
-		"object": "page",
-		"object_id": 2,
-		"parent": 0,
-		"menu_order": 10,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=103"
-				}
-			],
-			"wp:object": [
-				{
-					"post_type": "post_type",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/pages/2"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/103"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 104,
-		"title": {
-			"raw": "",
-			"rendered": "Beatae qui labore voluptas eveniet officia quia voluptas qui porro sequi et aut est"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=7",
-		"attr_title": "",
-		"description": "Ratione nemo ut aut ullam sed assumenda quis est exercitationem",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 7,
-		"parent": 0,
-		"menu_order": 11,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=104"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/7"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/104"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 105,
-		"title": {
-			"raw": "",
-			"rendered": "Et minus itaque velit tempore hic quisquam saepe quas asperiores"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=19",
-		"attr_title": "",
-		"description": "Vel fuga enim rerum perspiciatis sapiente mollitia magni ut molestiae labore quae quia quia libero perspiciatis voluptatem quidem deleniti eveniet laboriosam doloribus dolor laborum accusantium modi ducimus itaque rerum cum nostrum",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 19,
-		"parent": 104,
-		"menu_order": 12,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=105"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/19"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/105"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 106,
-		"title": {
-			"raw": "",
-			"rendered": "Et quas a et mollitia et voluptas optio voluptate quia quo unde aut in nostrum iste impedit quisquam id aut"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=6",
-		"attr_title": "",
-		"description": "Quas sit labore earum omnis eos sint iste est possimus harum aut soluta sint optio quos distinctio inventore voluptate non ut aliquam ad ut voluptates fugiat numquam magnam modi repellendus modi laudantium et debitis officia est voluptatum quidem unde molestiae animi vero fuga accusamus nam",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 6,
-		"parent": 105,
-		"menu_order": 13,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=106"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/6"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/106"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 107,
-		"title": {
-			"raw": "",
-			"rendered": "Illo quis sit impedit itaque expedita earum deserunt magni doloremque velit eum id error"
-		},
-		"status": "publish",
-		"url": "http://localhost:8889/?cat=16",
-		"attr_title": "",
-		"description": "Doloremque vero sunt officiis iste voluptatibus voluptas molestiae sint asperiores recusandae amet praesentium et explicabo nesciunt similique voluptatum laudantium amet officiis quas distinctio quis enim nihil tempora",
-		"type": "taxonomy",
-		"type_label": "Category",
-		"object": "category",
-		"object_id": 16,
-		"parent": 106,
-		"menu_order": 14,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=107"
-				}
-			],
-			"wp:object": [
-				{
-					"taxonomy": "taxonomy",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/categories/16"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/107"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 108,
-		"title": {
-			"raw": "WordPress.org",
-			"rendered": "WordPress.org"
-		},
-		"status": "publish",
-		"url": "https://wordpress.org",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 108,
-		"parent": 0,
-		"menu_order": 15,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=108"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/108"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	},
-	{
-		"id": 109,
-		"title": {
-			"raw": "Google",
-			"rendered": "Google"
-		},
-		"status": "publish",
-		"url": "https://google.com",
-		"attr_title": "",
-		"description": "",
-		"type": "custom",
-		"type_label": "Custom Link",
-		"object": "custom",
-		"object_id": 109,
-		"parent": 108,
-		"menu_order": 16,
-		"target": "",
-		"classes": [ "" ],
-		"xfn": [ "" ],
-		"meta": [],
-		"menus": [ 23 ],
-		"_links": {
-			"self": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"collection": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items"
-				}
-			],
-			"about": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/types/nav_menu_item"
-				}
-			],
-			"wp:term": [
-				{
-					"taxonomy": "nav_menu",
-					"embeddable": true,
-					"href": "http://localhost:8889/index.php?rest_route=%2Fwp%2Fv2%2Fmenus&post=109"
-				}
-			],
-			"wp:action-publish": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-unfiltered-html": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-create-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"wp:action-assign-menus": [
-				{
-					"href": "http://localhost:8889/index.php?rest_route=/wp/v2/menu-items/109"
-				}
-			],
-			"curies": [
-				{
-					"name": "wp",
-					"href": "https://api.w.org/{rel}",
-					"templated": true
-				}
-			]
-		}
-	}
-]

From e6a34a33be315553f810cf214f720d478e68a36a Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <me@andreidraganescu.info>
Date: Mon, 15 Jan 2024 16:15:33 +0200
Subject: [PATCH 114/296] removes the template condition and shows the chevron
 back in edit post header (#57807)

---
 packages/edit-post/src/components/header/index.js | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/edit-post/src/components/header/index.js b/packages/edit-post/src/components/header/index.js
index b76b89ff7673d..050ee8103251f 100644
--- a/packages/edit-post/src/components/header/index.js
+++ b/packages/edit-post/src/components/header/index.js
@@ -119,9 +119,7 @@ function Header( { setEntitiesSavedStatesCallback } ) {
 							className={ classnames(
 								'selected-block-tools-wrapper',
 								{
-									'is-collapsed':
-										isEditingTemplate &&
-										isBlockToolsCollapsed,
+									'is-collapsed': isBlockToolsCollapsed,
 								}
 							) }
 						>
@@ -131,7 +129,7 @@ function Header( { setEntitiesSavedStatesCallback } ) {
 							ref={ blockToolbarRef }
 							name="block-toolbar"
 						/>
-						{ isEditingTemplate && hasBlockSelection && (
+						{ hasBlockSelection && (
 							<Button
 								className="edit-post-header__block-tools-toggle"
 								icon={ isBlockToolsCollapsed ? next : previous }

From 50c84ff19b015fb1d57f23830b73bae958fda691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:41:55 +0100
Subject: [PATCH 115/296] DataViews: add description to pages (#57793)

---
 .../sidebar-navigation-screen-pages-dataviews/index.js          | 1 +
 .../src/components/sidebar-navigation-screen-pages/index.js     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
index 1ef4cbddee884..ade28989ff955 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
@@ -76,6 +76,7 @@ export default function SidebarNavigationScreenPagesDataViews() {
 	return (
 		<SidebarNavigationScreen
 			title={ __( 'Pages' ) }
+			description={ __( 'Browse and manage pages.' ) }
 			content={ <DataViewsSidebarContent /> }
 			footer={
 				<VStack spacing={ 0 }>
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
index e9a6163a0047e..85eaeea14a536 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
@@ -156,7 +156,7 @@ export default function SidebarNavigationScreenPages() {
 			) }
 			<SidebarNavigationScreen
 				title={ __( 'Pages' ) }
-				description={ __( 'Browse and edit pages on your site.' ) }
+				description={ __( 'Browse and manage pages.' ) }
 				actions={
 					<SidebarButton
 						icon={ plus }

From 48de159559079baf1fabe0a884cfae1930e61221 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Mon, 15 Jan 2024 12:38:05 -0300
Subject: [PATCH 116/296] Fix comments block (#57820)

Fix comment block accidentally broken here: https://github.com/WordPress/gutenberg/pull/57818
---
 packages/editor/src/store/defaults.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor/src/store/defaults.js b/packages/editor/src/store/defaults.js
index 485b65d24d3ad..e4f86b3a7dfb2 100644
--- a/packages/editor/src/store/defaults.js
+++ b/packages/editor/src/store/defaults.js
@@ -9,8 +9,8 @@ import { SETTINGS_DEFAULTS } from '@wordpress/block-editor';
  * @property {boolean|Array} allowedBlockTypes     Allowed block types
  * @property {boolean}       richEditingEnabled    Whether rich editing is enabled or not
  * @property {boolean}       codeEditingEnabled    Whether code editing is enabled or not
- * @property {boolean}       enableCustomFields    Whether the WordPress custom fields are enabled or not.
  * @property {boolean}       fontLibraryEnabled    Whether the font library is enabled or not.
+ * @property {boolean}       enableCustomFields    Whether the WordPress custom fields are enabled or not.
  *                                                 true  = the user has opted to show the Custom Fields panel at the bottom of the editor.
  *                                                 false = the user has opted to hide the Custom Fields panel at the bottom of the editor.
  *                                                 undefined = the current environment does not support Custom Fields, so the option toggle in Preferences -> Panels to enable the Custom Fields panel is not displayed.
@@ -27,7 +27,7 @@ export const EDITOR_SETTINGS_DEFAULTS = {
 
 	richEditingEnabled: true,
 	codeEditingEnabled: true,
-	enableCustomFields: undefined,
 	fontLibraryEnabled: true,
+	enableCustomFields: undefined,
 	defaultRenderingMode: 'post-only',
 };

From 4c319590947b5f7853411e3c076861193942c6d2 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Mon, 15 Jan 2024 19:09:26 +0100
Subject: [PATCH 117/296] Interactivity API:  Render the root interactive
 blocks (#57729)

* Update mark interactivity function to get interactive root blocks

* Renamed variables to be easier to read, still verbose :(

* Use a better wording

* Remove not needed check

* Remove not needed block declaration in tests

* Remove not needed doc

* Remove comments delimiter and non interactive inner block skipping

* Update tests to reflect non interactive with interactive ancestors

* Update e2e test to remove filter after rename
---
 .../class-wp-directive-processor.php          |  53 ++---
 .../directive-processing.php                  | 187 ++----------------
 .../e2e-tests/plugins/interactive-blocks.php  |   2 +-
 .../directive-processing-test.php             |  67 +++----
 4 files changed, 65 insertions(+), 244 deletions(-)

diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
index 3b8a38f973815..723b36026ce2a 100644
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ b/lib/experimental/interactivity-api/class-wp-directive-processor.php
@@ -20,33 +20,26 @@ class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_5 {
 	 *
 	 * @var string
 	 */
-	public static $root_block = null;
-
-	/**
-	 * Array containing the direct children of interactive blocks.
-	 *
-	 * @var array
-	 */
-	public static $children_of_interactive_block = array();
+	public static $interactive_root_block = null;
 
 	/**
 	 * Sets the current root block.
 	 *
 	 * @param array $block The block to add.
 	 */
-	public static function mark_root_block( $block ) {
+	public static function mark_interactive_root_block( $block ) {
 		if ( null !== $block['blockName'] ) {
-			self::$root_block = $block['blockName'] . md5( serialize( $block ) );
+			self::$interactive_root_block = $block['blockName'] . md5( serialize( $block ) );
 		} else {
-			self::$root_block = md5( serialize( $block ) );
+			self::$interactive_root_block = md5( serialize( $block ) );
 		}
 	}
 
 	/**
 	 * Resets the root block.
 	 */
-	public static function unmark_root_block() {
-		self::$root_block = null;
+	public static function unmark_interactive_root_block() {
+		self::$interactive_root_block = null;
 	}
 
 	/**
@@ -55,16 +48,16 @@ public static function unmark_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_root_block( $block ) {
-		// If self::$root_block is null, is impossible that any block has been marked as root.
-		if ( is_null( self::$root_block ) ) {
+	public static function is_marked_as_interactive_root_block( $block ) {
+		// If self::$interactive_root_block is null, is impossible that any block has been marked as root.
+		if ( is_null( self::$interactive_root_block ) ) {
 			return false;
 		}
 		// Blocks whose blockName is null are specifically intended to convey - "this is a freeform HTML block."
 		if ( null !== $block['blockName'] ) {
-			return str_contains( self::$root_block, $block['blockName'] ) && $block['blockName'] . md5( serialize( $block ) ) === self::$root_block;
+			return str_contains( self::$interactive_root_block, $block['blockName'] ) && $block['blockName'] . md5( serialize( $block ) ) === self::$interactive_root_block;
 		}
-		return md5( serialize( $block ) ) === self::$root_block;
+		return md5( serialize( $block ) ) === self::$interactive_root_block;
 	}
 
 	/**
@@ -72,28 +65,8 @@ public static function is_marked_as_root_block( $block ) {
 	 *
 	 * @return bool True if there is a root block, false otherwise.
 	 */
-	public static function has_root_block() {
-		return isset( self::$root_block );
-	}
-
-	/**
-	 * Stores a reference to a direct children of an interactive block to be able
-	 * to identify it later.
-	 *
-	 * @param array $block The block to add.
-	 */
-	public static function mark_children_of_interactive_block( $block ) {
-		self::$children_of_interactive_block[] = md5( serialize( $block ) );
-	}
-
-	/**
-	 * Checks if block is marked as children of an interactive block.
-	 *
-	 * @param array $block The block to check.
-	 * @return bool True if block is a children of an interactive 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 );
+	public static function has_interactive_root_block() {
+		return isset( self::$interactive_root_block );
 	}
 
 	/**
diff --git a/lib/experimental/interactivity-api/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
index b49ee538390ff..5a97166d6d22b 100644
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ b/lib/experimental/interactivity-api/directive-processing.php
@@ -13,19 +13,21 @@
  * parent is null.
  *
  * @param array $parsed_block The parsed block.
- * @param array $source_block The source block.
- * @param array $parent_block The parent block.
  *
  * @return array The parsed block.
  */
-function gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, $parent_block ) {
-	if ( ! isset( $parent_block ) && ! WP_Directive_Processor::has_root_block() ) {
-		WP_Directive_Processor::mark_root_block( $parsed_block );
+function gutenberg_interactivity_mark_root_interactive_blocks( $parsed_block ) {
+	if ( ! WP_Directive_Processor::has_interactive_root_block() ) {
+		$block_type     = WP_Block_Type_Registry::get_instance()->get_registered( $parsed_block['blockName'] );
+		$is_interactive = isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'];
+		if ( $is_interactive ) {
+			WP_Directive_Processor::mark_interactive_root_block( $parsed_block );
+		}
 	}
 
 	return $parsed_block;
 }
-add_filter( 'render_block_data', 'gutenberg_interactivity_mark_root_blocks', 10, 3 );
+add_filter( 'render_block_data', 'gutenberg_interactivity_mark_root_interactive_blocks', 10, 1 );
 
 /**
  * Processes the directives in the root blocks.
@@ -36,145 +38,16 @@ function gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block,
  * @return string Filtered block content.
  */
 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();
-
-		// Parse our own block delimiters for interactive and non-interactive blocks.
-		$parsed_blocks     = parse_blocks( $block_content );
-		$context           = new WP_Directive_Context();
-		$processed_content = '';
-		$namespace_stack   = array();
-
-		foreach ( $parsed_blocks as $parsed_block ) {
-			if ( 'core/interactivity-wrapper' === $parsed_block['blockName'] ) {
-				$processed_content .= gutenberg_process_interactive_block( $parsed_block, $context, $namespace_stack );
-			} elseif ( 'core/non-interactivity-wrapper' === $parsed_block['blockName'] ) {
-				$processed_content .= gutenberg_process_non_interactive_block( $parsed_block, $context, $namespace_stack );
-			} else {
-				$processed_content .= $parsed_block['innerHTML'];
-			}
-		}
-		return $processed_content;
-	}
-
-	return $block_content;
-}
-add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 20, 2 );
-
-/**
- * Marks the block as a children of an interactive block.
- *
- * @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_chidren_of_interactive_block( $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 );
+	if ( WP_Directive_Processor::is_marked_as_interactive_root_block( $block ) ) {
+		WP_Directive_Processor::unmark_interactive_root_block();
+		$context         = new WP_Directive_Context();
+		$namespace_stack = array();
+		return gutenberg_process_interactive_html( $block_content, $context, $namespace_stack );
 	}
-	return $parsed_block;
-}
-add_filter( 'render_block_data', 'gutenberg_mark_chidren_of_interactive_block', 100, 3 );
 
-/**
- * Adds a comment delimiter to mark if the block is interactive or not.
- *
- * @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']
-	) {
-		// Wraps the interactive block with a comment delimiter to be able to
-		// process it later.
-		return get_comment_delimited_block_content(
-			'core/interactivity-wrapper',
-			array(),
-			$block_content
-		);
-	} elseif ( WP_Directive_Processor::is_marked_as_children_of_interactive_block( $block ) ) {
-		// Wraps the non-interactive block with a comment delimiter to be able to
-		// skip it later.
-		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 );
-
-/**
- * Traverses the HTML of an interactive block, searching for Interactivity API
- * directives and processing them. For the inner blocks, it calls the
- * corresponding function depending on the wrapper type.
- *
- * @param array                $interactive_block The interactive block to process.
- * @param WP_Directive_Context $context The context to use when processing.
- * @param array                $namespace_stack Stack of namespackes passed by reference.
- *
- * @return string The processed HTML.
- */
-function gutenberg_process_interactive_block( $interactive_block, $context, &$namespace_stack ) {
-	$block_index              = 0;
-	$content                  = '';
-	$interactive_inner_blocks = array();
-
-	foreach ( $interactive_block['innerContent'] as $inner_content ) {
-		if ( is_string( $inner_content ) ) {
-			$content .= $inner_content;
-		} else {
-			// This is an inner block. It may be an interactive block or a
-			// non-interactive block.
-			$content                   .= '<wp-inner-blocks-' . $block_index . '></wp-inner-blocks-' . $block_index . '>';
-			$interactive_inner_blocks[] = $interactive_block['innerBlocks'][ $block_index++ ];
-		}
-	}
-
-	return gutenberg_process_interactive_html( $content, $context, $interactive_inner_blocks, $namespace_stack );
-}
-
-/**
- * Returns the HTML of a non-interactive block without processing the
- * directives. For the inner blocks, it calls the corresponding function
- * depending on the wrapper type.
- *
- * @param array                $non_interactive_block The non-interactive block to process.
- * @param WP_Directive_Context $context The context to use when processing.
- * @param array                $namespace_stack Stack of namespackes passed by reference.
- *
- * @return string The processed HTML.
- */
-function gutenberg_process_non_interactive_block( $non_interactive_block, $context, &$namespace_stack ) {
-	$block_index = 0;
-	$content     = '';
-	foreach ( $non_interactive_block['innerContent'] as $inner_content ) {
-		if ( is_string( $inner_content ) ) {
-			// This content belongs to a non interactive block and therefore it cannot
-			// contain directives. We add the HTML directly to the final output.
-			$content .= $inner_content;
-		} else {
-			// This is an inner block. It may be an interactive block or a
-			// non-interactive block.
-			$inner_block = $non_interactive_block['innerBlocks'][ $block_index++ ];
-
-			if ( 'core/interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_interactive_block( $inner_block, $context, $namespace_stack );
-			} elseif ( 'core/non-interactivity-wrapper' === $inner_block['blockName'] ) {
-				$content .= gutenberg_process_non_interactive_block( $inner_block, $context, $namespace_stack );
-			}
-		}
-	}
-	return $content;
-}
+add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 );
 
 /**
  * Processes interactive HTML by applying directives to the HTML tags.
@@ -191,7 +64,7 @@ function gutenberg_process_non_interactive_block( $non_interactive_block, $conte
  *
  * @return string The processed HTML.
  */
-function gutenberg_process_interactive_html( $html, $context, $inner_blocks = array(), &$namespace_stack = array() ) {
+function gutenberg_process_interactive_html( $html, $context, &$namespace_stack = array() ) {
 	static $directives = array(
 		'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
 		'data-wp-context'     => 'gutenberg_interactivity_process_wp_context',
@@ -201,22 +74,12 @@ function gutenberg_process_interactive_html( $html, $context, $inner_blocks = ar
 		'data-wp-text'        => 'gutenberg_interactivity_process_wp_text',
 	);
 
-	$tags                   = new WP_Directive_Processor( $html );
-	$prefix                 = 'data-wp-';
-	$tag_stack              = array();
-	$inner_processed_blocks = array();
-	$inner_blocks_index     = 0;
+	$tags      = new WP_Directive_Processor( $html );
+	$prefix    = 'data-wp-';
+	$tag_stack = array();
 	while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
 		$tag_name = $tags->get_tag();
 
-		// Processes the inner blocks.
-		if ( str_contains( $tag_name, 'WP-INNER-BLOCKS' ) && ! empty( $inner_blocks ) && ! $tags->is_tag_closer() ) {
-			if ( 'core/interactivity-wrapper' === $inner_blocks[ $inner_blocks_index ]['blockName'] ) {
-				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context, $namespace_stack );
-			} elseif ( 'core/non-interactivity-wrapper' === $inner_blocks[ $inner_blocks_index ]['blockName'] ) {
-				$inner_processed_blocks[ strtolower( $tag_name ) ] = gutenberg_process_non_interactive_block( $inner_blocks[ $inner_blocks_index++ ], $context, $namespace_stack );
-			}
-		}
 		if ( $tags->is_tag_closer() ) {
 			if ( 0 === count( $tag_stack ) ) {
 				continue;
@@ -287,19 +150,7 @@ function gutenberg_process_interactive_html( $html, $context, $inner_blocks = ar
 		}
 	}
 
-	$processed_html = $tags->get_updated_html();
-
-	// Replaces the inner block tags with the content of each inner block
-	// processed.
-	if ( ! empty( $inner_processed_blocks ) ) {
-		foreach ( $inner_processed_blocks as $inner_block_tag => $inner_block_content ) {
-			if ( str_contains( $processed_html, $inner_block_tag ) ) {
-				$processed_html = str_replace( '<' . $inner_block_tag . '></' . $inner_block_tag . '>', $inner_block_content, $processed_html );
-			}
-		}
-	}
-
-	return $processed_html;
+	return $tags->get_updated_html();
 }
 
 /**
diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
index 1236ecd7d277f..05b591ecce378 100644
--- a/packages/e2e-tests/plugins/interactive-blocks.php
+++ b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -40,7 +40,7 @@ function () {
 		if ( 'true' === $_GET['disable_directives_ssr'] ) {
 			remove_filter(
 				'render_block_data',
-				'gutenberg_interactivity_mark_root_blocks'
+				'gutenberg_interactivity_mark_root_interactive_blocks'
 			);
 		}
 	}
diff --git a/phpunit/experimental/interactivity-api/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
index d6b5bc3860a95..337f826c22ecd 100644
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ b/phpunit/experimental/interactivity-api/directive-processing-test.php
@@ -121,40 +121,37 @@ public function tear_down() {
 		parent::tear_down();
 	}
 
-	public function test_interactivity_process_directives_in_root_blocks() {
+	public function test_interactivity_process_directives_in_interactive_root_blocks() {
 		$block_content =
-		'<!-- wp:paragraph -->' .
-			'<p>Welcome to WordPress. This is your first post. Edit or delete it, then start writing!</p>' .
-		'<!-- /wp:paragraph -->' .
-		'<!-- wp:paragraph -->' .
-			'<p>Welcome to WordPress.</p>' .
-		'<!-- /wp:paragraph -->';
-
-		$parsed_block        = parse_blocks( $block_content )[0];
-		$source_block        = $parsed_block;
-		$rendered_content    = render_block( $parsed_block );
-		$parsed_block_second = parse_blocks( $block_content )[1];
-		$fake_parent_block   = array();
-
-		// Test that root block is intially emtpy.
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
-
-		// Test that root block is not added if there is a parent block.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, $fake_parent_block );
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
-
-		// Test that root block is added if there is no parent block.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block, $source_block, null );
-		$current_root_block = WP_Directive_Processor::$root_block;
-		$this->assertNotEmpty( $current_root_block );
-
-		// Test that a root block is not added if there is already a root block defined.
-		gutenberg_interactivity_mark_root_blocks( $parsed_block_second, $source_block, null );
-		$this->assertSame( $current_root_block, WP_Directive_Processor::$root_block );
+		'<!-- wp:test/context-level-1 /-->' .
+		'<!-- wp:test/context-level-2 /-->' .
+		'<!-- wp:paragraph --><p>Welcome</p><!-- /wp:paragraph -->';
+
+		$interactive_parsed_block = parse_blocks( $block_content )[0];
+
+		$rendered_content           = render_block( $interactive_parsed_block );
+		$parsed_block_second        = parse_blocks( $block_content )[1];
+		$non_interactive_root_block = parse_blocks( $block_content )[2];
+
+		// Test that root block is intially empty.
+		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
+
+		// Test that root block is not added if it is non interactive.
+		gutenberg_interactivity_mark_root_interactive_blocks( $non_interactive_root_block );
+		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
+
+		// Test that a non root block is added if it is interactive.
+		gutenberg_interactivity_mark_root_interactive_blocks( $interactive_parsed_block );
+		$this->assertNotEmpty( WP_Directive_Processor::$interactive_root_block );
+
+		// Test that an interactive block is not added if it has in interactive ancestor.
+		$current_root_block = WP_Directive_Processor::$interactive_root_block;
+		gutenberg_interactivity_mark_root_interactive_blocks( $parsed_block_second );
+		$this->assertSame( $current_root_block, WP_Directive_Processor::$interactive_root_block );
 
 		// Test that root block is removed after processing.
-		gutenberg_process_directives_in_root_blocks( $rendered_content, $parsed_block );
-		$this->assertEmpty( WP_Directive_Processor::$root_block );
+		gutenberg_process_directives_in_root_blocks( $rendered_content, $interactive_parsed_block );
+		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
 	}
 
 	public function test_directive_processing_of_interactive_block() {
@@ -220,7 +217,7 @@ public function test_non_interactive_children_of_interactive_is_rendered() {
 	}
 
 	public function test_non_interactive_blocks_are_not_processed() {
-		$post_content    = '<!-- wp:test/context-level-1 --><!-- wp:test/non-interactive-with-directive /--><!-- /wp:test/context-level-1 -->';
+		$post_content    = '<!-- wp:test/non-interactive-with-directive /-->';
 		$rendered_blocks = do_blocks( $post_content );
 		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
 		$p->next_tag( array( 'class_name' => 'non-interactive-with-directive' ) );
@@ -228,13 +225,13 @@ public function test_non_interactive_blocks_are_not_processed() {
 		$this->assertSame( null, $value );
 	}
 
-	public function test_non_interactive_blocks_with_manual_inner_block_rendering_are_not_processed() {
-		$post_content    = '<!-- wp:test/context-level-with-manual-inner-block-rendering --><!-- wp:test/non-interactive-with-directive /--><!-- /wp:test/context-level-with-manual-inner-block-rendering -->';
+	public function test_non_interactive_blocks_with_interactive_ancestor_are_processed() {
+		$post_content    = '<!-- wp:test/context-level-1 --><!-- wp:test/non-interactive-with-directive /--><!-- /wp:test/context-level-1 -->';
 		$rendered_blocks = do_blocks( $post_content );
 		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
 		$p->next_tag( array( 'class_name' => 'non-interactive-with-directive' ) );
 		$value = $p->get_attribute( 'value' );
-		$this->assertSame( null, $value );
+		$this->assertSame( 'level-1', $value );
 	}
 
 	public function test_directives_ordering() {

From 71da85aad57e9a0a2dcf3192149d1ee9ac2b112e Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Mon, 15 Jan 2024 16:12:49 -0600
Subject: [PATCH 118/296] Fix the iframe markup of the embed video in the Quick
 Start Guide (#57857)

* Use youtube shortcode to render video.

* Add iframe back without a wrapper div.
---
 docs/getting-started/quick-start-guide.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/getting-started/quick-start-guide.md b/docs/getting-started/quick-start-guide.md
index 75f68e1e6cd49..d218d0ee80607 100644
--- a/docs/getting-started/quick-start-guide.md
+++ b/docs/getting-started/quick-start-guide.md
@@ -2,7 +2,7 @@
 
 This guide is designed to demonstrate the basic principles of block development in WordPress using a hands-on approach. Following the steps below, you will create a custom block plugin that uses modern JavaScript (ESNext and JSX) in a matter of minutes. The example block displays the copyright symbol (©) and the current year, the perfect addition to any website's footer. You can see these steps in action through this short video demonstration.
 
-<div style="position:relative;overflow:hidden;padding-top:56.25%;"><iframe src="https://www.youtube.com/embed/nrut8SfXA44?si=YxvmHmAoYx-BDCog" title="WordPress Block Development: Quick Start Guide Video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="true" style="position:absolute;top:0;left:0;width:100%;max-width:960px;height:100%;max-height:540px;"></iframe></div>
+<iframe width="960" height="540" src="https://www.youtube.com/embed/nrut8SfXA44?si=YxvmHmAoYx-BDCog" title="WordPress Block Development: Quick Start Guide Video" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen="true"></iframe>
 
 ## Scaffold the block plugin
 

From 464961e7bc6bcd9386bd9bf88f830a76e2856b36 Mon Sep 17 00:00:00 2001
From: Brooke <35543432+brookewp@users.noreply.github.com>
Date: Mon, 15 Jan 2024 15:54:46 -0800
Subject: [PATCH 119/296] Components:  Add opt-in prop for 40px default size
 for `BoxControl`, `BorderControl`, and `BorderBoxControl` (#56185)

* Add 40px size to BoxControl

* Add 40px size to BorderControl

* Add 40px size to BorderBoxControl

* Move logic to hook for BorderControl

* Move logic to hook for `BorderBoxControl`

* Update changelog
---
 packages/components/CHANGELOG.md                      |  1 +
 .../border-box-control/component.tsx                  |  1 -
 .../src/border-box-control/border-box-control/hook.ts |  6 +++++-
 packages/components/src/border-box-control/types.ts   |  6 ++++++
 .../src/border-control/border-control/component.tsx   |  2 ++
 .../src/border-control/border-control/hook.ts         | 11 ++++++++---
 packages/components/src/border-control/types.ts       |  6 ++++++
 .../components/src/box-control/all-input-control.tsx  |  3 +++
 .../src/box-control/axial-input-controls.tsx          |  3 +++
 packages/components/src/box-control/index.tsx         |  2 ++
 .../components/src/box-control/input-controls.tsx     |  3 +++
 packages/components/src/box-control/types.ts          |  6 ++++++
 12 files changed, 45 insertions(+), 5 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 4152b3c654bab..ba0629eff7f37 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -37,6 +37,7 @@
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 -   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
 -   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
+-   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
 
 ### Experimental
 
diff --git a/packages/components/src/border-box-control/border-box-control/component.tsx b/packages/components/src/border-box-control/border-box-control/component.tsx
index 4f3517937f204..e329ac7c647cd 100644
--- a/packages/components/src/border-box-control/border-box-control/component.tsx
+++ b/packages/components/src/border-box-control/border-box-control/component.tsx
@@ -89,7 +89,6 @@ const UnconnectedBorderBoxControl = (
 		);
 
 	const mergedRef = useMergeRefs( [ setPopoverAnchor, forwardedRef ] );
-
 	return (
 		<View className={ className } { ...otherProps } ref={ mergedRef }>
 			<BorderLabel
diff --git a/packages/components/src/border-box-control/border-box-control/hook.ts b/packages/components/src/border-box-control/border-box-control/hook.ts
index a303e7d5a39e8..6756bd51188fb 100644
--- a/packages/components/src/border-box-control/border-box-control/hook.ts
+++ b/packages/components/src/border-box-control/border-box-control/hook.ts
@@ -35,9 +35,13 @@ export function useBorderBoxControl(
 		size = 'default',
 		value,
 		__experimentalIsRenderedInSidebar = false,
+		__next40pxDefaultSize,
 		...otherProps
 	} = useContextSystem( props, 'BorderBoxControl' );
 
+	const computedSize =
+		size === 'default' && __next40pxDefaultSize ? '__unstable-large' : size;
+
 	const mixedBorders = hasMixedBorders( value );
 	const splitBorders = hasSplitBorders( value );
 
@@ -133,7 +137,7 @@ export function useBorderBoxControl(
 		onSplitChange,
 		toggleLinked,
 		linkedValue,
-		size,
+		size: computedSize,
 		splitValue,
 		wrapperClassName,
 		__experimentalIsRenderedInSidebar,
diff --git a/packages/components/src/border-box-control/types.ts b/packages/components/src/border-box-control/types.ts
index 0b454d8ed0929..283faf05014a0 100644
--- a/packages/components/src/border-box-control/types.ts
+++ b/packages/components/src/border-box-control/types.ts
@@ -45,6 +45,12 @@ export type BorderBoxControlProps = ColorProps &
 		 * properties but for each side; `top`, `right`, `bottom`, and `left`.
 		 */
 		value: AnyBorder;
+		/**
+		 * Start opting into the larger default height that will become the default size in a future version.
+		 *
+		 * @default false
+		 */
+		__next40pxDefaultSize?: boolean;
 	};
 
 export type LinkedButtonProps = Pick< BorderBoxControlProps, 'size' > & {
diff --git a/packages/components/src/border-control/border-control/component.tsx b/packages/components/src/border-control/border-control/component.tsx
index 960be4bf171ea..197067c684373 100644
--- a/packages/components/src/border-control/border-control/component.tsx
+++ b/packages/components/src/border-control/border-control/component.tsx
@@ -38,6 +38,7 @@ const UnconnectedBorderControl = (
 	forwardedRef: React.ForwardedRef< any >
 ) => {
 	const {
+		__next40pxDefaultSize = false,
 		colors,
 		disableCustomColors,
 		disableUnits,
@@ -112,6 +113,7 @@ const UnconnectedBorderControl = (
 						step={ [ 'px', '%' ].includes( widthUnit ) ? 1 : 0.1 }
 						value={ widthValue || undefined }
 						withInputField={ false }
+						__next40pxDefaultSize={ __next40pxDefaultSize }
 					/>
 				) }
 			</HStack>
diff --git a/packages/components/src/border-control/border-control/hook.ts b/packages/components/src/border-control/border-control/hook.ts
index 63034527cfa1a..8a291c4112d91 100644
--- a/packages/components/src/border-control/border-control/hook.ts
+++ b/packages/components/src/border-control/border-control/hook.ts
@@ -41,9 +41,13 @@ export function useBorderControl(
 		value: border,
 		width,
 		__experimentalIsRenderedInSidebar = false,
+		__next40pxDefaultSize,
 		...otherProps
 	} = useContextSystem( props, 'BorderControl' );
 
+	const computedSize =
+		size === 'default' && __next40pxDefaultSize ? '__unstable-large' : size;
+
 	const [ widthValue, originalWidthUnit ] = parseQuantityAndUnitFromRawValue(
 		border?.width
 	);
@@ -130,10 +134,10 @@ export function useBorderControl(
 	}
 	const innerWrapperClassName = useMemo( () => {
 		const widthStyle = !! wrapperWidth && styles.wrapperWidth;
-		const heightStyle = styles.wrapperHeight( size );
+		const heightStyle = styles.wrapperHeight( computedSize );
 
 		return cx( styles.innerWrapper(), widthStyle, heightStyle );
-	}, [ wrapperWidth, cx, size ] );
+	}, [ wrapperWidth, cx, computedSize ] );
 
 	const sliderClassName = useMemo( () => {
 		return cx( styles.borderSlider() );
@@ -155,7 +159,8 @@ export function useBorderControl(
 		value: border,
 		widthUnit,
 		widthValue,
-		size,
+		size: computedSize,
 		__experimentalIsRenderedInSidebar,
+		__next40pxDefaultSize,
 	};
 }
diff --git a/packages/components/src/border-control/types.ts b/packages/components/src/border-control/types.ts
index 470b75df7c182..7752d9760ffe5 100644
--- a/packages/components/src/border-control/types.ts
+++ b/packages/components/src/border-control/types.ts
@@ -99,6 +99,12 @@ export type BorderControlProps = ColorProps &
 		 * `RangeControl` for additional control over a border's width.
 		 */
 		withSlider?: boolean;
+		/**
+		 * Start opting into the larger default height that will become the default size in a future version.
+		 *
+		 * @default false
+		 */
+		__next40pxDefaultSize?: boolean;
 	};
 
 export type DropdownProps = ColorProps &
diff --git a/packages/components/src/box-control/all-input-control.tsx b/packages/components/src/box-control/all-input-control.tsx
index 9c18694bbd0b6..fb65014dfaf0f 100644
--- a/packages/components/src/box-control/all-input-control.tsx
+++ b/packages/components/src/box-control/all-input-control.tsx
@@ -25,6 +25,7 @@ import {
 const noop = () => {};
 
 export default function AllInputControl( {
+	__next40pxDefaultSize,
 	onChange = noop,
 	onFocus = noop,
 	values,
@@ -74,6 +75,7 @@ export default function AllInputControl( {
 		<HStack>
 			<StyledUnitControl
 				{ ...props }
+				__next40pxDefaultSize={ __next40pxDefaultSize }
 				className="component-box-control__unit-control"
 				disableUnits={ isMixed }
 				id={ inputId }
@@ -89,6 +91,7 @@ export default function AllInputControl( {
 
 			<FlexedRangeControl
 				__nextHasNoMarginBottom
+				__next40pxDefaultSize={ __next40pxDefaultSize }
 				aria-controls={ inputId }
 				label={ LABELS.all }
 				hideLabelFromVision
diff --git a/packages/components/src/box-control/axial-input-controls.tsx b/packages/components/src/box-control/axial-input-controls.tsx
index 173605f68a872..c6c0181f6c871 100644
--- a/packages/components/src/box-control/axial-input-controls.tsx
+++ b/packages/components/src/box-control/axial-input-controls.tsx
@@ -20,6 +20,7 @@ const groupedSides = [ 'vertical', 'horizontal' ] as const;
 type GroupedSide = ( typeof groupedSides )[ number ];
 
 export default function AxialInputControls( {
+	__next40pxDefaultSize,
 	onChange,
 	onFocus,
 	values,
@@ -105,6 +106,7 @@ export default function AxialInputControls( {
 						<Tooltip placement="top-end" text={ LABELS[ side ] }>
 							<StyledUnitControl
 								{ ...props }
+								__next40pxDefaultSize={ __next40pxDefaultSize }
 								className="component-box-control__unit-control"
 								id={ inputId }
 								isPressEnterToChange
@@ -126,6 +128,7 @@ export default function AxialInputControls( {
 						</Tooltip>
 						<FlexedRangeControl
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize={ __next40pxDefaultSize }
 							aria-controls={ inputId }
 							label={ LABELS[ side ] }
 							hideLabelFromVision
diff --git a/packages/components/src/box-control/index.tsx b/packages/components/src/box-control/index.tsx
index dcc890e8e3c51..9c3452d4ccb80 100644
--- a/packages/components/src/box-control/index.tsx
+++ b/packages/components/src/box-control/index.tsx
@@ -72,6 +72,7 @@ function useUniqueId( idProp?: string ) {
  * ```
  */
 function BoxControl( {
+	__next40pxDefaultSize = false,
 	id: idProp,
 	inputProps = defaultInputProps,
 	onChange = noop,
@@ -151,6 +152,7 @@ function BoxControl( {
 		values: inputValues,
 		onMouseOver,
 		onMouseOut,
+		__next40pxDefaultSize,
 	};
 
 	return (
diff --git a/packages/components/src/box-control/input-controls.tsx b/packages/components/src/box-control/input-controls.tsx
index c8aaeae222749..553f547abf9b0 100644
--- a/packages/components/src/box-control/input-controls.tsx
+++ b/packages/components/src/box-control/input-controls.tsx
@@ -19,6 +19,7 @@ import type { BoxControlInputControlProps, BoxControlValue } from './types';
 const noop = () => {};
 
 export default function BoxInputControls( {
+	__next40pxDefaultSize,
 	onChange = noop,
 	onFocus = noop,
 	values,
@@ -107,6 +108,7 @@ export default function BoxInputControls( {
 						<Tooltip placement="top-end" text={ LABELS[ side ] }>
 							<StyledUnitControl
 								{ ...props }
+								__next40pxDefaultSize={ __next40pxDefaultSize }
 								className="component-box-control__unit-control"
 								id={ inputId }
 								isPressEnterToChange
@@ -131,6 +133,7 @@ export default function BoxInputControls( {
 
 						<FlexedRangeControl
 							__nextHasNoMarginBottom
+							__next40pxDefaultSize={ __next40pxDefaultSize }
 							aria-controls={ inputId }
 							label={ LABELS[ side ] }
 							hideLabelFromVision
diff --git a/packages/components/src/box-control/types.ts b/packages/components/src/box-control/types.ts
index 12524559564ab..eeb72df14bb9c 100644
--- a/packages/components/src/box-control/types.ts
+++ b/packages/components/src/box-control/types.ts
@@ -71,6 +71,12 @@ export type BoxControlProps = Pick<
 	 * The current values of the control, expressed as an object of `top`, `right`, `bottom`, and `left` values.
 	 */
 	values?: BoxControlValue;
+	/**
+	 * Start opting into the larger default height that will become the default size in a future version.
+	 *
+	 * @default false
+	 */
+	__next40pxDefaultSize?: boolean;
 };
 
 export type BoxControlInputControlProps = UnitControlPassthroughProps & {

From 46daa6ea3de69b8fe98ee2ce97890a29cde93487 Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Tue, 16 Jan 2024 14:40:29 +0800
Subject: [PATCH 120/296] Add `setGutenbergExperiments` to `requestUtils`
 (#56663)

* Add setGutenbergExperiments util

* Use it in one of the tests

* Fix test
---
 .../request-utils/gutenberg-experiments.ts    | 40 +++++++++++++++++++
 .../src/request-utils/index.ts                |  4 ++
 packages/e2e-tests/plugins/dataviews.php      | 25 ------------
 .../site-editor/new-templates-list.spec.js    |  4 +-
 4 files changed, 46 insertions(+), 27 deletions(-)
 create mode 100644 packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts
 delete mode 100644 packages/e2e-tests/plugins/dataviews.php

diff --git a/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts b/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts
new file mode 100644
index 0000000000000..6a21ba7d90aec
--- /dev/null
+++ b/packages/e2e-test-utils-playwright/src/request-utils/gutenberg-experiments.ts
@@ -0,0 +1,40 @@
+/**
+ * Internal dependencies
+ */
+import type { RequestUtils } from './index';
+
+/**
+ * Sets the Gutenberg experiments.
+ *
+ * @param this
+ * @param experiments Array of experimental flags to enable. Pass in an empty array to disable all experiments.
+ */
+async function setGutenbergExperiments(
+	this: RequestUtils,
+	experiments: string[]
+) {
+	const response = await this.request.get(
+		'/wp-admin/admin.php?page=gutenberg-experiments'
+	);
+	const html = await response.text();
+	const nonce = html.match( /name="_wpnonce" value="([^"]+)"/ )![ 1 ];
+
+	await this.request.post( '/wp-admin/options.php', {
+		form: {
+			option_page: 'gutenberg-experiments',
+			action: 'update',
+			_wpnonce: nonce,
+			_wp_http_referer: '/wp-admin/admin.php?page=gutenberg-experiments',
+			...Object.fromEntries(
+				experiments.map( ( experiment ) => [
+					`gutenberg-experiments[${ experiment }]`,
+					1,
+				] )
+			),
+			submit: 'Save Changes',
+		},
+		failOnStatusCode: true,
+	} );
+}
+
+export { setGutenbergExperiments };
diff --git a/packages/e2e-test-utils-playwright/src/request-utils/index.ts b/packages/e2e-test-utils-playwright/src/request-utils/index.ts
index 064894793b8f3..5036f3d0e8a97 100644
--- a/packages/e2e-test-utils-playwright/src/request-utils/index.ts
+++ b/packages/e2e-test-utils-playwright/src/request-utils/index.ts
@@ -36,6 +36,7 @@ import { resetPreferences } from './preferences';
 import { getSiteSettings, updateSiteSettings } from './site-settings';
 import { deleteAllWidgets, addWidgetBlock } from './widgets';
 import { deleteAllPatternCategories } from './patterns';
+import { setGutenbergExperiments } from './gutenberg-experiments';
 
 interface StorageState {
 	cookies: Cookie[];
@@ -205,6 +206,9 @@ class RequestUtils {
 		getThemeGlobalStylesRevisions.bind( this );
 	/** @borrows deleteAllPatternCategories as this.deleteAllPatternCategories */
 	deleteAllPatternCategories = deleteAllPatternCategories.bind( this );
+	/** @borrows setGutenbergExperiments as this.setGutenbergExperiments */
+	setGutenbergExperiments: typeof setGutenbergExperiments =
+		setGutenbergExperiments.bind( this );
 }
 
 export type { StorageState };
diff --git a/packages/e2e-tests/plugins/dataviews.php b/packages/e2e-tests/plugins/dataviews.php
deleted file mode 100644
index 60a611fcae8f1..0000000000000
--- a/packages/e2e-tests/plugins/dataviews.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Plugin Name: Gutenberg Test DataViews
- * Plugin URI: https://github.com/WordPress/gutenberg
- * Author: Gutenberg Team
- *
- * @package gutenberg-test-dataviews
- */
-
-/**
- * Disables the DataViews experiment on plugin deactivation.
- */
-function disable_dataviews_experiment() {
-	update_option( 'gutenberg-experiments', array() );
-}
-
-/**
- * Enables the DataViews experiment.
- */
-function enable_dataviews_experiment() {
-	update_option( 'gutenberg-experiments', array( 'gutenberg-dataviews' => true ) );
-	register_deactivation_hook( __FILE__, 'disable_dataviews_experiment' );
-}
-
-add_action( 'init', 'enable_dataviews_experiment' );
diff --git a/test/e2e/specs/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index df7f88b600442..13484abcb13ad 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -7,14 +7,14 @@ test.describe( 'Templates', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
-			requestUtils.activatePlugin( 'gutenberg-test-dataviews' ),
+			requestUtils.setGutenbergExperiments( [ 'gutenberg-dataviews' ] ),
 		] );
 	} );
 	test.afterAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'twentytwentyone' ),
-			requestUtils.deactivatePlugin( 'gutenberg-test-dataviews' ),
 			requestUtils.deleteAllTemplates( 'wp_template' ),
+			requestUtils.setGutenbergExperiments( [] ),
 		] );
 	} );
 	test( 'Sorting', async ( { admin, page } ) => {

From b8c177d255cf0b8bab7afa82bfbd40f93e69277f Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Tue, 16 Jan 2024 16:30:11 +0800
Subject: [PATCH 121/296] Add a basic e2e test for Pattern Overrides (#57792)

---
 .../editor/various/pattern-overrides.spec.js  | 219 ++++++++++++++++++
 1 file changed, 219 insertions(+)
 create mode 100644 test/e2e/specs/editor/various/pattern-overrides.spec.js

diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
new file mode 100644
index 0000000000000..818a05881f53e
--- /dev/null
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -0,0 +1,219 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+test.describe( 'Pattern Overrides', () => {
+	test.beforeAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.activateTheme( 'emptytheme' ),
+			requestUtils.setGutenbergExperiments( [
+				'gutenberg-pattern-partial-syncing',
+			] ),
+			requestUtils.deleteAllBlocks(),
+		] );
+	} );
+
+	test.afterEach( async ( { requestUtils } ) => {
+		await requestUtils.deleteAllBlocks();
+	} );
+
+	test.afterAll( async ( { requestUtils } ) => {
+		await Promise.all( [
+			requestUtils.setGutenbergExperiments( [] ),
+			requestUtils.activateTheme( 'twentytwentyone' ),
+		] );
+	} );
+
+	test( 'Create a pattern with overrides', async ( {
+		page,
+		admin,
+		editor,
+	} ) => {
+		let patternId;
+		let editableParagraphId;
+
+		await test.step( 'Create a synced pattern and assign blocks to allow overrides', async () => {
+			await admin.visitSiteEditor( { path: '/patterns' } );
+
+			await page
+				.getByRole( 'region', { name: 'Navigation' } )
+				.getByRole( 'button', { name: 'Create pattern' } )
+				.click();
+
+			await page
+				.getByRole( 'menu', { name: 'Create pattern' } )
+				.getByRole( 'menuitem', { name: 'Create pattern' } )
+				.click();
+
+			const createPatternDialog = page.getByRole( 'dialog', {
+				name: 'Create pattern',
+			} );
+			await createPatternDialog
+				.getByRole( 'textbox', { name: 'Name' } )
+				.fill( 'Pattern with overrides' );
+			await createPatternDialog
+				.getByRole( 'checkbox', { name: 'Synced' } )
+				.setChecked( true );
+			await createPatternDialog
+				.getByRole( 'button', { name: 'Create' } )
+				.click();
+
+			await editor.canvas
+				.getByRole( 'button', { name: 'Add default block' } )
+				.click();
+			await page.keyboard.type( 'This paragraph can be edited' );
+			await page.keyboard.press( 'Enter' );
+			await page.keyboard.type( "This one can't" );
+
+			await editor.canvas
+				.getByRole( 'document', { name: 'Block: Paragraph' } )
+				.filter( { hasText: 'This paragraph can be edited' } )
+				.focus();
+			await editor.openDocumentSettingsSidebar();
+			const editorSettings = page.getByRole( 'region', {
+				name: 'Editor settings',
+			} );
+			const advancedPanel = editorSettings.getByRole( 'button', {
+				name: 'Advanced',
+			} );
+			if (
+				( await advancedPanel.getAttribute( 'aria-expanded' ) ) ===
+				'false'
+			) {
+				await advancedPanel.click();
+			}
+			await editorSettings
+				.getByRole( 'checkbox', { name: 'Allow instance overrides' } )
+				.setChecked( true );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/paragraph',
+					attributes: {
+						content: 'This paragraph can be edited',
+						metadata: {
+							id: expect.any( String ),
+							bindings: {
+								content: {
+									source: { name: 'pattern_attributes' },
+								},
+							},
+						},
+					},
+				},
+				{
+					name: 'core/paragraph',
+					attributes: { content: "This one can't" },
+				},
+			] );
+
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+			await page
+				.getByRole( 'region', { name: 'Save panel' } )
+				.getByRole( 'button', { name: 'Save' } )
+				.click();
+
+			await expect(
+				page.getByRole( 'button', { name: 'Dismiss this notice' } )
+			).toBeVisible();
+
+			patternId = new URL( page.url() ).searchParams.get( 'postId' );
+			const blocks = await editor.getBlocks();
+			editableParagraphId = blocks[ 0 ].attributes.metadata.id;
+		} );
+
+		await test.step( 'Create a post and insert the pattern with overrides', async () => {
+			await admin.createNewPost();
+
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref: patternId },
+			} );
+			await editor.insertBlock( {
+				name: 'core/block',
+				attributes: { ref: patternId },
+			} );
+
+			const patternBlocks = editor.canvas.getByRole( 'document', {
+				name: 'Block: Pattern',
+			} );
+			const paragraphs = patternBlocks.first().getByRole( 'document', {
+				name: 'Block: Paragraph',
+			} );
+			await expect( paragraphs.first() ).not.toHaveAttribute(
+				'inert',
+				'true'
+			);
+			await expect( paragraphs.last() ).toHaveAttribute(
+				'inert',
+				'true'
+			);
+
+			await expect( paragraphs.first() ).toHaveText(
+				'This paragraph can be edited'
+			);
+
+			await paragraphs.first().selectText();
+			await page.keyboard.type( 'I would word it this way' );
+
+			await patternBlocks
+				.last()
+				.getByRole( 'document', {
+					name: 'Block: Paragraph',
+				} )
+				.first()
+				.selectText();
+			await page.keyboard.type( 'This one is different' );
+
+			await expect.poll( editor.getBlocks ).toMatchObject( [
+				{
+					name: 'core/block',
+					attributes: {
+						ref: patternId,
+						overrides: {
+							[ editableParagraphId ]: {
+								content: 'I would word it this way',
+							},
+						},
+					},
+				},
+				{
+					name: 'core/block',
+					attributes: {
+						ref: patternId,
+						overrides: {
+							[ editableParagraphId ]: {
+								content: 'This one is different',
+							},
+						},
+					},
+				},
+			] );
+
+			await page
+				.getByRole( 'region', { name: 'Editor top bar' } )
+				.getByRole( 'button', { name: 'Publish' } )
+				.click();
+			const editorPublishPanel = page.getByRole( 'region', {
+				name: 'Editor publish',
+			} );
+			await editorPublishPanel
+				.getByRole( 'button', { name: 'Publish', exact: true } )
+				.click();
+			await editorPublishPanel
+				.getByRole( 'link', { name: 'View post' } )
+				.click();
+
+			await expect( page.locator( 'p' ) ).toContainText( [
+				'I would word it this way',
+				'This one can’t',
+				'This one is different',
+				'This one can’t',
+			] );
+		} );
+	} );
+} );

From f6d29bd18e538ff63a52c7984376df58b5730a15 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Tue, 16 Jan 2024 09:52:41 +0100
Subject: [PATCH 122/296] Interactivity API: Remove `data-wp-slot` and 
 `data-wp-fill` (#57854)

* Remove slot and fill directives

* Remove slots tests

* Update changelog
---
 .../directive-slots/block.json                |  15 --
 .../directive-slots/render.php                |  69 -------
 .../directive-slots/view.js                   |  20 --
 packages/interactivity/CHANGELOG.md           |   4 +
 packages/interactivity/src/directives.js      |  59 ------
 packages/interactivity/src/slots.js           |  38 ----
 .../interactivity/directive-slots.spec.ts     | 186 ------------------
 7 files changed, 4 insertions(+), 387 deletions(-)
 delete mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
 delete mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php
 delete mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js
 delete mode 100644 packages/interactivity/src/slots.js
 delete mode 100644 test/e2e/specs/interactivity/directive-slots.spec.ts

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
deleted file mode 100644
index 6139c4e062040..0000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/block.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-	"$schema": "https://schemas.wp.org/trunk/block.json",
-	"apiVersion": 2,
-	"name": "test/directive-slots",
-	"title": "E2E Interactivity tests - directive slots",
-	"category": "text",
-	"icon": "heart",
-	"description": "",
-	"supports": {
-		"interactivity": true
-	},
-	"textdomain": "e2e-interactivity",
-	"viewScript": "directive-slots-view",
-	"render": "file:./render.php"
-}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php
deleted file mode 100644
index c9a989ccaf027..0000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/render.php
+++ /dev/null
@@ -1,69 +0,0 @@
-<?php
-/**
- * HTML for testing the directive `data-wp-bind`.
- *
- * @package gutenberg-test-interactive-blocks
- */
-
-gutenberg_enqueue_module( 'directive-slots-view' );
-?>
-
-<div
-	data-wp-interactive='{ "namespace": "directive-slots" }'
-	data-wp-slot-provider
-	data-wp-context='{ "text": "fill" }'
->
-	<div data-testid="slots" data-wp-context='{ "text": "fill inside slots" }'>
-		<div
-			data-testid="slot-1"
-			data-wp-key="slot-1"
-			data-wp-slot="slot-1"
-			data-wp-context='{ "text": "fill inside slot 1" }'
-		>[1]</div>
-		<div
-			data-testid="slot-2"
-			data-wp-key="slot-2"
-			data-wp-slot='{ "name": "slot-2", "position": "before" }'
-			data-wp-context='{ "text": "[2]" }'
-			data-wp-text='context.text'
-			data-wp-on--click="actions.updateSlotText"
-		>[2]</div>
-		<div
-			data-testid="slot-3"
-			data-wp-key="slot-3"
-			data-wp-slot='{ "name": "slot-3", "position": "after" }'
-			data-wp-context='{ "text": "[3]" }'
-			data-wp-text='context.text'
-			data-wp-on--click="actions.updateSlotText"
-		>[3]</div>
-		<div
-			data-testid="slot-4"
-			data-wp-key="slot-4"
-			data-wp-slot='{ "name": "slot-4", "position": "children" }'
-			data-wp-context='{ "text": "fill inside slot 4" }'
-		>[4]</div>
-		<div
-			data-testid="slot-5"
-			data-wp-key="slot-5"
-			data-wp-slot='{ "name": "slot-5", "position": "replace" }'
-			data-wp-context='{ "text": "fill inside slot 5" }'
-		>[5]</div>
-	</div>
-
-	<div data-testid="fill-container">
-		<span
-			data-testid="fill"
-			data-wp-fill="state.slot"
-			data-wp-text="context.text"
-		>initial</span>
-	</div>
-
-	<div data-wp-on--click="actions.changeSlot">
-		<button data-testid="slot-1-button" data-slot="slot-1">slot-1</button>
-		<button data-testid="slot-2-button" data-slot="slot-2">slot-2</button>
-		<button data-testid="slot-3-button" data-slot="slot-3">slot-3</button>
-		<button data-testid="slot-4-button" data-slot="slot-4">slot-4</button>
-		<button data-testid="slot-5-button" data-slot="slot-5">slot-5</button>
-		<button data-testid="reset" data-slot="">reset</button>
-	</div>
-</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js
deleted file mode 100644
index a8673fea9eba9..0000000000000
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-slots/view.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { store, getContext } from '@wordpress/interactivity';
-
-const { state } = store( 'directive-slots', {
-	state: {
-		slot: '',
-	},
-	actions: {
-		changeSlot( event ) {
-			state.slot = event.target.dataset.slot;
-		},
-		updateSlotText() {
-			const context = getContext();
-			const n = context.text[ 1 ];
-			context.text = `[${ n } updated]`;
-		},
-	},
-} );
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index ff0c4942abb3f..db396cfa11de1 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -6,6 +6,10 @@
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
 
+### Breaking Change
+
+-	Remove `data-wp-slot` and  `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
+
 ### Bug Fix
 
 -   Fix namespaces when there are nested interactive regions. ([#57029](https://github.com/WordPress/gutenberg/pull/57029))
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index e9cc66fa50a6f..cddab32079823 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -16,7 +16,6 @@ import { deepSignal, peek } from 'deepsignal';
 import { createPortal } from './portals';
 import { useWatch, useInit } from './utils';
 import { directive } from './hooks';
-import { SlotProvider, Slot, Fill } from './slots';
 import { navigate } from './router';
 
 const isObject = ( item ) =>
@@ -333,64 +332,6 @@ export default () => {
 		element.props.children = evaluate( entry );
 	} );
 
-	// data-wp-slot
-	directive(
-		'slot',
-		( { directives: { slot }, props: { children }, element } ) => {
-			const { value } = slot.find(
-				( { suffix } ) => suffix === 'default'
-			);
-			const name = typeof value === 'string' ? value : value.name;
-			const position = value.position || 'children';
-
-			if ( position === 'before' ) {
-				return (
-					<>
-						<Slot name={ name } />
-						{ children }
-					</>
-				);
-			}
-			if ( position === 'after' ) {
-				return (
-					<>
-						{ children }
-						<Slot name={ name } />
-					</>
-				);
-			}
-			if ( position === 'replace' ) {
-				return <Slot name={ name }>{ children }</Slot>;
-			}
-			if ( position === 'children' ) {
-				element.props.children = (
-					<Slot name={ name }>{ element.props.children }</Slot>
-				);
-			}
-		},
-		{ priority: 4 }
-	);
-
-	// data-wp-fill
-	directive(
-		'fill',
-		( { directives: { fill }, props: { children }, evaluate } ) => {
-			const entry = fill.find( ( { suffix } ) => suffix === 'default' );
-			const slot = evaluate( entry );
-			return <Fill slot={ slot }>{ children }</Fill>;
-		},
-		{ priority: 4 }
-	);
-
-	// data-wp-slot-provider
-	directive(
-		'slot-provider',
-		( { props: { children } } ) => (
-			<SlotProvider>{ children }</SlotProvider>
-		),
-		{ priority: 4 }
-	);
-
 	// data-wp-run
 	directive( 'run', ( { directives: { run }, evaluate } ) => {
 		run.forEach( ( entry ) => evaluate( entry ) );
diff --git a/packages/interactivity/src/slots.js b/packages/interactivity/src/slots.js
deleted file mode 100644
index e8bc6ddfa368f..0000000000000
--- a/packages/interactivity/src/slots.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/**
- * External dependencies
- */
-import { createContext } from 'preact';
-import { useContext, useEffect } from 'preact/hooks';
-import { signal } from '@preact/signals';
-
-const slotsContext = createContext();
-
-export const Fill = ( { slot, children } ) => {
-	const slots = useContext( slotsContext );
-
-	useEffect( () => {
-		if ( slot ) {
-			slots.value = { ...slots.value, [ slot ]: children };
-			return () => {
-				slots.value = { ...slots.value, [ slot ]: null };
-			};
-		}
-	}, [ slots, slot, children ] );
-
-	return !! slot ? null : children;
-};
-
-export const SlotProvider = ( { children } ) => {
-	return (
-		// TODO: We can change this to use deepsignal once this PR is merged.
-		// https://github.com/luisherranz/deepsignal/pull/38
-		<slotsContext.Provider value={ signal( {} ) }>
-			{ children }
-		</slotsContext.Provider>
-	);
-};
-
-export const Slot = ( { name, children } ) => {
-	const slots = useContext( slotsContext );
-	return slots.value[ name ] || children;
-};
diff --git a/test/e2e/specs/interactivity/directive-slots.spec.ts b/test/e2e/specs/interactivity/directive-slots.spec.ts
deleted file mode 100644
index 195af52fdb1bd..0000000000000
--- a/test/e2e/specs/interactivity/directive-slots.spec.ts
+++ /dev/null
@@ -1,186 +0,0 @@
-/**
- * Internal dependencies
- */
-import { test, expect } from './fixtures';
-
-test.describe( 'data-wp-slot', () => {
-	test.beforeAll( async ( { interactivityUtils: utils } ) => {
-		await utils.activatePlugins();
-		await utils.addPostWithBlock( 'test/directive-slots' );
-	} );
-
-	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
-		await page.goto( utils.getLink( 'test/directive-slots' ) );
-	} );
-
-	test.afterAll( async ( { interactivityUtils: utils } ) => {
-		await utils.deactivatePlugins();
-		await utils.deleteAllPosts();
-	} );
-
-	test( 'should render the fill in its children by default', async ( {
-		page,
-	} ) => {
-		const slot1 = page.getByTestId( 'slot-1' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-1-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot1.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slot1 ).toHaveText( 'fill inside slot 1' );
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'fill inside slot 1',
-			'[2]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill before if specified', async ( { page } ) => {
-		const slot2 = page.getByTestId( 'slot-2' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-2-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot2 ).toHaveText( '[2]' );
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'fill inside slots',
-			'[2]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill after if specified', async ( { page } ) => {
-		const slot3 = page.getByTestId( 'slot-3' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-3-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot3 ).toHaveText( '[3]' );
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'fill inside slots',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should render the fill in its children if specified', async ( {
-		page,
-	} ) => {
-		const slot4 = page.getByTestId( 'slot-4' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-4-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot4.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slot4 ).toHaveText( 'fill inside slot 4' );
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'fill inside slot 4',
-			'[5]',
-		] );
-	} );
-
-	test( 'should be replaced by the fill if specified', async ( { page } ) => {
-		const slot5 = page.getByTestId( 'slot-5' );
-		const slots = page.getByTestId( 'slots' );
-		const fillContainer = page.getByTestId( 'fill-container' );
-
-		await page.getByTestId( 'slot-5-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-		await expect( slot5 ).toBeHidden();
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3]',
-			'[4]',
-			'fill inside slots',
-		] );
-	} );
-
-	test( 'should keep the fill in its original position if no slot matches', async ( {
-		page,
-	} ) => {
-		const fillContainer = page.getByTestId( 'fill-container' );
-		await expect( fillContainer.getByTestId( 'fill' ) ).toBeVisible();
-
-		await page.getByTestId( 'slot-1-button' ).click();
-
-		await expect( fillContainer ).toBeEmpty();
-
-		await page.getByTestId( 'reset' ).click();
-
-		await expect( fillContainer.getByTestId( 'fill' ) ).toBeVisible();
-	} );
-
-	test( 'should not be re-mounted when adding the fill before', async ( {
-		page,
-	} ) => {
-		const slot2 = page.getByTestId( 'slot-2' );
-		const slots = page.getByTestId( 'slots' );
-
-		await expect( slot2 ).toHaveText( '[2]' );
-
-		await slot2.click();
-
-		await expect( slot2 ).toHaveText( '[2 updated]' );
-
-		await page.getByTestId( 'slot-2-button' ).click();
-
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'fill inside slots',
-			'[2 updated]',
-			'[3]',
-			'[4]',
-			'[5]',
-		] );
-	} );
-
-	test( 'should not be re-mounted when adding the fill after', async ( {
-		page,
-	} ) => {
-		const slot3 = page.getByTestId( 'slot-3' );
-		const slots = page.getByTestId( 'slots' );
-
-		await expect( slot3 ).toHaveText( '[3]' );
-
-		await slot3.click();
-
-		await expect( slot3 ).toHaveText( '[3 updated]' );
-
-		await page.getByTestId( 'slot-3-button' ).click();
-
-		await expect( slots.getByTestId( 'fill' ) ).toBeVisible();
-		await expect( slots.locator( 'css= > *' ) ).toHaveText( [
-			'[1]',
-			'[2]',
-			'[3 updated]',
-			'fill inside slots',
-			'[4]',
-			'[5]',
-		] );
-	} );
-} );

From 45eb9a5b1e3aa57b163ec8f1651e89881ca22773 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:17:44 +0100
Subject: [PATCH 123/296] Editor styles: memo transform (#57810)

---
 .../src/utils/transform-styles/index.js       | 89 +++++++++++--------
 1 file changed, 52 insertions(+), 37 deletions(-)

diff --git a/packages/block-editor/src/utils/transform-styles/index.js b/packages/block-editor/src/utils/transform-styles/index.js
index 742e3a9becaef..808566776f6ea 100644
--- a/packages/block-editor/src/utils/transform-styles/index.js
+++ b/packages/block-editor/src/utils/transform-styles/index.js
@@ -5,6 +5,52 @@ import postcss, { CssSyntaxError } from 'postcss';
 import wrap from 'postcss-prefixwrap';
 import rebaseUrl from 'postcss-urlrebase';
 
+const transformStylesCache = new WeakMap();
+
+function transformStyle(
+	{ css, ignoredSelectors = [], baseURL },
+	wrapperSelector = ''
+) {
+	// When there is no wrapper selector or base URL, there is no need
+	// to transform the CSS. This is most cases because in the default
+	// iframed editor, no wrapping is needed, and not many styles
+	// provide a base URL.
+	if ( ! wrapperSelector && ! baseURL ) {
+		return css;
+	}
+
+	try {
+		return postcss(
+			[
+				wrapperSelector &&
+					wrap( wrapperSelector, {
+						ignoredSelectors: [
+							...ignoredSelectors,
+							wrapperSelector,
+						],
+					} ),
+				baseURL && rebaseUrl( { rootUrl: baseURL } ),
+			].filter( Boolean )
+		).process( css, {} ).css; // use sync PostCSS API
+	} catch ( error ) {
+		if ( error instanceof CssSyntaxError ) {
+			// eslint-disable-next-line no-console
+			console.warn(
+				'wp.blockEditor.transformStyles Failed to transform CSS.',
+				error.message + '\n' + error.showSourceCode( false )
+			);
+		} else {
+			// eslint-disable-next-line no-console
+			console.warn(
+				'wp.blockEditor.transformStyles Failed to transform CSS.',
+				error
+			);
+		}
+
+		return null;
+	}
+}
+
 /**
  * Applies a series of CSS rule transforms to wrap selectors inside a given class and/or rewrite URLs depending on the parameters passed.
  *
@@ -18,45 +64,14 @@ import rebaseUrl from 'postcss-urlrebase';
  * @return {Array} converted rules.
  */
 const transformStyles = ( styles, wrapperSelector = '' ) => {
-	return styles.map( ( { css, ignoredSelectors = [], baseURL } ) => {
-		// When there is no wrapper selector or base URL, there is no need
-		// to transform the CSS. This is most cases because in the default
-		// iframed editor, no wrapping is needed, and not many styles
-		// provide a base URL.
-		if ( ! wrapperSelector && ! baseURL ) {
-			return css;
+	return styles.map( ( style ) => {
+		if ( transformStylesCache.has( style ) ) {
+			return transformStylesCache.get( style );
 		}
 
-		try {
-			return postcss(
-				[
-					wrapperSelector &&
-						wrap( wrapperSelector, {
-							ignoredSelectors: [
-								...ignoredSelectors,
-								wrapperSelector,
-							],
-						} ),
-					baseURL && rebaseUrl( { rootUrl: baseURL } ),
-				].filter( Boolean )
-			).process( css, {} ).css; // use sync PostCSS API
-		} catch ( error ) {
-			if ( error instanceof CssSyntaxError ) {
-				// eslint-disable-next-line no-console
-				console.warn(
-					'wp.blockEditor.transformStyles Failed to transform CSS.',
-					error.message + '\n' + error.showSourceCode( false )
-				);
-			} else {
-				// eslint-disable-next-line no-console
-				console.warn(
-					'wp.blockEditor.transformStyles Failed to transform CSS.',
-					error
-				);
-			}
-
-			return null;
-		}
+		const transformedStyle = transformStyle( style, wrapperSelector );
+		transformStylesCache.set( style, transformedStyle );
+		return transformedStyle;
 	} );
 };
 

From 33b6e641d6f3737a8880d22bad77cb4ee53be602 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 16 Jan 2024 10:21:09 +0100
Subject: [PATCH 124/296] Iframe: calc compat styles once per page load
 (#57798)

---
 .../iframe/get-compatibility-styles.js        | 120 +++++++++++++++++
 .../src/components/iframe/index.js            |   5 +-
 .../iframe/use-compatibility-styles.js        | 122 ------------------
 3 files changed, 122 insertions(+), 125 deletions(-)
 create mode 100644 packages/block-editor/src/components/iframe/get-compatibility-styles.js
 delete mode 100644 packages/block-editor/src/components/iframe/use-compatibility-styles.js

diff --git a/packages/block-editor/src/components/iframe/get-compatibility-styles.js b/packages/block-editor/src/components/iframe/get-compatibility-styles.js
new file mode 100644
index 0000000000000..ab80e0e8eb43e
--- /dev/null
+++ b/packages/block-editor/src/components/iframe/get-compatibility-styles.js
@@ -0,0 +1,120 @@
+let compatibilityStyles = null;
+
+/**
+ * Returns a list of stylesheets that target the editor canvas. A stylesheet is
+ * considered targetting the editor a canvas if it contains the
+ * `editor-styles-wrapper`, `wp-block`, or `wp-block-*` class selectors.
+ *
+ * Ideally, this hook should be removed in the future and styles should be added
+ * explicitly as editor styles.
+ */
+export function getCompatibilityStyles() {
+	if ( compatibilityStyles ) {
+		return compatibilityStyles;
+	}
+
+	// Only memoize the result once on load, since these stylesheets should not
+	// change.
+	compatibilityStyles = Array.from( document.styleSheets ).reduce(
+		( accumulator, styleSheet ) => {
+			try {
+				// May fail for external styles.
+				// eslint-disable-next-line no-unused-expressions
+				styleSheet.cssRules;
+			} catch ( e ) {
+				return accumulator;
+			}
+
+			const { ownerNode, cssRules } = styleSheet;
+
+			// Stylesheet is added by another stylesheet. See
+			// https://developer.mozilla.org/en-US/docs/Web/API/StyleSheet/ownerNode#notes.
+			if ( ownerNode === null ) {
+				return accumulator;
+			}
+
+			if ( ! cssRules ) {
+				return accumulator;
+			}
+
+			// Don't try to add the reset styles, which were removed as a dependency
+			// from `edit-blocks` for the iframe since we don't need to reset admin
+			// styles.
+			if ( ownerNode.id === 'wp-reset-editor-styles-css' ) {
+				return accumulator;
+			}
+
+			// Don't try to add styles without ID. Styles enqueued via the WP dependency system will always have IDs.
+			if ( ! ownerNode.id ) {
+				return accumulator;
+			}
+
+			function matchFromRules( _cssRules ) {
+				return Array.from( _cssRules ).find(
+					( {
+						selectorText,
+						conditionText,
+						cssRules: __cssRules,
+					} ) => {
+						// If the rule is conditional then it will not have selector text.
+						// Recurse into child CSS ruleset to determine selector eligibility.
+						if ( conditionText ) {
+							return matchFromRules( __cssRules );
+						}
+
+						return (
+							selectorText &&
+							( selectorText.includes(
+								'.editor-styles-wrapper'
+							) ||
+								selectorText.includes( '.wp-block' ) )
+						);
+					}
+				);
+			}
+
+			if ( matchFromRules( cssRules ) ) {
+				const isInline = ownerNode.tagName === 'STYLE';
+
+				if ( isInline ) {
+					// If the current target is inline,
+					// it could be a dependency of an existing stylesheet.
+					// Look for that dependency and add it BEFORE the current target.
+					const mainStylesCssId = ownerNode.id.replace(
+						'-inline-css',
+						'-css'
+					);
+					const mainStylesElement =
+						document.getElementById( mainStylesCssId );
+					if ( mainStylesElement ) {
+						accumulator.push( mainStylesElement.cloneNode( true ) );
+					}
+				}
+
+				accumulator.push( ownerNode.cloneNode( true ) );
+
+				if ( ! isInline ) {
+					// If the current target is not inline,
+					// we still look for inline styles that could be relevant for the current target.
+					// If they exist, add them AFTER the current target.
+					const inlineStylesCssId = ownerNode.id.replace(
+						'-css',
+						'-inline-css'
+					);
+					const inlineStylesElement =
+						document.getElementById( inlineStylesCssId );
+					if ( inlineStylesElement ) {
+						accumulator.push(
+							inlineStylesElement.cloneNode( true )
+						);
+					}
+				}
+			}
+
+			return accumulator;
+		},
+		[]
+	);
+
+	return compatibilityStyles;
+}
diff --git a/packages/block-editor/src/components/iframe/index.js b/packages/block-editor/src/components/iframe/index.js
index 1939f75811c8c..de482c5f059dc 100644
--- a/packages/block-editor/src/components/iframe/index.js
+++ b/packages/block-editor/src/components/iframe/index.js
@@ -28,7 +28,7 @@ import { useSelect } from '@wordpress/data';
  */
 import { useBlockSelectionClearer } from '../block-selection-clearer';
 import { useWritingFlow } from '../writing-flow';
-import { useCompatibilityStyles } from './use-compatibility-styles';
+import { getCompatibilityStyles } from './get-compatibility-styles';
 import { store as blockEditorStore } from '../../store';
 
 function bubbleEvent( event, Constructor, frame ) {
@@ -121,7 +121,6 @@ function Iframe( {
 	const { styles = '', scripts = '' } = resolvedAssets;
 	const [ iframeDocument, setIframeDocument ] = useState();
 	const [ bodyClasses, setBodyClasses ] = useState( [] );
-	const compatStyles = useCompatibilityStyles();
 	const clearerRef = useBlockSelectionClearer();
 	const [ before, writingFlowRef, after ] = useWritingFlow();
 	const [ contentResizeListener, { height: contentHeight } ] =
@@ -156,7 +155,7 @@ function Iframe( {
 
 			contentDocument.dir = ownerDocument.dir;
 
-			for ( const compatStyle of compatStyles ) {
+			for ( const compatStyle of getCompatibilityStyles() ) {
 				if ( contentDocument.getElementById( compatStyle.id ) ) {
 					continue;
 				}
diff --git a/packages/block-editor/src/components/iframe/use-compatibility-styles.js b/packages/block-editor/src/components/iframe/use-compatibility-styles.js
deleted file mode 100644
index eb738c7ebefdf..0000000000000
--- a/packages/block-editor/src/components/iframe/use-compatibility-styles.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-
-/**
- * Returns a list of stylesheets that target the editor canvas. A stylesheet is
- * considered targetting the editor a canvas if it contains the
- * `editor-styles-wrapper`, `wp-block`, or `wp-block-*` class selectors.
- *
- * Ideally, this hook should be removed in the future and styles should be added
- * explicitly as editor styles.
- */
-export function useCompatibilityStyles() {
-	// Only memoize the result once on load, since these stylesheets should not
-	// change.
-	return useMemo( () => {
-		// Search the document for stylesheets targetting the editor canvas.
-		return Array.from( document.styleSheets ).reduce(
-			( accumulator, styleSheet ) => {
-				try {
-					// May fail for external styles.
-					// eslint-disable-next-line no-unused-expressions
-					styleSheet.cssRules;
-				} catch ( e ) {
-					return accumulator;
-				}
-
-				const { ownerNode, cssRules } = styleSheet;
-
-				// Stylesheet is added by another stylesheet. See
-				// https://developer.mozilla.org/en-US/docs/Web/API/StyleSheet/ownerNode#notes.
-				if ( ownerNode === null ) {
-					return accumulator;
-				}
-
-				if ( ! cssRules ) {
-					return accumulator;
-				}
-
-				// Don't try to add the reset styles, which were removed as a dependency
-				// from `edit-blocks` for the iframe since we don't need to reset admin
-				// styles.
-				if ( ownerNode.id === 'wp-reset-editor-styles-css' ) {
-					return accumulator;
-				}
-
-				// Don't try to add styles without ID. Styles enqueued via the WP dependency system will always have IDs.
-				if ( ! ownerNode.id ) {
-					return accumulator;
-				}
-
-				function matchFromRules( _cssRules ) {
-					return Array.from( _cssRules ).find(
-						( {
-							selectorText,
-							conditionText,
-							cssRules: __cssRules,
-						} ) => {
-							// If the rule is conditional then it will not have selector text.
-							// Recurse into child CSS ruleset to determine selector eligibility.
-							if ( conditionText ) {
-								return matchFromRules( __cssRules );
-							}
-
-							return (
-								selectorText &&
-								( selectorText.includes(
-									'.editor-styles-wrapper'
-								) ||
-									selectorText.includes( '.wp-block' ) )
-							);
-						}
-					);
-				}
-
-				if ( matchFromRules( cssRules ) ) {
-					const isInline = ownerNode.tagName === 'STYLE';
-
-					if ( isInline ) {
-						// If the current target is inline,
-						// it could be a dependency of an existing stylesheet.
-						// Look for that dependency and add it BEFORE the current target.
-						const mainStylesCssId = ownerNode.id.replace(
-							'-inline-css',
-							'-css'
-						);
-						const mainStylesElement =
-							document.getElementById( mainStylesCssId );
-						if ( mainStylesElement ) {
-							accumulator.push(
-								mainStylesElement.cloneNode( true )
-							);
-						}
-					}
-
-					accumulator.push( ownerNode.cloneNode( true ) );
-
-					if ( ! isInline ) {
-						// If the current target is not inline,
-						// we still look for inline styles that could be relevant for the current target.
-						// If they exist, add them AFTER the current target.
-						const inlineStylesCssId = ownerNode.id.replace(
-							'-css',
-							'-inline-css'
-						);
-						const inlineStylesElement =
-							document.getElementById( inlineStylesCssId );
-						if ( inlineStylesElement ) {
-							accumulator.push(
-								inlineStylesElement.cloneNode( true )
-							);
-						}
-					}
-				}
-
-				return accumulator;
-			},
-			[]
-		);
-	}, [] );
-}

From d452cb429a259867d04dc6c94913fc642412eed9 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Tue, 16 Jan 2024 19:09:02 +0900
Subject: [PATCH 125/296] Pullquote Block: Add padding and margin support
 (#45731)

* Pullquote Block: Add padding and margin support

* Update padding styles

* Don't use __experimentalStyle
---
 docs/reference-guides/core-blocks.md            |  2 +-
 packages/block-library/src/pullquote/block.json |  4 ++++
 packages/block-library/src/pullquote/style.scss | 14 +++++++++++++-
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 84396caefbf47..bee68530eeb23 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -694,7 +694,7 @@ Give special visual emphasis to a quote from your text. ([Source](https://github
 
 -	**Name:** core/pullquote
 -	**Category:** text
--	**Supports:** align (full, left, right, wide), anchor, color (background, gradients, link, text), typography (fontSize, lineHeight)
+-	**Supports:** align (full, left, right, wide), anchor, color (background, gradients, link, text), spacing (margin, padding), typography (fontSize, lineHeight)
 -	**Attributes:** citation, textAlign, value
 
 ## Query Loop
diff --git a/packages/block-library/src/pullquote/block.json b/packages/block-library/src/pullquote/block.json
index 7fc81d5683bd1..f041d46cda8cd 100644
--- a/packages/block-library/src/pullquote/block.json
+++ b/packages/block-library/src/pullquote/block.json
@@ -35,6 +35,10 @@
 				"text": true
 			}
 		},
+		"spacing": {
+			"margin": true,
+			"padding": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/packages/block-library/src/pullquote/style.scss b/packages/block-library/src/pullquote/style.scss
index 94d043d1cf2f5..b53dbf6561638 100644
--- a/packages/block-library/src/pullquote/style.scss
+++ b/packages/block-library/src/pullquote/style.scss
@@ -1,5 +1,5 @@
 .wp-block-pullquote {
-	padding: 3em 0;
+	padding: 4em 0;
 	text-align: center; // Default text-alignment where the `textAlign` attribute value isn't specified.
 	overflow-wrap: break-word; // Break long strings of text without spaces so they don't overflow the block.
 	box-sizing: border-box;
@@ -10,6 +10,18 @@
 		color: inherit;
 	}
 
+	blockquote {
+		margin: 0;
+	}
+
+	p {
+		margin-top: 0;
+
+		&:last-child {
+			margin-bottom: 0;
+		}
+	}
+
 	&.alignleft,
 	&.alignright {
 		max-width: $content-width * 0.5;

From 23c3a67638901517df76dced33c73e6392171952 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Tue, 16 Jan 2024 11:47:18 +0100
Subject: [PATCH 126/296] Make the site hub View Site link always visible.
 (#57423)

---
 packages/edit-site/src/components/site-hub/index.js |  5 ++++-
 .../edit-site/src/components/site-hub/style.scss    | 13 +------------
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/packages/edit-site/src/components/site-hub/index.js b/packages/edit-site/src/components/site-hub/index.js
index 7af0d53090c57..f79df2df36709 100644
--- a/packages/edit-site/src/components/site-hub/index.js
+++ b/packages/edit-site/src/components/site-hub/index.js
@@ -180,7 +180,10 @@ const SiteHub = memo( ( { isTransparent, className } ) => {
 								'View site (opens in a new tab)'
 							) }
 							icon={ external }
-							className="edit-site-site-hub__site-view-link"
+							className={ classnames(
+								'edit-site-site-hub__site-view-link',
+								{ 'is-transparent': isTransparent }
+							) }
 						/>
 					) }
 				</HStack>
diff --git a/packages/edit-site/src/components/site-hub/style.scss b/packages/edit-site/src/components/site-hub/style.scss
index 0fda40c2e8a9a..ef063c39841fc 100644
--- a/packages/edit-site/src/components/site-hub/style.scss
+++ b/packages/edit-site/src/components/site-hub/style.scss
@@ -9,6 +9,7 @@
 	}
 
 	.edit-site-site-hub__site-title,
+	.edit-site-site-hub__site-view-link,
 	.edit-site-site-hub_toggle-command-center {
 		transition: opacity ease 0.1s;
 
@@ -20,22 +21,10 @@
 	.edit-site-site-hub__site-view-link {
 		flex-grow: 0;
 		margin-right: var(--wp-admin-border-width-focus);
-		@include break-mobile() {
-			opacity: 0;
-			transition: opacity 0.2s ease-in-out;
-		}
-		&:focus {
-			opacity: 1;
-		}
 		svg {
 			fill: $gray-200;
 		}
 	}
-	&:hover {
-		.edit-site-site-hub__site-view-link {
-			opacity: 1;
-		}
-	}
 }
 
 .edit-site-site-hub__post-type {

From b8ecb816188520fd7bb60d71005e01038e0d27af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 16 Jan 2024 12:53:48 +0100
Subject: [PATCH 127/296] DataViews: set primary field styles (#57846)

Co-authored-by: James Koster <james@jameskoster.co.uk>
---
 packages/dataviews/src/style.scss             | 64 +++++++++++-------
 packages/dataviews/src/view-grid.js           | 10 +--
 packages/dataviews/src/view-list.js           |  4 +-
 packages/dataviews/src/view-table.js          | 11 +++-
 .../src/components/page-pages/index.js        | 65 +++++++++----------
 .../page-patterns/dataviews-patterns.js       | 33 +++++-----
 .../src/components/page-patterns/style.scss   |  9 +++
 .../src/components/page-templates/index.js    | 31 +++------
 .../sidebar-dataviews/default-views.js        |  4 +-
 9 files changed, 125 insertions(+), 106 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 06997fee49a05..d5b962212af79 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -202,6 +202,44 @@
 	}
 }
 
+.dataviews-view-list__primary-field,
+.dataviews-view-grid__primary-field,
+.dataviews-view-table__primary-field {
+	font-size: $default-font-size;
+	font-weight: 500;
+	color: $gray-900;
+	text-overflow: ellipsis;
+	white-space: nowrap;
+	overflow: hidden;
+	display: block;
+	width: 100%;
+
+	a {
+		text-decoration: none;
+		color: inherit;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		width: 100%;
+
+		&:hover {
+			color: $gray-900;
+		}
+	}
+
+	button.components-button.is-link {
+		text-decoration: none;
+		color: inherit;
+		font-weight: inherit;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		overflow: hidden;
+		display: block;
+		width: 100%;
+	}
+}
+
 .dataviews-view-grid {
 	margin-bottom: $grid-unit-30;
 	grid-template-columns: repeat(2, minmax(0, 1fr)) !important;
@@ -215,26 +253,6 @@
 		grid-template-columns: repeat(4, minmax(0, 1fr)) !important; // Todo: eliminate !important dependency
 	}
 
-	.dataviews-view-grid__card {
-		.dataviews-view-grid__primary-field {
-			.dataviews-view-grid__title-field {
-				white-space: nowrap;
-				overflow: hidden;
-				text-overflow: ellipsis;
-				display: block;
-				font-size: $default-font-size;
-				width: 100%;
-			}
-
-			.dataviews-view-grid__title-field a,
-			button.dataviews-view-grid__title-field {
-				font-weight: 500;
-				color: $gray-900;
-				text-decoration: none;
-			}
-		}
-	}
-
 	.dataviews-view-grid__media {
 		width: 100%;
 		min-height: 200px;
@@ -250,10 +268,6 @@
 		}
 	}
 
-	.dataviews-view-grid__primary-field {
-		min-height: $grid-unit-30;
-	}
-
 	.dataviews-view-grid__fields {
 		position: relative;
 		font-size: 12px;
@@ -296,6 +310,7 @@
 		&:not(.is-selected):hover {
 			color: var(--wp-admin-theme-color);
 
+			.dataviews-view-list__primary-field,
 			.dataviews-view-list__fields {
 				color: var(--wp-admin-theme-color);
 			}
@@ -308,6 +323,7 @@
 			background-color: var(--wp-admin-theme-color);
 			color: $white;
 
+			.dataviews-view-list__primary-field,
 			.dataviews-view-list__fields,
 			.components-button {
 				color: $white;
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index 7c18d31dccd19..de0d5eca06b73 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -2,7 +2,6 @@
  * WordPress dependencies
  */
 import {
-	FlexBlock,
 	__experimentalGrid as Grid,
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
@@ -53,13 +52,10 @@ export default function ViewGrid( {
 					<div className="dataviews-view-grid__media">
 						{ mediaField?.render( { item } ) }
 					</div>
-					<HStack
-						className="dataviews-view-grid__primary-field"
-						justify="space-between"
-					>
-						<FlexBlock>
+					<HStack justify="space-between">
+						<HStack className="dataviews-view-grid__primary-field">
 							{ primaryField?.render( { item } ) }
-						</FlexBlock>
+						</HStack>
 						<ItemActions
 							item={ item }
 							actions={ actions }
diff --git a/packages/dataviews/src/view-list.js b/packages/dataviews/src/view-list.js
index df4297334d178..790b50f657a66 100644
--- a/packages/dataviews/src/view-list.js
+++ b/packages/dataviews/src/view-list.js
@@ -92,7 +92,9 @@ export default function ViewList( {
 										) }
 									</div>
 									<VStack spacing={ 1 }>
-										{ primaryField?.render( { item } ) }
+										<span className="dataviews-view-list__primary-field">
+											{ primaryField?.render( { item } ) }
+										</span>
 										<div className="dataviews-view-list__fields">
 											{ visibleFields.map( ( field ) => {
 												return (
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index 22e68b4f56331..8be188bf91c81 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -564,7 +564,16 @@ function ViewTable( {
 												field.maxWidth || undefined,
 										} }
 									>
-										<span className="dataviews-view-table__cell-content-wrapper">
+										<span
+											className={ classnames(
+												'dataviews-view-table__cell-content-wrapper',
+												{
+													'dataviews-view-table__primary-field':
+														primaryField?.id ===
+														field.id,
+												}
+											) }
+										>
 											{ field.render( {
 												item,
 											} ) }
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 45368c11833f3..5ef05273be02c 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -1,11 +1,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	__experimentalView as View,
-	__experimentalVStack as VStack,
-	Button,
-} from '@wordpress/components';
+import { Button } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { useEntityRecords, store as coreStore } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
@@ -82,10 +78,21 @@ function useView( type ) {
 	const { editEntityRecord } = useDispatch( coreStore );
 
 	const customView = useMemo( () => {
-		return (
-			editedViewRecord?.content && JSON.parse( editedViewRecord?.content )
-		);
+		const storedView =
+			editedViewRecord?.content &&
+			JSON.parse( editedViewRecord?.content );
+		if ( ! storedView ) {
+			return storedView;
+		}
+
+		return {
+			...storedView,
+			layout: {
+				...( DEFAULT_CONFIG_PER_VIEW_TYPE[ storedView?.type ] || {} ),
+			},
+		};
 	}, [ editedViewRecord?.content ] );
+
 	const setCustomView = useCallback(
 		( viewToSet ) => {
 			editEntityRecord(
@@ -224,32 +231,22 @@ export default function PagePages() {
 				id: 'title',
 				getValue: ( { item } ) => item.title?.rendered,
 				render: ( { item } ) => {
-					return (
-						<VStack spacing={ 1 }>
-							<View
-								as="span"
-								className="dataviews-view-grid__title-field"
-							>
-								{ [ LAYOUT_TABLE, LAYOUT_GRID ].includes(
-									view.type
-								) ? (
-									<Link
-										params={ {
-											postId: item.id,
-											postType: item.type,
-											canvas: 'edit',
-										} }
-									>
-										{ decodeEntities(
-											item.title?.rendered
-										) || __( '(no title)' ) }
-									</Link>
-								) : (
-									decodeEntities( item.title?.rendered ) ||
-									__( '(no title)' )
-								) }
-							</View>
-						</VStack>
+					return [ LAYOUT_TABLE, LAYOUT_GRID ].includes(
+						view.type
+					) ? (
+						<Link
+							params={ {
+								postId: item.id,
+								postType: item.type,
+								canvas: 'edit',
+							} }
+						>
+							{ decodeEntities( item.title?.rendered ) ||
+								__( '(no title)' ) }
+						</Link>
+					) : (
+						decodeEntities( item.title?.rendered ) ||
+							__( '(no title)' )
 					);
 				},
 				maxWidth: 400,
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
index ad474d882cfcf..19b9b6381ec3b 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
@@ -4,7 +4,6 @@
 import {
 	__experimentalHStack as HStack,
 	Button,
-	__experimentalHeading as Heading,
 	Tooltip,
 	Flex,
 } from '@wordpress/components';
@@ -197,24 +196,24 @@ function Title( { item, categoryId } ) {
 					/>
 				</Tooltip>
 			) }
-			<Flex as="span" gap={ 0 } justify="left">
+			<Flex
+				as="div"
+				gap={ 0 }
+				justify="left"
+				className="edit-site-patterns__pattern-title"
+			>
 				{ item.type === PATTERN_TYPES.theme ? (
-					<span className="dataviews-view-grid__title-field">
-						{ item.title }
-					</span>
+					item.title
 				) : (
-					<Heading level={ 5 }>
-						<Button
-							variant="link"
-							onClick={ onClick }
-							// Required for the grid's roving tab index system.
-							// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
-							tabIndex="-1"
-							className="dataviews-view-grid__title-field"
-						>
-							{ item.title || item.name }
-						</Button>
-					</Heading>
+					<Button
+						variant="link"
+						onClick={ onClick }
+						// Required for the grid's roving tab index system.
+						// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
+						tabIndex="-1"
+					>
+						{ item.title || item.name }
+					</Button>
 				) }
 			</Flex>
 		</HStack>
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index dd3c52ef08c1a..6be2f904a65ec 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -254,6 +254,15 @@
 		top: 0;
 		z-index: 2;
 	}
+
+	.edit-site-patterns__pattern-title {
+		display: block;
+		width: 100%;
+		white-space: nowrap;
+		overflow: hidden;
+		text-overflow: ellipsis;
+		color: inherit;
+	}
 }
 
 .dataviews-action-modal__duplicate-pattern {
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index ddc48542ee1b7..0d4ddd31620ab 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -8,10 +8,8 @@ import removeAccents from 'remove-accents';
  */
 import {
 	Icon,
-	__experimentalView as View,
 	__experimentalText as Text,
 	__experimentalHStack as HStack,
-	__experimentalVStack as VStack,
 	VisuallyHidden,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
@@ -96,28 +94,19 @@ function normalizeSearchInput( input = '' ) {
 
 function TemplateTitle( { item, viewType } ) {
 	if ( viewType === LAYOUT_LIST ) {
-		return (
-			<>
-				{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
-			</>
-		);
+		return decodeEntities( item.title?.rendered ) || __( '(no title)' );
 	}
 
 	return (
-		<VStack spacing={ 1 }>
-			<View as="span" className="dataviews-view-grid__title-field">
-				<Link
-					params={ {
-						postId: item.id,
-						postType: item.type,
-						canvas: 'edit',
-					} }
-				>
-					{ decodeEntities( item.title?.rendered ) ||
-						__( '(no title)' ) }
-				</Link>
-			</View>
-		</VStack>
+		<Link
+			params={ {
+				postId: item.id,
+				postType: item.type,
+				canvas: 'edit',
+			} }
+		>
+			{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
+		</Link>
 	);
 }
 
diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
index fe9f046f31972..329103bd2b97d 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -15,7 +15,9 @@ import {
 } from '../../utils/constants';
 
 export const DEFAULT_CONFIG_PER_VIEW_TYPE = {
-	[ LAYOUT_TABLE ]: {},
+	[ LAYOUT_TABLE ]: {
+		primaryField: 'title',
+	},
 	[ LAYOUT_GRID ]: {
 		mediaField: 'featured-image',
 		primaryField: 'title',

From fc850220b27f980dcd3a68f92b32bf4c7b41e968 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Tue, 16 Jan 2024 13:42:40 +0100
Subject: [PATCH 128/296] Interactivity API: Remove wp-data-navigation-link
 directive (#57853)

* Remove wp-data-navigation-link directive

* Update changelog

* Remove not needed functions

* Revert "Remove not needed functions"

This reverts commit 3461c772474e42ca89785fa9b302dbd85ff43b0c.

* Move breaking change changelog to correct position

* Add function style to changelog
---
 packages/interactivity/CHANGELOG.md      |  1 +
 packages/interactivity/src/directives.js | 51 +-----------------------
 2 files changed, 2 insertions(+), 50 deletions(-)

diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index db396cfa11de1..913134d670008 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -9,6 +9,7 @@
 ### Breaking Change
 
 -	Remove `data-wp-slot` and  `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
+-   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
 
 ### Bug Fix
 
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index cddab32079823..931fa07493f44 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -1,13 +1,7 @@
 /**
  * External dependencies
  */
-import {
-	useContext,
-	useMemo,
-	useEffect,
-	useRef,
-	useLayoutEffect,
-} from 'preact/hooks';
+import { useContext, useMemo, useRef, useLayoutEffect } from 'preact/hooks';
 import { deepSignal, peek } from 'deepsignal';
 
 /**
@@ -16,7 +10,6 @@ import { deepSignal, peek } from 'deepsignal';
 import { createPortal } from './portals';
 import { useWatch, useInit } from './utils';
 import { directive } from './hooks';
-import { navigate } from './router';
 
 const isObject = ( item ) =>
 	item && typeof item === 'object' && ! Array.isArray( item );
@@ -264,48 +257,6 @@ export default () => {
 		);
 	} );
 
-	// data-wp-navigation-link
-	directive(
-		'navigation-link',
-		( {
-			directives: { 'navigation-link': navigationLink },
-			props: { href },
-			element,
-		} ) => {
-			const { value: link } = navigationLink.find(
-				( { suffix } ) => suffix === 'default'
-			);
-
-			useEffect( () => {
-				// Prefetch the page if it is in the directive options.
-				if ( link?.prefetch ) {
-					// prefetch( href );
-				}
-			} );
-
-			// Don't do anything if it's falsy.
-			if ( link !== false ) {
-				element.props.onclick = async ( event ) => {
-					event.preventDefault();
-
-					// Fetch the page (or return it from cache).
-					await navigate( href );
-
-					// Update the scroll, depending on the option. True by default.
-					if ( link?.scroll === 'smooth' ) {
-						window.scrollTo( {
-							top: 0,
-							left: 0,
-							behavior: 'smooth',
-						} );
-					} else if ( link?.scroll !== false ) {
-						window.scrollTo( 0, 0 );
-					}
-				};
-			}
-		}
-	);
-
 	// data-wp-ignore
 	directive(
 		'ignore',

From 9fb3715d7de29f68a0923618cd2ee15b935d7e49 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 10 Jan 2024 16:47:42 +0000
Subject: [PATCH 129/296] Update changelog files

---
 packages/a11y/CHANGELOG.md                     |  2 ++
 packages/a11y/package.json                     |  2 +-
 packages/annotations/CHANGELOG.md              |  2 ++
 packages/annotations/package.json              |  2 +-
 packages/api-fetch/CHANGELOG.md                |  2 ++
 packages/api-fetch/package.json                |  2 +-
 packages/autop/CHANGELOG.md                    |  2 ++
 packages/autop/package.json                    |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 packages/babel-plugin-makepot/CHANGELOG.md     |  2 ++
 packages/babel-plugin-makepot/package.json     |  2 +-
 packages/babel-preset-default/CHANGELOG.md     |  2 ++
 packages/babel-preset-default/package.json     |  2 +-
 packages/base-styles/CHANGELOG.md              |  2 ++
 packages/base-styles/package.json              |  2 +-
 packages/blob/CHANGELOG.md                     |  2 ++
 packages/blob/package.json                     |  2 +-
 packages/block-directory/CHANGELOG.md          |  2 ++
 packages/block-directory/package.json          |  2 +-
 packages/block-editor/CHANGELOG.md             |  2 ++
 packages/block-editor/package.json             |  2 +-
 packages/block-library/CHANGELOG.md            |  2 ++
 packages/block-library/package.json            |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 packages/blocks/CHANGELOG.md                   |  2 ++
 packages/blocks/package.json                   |  2 +-
 packages/browserslist-config/CHANGELOG.md      |  2 ++
 packages/browserslist-config/package.json      |  2 +-
 packages/commands/CHANGELOG.md                 |  2 ++
 packages/commands/package.json                 |  2 +-
 packages/components/CHANGELOG.md               | 18 +++++++++++++-----
 packages/components/package.json               |  4 ++--
 packages/compose/CHANGELOG.md                  |  2 ++
 packages/compose/package.json                  |  2 +-
 packages/core-commands/CHANGELOG.md            |  2 ++
 packages/core-commands/package.json            |  2 +-
 packages/core-data/CHANGELOG.md                |  2 ++
 packages/core-data/package.json                |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 packages/create-block/CHANGELOG.md             |  2 ++
 packages/create-block/package.json             |  2 +-
 packages/customize-widgets/CHANGELOG.md        |  2 ++
 packages/customize-widgets/package.json        |  2 +-
 packages/data-controls/CHANGELOG.md            |  2 ++
 packages/data-controls/package.json            |  2 +-
 packages/data/CHANGELOG.md                     |  2 ++
 packages/data/package.json                     |  2 +-
 packages/dataviews/CHANGELOG.md                |  2 ++
 packages/dataviews/package.json                |  2 +-
 packages/date/CHANGELOG.md                     |  2 ++
 packages/date/package.json                     |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 packages/deprecated/CHANGELOG.md               |  2 ++
 packages/deprecated/package.json               |  2 +-
 packages/docgen/CHANGELOG.md                   |  2 ++
 packages/docgen/package.json                   |  2 +-
 packages/dom-ready/CHANGELOG.md                |  2 ++
 packages/dom-ready/package.json                |  2 +-
 packages/dom/CHANGELOG.md                      |  2 ++
 packages/dom/package.json                      |  2 +-
 .../e2e-test-utils-playwright/CHANGELOG.md     |  2 ++
 .../e2e-test-utils-playwright/package.json     |  2 +-
 packages/e2e-test-utils/CHANGELOG.md           |  2 ++
 packages/e2e-test-utils/package.json           |  2 +-
 packages/e2e-tests/CHANGELOG.md                |  2 ++
 packages/e2e-tests/package.json                |  2 +-
 packages/edit-post/CHANGELOG.md                |  2 ++
 packages/edit-post/package.json                |  2 +-
 packages/edit-site/CHANGELOG.md                |  2 ++
 packages/edit-site/package.json                |  2 +-
 packages/edit-widgets/CHANGELOG.md             |  2 ++
 packages/edit-widgets/package.json             |  2 +-
 packages/editor/CHANGELOG.md                   |  2 ++
 packages/editor/package.json                   |  2 +-
 packages/element/CHANGELOG.md                  |  2 ++
 packages/element/package.json                  |  2 +-
 packages/env/CHANGELOG.md                      |  2 ++
 packages/env/package.json                      |  2 +-
 packages/escape-html/CHANGELOG.md              |  2 ++
 packages/escape-html/package.json              |  2 +-
 packages/eslint-plugin/CHANGELOG.md            |  2 ++
 packages/eslint-plugin/package.json            |  2 +-
 packages/format-library/CHANGELOG.md           |  2 ++
 packages/format-library/package.json           |  2 +-
 packages/hooks/CHANGELOG.md                    |  2 ++
 packages/hooks/package.json                    |  2 +-
 packages/html-entities/CHANGELOG.md            |  2 ++
 packages/html-entities/package.json            |  2 +-
 packages/i18n/CHANGELOG.md                     |  2 ++
 packages/i18n/package.json                     |  2 +-
 packages/icons/CHANGELOG.md                    |  2 ++
 packages/icons/package.json                    |  2 +-
 packages/interactivity/CHANGELOG.md            |  6 ++++--
 packages/interactivity/package.json            |  2 +-
 packages/interface/CHANGELOG.md                |  2 ++
 packages/interface/package.json                |  2 +-
 packages/is-shallow-equal/CHANGELOG.md         |  2 ++
 packages/is-shallow-equal/package.json         |  2 +-
 packages/jest-console/CHANGELOG.md             |  2 ++
 packages/jest-console/package.json             |  2 +-
 packages/jest-preset-default/CHANGELOG.md      |  2 ++
 packages/jest-preset-default/package.json      |  2 +-
 packages/jest-puppeteer-axe/CHANGELOG.md       |  2 ++
 packages/jest-puppeteer-axe/package.json       |  2 +-
 packages/keyboard-shortcuts/CHANGELOG.md       |  2 ++
 packages/keyboard-shortcuts/package.json       |  2 +-
 packages/keycodes/CHANGELOG.md                 |  2 ++
 packages/keycodes/package.json                 |  2 +-
 packages/lazy-import/CHANGELOG.md              |  2 ++
 packages/lazy-import/package.json              |  2 +-
 packages/list-reusable-blocks/CHANGELOG.md     |  2 ++
 packages/list-reusable-blocks/package.json     |  2 +-
 packages/media-utils/CHANGELOG.md              |  2 ++
 packages/media-utils/package.json              |  2 +-
 packages/notices/CHANGELOG.md                  |  2 ++
 packages/notices/package.json                  |  2 +-
 .../npm-package-json-lint-config/CHANGELOG.md  |  2 ++
 .../npm-package-json-lint-config/package.json  |  2 +-
 packages/nux/CHANGELOG.md                      |  2 ++
 packages/nux/package.json                      |  2 +-
 packages/patterns/CHANGELOG.md                 |  2 ++
 packages/patterns/package.json                 |  2 +-
 packages/plugins/CHANGELOG.md                  |  2 ++
 packages/plugins/package.json                  |  2 +-
 packages/postcss-plugins-preset/CHANGELOG.md   |  2 ++
 packages/postcss-plugins-preset/package.json   |  2 +-
 packages/postcss-themes/CHANGELOG.md           |  2 ++
 packages/postcss-themes/package.json           |  2 +-
 packages/preferences-persistence/CHANGELOG.md  |  2 ++
 packages/preferences-persistence/package.json  |  2 +-
 packages/preferences/CHANGELOG.md              |  2 ++
 packages/preferences/package.json              |  2 +-
 packages/prettier-config/CHANGELOG.md          |  2 ++
 packages/prettier-config/package.json          |  2 +-
 packages/primitives/CHANGELOG.md               |  2 ++
 packages/primitives/package.json               |  2 +-
 packages/priority-queue/CHANGELOG.md           |  2 ++
 packages/priority-queue/package.json           |  2 +-
 packages/private-apis/CHANGELOG.md             |  2 ++
 packages/private-apis/package.json             |  2 +-
 .../project-management-automation/CHANGELOG.md |  2 ++
 .../project-management-automation/package.json |  2 +-
 packages/react-i18n/CHANGELOG.md               |  2 ++
 packages/react-i18n/package.json               |  2 +-
 .../CHANGELOG.md                               |  2 ++
 .../package.json                               |  2 +-
 packages/redux-routine/CHANGELOG.md            |  2 ++
 packages/redux-routine/package.json            |  2 +-
 packages/reusable-blocks/CHANGELOG.md          |  2 ++
 packages/reusable-blocks/package.json          |  2 +-
 packages/rich-text/CHANGELOG.md                |  2 ++
 packages/rich-text/package.json                |  2 +-
 packages/router/CHANGELOG.md                   |  2 ++
 packages/router/package.json                   |  2 +-
 packages/scripts/CHANGELOG.md                  |  2 ++
 packages/scripts/package.json                  |  2 +-
 packages/server-side-render/CHANGELOG.md       |  2 ++
 packages/server-side-render/package.json       |  2 +-
 packages/shortcode/CHANGELOG.md                |  2 ++
 packages/shortcode/package.json                |  2 +-
 packages/style-engine/CHANGELOG.md             |  2 ++
 packages/style-engine/package.json             |  2 +-
 packages/stylelint-config/CHANGELOG.md         |  2 ++
 packages/stylelint-config/package.json         |  2 +-
 packages/sync/CHANGELOG.md                     |  2 ++
 packages/sync/package.json                     |  2 +-
 packages/token-list/CHANGELOG.md               |  2 ++
 packages/token-list/package.json               |  2 +-
 packages/undo-manager/CHANGELOG.md             |  2 ++
 packages/undo-manager/package.json             |  2 +-
 packages/url/CHANGELOG.md                      |  2 ++
 packages/url/package.json                      |  2 +-
 packages/viewport/CHANGELOG.md                 |  2 ++
 packages/viewport/package.json                 |  2 +-
 packages/warning/CHANGELOG.md                  |  2 ++
 packages/warning/package.json                  |  2 +-
 packages/widgets/CHANGELOG.md                  |  2 ++
 packages/widgets/package.json                  |  2 +-
 packages/wordcount/CHANGELOG.md                |  2 ++
 packages/wordcount/package.json                |  2 +-
 188 files changed, 296 insertions(+), 102 deletions(-)

diff --git a/packages/a11y/CHANGELOG.md b/packages/a11y/CHANGELOG.md
index b78906a8b23e1..7c5c9d7978410 100644
--- a/packages/a11y/CHANGELOG.md
+++ b/packages/a11y/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 399b5bd451455..8ae9c45b7433d 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/annotations/CHANGELOG.md b/packages/annotations/CHANGELOG.md
index 98c1d6e0f9621..42c3783652797 100644
--- a/packages/annotations/CHANGELOG.md
+++ b/packages/annotations/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index 01ac7d7961f26..fbcf81fdf4f6f 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.48.0",
+	"version": "2.49.0-prerelease",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md
index cd9a3d8582dd9..67df4dad50c64 100644
--- a/packages/api-fetch/CHANGELOG.md
+++ b/packages/api-fetch/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.46.0 (2024-01-10)
+
 ## 6.45.0 (2023-12-13)
 
 ## 6.44.0 (2023-11-29)
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index be6d4adb079ee..fcd88a0099df6 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.45.0",
+	"version": "6.46.0-prerelease",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/autop/CHANGELOG.md b/packages/autop/CHANGELOG.md
index 301f58946ecdd..4e4c9a91bc781 100644
--- a/packages/autop/CHANGELOG.md
+++ b/packages/autop/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/autop/package.json b/packages/autop/package.json
index 8acd56c43fc8c..7df62adc20484 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
index bab957e21b3ae..19269095d73d7 100644
--- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
+++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.32.0 (2024-01-10)
+
 ## 4.31.0 (2023-12-13)
 
 ## 4.30.0 (2023-11-29)
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index e9f2b1b19596f..c0cfeed10daaa 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-import-jsx-pragma",
-	"version": "4.31.0",
+	"version": "4.32.0-prerelease",
 	"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-makepot/CHANGELOG.md b/packages/babel-plugin-makepot/CHANGELOG.md
index af6099fa128a1..fd1a0546da3ad 100644
--- a/packages/babel-plugin-makepot/CHANGELOG.md
+++ b/packages/babel-plugin-makepot/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.33.0 (2024-01-10)
+
 ## 5.32.0 (2023-12-13)
 
 ## 5.31.0 (2023-11-29)
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index 14d1364e72bf1..486ef101ada3b 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "5.32.0",
+	"version": "5.33.0-prerelease",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md
index 1b4af03b532b0..4149381dce16f 100644
--- a/packages/babel-preset-default/CHANGELOG.md
+++ b/packages/babel-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.33.0 (2024-01-10)
+
 ## 7.32.0 (2023-12-13)
 
 ## 7.31.0 (2023-11-29)
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index 2461fb083c3fa..a3b4c864bb6fe 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-preset-default",
-	"version": "7.32.0",
+	"version": "7.33.0-prerelease",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/base-styles/CHANGELOG.md b/packages/base-styles/CHANGELOG.md
index 3f1e818df2efd..a399317b2aef0 100644
--- a/packages/base-styles/CHANGELOG.md
+++ b/packages/base-styles/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.40.0 (2024-01-10)
+
 ## 4.39.0 (2023-12-13)
 
 ## 4.38.0 (2023-11-29)
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index bc5984014ee6c..86928afa0a515 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.39.0",
+	"version": "4.40.0-prerelease",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blob/CHANGELOG.md b/packages/blob/CHANGELOG.md
index 7dd54454a0488..b2a501021c5aa 100644
--- a/packages/blob/CHANGELOG.md
+++ b/packages/blob/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/blob/package.json b/packages/blob/package.json
index b1bc807dfd0b4..16fc425e19878 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-directory/CHANGELOG.md b/packages/block-directory/CHANGELOG.md
index 2a9b8c670db45..608fc4c4f005c 100644
--- a/packages/block-directory/CHANGELOG.md
+++ b/packages/block-directory/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index 2962204ac36e6..0dcd2f36ccd52 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index 64763eb66f7a8..a66143dd30ac9 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.17.0 (2024-01-10)
+
 ## 12.16.0 (2023-12-13)
 
 ## 12.15.0 (2023-11-29)
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index 1f9be9e2608b9..98aa8a709b236 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.16.0",
+	"version": "12.17.0-prerelease",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md
index d5079fbbb4ac2..d17ee65991c0a 100644
--- a/packages/block-library/CHANGELOG.md
+++ b/packages/block-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.26.0 (2024-01-10)
+
 ## 8.25.0 (2023-12-13)
 
 ## 8.24.0 (2023-11-29)
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 30e341d08923a..c1f484ad9a914 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.25.0",
+	"version": "8.26.0-prerelease",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-default-parser/CHANGELOG.md b/packages/block-serialization-default-parser/CHANGELOG.md
index 5e8e65ddea45b..b705866a04957 100644
--- a/packages/block-serialization-default-parser/CHANGELOG.md
+++ b/packages/block-serialization-default-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index 56a0c56269add..f4d324cf6c9a9 100644
--- a/packages/block-serialization-default-parser/package.json
+++ b/packages/block-serialization-default-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-default-parser",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-spec-parser/CHANGELOG.md b/packages/block-serialization-spec-parser/CHANGELOG.md
index 8181385569751..c6f586ce6b480 100644
--- a/packages/block-serialization-spec-parser/CHANGELOG.md
+++ b/packages/block-serialization-spec-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index cdd2884211afe..822868a597418 100644
--- a/packages/block-serialization-spec-parser/package.json
+++ b/packages/block-serialization-spec-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-spec-parser",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
index 0cce621f5b6cd..d932b12a54531 100644
--- a/packages/blocks/CHANGELOG.md
+++ b/packages/blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.26.0 (2024-01-10)
+
 ## 12.25.0 (2023-12-13)
 
 ## 12.24.0 (2023-11-29)
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index a2aff291dbda3..355251c5d16da 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.25.0",
+	"version": "12.26.0-prerelease",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/browserslist-config/CHANGELOG.md b/packages/browserslist-config/CHANGELOG.md
index 451716f50edb9..cf94e1caf70e5 100644
--- a/packages/browserslist-config/CHANGELOG.md
+++ b/packages/browserslist-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.32.0 (2024-01-10)
+
 ## 5.31.0 (2023-12-13)
 
 ## 5.30.0 (2023-11-29)
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 815fe6eba00fe..6e039d02c0f92 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.31.0",
+	"version": "5.32.0-prerelease",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/commands/CHANGELOG.md b/packages/commands/CHANGELOG.md
index 8c697a90b20be..3b42cc552899f 100644
--- a/packages/commands/CHANGELOG.md
+++ b/packages/commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.20.0 (2024-01-10)
+
 ## Enhancements
 
 -   Support conditional commands and commands loaders using the "disabled" config.
diff --git a/packages/commands/package.json b/packages/commands/package.json
index 20fcea5c67b11..ef3fa9f6bfbfd 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.19.0",
+	"version": "0.20.0-prerelease",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index ba0629eff7f37..570c7371072cc 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,19 @@
 
 ## Unreleased
 
+### Enhancements
+
+-   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
+-   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
+-   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
+-   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
+
+### Bug Fixes
+
+-   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
+
+## 25.15.0 (2024-01-10)
+
 ### Bug Fix
 
 -   `NumberControl`: Make increment and decrement buttons keyboard accessible. ([#57402](https://github.com/WordPress/gutenberg/pull/57402)).
@@ -19,12 +32,10 @@
 -   `DuotonePicker`: Remove top margin when no duotone options ([#57489](https://github.com/WordPress/gutenberg/pull/57489)).
 -   `Snackbar`: Fix icon positioning ([#57377](https://github.com/WordPress/gutenberg/pull/57377)).
 -   `GradientPicker`: Use slug while iterating over gradient entries to avoid React "duplicated key" warning ([#57361](https://github.com/WordPress/gutenberg/pull/57361)).
--   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 -   `NavigatorProvider`: Exclude `size` value from `contain` CSS rule ([#57498](https://github.com/WordPress/gutenberg/pull/57498)).
 
 ### Enhancements
 
--   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
 -   Update `ariakit` to version `0.3.10` ([#57325](https://github.com/WordPress/gutenberg/pull/57325)).
 -   Update `@ariakit/react` to version `0.3.12` and @ariakit/test to version `0.3.7` ([#57547](https://github.com/WordPress/gutenberg/pull/57547)).
 -   `DropdownMenuV2`: do not collapse suffix width ([#57238](https://github.com/WordPress/gutenberg/pull/57238)).
@@ -35,9 +46,6 @@
 -   `ToggleGroupControl`: Update button size in large variant to be 32px ([#57338](https://github.com/WordPress/gutenberg/pull/57338)).
 -   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
--   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
--   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
--   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
 
 ### Experimental
 
diff --git a/packages/components/package.json b/packages/components/package.json
index cd440998b9323..f49deb5413c35 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.14.0",
+	"version": "25.15.0-prerelease",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
@@ -88,4 +88,4 @@
 	"publishConfig": {
 		"access": "public"
 	}
-}
\ No newline at end of file
+}
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index d6938f4f26f63..25ea99778733f 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.26.0 (2024-01-10)
+
 ## 6.25.0 (2023-12-13)
 
 ## 6.24.0 (2023-11-29)
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 0dec375ed2243..713a7ac85f8cb 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.25.0",
+	"version": "6.26.0-prerelease",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-commands/CHANGELOG.md b/packages/core-commands/CHANGELOG.md
index 1abb8f289e7d9..a65a04f4dbe04 100644
--- a/packages/core-commands/CHANGELOG.md
+++ b/packages/core-commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.18.0 (2024-01-10)
+
 ## 0.17.0 (2023-12-13)
 
 ## 0.16.0 (2023-11-29)
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index a3e42ee2c236a..61d8e3037961a 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.17.0",
+	"version": "0.18.0-prerelease",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-data/CHANGELOG.md b/packages/core-data/CHANGELOG.md
index ae8d7543f8fbd..306ee51c90eab 100644
--- a/packages/core-data/CHANGELOG.md
+++ b/packages/core-data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.26.0 (2024-01-10)
+
 ## 6.25.0 (2023-12-13)
 
 ## 6.24.0 (2023-11-29)
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index dfbdc2a073765..565ef8e2fdf55 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.25.0",
+	"version": "6.26.0-prerelease",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-interactive-template/CHANGELOG.md b/packages/create-block-interactive-template/CHANGELOG.md
index 159c65e9ada19..2025feabddc63 100644
--- a/packages/create-block-interactive-template/CHANGELOG.md
+++ b/packages/create-block-interactive-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.12.0 (2024-01-10)
+
 ### Enhancement
 
 -   Update the template to use `viewModule` in block.json ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index 4b89f9d49ae83..976ee68a0e2d0 100644
--- a/packages/create-block-interactive-template/package.json
+++ b/packages/create-block-interactive-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-interactive-template",
-	"version": "1.11.0",
+	"version": "1.12.0-prerelease",
 	"description": "Template for @wordpress/create-block to create interactive blocks with the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-tutorial-template/CHANGELOG.md b/packages/create-block-tutorial-template/CHANGELOG.md
index 021972a2178bb..971da45400f01 100644
--- a/packages/create-block-tutorial-template/CHANGELOG.md
+++ b/packages/create-block-tutorial-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.3.0 (2024-01-10)
+
 ## 3.2.0 (2023-12-13)
 
 ## 3.1.0 (2023-11-29)
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 994294adf3a48..47625bb4996cf 100644
--- a/packages/create-block-tutorial-template/package.json
+++ b/packages/create-block-tutorial-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-tutorial-template",
-	"version": "3.2.0",
+	"version": "3.3.0-prerelease",
 	"description": "This is a template for @wordpress/create-block that creates an example 'Copyright Date' block. This block is used in the official WordPress block development Quick Start Guide.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index a3a1b01bc09fb..9d000b18d6aae 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.33.0 (2024-01-10)
+
 ### New Feature
 
 -   Add support for the `viewModule` property ([#57712](https://github.com/WordPress/gutenberg/pull/57712)).
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index 32a04f4b9857e..9a628ffdf4a33 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.32.0",
+	"version": "4.33.0-prerelease",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/customize-widgets/CHANGELOG.md b/packages/customize-widgets/CHANGELOG.md
index 733a2e88914e8..5ebaf223d81a3 100644
--- a/packages/customize-widgets/CHANGELOG.md
+++ b/packages/customize-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 88b32f5a23bec..64b1eabcaeee4 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data-controls/CHANGELOG.md b/packages/data-controls/CHANGELOG.md
index a5be93faab004..964ab8830b1c0 100644
--- a/packages/data-controls/CHANGELOG.md
+++ b/packages/data-controls/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.18.0 (2024-01-10)
+
 ## 3.17.0 (2023-12-13)
 
 ## 3.16.0 (2023-11-29)
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index 5018027820afe..0f26fca0fc653 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.17.0",
+	"version": "3.18.0-prerelease",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index 328928d93d509..9c56bdfd15831 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.19.0 (2024-01-10)
+
 ## 9.18.0 (2023-12-13)
 
 ## 9.17.0 (2023-11-29)
diff --git a/packages/data/package.json b/packages/data/package.json
index 37e9d8753cda0..cb57d35b87f13 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.18.0",
+	"version": "9.19.0-prerelease",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dataviews/CHANGELOG.md b/packages/dataviews/CHANGELOG.md
index bd4afefab43fe..231fa05170a08 100644
--- a/packages/dataviews/CHANGELOG.md
+++ b/packages/dataviews/CHANGELOG.md
@@ -2,4 +2,6 @@
 
 ## Unreleased
 
+## 0.3.0 (2024-01-10)
+
 ## 0.2.0 (2023-12-13)
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index 4dfb35948af46..4136be59c330d 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.2.0",
+	"version": "0.3.0-prerelease",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index 73ad2bc3daa06..d6158df35df7d 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/date/package.json b/packages/date/package.json
index 65f346132f928..7963815604a18 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
index 414a5229117ce..c147941c98e80 100644
--- a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
+++ b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.0.0 (2024-01-10)
+
 ### Breaking Changes
 
 -   Drop support for webpack 4.
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index b3a296e3f0014..12d3613ede998 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "4.31.0",
+	"version": "5.0.0-prerelease",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/CHANGELOG.md b/packages/deprecated/CHANGELOG.md
index f55a064fe5dcf..3c10ecf640335 100644
--- a/packages/deprecated/CHANGELOG.md
+++ b/packages/deprecated/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index b67260df2cfe3..37a5b08f376ff 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/CHANGELOG.md b/packages/docgen/CHANGELOG.md
index 9ce1823b8bb6c..8b3827a0c9e81 100644
--- a/packages/docgen/CHANGELOG.md
+++ b/packages/docgen/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.58.0 (2024-01-10)
+
 ## 1.57.0 (2023-12-13)
 
 ## 1.56.0 (2023-11-29)
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index 55b7675309f4c..5754ce37e9253 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.57.0",
+	"version": "1.58.0-prerelease",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/CHANGELOG.md b/packages/dom-ready/CHANGELOG.md
index 5def1df47ebae..05d3e7e79f07f 100644
--- a/packages/dom-ready/CHANGELOG.md
+++ b/packages/dom-ready/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index f4716f6bce305..561066f1c63d9 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom/CHANGELOG.md b/packages/dom/CHANGELOG.md
index 6e76f6e1e3276..dda6f4e53b489 100644
--- a/packages/dom/CHANGELOG.md
+++ b/packages/dom/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 8d783a9725592..901f866a23c26 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/CHANGELOG.md b/packages/e2e-test-utils-playwright/CHANGELOG.md
index cd848a23461ae..8f3e85e901191 100644
--- a/packages/e2e-test-utils-playwright/CHANGELOG.md
+++ b/packages/e2e-test-utils-playwright/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.17.0 (2024-01-10)
+
 ## 0.16.0 (2023-12-13)
 
 ## 0.15.0 (2023-11-29)
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 6f84aa51be554..8309f4dc6126a 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils-playwright",
-	"version": "0.16.0",
+	"version": "0.17.0-prerelease",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
index 9602fa9a33434..ef5b7f4de2f9d 100644
--- a/packages/e2e-test-utils/CHANGELOG.md
+++ b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 10.20.0 (2024-01-10)
+
 ## 10.19.0 (2023-12-13)
 
 ## 10.18.0 (2023-11-29)
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index b95b6cfb58d36..12aa2cca7e945 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils",
-	"version": "10.19.0",
+	"version": "10.20.0-prerelease",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index bf44801199780..bfd10d63c9271 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.20.0 (2024-01-10)
+
 ## 7.19.0 (2023-12-13)
 
 ## 7.18.0 (2023-11-29)
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index f9d8072adb915..86d88c253cdb7 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.19.0",
+	"version": "7.20.0-prerelease",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index 34ccd0953562f..d029f33335102 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.26.0 (2024-01-10)
+
 ### Deprecations
 
 -   Move the panels visibility actions and selectors to the editor package deprecating `toggleEditorPanelEnabled`, `toggleEditorPanelOpened`, `removeEditorPanel`, `isEditorPanelRemoved`, `isEditorPanelOpened` and `isEditorPanelEnabled`.
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 1b3b107a83413..2a3053d109a2a 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.25.0",
+	"version": "7.26.0-prerelease",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index ff3e85639d1de..d61e6028c0042 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index e560e5e682797..0debc2609e6ca 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.25.0",
+	"version": "5.26.0-prerelease",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index 34fb6a54d8c25..efef3dd674b80 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 974a0ba02905f..85b553fb090a8 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.25.0",
+	"version": "5.26.0-prerelease",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index dc8fffd379798..4484201d28fcc 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 13.26.0 (2024-01-10)
+
 ### New Features
 
 -   Add the editor panels visibility state to the editor store in addition to the following actions and selectors: `toggleEditorPanelEnabled`, `toggleEditorPanelOpened`, `removeEditorPanel`, `isEditorPanelRemoved`, `isEditorPanelOpened` and `isEditorPanelEnabled`.
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 63656899e587c..72d79660f7c76 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.25.0",
+	"version": "13.26.0-prerelease",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index 89c422ad27a0b..e57fc1e022e45 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/element/package.json b/packages/element/package.json
index 6ce4714c25f0b..4f4318038abbb 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.25.0",
+	"version": "5.26.0-prerelease",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 6605add780096..154e8d36b3b44 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.1.0 (2024-01-10)
+
 ## 9.0.0 (2023-12-13)
 
 ### Breaking Change
diff --git a/packages/env/package.json b/packages/env/package.json
index cd3fd075568e2..8e17750811551 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "9.0.0",
+	"version": "9.1.0-prerelease",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 7b5f651626528..8cb9c60a82c57 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 2618d5818400c..18c10a29b489e 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.48.0",
+	"version": "2.49.0-prerelease",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 533c5e7788c66..10e82685d7b74 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 17.6.0 (2024-01-10)
+
 ## 17.5.0 (2023-12-13)
 
 ## 17.4.0 (2023-11-29)
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index ef0931dfb2c6c..18bb33042f1d9 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.5.0",
+	"version": "17.6.0-prerelease",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 8b3d314e9a0f2..1ea92da62e1a4 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index b71addc176e7c..2d26087581170 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index c428f26ed17f1..7b71f8d382f01 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 0c29dacb17895..84074b3575c2d 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index d7c1b049e3790..ba88048d21a5a 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index 92e85598707b9..b6ae9c2634ded 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index f227f81571087..cca18773c660e 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 7346330946e19..56769f3e33736 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index df0e3e43b1d81..a5ca30a014f1d 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.40.0 (2024-01-10)
+
 ## 9.39.0 (2023-12-13)
 
 ## 9.38.0 (2023-11-29)
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 31ebc3c57d129..0c359d100a34b 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.39.0",
+	"version": "9.40.0-prerelease",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 913134d670008..67b25a7e30ee0 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -6,11 +6,13 @@
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
 
-### Breaking Change
+### Breaking Changes
 
--	Remove `data-wp-slot` and  `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
+-   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
 -   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
 
+## 3.2.0 (2024-01-10)
+
 ### Bug Fix
 
 -   Fix namespaces when there are nested interactive regions. ([#57029](https://github.com/WordPress/gutenberg/pull/57029))
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index c856628c5d79e..b7ed52dd288c8 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "3.1.0",
+	"version": "3.2.0-prerelease",
 	"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index 90e0326e02a47..a684dc5a6a4ef 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/interface/package.json b/packages/interface/package.json
index 7356a7b52d1d4..8dfd6bf8ccf85 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.25.0",
+	"version": "5.26.0-prerelease",
 	"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index 46ad3508ad041..d7d7028dd5e40 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 6969d6a2fe8a0..d37a0d1a735c4 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/is-shallow-equal",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index bf9aba56a98e1..f82d95dc08cd4 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.20.0 (2024-01-10)
+
 ## 7.19.0 (2023-12-13)
 
 ## 7.18.0 (2023-11-29)
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index 4a6f249a104d2..aec655cdef025 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.19.0",
+	"version": "7.20.0-prerelease",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index 5b94554550781..d0525fe187ad5 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 11.20.0 (2024-01-10)
+
 ## 11.19.0 (2023-12-13)
 
 ## 11.18.0 (2023-11-29)
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 7bda9f2e279f2..0eea603b2ad17 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-preset-default",
-	"version": "11.19.0",
+	"version": "11.20.0-prerelease",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index 9114f0e043772..89acfcecff4da 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.20.0 (2024-01-10)
+
 ## 6.19.0 (2023-12-13)
 
 ## 6.18.0 (2023-11-29)
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index cdd09f7b79165..44f86cd158e7e 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-puppeteer-axe",
-	"version": "6.19.0",
+	"version": "6.20.0-prerelease",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index 32175acb451f5..2af0ab1eb2905 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index af36a49371a0b..8e1c2b35130fd 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index b65e8f808d595..6fda0148feaa8 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index ecebbb58eb99f..342d50ba8e6e0 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 87ebbe936eaa4..214141e0d476d 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.36.0 (2024-01-10)
+
 ## 1.35.0 (2023-12-13)
 
 ## 1.34.0 (2023-11-29)
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index b1967c0d4bedb..644121850eab4 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.35.0",
+	"version": "1.36.0-prerelease",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index d1dd89a70ad63..4c153c4539b35 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index bba7e2a7680e5..1decde84386eb 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/list-reusable-blocks",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index 8d8a13b4ae6ab..d7a8c61e149bf 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.40.0 (2024-01-10)
+
 ## 4.39.0 (2023-12-13)
 
 ## 4.38.0 (2023-11-29)
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index 1086a79722cb0..3babc2af8c07e 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.39.0",
+	"version": "4.40.0-prerelease",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index 0b4c95da74005..03f5931c9899b 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.17.0 (2024-01-10)
+
 ## 4.16.0 (2023-12-13)
 
 ## 4.15.0 (2023-11-29)
diff --git a/packages/notices/package.json b/packages/notices/package.json
index 7c40413adea51..eb7ea82e973e4 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.16.0",
+	"version": "4.17.0-prerelease",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index 2eaaf4c0df1e9..3978d24103d0c 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.34.0 (2024-01-10)
+
 ## 4.33.0 (2023-12-13)
 
 ## 4.32.0 (2023-11-29)
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 3bbc4c6c2e47f..2f16d73f738b4 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/npm-package-json-lint-config",
-	"version": "4.33.0",
+	"version": "4.34.0-prerelease",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index 9980b2d629d0b..e20bca5073fb2 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.11.0 (2024-01-10)
+
 ## 8.10.0 (2023-12-13)
 
 ## 8.9.0 (2023-11-29)
diff --git a/packages/nux/package.json b/packages/nux/package.json
index 64511b2fa42d0..9af2b3682d3d1 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.10.0",
+	"version": "8.11.0-prerelease",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index 566bd024cf380..10fd61c03f939 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.10.0 (2024-01-10)
+
 ## 1.9.0 (2023-12-13)
 
 ## 1.8.0 (2023-11-29)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index 54ec5178d640d..7334017ca1a43 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.9.0",
+	"version": "1.10.0-prerelease",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index b41c2e9f112bd..4fc131ebbcbd4 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.17.0 (2024-01-10)
+
 ## 6.16.0 (2023-12-13)
 
 ## 6.15.0 (2023-11-29)
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index b8b63a3c381d7..11def4a122ebf 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.16.0",
+	"version": "6.17.0-prerelease",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index 00e7fb9a8c6c4..0599f401fe8e5 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.33.0 (2024-01-10)
+
 ## 4.32.0 (2023-12-13)
 
 ## 4.31.0 (2023-11-29)
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 078c6b87a2ec1..449c6b8994c4a 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-plugins-preset",
-	"version": "4.32.0",
+	"version": "4.33.0-prerelease",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index 7c696adb50733..7cb02c0f86cef 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.32.0 (2024-01-10)
+
 ## 5.31.0 (2023-12-13)
 
 ## 5.30.0 (2023-11-29)
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 845911ad918e5..9bad42995cd33 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.31.0",
+	"version": "5.32.0-prerelease",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index b227aa5ad2373..7eb846236d15b 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.41.0 (2024-01-10)
+
 ## 1.40.0 (2023-12-13)
 
 ## 1.39.0 (2023-11-29)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index e17080383749e..2a4fb8c576805 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.40.0",
+	"version": "1.41.0-prerelease",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index 363f62c70b3d9..6d5b2a7c62c3c 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.26.0 (2024-01-10)
+
 ## 3.25.0 (2023-12-13)
 
 ## 3.24.0 (2023-11-29)
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index e1164a7a1306c..50e82e4675983 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.25.0",
+	"version": "3.26.0-prerelease",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
index be847570c06f7..4b05f17c43abf 100644
--- a/packages/prettier-config/CHANGELOG.md
+++ b/packages/prettier-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.6.0 (2024-01-10)
+
 ## 3.5.0 (2023-12-13)
 
 ## 3.4.0 (2023-11-29)
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 047963ddde99b..c2e69e453f691 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.5.0",
+	"version": "3.6.0-prerelease",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
index bbea3951de7c9..0effaef62c372 100644
--- a/packages/primitives/CHANGELOG.md
+++ b/packages/primitives/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.47.0 (2024-01-10)
+
 ## 3.46.0 (2023-12-13)
 
 ## 3.45.0 (2023-11-29)
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 614e586c7efe2..294ba82270d36 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.46.0",
+	"version": "3.47.0-prerelease",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/CHANGELOG.md b/packages/priority-queue/CHANGELOG.md
index dc82da748d2eb..ccb782a2fb156 100644
--- a/packages/priority-queue/CHANGELOG.md
+++ b/packages/priority-queue/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index 4bfbb09da8d57..a90dc43ed0476 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.48.0",
+	"version": "2.49.0-prerelease",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/CHANGELOG.md b/packages/private-apis/CHANGELOG.md
index 4951a8b29a7dc..3c2ce0530b5cf 100644
--- a/packages/private-apis/CHANGELOG.md
+++ b/packages/private-apis/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.31.0 (2024-01-10)
+
 ## 0.30.0 (2023-12-13)
 
 ## 0.29.0 (2023-11-29)
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 654c53a02210e..953430fc97d1c 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.30.0",
+	"version": "0.31.0-prerelease",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/CHANGELOG.md b/packages/project-management-automation/CHANGELOG.md
index 09247de37995d..69fc6f7498ca8 100644
--- a/packages/project-management-automation/CHANGELOG.md
+++ b/packages/project-management-automation/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.48.0 (2024-01-10)
+
 ## 1.47.0 (2023-12-13)
 
 ## 1.46.0 (2023-11-29)
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 5e3d1f85314e2..02ddae86044eb 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/project-management-automation",
-	"version": "1.47.0",
+	"version": "1.48.0-prerelease",
 	"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/react-i18n/CHANGELOG.md b/packages/react-i18n/CHANGELOG.md
index 4e15abf8fadfb..893d433ed76c4 100644
--- a/packages/react-i18n/CHANGELOG.md
+++ b/packages/react-i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.47.0 (2024-01-10)
+
 ## 3.46.0 (2023-12-13)
 
 ## 3.45.0 (2023-11-29)
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index 753f5138a2a0f..fa81c2bba5dec 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.46.0",
+	"version": "3.47.0-prerelease",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
index 3a5dad2c51852..fccabbc78e0cd 100644
--- a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
+++ b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.32.0 (2024-01-10)
+
 ## 2.31.0 (2023-12-13)
 
 ## 2.30.0 (2023-11-29)
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index d27c530ca1510..518f2cc0a8053 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/readable-js-assets-webpack-plugin",
-	"version": "2.31.0",
+	"version": "2.32.0-prerelease",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/CHANGELOG.md b/packages/redux-routine/CHANGELOG.md
index 9559858c133e4..e79717f26f4d9 100644
--- a/packages/redux-routine/CHANGELOG.md
+++ b/packages/redux-routine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.49.0 (2024-01-10)
+
 ## 4.48.0 (2023-12-13)
 
 ## 4.47.0 (2023-11-29)
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index 2bdfb5fe8bffd..82a296a97a0d6 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.48.0",
+	"version": "4.49.0-prerelease",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/CHANGELOG.md b/packages/reusable-blocks/CHANGELOG.md
index 989f649f161f2..6b53ab6270411 100644
--- a/packages/reusable-blocks/CHANGELOG.md
+++ b/packages/reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index c6e6df921270a..07deea3856993 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
index ebc6157a84c1b..18e1f53183021 100644
--- a/packages/rich-text/CHANGELOG.md
+++ b/packages/rich-text/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.26.0 (2024-01-10)
+
 ## 6.25.0 (2023-12-13)
 
 ## 6.24.0 (2023-11-29)
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index 645beb47bfa2a..ac91805807c57 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.25.0",
+	"version": "6.26.0-prerelease",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index 90f93aa1f9700..5a931c8c945db 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.18.0 (2024-01-10)
+
 ## 0.17.0 (2023-12-13)
 
 ## 0.16.0 (2023-11-29)
diff --git a/packages/router/package.json b/packages/router/package.json
index d9d640a9fe75c..76ca9cba46588 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.17.0",
+	"version": "0.18.0-prerelease",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index a917cd119c17a..34c2f6049a3da 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 27.0.0 (2024-01-10)
+
 ### New Features
 
 -   Add experimental support for `viewModule` field in block.json for `build` and `start` scripts ([#57461](https://github.com/WordPress/gutenberg/pull/57461)).
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index f97ab389a527b..dbca51c0dc763 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "26.19.0",
+	"version": "27.0.0-prerelease",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/server-side-render/CHANGELOG.md b/packages/server-side-render/CHANGELOG.md
index 89f9150ade561..245c503e45bb2 100644
--- a/packages/server-side-render/CHANGELOG.md
+++ b/packages/server-side-render/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.26.0 (2024-01-10)
+
 ## 4.25.0 (2023-12-13)
 
 ## 4.24.0 (2023-11-29)
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index c3e3bb66680e7..73aea8946a255 100644
--- a/packages/server-side-render/package.json
+++ b/packages/server-side-render/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/server-side-render",
-	"version": "4.25.0",
+	"version": "4.26.0-prerelease",
 	"description": "The component used with WordPress to server-side render a preview of dynamic blocks to display in the editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/shortcode/CHANGELOG.md b/packages/shortcode/CHANGELOG.md
index 6d4bb284be7d4..05eb9e9e24526 100644
--- a/packages/shortcode/CHANGELOG.md
+++ b/packages/shortcode/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index 1e29a5e03343c..b640e88ac033f 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/style-engine/CHANGELOG.md b/packages/style-engine/CHANGELOG.md
index 35331cb4fe9a4..2c3a6970e3171 100644
--- a/packages/style-engine/CHANGELOG.md
+++ b/packages/style-engine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.32.0 (2024-01-10)
+
 ## 1.31.0 (2023-12-13)
 
 ## 1.30.0 (2023-11-29)
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index d11bc37c122bc..a0ba7ef7d32c8 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.31.0",
+	"version": "1.32.0-prerelease",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/stylelint-config/CHANGELOG.md b/packages/stylelint-config/CHANGELOG.md
index b7b6cb712ff75..eb82f9f916d4e 100644
--- a/packages/stylelint-config/CHANGELOG.md
+++ b/packages/stylelint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 21.32.0 (2024-01-10)
+
 ## 21.31.0 (2023-12-13)
 
 ## 21.30.0 (2023-11-29)
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index ff3ed08296c5e..c07b9ff1eaad6 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.31.0",
+	"version": "21.32.0-prerelease",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 206d4957a1287..353e3dec2c583 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.11.0 (2024-01-10)
+
 ## 0.10.0 (2023-12-13)
 
 ## 0.9.0 (2023-11-29)
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 7f3e20f6bd75a..51c9ce8522a28 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.10.0",
+	"version": "0.11.0-prerelease",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/token-list/CHANGELOG.md b/packages/token-list/CHANGELOG.md
index 7488e836b0c13..b9f1006ecbb3a 100644
--- a/packages/token-list/CHANGELOG.md
+++ b/packages/token-list/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index 3a877f9365d75..b7807fe59eb7c 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.48.0",
+	"version": "2.49.0-prerelease",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/undo-manager/CHANGELOG.md b/packages/undo-manager/CHANGELOG.md
index 2ff22f8020a32..0a3f1ffa8ba57 100644
--- a/packages/undo-manager/CHANGELOG.md
+++ b/packages/undo-manager/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.9.0 (2024-01-10)
+
 ## 0.8.0 (2023-12-13)
 
 ## 0.7.0 (2023-11-29)
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index f1d47b82de47d..e058bebc939c3 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.8.0",
+	"version": "0.9.0-prerelease",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md
index 29ca8923380d9..f6befc2b0a8b0 100644
--- a/packages/url/CHANGELOG.md
+++ b/packages/url/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-10)
+
 ## 3.49.0 (2023-12-13)
 
 ## 3.48.0 (2023-11-29)
diff --git a/packages/url/package.json b/packages/url/package.json
index 62cb1727928b4..e56260cf74b67 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/viewport/CHANGELOG.md b/packages/viewport/CHANGELOG.md
index 4d03197988aec..170371171003c 100644
--- a/packages/viewport/CHANGELOG.md
+++ b/packages/viewport/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.26.0 (2024-01-10)
+
 ## 5.25.0 (2023-12-13)
 
 ## 5.24.0 (2023-11-29)
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index 9251dabe8752d..4bd1820ddffdd 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.25.0",
+	"version": "5.26.0-prerelease",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/warning/CHANGELOG.md b/packages/warning/CHANGELOG.md
index 629291f88171b..20cae1aa42dc3 100644
--- a/packages/warning/CHANGELOG.md
+++ b/packages/warning/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.49.0 (2024-01-10)
+
 ## 2.48.0 (2023-12-13)
 
 ## 2.47.0 (2023-11-29)
diff --git a/packages/warning/package.json b/packages/warning/package.json
index 7a7e3958a922e..e89f8ea203b8f 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.48.0",
+	"version": "2.49.0-prerelease",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/widgets/CHANGELOG.md b/packages/widgets/CHANGELOG.md
index a24187330ba58..3e79836af4d93 100644
--- a/packages/widgets/CHANGELOG.md
+++ b/packages/widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.26.0 (2024-01-10)
+
 ## 3.25.0 (2023-12-13)
 
 ## 3.24.0 (2023-11-29)
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 60d7c7c5c4696..ad5a74db92e8d 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.25.0",
+	"version": "3.26.0-prerelease",
 	"description": "Functionality used by the widgets block editor in the Widgets screen and the Customizer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/wordcount/CHANGELOG.md b/packages/wordcount/CHANGELOG.md
index 9fab4788c9f41..3b1ee558fbfe7 100644
--- a/packages/wordcount/CHANGELOG.md
+++ b/packages/wordcount/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.49.0 (2024-01-10)
+
 ## 3.48.0 (2023-12-13)
 
 ## 3.47.0 (2023-11-29)
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index 5e76d6ed042c6..ac9400d8b1e3f 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.48.0",
+	"version": "3.49.0-prerelease",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 827c25844460c5f09a4d9f170f8100c4a53ff7e1 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Tue, 16 Jan 2024 13:39:28 +0000
Subject: [PATCH 130/296] chore(release): publish

 - @wordpress/a11y@3.49.0
 - @wordpress/annotations@2.49.0
 - @wordpress/api-fetch@6.46.0
 - @wordpress/autop@3.49.0
 - @wordpress/babel-plugin-import-jsx-pragma@4.32.0
 - @wordpress/babel-plugin-makepot@5.33.0
 - @wordpress/babel-preset-default@7.33.0
 - @wordpress/base-styles@4.40.0
 - @wordpress/blob@3.49.0
 - @wordpress/block-directory@4.26.0
 - @wordpress/block-editor@12.17.0
 - @wordpress/block-library@8.26.0
 - @wordpress/block-serialization-default-parser@4.49.0
 - @wordpress/block-serialization-spec-parser@4.49.0
 - @wordpress/blocks@12.26.0
 - @wordpress/browserslist-config@5.32.0
 - @wordpress/commands@0.20.0
 - @wordpress/components@25.15.0
 - @wordpress/compose@6.26.0
 - @wordpress/core-commands@0.18.0
 - @wordpress/core-data@6.26.0
 - @wordpress/create-block@4.33.0
 - @wordpress/create-block-interactive-template@1.12.0
 - @wordpress/create-block-tutorial-template@3.3.0
 - @wordpress/customize-widgets@4.26.0
 - @wordpress/data@9.19.0
 - @wordpress/data-controls@3.18.0
 - @wordpress/dataviews@0.3.0
 - @wordpress/date@4.49.0
 - @wordpress/dependency-extraction-webpack-plugin@5.0.0
 - @wordpress/deprecated@3.49.0
 - @wordpress/docgen@1.58.0
 - @wordpress/dom@3.49.0
 - @wordpress/dom-ready@3.49.0
 - @wordpress/e2e-test-utils@10.20.0
 - @wordpress/e2e-test-utils-playwright@0.17.0
 - @wordpress/e2e-tests@7.20.0
 - @wordpress/edit-post@7.26.0
 - @wordpress/edit-site@5.26.0
 - @wordpress/edit-widgets@5.26.0
 - @wordpress/editor@13.26.0
 - @wordpress/element@5.26.0
 - @wordpress/env@9.1.0
 - @wordpress/escape-html@2.49.0
 - @wordpress/eslint-plugin@17.6.0
 - @wordpress/format-library@4.26.0
 - @wordpress/hooks@3.49.0
 - @wordpress/html-entities@3.49.0
 - @wordpress/i18n@4.49.0
 - @wordpress/icons@9.40.0
 - @wordpress/interactivity@3.2.0
 - @wordpress/interface@5.26.0
 - @wordpress/is-shallow-equal@4.49.0
 - @wordpress/jest-console@7.20.0
 - @wordpress/jest-preset-default@11.20.0
 - @wordpress/jest-puppeteer-axe@6.20.0
 - @wordpress/keyboard-shortcuts@4.26.0
 - @wordpress/keycodes@3.49.0
 - @wordpress/lazy-import@1.36.0
 - @wordpress/list-reusable-blocks@4.26.0
 - @wordpress/media-utils@4.40.0
 - @wordpress/notices@4.17.0
 - @wordpress/npm-package-json-lint-config@4.34.0
 - @wordpress/nux@8.11.0
 - @wordpress/patterns@1.10.0
 - @wordpress/plugins@6.17.0
 - @wordpress/postcss-plugins-preset@4.33.0
 - @wordpress/postcss-themes@5.32.0
 - @wordpress/preferences@3.26.0
 - @wordpress/preferences-persistence@1.41.0
 - @wordpress/prettier-config@3.6.0
 - @wordpress/primitives@3.47.0
 - @wordpress/priority-queue@2.49.0
 - @wordpress/private-apis@0.31.0
 - @wordpress/project-management-automation@1.48.0
 - @wordpress/react-i18n@3.47.0
 - @wordpress/readable-js-assets-webpack-plugin@2.32.0
 - @wordpress/redux-routine@4.49.0
 - @wordpress/reusable-blocks@4.26.0
 - @wordpress/rich-text@6.26.0
 - @wordpress/router@0.18.0
 - @wordpress/scripts@27.0.0
 - @wordpress/server-side-render@4.26.0
 - @wordpress/shortcode@3.49.0
 - @wordpress/style-engine@1.32.0
 - @wordpress/stylelint-config@21.32.0
 - @wordpress/sync@0.11.0
 - @wordpress/token-list@2.49.0
 - @wordpress/undo-manager@0.9.0
 - @wordpress/url@3.50.0
 - @wordpress/viewport@5.26.0
 - @wordpress/warning@2.49.0
 - @wordpress/widgets@3.26.0
 - @wordpress/wordcount@3.49.0
---
 package-lock.json                             | 186 +++++++++---------
 packages/a11y/package.json                    |   2 +-
 packages/annotations/package.json             |   2 +-
 packages/api-fetch/package.json               |   2 +-
 packages/autop/package.json                   |   2 +-
 .../package.json                              |   2 +-
 packages/babel-plugin-makepot/package.json    |   2 +-
 packages/babel-preset-default/package.json    |   2 +-
 packages/base-styles/package.json             |   2 +-
 packages/blob/package.json                    |   2 +-
 packages/block-directory/package.json         |   2 +-
 packages/block-editor/package.json            |   2 +-
 packages/block-library/package.json           |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 packages/blocks/package.json                  |   2 +-
 packages/browserslist-config/package.json     |   2 +-
 packages/commands/package.json                |   2 +-
 packages/components/package.json              |   2 +-
 packages/compose/package.json                 |   2 +-
 packages/core-commands/package.json           |   2 +-
 packages/core-data/package.json               |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 packages/create-block/package.json            |   2 +-
 packages/customize-widgets/package.json       |   2 +-
 packages/data-controls/package.json           |   2 +-
 packages/data/package.json                    |   2 +-
 packages/dataviews/package.json               |   2 +-
 packages/date/package.json                    |   2 +-
 .../package.json                              |   2 +-
 packages/deprecated/package.json              |   2 +-
 packages/docgen/package.json                  |   2 +-
 packages/dom-ready/package.json               |   2 +-
 packages/dom/package.json                     |   2 +-
 .../e2e-test-utils-playwright/package.json    |   2 +-
 packages/e2e-test-utils/package.json          |   2 +-
 packages/e2e-tests/package.json               |   2 +-
 packages/edit-post/package.json               |   2 +-
 packages/edit-site/package.json               |   2 +-
 packages/edit-widgets/package.json            |   2 +-
 packages/editor/package.json                  |   2 +-
 packages/element/package.json                 |   2 +-
 packages/env/package.json                     |   2 +-
 packages/escape-html/package.json             |   2 +-
 packages/eslint-plugin/package.json           |   2 +-
 packages/format-library/package.json          |   2 +-
 packages/hooks/package.json                   |   2 +-
 packages/html-entities/package.json           |   2 +-
 packages/i18n/package.json                    |   2 +-
 packages/icons/package.json                   |   2 +-
 packages/interactivity/package.json           |   2 +-
 packages/interface/package.json               |   2 +-
 packages/is-shallow-equal/package.json        |   2 +-
 packages/jest-console/package.json            |   2 +-
 packages/jest-preset-default/package.json     |   2 +-
 packages/jest-puppeteer-axe/package.json      |   2 +-
 packages/keyboard-shortcuts/package.json      |   2 +-
 packages/keycodes/package.json                |   2 +-
 packages/lazy-import/package.json             |   2 +-
 packages/list-reusable-blocks/package.json    |   2 +-
 packages/media-utils/package.json             |   2 +-
 packages/notices/package.json                 |   2 +-
 .../npm-package-json-lint-config/package.json |   2 +-
 packages/nux/package.json                     |   2 +-
 packages/patterns/package.json                |   2 +-
 packages/plugins/package.json                 |   2 +-
 packages/postcss-plugins-preset/package.json  |   2 +-
 packages/postcss-themes/package.json          |   2 +-
 packages/preferences-persistence/package.json |   2 +-
 packages/preferences/package.json             |   2 +-
 packages/prettier-config/package.json         |   2 +-
 packages/primitives/package.json              |   2 +-
 packages/priority-queue/package.json          |   2 +-
 packages/private-apis/package.json            |   2 +-
 .../package.json                              |   2 +-
 packages/react-i18n/package.json              |   2 +-
 .../package.json                              |   2 +-
 packages/redux-routine/package.json           |   2 +-
 packages/reusable-blocks/package.json         |   2 +-
 packages/rich-text/package.json               |   2 +-
 packages/router/package.json                  |   2 +-
 packages/scripts/package.json                 |   2 +-
 packages/server-side-render/package.json      |   2 +-
 packages/shortcode/package.json               |   2 +-
 packages/style-engine/package.json            |   2 +-
 packages/stylelint-config/package.json        |   2 +-
 packages/sync/package.json                    |   2 +-
 packages/token-list/package.json              |   2 +-
 packages/undo-manager/package.json            |   2 +-
 packages/url/package.json                     |   2 +-
 packages/viewport/package.json                |   2 +-
 packages/warning/package.json                 |   2 +-
 packages/widgets/package.json                 |   2 +-
 packages/wordcount/package.json               |   2 +-
 95 files changed, 187 insertions(+), 187 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 626b31a3ee9f8..b74f66298d787 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53831,7 +53831,7 @@
 		},
 		"packages/a11y": {
 			"name": "@wordpress/a11y",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53844,7 +53844,7 @@
 		},
 		"packages/annotations": {
 			"name": "@wordpress/annotations",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53872,7 +53872,7 @@
 		},
 		"packages/api-fetch": {
 			"name": "@wordpress/api-fetch",
-			"version": "6.45.0",
+			"version": "6.46.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53885,7 +53885,7 @@
 		},
 		"packages/autop": {
 			"name": "@wordpress/autop",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53896,7 +53896,7 @@
 		},
 		"packages/babel-plugin-import-jsx-pragma": {
 			"name": "@wordpress/babel-plugin-import-jsx-pragma",
-			"version": "4.31.0",
+			"version": "4.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -53908,7 +53908,7 @@
 		},
 		"packages/babel-plugin-makepot": {
 			"name": "@wordpress/babel-plugin-makepot",
-			"version": "5.32.0",
+			"version": "5.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53925,7 +53925,7 @@
 		},
 		"packages/babel-preset-default": {
 			"name": "@wordpress/babel-preset-default",
-			"version": "7.32.0",
+			"version": "7.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53948,13 +53948,13 @@
 		},
 		"packages/base-styles": {
 			"name": "@wordpress/base-styles",
-			"version": "4.39.0",
+			"version": "4.40.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/blob": {
 			"name": "@wordpress/blob",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53965,7 +53965,7 @@
 		},
 		"packages/block-directory": {
 			"name": "@wordpress/block-directory",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54000,7 +54000,7 @@
 		},
 		"packages/block-editor": {
 			"name": "@wordpress/block-editor",
-			"version": "12.16.0",
+			"version": "12.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54097,7 +54097,7 @@
 		},
 		"packages/block-library": {
 			"name": "@wordpress/block-library",
-			"version": "8.25.0",
+			"version": "8.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54159,7 +54159,7 @@
 		},
 		"packages/block-serialization-default-parser": {
 			"name": "@wordpress/block-serialization-default-parser",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54170,7 +54170,7 @@
 		},
 		"packages/block-serialization-spec-parser": {
 			"name": "@wordpress/block-serialization-spec-parser",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"pegjs": "^0.10.0",
@@ -54182,7 +54182,7 @@
 		},
 		"packages/blocks": {
 			"name": "@wordpress/blocks",
-			"version": "12.25.0",
+			"version": "12.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54236,7 +54236,7 @@
 		},
 		"packages/browserslist-config": {
 			"name": "@wordpress/browserslist-config",
-			"version": "5.31.0",
+			"version": "5.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -54245,7 +54245,7 @@
 		},
 		"packages/commands": {
 			"name": "@wordpress/commands",
-			"version": "0.19.0",
+			"version": "0.20.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54270,7 +54270,7 @@
 		},
 		"packages/components": {
 			"name": "@wordpress/components",
-			"version": "25.14.0",
+			"version": "25.15.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@ariakit/react": "^0.3.12",
@@ -54375,7 +54375,7 @@
 		},
 		"packages/compose": {
 			"name": "@wordpress/compose",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54401,7 +54401,7 @@
 		},
 		"packages/core-commands": {
 			"name": "@wordpress/core-commands",
-			"version": "0.17.0",
+			"version": "0.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54426,7 +54426,7 @@
 		},
 		"packages/core-data": {
 			"name": "@wordpress/core-data",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54470,7 +54470,7 @@
 		},
 		"packages/create-block": {
 			"name": "@wordpress/create-block",
-			"version": "4.32.0",
+			"version": "4.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54498,13 +54498,13 @@
 		},
 		"packages/create-block-tutorial-template": {
 			"name": "@wordpress/create-block-tutorial-template",
-			"version": "3.2.0",
+			"version": "3.3.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/customize-widgets": {
 			"name": "@wordpress/customize-widgets",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54541,7 +54541,7 @@
 		},
 		"packages/data": {
 			"name": "@wordpress/data",
-			"version": "9.18.0",
+			"version": "9.19.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54569,7 +54569,7 @@
 		},
 		"packages/data-controls": {
 			"name": "@wordpress/data-controls",
-			"version": "3.17.0",
+			"version": "3.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54586,7 +54586,7 @@
 		},
 		"packages/dataviews": {
 			"name": "@wordpress/dataviews",
-			"version": "0.2.0",
+			"version": "0.3.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54611,7 +54611,7 @@
 		},
 		"packages/date": {
 			"name": "@wordpress/date",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54625,7 +54625,7 @@
 		},
 		"packages/dependency-extraction-webpack-plugin": {
 			"name": "@wordpress/dependency-extraction-webpack-plugin",
-			"version": "4.31.0",
+			"version": "5.0.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54640,7 +54640,7 @@
 		},
 		"packages/deprecated": {
 			"name": "@wordpress/deprecated",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54652,7 +54652,7 @@
 		},
 		"packages/docgen": {
 			"name": "@wordpress/docgen",
-			"version": "1.57.0",
+			"version": "1.58.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54670,7 +54670,7 @@
 		},
 		"packages/dom": {
 			"name": "@wordpress/dom",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54682,7 +54682,7 @@
 		},
 		"packages/dom-ready": {
 			"name": "@wordpress/dom-ready",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54693,7 +54693,7 @@
 		},
 		"packages/e2e-test-utils": {
 			"name": "@wordpress/e2e-test-utils",
-			"version": "10.19.0",
+			"version": "10.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54715,7 +54715,7 @@
 		},
 		"packages/e2e-test-utils-playwright": {
 			"name": "@wordpress/e2e-test-utils-playwright",
-			"version": "0.16.0",
+			"version": "0.17.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54738,7 +54738,7 @@
 		},
 		"packages/e2e-tests": {
 			"name": "@wordpress/e2e-tests",
-			"version": "7.19.0",
+			"version": "7.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54776,7 +54776,7 @@
 		},
 		"packages/edit-post": {
 			"name": "@wordpress/edit-post",
-			"version": "7.25.0",
+			"version": "7.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54824,7 +54824,7 @@
 		},
 		"packages/edit-site": {
 			"name": "@wordpress/edit-site",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54889,7 +54889,7 @@
 		},
 		"packages/edit-widgets": {
 			"name": "@wordpress/edit-widgets",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54932,7 +54932,7 @@
 		},
 		"packages/editor": {
 			"name": "@wordpress/editor",
-			"version": "13.25.0",
+			"version": "13.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54983,7 +54983,7 @@
 		},
 		"packages/element": {
 			"name": "@wordpress/element",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55001,7 +55001,7 @@
 		},
 		"packages/env": {
 			"name": "@wordpress/env",
-			"version": "9.0.0",
+			"version": "9.1.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55135,7 +55135,7 @@
 		},
 		"packages/escape-html": {
 			"name": "@wordpress/escape-html",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55146,7 +55146,7 @@
 		},
 		"packages/eslint-plugin": {
 			"name": "@wordpress/eslint-plugin",
-			"version": "17.5.0",
+			"version": "17.6.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55189,7 +55189,7 @@
 		},
 		"packages/format-library": {
 			"name": "@wordpress/format-library",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55216,7 +55216,7 @@
 		},
 		"packages/hooks": {
 			"name": "@wordpress/hooks",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55227,7 +55227,7 @@
 		},
 		"packages/html-entities": {
 			"name": "@wordpress/html-entities",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55238,7 +55238,7 @@
 		},
 		"packages/i18n": {
 			"name": "@wordpress/i18n",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55257,7 +55257,7 @@
 		},
 		"packages/icons": {
 			"name": "@wordpress/icons",
-			"version": "9.39.0",
+			"version": "9.40.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55270,7 +55270,7 @@
 		},
 		"packages/interactivity": {
 			"name": "@wordpress/interactivity",
-			"version": "3.1.0",
+			"version": "3.2.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@preact/signals": "^1.1.3",
@@ -55283,7 +55283,7 @@
 		},
 		"packages/interface": {
 			"name": "@wordpress/interface",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55311,7 +55311,7 @@
 		},
 		"packages/is-shallow-equal": {
 			"name": "@wordpress/is-shallow-equal",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55322,7 +55322,7 @@
 		},
 		"packages/jest-console": {
 			"name": "@wordpress/jest-console",
-			"version": "7.19.0",
+			"version": "7.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55338,7 +55338,7 @@
 		},
 		"packages/jest-preset-default": {
 			"name": "@wordpress/jest-preset-default",
-			"version": "11.19.0",
+			"version": "11.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55355,7 +55355,7 @@
 		},
 		"packages/jest-puppeteer-axe": {
 			"name": "@wordpress/jest-puppeteer-axe",
-			"version": "6.19.0",
+			"version": "6.20.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55377,7 +55377,7 @@
 		},
 		"packages/keyboard-shortcuts": {
 			"name": "@wordpress/keyboard-shortcuts",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55395,7 +55395,7 @@
 		},
 		"packages/keycodes": {
 			"name": "@wordpress/keycodes",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55407,7 +55407,7 @@
 		},
 		"packages/lazy-import": {
 			"name": "@wordpress/lazy-import",
-			"version": "1.35.0",
+			"version": "1.36.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55421,7 +55421,7 @@
 		},
 		"packages/list-reusable-blocks": {
 			"name": "@wordpress/list-reusable-blocks",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55443,7 +55443,7 @@
 		},
 		"packages/media-utils": {
 			"name": "@wordpress/media-utils",
-			"version": "4.39.0",
+			"version": "4.40.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55458,7 +55458,7 @@
 		},
 		"packages/notices": {
 			"name": "@wordpress/notices",
-			"version": "4.16.0",
+			"version": "4.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55474,7 +55474,7 @@
 		},
 		"packages/npm-package-json-lint-config": {
 			"name": "@wordpress/npm-package-json-lint-config",
-			"version": "4.33.0",
+			"version": "4.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55486,7 +55486,7 @@
 		},
 		"packages/nux": {
 			"name": "@wordpress/nux",
-			"version": "8.10.0",
+			"version": "8.11.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55509,7 +55509,7 @@
 		},
 		"packages/patterns": {
 			"name": "@wordpress/patterns",
-			"version": "1.9.0",
+			"version": "1.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55539,7 +55539,7 @@
 		},
 		"packages/plugins": {
 			"name": "@wordpress/plugins",
-			"version": "6.16.0",
+			"version": "6.17.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55561,7 +55561,7 @@
 		},
 		"packages/postcss-plugins-preset": {
 			"name": "@wordpress/postcss-plugins-preset",
-			"version": "4.32.0",
+			"version": "4.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55577,7 +55577,7 @@
 		},
 		"packages/postcss-themes": {
 			"name": "@wordpress/postcss-themes",
-			"version": "5.31.0",
+			"version": "5.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55589,7 +55589,7 @@
 		},
 		"packages/preferences": {
 			"name": "@wordpress/preferences",
-			"version": "3.25.0",
+			"version": "3.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55613,7 +55613,7 @@
 		},
 		"packages/preferences-persistence": {
 			"name": "@wordpress/preferences-persistence",
-			"version": "1.40.0",
+			"version": "1.41.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55625,7 +55625,7 @@
 		},
 		"packages/prettier-config": {
 			"name": "@wordpress/prettier-config",
-			"version": "3.5.0",
+			"version": "3.6.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55637,7 +55637,7 @@
 		},
 		"packages/primitives": {
 			"name": "@wordpress/primitives",
-			"version": "3.46.0",
+			"version": "3.47.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55650,7 +55650,7 @@
 		},
 		"packages/priority-queue": {
 			"name": "@wordpress/priority-queue",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55662,7 +55662,7 @@
 		},
 		"packages/private-apis": {
 			"name": "@wordpress/private-apis",
-			"version": "0.30.0",
+			"version": "0.31.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55673,7 +55673,7 @@
 		},
 		"packages/project-management-automation": {
 			"name": "@wordpress/project-management-automation",
-			"version": "1.47.0",
+			"version": "1.48.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55686,7 +55686,7 @@
 		},
 		"packages/react-i18n": {
 			"name": "@wordpress/react-i18n",
-			"version": "3.46.0",
+			"version": "3.47.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55834,7 +55834,7 @@
 		},
 		"packages/readable-js-assets-webpack-plugin": {
 			"name": "@wordpress/readable-js-assets-webpack-plugin",
-			"version": "2.31.0",
+			"version": "2.32.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55846,7 +55846,7 @@
 		},
 		"packages/redux-routine": {
 			"name": "@wordpress/redux-routine",
-			"version": "4.48.0",
+			"version": "4.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55890,7 +55890,7 @@
 		},
 		"packages/reusable-blocks": {
 			"name": "@wordpress/reusable-blocks",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55916,7 +55916,7 @@
 		},
 		"packages/rich-text": {
 			"name": "@wordpress/rich-text",
-			"version": "6.25.0",
+			"version": "6.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55940,7 +55940,7 @@
 		},
 		"packages/router": {
 			"name": "@wordpress/router",
-			"version": "0.17.0",
+			"version": "0.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55958,7 +55958,7 @@
 		},
 		"packages/scripts": {
 			"name": "@wordpress/scripts",
-			"version": "26.19.0",
+			"version": "27.0.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -56180,7 +56180,7 @@
 		},
 		"packages/server-side-render": {
 			"name": "@wordpress/server-side-render",
-			"version": "4.25.0",
+			"version": "4.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56205,7 +56205,7 @@
 		},
 		"packages/shortcode": {
 			"name": "@wordpress/shortcode",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56217,7 +56217,7 @@
 		},
 		"packages/style-engine": {
 			"name": "@wordpress/style-engine",
-			"version": "1.31.0",
+			"version": "1.32.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56229,7 +56229,7 @@
 		},
 		"packages/stylelint-config": {
 			"name": "@wordpress/stylelint-config",
-			"version": "21.31.0",
+			"version": "21.32.0",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -56245,7 +56245,7 @@
 		},
 		"packages/sync": {
 			"name": "@wordpress/sync",
-			"version": "0.10.0",
+			"version": "0.11.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56265,7 +56265,7 @@
 		},
 		"packages/token-list": {
 			"name": "@wordpress/token-list",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -56276,7 +56276,7 @@
 		},
 		"packages/undo-manager": {
 			"name": "@wordpress/undo-manager",
-			"version": "0.8.0",
+			"version": "0.9.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56288,7 +56288,7 @@
 		},
 		"packages/url": {
 			"name": "@wordpress/url",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56300,7 +56300,7 @@
 		},
 		"packages/viewport": {
 			"name": "@wordpress/viewport",
-			"version": "5.25.0",
+			"version": "5.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56317,7 +56317,7 @@
 		},
 		"packages/warning": {
 			"name": "@wordpress/warning",
-			"version": "2.48.0",
+			"version": "2.49.0",
 			"license": "GPL-2.0-or-later",
 			"engines": {
 				"node": ">=12"
@@ -56325,7 +56325,7 @@
 		},
 		"packages/widgets": {
 			"name": "@wordpress/widgets",
-			"version": "3.25.0",
+			"version": "3.26.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56349,7 +56349,7 @@
 		},
 		"packages/wordcount": {
 			"name": "@wordpress/wordcount",
-			"version": "3.48.0",
+			"version": "3.49.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 8ae9c45b7433d..c2d1b666339bf 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index fbcf81fdf4f6f..007b02ad29a71 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.49.0-prerelease",
+	"version": "2.49.0",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index fcd88a0099df6..02d0474156bfc 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.46.0-prerelease",
+	"version": "6.46.0",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/autop/package.json b/packages/autop/package.json
index 7df62adc20484..e335e4ac7349b 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index c0cfeed10daaa..3af7e30b2e234 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-import-jsx-pragma",
-	"version": "4.32.0-prerelease",
+	"version": "4.32.0",
 	"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index 486ef101ada3b..6163ad1df3ff1 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "5.33.0-prerelease",
+	"version": "5.33.0",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index a3b4c864bb6fe..66e63b24ff51e 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-preset-default",
-	"version": "7.33.0-prerelease",
+	"version": "7.33.0",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index 86928afa0a515..64d3835a00aca 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.40.0-prerelease",
+	"version": "4.40.0",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blob/package.json b/packages/blob/package.json
index 16fc425e19878..53071228e0af1 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index 0dcd2f36ccd52..466d1fd783e95 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index 98aa8a709b236..cf8f13a0b9f11 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.17.0-prerelease",
+	"version": "12.17.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index c1f484ad9a914..49cbc29415718 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.26.0-prerelease",
+	"version": "8.26.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index f4d324cf6c9a9..668fc92eea94b 100644
--- a/packages/block-serialization-default-parser/package.json
+++ b/packages/block-serialization-default-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-default-parser",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index 822868a597418..df841c8a506c1 100644
--- a/packages/block-serialization-spec-parser/package.json
+++ b/packages/block-serialization-spec-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-spec-parser",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index 355251c5d16da..af0e076574518 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.26.0-prerelease",
+	"version": "12.26.0",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 6e039d02c0f92..4b2747e505e16 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.32.0-prerelease",
+	"version": "5.32.0",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/commands/package.json b/packages/commands/package.json
index ef3fa9f6bfbfd..5314cf671b1ba 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.20.0-prerelease",
+	"version": "0.20.0",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/components/package.json b/packages/components/package.json
index f49deb5413c35..a16778a7778b5 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.15.0-prerelease",
+	"version": "25.15.0",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 713a7ac85f8cb..851d3025b50a1 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.26.0-prerelease",
+	"version": "6.26.0",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index 61d8e3037961a..076dce00569e0 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.18.0-prerelease",
+	"version": "0.18.0",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index 565ef8e2fdf55..5970b985a58d4 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.26.0-prerelease",
+	"version": "6.26.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index 976ee68a0e2d0..e95e68fef062a 100644
--- a/packages/create-block-interactive-template/package.json
+++ b/packages/create-block-interactive-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-interactive-template",
-	"version": "1.12.0-prerelease",
+	"version": "1.12.0",
 	"description": "Template for @wordpress/create-block to create interactive blocks with the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 47625bb4996cf..6a7f0b85901b0 100644
--- a/packages/create-block-tutorial-template/package.json
+++ b/packages/create-block-tutorial-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-tutorial-template",
-	"version": "3.3.0-prerelease",
+	"version": "3.3.0",
 	"description": "This is a template for @wordpress/create-block that creates an example 'Copyright Date' block. This block is used in the official WordPress block development Quick Start Guide.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index 9a628ffdf4a33..b25dd050a1ef4 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.33.0-prerelease",
+	"version": "4.33.0",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 64b1eabcaeee4..5ee1b3ddb6037 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index 0f26fca0fc653..2c1fc4dc011e7 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.18.0-prerelease",
+	"version": "3.18.0",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/package.json b/packages/data/package.json
index cb57d35b87f13..135e9697ad1b1 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.19.0-prerelease",
+	"version": "9.19.0",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index 4136be59c330d..ddb51cc846985 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.3.0-prerelease",
+	"version": "0.3.0",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/date/package.json b/packages/date/package.json
index 7963815604a18..1553dba858339 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index 12d3613ede998..06b9efd857d03 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "5.0.0-prerelease",
+	"version": "5.0.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index 37a5b08f376ff..7dc51929550c3 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index 5754ce37e9253..844518cc1cbab 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.58.0-prerelease",
+	"version": "1.58.0",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index 561066f1c63d9..d902a14c662f7 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 901f866a23c26..304653e4074b9 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 8309f4dc6126a..89bfb6ab66ae8 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils-playwright",
-	"version": "0.17.0-prerelease",
+	"version": "0.17.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index 12aa2cca7e945..6943658627510 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils",
-	"version": "10.20.0-prerelease",
+	"version": "10.20.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 86d88c253cdb7..864eba1af12ac 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.20.0-prerelease",
+	"version": "7.20.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 2a3053d109a2a..4041630884f75 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.26.0-prerelease",
+	"version": "7.26.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index 0debc2609e6ca..830d525ed060a 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.26.0-prerelease",
+	"version": "5.26.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 85b553fb090a8..8861148d173ca 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.26.0-prerelease",
+	"version": "5.26.0",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 72d79660f7c76..b974c7443851f 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.26.0-prerelease",
+	"version": "13.26.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/element/package.json b/packages/element/package.json
index 4f4318038abbb..9f075bdfff56d 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.26.0-prerelease",
+	"version": "5.26.0",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/env/package.json b/packages/env/package.json
index 8e17750811551..5036479faa532 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "9.1.0-prerelease",
+	"version": "9.1.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 18c10a29b489e..cfeabcb8c06e9 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.49.0-prerelease",
+	"version": "2.49.0",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 18bb33042f1d9..b56a61ab16044 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.6.0-prerelease",
+	"version": "17.6.0",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index 2d26087581170..280fd5d8c2042 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 84074b3575c2d..08fa1eb54819c 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index b6ae9c2634ded..10965eaf51fab 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 56769f3e33736..a2b2ed907cf96 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index 0c359d100a34b..b94cb445b5760 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.40.0-prerelease",
+	"version": "9.40.0",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index b7ed52dd288c8..455af38b67fca 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "3.2.0-prerelease",
+	"version": "3.2.0",
 	"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interface/package.json b/packages/interface/package.json
index 8dfd6bf8ccf85..feebc542d3a78 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.26.0-prerelease",
+	"version": "5.26.0",
 	"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index d37a0d1a735c4..f2600696d54d6 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/is-shallow-equal",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index aec655cdef025..4dfdea8d61175 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.20.0-prerelease",
+	"version": "7.20.0",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 0eea603b2ad17..aa787861ed89d 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-preset-default",
-	"version": "11.20.0-prerelease",
+	"version": "11.20.0",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index 44f86cd158e7e..d30e2ea781286 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-puppeteer-axe",
-	"version": "6.20.0-prerelease",
+	"version": "6.20.0",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index 8e1c2b35130fd..7f336adb52510 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index 342d50ba8e6e0..c5ce48ea8c2c3 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index 644121850eab4..8ad948e62408a 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.36.0-prerelease",
+	"version": "1.36.0",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index 1decde84386eb..403809ae7d72a 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/list-reusable-blocks",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index 3babc2af8c07e..b01403efff06e 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.40.0-prerelease",
+	"version": "4.40.0",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/notices/package.json b/packages/notices/package.json
index eb7ea82e973e4..4f763cb6ed576 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.17.0-prerelease",
+	"version": "4.17.0",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 2f16d73f738b4..a05901155c0ad 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/npm-package-json-lint-config",
-	"version": "4.34.0-prerelease",
+	"version": "4.34.0",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/nux/package.json b/packages/nux/package.json
index 9af2b3682d3d1..e59b11cf9b951 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.11.0-prerelease",
+	"version": "8.11.0",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index 7334017ca1a43..bb130b52f8a98 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.10.0-prerelease",
+	"version": "1.10.0",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 11def4a122ebf..9341fc509e6a8 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.17.0-prerelease",
+	"version": "6.17.0",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 449c6b8994c4a..0fce1ad734cb9 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-plugins-preset",
-	"version": "4.33.0-prerelease",
+	"version": "4.33.0",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 9bad42995cd33..9eb9b4c37a647 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.32.0-prerelease",
+	"version": "5.32.0",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index 2a4fb8c576805..1c40eeb80d3ba 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.41.0-prerelease",
+	"version": "1.41.0",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index 50e82e4675983..ac1f1c9ade95c 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.26.0-prerelease",
+	"version": "3.26.0",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index c2e69e453f691..3dc8c49a3b1f0 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.6.0-prerelease",
+	"version": "3.6.0",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 294ba82270d36..3aa66baee21da 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.47.0-prerelease",
+	"version": "3.47.0",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index a90dc43ed0476..c06d29acf5585 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.49.0-prerelease",
+	"version": "2.49.0",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 953430fc97d1c..8bf5a27dbd8bb 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.31.0-prerelease",
+	"version": "0.31.0",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 02ddae86044eb..46fe20bf9e727 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/project-management-automation",
-	"version": "1.48.0-prerelease",
+	"version": "1.48.0",
 	"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index fa81c2bba5dec..b7798f268c13d 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.47.0-prerelease",
+	"version": "3.47.0",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index 518f2cc0a8053..da6750fd93136 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/readable-js-assets-webpack-plugin",
-	"version": "2.32.0-prerelease",
+	"version": "2.32.0",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index 82a296a97a0d6..347fa98b63510 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.49.0-prerelease",
+	"version": "4.49.0",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index 07deea3856993..947d85834784b 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index ac91805807c57..ef935eea5686f 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.26.0-prerelease",
+	"version": "6.26.0",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/router/package.json b/packages/router/package.json
index 76ca9cba46588..4d882bdc5cd9d 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.18.0-prerelease",
+	"version": "0.18.0",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index dbca51c0dc763..b270cac5ea7bf 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "27.0.0-prerelease",
+	"version": "27.0.0",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index 73aea8946a255..221c36cb20072 100644
--- a/packages/server-side-render/package.json
+++ b/packages/server-side-render/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/server-side-render",
-	"version": "4.26.0-prerelease",
+	"version": "4.26.0",
 	"description": "The component used with WordPress to server-side render a preview of dynamic blocks to display in the editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index b640e88ac033f..3088836074b9d 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index a0ba7ef7d32c8..4c318049e4fe5 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.32.0-prerelease",
+	"version": "1.32.0",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index c07b9ff1eaad6..40bc6becf03fb 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.32.0-prerelease",
+	"version": "21.32.0",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 51c9ce8522a28..e0e07f11a121b 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.11.0-prerelease",
+	"version": "0.11.0",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index b7807fe59eb7c..6e47980844ca2 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.49.0-prerelease",
+	"version": "2.49.0",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index e058bebc939c3..fde1fcf604cbc 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.9.0-prerelease",
+	"version": "0.9.0",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/url/package.json b/packages/url/package.json
index e56260cf74b67..0c2d9993f49e9 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index 4bd1820ddffdd..dd11ff8db2ba6 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.26.0-prerelease",
+	"version": "5.26.0",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/warning/package.json b/packages/warning/package.json
index e89f8ea203b8f..134d58c060d08 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.49.0-prerelease",
+	"version": "2.49.0",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index ad5a74db92e8d..8f04224c63fb2 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.26.0-prerelease",
+	"version": "3.26.0",
 	"description": "Functionality used by the widgets block editor in the Widgets screen and the Customizer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index ac9400d8b1e3f..b8834399c8f28 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.49.0-prerelease",
+	"version": "3.49.0",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From f6db63174d3d0e29e8ed5f041a7de83cb41ba8ef Mon Sep 17 00:00:00 2001
From: Milen Petrinski <gonzo@greatgonzo.net>
Date: Tue, 16 Jan 2024 16:14:29 +0200
Subject: [PATCH 131/296] Add gettext content when translating 'Header'.
 (#51066)

* Add gettext content when translating 'Header'.

* Oops, add import for _x().
---
 packages/interface/src/components/interface-skeleton/index.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/interface/src/components/interface-skeleton/index.js b/packages/interface/src/components/interface-skeleton/index.js
index baf98d153ed87..8d6a060259a29 100644
--- a/packages/interface/src/components/interface-skeleton/index.js
+++ b/packages/interface/src/components/interface-skeleton/index.js
@@ -11,7 +11,7 @@ import {
 	__unstableUseNavigateRegions as useNavigateRegions,
 	__unstableMotion as motion,
 } from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
+import { __, _x } from '@wordpress/i18n';
 import { useMergeRefs } from '@wordpress/compose';
 
 /**
@@ -68,7 +68,7 @@ function InterfaceSkeleton(
 
 	const defaultLabels = {
 		/* translators: accessibility text for the top bar landmark region. */
-		header: __( 'Header' ),
+		header: _x( 'Header', 'header landmark area' ),
 		/* translators: accessibility text for the content landmark region. */
 		body: __( 'Content' ),
 		/* translators: accessibility text for the secondary sidebar landmark region. */

From cdd6cecbc5bbf5ce5f55da0301246acfcf56c426 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Tue, 16 Jan 2024 15:59:16 +0100
Subject: [PATCH 132/296] Components: move CHANGELOG entries under the correct
 release (#57885)

---
 packages/components/CHANGELOG.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 570c7371072cc..9a245d85ebf84 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -7,12 +7,17 @@
 -   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
 -   `BoxControl`, `BorderControl`, `BorderBoxControl`: Add opt-in prop for 40px default size ([#56185](https://github.com/WordPress/gutenberg/pull/56185)).
 -   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
--   `ColorPalette` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
+-   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
+-   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 
 ### Bug Fixes
 
 -   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 
+### Experimental
+
+-   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
+
 ## 25.15.0 (2024-01-10)
 
 ### Bug Fix
@@ -45,7 +50,6 @@
 -   `InputControl`, `NumberControl`, `UnitControl`, `SelectControl`, `TreeSelect`: Add `compact` size variant ([#57398](https://github.com/WordPress/gutenberg/pull/57398)).
 -   `ToggleGroupControl`: Update button size in large variant to be 32px ([#57338](https://github.com/WordPress/gutenberg/pull/57338)).
 -   `Tooltip`: improve unit tests ([#57345](https://github.com/WordPress/gutenberg/pull/57345)).
--   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 
 ### Experimental
 
@@ -53,7 +57,6 @@
 -   `Tabs`: do not render hidden content ([#57046](https://github.com/WordPress/gutenberg/pull/57046)).
 -   `Tabs`: improve hover and text alignment styles ([#57275](https://github.com/WordPress/gutenberg/pull/57275)).
 -   `Tabs`: make sure `Tab`s are associated to the right `TabPanel`s, regardless of the order they're rendered in ([#57033](https://github.com/WordPress/gutenberg/pull/57033)).
--   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
 
 ## 25.14.0 (2023-12-13)
 

From df1819d1626c8b90903d067c45f68bb49f5f8e6b Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Tue, 16 Jan 2024 17:08:33 +0100
Subject: [PATCH 133/296] Interactivity API: Prevent the use of components in
 `wp-text` (#57879)

* Allow only strings for wp-text

* Update changelog

* Update with suggested commit, add try-catch and toString

* Update tests, prevent [object Object]

* Apply suggestion to preven duplicate evaluate calls

* Change changelog

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 .../interactive-blocks/directive-text/render.php   | 14 ++++++++++++++
 .../interactive-blocks/directive-text/view.js      |  5 ++++-
 packages/interactivity/CHANGELOG.md                |  4 ++++
 packages/interactivity/src/directives.js           |  8 +++++++-
 .../specs/interactivity/directives-text.spec.ts    |  9 +++++++++
 5 files changed, 38 insertions(+), 2 deletions(-)

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
index 98803669c6b0b..91d03b6fb8e19 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
@@ -34,4 +34,18 @@
 			Toggle Context Text
 		</button>
 	</div>
+	<div>
+		<span
+			data-wp-text="state.component"
+			data-testid="show state component"
+		></span>
+		<span
+			data-wp-text="state.number"
+			data-testid="show state number"
+		></span>
+		<span
+			data-wp-text="state.boolean"
+			data-testid="show state boolean"
+		></span>
+	</div>
 </div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
index 82f37f4f78f1f..12b8ca9488ea1 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/view.js
@@ -1,11 +1,14 @@
 /**
  * WordPress dependencies
  */
-import { store, getContext } from '@wordpress/interactivity';
+import { store, getContext, createElement } from '@wordpress/interactivity';
 
 const { state } = store( 'directive-context', {
 	state: {
 		text: 'Text 1',
+		component: () => (createElement( 'div', {}, state.text )),
+		number: 1,
+		boolean: true
 	},
 	actions: {
 		toggleStateText() {
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 67b25a7e30ee0..a67775b781d55 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Enhancements
+
+- Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
+
 ### New Features
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index 931fa07493f44..b31f8ddb4b84d 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -280,7 +280,13 @@ export default () => {
 	// data-wp-text
 	directive( 'text', ( { directives: { text }, element, evaluate } ) => {
 		const entry = text.find( ( { suffix } ) => suffix === 'default' );
-		element.props.children = evaluate( entry );
+		try {
+			const result = evaluate( entry );
+			element.props.children =
+				typeof result === 'object' ? null : result.toString();
+		} catch ( e ) {
+			element.props.children = null;
+		}
 	} );
 
 	// data-wp-run
diff --git a/test/e2e/specs/interactivity/directives-text.spec.ts b/test/e2e/specs/interactivity/directives-text.spec.ts
index 8e83be26de15c..3670c5931e15d 100644
--- a/test/e2e/specs/interactivity/directives-text.spec.ts
+++ b/test/e2e/specs/interactivity/directives-text.spec.ts
@@ -33,4 +33,13 @@ test.describe( 'data-wp-text', () => {
 		await page.getByTestId( 'toggle context text' ).click();
 		await expect( el ).toHaveText( 'Text 1' );
 	} );
+
+	test( 'Transforms results into strings', async ( { page } ) => {
+		const elObject = page.getByTestId( 'show state component' );
+		await expect( elObject ).toBeHidden();
+		const elNumber = page.getByTestId( 'show state number' );
+		await expect( elNumber ).toHaveText( '1' );
+		const elBool = page.getByTestId( 'show state boolean' );
+		await expect( elBool ).toHaveText( 'true' );
+	} );
 } );

From 2c247e2ae62b5d61dcdf5c634c13c7ccf0731b0d Mon Sep 17 00:00:00 2001
From: Karthik Thayyil <30643833+kt-12@users.noreply.github.com>
Date: Tue, 16 Jan 2024 16:29:55 +0000
Subject: [PATCH 134/296] Call variation through callback so it's only loaded
 when needed - in support of  trac 59969 (#56952)

* call variation through callback so it's only loaded when needed.

* move gutenberg_add_hooked_blocks from 6.4 to 6.5

* cs fixes

* fix version number

* revert some code

* adapting to variation_calback

* B/C for plugin

* cs fixes

* cs fixes

* cs fixes

* shims to support block variation changes for WP < 6.5

* EOL for PHPCS
---
 lib/compat/wordpress-6.5/blocks.php           | 24 +++++++++++++++++++
 lib/load.php                                  |  1 +
 .../src/navigation-link/index.php             | 20 ++++++++++++----
 .../block-library/src/post-terms/index.php    | 17 +++++++++----
 .../block-library/src/template-part/index.php |  4 ++--
 phpcs.xml.dist                                |  2 ++
 6 files changed, 57 insertions(+), 11 deletions(-)
 create mode 100644 lib/compat/wordpress-6.5/blocks.php

diff --git a/lib/compat/wordpress-6.5/blocks.php b/lib/compat/wordpress-6.5/blocks.php
new file mode 100644
index 0000000000000..b6890c14dc1f9
--- /dev/null
+++ b/lib/compat/wordpress-6.5/blocks.php
@@ -0,0 +1,24 @@
+<?php
+/**
+ * Temporary compatibility shims for block APIs present in Gutenberg.
+ *
+ * @package gutenberg
+ */
+
+/**
+ * Shim for the `variation_callback` block type argument.
+ *
+ * @param array $args The block type arguments.
+ * @return array The updated block type arguments.
+ */
+function gutenberg_register_block_type_args_shim( $args ) {
+	if ( isset( $args['variation_callback'] ) && is_callable( $args['variation_callback'] ) ) {
+		$args['variations'] = call_user_func( $args['variation_callback'] );
+		unset( $args['variation_callback'] );
+	}
+	return $args;
+}
+
+if ( ! method_exists( 'WP_Block_Type', 'get_variations' ) ) {
+	add_filter( 'register_block_type_args', 'gutenberg_register_block_type_args_shim' );
+}
diff --git a/lib/load.php b/lib/load.php
index 8988a05820425..f09391b5b5ab7 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -101,6 +101,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.4/kses.php';
 
 // WordPress 6.5 compat.
+require __DIR__ . '/compat/wordpress-6.5/blocks.php';
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index f7c26afd1f88d..1dcb2996a8e15 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -368,11 +368,11 @@ function block_core_navigation_link_unregister_variation( $name ) {
 
 /**
  * Register the navigation link block.
+ * Returns an array of variations for the navigation link block.
  *
- * @uses render_block_core_navigation()
- * @throws WP_Error An WP_Error exception parsing the block definition.
+ * @return array
  */
-function register_block_core_navigation_link() {
+function build_navigation_link_block_variations() {
 	// This will only handle post types and taxonomies registered until this point (init on priority 9).
 	// See action hooks below for other post types and taxonomies.
 	// See https://github.com/WordPress/gutenberg/issues/53826 for details.
@@ -407,11 +407,21 @@ function register_block_core_navigation_link() {
 		}
 	}
 
+	return array_merge( $built_ins, $variations );
+}
+
+/**
+ * Register the navigation link block.
+ *
+ * @uses render_block_core_navigation()
+ * @throws WP_Error An WP_Error exception parsing the block definition.
+ */
+function register_block_core_navigation_link() {
 	register_block_type_from_metadata(
 		__DIR__ . '/navigation-link',
 		array(
-			'render_callback' => 'render_block_core_navigation_link',
-			'variations'      => array_merge( $built_ins, $variations ),
+			'render_callback'    => 'render_block_core_navigation_link',
+			'variation_callback' => 'build_navigation_link_block_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/post-terms/index.php b/packages/block-library/src/post-terms/index.php
index c97155b81e3a9..44291038383d4 100644
--- a/packages/block-library/src/post-terms/index.php
+++ b/packages/block-library/src/post-terms/index.php
@@ -59,9 +59,11 @@ function render_block_core_post_terms( $attributes, $content, $block ) {
 }
 
 /**
- * Registers the `core/post-terms` block on the server.
+ * Returns the available variations for the `core/post-terms` block.
+ *
+ * @return array The available variations for the block.
  */
-function register_block_core_post_terms() {
+function build_post_term_block_variations() {
 	$taxonomies = get_taxonomies(
 		array(
 			'publicly_queryable' => true,
@@ -103,11 +105,18 @@ function register_block_core_post_terms() {
 		}
 	}
 
+	return array_merge( $built_ins, $custom_variations );
+}
+
+/**
+ * Registers the `core/post-terms` block on the server.
+ */
+function register_block_core_post_terms() {
 	register_block_type_from_metadata(
 		__DIR__ . '/post-terms',
 		array(
-			'render_callback' => 'render_block_core_post_terms',
-			'variations'      => array_merge( $built_ins, $custom_variations ),
+			'render_callback'    => 'render_block_core_post_terms',
+			'variation_callback' => 'build_post_term_block_variations',
 		)
 	);
 }
diff --git a/packages/block-library/src/template-part/index.php b/packages/block-library/src/template-part/index.php
index 0c97f88b98e38..86a17f33c92f3 100644
--- a/packages/block-library/src/template-part/index.php
+++ b/packages/block-library/src/template-part/index.php
@@ -281,8 +281,8 @@ function register_block_core_template_part() {
 	register_block_type_from_metadata(
 		__DIR__ . '/template-part',
 		array(
-			'render_callback' => 'render_block_core_template_part',
-			'variations'      => build_template_part_block_variations(),
+			'render_callback'    => 'render_block_core_template_part',
+			'variation_callback' => 'build_template_part_block_variations',
 		)
 	);
 }
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 21f3fcb8baee1..03a590d21644f 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -115,6 +115,8 @@
 				<element value="apply_block_core_search_border_style"/>
 				<element value="apply_block_core_search_border_styles"/>
 				<element value="build_dropdown_script_block_core_categories"/>
+				<element value="build_navigation_link_block_variations"/>
+				<element value="build_post_term_block_variations"/>
 				<element value="build_template_part_block_area_variations"/>
 				<element value="build_template_part_block_instance_variations"/>
 				<element value="build_template_part_block_variations"/>

From 56c02a0f5736ff577e41880942c19333883db028 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 16 Jan 2024 21:35:26 +0100
Subject: [PATCH 135/296] Data: fix memoized createRegistrySelector (#57888)

---
 packages/data/src/factory.js                 |  15 ++-
 packages/data/src/test/registry-selectors.js | 135 +++++++++++++++++++
 2 files changed, 146 insertions(+), 4 deletions(-)
 create mode 100644 packages/data/src/test/registry-selectors.js

diff --git a/packages/data/src/factory.js b/packages/data/src/factory.js
index a4adc4dcf4251..389c4a7e2b33a 100644
--- a/packages/data/src/factory.js
+++ b/packages/data/src/factory.js
@@ -39,11 +39,18 @@
  * @return {Function} Registry selector that can be registered with a store.
  */
 export function createRegistrySelector( registrySelector ) {
+	let selector;
+	let lastRegistry;
 	// Create a selector function that is bound to the registry referenced by `selector.registry`
 	// and that has the same API as a regular selector. Binding it in such a way makes it
 	// possible to call the selector directly from another selector.
-	const selector = ( ...args ) =>
-		registrySelector( selector.registry.select )( ...args );
+	const wrappedSelector = ( ...args ) => {
+		if ( ! selector || lastRegistry !== wrappedSelector.registry ) {
+			selector = registrySelector( wrappedSelector.registry.select );
+			lastRegistry = wrappedSelector.registry;
+		}
+		return selector( ...args );
+	};
 
 	/**
 	 * Flag indicating that the selector is a registry selector that needs the correct registry
@@ -52,9 +59,9 @@ export function createRegistrySelector( registrySelector ) {
 	 *
 	 * @type {boolean}
 	 */
-	selector.isRegistrySelector = true;
+	wrappedSelector.isRegistrySelector = true;
 
-	return selector;
+	return wrappedSelector;
 }
 
 /**
diff --git a/packages/data/src/test/registry-selectors.js b/packages/data/src/test/registry-selectors.js
new file mode 100644
index 0000000000000..bc567474541e2
--- /dev/null
+++ b/packages/data/src/test/registry-selectors.js
@@ -0,0 +1,135 @@
+/**
+ * External dependencies
+ */
+import createSelector from 'rememo';
+
+/**
+ * Internal dependencies
+ */
+import { createRegistry } from '../registry';
+import { createRegistrySelector } from '../factory';
+import createReduxStore from '../redux-store';
+
+const getElementCount = createRegistrySelector( ( select ) => () => {
+	return select( 'elements' ).getElements().length;
+} );
+
+const getFilterValue = ( state ) => state;
+
+const getFilteredElements = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state ) => {
+			const filter = getFilterValue( state );
+			const elements = select( 'elements' ).getElements();
+			if ( ! filter ) {
+				return elements;
+			}
+			return elements.filter( ( el ) => el.startsWith( filter ) );
+		},
+		( state ) => [
+			select( 'elements' ).getElements(),
+			getFilterValue( state ),
+		]
+	)
+);
+
+const elementsStore = createReduxStore( 'elements', {
+	reducer( state = [], action ) {
+		if ( action.type === 'ADD' ) {
+			return [ ...state, ...action.elements ];
+		}
+		return state;
+	},
+	actions: {
+		add: ( ...elements ) => ( { type: 'ADD', elements } ),
+	},
+	selectors: {
+		getElements: ( state ) => state,
+	},
+} );
+
+const uiStore = createReduxStore( 'ui', {
+	reducer( state = '', action ) {
+		if ( action.type === 'FILTER' ) {
+			return action.value;
+		}
+		return state;
+	},
+	actions: {
+		filter: ( value ) => ( { type: 'FILTER', value } ),
+	},
+	selectors: {
+		getFilterValue,
+		getElementCount,
+		getFilteredElements,
+	},
+} );
+
+describe( 'createRegistrySelector', () => {
+	it( 'can bind one selector to a registry', () => {
+		const registry = createRegistry();
+		registry.register( elementsStore );
+		registry.register( uiStore );
+
+		expect( registry.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry.dispatch( elementsStore ).add( 'Carbon' );
+
+		expect( registry.select( uiStore ).getElementCount() ).toBe( 1 );
+	} );
+
+	// Even without createSelector, this fails in trunk.
+	it.skip( 'can bind one selector to multiple registries', () => {
+		const registry1 = createRegistry();
+		const registry2 = createRegistry();
+
+		registry1.register( elementsStore );
+		registry1.register( uiStore );
+		registry2.register( elementsStore );
+		registry2.register( uiStore );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 0 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry1.dispatch( elementsStore ).add( 'Carbon' );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 1 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 0 );
+
+		registry2.dispatch( elementsStore ).add( 'Helium' );
+
+		expect( registry1.select( uiStore ).getElementCount() ).toBe( 1 );
+		expect( registry2.select( uiStore ).getElementCount() ).toBe( 1 );
+	} );
+
+	it( 'can bind a memoized selector to a registry', () => {
+		const registry = createRegistry();
+		registry.register( elementsStore );
+		registry.register( uiStore );
+
+		registry.dispatch( elementsStore ).add( 'Carbon', 'Nitrogen' );
+		registry.dispatch( uiStore ).filter( 'Ca' );
+
+		// check that `getFilteredElements` return value is a memoized array
+		const elements1 = registry.select( uiStore ).getFilteredElements();
+		expect( elements1 ).toEqual( [ 'Carbon' ] );
+		const elements2 = registry.select( uiStore ).getFilteredElements();
+		expect( elements2 ).toBe( elements1 ); // memoized
+
+		// check that adding a new element triggers recalculation
+		registry.dispatch( elementsStore ).add( 'Calcium' );
+
+		const elements3 = registry.select( uiStore ).getFilteredElements();
+		expect( elements3 ).toEqual( [ 'Carbon', 'Calcium' ] );
+		const elements4 = registry.select( uiStore ).getFilteredElements();
+		expect( elements4 ).toBe( elements3 ); // memoized
+
+		// check that changing the filter triggers recalculation
+		registry.dispatch( uiStore ).filter( 'Ni' );
+
+		const elements5 = registry.select( uiStore ).getFilteredElements();
+		expect( elements5 ).toEqual( [ 'Nitrogen' ] );
+		const elements6 = registry.select( uiStore ).getFilteredElements();
+		expect( elements6 ).toBe( elements5 ); // memoized
+	} );
+} );

From f478dfe29742602533d4a26c2f12c4bd68556cf0 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 17 Jan 2024 08:37:35 +0900
Subject: [PATCH 136/296] Button: Improve `disabled`-related prop descriptions
 (#57864)

---
 packages/components/src/button/README.md |  2 +-
 packages/components/src/button/types.ts  | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/components/src/button/README.md b/packages/components/src/button/README.md
index 3f577991dc44b..a8cdcf82c9665 100644
--- a/packages/components/src/button/README.md
+++ b/packages/components/src/button/README.md
@@ -135,7 +135,7 @@ An accessible description for the button.
 
 #### `disabled`: `boolean`
 
-Whether the button is disabled. If `true`, this will force a `button` element to be rendered.
+Whether the button is disabled. If `true`, this will force a `button` element to be rendered, even when an `href` is given.
 
 -   Required: No
 
diff --git a/packages/components/src/button/types.ts b/packages/components/src/button/types.ts
index b781786cc1271..e728739806af7 100644
--- a/packages/components/src/button/types.ts
+++ b/packages/components/src/button/types.ts
@@ -115,7 +115,9 @@ type BaseButtonProps = {
 	 */
 	variant?: 'primary' | 'secondary' | 'tertiary' | 'link';
 	/**
-	 * Whether this is focusable.
+	 * Whether to keep the button focusable when disabled.
+	 *
+	 * @default false
 	 */
 	__experimentalIsFocusable?: boolean;
 };
@@ -123,7 +125,8 @@ type BaseButtonProps = {
 type _ButtonProps = {
 	/**
 	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 *
+	 * If `true`, this will force a `button` element to be rendered, even when an `href` is given.
 	 */
 	disabled?: boolean;
 };
@@ -131,7 +134,8 @@ type _ButtonProps = {
 type AnchorProps = {
 	/**
 	 * Whether the button is disabled.
-	 * If `true`, this will force a `button` element to be rendered.
+	 *
+	 * If `true`, this will force a `button` element to be rendered, even when an `href` is given.
 	 */
 	disabled?: false;
 	/**

From 6c0cd1139548bc236668d535eb63a1a00aeba9c0 Mon Sep 17 00:00:00 2001
From: Ramon <ramonjd@users.noreply.github.com>
Date: Wed, 17 Jan 2024 10:44:13 +1100
Subject: [PATCH 137/296] Fluid typography: do not calculate fluid font size
 when min and max viewport widths are equal (#57866)

* When the same value is provided for min and max viewport widths in the fluid typography config, do not calculate fluid typography values and return null. We could provide a fallback from the default values in gutenberg_get_typography_font_size_value() but I think it might be better to bypass returning clamp values altogether because fundamentally, the input is wrong.

* Comment
---
 lib/block-supports/typography.php                  | 14 +++++++++++---
 .../src/components/font-sizes/fluid-utils.js       | 10 ++++++++--
 .../src/components/font-sizes/test/fluid-utils.js  |  9 +++++++++
 phpunit/block-supports/typography-test.php         | 10 ++++++++++
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/lib/block-supports/typography.php b/lib/block-supports/typography.php
index 3cda86cf0a257..b3fa4b4252eed 100644
--- a/lib/block-supports/typography.php
+++ b/lib/block-supports/typography.php
@@ -401,10 +401,18 @@ function gutenberg_get_computed_fluid_typography_value( $args = array() ) {
 		return null;
 	}
 
-	// Build CSS rule.
-	// Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
+	// Calculates the linear factor denominator. If it's 0, we cannot calculate a fluid value.
+	$linear_factor_denominator = $maximum_viewport_width['value'] - $minimum_viewport_width['value'];
+	if ( empty( $linear_factor_denominator ) ) {
+		return null;
+	}
+
+	/*
+	 * Build CSS rule.
+	 * Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
+	 */
 	$view_port_width_offset = round( $minimum_viewport_width['value'] / 100, 3 ) . $font_size_unit;
-	$linear_factor          = 100 * ( ( $maximum_font_size['value'] - $minimum_font_size['value'] ) / ( $maximum_viewport_width['value'] - $minimum_viewport_width['value'] ) );
+	$linear_factor          = 100 * ( ( $maximum_font_size['value'] - $minimum_font_size['value'] ) / ( $linear_factor_denominator ) );
 	$linear_factor_scaled   = round( $linear_factor * $scale_factor, 3 );
 	$linear_factor_scaled   = empty( $linear_factor_scaled ) ? 1 : $linear_factor_scaled;
 	$fluid_target_font_size = implode( '', $minimum_font_size_rem ) . " + ((1vw - $view_port_width_offset) * $linear_factor_scaled)";
diff --git a/packages/block-editor/src/components/font-sizes/fluid-utils.js b/packages/block-editor/src/components/font-sizes/fluid-utils.js
index b26d542708c37..595011b68bafb 100644
--- a/packages/block-editor/src/components/font-sizes/fluid-utils.js
+++ b/packages/block-editor/src/components/font-sizes/fluid-utils.js
@@ -181,6 +181,13 @@ export function getComputedFluidTypographyValue( {
 		return null;
 	}
 
+	// Calculates the linear factor denominator. If it's 0, we cannot calculate a fluid value.
+	const linearDenominator =
+		maximumViewportWidthParsed.value - minimumViewportWidthParsed.value;
+	if ( ! linearDenominator ) {
+		return null;
+	}
+
 	// Build CSS rule.
 	// Borrowed from https://websemantics.uk/tools/responsive-font-calculator/.
 	const minViewportWidthOffsetValue = roundToPrecision(
@@ -193,8 +200,7 @@ export function getComputedFluidTypographyValue( {
 	const linearFactor =
 		100 *
 		( ( maximumFontSizeParsed.value - minimumFontSizeParsed.value ) /
-			( maximumViewportWidthParsed.value -
-				minimumViewportWidthParsed.value ) );
+			linearDenominator );
 	const linearFactorScaled = roundToPrecision(
 		( linearFactor || 1 ) * scaleFactor,
 		3
diff --git a/packages/block-editor/src/components/font-sizes/test/fluid-utils.js b/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
index 0a1092a1d8128..27b1cfe8c994a 100644
--- a/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
+++ b/packages/block-editor/src/components/font-sizes/test/fluid-utils.js
@@ -64,6 +64,15 @@ describe( 'getComputedFluidTypographyValue()', () => {
 		);
 	} );
 
+	it( 'should return `null` when maximum and minimum viewport width are equal', () => {
+		const fluidTypographyValues = getComputedFluidTypographyValue( {
+			fontSize: '30px',
+			minimumViewportWidth: '500px',
+			maximumViewportWidth: '500px',
+		} );
+		expect( fluidTypographyValues ).toBeNull();
+	} );
+
 	it( 'should return a fluid font size when given a scale factor', () => {
 		const fluidTypographyValues = getComputedFluidTypographyValue( {
 			fontSize: '30px',
diff --git a/phpunit/block-supports/typography-test.php b/phpunit/block-supports/typography-test.php
index f6d5344222678..ec7df51317a3f 100644
--- a/phpunit/block-supports/typography-test.php
+++ b/phpunit/block-supports/typography-test.php
@@ -933,6 +933,16 @@ public function data_get_computed_fluid_typography_value() {
 				),
 				'expected_output' => 'clamp(50px, 3.125rem + ((1vw - 3.2px) * 7.353), 100px)',
 			),
+			'returns `null` when maximum and minimum viewport width are equal' => array(
+				'args'            => array(
+					'minimum_viewport_width' => '800px',
+					'maximum_viewport_width' => '800px',
+					'minimum_font_size'      => '50px',
+					'maximum_font_size'      => '100px',
+					'scale_factor'           => 1,
+				),
+				'expected_output' => null,
+			),
 			'returns `null` when `maximum_viewport_width` is an unsupported unit' => array(
 				'args'            => array(
 					'minimum_viewport_width' => '320px',

From e84b38d63688b2ea9c96a974962d5cee663102ef Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Wed, 17 Jan 2024 10:50:13 +0800
Subject: [PATCH 138/296] Allow heading and button in Pattern Overrides
 (#57789)

* Allow heading and button in Pattern Overrides

* Allow url for button
---
 lib/block-supports/pattern.php           |  3 ++-
 package-lock.json                        |  2 ++
 packages/block-library/package.json      |  1 +
 packages/block-library/src/block/edit.js | 10 ++++++++--
 packages/patterns/src/constants.js       |  5 +++++
 5 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
index 2f7717091ff50..7c344d669e1f9 100644
--- a/lib/block-supports/pattern.php
+++ b/lib/block-supports/pattern.php
@@ -13,7 +13,8 @@
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	function gutenberg_register_pattern_support( $block_type ) {
-		$pattern_support = 'core/paragraph' === $block_type->name ? true : false;
+		global $block_bindings_allowed_blocks;
+		$pattern_support = array_key_exists( $block_type->name, $block_bindings_allowed_blocks );
 
 		if ( $pattern_support ) {
 			if ( ! $block_type->uses_context ) {
diff --git a/package-lock.json b/package-lock.json
index b74f66298d787..85e61fb71c594 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -54123,6 +54123,7 @@
 				"@wordpress/interactivity": "file:../interactivity",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
 				"@wordpress/primitives": "file:../primitives",
 				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/reusable-blocks": "file:../reusable-blocks",
@@ -69271,6 +69272,7 @@
 				"@wordpress/interactivity": "file:../interactivity",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
+				"@wordpress/patterns": "file:../patterns",
 				"@wordpress/primitives": "file:../primitives",
 				"@wordpress/private-apis": "file:../private-apis",
 				"@wordpress/reusable-blocks": "file:../reusable-blocks",
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 49cbc29415718..12f4e23d9da4d 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -53,6 +53,7 @@
 		"@wordpress/interactivity": "file:../interactivity",
 		"@wordpress/keycodes": "file:../keycodes",
 		"@wordpress/notices": "file:../notices",
+		"@wordpress/patterns": "file:../patterns",
 		"@wordpress/primitives": "file:../primitives",
 		"@wordpress/private-apis": "file:../private-apis",
 		"@wordpress/reusable-blocks": "file:../reusable-blocks",
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 6331d33c27a7b..9d03accb1204c 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -27,6 +27,7 @@ import {
 	store as blockEditorStore,
 	BlockControls,
 } from '@wordpress/block-editor';
+import { privateApis as patternsPrivateApis } from '@wordpress/patterns';
 import { parse, cloneBlock } from '@wordpress/blocks';
 
 /**
@@ -35,10 +36,13 @@ import { parse, cloneBlock } from '@wordpress/blocks';
 import { unlock } from '../lock-unlock';
 
 const { useLayoutClasses } = unlock( blockEditorPrivateApis );
+const { PARTIAL_SYNCING_SUPPORTED_BLOCKS } = unlock( patternsPrivateApis );
 
 function isPartiallySynced( block ) {
 	return (
-		'core/paragraph' === block.name &&
+		Object.keys( PARTIAL_SYNCING_SUPPORTED_BLOCKS ).includes(
+			block.name
+		) &&
 		!! block.attributes.metadata?.bindings &&
 		Object.values( block.attributes.metadata.bindings ).some(
 			( binding ) => binding.source.name === 'pattern_attributes'
@@ -100,7 +104,7 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 			defaultValues[ blockId ] ??= {};
 			defaultValues[ blockId ][ attributeKey ] =
 				block.attributes[ attributeKey ];
-			if ( overrides[ blockId ] ) {
+			if ( overrides[ blockId ]?.[ attributeKey ] !== undefined ) {
 				newAttributes[ attributeKey ] =
 					overrides[ blockId ][ attributeKey ];
 			}
@@ -130,6 +134,8 @@ function getOverridesFromBlocks( blocks, defaultValues ) {
 				defaultValues[ blockId ][ attributeKey ]
 			) {
 				overrides[ blockId ] ??= {};
+				// TODO: We need a way to represent `undefined` in the serialized overrides.
+				// Also see: https://github.com/WordPress/gutenberg/pull/57249#discussion_r1452987871
 				overrides[ blockId ][ attributeKey ] =
 					block.attributes[ attributeKey ];
 			}
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 3e533d834fd75..4a9f769658b2e 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -23,4 +23,9 @@ export const PATTERN_SYNC_TYPES = {
 // TODO: This should not be hardcoded. Maybe there should be a config and/or an UI.
 export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
 	'core/paragraph': { content: __( 'Content' ) },
+	'core/heading': { content: __( 'Content' ) },
+	'core/button': {
+		text: __( 'Text' ),
+		url: __( 'URL' ),
+	},
 };

From 2881d64848d24dc9975566cb1f89f79a56658873 Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Wed, 17 Jan 2024 14:05:43 +0800
Subject: [PATCH 139/296] Add a control to reset pattern overrides (#57845)

* Add a control to reset pattern overrides

* Address code reviews

* Don't render reset button when there is no binding blocks

* Set the `__experimentalIsFocusable` prop on the Reset to original toolbar button so that it maintains focus

---------

Co-authored-by: Daniel Richards <daniel.richards@automattic.com>
---
 packages/block-library/src/block/edit.js | 46 +++++++++++++++++++++---
 1 file changed, 41 insertions(+), 5 deletions(-)

diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index 9d03accb1204c..c53f52bfb703e 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -153,6 +153,13 @@ function setBlockEditMode( setEditMode, blocks, mode ) {
 	} );
 }
 
+function getHasOverridableBlocks( blocks ) {
+	return blocks.some( ( block ) => {
+		if ( isPartiallySynced( block ) ) return true;
+		return getHasOverridableBlocks( block.innerBlocks );
+	} );
+}
+
 export default function ReusableBlockEdit( {
 	name,
 	attributes: { ref, overrides },
@@ -214,15 +221,23 @@ export default function ReusableBlockEdit( {
 		[ innerBlocks, setBlockEditingMode ]
 	);
 
-	// Apply the initial overrides from the pattern block to the inner blocks.
-	useEffect( () => {
-		const initialBlocks =
+	const hasOverridableBlocks = useMemo(
+		() => getHasOverridableBlocks( innerBlocks ),
+		[ innerBlocks ]
+	);
+
+	const initialBlocks = useMemo(
+		() =>
 			// Clone the blocks to generate new client IDs.
 			editedRecord.blocks?.map( ( block ) => cloneBlock( block ) ) ??
 			( editedRecord.content && typeof editedRecord.content !== 'function'
 				? parse( editedRecord.content )
-				: [] );
+				: [] ),
+		[ editedRecord.blocks, editedRecord.content ]
+	);
 
+	// Apply the initial overrides from the pattern block to the inner blocks.
+	useEffect( () => {
 		defaultValuesRef.current = {};
 		const editingMode = getBlockEditingMode( patternClientId );
 		// Replace the contents of the blocks with the overrides.
@@ -243,7 +258,7 @@ export default function ReusableBlockEdit( {
 	}, [
 		__unstableMarkNextChangeAsNotPersistent,
 		patternClientId,
-		editedRecord,
+		initialBlocks,
 		replaceInnerBlocks,
 		registry,
 		getBlockEditingMode,
@@ -299,6 +314,12 @@ export default function ReusableBlockEdit( {
 		editOriginalProps.onClick( event );
 	};
 
+	const resetOverrides = () => {
+		if ( overrides ) {
+			replaceInnerBlocks( patternClientId, initialBlocks );
+		}
+	};
+
 	let children = null;
 
 	if ( hasAlreadyRendered ) {
@@ -339,6 +360,21 @@ export default function ReusableBlockEdit( {
 					</ToolbarGroup>
 				</BlockControls>
 			) }
+
+			{ hasOverridableBlocks && (
+				<BlockControls>
+					<ToolbarGroup>
+						<ToolbarButton
+							onClick={ resetOverrides }
+							disabled={ ! overrides }
+							__experimentalIsFocusable
+						>
+							{ __( 'Reset to original' ) }
+						</ToolbarButton>
+					</ToolbarGroup>
+				</BlockControls>
+			) }
+
 			{ children === null ? (
 				<div { ...innerBlocksProps } />
 			) : (

From aec6947ee08c32e7c16ef0cdd65e63ba0c14ede1 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 17 Jan 2024 16:33:52 +0800
Subject: [PATCH 140/296] Remove text align control for paragraph, heading, and
 button in contentOnly editing mode (#57906)

* Remove text align control for paragraphs and buttons in contentOnly editing mode

* Remove heading level and text align on content only mode heading blocks

* Add a react native edit file for the heading block that does not use useBlockEditingMode
---
 packages/block-library/src/button/edit.js     |  16 +-
 packages/block-library/src/heading/edit.js    |  32 ++--
 .../block-library/src/heading/edit.native.js  | 144 ++++++++++++++++++
 packages/block-library/src/paragraph/edit.js  |  42 ++---
 4 files changed, 195 insertions(+), 39 deletions(-)
 create mode 100644 packages/block-library/src/heading/edit.native.js

diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index d41d917d5b8fe..b46e145d760ad 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -35,6 +35,7 @@ import {
 	__experimentalLinkControl as LinkControl,
 	__experimentalGetElementClassName,
 	store as blockEditorStore,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { displayShortcut, isKeyboardEvent, ENTER } from '@wordpress/keycodes';
 import { link, linkOff } from '@wordpress/icons';
@@ -189,6 +190,7 @@ function ButtonEdit( props ) {
 		ref: useMergeRefs( [ setPopoverAnchor, ref ] ),
 		onKeyDown,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const [ isEditingURL, setIsEditingURL ] = useState( false );
 	const isURLSet = !! url;
@@ -277,12 +279,14 @@ function ButtonEdit( props ) {
 				/>
 			</div>
 			<BlockControls group="block">
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
+				{ blockEditingMode === 'default' && (
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				) }
 				{ ! isURLSet && isLinkTag && (
 					<ToolbarButton
 						name="link"
diff --git a/packages/block-library/src/heading/edit.js b/packages/block-library/src/heading/edit.js
index b7d1d17426443..e0e36a831429b 100644
--- a/packages/block-library/src/heading/edit.js
+++ b/packages/block-library/src/heading/edit.js
@@ -17,6 +17,7 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 	HeadingLevelDropdown,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 
 /**
@@ -40,6 +41,7 @@ function HeadingEdit( {
 		} ),
 		style,
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	const { canGenerateAnchors } = useSelect( ( select ) => {
 		const { getGlobalBlockCount, getSettings } = select( blockEditorStore );
@@ -90,20 +92,22 @@ function HeadingEdit( {
 
 	return (
 		<>
-			<BlockControls group="block">
-				<HeadingLevelDropdown
-					value={ level }
-					onChange={ ( newLevel ) =>
-						setAttributes( { level: newLevel } )
-					}
-				/>
-				<AlignmentControl
-					value={ textAlign }
-					onChange={ ( nextAlign ) => {
-						setAttributes( { textAlign: nextAlign } );
-					} }
-				/>
-			</BlockControls>
+			{ blockEditingMode === 'default' && (
+				<BlockControls group="block">
+					<HeadingLevelDropdown
+						value={ level }
+						onChange={ ( newLevel ) =>
+							setAttributes( { level: newLevel } )
+						}
+					/>
+					<AlignmentControl
+						value={ textAlign }
+						onChange={ ( nextAlign ) => {
+							setAttributes( { textAlign: nextAlign } );
+						} }
+					/>
+				</BlockControls>
+			) }
 			<RichText
 				identifier="content"
 				tagName={ tagName }
diff --git a/packages/block-library/src/heading/edit.native.js b/packages/block-library/src/heading/edit.native.js
new file mode 100644
index 0000000000000..b7d1d17426443
--- /dev/null
+++ b/packages/block-library/src/heading/edit.native.js
@@ -0,0 +1,144 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
+/**
+ * WordPress dependencies
+ */
+import { __ } from '@wordpress/i18n';
+import { useEffect, Platform } from '@wordpress/element';
+import { useDispatch, useSelect } from '@wordpress/data';
+import { createBlock, getDefaultBlockName } from '@wordpress/blocks';
+import {
+	AlignmentControl,
+	BlockControls,
+	RichText,
+	useBlockProps,
+	store as blockEditorStore,
+	HeadingLevelDropdown,
+} from '@wordpress/block-editor';
+
+/**
+ * Internal dependencies
+ */
+import { generateAnchor, setAnchor } from './autogenerate-anchors';
+
+function HeadingEdit( {
+	attributes,
+	setAttributes,
+	mergeBlocks,
+	onReplace,
+	style,
+	clientId,
+} ) {
+	const { textAlign, content, level, placeholder, anchor } = attributes;
+	const tagName = 'h' + level;
+	const blockProps = useBlockProps( {
+		className: classnames( {
+			[ `has-text-align-${ textAlign }` ]: textAlign,
+		} ),
+		style,
+	} );
+
+	const { canGenerateAnchors } = useSelect( ( select ) => {
+		const { getGlobalBlockCount, getSettings } = select( blockEditorStore );
+		const settings = getSettings();
+
+		return {
+			canGenerateAnchors:
+				!! settings.generateAnchors ||
+				getGlobalBlockCount( 'core/table-of-contents' ) > 0,
+		};
+	}, [] );
+
+	const { __unstableMarkNextChangeAsNotPersistent } =
+		useDispatch( blockEditorStore );
+
+	// Initially set anchor for headings that have content but no anchor set.
+	// This is used when transforming a block to heading, or for legacy anchors.
+	useEffect( () => {
+		if ( ! canGenerateAnchors ) {
+			return;
+		}
+
+		if ( ! anchor && content ) {
+			// This side-effect should not create an undo level.
+			__unstableMarkNextChangeAsNotPersistent();
+			setAttributes( {
+				anchor: generateAnchor( clientId, content ),
+			} );
+		}
+		setAnchor( clientId, anchor );
+
+		// Remove anchor map when block unmounts.
+		return () => setAnchor( clientId, null );
+	}, [ anchor, content, clientId, canGenerateAnchors ] );
+
+	const onContentChange = ( value ) => {
+		const newAttrs = { content: value };
+		if (
+			canGenerateAnchors &&
+			( ! anchor ||
+				! value ||
+				generateAnchor( clientId, content ) === anchor )
+		) {
+			newAttrs.anchor = generateAnchor( clientId, value );
+		}
+		setAttributes( newAttrs );
+	};
+
+	return (
+		<>
+			<BlockControls group="block">
+				<HeadingLevelDropdown
+					value={ level }
+					onChange={ ( newLevel ) =>
+						setAttributes( { level: newLevel } )
+					}
+				/>
+				<AlignmentControl
+					value={ textAlign }
+					onChange={ ( nextAlign ) => {
+						setAttributes( { textAlign: nextAlign } );
+					} }
+				/>
+			</BlockControls>
+			<RichText
+				identifier="content"
+				tagName={ tagName }
+				value={ content }
+				onChange={ onContentChange }
+				onMerge={ mergeBlocks }
+				onSplit={ ( value, isOriginal ) => {
+					let block;
+
+					if ( isOriginal || value ) {
+						block = createBlock( 'core/heading', {
+							...attributes,
+							content: value,
+						} );
+					} else {
+						block = createBlock(
+							getDefaultBlockName() ?? 'core/heading'
+						);
+					}
+
+					if ( isOriginal ) {
+						block.clientId = clientId;
+					}
+
+					return block;
+				} }
+				onReplace={ onReplace }
+				onRemove={ () => onReplace( [] ) }
+				placeholder={ placeholder || __( 'Heading' ) }
+				textAlign={ textAlign }
+				{ ...( Platform.isNative && { deleteEnter: true } ) } // setup RichText on native mobile to delete the "Enter" key as it's handled by the JS/RN side
+				{ ...blockProps }
+			/>
+		</>
+	);
+}
+
+export default HeadingEdit;
diff --git a/packages/block-library/src/paragraph/edit.js b/packages/block-library/src/paragraph/edit.js
index ac766f69dd846..cecfdce474c51 100644
--- a/packages/block-library/src/paragraph/edit.js
+++ b/packages/block-library/src/paragraph/edit.js
@@ -19,6 +19,7 @@ import {
 	RichText,
 	useBlockProps,
 	useSettings,
+	useBlockEditingMode,
 } from '@wordpress/block-editor';
 import { createBlock } from '@wordpress/blocks';
 import { formatLtr } from '@wordpress/icons';
@@ -108,28 +109,31 @@ function ParagraphBlock( {
 		} ),
 		style: { direction },
 	} );
+	const blockEditingMode = useBlockEditingMode();
 
 	return (
 		<>
-			<BlockControls group="block">
-				<AlignmentControl
-					value={ align }
-					onChange={ ( newAlign ) =>
-						setAttributes( {
-							align: newAlign,
-							dropCap: hasDropCapDisabled( newAlign )
-								? false
-								: dropCap,
-						} )
-					}
-				/>
-				<ParagraphRTLControl
-					direction={ direction }
-					setDirection={ ( newDirection ) =>
-						setAttributes( { direction: newDirection } )
-					}
-				/>
-			</BlockControls>
+			{ blockEditingMode === 'default' && (
+				<BlockControls group="block">
+					<AlignmentControl
+						value={ align }
+						onChange={ ( newAlign ) =>
+							setAttributes( {
+								align: newAlign,
+								dropCap: hasDropCapDisabled( newAlign )
+									? false
+									: dropCap,
+							} )
+						}
+					/>
+					<ParagraphRTLControl
+						direction={ direction }
+						setDirection={ ( newDirection ) =>
+							setAttributes( { direction: newDirection } )
+						}
+					/>
+				</BlockControls>
+			) }
 			<InspectorControls group="typography">
 				<DropCapControl
 					clientId={ clientId }

From 05b6bd76b6d8ca2a742601ebbd2f79bf582dd016 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 17 Jan 2024 17:30:46 +0800
Subject: [PATCH 141/296] Add image block support for pattern overrides
 (#57909)

* Add image block support for pattern overrides

* Hide the crop controls in content only mode

* Revert "Hide the crop controls in content only mode"

This reverts commit 2cf4c3cc71831139dec2fea4ad72c1a8995eed1f.
---
 packages/patterns/src/constants.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 4a9f769658b2e..5fa9ec44f4e3a 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -28,4 +28,9 @@ export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
 		text: __( 'Text' ),
 		url: __( 'URL' ),
 	},
+	'core/image': {
+		url: __( 'URL' ),
+		title: __( 'Title' ),
+		alt: __( 'Alt Text' ),
+	},
 };

From b77d9f480068e794ef73b7a76c00a5ef3d84c719 Mon Sep 17 00:00:00 2001
From: Birgit Pauli-Haack <birgit.pauli@gmail.com>
Date: Wed, 17 Jan 2024 11:32:47 +0100
Subject: [PATCH 142/296] Update versions-in-wordpress.md (#57916)

---
 docs/contributors/versions-in-wordpress.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/contributors/versions-in-wordpress.md b/docs/contributors/versions-in-wordpress.md
index 4449f13996c62..ce9eb458e7372 100644
--- a/docs/contributors/versions-in-wordpress.md
+++ b/docs/contributors/versions-in-wordpress.md
@@ -6,6 +6,7 @@ If anything looks incorrect here, please bring it up in #core-editor in [WordPre
 
 | Gutenberg Versions | WordPress Version |
 | ------------------ | ----------------- |
+| 16.2-16.7          | 6.4.2             |
 | 16.2-16.7          | 6.4.1             |
 | 16.2-16.7          | 6.4               |
 | 15.2-16.1          | 6.3.1             |

From e1598cf6b3333661e804de21e3eba86a74278738 Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 17 Jan 2024 11:48:38 +0100
Subject: [PATCH 143/296] Use ClipboardJS latest version and clean up focus
 loss workaround. (#57156)

Co-authored-by: Carolina Nymark <hi@themesbycarolina.com>
---
 package-lock.json                             | 46 ++++++++++---------
 packages/compose/package.json                 |  2 +-
 .../src/hooks/use-copy-to-clipboard/index.js  |  3 --
 3 files changed, 25 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 85e61fb71c594..af61124db82df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -21922,16 +21922,6 @@
 			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
 			"dev": true
 		},
-		"node_modules/clipboard": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
-			"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
-			"dependencies": {
-				"good-listener": "^1.2.2",
-				"select": "^1.1.2",
-				"tiny-emitter": "^2.0.0"
-			}
-		},
 		"node_modules/cliui": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
@@ -54389,7 +54379,7 @@
 				"@wordpress/priority-queue": "file:../priority-queue",
 				"@wordpress/undo-manager": "file:../undo-manager",
 				"change-case": "^4.1.2",
-				"clipboard": "^2.0.8",
+				"clipboard": "^2.0.11",
 				"mousetrap": "^1.6.5",
 				"use-memo-one": "^1.1.1"
 			},
@@ -54400,6 +54390,16 @@
 				"react": "^18.0.0"
 			}
 		},
+		"packages/compose/node_modules/clipboard": {
+			"version": "2.0.11",
+			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+			"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+			"dependencies": {
+				"good-listener": "^1.2.2",
+				"select": "^1.1.2",
+				"tiny-emitter": "^2.0.0"
+			}
+		},
 		"packages/core-commands": {
 			"name": "@wordpress/core-commands",
 			"version": "0.18.0",
@@ -69475,9 +69475,21 @@
 				"@wordpress/priority-queue": "file:../priority-queue",
 				"@wordpress/undo-manager": "file:../undo-manager",
 				"change-case": "^4.1.2",
-				"clipboard": "^2.0.8",
+				"clipboard": "^2.0.11",
 				"mousetrap": "^1.6.5",
 				"use-memo-one": "^1.1.1"
+			},
+			"dependencies": {
+				"clipboard": {
+					"version": "2.0.11",
+					"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.11.tgz",
+					"integrity": "sha512-C+0bbOqkezLIsmWSvlsXS0Q0bmkugu7jcfMIACB+RDEntIzQIkdr148we28AfSloQLRdZlYL/QYyrq05j/3Faw==",
+					"requires": {
+						"good-listener": "^1.2.2",
+						"select": "^1.1.2",
+						"tiny-emitter": "^2.0.0"
+					}
+				}
 			}
 		},
 		"@wordpress/core-commands": {
@@ -73684,16 +73696,6 @@
 			"integrity": "sha512-GRMWDxpOB6Dgk2E5Uo+3eEBvtOOlimMmpbFiKuLFnQzYDavtLFY3K5ona41jgN/WdRZtG7utuVSVTL4HbZHGkw==",
 			"dev": true
 		},
-		"clipboard": {
-			"version": "2.0.8",
-			"resolved": "https://registry.npmjs.org/clipboard/-/clipboard-2.0.8.tgz",
-			"integrity": "sha512-Y6WO0unAIQp5bLmk1zdThRhgJt/x3ks6f30s3oE3H1mgIEU33XyQjEf8gsf6DxC7NPX8Y1SsNWjUjL/ywLnnbQ==",
-			"requires": {
-				"good-listener": "^1.2.2",
-				"select": "^1.1.2",
-				"tiny-emitter": "^2.0.0"
-			}
-		},
 		"cliui": {
 			"version": "6.0.0",
 			"resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 851d3025b50a1..63ebb740de6fa 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -39,7 +39,7 @@
 		"@wordpress/priority-queue": "file:../priority-queue",
 		"@wordpress/undo-manager": "file:../undo-manager",
 		"change-case": "^4.1.2",
-		"clipboard": "^2.0.8",
+		"clipboard": "^2.0.11",
 		"mousetrap": "^1.6.5",
 		"use-memo-one": "^1.1.1"
 	},
diff --git a/packages/compose/src/hooks/use-copy-to-clipboard/index.js b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
index 1d838a1158ecf..94ab6048a4b46 100644
--- a/packages/compose/src/hooks/use-copy-to-clipboard/index.js
+++ b/packages/compose/src/hooks/use-copy-to-clipboard/index.js
@@ -54,9 +54,6 @@ export default function useCopyToClipboard( text, onSuccess ) {
 			// button, ensuring that it is not reset to the body, and
 			// further that it is kept within the rendered node.
 			clearSelection();
-			// Handle ClipboardJS focus bug, see
-			// https://github.com/zenorocha/clipboard.js/issues/680
-			node.focus();
 
 			if ( onSuccessRef.current ) {
 				onSuccessRef.current();

From 176617b7d98ba1c643cd92c19f2dc23bfebfe84d Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Wed, 17 Jan 2024 13:00:21 +0200
Subject: [PATCH 144/296] Fix visual indication of switch to default template
 in the post editor (#57718)

* Fix visual indication of switch to default template in the post editor

* fix logic for request template resolution

* fix template resolution in site editor

* add e2e test
---
 packages/edit-post/src/store/selectors.js     | 27 ++++++++++----
 .../use-init-edited-entity-from-url.js        | 19 ++++++++--
 .../various/post-editor-template-mode.spec.js | 36 +++++++++++++++++++
 3 files changed, 74 insertions(+), 8 deletions(-)

diff --git a/packages/edit-post/src/store/selectors.js b/packages/edit-post/src/store/selectors.js
index b6a54dfd0de2c..1a39a516da8f5 100644
--- a/packages/edit-post/src/store/selectors.js
+++ b/packages/edit-post/src/store/selectors.js
@@ -594,12 +594,27 @@ export const getEditedPostTemplate = createRegistrySelector(
 		}
 
 		const post = select( editorStore ).getCurrentPost();
-		if ( post.link ) {
-			return select( coreStore ).__experimentalGetTemplateForLink(
-				post.link
-			);
+		let slugToCheck;
+		// In `draft` status we might not have a slug available, so we use the `single`
+		// post type templates slug(ex page, single-post, single-product etc..).
+		// Pages do not need the `single` prefix in the slug to be prioritized
+		// through template hierarchy.
+		if ( post.slug ) {
+			slugToCheck =
+				post.type === 'page'
+					? `${ post.type }-${ post.slug }`
+					: `single-${ post.type }-${ post.slug }`;
+		} else {
+			slugToCheck =
+				post.type === 'page' ? 'page' : `single-${ post.type }`;
 		}
-
-		return null;
+		const defaultTemplateId = select( coreStore ).getDefaultTemplateId( {
+			slug: slugToCheck,
+		} );
+		return select( coreStore ).getEditedEntityRecord(
+			'postType',
+			'wp_template',
+			defaultTemplateId
+		);
 	}
 );
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 7b1321fdf4b8a..36056cf4b43bd 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -128,10 +128,25 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 						return currentTemplate.id;
 					}
 				}
-
 				// If no template is assigned, use the default template.
+				let slugToCheck;
+				// In `draft` status we might not have a slug available, so we use the `single`
+				// post type templates slug(ex page, single-post, single-product etc..).
+				// Pages do not need the `single` prefix in the slug to be prioritized
+				// through template hierarchy.
+				if ( editedEntity.slug ) {
+					slugToCheck =
+						postTypeToResolve === 'page'
+							? `${ postTypeToResolve }-${ editedEntity.slug }`
+							: `single-${ postTypeToResolve }-${ editedEntity.slug }`;
+				} else {
+					slugToCheck =
+						postTypeToResolve === 'page'
+							? 'page'
+							: `single-${ postTypeToResolve }`;
+				}
 				return getDefaultTemplateId( {
-					slug: `${ postTypeToResolve }-${ editedEntity?.slug }`,
+					slug: slugToCheck,
 				} );
 			}
 
diff --git a/test/e2e/specs/editor/various/post-editor-template-mode.spec.js b/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
index 021199cc09495..6d6a36eab9b1d 100644
--- a/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
+++ b/test/e2e/specs/editor/various/post-editor-template-mode.spec.js
@@ -70,6 +70,42 @@ test.describe( 'Post Editor Template mode', () => {
 		).toBeVisible();
 	} );
 
+	test( 'Swap templates and proper template resolution when switching to default template', async ( {
+		editor,
+		page,
+		requestUtils,
+		postEditorTemplateMode,
+	} ) => {
+		await requestUtils.activateTheme( 'emptytheme' );
+		await postEditorTemplateMode.createPostAndSaveDraft();
+		await page.reload();
+		await postEditorTemplateMode.disableTemplateWelcomeGuide();
+		await postEditorTemplateMode.openTemplatePopover();
+		// Swap to a custom template, save and reload.
+		await page
+			.getByRole( 'menuitem', {
+				name: 'Swap template',
+			} )
+			.click();
+		await page
+			.getByRole( 'option', {
+				name: 'Custom',
+			} )
+			.click();
+		await editor.saveDraft();
+		await page.reload();
+		// Swap to the default template.
+		await postEditorTemplateMode.openTemplatePopover();
+		await page
+			.getByRole( 'menuitem', {
+				name: 'Use default template',
+			} )
+			.click();
+		await expect(
+			page.getByRole( 'button', { name: 'Template options' } )
+		).toHaveText( 'Single Entries' );
+	} );
+
 	test( 'Allow creating custom block templates in classic themes', async ( {
 		editor,
 		page,

From 7ae7564d2a5d82bce28bfe66c1f3f9c529c6f5e2 Mon Sep 17 00:00:00 2001
From: Jarda Snajdr <jsnajdr@gmail.com>
Date: Wed, 17 Jan 2024 12:22:43 +0100
Subject: [PATCH 145/296] Tidy up patterns selectors (#57913)

---
 .../src/store/private-selectors.js            | 32 ++++-----
 packages/block-editor/src/store/selectors.js  | 60 +++++-----------
 packages/block-editor/src/store/utils.js      | 69 ++++++++++++-------
 3 files changed, 75 insertions(+), 86 deletions(-)

diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index d31a710fd94fe..e8230eea89daa 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -15,7 +15,7 @@ import {
 	canInsertBlockType,
 	__experimentalGetAllowedPatterns,
 } from './selectors';
-import { getUserPatterns, checkAllowListRecursive } from './utils';
+import { getAllPatterns, checkAllowListRecursive } from './utils';
 
 /**
  * Returns true if the block interface is hidden, or false otherwise.
@@ -253,26 +253,20 @@ export const getInserterMediaCategories = createSelector(
  */
 export const hasAllowedPatterns = createSelector(
 	( state, rootClientId = null ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
+		const patterns = getAllPatterns( state );
 		const { allowedBlockTypes } = getSettings( state );
-		return [ ...userPatterns, ...patterns ].some(
-			( { name, inserter = true } ) => {
-				if ( ! inserter ) {
-					return false;
-				}
-				const { blocks } = __experimentalGetParsedPattern(
-					state,
-					name
-				);
-				return (
-					checkAllowListRecursive( blocks, allowedBlockTypes ) &&
-					blocks.every( ( { name: blockName } ) =>
-						canInsertBlockType( state, blockName, rootClientId )
-					)
-				);
+		return patterns.some( ( { name, inserter = true } ) => {
+			if ( ! inserter ) {
+				return false;
 			}
-		);
+			const { blocks } = __experimentalGetParsedPattern( state, name );
+			return (
+				checkAllowListRecursive( blocks, allowedBlockTypes ) &&
+				blocks.every( ( { name: blockName } ) =>
+					canInsertBlockType( state, blockName, rootClientId )
+				)
+			);
+		} );
 	},
 	( state, rootClientId ) => [
 		...__experimentalGetAllowedPatterns.getDependants(
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 1cf3705454f9b..5e47e966ef334 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -27,7 +27,7 @@ import { createRegistrySelector } from '@wordpress/data';
  * Internal dependencies
  */
 import {
-	getUserPatterns,
+	getAllPatterns,
 	checkAllowListRecursive,
 	checkAllowList,
 } from './utils';
@@ -2015,7 +2015,7 @@ export const getInserterItems = createSelector(
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.blocks.order,
 		state.preferences.insertUsage,
 		state.settings.allowedBlockTypes,
@@ -2086,7 +2086,7 @@ export const getBlockTransformItems = createSelector(
 	},
 	( state, blocks, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.preferences.insertUsage,
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
@@ -2118,7 +2118,7 @@ export const hasInserterItems = createSelector(
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
 		getReusableBlocks( state ),
@@ -2143,18 +2143,20 @@ export const getAllowedBlocks = createSelector(
 		const blockTypes = getBlockTypes().filter( ( blockType ) =>
 			canIncludeBlockTypeInInserter( state, blockType, rootClientId )
 		);
+
 		const hasReusableBlock =
 			canInsertBlockTypeUnmemoized( state, 'core/block', rootClientId ) &&
 			getReusableBlocks( state ).length > 0;
 
-		return [
-			...blockTypes,
-			...( hasReusableBlock ? [ 'core/block' ] : [] ),
-		];
+		if ( hasReusableBlock ) {
+			blockTypes.push( 'core/block' );
+		}
+
+		return blockTypes;
 	},
 	( state, rootClientId ) => [
 		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId,
+		state.blocks.byClientId.get( rootClientId ),
 		state.settings.allowedBlockTypes,
 		state.settings.templateLock,
 		getReusableBlocks( state ),
@@ -2237,21 +2239,10 @@ export const __experimentalGetDirectInsertBlock = createSelector(
 	]
 );
 
-export const __experimentalUserPatternCategories = createSelector(
-	( state ) => {
-		return state?.settings?.__experimentalUserPatternCategories;
-	},
-	( state ) => [ state.settings.__experimentalUserPatternCategories ]
-);
-
 export const __experimentalGetParsedPattern = createSelector(
 	( state, patternName ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-
-		const pattern = [ ...patterns, ...userPatterns ].find(
-			( { name } ) => name === patternName
-		);
+		const patterns = getAllPatterns( state );
+		const pattern = patterns.find( ( { name } ) => name === patternName );
 		if ( ! pattern ) {
 			return null;
 		}
@@ -2262,21 +2253,15 @@ export const __experimentalGetParsedPattern = createSelector(
 			} ),
 		};
 	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
+	( state ) => [ getAllPatterns( state ) ]
 );
 
 const getAllAllowedPatterns = createSelector(
 	( state ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-
+		const patterns = getAllPatterns( state );
 		const { allowedBlockTypes } = getSettings( state );
 
-		const parsedPatterns = [ ...userPatterns, ...patterns ]
+		const parsedPatterns = patterns
 			.filter( ( { inserter = true } ) => !! inserter )
 			.map( ( { name } ) =>
 				__experimentalGetParsedPattern( state, name )
@@ -2286,12 +2271,7 @@ const getAllAllowedPatterns = createSelector(
 		);
 		return allowedPatterns;
 	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
-		state?.settings?.__experimentalUserPatternCategories,
-	]
+	( state ) => [ getAllPatterns( state ), state.settings.allowedBlockTypes ]
 );
 
 /**
@@ -2315,9 +2295,7 @@ export const __experimentalGetAllowedPatterns = createSelector(
 		return patternsAllowed;
 	},
 	( state, rootClientId ) => [
-		state.settings.__experimentalBlockPatterns,
-		state.settings.__experimentalReusableBlocks,
-		state.settings.allowedBlockTypes,
+		getAllAllowedPatterns( state ),
 		state.settings.templateLock,
 		state.blockListSettings[ rootClientId ],
 		state.blocks.byClientId.get( rootClientId ),
@@ -2566,7 +2544,7 @@ export function __experimentalGetLastBlockAttributeChanges( state ) {
  * @return {Array} Reusable blocks
  */
 function getReusableBlocks( state ) {
-	return state?.settings?.__experimentalReusableBlocks ?? EMPTY_ARRAY;
+	return state.settings.__experimentalReusableBlocks ?? EMPTY_ARRAY;
 }
 
 /**
diff --git a/packages/block-editor/src/store/utils.js b/packages/block-editor/src/store/utils.js
index 99281f55fcd09..7587dcdf56fd7 100644
--- a/packages/block-editor/src/store/utils.js
+++ b/packages/block-editor/src/store/utils.js
@@ -1,35 +1,52 @@
+/**
+ * External dependencies
+ */
+import createSelector from 'rememo';
+
 /**
  * Internal dependencies
  */
 import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
 
-const EMPTY_ARRAY = [];
+export const getUserPatterns = createSelector(
+	( state ) => {
+		const userPatterns = state.settings.__experimentalReusableBlocks ?? [];
+		const userPatternCategories =
+			state.settings.__experimentalUserPatternCategories ?? [];
+		return userPatterns.map( ( userPattern ) => {
+			return {
+				name: `core/block/${ userPattern.id }`,
+				id: userPattern.id,
+				type: INSERTER_PATTERN_TYPES.user,
+				title: userPattern.title.raw,
+				categories: userPattern.wp_pattern_category.map( ( catId ) => {
+					const category = userPatternCategories.find(
+						( { id } ) => id === catId
+					);
+					return category ? category.slug : catId;
+				} ),
+				content: userPattern.content.raw,
+				syncStatus: userPattern.wp_pattern_sync_status,
+			};
+		} );
+	},
+	( state ) => [
+		state.settings.__experimentalReusableBlocks,
+		state.settings.__experimentalUserPatternCategories,
+	]
+);
 
-export function getUserPatterns( state ) {
-	const userPatterns =
-		state?.settings?.__experimentalReusableBlocks ?? EMPTY_ARRAY;
-	const userPatternCategories =
-		state?.settings?.__experimentalUserPatternCategories ?? [];
-	const categories = new Map();
-	userPatternCategories.forEach( ( userCategory ) =>
-		categories.set( userCategory.id, userCategory )
-	);
-	return userPatterns.map( ( userPattern ) => {
-		return {
-			name: `core/block/${ userPattern.id }`,
-			id: userPattern.id,
-			type: INSERTER_PATTERN_TYPES.user,
-			title: userPattern.title.raw,
-			categories: userPattern.wp_pattern_category.map( ( catId ) =>
-				categories && categories.get( catId )
-					? categories.get( catId ).slug
-					: catId
-			),
-			content: userPattern.content.raw,
-			syncStatus: userPattern.wp_pattern_sync_status,
-		};
-	} );
-}
+export const getAllPatterns = createSelector(
+	( state ) => {
+		const patterns = state.settings.__experimentalBlockPatterns;
+		const userPatterns = getUserPatterns( state );
+		return [ ...userPatterns, ...patterns ];
+	},
+	( state ) => [
+		state.settings.__experimentalBlockPatterns,
+		getUserPatterns( state ),
+	]
+);
 
 export const checkAllowList = ( list, item, defaultResult = null ) => {
 	if ( typeof list === 'boolean' ) {

From 9da04250da80c4bc402adcf244acf0499feb9b98 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Wed, 17 Jan 2024 12:00:48 +0000
Subject: [PATCH 146/296] Update Grid layout design (#57880)

---
 packages/dataviews/src/style.scss             | 37 ++++++++++++++++---
 packages/dataviews/src/view-grid.js           | 24 +++++++-----
 .../src/components/page-pages/style.scss      |  1 -
 .../src/components/page-templates/index.js    | 24 ++++++------
 4 files changed, 58 insertions(+), 28 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index d5b962212af79..156a901460048 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -253,13 +253,28 @@
 		grid-template-columns: repeat(4, minmax(0, 1fr)) !important; // Todo: eliminate !important dependency
 	}
 
+	.dataviews-view-grid__card {
+		border-radius: $radius-block-ui * 2;
+		border: 1px solid $gray-200;
+		height: 100%;
+		justify-content: flex-start;
+
+		.dataviews-view-grid__title-actions {
+			padding: 0 $grid-unit-05;
+		}
+
+		.dataviews-view-grid__primary-field {
+			min-height: $grid-unit-50;
+		}
+	}
+
 	.dataviews-view-grid__media {
 		width: 100%;
 		min-height: 200px;
 		aspect-ratio: 1/1;
-		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
-		border-radius: $radius-block-ui * 2;
 		overflow: hidden;
+		border-bottom: 1px solid $gray-200;
+		background-color: $gray-100;
 
 		> * {
 			object-fit: cover;
@@ -268,17 +283,23 @@
 		}
 	}
 
+	.dataviews-view-grid__primary-field {
+		padding: $grid-unit-10;
+	}
+
 	.dataviews-view-grid__fields {
 		position: relative;
 		font-size: 12px;
 		line-height: 16px;
 
+		&:not(:empty) {
+			padding: $grid-unit-15;
+			padding-top: 0;
+		}
+
 		.dataviews-view-grid__field {
-			.dataviews-view-grid__field-header {
-				color: $gray-700;
-			}
 			.dataviews-view-grid__field-value {
-				color: $gray-900;
+				color: $gray-700;
 			}
 		}
 	}
@@ -403,6 +424,10 @@
 			&:last-child {
 				margin-right: 0;
 			}
+
+			&:empty {
+				display: none;
+			}
 		}
 	}
 
diff --git a/packages/dataviews/src/view-grid.js b/packages/dataviews/src/view-grid.js
index de0d5eca06b73..c8cc3516e1cbb 100644
--- a/packages/dataviews/src/view-grid.js
+++ b/packages/dataviews/src/view-grid.js
@@ -5,6 +5,7 @@ import {
 	__experimentalGrid as Grid,
 	__experimentalHStack as HStack,
 	__experimentalVStack as VStack,
+	Tooltip,
 } from '@wordpress/components';
 import { useAsyncList } from '@wordpress/compose';
 
@@ -38,21 +39,24 @@ export default function ViewGrid( {
 	const usedData = deferredRendering ? shownData : data;
 	return (
 		<Grid
-			gap={ 8 }
+			gap={ 6 }
 			columns={ 2 }
 			alignment="top"
 			className="dataviews-view-grid"
 		>
 			{ usedData.map( ( item ) => (
 				<VStack
-					spacing={ 3 }
+					spacing={ 0 }
 					key={ getItemId( item ) }
 					className="dataviews-view-grid__card"
 				>
 					<div className="dataviews-view-grid__media">
 						{ mediaField?.render( { item } ) }
 					</div>
-					<HStack justify="space-between">
+					<HStack
+						justify="space-between"
+						className="dataviews-view-grid__title-actions"
+					>
 						<HStack className="dataviews-view-grid__primary-field">
 							{ primaryField?.render( { item } ) }
 						</HStack>
@@ -79,12 +83,14 @@ export default function ViewGrid( {
 									key={ field.id }
 									spacing={ 1 }
 								>
-									<div className="dataviews-view-grid__field-header">
-										{ field.header }
-									</div>
-									<div className="dataviews-view-grid__field-value">
-										{ renderedValue }
-									</div>
+									<Tooltip
+										text={ field.header }
+										placement="left"
+									>
+										<div className="dataviews-view-grid__field-value">
+											{ renderedValue }
+										</div>
+									</Tooltip>
 								</VStack>
 							);
 						} ) }
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index c2d2cc25529c4..2bd7c771fd60d 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -1,5 +1,4 @@
 .edit-site-page-pages__featured-image {
-	border-radius: $grid-unit-05;
 	width: $grid-unit-50;
 	height: $grid-unit-50;
 	display: block;
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 0d4ddd31620ab..fd28c22298ba1 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -216,18 +216,18 @@ export default function DataviewsTemplates() {
 				id: 'description',
 				getValue: ( { item } ) => item.description,
 				render: ( { item } ) => {
-					return item.description ? (
-						decodeEntities( item.description )
-					) : (
-						<>
-							<Text variant="muted" aria-hidden="true">
-								&#8212;
-							</Text>
-							<VisuallyHidden>
-								{ __( 'No description.' ) }
-							</VisuallyHidden>
-						</>
-					);
+					return item.description
+						? decodeEntities( item.description )
+						: view.type === LAYOUT_TABLE && (
+								<>
+									<Text variant="muted" aria-hidden="true">
+										&#8212;
+									</Text>
+									<VisuallyHidden>
+										{ __( 'No description.' ) }
+									</VisuallyHidden>
+								</>
+						  );
 				},
 				maxWidth: 200,
 				enableSorting: false,

From 7591f415a36e9e2256fe6ac3ce5a82af2da37914 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 17 Jan 2024 12:07:14 +0000
Subject: [PATCH 147/296] Bump plugin version to 17.5.0

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 9559f838608da..febd63e0be030 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.0-rc.1
+ * Version: 17.5.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index af61124db82df..80ebc67b9cc1a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0-rc.1",
+	"version": "17.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.0-rc.1",
+			"version": "17.5.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index aae8275e714ab..39f4ab82105e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0-rc.1",
+	"version": "17.5.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 0b9d8aef1cc4d5716d531f3d9116a6ea8f501e2d Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 17 Jan 2024 12:19:07 +0000
Subject: [PATCH 148/296] Update Changelog for 17.5.0

---
 changelog.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 9268dc7edd1fb..b24b8294744d6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,8 +1,6 @@
 == Changelog ==
 
-= 17.5.0-rc.1 =
-
-
+= 17.5.0 =
 
 ## Changelog
 
@@ -207,7 +205,7 @@
 - Add drag cursor to draggable list items. ([57493](https://github.com/WordPress/gutenberg/pull/57493))
 
 ### Tools
-
+- DependencyExtractionWebpackPlugin: Throw when using scripts from modules. ([57795]
 - Dependency Extraction Webpack Plugin: Use `import` for module externals. ([57577](https://github.com/WordPress/gutenberg/pull/57577))
 - DependencyExtractionWebpackPlugin: Add true shorthand for requestToExternalModule. ([57593](https://github.com/WordPress/gutenberg/pull/57593))
 - DependencyExtractionWebpackPlugin: Use module for @wordpress/interactivity. ([57602](https://github.com/WordPress/gutenberg/pull/57602))
@@ -256,6 +254,8 @@ The following contributors merged PRs in this release:
 @afercia @andrewhayward @andrewserong @atachibana @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @DAreRodz @dcalhoun @derekblank @desrosj @ellatrix @fai-sal @fluiddot @geriux @getdave @glendaviesnz @gziolo @hbhalodia @HrithikDalal @jameskoster @jeryj @jorgefilipecosta @jsnajdr @juanmaguitar @kevin940726 @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mirka @muhme @ndiego @ntsekouras @oandregal @ockham @ramonjd @scruffian @sirreal @Soean @t-hamano @talldan @tellthemachines @youknowriad
 
 
+
+
 = 17.3.2 =
 
 ## Changelog

From 81c3c96ef0762e802af957bcd5739b9786bdc180 Mon Sep 17 00:00:00 2001
From: Artemio Morales <artemio.morales@a8c.com>
Date: Wed, 17 Jan 2024 07:22:41 -0500
Subject: [PATCH 149/296] Block Bindings API: Refactor logic into Block
 Bindings class and singleton pattern (#57742)

* Move bindings logic to Block Bindings class

* Remove erroneous echo statement that was breaking UI

* Fix error in registering block bindings sources

* Add missing return statement

* Add docblocks

* Remove obsolete file

* Fix docblock

* Sync register_source docblock

* Remove erroneous subpackage declaration

* Update package name

* Fix gutenberg package declarations

* Remove extraneous comments

* Move allowed_blocks property to filter function

* Update description of Block Bindings class

* Address PHPCS spacing issue

* Rename function call and call using string in filter
---
 .../block-bindings/block-bindings.php         | 69 +++++++++++++++++++
 ...essing.php => class-wp-block-bindings.php} | 54 ++++++++++++++-
 lib/experimental/block-bindings/index.php     |  5 +-
 .../block-bindings/sources/index.php          | 32 ---------
 .../block-bindings/sources/pattern.php        |  5 +-
 .../block-bindings/sources/post-meta.php      |  5 +-
 lib/experimental/blocks.php                   | 48 ++++++-------
 7 files changed, 148 insertions(+), 70 deletions(-)
 create mode 100644 lib/experimental/block-bindings/block-bindings.php
 rename lib/experimental/block-bindings/{html-processing.php => class-wp-block-bindings.php} (70%)
 delete mode 100644 lib/experimental/block-bindings/sources/index.php

diff --git a/lib/experimental/block-bindings/block-bindings.php b/lib/experimental/block-bindings/block-bindings.php
new file mode 100644
index 0000000000000..83a1d6132f5f4
--- /dev/null
+++ b/lib/experimental/block-bindings/block-bindings.php
@@ -0,0 +1,69 @@
+<?php
+/**
+ * Block Bindings API
+ *
+ * This file contains functions for managing block bindings in WordPress.
+ *
+ * @since 17.6.0
+ * @package gutenberg
+ */
+
+/**
+ * Retrieves the singleton instance of WP_Block_Bindings.
+ *
+ * @return WP_Block_Bindings The WP_Block_Bindings instance.
+ */
+if ( ! function_exists( 'wp_block_bindings' ) ) {
+	function wp_block_bindings() {
+		static $instance = null;
+		if ( is_null( $instance ) ) {
+			$instance = new WP_Block_Bindings();
+		}
+		return $instance;
+	}
+}
+
+/**
+ * Registers a new source for block bindings.
+ *
+ * @param string   $source_name The name of the source.
+ * @param string   $label The label of the source.
+ * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
+ *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
+ *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+ *                        - object $block_instance: The block instance.
+ *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+ *                        The callable should return a string that will be used to override the block's original value.
+ * @return void
+ */
+if ( ! function_exists( 'wp_block_bindings_register_source' ) ) {
+	function wp_block_bindings_register_source( $source_name, $label, $apply ) {
+		wp_block_bindings()->register_source( $source_name, $label, $apply );
+	}
+}
+
+/**
+ * Retrieves the list of registered block sources.
+ *
+ * @return array The list of registered block sources.
+ */
+if ( ! function_exists( 'wp_block_bindings_get_sources' ) ) {
+	function wp_block_bindings_get_sources() {
+		return wp_block_bindings()->get_sources();
+	}
+}
+
+/**
+ * Replaces the HTML content of a block based on the provided source value.
+ *
+ * @param string $block_content Block Content.
+ * @param string $block_name The name of the block to process.
+ * @param string $block_attr The attribute of the block we want to process.
+ * @param string $source_value The value used to replace the HTML.
+ * @return string The modified block content.
+ */
+if ( ! function_exists( 'wp_block_bindings_replace_html' ) ) {
+	function wp_block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+		return wp_block_bindings()->replace_html( $block_content, $block_name, $block_attr, $source_value );
+	}
+}
diff --git a/lib/experimental/block-bindings/html-processing.php b/lib/experimental/block-bindings/class-wp-block-bindings.php
similarity index 70%
rename from lib/experimental/block-bindings/html-processing.php
rename to lib/experimental/block-bindings/class-wp-block-bindings.php
index 515749d0a8e75..7eb443dd367a6 100644
--- a/lib/experimental/block-bindings/html-processing.php
+++ b/lib/experimental/block-bindings/class-wp-block-bindings.php
@@ -1,11 +1,50 @@
 <?php
 /**
- * Define the mechanism to replace the HTML depending on the block attributes.
+ * Block Bindings API: WP_Block_Bindings class.
  *
+ * Support for overriding content in blocks by connecting them to different sources.
+ *
+ * @since 17.6.0
  * @package gutenberg
  */
 
-if ( ! function_exists( 'block_bindings_replace_html' ) ) {
+if ( class_exists( 'WP_Block_Bindings' ) ) {
+	return;
+}
+
+/**
+ * Core class used to define supported blocks, register sources, and populate HTML with content from those sources.
+ */
+class WP_Block_Bindings {
+
+	/**
+	 * Holds the registered block bindings sources, keyed by source identifier.
+	 *
+	 * @var array
+	 */
+	private $sources = array();
+
+	/**
+	 * Function to register a new source.
+	 *
+	 * @param string   $source_name The name of the source.
+	 * @param string   $label The label of the source.
+	 * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
+	 *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
+	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+	 *                        - object $block_instance: The block instance.
+	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+	 *                        The callable should return a string that will be used to override the block's original value.
+	 *
+	 * @return void
+	 */
+	public function register_source( $source_name, $label, $apply ) {
+		$this->sources[ $source_name ] = array(
+			'label' => $label,
+			'apply' => $apply,
+		);
+	}
+
 	/**
 	 * Depending on the block attributes, replace the proper HTML based on the value returned by the source.
 	 *
@@ -14,7 +53,7 @@
 	 * @param string $block_attr The attribute of the block we want to process.
 	 * @param string $source_value The value used to replace the HTML.
 	 */
-	function block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+	public function replace_html( $block_content, $block_name, $block_attr, $source_value ) {
 		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
 		if ( null === $block_type ) {
 			return;
@@ -107,4 +146,13 @@ function block_bindings_replace_html( $block_content, $block_name, $block_attr,
 		}
 		return;
 	}
+
+	/**
+	 * Retrieves the list of registered block sources.
+	 *
+	 * @return array The array of registered sources.
+	 */
+	public function get_sources() {
+		return $this->sources;
+	}
 }
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
index cca857e93702f..dc9a6c9b96957 100644
--- a/lib/experimental/block-bindings/index.php
+++ b/lib/experimental/block-bindings/index.php
@@ -5,9 +5,8 @@
  * @package gutenberg
  */
 
-require_once __DIR__ . '/sources/index.php';
-require_once __DIR__ . '/html-processing.php';
-
+require_once __DIR__ . '/class-wp-block-bindings.php';
+require_once __DIR__ . '/block-bindings.php';
 // Register the sources.
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments ) {
diff --git a/lib/experimental/block-bindings/sources/index.php b/lib/experimental/block-bindings/sources/index.php
deleted file mode 100644
index 6d14bc96d86ba..0000000000000
--- a/lib/experimental/block-bindings/sources/index.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Define the mechanism to add new sources available in the block bindings API.
- *
- * @package gutenberg
- */
-
-global $block_bindings_sources;
-$block_bindings_sources = array();
-if ( ! function_exists( 'register_block_bindings_source' ) ) {
-	/**
-	 * Function to register a new source.
-	 *
-	 * @param string   $source_name The name of the source.
-	 * @param string   $label The label of the source.
-	 * @param callable(object, object, string): string $apply - The callback executed when the source is processed during block rendering.
-	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
-	 *                        - object $block_instance: The block instance.
-	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
-	 *                        The callable should return a string that will be used to override the block's original value.
-	 *
-	 *
-	 * @return void
-	 */
-	function register_block_bindings_source( $source_name, $label, $apply ) {
-		global $block_bindings_sources;
-		$block_bindings_sources[ $source_name ] = array(
-			'label' => $label,
-			'apply' => $apply,
-		);
-	}
-}
diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
index e3456aa468d3e..16bf46f4f06ab 100644
--- a/lib/experimental/block-bindings/sources/pattern.php
+++ b/lib/experimental/block-bindings/sources/pattern.php
@@ -4,8 +4,7 @@
  *
  * @package gutenberg
  */
-
-if ( function_exists( 'register_block_bindings_source' ) ) {
+if ( function_exists( 'wp_block_bindings_register_source' ) ) {
 	$pattern_source_callback = function ( $source_attrs, $block_instance, $attribute_name ) {
 		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
 			return null;
@@ -13,7 +12,7 @@
 		$block_id = $block_instance->attributes['metadata']['id'];
 		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
 	};
-	register_block_bindings_source(
+	wp_block_bindings_register_source(
 		'pattern_attributes',
 		__( 'Pattern Attributes', 'gutenberg' ),
 		$pattern_source_callback
diff --git a/lib/experimental/block-bindings/sources/post-meta.php b/lib/experimental/block-bindings/sources/post-meta.php
index 99b6afc03c0d4..2d53dab6d321a 100644
--- a/lib/experimental/block-bindings/sources/post-meta.php
+++ b/lib/experimental/block-bindings/sources/post-meta.php
@@ -4,8 +4,7 @@
  *
  * @package gutenberg
  */
-
-if ( function_exists( 'register_block_bindings_source' ) ) {
+if ( function_exists( 'wp_block_bindings_register_source' ) ) {
 	$post_meta_source_callback = function ( $source_attrs ) {
 		// Use the postId attribute if available
 		if ( isset( $source_attrs['postId'] ) ) {
@@ -17,7 +16,7 @@
 
 		return get_post_meta( $post_id, $source_attrs['value'], true );
 	};
-	register_block_bindings_source(
+	wp_block_bindings_register_source(
 		'post_meta',
 		__( 'Post Meta', 'gutenberg' ),
 		$post_meta_source_callback
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 42663e127870c..93b65f95fc61a 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -88,16 +88,8 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 ) ) {
 
 	require_once __DIR__ . '/block-bindings/index.php';
-		// Allowed blocks that support block bindings.
-	// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
-	global $block_bindings_allowed_blocks;
-	$block_bindings_allowed_blocks = array(
-		'core/paragraph' => array( 'content' ),
-		'core/heading'   => array( 'content' ),
-		'core/image'     => array( 'url', 'title', 'alt' ),
-		'core/button'    => array( 'url', 'text' ),
-	);
-	if ( ! function_exists( 'process_block_bindings' ) ) {
+
+	if ( ! function_exists( 'gutenberg_process_block_bindings' ) ) {
 		/**
 		 * Process the block bindings attribute.
 		 *
@@ -105,9 +97,19 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 		 * @param array    $block Block attributes.
 		 * @param WP_Block $block_instance The block instance.
 		 */
-		function process_block_bindings( $block_content, $block, $block_instance ) {
-			// If the block doesn't have the bindings property, return.
-			if ( ! isset( $block['attrs']['metadata']['bindings'] ) ) {
+		function gutenberg_process_block_bindings( $block_content, $block, $block_instance ) {
+
+			// Allowed blocks that support block bindings.
+			// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
+			$allowed_blocks = array(
+				'core/paragraph' => array( 'content' ),
+				'core/heading'   => array( 'content' ),
+				'core/image'     => array( 'url', 'title', 'alt' ),
+				'core/button'    => array( 'url', 'text' ),
+			);
+
+			// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
+			if ( ! isset( $block['attrs']['metadata']['bindings'] ) || ! isset( $allowed_blocks[ $block_instance->name ] ) ) {
 				return $block_content;
 			}
 
@@ -128,16 +130,13 @@ function process_block_bindings( $block_content, $block, $block_instance ) {
 			//   }
 			// }
 			//
-			global $block_bindings_allowed_blocks;
-			global $block_bindings_sources;
+
+			$block_bindings_sources = wp_block_bindings_get_sources();
 			$modified_block_content = $block_content;
 			foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
-				// If the block is not in the list, stop processing.
-				if ( ! isset( $block_bindings_allowed_blocks[ $block['blockName'] ] ) ) {
-					return $block_content;
-				}
+
 				// If the attribute is not in the list, process next attribute.
-				if ( ! in_array( $binding_attribute, $block_bindings_allowed_blocks[ $block['blockName'] ], true ) ) {
+				if ( ! in_array( $binding_attribute, $allowed_blocks[ $block_instance->name ], true ) ) {
 					continue;
 				}
 				// If no source is provided, or that source is not registered, process next attribute.
@@ -159,14 +158,11 @@ function process_block_bindings( $block_content, $block, $block_instance ) {
 				}
 
 				// Process the HTML based on the block and the attribute.
-				$modified_block_content = block_bindings_replace_html( $modified_block_content, $block['blockName'], $binding_attribute, $source_value );
+				$modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
 			}
 			return $modified_block_content;
 		}
-
-		// Add filter only to the blocks in the list.
-		foreach ( $block_bindings_allowed_blocks as $block_name => $attributes ) {
-			add_filter( 'render_block_' . $block_name, 'process_block_bindings', 20, 3 );
-		}
 	}
+
+	add_filter( 'render_block', 'gutenberg_process_block_bindings', 20, 3 );
 }

From 8c1b69ca397f29977c60992d1905dca0c3381908 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Wed, 17 Jan 2024 14:26:29 +0200
Subject: [PATCH 150/296] BlockSwitcher: Defer transform calculations until the
 Dropdown is open (#57892)

* BlockSwitcher: Defer transform calculations until the Dropdown is open

* address feedback

* fix e2e tests

* add a test, fix a test

* address feedback
---
 .../src/components/block-switcher/index.js    | 244 +++++++------
 .../src/components/block-switcher/style.scss  |   6 +
 .../test/__snapshots__/index.js.snap          | 116 ------
 .../components/block-switcher/test/index.js   | 343 ++++++------------
 .../editor/various/block-switcher.spec.js     |  56 +--
 .../various/toolbar-roving-tabindex.spec.js   |   5 +-
 6 files changed, 282 insertions(+), 488 deletions(-)
 delete mode 100644 packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap

diff --git a/packages/block-editor/src/components/block-switcher/index.js b/packages/block-editor/src/components/block-switcher/index.js
index 8117c6f539b4f..f3f976262ea58 100644
--- a/packages/block-editor/src/components/block-switcher/index.js
+++ b/packages/block-editor/src/components/block-switcher/index.js
@@ -29,75 +29,44 @@ import BlockStylesMenu from './block-styles-menu';
 import PatternTransformationsMenu from './pattern-transformations-menu';
 import useBlockDisplayTitle from '../block-title/use-block-display-title';
 
-export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
+function BlockSwitcherDropdownMenuContents( {
+	onClose,
+	clientIds,
+	hasBlockStyles,
+	canRemove,
+} ) {
 	const { replaceBlocks, multiSelect, updateBlockAttributes } =
 		useDispatch( blockEditorStore );
-	const blockInformation = useBlockDisplayInformation( blocks[ 0 ].clientId );
-	const {
-		possibleBlockTransformations,
-		canRemove,
-		hasBlockStyles,
-		icon,
-		patterns,
-	} = useSelect(
+	const { possibleBlockTransformations, patterns, blocks } = useSelect(
 		( select ) => {
 			const {
+				getBlocksByClientId,
 				getBlockRootClientId,
 				getBlockTransformItems,
 				__experimentalGetPatternTransformItems,
-				canRemoveBlocks,
 			} = select( blockEditorStore );
-			const { getBlockStyles, getBlockType } = select( blocksStore );
 			const rootClientId = getBlockRootClientId(
 				Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds
 			);
-			const [ { name: firstBlockName } ] = blocks;
-			const _isSingleBlockSelected = blocks.length === 1;
-			const styles =
-				_isSingleBlockSelected && getBlockStyles( firstBlockName );
-			let _icon;
-			if ( _isSingleBlockSelected ) {
-				_icon = blockInformation?.icon; // Take into account active block variations.
-			} else {
-				const isSelectionOfSameType =
-					new Set( blocks.map( ( { name } ) => name ) ).size === 1;
-				// When selection consists of blocks of multiple types, display an
-				// appropriate icon to communicate the non-uniformity.
-				_icon = isSelectionOfSameType
-					? getBlockType( firstBlockName )?.icon
-					: copy;
-			}
+			const _blocks = getBlocksByClientId( clientIds );
 			return {
+				blocks: _blocks,
 				possibleBlockTransformations: getBlockTransformItems(
-					blocks,
+					_blocks,
 					rootClientId
 				),
-				canRemove: canRemoveBlocks( clientIds, rootClientId ),
-				hasBlockStyles: !! styles?.length,
-				icon: _icon,
 				patterns: __experimentalGetPatternTransformItems(
-					blocks,
+					_blocks,
 					rootClientId
 				),
 			};
 		},
-		[ clientIds, blocks, blockInformation?.icon ]
+		[ clientIds ]
 	);
-
 	const blockVariationTransformations = useBlockVariationTransforms( {
 		clientIds,
 		blocks,
 	} );
-
-	const blockTitle = useBlockDisplayTitle( {
-		clientId: Array.isArray( clientIds ) ? clientIds[ 0 ] : clientIds,
-		maximumLength: 35,
-	} );
-
-	const isSingleBlock = blocks.length === 1;
-	const isReusable = isSingleBlock && isReusableBlock( blocks[ 0 ] );
-	const isTemplate = isSingleBlock && isTemplatePart( blocks[ 0 ] );
-
 	function selectForMultipleBlocks( insertedBlocks ) {
 		if ( insertedBlocks.length > 1 ) {
 			multiSelect(
@@ -106,14 +75,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			);
 		}
 	}
-
 	// Simple block tranformation based on the `Block Transforms` API.
 	function onBlockTransform( name ) {
 		const newBlocks = switchToBlockType( blocks, name );
 		replaceBlocks( clientIds, newBlocks );
 		selectForMultipleBlocks( newBlocks );
 	}
-
 	function onBlockVariationTransform( name ) {
 		updateBlockAttributes( blocks[ 0 ].clientId, {
 			...blockVariationTransformations.find(
@@ -121,18 +88,18 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			).attributes,
 		} );
 	}
-
 	// Pattern transformation through the `Patterns` API.
 	function onPatternTransform( transformedBlocks ) {
 		replaceBlocks( clientIds, transformedBlocks );
 		selectForMultipleBlocks( transformedBlocks );
 	}
-
 	/**
 	 * The `isTemplate` check is a stopgap solution here.
 	 * Ideally, the Transforms API should handle this
 	 * by allowing to exclude blocks from wildcard transformations.
 	 */
+	const isSingleBlock = blocks.length === 1;
+	const isTemplate = isSingleBlock && isTemplatePart( blocks[ 0 ] );
 	const hasPossibleBlockTransformations =
 		!! possibleBlockTransformations.length && canRemove && ! isTemplate;
 	const hasPossibleBlockVariationTransformations =
@@ -141,11 +108,118 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	const hasBlockOrBlockVariationTransforms =
 		hasPossibleBlockTransformations ||
 		hasPossibleBlockVariationTransformations;
-	const showDropdown =
+	const hasContents =
 		hasBlockStyles ||
 		hasBlockOrBlockVariationTransforms ||
 		hasPatternTransformation;
-	if ( ! showDropdown ) {
+	if ( ! hasContents ) {
+		return (
+			<p className="block-editor-block-switcher__no-transforms">
+				{ __( 'No transforms.' ) }
+			</p>
+		);
+	}
+	return (
+		<div className="block-editor-block-switcher__container">
+			{ hasPatternTransformation && (
+				<PatternTransformationsMenu
+					blocks={ blocks }
+					patterns={ patterns }
+					onSelect={ ( transformedBlocks ) => {
+						onPatternTransform( transformedBlocks );
+						onClose();
+					} }
+				/>
+			) }
+			{ hasBlockOrBlockVariationTransforms && (
+				<BlockTransformationsMenu
+					className="block-editor-block-switcher__transforms__menugroup"
+					possibleBlockTransformations={
+						possibleBlockTransformations
+					}
+					possibleBlockVariationTransformations={
+						blockVariationTransformations
+					}
+					blocks={ blocks }
+					onSelect={ ( name ) => {
+						onBlockTransform( name );
+						onClose();
+					} }
+					onSelectVariation={ ( name ) => {
+						onBlockVariationTransform( name );
+						onClose();
+					} }
+				/>
+			) }
+			{ hasBlockStyles && (
+				<BlockStylesMenu
+					hoveredBlock={ blocks[ 0 ] }
+					onSwitch={ onClose }
+				/>
+			) }
+		</div>
+	);
+}
+
+export const BlockSwitcher = ( { clientIds } ) => {
+	const blockInformation = useBlockDisplayInformation( clientIds?.[ 0 ] );
+	const {
+		canRemove,
+		hasBlockStyles,
+		icon,
+		invalidBlocks,
+		isReusable,
+		isTemplate,
+	} = useSelect(
+		( select ) => {
+			const {
+				getBlockRootClientId,
+				getBlocksByClientId,
+				canRemoveBlocks,
+			} = select( blockEditorStore );
+			const { getBlockStyles, getBlockType } = select( blocksStore );
+			const _blocks = getBlocksByClientId( clientIds );
+			if ( ! _blocks.length || _blocks.some( ( block ) => ! block ) ) {
+				return { invalidBlocks: true };
+			}
+			const rootClientId = getBlockRootClientId( clientIds );
+			const [ { name: firstBlockName } ] = _blocks;
+			const _isSingleBlockSelected = _blocks.length === 1;
+			let _icon;
+			if ( _isSingleBlockSelected ) {
+				_icon = blockInformation?.icon; // Take into account active block variations.
+			} else {
+				const isSelectionOfSameType =
+					new Set( _blocks.map( ( { name } ) => name ) ).size === 1;
+				// When selection consists of blocks of multiple types, display an
+				// appropriate icon to communicate the non-uniformity.
+				_icon = isSelectionOfSameType
+					? getBlockType( firstBlockName )?.icon
+					: copy;
+			}
+			return {
+				canRemove: canRemoveBlocks( clientIds, rootClientId ),
+				hasBlockStyles:
+					_isSingleBlockSelected &&
+					!! getBlockStyles( firstBlockName )?.length,
+				icon: _icon,
+				isReusable:
+					_isSingleBlockSelected && isReusableBlock( _blocks[ 0 ] ),
+				isTemplate:
+					_isSingleBlockSelected && isTemplatePart( _blocks[ 0 ] ),
+			};
+		},
+		[ clientIds, blockInformation?.icon ]
+	);
+	const blockTitle = useBlockDisplayTitle( {
+		clientId: clientIds?.[ 0 ],
+		maximumLength: 35,
+	} );
+	if ( invalidBlocks ) {
+		return null;
+	}
+	const hideDropdown = ! hasBlockStyles && ! canRemove;
+	if ( hideDropdown ) {
 		return (
 			<ToolbarGroup>
 				<ToolbarButton
@@ -166,11 +240,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 			</ToolbarGroup>
 		);
 	}
-
+	const isSingleBlock = clientIds.length === 1;
 	const blockSwitcherLabel = isSingleBlock
 		? blockTitle
 		: __( 'Multiple blocks selected' );
-
 	const blockSwitcherDescription = isSingleBlock
 		? __( 'Change block type or style' )
 		: sprintf(
@@ -178,11 +251,10 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 				_n(
 					'Change type of %d block',
 					'Change type of %d blocks',
-					blocks.length
+					clientIds.length
 				),
-				blocks.length
+				clientIds.length
 		  );
-
 	return (
 		<ToolbarGroup>
 			<ToolbarItem>
@@ -215,46 +287,12 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 						menuProps={ { orientation: 'both' } }
 					>
 						{ ( { onClose } ) => (
-							<div className="block-editor-block-switcher__container">
-								{ hasPatternTransformation && (
-									<PatternTransformationsMenu
-										blocks={ blocks }
-										patterns={ patterns }
-										onSelect={ ( transformedBlocks ) => {
-											onPatternTransform(
-												transformedBlocks
-											);
-											onClose();
-										} }
-									/>
-								) }
-								{ hasBlockOrBlockVariationTransforms && (
-									<BlockTransformationsMenu
-										className="block-editor-block-switcher__transforms__menugroup"
-										possibleBlockTransformations={
-											possibleBlockTransformations
-										}
-										possibleBlockVariationTransformations={
-											blockVariationTransformations
-										}
-										blocks={ blocks }
-										onSelect={ ( name ) => {
-											onBlockTransform( name );
-											onClose();
-										} }
-										onSelectVariation={ ( name ) => {
-											onBlockVariationTransform( name );
-											onClose();
-										} }
-									/>
-								) }
-								{ hasBlockStyles && (
-									<BlockStylesMenu
-										hoveredBlock={ blocks[ 0 ] }
-										onSwitch={ onClose }
-									/>
-								) }
-							</div>
+							<BlockSwitcherDropdownMenuContents
+								onClose={ onClose }
+								clientIds={ clientIds }
+								hasBlockStyles={ hasBlockStyles }
+								canRemove={ canRemove }
+							/>
 						) }
 					</DropdownMenu>
 				) }
@@ -263,20 +301,4 @@ export const BlockSwitcherDropdownMenu = ( { clientIds, blocks } ) => {
 	);
 };
 
-export const BlockSwitcher = ( { clientIds } ) => {
-	const blocks = useSelect(
-		( select ) =>
-			select( blockEditorStore ).getBlocksByClientId( clientIds ),
-		[ clientIds ]
-	);
-
-	if ( ! blocks.length || blocks.some( ( block ) => ! block ) ) {
-		return null;
-	}
-
-	return (
-		<BlockSwitcherDropdownMenu clientIds={ clientIds } blocks={ blocks } />
-	);
-};
-
 export default BlockSwitcher;
diff --git a/packages/block-editor/src/components/block-switcher/style.scss b/packages/block-editor/src/components/block-switcher/style.scss
index d30c6587a520f..6a8a720b9fd2e 100644
--- a/packages/block-editor/src/components/block-switcher/style.scss
+++ b/packages/block-editor/src/components/block-switcher/style.scss
@@ -197,3 +197,9 @@
 		}
 	}
 }
+
+.block-editor-block-switcher__no-transforms {
+	color: $gray-700;
+	padding: 6px $grid-unit;
+	margin: 0;
+}
diff --git a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap b/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
deleted file mode 100644
index 220815d1a6afd..0000000000000
--- a/packages/block-editor/src/components/block-switcher/test/__snapshots__/index.js.snap
+++ /dev/null
@@ -1,116 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`BlockSwitcherDropdownMenu should render disabled block switcher with multi block of different types when no transforms 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div>
-      <button
-        aria-label="Block Name"
-        class="components-button components-toolbar__control block-editor-block-switcher__no-switcher-icon has-icon"
-        data-toolbar-item="true"
-        disabled=""
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon has-colors"
-        >
-          <svg
-            aria-hidden="true"
-            focusable="false"
-            height="24"
-            viewBox="0 0 24 24"
-            width="24"
-            xmlns="http://www.w3.org/2000/svg"
-          >
-            <path
-              clip-rule="evenodd"
-              d="M5 4.5h11a.5.5 0 0 1 .5.5v11a.5.5 0 0 1-.5.5H5a.5.5 0 0 1-.5-.5V5a.5.5 0 0 1 .5-.5ZM3 5a2 2 0 0 1 2-2h11a2 2 0 0 1 2 2v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V5Zm17 3v10.75c0 .69-.56 1.25-1.25 1.25H6v1.5h12.75a2.75 2.75 0 0 0 2.75-2.75V8H20Z"
-              fill-rule="evenodd"
-            />
-          </svg>
-        </span>
-      </button>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`BlockSwitcherDropdownMenu should render enabled block switcher with multi block when transforms exist 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div
-      class="components-dropdown components-dropdown-menu block-editor-block-switcher"
-      tabindex="-1"
-    >
-      <button
-        aria-describedby="components-button__description-2"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="Multiple blocks selected"
-        class="components-button components-dropdown-menu__toggle has-icon"
-        data-toolbar-item="true"
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon block-editor-block-switcher__toggle has-colors"
-        />
-      </button>
-      <div
-        class="components-visually-hidden emotion-0 emotion-1"
-        data-wp-c16t="true"
-        data-wp-component="VisuallyHidden"
-        style="border: 0px; clip: rect(1px, 1px, 1px, 1px); clip-path: inset( 50% ); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; word-wrap: normal;"
-      >
-        <span
-          id="components-button__description-2"
-        >
-          Change type of 2 blocks
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`BlockSwitcherDropdownMenu should render switcher with blocks 1`] = `
-<div>
-  <div
-    class="components-toolbar"
-  >
-    <div
-      class="components-dropdown components-dropdown-menu block-editor-block-switcher"
-      tabindex="-1"
-    >
-      <button
-        aria-describedby="components-button__description-0"
-        aria-expanded="false"
-        aria-haspopup="true"
-        aria-label="Block Name"
-        class="components-button components-dropdown-menu__toggle has-icon"
-        data-toolbar-item="true"
-        type="button"
-      >
-        <span
-          class="block-editor-block-icon block-editor-block-switcher__toggle has-colors"
-        />
-      </button>
-      <div
-        class="components-visually-hidden emotion-0 emotion-1"
-        data-wp-c16t="true"
-        data-wp-component="VisuallyHidden"
-        style="border: 0px; clip: rect(1px, 1px, 1px, 1px); clip-path: inset( 50% ); height: 1px; margin: -1px; overflow: hidden; padding: 0px; position: absolute; width: 1px; word-wrap: normal;"
-      >
-        <span
-          id="components-button__description-0"
-        >
-          Change block type or style
-        </span>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/packages/block-editor/src/components/block-switcher/test/index.js b/packages/block-editor/src/components/block-switcher/test/index.js
index 8882a5369ca01..ce900003e7a60 100644
--- a/packages/block-editor/src/components/block-switcher/test/index.js
+++ b/packages/block-editor/src/components/block-switcher/test/index.js
@@ -14,7 +14,7 @@ import { copy } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
-import { BlockSwitcher, BlockSwitcherDropdownMenu } from '../';
+import { BlockSwitcher } from '../';
 
 jest.mock( '@wordpress/data/src/components/use-select', () => jest.fn() );
 jest.mock( '../../block-title/use-block-display-title', () =>
@@ -22,23 +22,6 @@ jest.mock( '../../block-title/use-block-display-title', () =>
 );
 
 describe( 'BlockSwitcher', () => {
-	test( 'should not render block switcher without blocks', () => {
-		useSelect.mockImplementation( () => ( {} ) );
-		const { container } = render( <BlockSwitcher /> );
-		expect( container ).toBeEmptyDOMElement();
-	} );
-
-	test( 'should not render block switcher with null blocks', () => {
-		useSelect.mockImplementation( () => ( { blocks: [ null ] } ) );
-		const { container } = render(
-			<BlockSwitcher
-				clientIds={ [ 'a1303fd6-3e60-4fff-a770-0e0ea656c5b9' ] }
-			/>
-		);
-		expect( container ).toBeEmptyDOMElement();
-	} );
-} );
-describe( 'BlockSwitcherDropdownMenu', () => {
 	const headingBlock1 = {
 		attributes: {
 			content: [ 'How are you?' ],
@@ -49,66 +32,46 @@ describe( 'BlockSwitcherDropdownMenu', () => {
 		originalContent: '<h2>How are you?</h2>',
 		clientId: 'a1303fd6-3e60-4fff-a770-0e0ea656c5b9',
 	};
-
-	const textBlock = {
-		attributes: {
-			content: [ 'I am great!' ],
+	const headingBlockType = {
+		category: 'text',
+		title: 'Heading',
+		edit: () => {},
+		save: () => {},
+		transforms: {
+			to: [
+				{
+					type: 'block',
+					blocks: [ 'core/paragraph' ],
+					transform: () => {},
+				},
+				{
+					type: 'block',
+					blocks: [ 'core/paragraph' ],
+					transform: () => {},
+					isMultiBlock: true,
+				},
+			],
 		},
-		isValid: true,
-		name: 'core/paragraph',
-		originalContent: '<p>I am great!</p>',
-		clientId: 'b1303fdb-3e60-43faf-a770-2e1ea656c5b8',
 	};
-
-	const headingBlock2 = {
-		attributes: {
-			content: [ 'I am the greatest!' ],
-			level: 3,
+	const paragraphBlockType = {
+		category: 'text',
+		title: 'Paragraph',
+		edit: () => {},
+		save: () => {},
+		transforms: {
+			to: [
+				{
+					type: 'block',
+					blocks: [ 'core/heading' ],
+					transform: () => {},
+				},
+			],
 		},
-		isValid: true,
-		name: 'core/heading',
-		originalContent: '<h3>I am the greatest!</h3>',
-		clientId: 'c2403fd2-4e63-5ffa-b71c-1e0ea656c5b0',
 	};
 
 	beforeAll( () => {
-		registerBlockType( 'core/heading', {
-			category: 'text',
-			title: 'Heading',
-			edit: () => {},
-			save: () => {},
-			transforms: {
-				to: [
-					{
-						type: 'block',
-						blocks: [ 'core/paragraph' ],
-						transform: () => {},
-					},
-					{
-						type: 'block',
-						blocks: [ 'core/paragraph' ],
-						transform: () => {},
-						isMultiBlock: true,
-					},
-				],
-			},
-		} );
-
-		registerBlockType( 'core/paragraph', {
-			category: 'text',
-			title: 'Paragraph',
-			edit: () => {},
-			save: () => {},
-			transforms: {
-				to: [
-					{
-						type: 'block',
-						blocks: [ 'core/heading' ],
-						transform: () => {},
-					},
-				],
-			},
-		} );
+		registerBlockType( 'core/heading', headingBlockType );
+		registerBlockType( 'core/paragraph', paragraphBlockType );
 	} );
 
 	afterAll( () => {
@@ -116,184 +79,104 @@ describe( 'BlockSwitcherDropdownMenu', () => {
 		unregisterBlockType( 'core/paragraph' );
 	} );
 
-	test( 'should render switcher with blocks', () => {
+	test( 'should render switcher with block transforms', async () => {
 		useSelect.mockImplementation( () => ( {
 			possibleBlockTransformations: [
-				{ name: 'core/heading', frecency: 1 },
-				{ name: 'core/paragraph', frecency: 1 },
+				{
+					name: 'core/heading',
+					title: headingBlockType.title,
+					frecency: 1,
+				},
+				{
+					name: 'core/paragraph',
+					title: paragraphBlockType.title,
+					frecency: 1,
+				},
 			],
+			blocks: [ headingBlock1 ],
 			canRemove: true,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
+		const user = userEvent.setup();
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} )
+		).toBeVisible();
+		expect(
+			screen.queryByRole( 'menu', {
+				name: 'Block Name',
+			} )
+		).not.toBeInTheDocument();
+		await user.type(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} ),
+			'[ArrowDown]'
 		);
-		expect( container ).toMatchSnapshot();
+		await waitFor( () =>
+			expect(
+				screen.getByRole( 'button', {
+					name: 'Block Name',
+					expanded: true,
+				} )
+			).toBeVisible()
+		);
+		const dropdown = screen.getByRole( 'menu', {
+			name: 'Block Name',
+		} );
+		await waitFor( () => expect( dropdown ).toBeVisible() );
+		const items = within( dropdown ).getAllByRole( 'menuitem' );
+		expect( items ).toHaveLength( 2 );
+		expect( items[ 0 ] ).toHaveTextContent( paragraphBlockType.title );
+		expect( items[ 1 ] ).toHaveTextContent( headingBlockType.title );
 	} );
 
-	test( 'should render disabled block switcher with multi block of different types when no transforms', () => {
+	test( 'should render disabled block switcher when we have a single selected block without styles and we cannot remove it', () => {
 		useSelect.mockImplementation( () => ( {
-			possibleBlockTransformations: [],
+			blocks: [ headingBlock1 ],
 			icon: copy,
+			hasBlockStyles: false,
+			canRemove: false,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu
-				blocks={ [ headingBlock1, textBlock ] }
-			/>
-		);
-		expect( container ).toMatchSnapshot();
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		expect(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+			} )
+		).toBeDisabled();
 	} );
 
-	test( 'should render enabled block switcher with multi block when transforms exist', () => {
+	test( 'should render message for no available transforms', async () => {
 		useSelect.mockImplementation( () => ( {
-			possibleBlockTransformations: [
-				{ name: 'core/heading', frecency: 1 },
-				{ name: 'core/paragraph', frecency: 1 },
-			],
+			possibleBlockTransformations: [],
+			blocks: [ headingBlock1 ],
+			icon: copy,
 			canRemove: true,
 		} ) );
-		const { container } = render(
-			<BlockSwitcherDropdownMenu
-				blocks={ [ headingBlock1, headingBlock2 ] }
-			/>
+		render( <BlockSwitcher clientIds={ [ headingBlock1.clientId ] } /> );
+		const user = userEvent.setup();
+		await user.type(
+			screen.getByRole( 'button', {
+				name: 'Block Name',
+				expanded: false,
+			} ),
+			'[ArrowDown]'
 		);
-		expect( container ).toMatchSnapshot();
-	} );
-
-	describe( 'Dropdown', () => {
-		beforeAll( () => {
-			useSelect.mockImplementation( () => ( {
-				possibleBlockTransformations: [
-					{ name: 'core/paragraph', frecency: 3 },
-				],
-				canRemove: true,
-			} ) );
-		} );
-
-		test( 'should dropdown exist', () => {
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
+		await waitFor( () =>
 			expect(
 				screen.getByRole( 'button', {
 					name: 'Block Name',
-					expanded: false,
+					expanded: true,
 				} )
-			).toBeVisible();
-		} );
-
-		test( 'should simulate a keydown event, which should open transform toggle.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			expect(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			).toBeVisible();
-			expect(
-				screen.queryByRole( 'menu', {
-					name: 'Block Name',
-				} )
-			).not.toBeInTheDocument();
-
-			await user.type(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} ),
-				'[ArrowDown]'
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'button', {
-						name: 'Block Name',
-						expanded: true,
-					} )
-				).toBeVisible()
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'menu', {
-						name: 'Block Name',
-					} )
-				).toBeVisible()
-			);
-		} );
-
-		test( 'should simulate a click event, which should call onToggle.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			expect(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			).toBeVisible();
-			expect(
-				screen.queryByRole( 'menu', {
-					name: 'Block Name',
-				} )
-			).not.toBeInTheDocument();
-
-			await user.click(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'button', {
-						name: 'Block Name',
-						expanded: true,
-					} )
-				).toBeVisible()
-			);
-
-			await waitFor( () =>
-				expect(
-					screen.getByRole( 'menu', {
-						name: 'Block Name',
-					} )
-				).toBeVisible()
-			);
-		} );
-
-		test( 'should create the transform items for the chosen block.', async () => {
-			const user = userEvent.setup();
-
-			render(
-				<BlockSwitcherDropdownMenu blocks={ [ headingBlock1 ] } />
-			);
-
-			await user.click(
-				screen.getByRole( 'button', {
-					name: 'Block Name',
-					expanded: false,
-				} )
-			);
-
-			await waitFor( () =>
-				expect(
-					within(
-						screen.getByRole( 'menu', {
-							name: 'Block Name',
-						} )
-					).getByRole( 'menuitem' )
-				).toBeInTheDocument()
-			);
-		} );
+			).toBeVisible()
+		);
+		expect(
+			screen.getByRole( 'menu', {
+				name: 'Block Name',
+			} )
+		).toHaveTextContent( 'No transforms.' );
 	} );
 } );
diff --git a/test/e2e/specs/editor/various/block-switcher.spec.js b/test/e2e/specs/editor/various/block-switcher.spec.js
index e68844ac4a9f6..8ddbcaa906f6d 100644
--- a/test/e2e/specs/editor/various/block-switcher.spec.js
+++ b/test/e2e/specs/editor/various/block-switcher.spec.js
@@ -77,7 +77,7 @@ test.describe( 'Block Switcher', () => {
 		).toHaveText( [ 'Paragraph', 'Heading', 'Columns', 'Group' ] );
 	} );
 
-	test( 'Should not show the block switcher if all the blocks the list block transforms into are removed', async ( {
+	test( 'Should not show the block switcher if the block has no styles and cannot be removed', async ( {
 		editor,
 		page,
 		pageUtils,
@@ -86,36 +86,38 @@ test.describe( 'Block Switcher', () => {
 		await editor.canvas
 			.getByRole( 'button', { name: 'Add default block' } )
 			.click();
-		await page.keyboard.type( '- List content' );
+		await page.keyboard.type( '1' );
+		await pageUtils.pressKeys( 'alt+F10' );
+		const button = page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'Paragraph' } );
+		await expect( button ).toBeEnabled();
 
-		// Remove blocks.
-		await page.waitForFunction( () => {
-			try {
-				window.wp.data
-					.dispatch( 'core/blocks' )
-					.removeBlockTypes( [
-						'core/quote',
-						'core/pullquote',
-						'core/paragraph',
-						'core/group',
-						'core/heading',
-						'core/columns',
-					] );
-				return true;
-			} catch {
-				return false;
-			}
-		} );
+		await editor.clickBlockOptionsMenuItem( 'Lock' );
+		await page.click( 'role=checkbox[name="Prevent removal"]' );
+		await page.click( 'role=button[name="Apply"]' );
 
-		await page.keyboard.press( 'ArrowUp' );
+		// Verify the block switcher isn't enabled.
+		await expect( button ).toBeDisabled();
+	} );
+
+	test( 'Should show a message if there are no transforms or styles available', async ( {
+		editor,
+		page,
+		pageUtils,
+	} ) => {
+		// Insert a list block.
+		await editor.canvas
+			.getByRole( 'button', { name: 'Add default block' } )
+			.click();
+		await page.keyboard.type( '- List content' );
 		await pageUtils.pressKeys( 'alt+F10' );
 
-		// Verify the block switcher isn't enabled.
-		await expect(
-			page
-				.getByRole( 'toolbar', { name: 'Block tools' } )
-				.getByRole( 'button', { name: 'List' } )
-		).toBeDisabled();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'button', { name: 'List item' } )
+			.click();
+		await expect( page.getByText( 'No transforms.' ) ).toBeVisible();
 	} );
 
 	test( 'Should show Columns block only if selected blocks are between limits (1-6)', async ( {
diff --git a/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js b/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
index 70509348983e6..2dc1e7c6b5051 100644
--- a/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
+++ b/test/e2e/specs/editor/various/toolbar-roving-tabindex.spec.js
@@ -57,10 +57,7 @@ test.describe( 'Toolbar roving tabindex', () => {
 		// ensures list block toolbar uses roving tabindex
 		await editor.insertBlock( { name: 'core/list' } );
 		await page.keyboard.type( 'List' );
-		await ToolbarRovingTabindexUtils.testBlockToolbarKeyboardNavigation(
-			'List text',
-			'Select parent block: List'
-		);
+		await ToolbarRovingTabindexUtils.focusBlockToolbar();
 		await page.click( `role=button[name="Select parent block: List"i]` );
 		await ToolbarRovingTabindexUtils.wrapCurrentBlockWithGroup( 'List' );
 		await ToolbarRovingTabindexUtils.testGroupKeyboardNavigation(

From 6b224fc3f8c2c81f0a59236fe7eec54ac7d6c6bf Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Wed, 17 Jan 2024 12:30:53 +0000
Subject: [PATCH 151/296] Update the cherry pick script to work with the new
 version of gh (#57917)

---
 bin/cherry-pick.mjs | 25 ++++++++++++++++---------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/bin/cherry-pick.mjs b/bin/cherry-pick.mjs
index 0c6a6c613638b..dc71eed751cfd 100644
--- a/bin/cherry-pick.mjs
+++ b/bin/cherry-pick.mjs
@@ -10,7 +10,7 @@ const LABEL = process.argv[ 2 ] || 'Backport to WP Beta/RC';
 const BRANCH = getCurrentBranch();
 const GITHUB_CLI_AVAILABLE = spawnSync( 'gh', [ 'auth', 'status' ] )
 	?.stdout?.toString()
-	.includes( '✓ Logged in to github.com as' );
+	.includes( '✓ Logged in to github.com' );
 
 const AUTO_PROPAGATE_RESULTS_TO_GITHUB = GITHUB_CLI_AVAILABLE;
 
@@ -114,16 +114,23 @@ async function fetchPRs() {
 	const { items } = await GitHubFetch(
 		`/search/issues?q=is:pr state:closed sort:updated label:"${ LABEL }" repo:WordPress/gutenberg`
 	);
-	const PRs = items.map( ( { id, number, title, pull_request, closed_at } ) => ( {
-		id,
-		number,
-		title,
-		pull_request,
-	} ) )
+	const PRs = items
+		.map( ( { id, number, title, pull_request, closed_at } ) => ( {
+			id,
+			number,
+			title,
+			pull_request,
+		} ) )
 		.filter( ( { pull_request } ) => !! pull_request?.merged_at )
-		.sort( ( a, b ) => new Date(  a?.pull_request?.merged_at ) - new Date( b?.pull_request?.merged_at ) );
+		.sort(
+			( a, b ) =>
+				new Date( a?.pull_request?.merged_at ) -
+				new Date( b?.pull_request?.merged_at )
+		);
 
-	console.log( 'Found the following PRs to cherry-pick (sorted by closed date in ascending order): ' );
+	console.log(
+		'Found the following PRs to cherry-pick (sorted by closed date in ascending order): '
+	);
 	PRs.forEach( ( { number, title } ) =>
 		console.log( indent( `#${ number } – ${ title }` ) )
 	);

From e7e343c4bbf116c1bd953d091324d18adb95cd00 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Wed, 17 Jan 2024 13:37:44 +0100
Subject: [PATCH 152/296] Interactivity API: Update `preact`, `@preact/signals`
 and `deepsignal` dependencies (#57891)

* Update preact, preact-signals, and deepsignal versions

* Update changelog

* Revert removal of role in wp-bind processing
---
 package-lock.json                        | 148 ++++++++++++-----------
 packages/interactivity/CHANGELOG.md      |   4 +
 packages/interactivity/package.json      |   6 +-
 packages/interactivity/src/directives.js |  13 +-
 4 files changed, 83 insertions(+), 88 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 80ebc67b9cc1a..6c47aab7fe1a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7317,21 +7317,6 @@
 				"url": "https://opencollective.com/popperjs"
 			}
 		},
-		"node_modules/@preact/signals": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.1.3.tgz",
-			"integrity": "sha512-N09DuAVvc90bBZVRwD+aFhtGyHAmJLhS3IFoawO/bYJRcil4k83nBOchpCEoS0s5+BXBpahgp0Mjf+IOqP57Og==",
-			"dependencies": {
-				"@preact/signals-core": "^1.2.3"
-			},
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/preact"
-			},
-			"peerDependencies": {
-				"preact": "10.x"
-			}
-		},
 		"node_modules/@preact/signals-core": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.4.0.tgz",
@@ -24240,31 +24225,6 @@
 				"node": ">=16.0.0"
 			}
 		},
-		"node_modules/deepsignal": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.3.6.tgz",
-			"integrity": "sha512-yjd+vtiznL6YaMptOsKnEKkPr60OEApa+LRe+Qe6Ile/RfCOrELKk/YM3qVpXFZiyOI3Ng67GDEyjAlqVc697g==",
-			"peerDependencies": {
-				"@preact/signals": "^1.1.4",
-				"@preact/signals-core": "^1.3.1",
-				"@preact/signals-react": "^1.3.3",
-				"preact": "^10.16.0"
-			},
-			"peerDependenciesMeta": {
-				"@preact/signals": {
-					"optional": true
-				},
-				"@preact/signals-core": {
-					"optional": true
-				},
-				"@preact/signals-react": {
-					"optional": true
-				},
-				"preact": {
-					"optional": true
-				}
-			}
-		},
 		"node_modules/default-browser": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
@@ -43621,15 +43581,6 @@
 				"node": ">=0.10.0"
 			}
 		},
-		"node_modules/preact": {
-			"version": "10.13.2",
-			"resolved": "https://registry.npmjs.org/preact/-/preact-10.13.2.tgz",
-			"integrity": "sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw==",
-			"funding": {
-				"type": "opencollective",
-				"url": "https://opencollective.com/preact"
-			}
-		},
 		"node_modules/prebuild-install": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
@@ -55274,14 +55225,63 @@
 			"version": "3.2.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
+				"@preact/signals": "^1.2.2",
+				"deepsignal": "^1.4.0",
+				"preact": "^10.19.3"
 			},
 			"engines": {
 				"node": ">=12"
 			}
 		},
+		"packages/interactivity/node_modules/@preact/signals": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz",
+			"integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==",
+			"dependencies": {
+				"@preact/signals-core": "^1.4.0"
+			},
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			},
+			"peerDependencies": {
+				"preact": "10.x"
+			}
+		},
+		"packages/interactivity/node_modules/deepsignal": {
+			"version": "1.4.0",
+			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.4.0.tgz",
+			"integrity": "sha512-x0XUMT48s+xQRLc2fPFfxnYLCJ46vffw47OQ5NcHFzacOjfW5eA0NrEmI0bhQHL6MgUHkBVT4TIiWTVwzTEwpg==",
+			"peerDependencies": {
+				"@preact/signals": "^1.1.4",
+				"@preact/signals-core": "^1.5.1",
+				"@preact/signals-react": "^1.3.8 || ^2.0.0",
+				"preact": "^10.16.0"
+			},
+			"peerDependenciesMeta": {
+				"@preact/signals": {
+					"optional": true
+				},
+				"@preact/signals-core": {
+					"optional": true
+				},
+				"@preact/signals-react": {
+					"optional": true
+				},
+				"preact": {
+					"optional": true
+				}
+			}
+		},
+		"packages/interactivity/node_modules/preact": {
+			"version": "10.19.3",
+			"resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz",
+			"integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ==",
+			"funding": {
+				"type": "opencollective",
+				"url": "https://opencollective.com/preact"
+			}
+		},
 		"packages/interface": {
 			"name": "@wordpress/interface",
 			"version": "5.26.0",
@@ -61425,14 +61425,6 @@
 			"resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.7.tgz",
 			"integrity": "sha512-Cr4OjIkipTtcXKjAsm8agyleBuDHvxzeBoa1v543lbv1YaIwQjESsVcmjiWiPEbC1FIeHOG/Op9kdCmAmiS3Kw=="
 		},
-		"@preact/signals": {
-			"version": "1.1.3",
-			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.1.3.tgz",
-			"integrity": "sha512-N09DuAVvc90bBZVRwD+aFhtGyHAmJLhS3IFoawO/bYJRcil4k83nBOchpCEoS0s5+BXBpahgp0Mjf+IOqP57Og==",
-			"requires": {
-				"@preact/signals-core": "^1.2.3"
-			}
-		},
 		"@preact/signals-core": {
 			"version": "1.4.0",
 			"resolved": "https://registry.npmjs.org/@preact/signals-core/-/signals-core-1.4.0.tgz",
@@ -70102,9 +70094,29 @@
 		"@wordpress/interactivity": {
 			"version": "file:packages/interactivity",
 			"requires": {
-				"@preact/signals": "^1.1.3",
-				"deepsignal": "^1.3.6",
-				"preact": "^10.13.2"
+				"@preact/signals": "^1.2.2",
+				"deepsignal": "^1.4.0",
+				"preact": "^10.19.3"
+			},
+			"dependencies": {
+				"@preact/signals": {
+					"version": "1.2.2",
+					"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz",
+					"integrity": "sha512-ColCqdo4cRP18bAuIR4Oik5rDpiyFtPIJIygaYPMEAwTnl4buWkBOflGBSzhYyPyJfKpkwlekrvK+1pzQ2ldWw==",
+					"requires": {
+						"@preact/signals-core": "^1.4.0"
+					}
+				},
+				"deepsignal": {
+					"version": "1.4.0",
+					"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.4.0.tgz",
+					"integrity": "sha512-x0XUMT48s+xQRLc2fPFfxnYLCJ46vffw47OQ5NcHFzacOjfW5eA0NrEmI0bhQHL6MgUHkBVT4TIiWTVwzTEwpg=="
+				},
+				"preact": {
+					"version": "10.19.3",
+					"resolved": "https://registry.npmjs.org/preact/-/preact-10.19.3.tgz",
+					"integrity": "sha512-nHHTeFVBTHRGxJXKkKu5hT8C/YWBkPso4/Gad6xuj5dbptt9iF9NZr9pHbPhBrnT2klheu7mHTxTZ/LjwJiEiQ=="
+				}
 			}
 		},
 		"@wordpress/interface": {
@@ -75509,11 +75521,6 @@
 			"integrity": "sha512-eS8dRJOckyo9maw9Tu5O5RUi/4inFLrnoLkBe3cPfDMx3WZioXtmOew4TXQaxq7Rhl4xjDtR7c6x8nNTxOvbFw==",
 			"dev": true
 		},
-		"deepsignal": {
-			"version": "1.3.6",
-			"resolved": "https://registry.npmjs.org/deepsignal/-/deepsignal-1.3.6.tgz",
-			"integrity": "sha512-yjd+vtiznL6YaMptOsKnEKkPr60OEApa+LRe+Qe6Ile/RfCOrELKk/YM3qVpXFZiyOI3Ng67GDEyjAlqVc697g=="
-		},
 		"default-browser": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/default-browser/-/default-browser-4.0.0.tgz",
@@ -90301,11 +90308,6 @@
 			"resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
 			"integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ=="
 		},
-		"preact": {
-			"version": "10.13.2",
-			"resolved": "https://registry.npmjs.org/preact/-/preact-10.13.2.tgz",
-			"integrity": "sha512-q44QFLhOhty2Bd0Y46fnYW0gD/cbVM9dUVtNTDKPcdXSMA7jfY+Jpd6rk3GB0lcQss0z5s/6CmVP0Z/hV+g6pw=="
-		},
 		"prebuild-install": {
 			"version": "7.1.1",
 			"resolved": "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index a67775b781d55..8514ecc6716f8 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -10,6 +10,10 @@
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
 
+### Enhancements
+
+-  Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
+
 ### Breaking Changes
 
 -   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index 455af38b67fca..35c8dd2d85bd8 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -26,9 +26,9 @@
 	"react-native": "src/index",
 	"types": "build-types",
 	"dependencies": {
-		"@preact/signals": "^1.1.3",
-		"deepsignal": "^1.3.6",
-		"preact": "^10.13.2"
+		"@preact/signals": "^1.2.2",
+		"deepsignal": "^1.4.0",
+		"preact": "^10.19.3"
 	},
 	"publishConfig": {
 		"access": "public"
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index b31f8ddb4b84d..c24c01ecdfa63 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -1,7 +1,7 @@
 /**
  * External dependencies
  */
-import { useContext, useMemo, useRef, useLayoutEffect } from 'preact/hooks';
+import { useContext, useMemo, useRef } from 'preact/hooks';
 import { deepSignal, peek } from 'deepsignal';
 
 /**
@@ -194,17 +194,6 @@ export default () => {
 				const attribute = entry.suffix;
 				const result = evaluate( entry );
 				element.props[ attribute ] = result;
-				// Preact doesn't handle the `role` attribute properly, as it doesn't remove it when `null`.
-				// We need this workaround until the following issue is solved:
-				// https://github.com/preactjs/preact/issues/4136
-				useLayoutEffect( () => {
-					if (
-						attribute === 'role' &&
-						( result === null || result === undefined )
-					) {
-						element.ref.current.removeAttribute( attribute );
-					}
-				}, [ attribute, result ] );
 
 				// This seems necessary because Preact doesn't change the attributes
 				// on the hydration, so we have to do it manually. It doesn't need

From aa9b37401e4a54922dd9c3ba5f5545e20b4df96b Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Wed, 17 Jan 2024 23:50:41 +0900
Subject: [PATCH 153/296] Modified Date Block: Don't render change date tool
 (#57914)

---
 packages/block-library/src/post-date/edit.js | 71 +++++++++++---------
 1 file changed, 38 insertions(+), 33 deletions(-)

diff --git a/packages/block-library/src/post-date/edit.js b/packages/block-library/src/post-date/edit.js
index f8cd268358d49..0a70758ac32f0 100644
--- a/packages/block-library/src/post-date/edit.js
+++ b/packages/block-library/src/post-date/edit.js
@@ -108,40 +108,45 @@ export default function PostDateEdit( {
 						setAttributes( { textAlign: nextAlign } );
 					} }
 				/>
-				{ date && ! isDescendentOfQueryLoop && (
-					<ToolbarGroup>
-						<Dropdown
-							popoverProps={ popoverProps }
-							renderContent={ ( { onClose } ) => (
-								<PublishDateTimePicker
-									currentDate={ date }
-									onChange={ setDate }
-									is12Hour={ is12HourFormat(
-										siteTimeFormat
-									) }
-									onClose={ onClose }
-								/>
-							) }
-							renderToggle={ ( { isOpen, onToggle } ) => {
-								const openOnArrowDown = ( event ) => {
-									if ( ! isOpen && event.keyCode === DOWN ) {
-										event.preventDefault();
-										onToggle();
-									}
-								};
-								return (
-									<ToolbarButton
-										aria-expanded={ isOpen }
-										icon={ edit }
-										title={ __( 'Change Date' ) }
-										onClick={ onToggle }
-										onKeyDown={ openOnArrowDown }
+				{ date &&
+					displayType === 'date' &&
+					! isDescendentOfQueryLoop && (
+						<ToolbarGroup>
+							<Dropdown
+								popoverProps={ popoverProps }
+								renderContent={ ( { onClose } ) => (
+									<PublishDateTimePicker
+										currentDate={ date }
+										onChange={ setDate }
+										is12Hour={ is12HourFormat(
+											siteTimeFormat
+										) }
+										onClose={ onClose }
 									/>
-								);
-							} }
-						/>
-					</ToolbarGroup>
-				) }
+								) }
+								renderToggle={ ( { isOpen, onToggle } ) => {
+									const openOnArrowDown = ( event ) => {
+										if (
+											! isOpen &&
+											event.keyCode === DOWN
+										) {
+											event.preventDefault();
+											onToggle();
+										}
+									};
+									return (
+										<ToolbarButton
+											aria-expanded={ isOpen }
+											icon={ edit }
+											title={ __( 'Change Date' ) }
+											onClick={ onToggle }
+											onKeyDown={ openOnArrowDown }
+										/>
+									);
+								} }
+							/>
+						</ToolbarGroup>
+					) }
 			</BlockControls>
 
 			<InspectorControls>

From 4e982f45cc372cae344f05d3d838d6b03fb5596b Mon Sep 17 00:00:00 2001
From: Dennis Snell <dennis.snell@automattic.com>
Date: Wed, 17 Jan 2024 10:31:22 -0600
Subject: [PATCH 154/296] HTML API: Backport updates from Core (#57022)
 (#57022)

Updates from WordPress/wordpress-develop at 54a09a7ec99c59b8e640bd5aacebfdbf03bb02cc

 - WordPress/wordpress-develop#5535
   Adds support for H1 - H6 elements in the HTML Processor.

 - WordPress/wordpress-develop#5725
   Pause the Tag Processor when reaching the end of the document
   inside an incomplete syntax element.

 - Incorporates linting changes from "TODO:" to "todo".

 - WordPress/wordpress-develop#5762
   Handles the "all other tags" rules in IN BODY insertion mode.

 - WordPress/wordpress-develop#5539
   Adds support for list elements in the HTML Processor.

This patch adds the blanket exclusion from the HTML API compatability
layer after they were removed and started blocking updates from Core.

The PHP files in the compatability layer are merged and maintained in
the Core repo and all changes or updates need to happen first in Core
and then be brought over to Gutenberg as built files. From Gutenberg's
perspective they are no different than NPM packages.

Co-authored-by: Anton Vlasenko <43744263+anton-vlasenko@users.noreply.github.com>
Co-authored-by: Bernie Reiter <96308+ockham@users.noreply.github.com>
---
 ...class-gutenberg-html-open-elements-6-5.php |  462 +++++
 .../class-gutenberg-html-processor-6-5.php    | 1745 +++++++++++++++++
 ...ass-gutenberg-html-processor-state-6-5.php |  143 ++
 ...class-gutenberg-html-tag-processor-6-5.php |  509 ++++-
 lib/load.php                                  |    3 +
 phpcs.xml.dist                                |    5 +
 6 files changed, 2771 insertions(+), 96 deletions(-)
 create mode 100644 lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php
 create mode 100644 lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php
 create mode 100644 lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php

diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php
new file mode 100644
index 0000000000000..0d8901225c792
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php
@@ -0,0 +1,462 @@
+<?php
+/**
+ * HTML API: WP_HTML_Open_Elements class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the stack of open elements.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * > Initially, the stack of open elements is empty. The stack grows
+ * > downwards; the topmost node on the stack is the first one added
+ * > to the stack, and the bottommost node of the stack is the most
+ * > recently added node in the stack (notwithstanding when the stack
+ * > is manipulated in a random access fashion as part of the handling
+ * > for misnested tags).
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see https://html.spec.whatwg.org/#stack-of-open-elements
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Open_Elements_6_5 {
+	/**
+	 * Holds the stack of open element references.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token[]
+	 */
+	public $stack = array();
+
+	/**
+	 * Whether a P element is in button scope currently.
+	 *
+	 * This class optimizes scope lookup by pre-calculating
+	 * this value when elements are added and removed to the
+	 * stack of open elements which might change its value.
+	 * This avoids frequent iteration over the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var bool
+	 */
+	private $has_p_in_button_scope = false;
+
+	/**
+	 * Reports if a specific node is in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token Look for this node in the stack.
+	 * @return bool Whether the referenced node is in the stack of open elements.
+	 */
+	public function contains_node( $token ) {
+		foreach ( $this->walk_up() as $item ) {
+			if ( $token->bookmark_name === $item->bookmark_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns how many nodes are currently in the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return int How many node are in the stack of open elements.
+	 */
+	public function count() {
+		return count( $this->stack );
+	}
+
+	/**
+	 * Returns the node at the end of the stack of open elements,
+	 * if one exists. If the stack is empty, returns null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return WP_HTML_Token|null Last node in the stack of open elements, if one exists, otherwise null.
+	 */
+	public function current_node() {
+		$current_node = end( $this->stack );
+
+		return $current_node ? $current_node : null;
+	}
+
+	/**
+	 * Returns whether an element is in a specific scope.
+	 *
+	 * ## HTML Support
+	 *
+	 * This function skips checking for the termination list because there
+	 * are no supported elements which appear in the termination list.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-the-specific-scope
+	 *
+	 * @param string   $tag_name         Name of tag check.
+	 * @param string[] $termination_list List of elements that terminate the search.
+	 * @return bool Whether the element was found in a specific scope.
+	 */
+	public function has_element_in_specific_scope( $tag_name, $termination_list ) {
+		foreach ( $this->walk_up() as $node ) {
+			if ( $node->node_name === $tag_name ) {
+				return true;
+			}
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $node->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			switch ( $node->node_name ) {
+				case 'HTML':
+					return false;
+			}
+
+			if ( in_array( $node->node_name, $termination_list, true ) ) {
+				return false;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Returns whether a particular element is in scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+
+				/*
+				 * Because it's not currently possible to encounter
+				 * one of the termination elements, they don't need
+				 * to be listed here. If they were, they would be
+				 * unreachable and only waste CPU cycles while
+				 * scanning through HTML.
+				 */
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in list item scope.
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Implemented: no longer throws on every invocation.
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-list-item-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_list_item_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope(
+			$tag_name,
+			array(
+				// There are more elements that belong here which aren't currently supported.
+				'OL',
+				'UL',
+			)
+		);
+	}
+
+	/**
+	 * Returns whether a particular element is in button scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_button_scope( $tag_name ) {
+		return $this->has_element_in_specific_scope( $tag_name, array( 'BUTTON' ) );
+	}
+
+	/**
+	 * Returns whether a particular element is in table scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-table-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_table_scope( $tag_name ) {
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on table scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a particular element is in select scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-select-scope
+	 *
+	 * @throws WP_HTML_Unsupported_Exception Always until this function is implemented.
+	 *
+	 * @param string $tag_name Name of tag to check.
+	 * @return bool Whether given element is in scope.
+	 */
+	public function has_element_in_select_scope( $tag_name ) {
+		throw new WP_HTML_Unsupported_Exception( 'Cannot process elements depending on select scope.' );
+
+		return false; // The linter requires this unreachable code until the function is implemented and can return.
+	}
+
+	/**
+	 * Returns whether a P is in BUTTON scope.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#has-an-element-in-button-scope
+	 *
+	 * @return bool Whether a P is in BUTTON scope.
+	 */
+	public function has_p_in_button_scope() {
+		return $this->has_p_in_button_scope;
+	}
+
+	/**
+	 * Pops a node off of the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @return bool Whether a node was popped off of the stack.
+	 */
+	public function pop() {
+		$item = array_pop( $this->stack );
+
+		if ( null === $item ) {
+			return false;
+		}
+
+		$this->after_element_pop( $item );
+		return true;
+	}
+
+	/**
+	 * Pops nodes off of the stack of open elements until one with the given tag name has been popped.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Open_Elements::pop
+	 *
+	 * @param string $tag_name Name of tag that needs to be popped off of the stack of open elements.
+	 * @return bool Whether a tag of the given name was found and popped off of the stack of open elements.
+	 */
+	public function pop_until( $tag_name ) {
+		foreach ( $this->walk_up() as $item ) {
+			$this->pop();
+
+			if (
+				'(internal: H1 through H6 - do not use)' === $tag_name &&
+				in_array( $item->node_name, array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ), true )
+			) {
+				return true;
+			}
+
+			if ( $tag_name === $item->node_name ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Pushes a node onto the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @param WP_HTML_Token $stack_item Item to add onto stack.
+	 */
+	public function push( $stack_item ) {
+		$this->stack[] = $stack_item;
+		$this->after_element_push( $stack_item );
+	}
+
+	/**
+	 * Removes a specific node from the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $token The node to remove from the stack of open elements.
+	 * @return bool Whether the node was found and removed from the stack of open elements.
+	 */
+	public function remove_node( $token ) {
+		foreach ( $this->walk_up() as $position_from_end => $item ) {
+			if ( $token->bookmark_name !== $item->bookmark_name ) {
+				continue;
+			}
+
+			$position_from_start = $this->count() - $position_from_end - 1;
+			array_splice( $this->stack, $position_from_start, 1 );
+			$this->after_element_pop( $item );
+			return true;
+		}
+
+		return false;
+	}
+
+
+	/**
+	 * Steps through the stack of open elements, starting with the top element
+	 * (added first) and walking downwards to the one added last.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_down() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > EM -> STRONG -> A ->
+	 *
+	 * To start with the most-recently added element and walk towards the top,
+	 * see WP_HTML_Open_Elements::walk_up().
+	 *
+	 * @since 6.4.0
+	 */
+	public function walk_down() {
+		$count = count( $this->stack );
+
+		for ( $i = 0; $i < $count; $i++ ) {
+			yield $this->stack[ $i ];
+		}
+	}
+
+	/**
+	 * Steps through the stack of open elements, starting with the bottom element
+	 * (added last) and walking upwards to the one added first.
+	 *
+	 * This generator function is designed to be used inside a "foreach" loop.
+	 *
+	 * Example:
+	 *
+	 *     $html = '<em><strong><a>We are here';
+	 *     foreach ( $stack->walk_up() as $node ) {
+	 *         echo "{$node->node_name} -> ";
+	 *     }
+	 *     > A -> STRONG -> EM ->
+	 *
+	 * To start with the first added element and walk towards the bottom,
+	 * see WP_HTML_Open_Elements::walk_down().
+	 *
+	 * @since 6.4.0
+	 * @since 6.5.0 Accepts $above_this_node to start traversal above a given node, if it exists.
+	 *
+	 * @param ?WP_HTML_Token $above_this_node Start traversing above this node, if provided and if the node exists.
+	 */
+	public function walk_up( $above_this_node = null ) {
+		$has_found_node = null === $above_this_node;
+
+		for ( $i = count( $this->stack ) - 1; $i >= 0; $i-- ) {
+			$node = $this->stack[ $i ];
+
+			if ( ! $has_found_node ) {
+				$has_found_node = $node === $above_this_node;
+				continue;
+			}
+
+			yield $node;
+		}
+	}
+
+	/*
+	 * Internal helpers.
+	 */
+
+	/**
+	 * Updates internal flags after adding an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was added to the stack of open elements.
+	 */
+	public function after_element_push( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = false;
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = true;
+				break;
+		}
+	}
+
+	/**
+	 * Updates internal flags after removing an element.
+	 *
+	 * Certain conditions (such as "has_p_in_button_scope") are maintained here as
+	 * flags that are only modified when adding and removing elements. This allows
+	 * the HTML Processor to quickly check for these conditions instead of iterating
+	 * over the open stack elements upon each new tag it encounters. These flags,
+	 * however, need to be maintained as items are added and removed from the stack.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param WP_HTML_Token $item Element that was removed from the stack of open elements.
+	 */
+	public function after_element_pop( $item ) {
+		/*
+		 * When adding support for new elements, expand this switch to trap
+		 * cases where the precalculated value needs to change.
+		 */
+		switch ( $item->node_name ) {
+			case 'BUTTON':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+
+			case 'P':
+				$this->has_p_in_button_scope = $this->has_element_in_button_scope( 'P' );
+				break;
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php
new file mode 100644
index 0000000000000..eae2b1eda815c
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php
@@ -0,0 +1,1745 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used to safely parse and modify an HTML document.
+ *
+ * The HTML Processor class properly parses and modifies HTML5 documents.
+ *
+ * It supports a subset of the HTML5 specification, and when it encounters
+ * unsupported markup, it aborts early to avoid unintentionally breaking
+ * the document. The HTML Processor should never break an HTML document.
+ *
+ * While the `WP_HTML_Tag_Processor` is a valuable tool for modifying
+ * attributes on individual HTML tags, the HTML Processor is more capable
+ * and useful for the following operations:
+ *
+ *  - Querying based on nested HTML structure.
+ *
+ * Eventually the HTML Processor will also support:
+ *  - Wrapping a tag in surrounding HTML.
+ *  - Unwrapping a tag by removing its parent.
+ *  - Inserting and removing nodes.
+ *  - Reading and changing inner content.
+ *  - Navigating up or around HTML structure.
+ *
+ * ## Usage
+ *
+ * Use of this class requires three steps:
+ *
+ *   1. Call a static creator method with your input HTML document.
+ *   2. Find the location in the document you are looking for.
+ *   3. Request changes to the document at that location.
+ *
+ * Example:
+ *
+ *     $processor = WP_HTML_Processor::create_fragment( $html );
+ *     if ( $processor->next_tag( array( 'breadcrumbs' => array( 'DIV', 'FIGURE', 'IMG' ) ) ) ) {
+ *         $processor->add_class( 'responsive-image' );
+ *     }
+ *
+ * #### Breadcrumbs
+ *
+ * Breadcrumbs represent the stack of open elements from the root
+ * of the document or fragment down to the currently-matched node,
+ * if one is currently selected. Call WP_HTML_Processor::get_breadcrumbs()
+ * to inspect the breadcrumbs for a matched tag.
+ *
+ * Breadcrumbs can specify nested HTML structure and are equivalent
+ * to a CSS selector comprising tag names separated by the child
+ * combinator, such as "DIV > FIGURE > IMG".
+ *
+ * Since all elements find themselves inside a full HTML document
+ * when parsed, the return value from `get_breadcrumbs()` will always
+ * contain any implicit outermost elements. For example, when parsing
+ * with `create_fragment()` in the `BODY` context (the default), any
+ * tag in the given HTML document will contain `array( 'HTML', 'BODY', … )`
+ * in its breadcrumbs.
+ *
+ * Despite containing the implied outermost elements in their breadcrumbs,
+ * tags may be found with the shortest-matching breadcrumb query. That is,
+ * `array( 'IMG' )` matches all IMG elements and `array( 'P', 'IMG' )`
+ * matches all IMG elements directly inside a P element. To ensure that no
+ * partial matches erroneously match it's possible to specify in a query
+ * the full breadcrumb match all the way down from the root HTML element.
+ *
+ * Example:
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //               ----- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'IMG' ) ) );
+ *
+ *     $html = '<figure><img><figcaption>A <em>lovely</em> day outside</figcaption></figure>';
+ *     //                                  ---- Matches here.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'FIGURE', 'FIGCAPTION', 'EM' ) ) );
+ *
+ *     $html = '<div><img></div><img>';
+ *     //                       ----- Matches here, because IMG must be a direct child of the implicit BODY.
+ *     $processor->next_tag( array( 'breadcrumbs' => array( 'BODY', 'IMG' ) ) );
+ *
+ * ## HTML Support
+ *
+ * This class implements a small part of the HTML5 specification.
+ * It's designed to operate within its support and abort early whenever
+ * encountering circumstances it can't properly handle. This is
+ * the principle way in which this class remains as simple as possible
+ * without cutting corners and breaking compliance.
+ *
+ * ### Supported elements
+ *
+ * If any unsupported element appears in the HTML input the HTML Processor
+ * will abort early and stop all processing. This draconian measure ensures
+ * that the HTML Processor won't break any HTML it doesn't fully understand.
+ *
+ * The following list specifies the HTML tags that _are_ supported:
+ *
+ *  - Containers: ADDRESS, BLOCKQUOTE, DETAILS, DIALOG, DIV, FOOTER, HEADER, MAIN, MENU, SPAN, SUMMARY.
+ *  - Custom elements: All custom elements are supported. :)
+ *  - Form elements: BUTTON, DATALIST, FIELDSET, LABEL, LEGEND, METER, PROGRESS, SEARCH.
+ *  - Formatting elements: B, BIG, CODE, EM, FONT, I, SMALL, STRIKE, STRONG, TT, U.
+ *  - Heading elements: H1, H2, H3, H4, H5, H6, HGROUP.
+ *  - Links: A.
+ *  - Lists: DD, DL, DT, LI, OL, LI.
+ *  - Media elements: AUDIO, CANVAS, FIGCAPTION, FIGURE, IMG, MAP, PICTURE, VIDEO.
+ *  - Paragraph: P.
+ *  - Phrasing elements: ABBR, BDI, BDO, CITE, DATA, DEL, DFN, INS, MARK, OUTPUT, Q, SAMP, SUB, SUP, TIME, VAR.
+ *  - Sectioning elements: ARTICLE, ASIDE, NAV, SECTION.
+ *  - Templating elements: SLOT.
+ *  - Text decoration: RUBY.
+ *  - Deprecated elements: ACRONYM, BLINK, CENTER, DIR, ISINDEX, MULTICOL, NEXTID, SPACER.
+ *
+ * ### Supported markup
+ *
+ * Some kinds of non-normative HTML involve reconstruction of formatting elements and
+ * re-parenting of mis-nested elements. For example, a DIV tag found inside a TABLE
+ * may in fact belong _before_ the table in the DOM. If the HTML Processor encounters
+ * such a case it will stop processing.
+ *
+ * The following list specifies HTML markup that _is_ supported:
+ *
+ *  - Markup involving only those tags listed above.
+ *  - Fully-balanced and non-overlapping tags.
+ *  - HTML with unexpected tag closers.
+ *  - Some unbalanced or overlapping tags.
+ *  - P tags after unclosed P tags.
+ *  - BUTTON tags after unclosed BUTTON tags.
+ *  - A tags after unclosed A tags that don't involve any active formatting elements.
+ *
+ * @since 6.4.0
+ *
+ * @see WP_HTML_Tag_Processor
+ * @see https://html.spec.whatwg.org/
+ */
+class Gutenberg_HTML_Processor_6_5 extends Gutenberg_HTML_Tag_Processor_6_5 {
+	/**
+	 * The maximum number of bookmarks allowed to exist at any given time.
+	 *
+	 * HTML processing requires more bookmarks than basic tag processing,
+	 * so this class constant from the Tag Processor is overwritten.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var int
+	 */
+	const MAX_BOOKMARKS = 100;
+
+	/**
+	 * Static query for instructing the Tag Processor to visit every token.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var array
+	 */
+	const VISIT_EVERYTHING = array( 'tag_closers' => 'visit' );
+
+	/**
+	 * Holds the working state of the parser, including the stack of
+	 * open elements and the stack of active formatting elements.
+	 *
+	 * Initialized in the constructor.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Processor_State
+	 */
+	private $state = null;
+
+	/**
+	 * Used to create unique bookmark names.
+	 *
+	 * This class sets a bookmark for every tag in the HTML document that it encounters.
+	 * The bookmark name is auto-generated and increments, starting with `1`. These are
+	 * internal bookmarks and are automatically released when the referring WP_HTML_Token
+	 * goes out of scope and is garbage-collected.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::$release_internal_bookmark_on_destruct
+	 *
+	 * @var int
+	 */
+	private $bookmark_counter = 0;
+
+	/**
+	 * Stores an explanation for why something failed, if it did.
+	 *
+	 * @see self::get_last_error
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string|null
+	 */
+	private $last_error = null;
+
+	/**
+	 * Releases a bookmark when PHP garbage-collects its wrapping WP_HTML_Token instance.
+	 *
+	 * This function is created inside the class constructor so that it can be passed to
+	 * the stack of open elements and the stack of active formatting elements without
+	 * exposing it as a public method on the class.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var closure
+	 */
+	private $release_internal_bookmark_on_destruct = null;
+
+	/*
+	 * Public Interface Functions
+	 */
+
+	/**
+	 * Creates an HTML processor in the fragment parsing mode.
+	 *
+	 * Use this for cases where you are processing chunks of HTML that
+	 * will be found within a bigger HTML document, such as rendered
+	 * block output that exists within a post, `the_content` inside a
+	 * rendered site layout.
+	 *
+	 * Fragment parsing occurs within a context, which is an HTML element
+	 * that the document will eventually be placed in. It becomes important
+	 * when special elements have different rules than others, such as inside
+	 * a TEXTAREA or a TITLE tag where things that look like tags are text,
+	 * or inside a SCRIPT tag where things that look like HTML syntax are JS.
+	 *
+	 * The context value should be a representation of the tag into which the
+	 * HTML is found. For most cases this will be the body element. The HTML
+	 * form is provided because a context element may have attributes that
+	 * impact the parse, such as with a SCRIPT tag and its `type` attribute.
+	 *
+	 * ## Current HTML Support
+	 *
+	 *  - The only supported context is `<body>`, which is the default value.
+	 *  - The only supported document encoding is `UTF-8`, which is the default value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $html     Input HTML fragment to process.
+	 * @param string $context  Context element for the fragment, must be default of `<body>`.
+	 * @param string $encoding Text encoding of the document; must be default of 'UTF-8'.
+	 * @return WP_HTML_Processor|null The created processor if successful, otherwise null.
+	 */
+	public static function create_fragment( $html, $context = '<body>', $encoding = 'UTF-8' ) {
+		if ( '<body>' !== $context || 'UTF-8' !== $encoding ) {
+			return null;
+		}
+
+		$p                        = new self( $html, self::CONSTRUCTOR_UNLOCK_CODE );
+		$p->state->context_node   = array( 'BODY', array() );
+		$p->state->insertion_mode = WP_HTML_Processor_State::INSERTION_MODE_IN_BODY;
+
+		// @todo Create "fake" bookmarks for non-existent but implied nodes.
+		$p->bookmarks['root-node']    = new WP_HTML_Span( 0, 0 );
+		$p->bookmarks['context-node'] = new WP_HTML_Span( 0, 0 );
+
+		$p->state->stack_of_open_elements->push(
+			new WP_HTML_Token(
+				'root-node',
+				'HTML',
+				false
+			)
+		);
+
+		$p->state->stack_of_open_elements->push(
+			new WP_HTML_Token(
+				'context-node',
+				$p->state->context_node[0],
+				false
+			)
+		);
+
+		return $p;
+	}
+
+	/**
+	 * Constructor.
+	 *
+	 * Do not use this method. Use the static creator methods instead.
+	 *
+	 * @access private
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::create_fragment()
+	 *
+	 * @param string      $html                                  HTML to process.
+	 * @param string|null $use_the_static_create_methods_instead This constructor should not be called manually.
+	 */
+	public function __construct( $html, $use_the_static_create_methods_instead = null ) {
+		parent::__construct( $html );
+
+		if ( self::CONSTRUCTOR_UNLOCK_CODE !== $use_the_static_create_methods_instead ) {
+			_doing_it_wrong(
+				__METHOD__,
+				sprintf(
+					/* translators: %s: WP_HTML_Processor::create_fragment(). */
+					__( 'Call %s to create an HTML Processor instead of calling the constructor directly.' ),
+					'<code>WP_HTML_Processor::create_fragment()</code>'
+				),
+				'6.4.0'
+			);
+		}
+
+		$this->state = new Gutenberg_HTML_Processor_State_6_5();
+
+		/*
+		 * Create this wrapper so that it's possible to pass
+		 * a private method into WP_HTML_Token classes without
+		 * exposing it to any public API.
+		 */
+		$this->release_internal_bookmark_on_destruct = function ( $name ) {
+			parent::release_bookmark( $name );
+		};
+	}
+
+	/**
+	 * Returns the last error, if any.
+	 *
+	 * Various situations lead to parsing failure but this class will
+	 * return `false` in all those cases. To determine why something
+	 * failed it's possible to request the last error. This can be
+	 * helpful to know to distinguish whether a given tag couldn't
+	 * be found or if content in the document caused the processor
+	 * to give up and abort processing.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<template><strong><button><em><p><em>' );
+	 *     false === $processor->next_tag();
+	 *     WP_HTML_Processor::ERROR_UNSUPPORTED === $processor->get_last_error();
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see self::ERROR_UNSUPPORTED
+	 * @see self::ERROR_EXCEEDED_MAX_BOOKMARKS
+	 *
+	 * @return string|null The last error, if one exists, otherwise null.
+	 */
+	public function get_last_error() {
+		return $this->last_error;
+	}
+
+	/**
+	 * Finds the next tag matching the $query.
+	 *
+	 * @todo Support matching the class name and tag name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @param array|string|null $query {
+	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
+	 *
+	 *     @type string|null $tag_name     Which tag to find, or `null` for "any tag."
+	 *     @type int|null    $match_offset Find the Nth tag matching all search criteria.
+	 *                                     1 for "first" tag, 3 for "third," etc.
+	 *                                     Defaults to first tag.
+	 *     @type string|null $class_name   Tag must contain this whole class name to match.
+	 *     @type string[]    $breadcrumbs  DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                                     May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * }
+	 * @return bool Whether a tag was matched.
+	 */
+	public function next_tag( $query = null ) {
+		if ( null === $query ) {
+			while ( $this->step() ) {
+				if ( ! $this->is_tag_closer() ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( is_string( $query ) ) {
+			$query = array( 'breadcrumbs' => array( $query ) );
+		}
+
+		if ( ! is_array( $query ) ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Please pass a query array to this function.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		if ( ! ( array_key_exists( 'breadcrumbs', $query ) && is_array( $query['breadcrumbs'] ) ) ) {
+			while ( $this->step() ) {
+				if ( ! $this->is_tag_closer() ) {
+					return true;
+				}
+			}
+
+			return false;
+		}
+
+		if ( isset( $query['tag_closers'] ) && 'visit' === $query['tag_closers'] ) {
+			_doing_it_wrong(
+				__METHOD__,
+				__( 'Cannot visit tag closers in HTML Processor.' ),
+				'6.4.0'
+			);
+			return false;
+		}
+
+		$breadcrumbs  = $query['breadcrumbs'];
+		$match_offset = isset( $query['match_offset'] ) ? (int) $query['match_offset'] : 1;
+
+		while ( $match_offset > 0 && $this->step() ) {
+			if ( $this->matches_breadcrumbs( $breadcrumbs ) && 0 === --$match_offset ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Indicates if the currently-matched tag matches the given breadcrumbs.
+	 *
+	 * A "*" represents a single tag wildcard, where any tag matches, but not no tags.
+	 *
+	 * At some point this function _may_ support a `**` syntax for matching any number
+	 * of unspecified tags in the breadcrumb stack. This has been intentionally left
+	 * out, however, to keep this function simple and to avoid introducing backtracking,
+	 * which could open up surprising performance breakdowns.
+	 *
+	 * Example:
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<div><span><figure><img></figure></span></div>' );
+	 *     $processor->next_tag( 'img' );
+	 *     true  === $processor->matches_breadcrumbs( array( 'figure', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', 'figure', 'img' ) );
+	 *     false === $processor->matches_breadcrumbs( array( 'span', 'img' ) );
+	 *     true  === $processor->matches_breadcrumbs( array( 'span', '*', 'img' ) );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string[] $breadcrumbs DOM sub-path at which element is found, e.g. `array( 'FIGURE', 'IMG' )`.
+	 *                              May also contain the wildcard `*` which matches a single element, e.g. `array( 'SECTION', '*' )`.
+	 * @return bool Whether the currently-matched tag is found at the given nested structure.
+	 */
+	public function matches_breadcrumbs( $breadcrumbs ) {
+		if ( ! $this->get_tag() ) {
+			return false;
+		}
+
+		// Everything matches when there are zero constraints.
+		if ( 0 === count( $breadcrumbs ) ) {
+			return true;
+		}
+
+		// Start at the last crumb.
+		$crumb = end( $breadcrumbs );
+
+		if ( '*' !== $crumb && $this->get_tag() !== strtoupper( $crumb ) ) {
+			return false;
+		}
+
+		foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+			$crumb = strtoupper( current( $breadcrumbs ) );
+
+			if ( '*' !== $crumb && $node->node_name !== $crumb ) {
+				return false;
+			}
+
+			if ( false === prev( $breadcrumbs ) ) {
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	/**
+	 * Steps through the HTML document and stop at the next tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @see self::PROCESS_NEXT_NODE
+	 * @see self::REPROCESS_CURRENT_NODE
+	 *
+	 * @param string $node_to_process Whether to parse the next node or reprocess the current node.
+	 * @return bool Whether a tag was matched.
+	 */
+	public function step( $node_to_process = self::PROCESS_NEXT_NODE ) {
+		// Refuse to proceed if there was a previous error.
+		if ( null !== $this->last_error ) {
+			return false;
+		}
+
+		if ( self::PROCESS_NEXT_NODE === $node_to_process ) {
+			/*
+			 * Void elements still hop onto the stack of open elements even though
+			 * there's no corresponding closing tag. This is important for managing
+			 * stack-based operations such as "navigate to parent node" or checking
+			 * on an element's breadcrumbs.
+			 *
+			 * When moving on to the next node, therefore, if the bottom-most element
+			 * on the stack is a void element, it must be closed.
+			 *
+			 * @todo Once self-closing foreign elements and BGSOUND are supported,
+			 *        they must also be implicitly closed here too. BGSOUND is
+			 *        special since it's only self-closing if the self-closing flag
+			 *        is provided in the opening tag, otherwise it expects a tag closer.
+			 */
+			$top_node = $this->state->stack_of_open_elements->current_node();
+			if ( $top_node && self::is_void( $top_node->node_name ) ) {
+				$this->state->stack_of_open_elements->pop();
+			}
+
+			parent::next_tag( self::VISIT_EVERYTHING );
+		}
+
+		// Finish stepping when there are no more tokens in the document.
+		if ( null === $this->get_tag() ) {
+			return false;
+		}
+
+		$this->state->current_token = new WP_HTML_Token(
+			$this->bookmark_tag(),
+			$this->get_tag(),
+			$this->is_tag_closer(),
+			$this->release_internal_bookmark_on_destruct
+		);
+
+		try {
+			switch ( $this->state->insertion_mode ) {
+				case WP_HTML_Processor_State::INSERTION_MODE_IN_BODY:
+					return $this->step_in_body();
+
+				default:
+					$this->last_error = self::ERROR_UNSUPPORTED;
+					throw new WP_HTML_Unsupported_Exception( "No support for parsing in the '{$this->state->insertion_mode}' state." );
+			}
+		} catch ( WP_HTML_Unsupported_Exception $e ) {
+			/*
+			 * Exceptions are used in this class to escape deep call stacks that
+			 * otherwise might involve messier calling and return conventions.
+			 */
+			return false;
+		}
+	}
+
+	/**
+	 * Computes the HTML breadcrumbs for the currently-matched node, if matched.
+	 *
+	 * Breadcrumbs start at the outermost parent and descend toward the matched element.
+	 * They always include the entire path from the root HTML node to the matched element.
+	 *
+	 * @todo It could be more efficient to expose a generator-based version of this function
+	 *       to avoid creating the array copy on tag iteration. If this is done, it would likely
+	 *       be more useful to walk up the stack when yielding instead of starting at the top.
+	 *
+	 * Example
+	 *
+	 *     $processor = WP_HTML_Processor::create_fragment( '<p><strong><em><img></em></strong></p>' );
+	 *     $processor->next_tag( 'IMG' );
+	 *     $processor->get_breadcrumbs() === array( 'HTML', 'BODY', 'P', 'STRONG', 'EM', 'IMG' );
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string[]|null Array of tag names representing path to matched node, if matched, otherwise NULL.
+	 */
+	public function get_breadcrumbs() {
+		if ( ! $this->get_tag() ) {
+			return null;
+		}
+
+		$breadcrumbs = array();
+		foreach ( $this->state->stack_of_open_elements->walk_down() as $stack_item ) {
+			$breadcrumbs[] = $stack_item->node_name;
+		}
+
+		return $breadcrumbs;
+	}
+
+	/**
+	 * Parses next element in the 'in body' insertion mode.
+	 *
+	 * This internal function performs the 'in body' insertion mode
+	 * logic for the generalized WP_HTML_Processor::step() function.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor::step
+	 *
+	 * @return bool Whether an element was found.
+	 */
+	private function step_in_body() {
+		$tag_name = $this->get_tag();
+		$op_sigil = $this->is_tag_closer() ? '-' : '+';
+		$op       = "{$op_sigil}{$tag_name}";
+
+		switch ( $op ) {
+			/*
+			 * > A start tag whose tag name is "button"
+			 */
+			case '+BUTTON':
+				if ( $this->state->stack_of_open_elements->has_element_in_scope( 'BUTTON' ) ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					$this->generate_implied_end_tags();
+					$this->state->stack_of_open_elements->pop_until( 'BUTTON' );
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->frameset_ok = false;
+
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "address", "article", "aside",
+			 * > "blockquote", "center", "details", "dialog", "dir", "div", "dl",
+			 * > "fieldset", "figcaption", "figure", "footer", "header", "hgroup",
+			 * > "main", "menu", "nav", "ol", "p", "search", "section", "summary", "ul"
+			 */
+			case '+ADDRESS':
+			case '+ARTICLE':
+			case '+ASIDE':
+			case '+BLOCKQUOTE':
+			case '+CENTER':
+			case '+DETAILS':
+			case '+DIALOG':
+			case '+DIR':
+			case '+DIV':
+			case '+DL':
+			case '+FIELDSET':
+			case '+FIGCAPTION':
+			case '+FIGURE':
+			case '+FOOTER':
+			case '+HEADER':
+			case '+HGROUP':
+			case '+MAIN':
+			case '+MENU':
+			case '+NAV':
+			case '+OL':
+			case '+P':
+			case '+SEARCH':
+			case '+SECTION':
+			case '+SUMMARY':
+			case '+UL':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "address", "article", "aside", "blockquote",
+			 * > "button", "center", "details", "dialog", "dir", "div", "dl", "fieldset",
+			 * > "figcaption", "figure", "footer", "header", "hgroup", "listing", "main",
+			 * > "menu", "nav", "ol", "pre", "search", "section", "summary", "ul"
+			 */
+			case '-ADDRESS':
+			case '-ARTICLE':
+			case '-ASIDE':
+			case '-BLOCKQUOTE':
+			case '-BUTTON':
+			case '-CENTER':
+			case '-DETAILS':
+			case '-DIALOG':
+			case '-DIR':
+			case '-DIV':
+			case '-DL':
+			case '-FIELDSET':
+			case '-FIGCAPTION':
+			case '-FIGURE':
+			case '-FOOTER':
+			case '-HEADER':
+			case '-HGROUP':
+			case '-MAIN':
+			case '-MENU':
+			case '-NAV':
+			case '-OL':
+			case '-SEARCH':
+			case '-SECTION':
+			case '-SUMMARY':
+			case '-UL':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $tag_name ) ) {
+					// @todo Report parse error.
+					// Ignore the token.
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $tag_name ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+				$this->state->stack_of_open_elements->pop_until( $tag_name );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '+H1':
+			case '+H2':
+			case '+H3':
+			case '+H4':
+			case '+H5':
+			case '+H6':
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				if (
+					in_array(
+						$this->state->stack_of_open_elements->current_node()->node_name,
+						array( 'H1', 'H2', 'H3', 'H4', 'H5', 'H6' ),
+						true
+					)
+				) {
+					// @todo Indicate a parse error once it's possible.
+					$this->state->stack_of_open_elements->pop();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "h1", "h2", "h3", "h4", "h5", "h6"
+			 */
+			case '-H1':
+			case '-H2':
+			case '-H3':
+			case '-H4':
+			case '-H5':
+			case '-H6':
+				if ( ! $this->state->stack_of_open_elements->has_element_in_scope( '(internal: H1 through H6 - do not use)' ) ) {
+					/*
+					 * This is a parse error; ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags();
+
+				if ( $this->state->stack_of_open_elements->current_node()->node_name !== $tag_name ) {
+					// @todo Record parse error: this error doesn't impact parsing.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( '(internal: H1 through H6 - do not use)' );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is "li"
+			 * > A start tag whose tag name is one of: "dd", "dt"
+			 */
+			case '+DD':
+			case '+DT':
+			case '+LI':
+				$this->state->frameset_ok = false;
+				$node                     = $this->state->stack_of_open_elements->current_node();
+				$is_li                    = 'LI' === $tag_name;
+
+				in_body_list_loop:
+				/*
+				 * The logic for LI and DT/DD is the same except for one point: LI elements _only_
+				 * close other LI elements, but a DT or DD element closes _any_ open DT or DD element.
+				 */
+				if ( $is_li ? 'LI' === $node->node_name : ( 'DD' === $node->node_name || 'DT' === $node->node_name ) ) {
+					$node_name = $is_li ? 'LI' : $node->node_name;
+					$this->generate_implied_end_tags( $node_name );
+					if ( $node_name !== $this->state->stack_of_open_elements->current_node()->node_name ) {
+						// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+					}
+
+					$this->state->stack_of_open_elements->pop_until( $node_name );
+					goto in_body_list_done;
+				}
+
+				if (
+					'ADDRESS' !== $node->node_name &&
+					'DIV' !== $node->node_name &&
+					'P' !== $node->node_name &&
+					$this->is_special( $node->node_name )
+				) {
+					/*
+					 * > If node is in the special category, but is not an address, div,
+					 * > or p element, then jump to the step labeled done below.
+					 */
+					goto in_body_list_done;
+				} else {
+					/*
+					 * > Otherwise, set node to the previous entry in the stack of open elements
+					 * > and return to the step labeled loop.
+					 */
+					foreach ( $this->state->stack_of_open_elements->walk_up( $node ) as $item ) {
+						$node = $item;
+						break;
+					}
+					goto in_body_list_loop;
+				}
+
+				in_body_list_done:
+				if ( $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->close_a_p_element();
+				}
+
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "li"
+			 * > An end tag whose tag name is one of: "dd", "dt"
+			 */
+			case '-DD':
+			case '-DT':
+			case '-LI':
+				if (
+					/*
+					 * An end tag whose tag name is "li":
+					 * If the stack of open elements does not have an li element in list item scope,
+					 * then this is a parse error; ignore the token.
+					 */
+					(
+						'LI' === $tag_name &&
+						! $this->state->stack_of_open_elements->has_element_in_list_item_scope( 'LI' )
+					) ||
+					/*
+					 * An end tag whose tag name is one of: "dd", "dt":
+					 * If the stack of open elements does not have an element in scope that is an
+					 * HTML element with the same tag name as that of the token, then this is a
+					 * parse error; ignore the token.
+					 */
+					(
+						'LI' !== $tag_name &&
+						! $this->state->stack_of_open_elements->has_element_in_scope( $tag_name )
+					)
+				) {
+					/*
+					 * This is a parse error, ignore the token.
+					 *
+					 * @todo Indicate a parse error once it's possible.
+					 */
+					return $this->step();
+				}
+
+				$this->generate_implied_end_tags( $tag_name );
+
+				if ( $tag_name !== $this->state->stack_of_open_elements->current_node()->node_name ) {
+					// @todo Indicate a parse error once it's possible. This error does not impact the logic here.
+				}
+
+				$this->state->stack_of_open_elements->pop_until( $tag_name );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is "p"
+			 */
+			case '-P':
+				if ( ! $this->state->stack_of_open_elements->has_p_in_button_scope() ) {
+					$this->insert_html_element( $this->state->current_token );
+				}
+
+				$this->close_a_p_element();
+				return true;
+
+			// > A start tag whose tag name is "a"
+			case '+A':
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					switch ( $item->node_name ) {
+						case 'marker':
+							break;
+
+						case 'A':
+							$this->run_adoption_agency_algorithm();
+							$this->state->active_formatting_elements->remove_node( $item );
+							$this->state->stack_of_open_elements->remove_node( $item );
+							break;
+					}
+				}
+
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "b", "big", "code", "em", "font", "i",
+			 * > "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '+B':
+			case '+BIG':
+			case '+CODE':
+			case '+EM':
+			case '+FONT':
+			case '+I':
+			case '+S':
+			case '+SMALL':
+			case '+STRIKE':
+			case '+STRONG':
+			case '+TT':
+			case '+U':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				$this->state->active_formatting_elements->push( $this->state->current_token );
+				return true;
+
+			/*
+			 * > An end tag whose tag name is one of: "a", "b", "big", "code", "em", "font", "i",
+			 * > "nobr", "s", "small", "strike", "strong", "tt", "u"
+			 */
+			case '-A':
+			case '-B':
+			case '-BIG':
+			case '-CODE':
+			case '-EM':
+			case '-FONT':
+			case '-I':
+			case '-S':
+			case '-SMALL':
+			case '-STRIKE':
+			case '-STRONG':
+			case '-TT':
+			case '-U':
+				$this->run_adoption_agency_algorithm();
+				return true;
+
+			/*
+			 * > A start tag whose tag name is one of: "area", "br", "embed", "img", "keygen", "wbr"
+			 */
+			case '+IMG':
+				$this->reconstruct_active_formatting_elements();
+				$this->insert_html_element( $this->state->current_token );
+				return true;
+		}
+
+		/*
+		 * These tags require special handling in the 'in body' insertion mode
+		 * but that handling hasn't yet been implemented.
+		 *
+		 * As the rules for each tag are implemented, the corresponding tag
+		 * name should be removed from this list. An accompanying test should
+		 * help ensure this list is maintained.
+		 *
+		 * @see Tests_HtmlApi_WpHtmlProcessor::test_step_in_body_fails_on_unsupported_tags
+		 *
+		 * Since this switch structure throws a WP_HTML_Unsupported_Exception, it's
+		 * possible to handle "any other start tag" and "any other end tag" below,
+		 * as that guarantees execution doesn't proceed for the unimplemented tags.
+		 *
+		 * @see https://html.spec.whatwg.org/multipage/parsing.html#parsing-main-inbody
+		 */
+		switch ( $tag_name ) {
+			case 'APPLET':
+			case 'AREA':
+			case 'BASE':
+			case 'BASEFONT':
+			case 'BGSOUND':
+			case 'BODY':
+			case 'BR':
+			case 'CAPTION':
+			case 'COL':
+			case 'COLGROUP':
+			case 'DD':
+			case 'DT':
+			case 'EMBED':
+			case 'FORM':
+			case 'FRAME':
+			case 'FRAMESET':
+			case 'HEAD':
+			case 'HR':
+			case 'HTML':
+			case 'IFRAME':
+			case 'INPUT':
+			case 'KEYGEN':
+			case 'LI':
+			case 'LINK':
+			case 'LISTING':
+			case 'MARQUEE':
+			case 'MATH':
+			case 'META':
+			case 'NOBR':
+			case 'NOEMBED':
+			case 'NOFRAMES':
+			case 'NOSCRIPT':
+			case 'OBJECT':
+			case 'OL':
+			case 'OPTGROUP':
+			case 'OPTION':
+			case 'PARAM':
+			case 'PLAINTEXT':
+			case 'PRE':
+			case 'RB':
+			case 'RP':
+			case 'RT':
+			case 'RTC':
+			case 'SARCASM':
+			case 'SCRIPT':
+			case 'SELECT':
+			case 'SOURCE':
+			case 'STYLE':
+			case 'SVG':
+			case 'TABLE':
+			case 'TBODY':
+			case 'TD':
+			case 'TEMPLATE':
+			case 'TEXTAREA':
+			case 'TFOOT':
+			case 'TH':
+			case 'THEAD':
+			case 'TITLE':
+			case 'TR':
+			case 'TRACK':
+			case 'UL':
+			case 'WBR':
+			case 'XMP':
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( "Cannot process {$tag_name} element." );
+		}
+
+		if ( ! $this->is_tag_closer() ) {
+			/*
+			 * > Any other start tag
+			 */
+			$this->reconstruct_active_formatting_elements();
+			$this->insert_html_element( $this->state->current_token );
+			return true;
+		} else {
+			/*
+			 * > Any other end tag
+			 */
+
+			/*
+			 * Find the corresponding tag opener in the stack of open elements, if
+			 * it exists before reaching a special element, which provides a kind
+			 * of boundary in the stack. For example, a `</custom-tag>` should not
+			 * close anything beyond its containing `P` or `DIV` element.
+			 */
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $node ) {
+				if ( $tag_name === $node->node_name ) {
+					break;
+				}
+
+				if ( self::is_special( $node->node_name ) ) {
+					// This is a parse error, ignore the token.
+					return $this->step();
+				}
+			}
+
+			$this->generate_implied_end_tags( $tag_name );
+			if ( $node !== $this->state->stack_of_open_elements->current_node() ) {
+				// @todo Record parse error: this error doesn't impact parsing.
+			}
+
+			foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+				$this->state->stack_of_open_elements->pop();
+				if ( $node === $item ) {
+					return true;
+				}
+			}
+		}
+	}
+
+	/*
+	 * Internal helpers
+	 */
+
+	/**
+	 * Creates a new bookmark for the currently-matched tag and returns the generated name.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws Exception When unable to allocate requested bookmark.
+	 *
+	 * @return string|false Name of created bookmark, or false if unable to create.
+	 */
+	private function bookmark_tag() {
+		if ( ! $this->get_tag() ) {
+			return false;
+		}
+
+		if ( ! parent::set_bookmark( ++$this->bookmark_counter ) ) {
+			$this->last_error = self::ERROR_EXCEEDED_MAX_BOOKMARKS;
+			throw new Exception( 'could not allocate bookmark' );
+		}
+
+		return "{$this->bookmark_counter}";
+	}
+
+	/*
+	 * HTML semantic overrides for Tag Processor
+	 */
+
+	/**
+	 * Returns the uppercase name of the matched tag.
+	 *
+	 * The semantic rules for HTML specify that certain tags be reprocessed
+	 * with a different tag name. Because of this, the tag name presented
+	 * by the HTML Processor may differ from the one reported by the HTML
+	 * Tag Processor, which doesn't apply these semantic rules.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<div class="test">Test</div>' );
+	 *     $processor->next_tag() === true;
+	 *     $processor->get_tag() === 'DIV';
+	 *
+	 *     $processor->next_tag() === false;
+	 *     $processor->get_tag() === null;
+	 *
+	 * @since 6.4.0
+	 *
+	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
+	 */
+	public function get_tag() {
+		if ( null !== $this->last_error ) {
+			return null;
+		}
+
+		$tag_name = parent::get_tag();
+
+		switch ( $tag_name ) {
+			case 'IMAGE':
+				/*
+				 * > A start tag whose tag name is "image"
+				 * > Change the token's tag name to "img" and reprocess it. (Don't ask.)
+				 */
+				return 'IMG';
+
+			default:
+				return $tag_name;
+		}
+	}
+
+	/**
+	 * Removes a bookmark that is no longer needed.
+	 *
+	 * Releasing a bookmark frees up the small
+	 * performance overhead it requires.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Name of the bookmark to remove.
+	 * @return bool Whether the bookmark already existed before removal.
+	 */
+	public function release_bookmark( $bookmark_name ) {
+		return parent::release_bookmark( "_{$bookmark_name}" );
+	}
+
+	/**
+	 * Moves the internal cursor in the HTML Processor to a given bookmark's location.
+	 *
+	 * In order to prevent accidental infinite loops, there's a
+	 * maximum limit on the number of times seek() can be called.
+	 *
+	 * @throws Exception When unable to allocate a bookmark for the next token in the input HTML document.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Jump to the place in the document identified by this bookmark name.
+	 * @return bool Whether the internal cursor was successfully moved to the bookmark's location.
+	 */
+	public function seek( $bookmark_name ) {
+		$actual_bookmark_name = "_{$bookmark_name}";
+		$processor_started_at = $this->state->current_token
+			? $this->bookmarks[ $this->state->current_token->bookmark_name ]->start
+			: 0;
+		$bookmark_starts_at   = $this->bookmarks[ $actual_bookmark_name ]->start;
+		$direction            = $bookmark_starts_at > $processor_started_at ? 'forward' : 'backward';
+
+		switch ( $direction ) {
+			case 'forward':
+				// When moving forwards, re-parse the document until reaching the same location as the original bookmark.
+				while ( $this->step() ) {
+					if ( $bookmark_starts_at === $this->bookmarks[ $this->state->current_token->bookmark_name ]->start ) {
+						return true;
+					}
+				}
+
+				return false;
+
+			case 'backward':
+				/*
+				 * When moving backwards, clear out all existing stack entries which appear after the destination
+				 * bookmark. These could be stored for later retrieval, but doing so would require additional
+				 * memory overhead and also demand that references and bookmarks are updated as the document
+				 * changes. In time this could be a valuable optimization, but it's okay to give up that
+				 * optimization in exchange for more CPU time to recompute the stack, to re-parse the
+				 * document that may have already been parsed once.
+				 */
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
+						break;
+					}
+
+					$this->state->stack_of_open_elements->remove_node( $item );
+				}
+
+				foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+					if ( $bookmark_starts_at >= $this->bookmarks[ $item->bookmark_name ]->start ) {
+						break;
+					}
+
+					$this->state->active_formatting_elements->remove_node( $item );
+				}
+
+				return parent::seek( $actual_bookmark_name );
+		}
+	}
+
+	/**
+	 * Sets a bookmark in the HTML document.
+	 *
+	 * Bookmarks represent specific places or tokens in the HTML
+	 * document, such as a tag opener or closer. When applying
+	 * edits to a document, such as setting an attribute, the
+	 * text offsets of that token may shift; the bookmark is
+	 * kept updated with those shifts and remains stable unless
+	 * the entire span of text in which the token sits is removed.
+	 *
+	 * Release bookmarks when they are no longer needed.
+	 *
+	 * Example:
+	 *
+	 *     <main><h2>Surprising fact you may not know!</h2></main>
+	 *           ^  ^
+	 *            \-|-- this `H2` opener bookmark tracks the token
+	 *
+	 *     <main class="clickbait"><h2>Surprising fact you may no…
+	 *                             ^  ^
+	 *                              \-|-- it shifts with edits
+	 *
+	 * Bookmarks provide the ability to seek to a previously-scanned
+	 * place in the HTML document. This avoids the need to re-scan
+	 * the entire document.
+	 *
+	 * Example:
+	 *
+	 *     <ul><li>One</li><li>Two</li><li>Three</li></ul>
+	 *                                 ^^^^
+	 *                                 want to note this last item
+	 *
+	 *     $p = new WP_HTML_Tag_Processor( $html );
+	 *     $in_list = false;
+	 *     while ( $p->next_tag( array( 'tag_closers' => $in_list ? 'visit' : 'skip' ) ) ) {
+	 *         if ( 'UL' === $p->get_tag() ) {
+	 *             if ( $p->is_tag_closer() ) {
+	 *                 $in_list = false;
+	 *                 $p->set_bookmark( 'resume' );
+	 *                 if ( $p->seek( 'last-li' ) ) {
+	 *                     $p->add_class( 'last-li' );
+	 *                 }
+	 *                 $p->seek( 'resume' );
+	 *                 $p->release_bookmark( 'last-li' );
+	 *                 $p->release_bookmark( 'resume' );
+	 *             } else {
+	 *                 $in_list = true;
+	 *             }
+	 *         }
+	 *
+	 *         if ( 'LI' === $p->get_tag() ) {
+	 *             $p->set_bookmark( 'last-li' );
+	 *         }
+	 *     }
+	 *
+	 * Bookmarks intentionally hide the internal string offsets
+	 * to which they refer. They are maintained internally as
+	 * updates are applied to the HTML document and therefore
+	 * retain their "position" - the location to which they
+	 * originally pointed. The inability to use bookmarks with
+	 * functions like `substr` is therefore intentional to guard
+	 * against accidentally breaking the HTML.
+	 *
+	 * Because bookmarks allocate memory and require processing
+	 * for every applied update, they are limited and require
+	 * a name. They should not be created with programmatically-made
+	 * names, such as "li_{$index}" with some loop. As a general
+	 * rule they should only be created with string-literal names
+	 * like "start-of-section" or "last-paragraph".
+	 *
+	 * Bookmarks are a powerful tool to enable complicated behavior.
+	 * Consider double-checking that you need this tool if you are
+	 * reaching for it, as inappropriate use could lead to broken
+	 * HTML structure or unwanted processing overhead.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @param string $bookmark_name Identifies this particular bookmark.
+	 * @return bool Whether the bookmark was successfully created.
+	 */
+	public function set_bookmark( $bookmark_name ) {
+		return parent::set_bookmark( "_{$bookmark_name}" );
+	}
+
+	/*
+	 * HTML Parsing Algorithms
+	 */
+
+	/**
+	 * Closes a P element.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#close-a-p-element
+	 */
+	private function close_a_p_element() {
+		$this->generate_implied_end_tags( 'P' );
+		$this->state->stack_of_open_elements->pop_until( 'P' );
+	}
+
+	/**
+	 * Closes elements that have implied end tags.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 *
+	 * @param string|null $except_for_this_element Perform as if this element doesn't exist in the stack of open elements.
+	 */
+	private function generate_implied_end_tags( $except_for_this_element = null ) {
+		$elements_with_implied_end_tags = array(
+			'DD',
+			'DT',
+			'LI',
+			'P',
+		);
+
+		$current_node = $this->state->stack_of_open_elements->current_node();
+		while (
+			$current_node && $current_node->node_name !== $except_for_this_element &&
+			in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true )
+		) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Closes elements that have implied end tags, thoroughly.
+	 *
+	 * See the HTML specification for an explanation why this is
+	 * different from generating end tags in the normal sense.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor::generate_implied_end_tags
+	 * @see https://html.spec.whatwg.org/#generate-implied-end-tags
+	 */
+	private function generate_implied_end_tags_thoroughly() {
+		$elements_with_implied_end_tags = array(
+			'DD',
+			'DT',
+			'LI',
+			'P',
+		);
+
+		while ( in_array( $this->state->stack_of_open_elements->current_node(), $elements_with_implied_end_tags, true ) ) {
+			$this->state->stack_of_open_elements->pop();
+		}
+	}
+
+	/**
+	 * Reconstructs the active formatting elements.
+	 *
+	 * > This has the effect of reopening all the formatting elements that were opened
+	 * > in the current body, cell, or caption (whichever is youngest) that haven't
+	 * > been explicitly closed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#reconstruct-the-active-formatting-elements
+	 *
+	 * @return bool Whether any formatting elements needed to be reconstructed.
+	 */
+	private function reconstruct_active_formatting_elements() {
+		/*
+		 * > If there are no entries in the list of active formatting elements, then there is nothing
+		 * > to reconstruct; stop this algorithm.
+		 */
+		if ( 0 === $this->state->active_formatting_elements->count() ) {
+			return false;
+		}
+
+		$last_entry = $this->state->active_formatting_elements->current_node();
+		if (
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is a marker;
+			 * > stop this algorithm.
+			 */
+			'marker' === $last_entry->node_name ||
+
+			/*
+			 * > If the last (most recently added) entry in the list of active formatting elements is an
+			 * > element that is in the stack of open elements, then there is nothing to reconstruct;
+			 * > stop this algorithm.
+			 */
+			$this->state->stack_of_open_elements->contains_node( $last_entry )
+		) {
+			return false;
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot reconstruct active formatting elements when advancing and rewinding is required.' );
+	}
+
+	/**
+	 * Runs the adoption agency algorithm.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @throws WP_HTML_Unsupported_Exception When encountering unsupported HTML input.
+	 *
+	 * @see https://html.spec.whatwg.org/#adoption-agency-algorithm
+	 */
+	private function run_adoption_agency_algorithm() {
+		$budget       = 1000;
+		$subject      = $this->get_tag();
+		$current_node = $this->state->stack_of_open_elements->current_node();
+
+		if (
+			// > If the current node is an HTML element whose tag name is subject
+			$current_node && $subject === $current_node->node_name &&
+			// > the current node is not in the list of active formatting elements
+			! $this->state->active_formatting_elements->contains_node( $current_node )
+		) {
+			$this->state->stack_of_open_elements->pop();
+			return;
+		}
+
+		$outer_loop_counter = 0;
+		while ( $budget-- > 0 ) {
+			if ( $outer_loop_counter++ >= 8 ) {
+				return;
+			}
+
+			/*
+			 * > Let formatting element be the last element in the list of active formatting elements that:
+			 * >   - is between the end of the list and the last marker in the list,
+			 * >     if any, or the start of the list otherwise,
+			 * >   - and has the tag name subject.
+			 */
+			$formatting_element = null;
+			foreach ( $this->state->active_formatting_elements->walk_up() as $item ) {
+				if ( 'marker' === $item->node_name ) {
+					break;
+				}
+
+				if ( $subject === $item->node_name ) {
+					$formatting_element = $item;
+					break;
+				}
+			}
+
+			// > If there is no such element, then return and instead act as described in the "any other end tag" entry above.
+			if ( null === $formatting_element ) {
+				$this->last_error = self::ERROR_UNSUPPORTED;
+				throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when "any other end tag" is required.' );
+			}
+
+			// > If formatting element is not in the stack of open elements, then this is a parse error; remove the element from the list, and return.
+			if ( ! $this->state->stack_of_open_elements->contains_node( $formatting_element ) ) {
+				$this->state->active_formatting_elements->remove_node( $formatting_element );
+				return;
+			}
+
+			// > If formatting element is in the stack of open elements, but the element is not in scope, then this is a parse error; return.
+			if ( ! $this->state->stack_of_open_elements->has_element_in_scope( $formatting_element->node_name ) ) {
+				return;
+			}
+
+			/*
+			 * > Let furthest block be the topmost node in the stack of open elements that is lower in the stack
+			 * > than formatting element, and is an element in the special category. There might not be one.
+			 */
+			$is_above_formatting_element = true;
+			$furthest_block              = null;
+			foreach ( $this->state->stack_of_open_elements->walk_down() as $item ) {
+				if ( $is_above_formatting_element && $formatting_element->bookmark_name !== $item->bookmark_name ) {
+					continue;
+				}
+
+				if ( $is_above_formatting_element ) {
+					$is_above_formatting_element = false;
+					continue;
+				}
+
+				if ( self::is_special( $item->node_name ) ) {
+					$furthest_block = $item;
+					break;
+				}
+			}
+
+			/*
+			 * > If there is no furthest block, then the UA must first pop all the nodes from the bottom of the
+			 * > stack of open elements, from the current node up to and including formatting element, then
+			 * > remove formatting element from the list of active formatting elements, and finally return.
+			 */
+			if ( null === $furthest_block ) {
+				foreach ( $this->state->stack_of_open_elements->walk_up() as $item ) {
+					$this->state->stack_of_open_elements->pop();
+
+					if ( $formatting_element->bookmark_name === $item->bookmark_name ) {
+						$this->state->active_formatting_elements->remove_node( $formatting_element );
+						return;
+					}
+				}
+			}
+
+			$this->last_error = self::ERROR_UNSUPPORTED;
+			throw new WP_HTML_Unsupported_Exception( 'Cannot extract common ancestor in adoption agency algorithm.' );
+		}
+
+		$this->last_error = self::ERROR_UNSUPPORTED;
+		throw new WP_HTML_Unsupported_Exception( 'Cannot run adoption agency when looping required.' );
+	}
+
+	/**
+	 * Inserts an HTML element on the stack of open elements.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insert-a-foreign-element
+	 *
+	 * @param WP_HTML_Token $token Name of bookmark pointing to element in original input HTML.
+	 */
+	private function insert_html_element( $token ) {
+		$this->state->stack_of_open_elements->push( $token );
+	}
+
+	/*
+	 * HTML Specification Helpers
+	 */
+
+	/**
+	 * Returns whether an element of a given name is in the HTML special category.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#special
+	 *
+	 * @param string $tag_name Name of element to check.
+	 * @return bool Whether the element of the given name is in the special category.
+	 */
+	public static function is_special( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'ADDRESS' === $tag_name ||
+			'APPLET' === $tag_name ||
+			'AREA' === $tag_name ||
+			'ARTICLE' === $tag_name ||
+			'ASIDE' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BASEFONT' === $tag_name ||
+			'BGSOUND' === $tag_name ||
+			'BLOCKQUOTE' === $tag_name ||
+			'BODY' === $tag_name ||
+			'BR' === $tag_name ||
+			'BUTTON' === $tag_name ||
+			'CAPTION' === $tag_name ||
+			'CENTER' === $tag_name ||
+			'COL' === $tag_name ||
+			'COLGROUP' === $tag_name ||
+			'DD' === $tag_name ||
+			'DETAILS' === $tag_name ||
+			'DIR' === $tag_name ||
+			'DIV' === $tag_name ||
+			'DL' === $tag_name ||
+			'DT' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'FIELDSET' === $tag_name ||
+			'FIGCAPTION' === $tag_name ||
+			'FIGURE' === $tag_name ||
+			'FOOTER' === $tag_name ||
+			'FORM' === $tag_name ||
+			'FRAME' === $tag_name ||
+			'FRAMESET' === $tag_name ||
+			'H1' === $tag_name ||
+			'H2' === $tag_name ||
+			'H3' === $tag_name ||
+			'H4' === $tag_name ||
+			'H5' === $tag_name ||
+			'H6' === $tag_name ||
+			'HEAD' === $tag_name ||
+			'HEADER' === $tag_name ||
+			'HGROUP' === $tag_name ||
+			'HR' === $tag_name ||
+			'HTML' === $tag_name ||
+			'IFRAME' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'KEYGEN' === $tag_name ||
+			'LI' === $tag_name ||
+			'LINK' === $tag_name ||
+			'LISTING' === $tag_name ||
+			'MAIN' === $tag_name ||
+			'MARQUEE' === $tag_name ||
+			'MENU' === $tag_name ||
+			'META' === $tag_name ||
+			'NAV' === $tag_name ||
+			'NOEMBED' === $tag_name ||
+			'NOFRAMES' === $tag_name ||
+			'NOSCRIPT' === $tag_name ||
+			'OBJECT' === $tag_name ||
+			'OL' === $tag_name ||
+			'P' === $tag_name ||
+			'PARAM' === $tag_name ||
+			'PLAINTEXT' === $tag_name ||
+			'PRE' === $tag_name ||
+			'SCRIPT' === $tag_name ||
+			'SEARCH' === $tag_name ||
+			'SECTION' === $tag_name ||
+			'SELECT' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'STYLE' === $tag_name ||
+			'SUMMARY' === $tag_name ||
+			'TABLE' === $tag_name ||
+			'TBODY' === $tag_name ||
+			'TD' === $tag_name ||
+			'TEMPLATE' === $tag_name ||
+			'TEXTAREA' === $tag_name ||
+			'TFOOT' === $tag_name ||
+			'TH' === $tag_name ||
+			'THEAD' === $tag_name ||
+			'TITLE' === $tag_name ||
+			'TR' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'UL' === $tag_name ||
+			'WBR' === $tag_name ||
+			'XMP' === $tag_name ||
+
+			// MathML.
+			'MI' === $tag_name ||
+			'MO' === $tag_name ||
+			'MN' === $tag_name ||
+			'MS' === $tag_name ||
+			'MTEXT' === $tag_name ||
+			'ANNOTATION-XML' === $tag_name ||
+
+			// SVG.
+			'FOREIGNOBJECT' === $tag_name ||
+			'DESC' === $tag_name ||
+			'TITLE' === $tag_name
+		);
+	}
+
+	/**
+	 * Returns whether a given element is an HTML Void Element
+	 *
+	 * > area, base, br, col, embed, hr, img, input, link, meta, source, track, wbr
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#void-elements
+	 *
+	 * @param string $tag_name Name of HTML tag to check.
+	 * @return bool Whether the given tag is an HTML Void Element.
+	 */
+	public static function is_void( $tag_name ) {
+		$tag_name = strtoupper( $tag_name );
+
+		return (
+			'AREA' === $tag_name ||
+			'BASE' === $tag_name ||
+			'BR' === $tag_name ||
+			'COL' === $tag_name ||
+			'EMBED' === $tag_name ||
+			'HR' === $tag_name ||
+			'IMG' === $tag_name ||
+			'INPUT' === $tag_name ||
+			'LINK' === $tag_name ||
+			'META' === $tag_name ||
+			'SOURCE' === $tag_name ||
+			'TRACK' === $tag_name ||
+			'WBR' === $tag_name
+		);
+	}
+
+	/*
+	 * Constants that would pollute the top of the class if they were found there.
+	 */
+
+	/**
+	 * Indicates that the next HTML token should be parsed and processed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const PROCESS_NEXT_NODE = 'process-next-node';
+
+	/**
+	 * Indicates that the current HTML token should be reprocessed in the newly-selected insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const REPROCESS_CURRENT_NODE = 'reprocess-current-node';
+
+	/**
+	 * Indicates that the parser encountered unsupported markup and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_UNSUPPORTED = 'unsupported';
+
+	/**
+	 * Indicates that the parser encountered more HTML tokens than it
+	 * was able to process and has bailed.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var string
+	 */
+	const ERROR_EXCEEDED_MAX_BOOKMARKS = 'exceeded-max-bookmarks';
+
+	/**
+	 * Unlock code that must be passed into the constructor to create this class.
+	 *
+	 * This class extends the WP_HTML_Tag_Processor, which has a public class
+	 * constructor. Therefore, it's not possible to have a private constructor here.
+	 *
+	 * This unlock code is used to ensure that anyone calling the constructor is
+	 * doing so with a full understanding that it's intended to be a private API.
+	 *
+	 * @access private
+	 */
+	const CONSTRUCTOR_UNLOCK_CODE = 'Use WP_HTML_Processor::create_fragment() instead of calling the class constructor directly.';
+}
diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php
new file mode 100644
index 0000000000000..890e19fb5da4d
--- /dev/null
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * HTML API: WP_HTML_Processor_State class
+ *
+ * @package WordPress
+ * @subpackage HTML-API
+ * @since 6.4.0
+ */
+
+/**
+ * Core class used by the HTML processor during HTML parsing
+ * for managing the internal parsing state.
+ *
+ * This class is designed for internal use by the HTML processor.
+ *
+ * @since 6.4.0
+ *
+ * @access private
+ *
+ * @see WP_HTML_Processor
+ */
+class Gutenberg_HTML_Processor_State_6_5 {
+	/*
+	 * Insertion mode constants.
+	 *
+	 * These constants exist and are named to make it easier to
+	 * discover and recognize the supported insertion modes in
+	 * the parser.
+	 *
+	 * Out of all the possible insertion modes, only those
+	 * supported by the parser are listed here. As support
+	 * is added to the parser for more modes, add them here
+	 * following the same naming and value pattern.
+	 *
+	 * @see https://html.spec.whatwg.org/#the-insertion-mode
+	 */
+
+	/**
+	 * Initial insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#the-initial-insertion-mode
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_INITIAL = 'insertion-mode-initial';
+
+	/**
+	 * In body insertion mode for full HTML parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#parsing-main-inbody
+	 * @see WP_HTML_Processor_State::$insertion_mode
+	 *
+	 * @var string
+	 */
+	const INSERTION_MODE_IN_BODY = 'insertion-mode-in-body';
+
+	/**
+	 * Tracks open elements while scanning HTML.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#stack-of-open-elements
+	 *
+	 * @var WP_HTML_Open_Elements
+	 */
+	public $stack_of_open_elements = null;
+
+	/**
+	 * Tracks open formatting elements, used to handle mis-nested formatting element tags.
+	 *
+	 * This property is initialized in the constructor and never null.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#list-of-active-formatting-elements
+	 *
+	 * @var WP_HTML_Active_Formatting_Elements
+	 */
+	public $active_formatting_elements = null;
+
+	/**
+	 * Refers to the currently-matched tag, if any.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @var WP_HTML_Token|null
+	 */
+	public $current_token = null;
+
+	/**
+	 * Tree construction insertion mode.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#insertion-mode
+	 *
+	 * @var string
+	 */
+	public $insertion_mode = self::INSERTION_MODE_INITIAL;
+
+	/**
+	 * Context node initializing fragment parser, if created as a fragment parser.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#concept-frag-parse-context
+	 *
+	 * @var [string, array]|null
+	 */
+	public $context_node = null;
+
+	/**
+	 * The frameset-ok flag indicates if a `FRAMESET` element is allowed in the current state.
+	 *
+	 * > The frameset-ok flag is set to "ok" when the parser is created. It is set to "not ok" after certain tokens are seen.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see https://html.spec.whatwg.org/#frameset-ok-flag
+	 *
+	 * @var bool
+	 */
+	public $frameset_ok = true;
+
+	/**
+	 * Constructor - creates a new and empty state value.
+	 *
+	 * @since 6.4.0
+	 *
+	 * @see WP_HTML_Processor
+	 */
+	public function __construct() {
+		$this->stack_of_open_elements     = new Gutenberg_HTML_Open_Elements_6_5();
+		$this->active_formatting_elements = new WP_HTML_Active_Formatting_Elements();
+	}
+}
diff --git a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
index f14bc15adf999..de3823d2b2703 100644
--- a/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
+++ b/lib/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php
@@ -15,9 +15,6 @@
  *  - Prune the whitespace when removing classes/attributes: e.g. "a b c" -> "c" not " c".
  *    This would increase the size of the changes for some operations but leave more
  *    natural-looking output HTML.
- *  - Decode HTML character references within class names when matching. E.g. match having
- *    class `1<"2` needs to recognize `class="1&lt;&quot;2"`. Currently the Tag Processor
- *    will fail to find the right tag if the class name is encoded as such.
  *  - Properly decode HTML character references in `get_attribute()`. PHP's
  *    `html_entity_decode()` is wrong in a couple ways: it doesn't account for the
  *    no-ambiguous-ampersand rule, and it improperly handles the way semicolons may
@@ -107,6 +104,56 @@
  * given, it will return `true` (the only way to set `false` for an
  * attribute is to remove it).
  *
+ * #### When matching fails
+ *
+ * When `next_tag()` returns `false` it could mean different things:
+ *
+ *  - The requested tag wasn't found in the input document.
+ *  - The input document ended in the middle of an HTML syntax element.
+ *
+ * When a document ends in the middle of a syntax element it will pause
+ * the processor. This is to make it possible in the future to extend the
+ * input document and proceed - an important requirement for chunked
+ * streaming parsing of a document.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( 'This <div is="a" partial="token' );
+ *     false === $processor->next_tag();
+ *
+ * If a special element (see next section) is encountered but no closing tag
+ * is found it will count as an incomplete tag. The parser will pause as if
+ * the opening tag were incomplete.
+ *
+ * Example:
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// there could be more styling to come' );
+ *     false === $processor->next_tag();
+ *
+ *     $processor = new WP_HTML_Tag_Processor( '<style>// this is everything</style><div>' );
+ *     true === $processor->next_tag( 'DIV' );
+ *
+ * #### Special elements
+ *
+ * Some HTML elements are handled in a special way; their start and end tags
+ * act like a void tag. These are special because their contents can't contain
+ * HTML markup. Everything inside these elements is handled in a special way
+ * and content that _appears_ like HTML tags inside of them isn't. There can
+ * be no nesting in these elements.
+ *
+ * In the following list, "raw text" means that all of the content in the HTML
+ * until the matching closing tag is treated verbatim without any replacements
+ * and without any parsing.
+ *
+ *  - IFRAME allows no content but requires a closing tag.
+ *  - NOEMBED (deprecated) content is raw text.
+ *  - NOFRAMES (deprecated) content is raw text.
+ *  - SCRIPT content is plaintext apart from legacy rules allowing `</script>` inside an HTML comment.
+ *  - STYLE content is raw text.
+ *  - TITLE content is plain text but character references are decoded.
+ *  - TEXTAREA content is plain text but character references are decoded.
+ *  - XMP (deprecated) content is raw text.
+ *
  * ### Modifying HTML attributes for a found tag
  *
  * Once you've found the start of an opening tag you can modify
@@ -241,9 +288,39 @@
  * double-quoted strings, meaning that attributes on input with single-quoted or
  * unquoted values will appear in the output with double-quotes.
  *
+ * ### Scripting Flag
+ *
+ * The Tag Processor parses HTML with the "scripting flag" disabled. This means
+ * that it doesn't run any scripts while parsing the page. In a browser with
+ * JavaScript enabled, for example, the script can change the parse of the
+ * document as it loads. On the server, however, evaluating JavaScript is not
+ * only impractical, but also unwanted.
+ *
+ * Practically this means that the Tag Processor will descend into NOSCRIPT
+ * elements and process its child tags. Were the scripting flag enabled, such
+ * as in a typical browser, the contents of NOSCRIPT are skipped entirely.
+ *
+ * This allows the HTML API to process the content that will be presented in
+ * a browser when scripting is disabled, but it offers a different view of a
+ * page than most browser sessions will experience. E.g. the tags inside the
+ * NOSCRIPT disappear.
+ *
+ * ### Text Encoding
+ *
+ * The Tag Processor assumes that the input HTML document is encoded with a
+ * text encoding compatible with 7-bit ASCII's '<', '>', '&', ';', '/', '=',
+ * "'", '"', 'a' - 'z', 'A' - 'Z', and the whitespace characters ' ', tab,
+ * carriage-return, newline, and form-feed.
+ *
+ * In practice, this includes almost every single-byte encoding as well as
+ * UTF-8. Notably, however, it does not include UTF-16. If providing input
+ * that's incompatible, then convert the encoding beforehand.
+ *
  * @since 6.2.0
  * @since 6.2.1 Fix: Support for various invalid comments; attribute updates are case-insensitive.
  * @since 6.3.2 Fix: Skip HTML-like content inside rawtext elements such as STYLE.
+ * @since 6.5.0 Pauses processor when input ends in an incomplete syntax token.
+ *              Introduces "special" elements which act like void elements, e.g. STYLE.
  */
 class Gutenberg_HTML_Tag_Processor_6_5 {
 	/**
@@ -316,6 +393,27 @@ class Gutenberg_HTML_Tag_Processor_6_5 {
 	 */
 	private $stop_on_tag_closers;
 
+	/**
+	 * Specifies mode of operation of the parser at any given time.
+	 *
+	 * | State         | Meaning                                                              |
+	 * | --------------|----------------------------------------------------------------------|
+	 * | *Ready*       | The parser is ready to run.                                          |
+	 * | *Complete*    | There is nothing left to parse.                                      |
+	 * | *Incomplete*  | The HTML ended in the middle of a token; nothing more can be parsed. |
+	 * | *Matched tag* | Found an HTML tag; it's possible to modify its attributes.           |
+	 *
+	 * @since 6.5.0
+	 *
+	 * @see WP_HTML_Tag_Processor::STATE_READY
+	 * @see WP_HTML_Tag_Processor::STATE_COMPLETE
+	 * @see WP_HTML_Tag_Processor::STATE_INCOMPLETE
+	 * @see WP_HTML_Tag_Processor::STATE_MATCHED_TAG
+	 *
+	 * @var string
+	 */
+	private $parser_state = self::STATE_READY;
+
 	/**
 	 * How many bytes from the original HTML document have been read and parsed.
 	 *
@@ -544,6 +642,7 @@ public function __construct( $html ) {
 	 * Finds the next tag matching the $query.
 	 *
 	 * @since 6.2.0
+	 * @since 6.5.0 No longer processes incomplete tokens at end of document; pauses the processor at start of token.
 	 *
 	 * @param array|string|null $query {
 	 *     Optional. Which tag name to find, having which class, etc. Default is to find any tag.
@@ -562,90 +661,177 @@ public function next_tag( $query = null ) {
 		$already_found = 0;
 
 		do {
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
-			}
-
-			// Find the next tag if it exists.
-			if ( false === $this->parse_next_tag() ) {
-				$this->bytes_already_parsed = strlen( $this->html );
-
+			if ( false === $this->next_token() ) {
 				return false;
 			}
 
-			// Parse all of its attributes.
-			while ( $this->parse_next_attribute() ) {
+			if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 				continue;
 			}
 
-			// Ensure that the tag closes before the end of the document.
-			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
-				return false;
+			if ( $this->matches() ) {
+				++$already_found;
 			}
+		} while ( $already_found < $this->sought_match_offset );
 
-			$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
-			if ( false === $tag_ends_at ) {
-				return false;
-			}
-			$this->token_length         = $tag_ends_at - $this->token_starts_at;
-			$this->bytes_already_parsed = $tag_ends_at;
+		return true;
+	}
 
-			// Finally, check if the parsed tag and its attributes match the search query.
-			if ( $this->matches() ) {
-				++$already_found;
+	/**
+	 * Finds the next token in the HTML document.
+	 *
+	 * An HTML document can be viewed as a stream of tokens,
+	 * where tokens are things like HTML tags, HTML comments,
+	 * text nodes, etc. This method finds the next token in
+	 * the HTML document and returns whether it found one.
+	 *
+	 * If it starts parsing a token and reaches the end of the
+	 * document then it will seek to the start of the last
+	 * token and pause, returning `false` to indicate that it
+	 * failed to find a complete token.
+	 *
+	 * Possible token types, based on the HTML specification:
+	 *
+	 *  - an HTML tag, whether opening, closing, or void.
+	 *  - a text node - the plaintext inside tags.
+	 *  - an HTML comment.
+	 *  - a DOCTYPE declaration.
+	 *  - a processing instruction, e.g. `<?xml version="1.0" ?>`.
+	 *
+	 * The Tag Processor currently only supports the tag token.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether a token was parsed.
+	 */
+	public function next_token() {
+		$this->get_updated_html();
+		$was_at = $this->bytes_already_parsed;
+
+		// Don't proceed if there's nothing more to scan.
+		if (
+			self::STATE_COMPLETE === $this->parser_state ||
+			self::STATE_INCOMPLETE === $this->parser_state
+		) {
+			return false;
+		}
+
+		/*
+		 * The next step in the parsing loop determines the parsing state;
+		 * clear it so that state doesn't linger from the previous step.
+		 */
+		$this->parser_state = self::STATE_READY;
+
+		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_COMPLETE;
+			return false;
+		}
+
+		// Find the next tag if it exists.
+		if ( false === $this->parse_next_tag() ) {
+			if ( self::STATE_INCOMPLETE === $this->parser_state ) {
+				$this->bytes_already_parsed = $was_at;
 			}
 
-			/*
-			 * For non-DATA sections which might contain text that looks like HTML tags but
-			 * isn't, scan with the appropriate alternative mode. Looking at the first letter
-			 * of the tag name as a pre-check avoids a string allocation when it's not needed.
-			 */
-			$t = $this->html[ $this->tag_name_starts_at ];
-			if (
-				! $this->is_closing_tag &&
+			return false;
+		}
+
+		// Parse all of its attributes.
+		while ( $this->parse_next_attribute() ) {
+			continue;
+		}
+
+		// Ensure that the tag closes before the end of the document.
+		if (
+			self::STATE_INCOMPLETE === $this->parser_state ||
+			$this->bytes_already_parsed >= strlen( $this->html )
+		) {
+			// Does this appropriately clear state (parsed attributes)?
+			$this->parser_state         = self::STATE_INCOMPLETE;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+
+		$tag_ends_at = strpos( $this->html, '>', $this->bytes_already_parsed );
+		if ( false === $tag_ends_at ) {
+			$this->parser_state         = self::STATE_INCOMPLETE;
+			$this->bytes_already_parsed = $was_at;
+
+			return false;
+		}
+		$this->parser_state         = self::STATE_MATCHED_TAG;
+		$this->token_length         = $tag_ends_at - $this->token_starts_at;
+		$this->bytes_already_parsed = $tag_ends_at;
+
+		/*
+		 * For non-DATA sections which might contain text that looks like HTML tags but
+		 * isn't, scan with the appropriate alternative mode. Looking at the first letter
+		 * of the tag name as a pre-check avoids a string allocation when it's not needed.
+		 */
+		$t = $this->html[ $this->tag_name_starts_at ];
+		if (
+			! $this->is_closing_tag &&
+			(
+				'i' === $t || 'I' === $t ||
+				'n' === $t || 'N' === $t ||
+				's' === $t || 'S' === $t ||
+				't' === $t || 'T' === $t ||
+				'x' === $t || 'X' === $t
+			)
+		) {
+			$tag_name = $this->get_tag();
+
+			if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
+			} elseif (
+				( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
+				! $this->skip_rcdata( $tag_name )
+			) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
+			} elseif (
 				(
-					'i' === $t || 'I' === $t ||
-					'n' === $t || 'N' === $t ||
-					's' === $t || 'S' === $t ||
-					't' === $t || 'T' === $t
-				) ) {
-				$tag_name = $this->get_tag();
-
-				if ( 'SCRIPT' === $tag_name && ! $this->skip_script_data() ) {
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				} elseif (
-					( 'TEXTAREA' === $tag_name || 'TITLE' === $tag_name ) &&
-					! $this->skip_rcdata( $tag_name )
-				) {
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				} elseif (
-					(
-						'IFRAME' === $tag_name ||
-						'NOEMBED' === $tag_name ||
-						'NOFRAMES' === $tag_name ||
-						'NOSCRIPT' === $tag_name ||
-						'STYLE' === $tag_name
-					) &&
-					! $this->skip_rawtext( $tag_name )
-				) {
-					/*
-					 * "XMP" should be here too but its rules are more complicated and require the
-					 * complexity of the HTML Processor (it needs to close out any open P element,
-					 * meaning it can't be skipped here or else the HTML Processor will lose its
-					 * place). For now, it can be ignored as it's a rare HTML tag in practice and
-					 * any normative HTML should be using PRE instead.
-					 */
-					$this->bytes_already_parsed = strlen( $this->html );
-					return false;
-				}
+					'IFRAME' === $tag_name ||
+					'NOEMBED' === $tag_name ||
+					'NOFRAMES' === $tag_name ||
+					'STYLE' === $tag_name ||
+					'XMP' === $tag_name
+				) &&
+				! $this->skip_rawtext( $tag_name )
+			) {
+				$this->parser_state         = self::STATE_INCOMPLETE;
+				$this->bytes_already_parsed = $was_at;
+
+				return false;
 			}
-		} while ( $already_found < $this->sought_match_offset );
+		}
 
 		return true;
 	}
 
+	/**
+	 * Whether the processor paused because the input HTML document ended
+	 * in the middle of a syntax element, such as in the middle of a tag.
+	 *
+	 * Example:
+	 *
+	 *     $processor = new WP_HTML_Tag_Processor( '<input type="text" value="Th' );
+	 *     false      === $processor->get_next_tag();
+	 *     true       === $processor->paused_at_incomplete_token();
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return bool Whether the parse paused at the start of an incomplete token.
+	 */
+	public function paused_at_incomplete_token() {
+		return self::STATE_INCOMPLETE === $this->parser_state;
+	}
 
 	/**
 	 * Generator for a foreach loop to step through each class name for the matched tag.
@@ -664,6 +850,10 @@ public function next_tag( $query = null ) {
 	 * @since 6.4.0
 	 */
 	public function class_list() {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return;
+		}
+
 		/** @var string $class contains the string value of the class attribute, with character references decoded. */
 		$class = $this->get_attribute( 'class' );
 
@@ -719,7 +909,7 @@ public function class_list() {
 	 * @return bool|null Whether the matched tag contains the given class name, or null if not matched.
 	 */
 	public function has_class( $wanted_class ) {
-		if ( ! $this->tag_name_starts_at ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -816,7 +1006,8 @@ public function has_class( $wanted_class ) {
 	 * @return bool Whether the bookmark was successfully created.
 	 */
 	public function set_bookmark( $name ) {
-		if ( null === $this->tag_name_starts_at ) {
+		// It only makes sense to set a bookmark if the parser has paused on a concrete token.
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return false;
 		}
 
@@ -895,7 +1086,6 @@ private function skip_rcdata( $tag_name ) {
 
 			// Fail if there is no possible tag closer.
 			if ( false === $at || ( $at + $tag_length ) >= $doc_length ) {
-				$this->bytes_already_parsed = $doc_length;
 				return false;
 			}
 
@@ -923,6 +1113,10 @@ private function skip_rcdata( $tag_name ) {
 			$at                        += $tag_length;
 			$this->bytes_already_parsed = $at;
 
+			if ( $at >= strlen( $html ) ) {
+				return false;
+			}
+
 			/*
 			 * Ensure that the tag name terminates to avoid matching on
 			 * substrings of a longer tag name. For example, the sequence
@@ -1073,6 +1267,12 @@ private function skip_script_data() {
 					continue;
 				}
 
+				if ( $this->bytes_already_parsed >= $doc_length ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
+					return false;
+				}
+
 				if ( '>' === $html[ $this->bytes_already_parsed ] ) {
 					$this->bytes_already_parsed = $closer_potentially_starts_at;
 					return true;
@@ -1107,13 +1307,18 @@ private function parse_next_tag() {
 
 		while ( false !== $at && $at < $doc_length ) {
 			$at = strpos( $html, '<', $at );
+
+			/*
+			 * This does not imply an incomplete parse; it indicates that there
+			 * can be nothing left in the document other than a #text node.
+			 */
 			if ( false === $at ) {
 				return false;
 			}
 
 			$this->token_starts_at = $at;
 
-			if ( '/' === $this->html[ $at + 1 ] ) {
+			if ( $at + 1 < $doc_length && '/' === $this->html[ $at + 1 ] ) {
 				$this->is_closing_tag = true;
 				++$at;
 			} else {
@@ -1147,7 +1352,9 @@ private function parse_next_tag() {
 			 * Abort if no tag is found before the end of
 			 * the document. There is nothing left to parse.
 			 */
-			if ( $at + 1 >= strlen( $html ) ) {
+			if ( $at + 1 >= $doc_length ) {
+				$this->parser_state = self::STATE_INCOMPLETE;
+
 				return false;
 			}
 
@@ -1161,13 +1368,15 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 3 &&
+					$doc_length > $at + 3 &&
 					'-' === $html[ $at + 2 ] &&
 					'-' === $html[ $at + 3 ]
 				) {
 					$closer_at = $at + 4;
 					// If it's not possible to close the comment then there is nothing more to scan.
-					if ( strlen( $html ) <= $closer_at ) {
+					if ( $doc_length <= $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1185,18 +1394,20 @@ private function parse_next_tag() {
 					 * See https://html.spec.whatwg.org/#parse-error-incorrectly-closed-comment
 					 */
 					--$closer_at; // Pre-increment inside condition below reduces risk of accidental infinite looping.
-					while ( ++$closer_at < strlen( $html ) ) {
+					while ( ++$closer_at < $doc_length ) {
 						$closer_at = strpos( $html, '--', $closer_at );
 						if ( false === $closer_at ) {
+							$this->parser_state = self::STATE_INCOMPLETE;
+
 							return false;
 						}
 
-						if ( $closer_at + 2 < strlen( $html ) && '>' === $html[ $closer_at + 2 ] ) {
+						if ( $closer_at + 2 < $doc_length && '>' === $html[ $closer_at + 2 ] ) {
 							$at = $closer_at + 3;
 							continue 2;
 						}
 
-						if ( $closer_at + 3 < strlen( $html ) && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
+						if ( $closer_at + 3 < $doc_length && '!' === $html[ $closer_at + 2 ] && '>' === $html[ $closer_at + 3 ] ) {
 							$at = $closer_at + 4;
 							continue 2;
 						}
@@ -1209,7 +1420,7 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 8 &&
+					$doc_length > $at + 8 &&
 					'[' === $html[ $at + 2 ] &&
 					'C' === $html[ $at + 3 ] &&
 					'D' === $html[ $at + 4 ] &&
@@ -1220,6 +1431,8 @@ private function parse_next_tag() {
 				) {
 					$closer_at = strpos( $html, ']]>', $at + 9 );
 					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1233,7 +1446,7 @@ private function parse_next_tag() {
 				 * https://html.spec.whatwg.org/multipage/parsing.html#tag-open-state
 				 */
 				if (
-					strlen( $html ) > $at + 8 &&
+					$doc_length > $at + 8 &&
 					( 'D' === $html[ $at + 2 ] || 'd' === $html[ $at + 2 ] ) &&
 					( 'O' === $html[ $at + 3 ] || 'o' === $html[ $at + 3 ] ) &&
 					( 'C' === $html[ $at + 4 ] || 'c' === $html[ $at + 4 ] ) &&
@@ -1244,6 +1457,8 @@ private function parse_next_tag() {
 				) {
 					$closer_at = strpos( $html, '>', $at + 9 );
 					if ( false === $closer_at ) {
+						$this->parser_state = self::STATE_INCOMPLETE;
+
 						return false;
 					}
 
@@ -1253,15 +1468,26 @@ private function parse_next_tag() {
 
 				/*
 				 * Anything else here is an incorrectly-opened comment and transitions
-				 * to the bogus comment state - skip to the nearest >.
+				 * to the bogus comment state - skip to the nearest >. If no closer is
+				 * found then the HTML was truncated inside the markup declaration.
 				 */
 				$at = strpos( $html, '>', $at + 1 );
+				if ( false === $at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
+					return false;
+				}
+
 				continue;
 			}
 
 			/*
 			 * </> is a missing end tag name, which is ignored.
 			 *
+			 * This was also known as the "presumptuous empty tag"
+			 * in early discussions as it was proposed to close
+			 * the nearest previous opening tag.
+			 *
 			 * See https://html.spec.whatwg.org/#parse-error-missing-end-tag-name
 			 */
 			if ( '>' === $html[ $at + 1 ] ) {
@@ -1276,6 +1502,8 @@ private function parse_next_tag() {
 			if ( '?' === $html[ $at + 1 ] ) {
 				$closer_at = strpos( $html, '>', $at + 2 );
 				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
 					return false;
 				}
 
@@ -1290,8 +1518,15 @@ private function parse_next_tag() {
 			 * See https://html.spec.whatwg.org/#parse-error-invalid-first-character-of-tag-name
 			 */
 			if ( $this->is_closing_tag ) {
+				// No chance of finding a closer.
+				if ( $at + 3 > $doc_length ) {
+					return false;
+				}
+
 				$closer_at = strpos( $html, '>', $at + 3 );
 				if ( false === $closer_at ) {
+					$this->parser_state = self::STATE_INCOMPLETE;
+
 					return false;
 				}
 
@@ -1316,6 +1551,8 @@ private function parse_next_attribute() {
 		// Skip whitespace and slashes.
 		$this->bytes_already_parsed += strspn( $this->html, " \t\f\r\n/", $this->bytes_already_parsed );
 		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
@@ -1338,11 +1575,15 @@ private function parse_next_attribute() {
 		$attribute_name              = substr( $this->html, $attribute_start, $name_length );
 		$this->bytes_already_parsed += $name_length;
 		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
 		$this->skip_whitespace();
 		if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
@@ -1351,6 +1592,8 @@ private function parse_next_attribute() {
 			++$this->bytes_already_parsed;
 			$this->skip_whitespace();
 			if ( $this->bytes_already_parsed >= strlen( $this->html ) ) {
+				$this->parser_state = self::STATE_INCOMPLETE;
+
 				return false;
 			}
 
@@ -1377,6 +1620,8 @@ private function parse_next_attribute() {
 		}
 
 		if ( $attribute_end >= strlen( $this->html ) ) {
+			$this->parser_state = self::STATE_INCOMPLETE;
+
 			return false;
 		}
 
@@ -1443,7 +1688,6 @@ private function skip_whitespace() {
 	 * @since 6.2.0
 	 */
 	private function after_tag() {
-		$this->get_updated_html();
 		$this->token_starts_at      = null;
 		$this->token_length         = null;
 		$this->tag_name_starts_at   = null;
@@ -1786,6 +2030,10 @@ private static function sort_start_ascending( $a, $b ) {
 	 * @return string|boolean|null Value of enqueued update if present, otherwise false.
 	 */
 	private function get_enqueued_attribute_value( $comparable_name ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
+			return false;
+		}
+
 		if ( ! isset( $this->lexical_updates[ $comparable_name ] ) ) {
 			return false;
 		}
@@ -1853,7 +2101,7 @@ private function get_enqueued_attribute_value( $comparable_name ) {
 	 * @return string|true|null Value of attribute or `null` if not available. Boolean attributes return `true`.
 	 */
 	public function get_attribute( $name ) {
-		if ( null === $this->tag_name_starts_at ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -1933,7 +2181,10 @@ public function get_attribute( $name ) {
 	 * @return array|null List of attribute names, or `null` when no tag opener is matched.
 	 */
 	public function get_attribute_names_with_prefix( $prefix ) {
-		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return null;
 		}
 
@@ -1965,7 +2216,7 @@ public function get_attribute_names_with_prefix( $prefix ) {
 	 * @return string|null Name of currently matched tag in input HTML, or `null` if none found.
 	 */
 	public function get_tag() {
-		if ( null === $this->tag_name_starts_at ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return null;
 		}
 
@@ -1992,7 +2243,7 @@ public function get_tag() {
 	 * @return bool Whether the currently matched tag contains the self-closing flag.
 	 */
 	public function has_self_closing_flag() {
-		if ( ! $this->tag_name_starts_at ) {
+		if ( self::STATE_MATCHED_TAG !== $this->parser_state ) {
 			return false;
 		}
 
@@ -2024,7 +2275,10 @@ public function has_self_closing_flag() {
 	 * @return bool Whether the current tag is a tag closer.
 	 */
 	public function is_tag_closer() {
-		return $this->is_closing_tag;
+		return (
+			self::STATE_MATCHED_TAG === $this->parser_state &&
+			$this->is_closing_tag
+		);
 	}
 
 	/**
@@ -2044,7 +2298,10 @@ public function is_tag_closer() {
 	 * @return bool Whether an attribute value was set.
 	 */
 	public function set_attribute( $name, $value ) {
-		if ( $this->is_closing_tag || null === $this->tag_name_starts_at ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2177,7 +2434,10 @@ public function set_attribute( $name, $value ) {
 	 * @return bool Whether an attribute was removed.
 	 */
 	public function remove_attribute( $name ) {
-		if ( $this->is_closing_tag ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2254,13 +2514,14 @@ public function remove_attribute( $name ) {
 	 * @return bool Whether the class was set to be added.
 	 */
 	public function add_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
-		if ( null !== $this->tag_name_starts_at ) {
-			$this->classname_updates[ $class_name ] = self::ADD_CLASS;
-		}
+		$this->classname_updates[ $class_name ] = self::ADD_CLASS;
 
 		return true;
 	}
@@ -2274,7 +2535,10 @@ public function add_class( $class_name ) {
 	 * @return bool Whether the class was set to be removed.
 	 */
 	public function remove_class( $class_name ) {
-		if ( $this->is_closing_tag ) {
+		if (
+			self::STATE_MATCHED_TAG !== $this->parser_state ||
+			$this->is_closing_tag
+		) {
 			return false;
 		}
 
@@ -2480,4 +2744,57 @@ private function matches() {
 
 		return true;
 	}
+
+	/**
+	 * Parser Ready State
+	 *
+	 * Indicates that the parser is ready to run and waiting for a state transition.
+	 * It may not have started yet, or it may have just finished parsing a token and
+	 * is ready to find the next one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_READY = 'STATE_READY';
+
+	/**
+	 * Parser Complete State
+	 *
+	 * Indicates that the parser has reached the end of the document and there is
+	 * nothing left to scan. It finished parsing the last token completely.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_COMPLETE = 'STATE_COMPLETE';
+
+	/**
+	 * Parser Incomplete State
+	 *
+	 * Indicates that the parser has reached the end of the document before finishing
+	 * a token. It started parsing a token but there is a possibility that the input
+	 * HTML document was truncated in the middle of a token.
+	 *
+	 * The parser is reset at the start of the incomplete token and has paused. There
+	 * is nothing more than can be scanned unless provided a more complete document.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_INCOMPLETE = 'STATE_INCOMPLETE';
+
+	/**
+	 * Parser Matched Tag State
+	 *
+	 * Indicates that the parser has found an HTML tag and it's possible to get
+	 * the tag name and read or modify its attributes (if it's not a closing tag).
+	 *
+	 * @since 6.5.0
+	 *
+	 * @access private
+	 */
+	const STATE_MATCHED_TAG = 'STATE_MATCHED_TAG';
 }
diff --git a/lib/load.php b/lib/load.php
index f09391b5b5ab7..61a300447415d 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -79,7 +79,10 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-attribute-token-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-span-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-text-replacement-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-open-elements-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-state-6-5.php';
 require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-tag-processor-6-5.php';
+require __DIR__ . '/compat/wordpress-6.5/html-api/class-gutenberg-html-processor-6-5.php';
 
 /*
  * The HTML Processor appeared after WordPress 6.3. If Gutenberg is running on a version of
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index 03a590d21644f..a603ab142729c 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -58,6 +58,11 @@
 	<exclude-pattern>./vendor/*</exclude-pattern>
 	<exclude-pattern>./test/php/gutenberg-coding-standards/*</exclude-pattern>
 
+	<!-- Exclude files maintained in WordPress Core and backported to Gutenberg
+	     DO NOT REMOVE these rules; these files are "built" artifacts from Core
+	     and when they are removed it prevents keeping the repos in sync. -->
+	<exclude-pattern>./lib/compat/wordpress-*/html-api/*.php</exclude-pattern>
+
 	<!-- Ignore filename error since it requires WP core build process change -->
 	<rule ref="WordPress.Files.FileName.InvalidClassFileName">
 		<exclude-pattern>/phpunit/*</exclude-pattern>

From d159752fb162f9a91ba5dd88b70e7f77b2ec25c6 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Thu, 18 Jan 2024 09:15:30 +0800
Subject: [PATCH 155/296] Update pattern overrides to use a hard coded support
 array rather than the soon to be removed block bindings global (#57912)

---
 lib/block-supports/pattern.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
index 7c344d669e1f9..0c5868c1fea0c 100644
--- a/lib/block-supports/pattern.php
+++ b/lib/block-supports/pattern.php
@@ -13,8 +13,17 @@
 	 * @param WP_Block_Type $block_type Block Type.
 	 */
 	function gutenberg_register_pattern_support( $block_type ) {
-		global $block_bindings_allowed_blocks;
-		$pattern_support = array_key_exists( $block_type->name, $block_bindings_allowed_blocks );
+		// Note that this should be a duplicate or a subset of the $allowed_blocks
+		// defined in the `process_block_bindings` function.
+		// It should also match the client side config defined in
+		// `packages/patterns/src/constants.js`.
+		$allowed_blocks  = array(
+			'core/paragraph' => array( 'content' ),
+			'core/heading'   => array( 'content' ),
+			'core/image'     => array( 'url', 'title', 'alt' ),
+			'core/button'    => array( 'url', 'text' ),
+		);
+		$pattern_support = array_key_exists( $block_type->name, $allowed_blocks );
 
 		if ( $pattern_support ) {
 			if ( ! $block_type->uses_context ) {

From 9aed4b64cb35b2741bc8cecaaedaba20cbf49310 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 18 Jan 2024 08:34:24 +0000
Subject: [PATCH 156/296] Update Templates table layout (#57930)

* Templates

* Remove commeent

* Proportions

* lint offense

---------

Co-authored-by: ntsekouras <ntsekouras@outlook.com>
---
 packages/dataviews/src/style.scss             | 15 ++++++++-
 packages/dataviews/src/view-table.js          |  9 ++++--
 .../src/components/page-templates/index.js    | 32 +++++++++++--------
 .../src/components/page-templates/style.scss  |  4 +++
 4 files changed, 43 insertions(+), 17 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 156a901460048..a87b4a82c1ecd 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -59,6 +59,10 @@
 	margin: $grid-unit-40 0 $grid-unit-20;
 }
 
+.dataviews-view-table-wrapper {
+	overflow-x: scroll;
+}
+
 .dataviews-view-table {
 	width: 100%;
 	text-indent: 0;
@@ -81,7 +85,12 @@
 	td,
 	th {
 		padding: $grid-unit-15;
-		min-width: 160px;
+		white-space: nowrap;
+
+		@include break-huge() {
+			min-width: 200px;
+		}
+
 		&[data-field-id="actions"] {
 			text-align: right;
 		}
@@ -200,6 +209,10 @@
 	.dataviews-view-table-header {
 		padding-left: $grid-unit-05;
 	}
+
+	.dataviews-view-table__actions-column {
+		width: 1%;
+	}
 }
 
 .dataviews-view-list__primary-field,
diff --git a/packages/dataviews/src/view-table.js b/packages/dataviews/src/view-table.js
index 8be188bf91c81..361b4091d646f 100644
--- a/packages/dataviews/src/view-table.js
+++ b/packages/dataviews/src/view-table.js
@@ -437,7 +437,7 @@ function ViewTable( {
 	);
 
 	return (
-		<div>
+		<div className="dataviews-view-table-wrapper">
 			<table
 				className="dataviews-view-table"
 				aria-busy={ isLoading }
@@ -506,7 +506,10 @@ function ViewTable( {
 							</th>
 						) ) }
 						{ !! actions?.length && (
-							<th data-field-id="actions">
+							<th
+								data-field-id="actions"
+								className="dataviews-view-table__actions-column"
+							>
 								<span className="dataviews-view-table-header">
 									{ __( 'Actions' ) }
 								</span>
@@ -581,7 +584,7 @@ function ViewTable( {
 									</td>
 								) ) }
 								{ !! actions?.length && (
-									<td>
+									<td className="dataviews-view-table__actions-column">
 										<ItemActions
 											item={ item }
 											actions={ actions }
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index fd28c22298ba1..ddf4c18a3ce7f 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -216,20 +216,25 @@ export default function DataviewsTemplates() {
 				id: 'description',
 				getValue: ( { item } ) => item.description,
 				render: ( { item } ) => {
-					return item.description
-						? decodeEntities( item.description )
-						: view.type === LAYOUT_TABLE && (
-								<>
-									<Text variant="muted" aria-hidden="true">
-										&#8212;
-									</Text>
-									<VisuallyHidden>
-										{ __( 'No description.' ) }
-									</VisuallyHidden>
-								</>
-						  );
+					return item.description ? (
+						<span className="page-templates-description">
+							{ decodeEntities( item.description ) }
+						</span>
+					) : (
+						view.type === LAYOUT_TABLE && (
+							<>
+								<Text variant="muted" aria-hidden="true">
+									&#8212;
+								</Text>
+								<VisuallyHidden>
+									{ __( 'No description.' ) }
+								</VisuallyHidden>
+							</>
+						)
+					);
 				},
-				maxWidth: 200,
+				maxWidth: 400,
+				minWidth: 320,
 				enableSorting: false,
 			},
 			{
@@ -242,6 +247,7 @@ export default function DataviewsTemplates() {
 				enableHiding: false,
 				type: ENUMERATION_TYPE,
 				elements: authors,
+				width: '1%',
 			},
 		],
 		[ authors, view.type ]
diff --git a/packages/edit-site/src/components/page-templates/style.scss b/packages/edit-site/src/components/page-templates/style.scss
index ed4484550b48d..9fdca6d15d560 100644
--- a/packages/edit-site/src/components/page-templates/style.scss
+++ b/packages/edit-site/src/components/page-templates/style.scss
@@ -11,3 +11,7 @@
 		}
 	}
 }
+
+.page-templates-description {
+	white-space: normal;
+}

From bc6e2e216f7cd36887fbb0532566dca670f15385 Mon Sep 17 00:00:00 2001
From: Brooke <35543432+brookewp@users.noreply.github.com>
Date: Thu, 18 Jan 2024 01:18:20 -0800
Subject: [PATCH 157/296] CustomSelect: adjust `renderSelectedValue` to fix
 sizing (#57865)

* CustomSelect: adjust renderSelectedValue to fix sizing

* Revert "CustomSelect: adjust renderSelectedValue to fix sizing"

This reverts commit 924ce00a894d820a7213412cdec9dbaa6a6cf7d0.

* Update based on PR feedback

* Update changelog
---
 packages/components/CHANGELOG.md                           | 1 +
 packages/components/src/custom-select-control-v2/index.tsx | 7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 9a245d85ebf84..a97b666e02944 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -17,6 +17,7 @@
 ### Experimental
 
 -   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
+-   `CustomSelect`: adjust `renderSelectedValue` to fix sizing ([#57865](https://github.com/WordPress/gutenberg/pull/57865)).
 
 ## 25.15.0 (2024-01-10)
 
diff --git a/packages/components/src/custom-select-control-v2/index.tsx b/packages/components/src/custom-select-control-v2/index.tsx
index 614f52105513f..87750eaaec99e 100644
--- a/packages/components/src/custom-select-control-v2/index.tsx
+++ b/packages/components/src/custom-select-control-v2/index.tsx
@@ -49,7 +49,7 @@ export function CustomSelect( {
 	onChange,
 	size = 'default',
 	value,
-	renderSelectedValue = defaultRenderSelectedValue,
+	renderSelectedValue,
 	...props
 }: WordPressComponentProps< CustomSelectProps, 'button', false > ) {
 	const store = Ariakit.useSelectStore( {
@@ -60,6 +60,9 @@ export function CustomSelect( {
 
 	const { value: currentValue } = store.useState();
 
+	const computedRenderSelectedValue =
+		renderSelectedValue ?? defaultRenderSelectedValue;
+
 	return (
 		<>
 			<Styled.CustomSelectLabel store={ store }>
@@ -71,7 +74,7 @@ export function CustomSelect( {
 				hasCustomRenderProp={ !! renderSelectedValue }
 				store={ store }
 			>
-				{ renderSelectedValue( currentValue ) }
+				{ computedRenderSelectedValue( currentValue ) }
 				<Ariakit.SelectArrow />
 			</Styled.CustomSelectButton>
 			<Styled.CustomSelectPopover gutter={ 12 } store={ store } sameWidth>

From 8b5bc0e22480d9001d43f29b30e2c781dae8d221 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Thu, 18 Jan 2024 18:35:05 +0900
Subject: [PATCH 158/296] Global Styles: Correctly decode border color values
 (#57876)

---
 .../components/global-styles/border-panel.js  | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/packages/block-editor/src/components/global-styles/border-panel.js b/packages/block-editor/src/components/global-styles/border-panel.js
index ff1f3ddf55471..a1cbcfd9a01c6 100644
--- a/packages/block-editor/src/components/global-styles/border-panel.js
+++ b/packages/block-editor/src/components/global-styles/border-panel.js
@@ -85,8 +85,10 @@ export default function BorderPanel( {
 	defaultControls = DEFAULT_CONTROLS,
 } ) {
 	const colors = useColorsPerOrigin( settings );
-	const decodeValue = ( rawValue ) =>
-		getValueFromVariable( { settings }, '', rawValue );
+	const decodeValue = useCallback(
+		( rawValue ) => getValueFromVariable( { settings }, '', rawValue ),
+		[ settings ]
+	);
 	const encodeColorValue = ( colorValue ) => {
 		const allColors = colors.flatMap(
 			( { colors: originColors } ) => originColors
@@ -98,25 +100,13 @@ export default function BorderPanel( {
 			? 'var:preset|color|' + colorObject.slug
 			: colorValue;
 	};
-	const decodeColorValue = useCallback(
-		( colorValue ) => {
-			const allColors = colors.flatMap(
-				( { colors: originColors } ) => originColors
-			);
-			const colorObject = allColors.find(
-				( { slug } ) => colorValue === 'var:preset|color|' + slug
-			);
-			return colorObject ? colorObject.color : colorValue;
-		},
-		[ colors ]
-	);
 	const border = useMemo( () => {
 		if ( hasSplitBorders( inheritedValue?.border ) ) {
 			const borderValue = { ...inheritedValue?.border };
 			[ 'top', 'right', 'bottom', 'left' ].forEach( ( side ) => {
 				borderValue[ side ] = {
 					...borderValue[ side ],
-					color: decodeColorValue( borderValue[ side ]?.color ),
+					color: decodeValue( borderValue[ side ]?.color ),
 				};
 			} );
 			return borderValue;
@@ -124,10 +114,10 @@ export default function BorderPanel( {
 		return {
 			...inheritedValue?.border,
 			color: inheritedValue?.border?.color
-				? decodeColorValue( inheritedValue?.border?.color )
+				? decodeValue( inheritedValue?.border?.color )
 				: undefined,
 		};
-	}, [ inheritedValue?.border, decodeColorValue ] );
+	}, [ inheritedValue?.border, decodeValue ] );
 	const setBorder = ( newBorder ) =>
 		onChange( { ...value, border: newBorder } );
 	const showBorderColor = useHasBorderColorControl( settings );

From 142725a494f98da4babbdb15577e11f1b5408db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Thu, 18 Jan 2024 12:32:43 +0100
Subject: [PATCH 159/296] DataViews: make list layout the default for templates
 with the experiment enabled (#57933)

---
 .../src/components/page-main/index.js         |  5 ++++-
 .../src/components/page-templates/index.js    | 15 ++++++++++++-
 .../edit-site/src/components/sidebar/index.js |  6 ++++-
 .../edit-site/src/utils/get-is-list-page.js   |  1 +
 .../site-editor/new-templates-list.spec.js    | 22 ++++++++++++++++---
 5 files changed, 43 insertions(+), 6 deletions(-)

diff --git a/packages/edit-site/src/components/page-main/index.js b/packages/edit-site/src/components/page-main/index.js
index 7cc2025ac2c94..fead1b9dbc11e 100644
--- a/packages/edit-site/src/components/page-main/index.js
+++ b/packages/edit-site/src/components/page-main/index.js
@@ -20,7 +20,10 @@ export default function PageMain() {
 		params: { path },
 	} = useLocation();
 
-	if ( path === '/wp_template/all' ) {
+	if (
+		path === '/wp_template/all' ||
+		( path === '/wp_template' && window?.__experimentalAdminViews )
+	) {
 		return <PageTemplates />;
 	} else if ( path === '/wp_template_part/all' ) {
 		return <PageTemplateParts />;
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index ddf4c18a3ce7f..1e688971b4569 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -77,7 +77,7 @@ const defaultConfigPerViewType = {
 };
 
 const DEFAULT_VIEW = {
-	type: LAYOUT_TABLE,
+	type: LAYOUT_LIST,
 	search: '',
 	page: 1,
 	perPage: 20,
@@ -170,6 +170,18 @@ export default function DataviewsTemplates() {
 		[ setTemplateId ]
 	);
 
+	const onDetailsChange = useCallback(
+		( items ) => {
+			if ( items?.length === 1 ) {
+				history.push( {
+					postId: items[ 0 ].id,
+					postType: TEMPLATE_POST_TYPE,
+				} );
+			}
+		},
+		[ history ]
+	);
+
 	const authors = useMemo( () => {
 		if ( ! allTemplates ) {
 			return EMPTY_ARRAY;
@@ -369,6 +381,7 @@ export default function DataviewsTemplates() {
 					view={ view }
 					onChangeView={ onChangeView }
 					onSelectionChange={ onSelectionChange }
+					onDetailsChange={ onDetailsChange }
 					deferredRendering={
 						! view.hiddenFields?.includes( 'preview' )
 					}
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 73c6aea7e328c..1d0be62982e87 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -76,7 +76,11 @@ function SidebarScreens() {
 				<SidebarNavigationScreenPage />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/:postType(wp_template)">
-				<SidebarNavigationScreenTemplates />
+				{ window?.__experimentalAdminViews ? (
+					<SidebarNavigationScreenTemplatesBrowse />
+				) : (
+					<SidebarNavigationScreenTemplates />
+				) }
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/patterns">
 				<SidebarNavigationScreenPatterns />
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 9530cd85bf04b..3028b0e65d786 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -16,6 +16,7 @@ export default function getIsListPage(
 	return (
 		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
 		( path === '/page' && window?.__experimentalAdminViews ) ||
+		( path === '/wp_template' && window?.__experimentalAdminViews ) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.
diff --git a/test/e2e/specs/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index 13484abcb13ad..272a3ffff80bf 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -18,7 +18,11 @@ test.describe( 'Templates', () => {
 		] );
 	} );
 	test( 'Sorting', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
 		// Descending by title.
 		await page
 			.getByRole( 'button', { name: 'Template', exact: true } )
@@ -48,7 +52,13 @@ test.describe( 'Templates', () => {
 			title: 'Date Archives',
 			content: 'hi',
 		} );
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+
 		// Global search.
 		await page.getByRole( 'searchbox', { name: 'Filter list' } ).click();
 		await page.keyboard.type( 'tag' );
@@ -84,7 +94,13 @@ test.describe( 'Templates', () => {
 		await expect( titles ).toHaveCount( 2 );
 	} );
 	test( 'Field visibility', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template/all' } );
+		await admin.visitSiteEditor( { path: '/wp_template' } );
+
+		// Switch to table layout.
+		await page.getByLabel( 'View options' ).click();
+		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
+		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+
 		await page.getByRole( 'button', { name: 'Description' } ).click();
 		await page.getByRole( 'menuitem', { name: 'Hide' } ).click();
 		await expect(

From 57f604610002fb02d4e646ffe03cb52f09c302cb Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:02:25 +0100
Subject: [PATCH 160/296] Interactivity API: Prevent `wp-data-on=""` from
 creating `onDefault` handlers. (#57925)

* Prevent processing data-wp-on- without events

* Accidentaly removed one test

* Remove not needed test

* Update changelog
---
 packages/interactivity/CHANGELOG.md      |  4 ++++
 packages/interactivity/src/directives.js | 12 +++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 8514ecc6716f8..b96dce6ffdcd4 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -19,6 +19,10 @@
 -   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
 -   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
 
+### Bug Fix
+
+-   Prevent `wp-data-on=""` from creating `onDefault` handlers. ([#57925](https://github.com/WordPress/gutenberg/pull/57925))
+
 ## 3.2.0 (2024-01-10)
 
 ### Bug Fix
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index c24c01ecdfa63..e8fec14be7538 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -80,11 +80,13 @@ export default () => {
 
 	// data-wp-on--[event]
 	directive( 'on', ( { directives: { on }, element, evaluate } ) => {
-		on.forEach( ( entry ) => {
-			element.props[ `on${ entry.suffix }` ] = ( event ) => {
-				evaluate( entry, event );
-			};
-		} );
+		on.filter( ( { suffix } ) => suffix !== 'default' ).forEach(
+			( entry ) => {
+				element.props[ `on${ entry.suffix }` ] = ( event ) => {
+					evaluate( entry, event );
+				};
+			}
+		);
 	} );
 
 	// data-wp-class--[classname]

From e67f6fc22fecfd41b50b0d1fcab90e825bc493bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:28:56 +0100
Subject: [PATCH 161/296] DataViews: use table layout for templates when
 experiment disabled (#57960)

---
 packages/edit-site/src/components/page-templates/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 1e688971b4569..4ef099aed6d8d 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -77,7 +77,7 @@ const defaultConfigPerViewType = {
 };
 
 const DEFAULT_VIEW = {
-	type: LAYOUT_LIST,
+	type: window?.__experimentalAdminViews ? LAYOUT_LIST : LAYOUT_TABLE,
 	search: '',
 	page: 1,
 	perPage: 20,

From cac5e53463dc6b0ba0536d5b71ce87072980cb3c Mon Sep 17 00:00:00 2001
From: Bernie Reiter <96308+ockham@users.noreply.github.com>
Date: Thu, 18 Jan 2024 13:56:54 +0100
Subject: [PATCH 162/296] Block Hooks: Fix toggle (#57956)

Fix bug introduced by #56862.
---
 packages/block-editor/src/hooks/block-hooks.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/block-editor/src/hooks/block-hooks.js b/packages/block-editor/src/hooks/block-hooks.js
index a1640c72f4b2b..f9d7026e48545 100644
--- a/packages/block-editor/src/hooks/block-hooks.js
+++ b/packages/block-editor/src/hooks/block-hooks.js
@@ -83,7 +83,7 @@ function BlockHooksControlPure( { name, clientId } ) {
 					}
 
 					const hookedBlock = candidates?.find(
-						( candidate ) => name === candidate.name
+						( candidate ) => candidate.name === block.name
 					);
 
 					// If the block exists in the designated location, we consider it hooked

From 0cfc24fc985fa3542885eff96e6890604c777f32 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:09:09 +0100
Subject: [PATCH 163/296] Block editor: use context for useBlockEditingMode
 (#57950)

---
 .../components/block-editing-mode/index.js    | 18 ++++++++-------
 .../src/components/block-list/block.native.js | 17 +++++++++++++-
 .../block-list/private-block-context.js       |  2 +-
 .../src/cover/test/edit.native.js             | 23 ++++++++++++-------
 4 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/packages/block-editor/src/components/block-editing-mode/index.js b/packages/block-editor/src/components/block-editing-mode/index.js
index 20f93f6b36f90..0f0a65995ff95 100644
--- a/packages/block-editor/src/components/block-editing-mode/index.js
+++ b/packages/block-editor/src/components/block-editing-mode/index.js
@@ -2,13 +2,13 @@
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect } from '@wordpress/element';
+import { useEffect, useContext } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { useBlockEditContext } from '../block-edit/context';
+import { PrivateBlockContext } from '../block-list/private-block-context';
 
 /**
  * @typedef {'disabled'|'contentOnly'|'default'} BlockEditingMode
@@ -45,14 +45,16 @@ import { useBlockEditContext } from '../block-edit/context';
  * @return {BlockEditingMode} The current editing mode.
  */
 export function useBlockEditingMode( mode ) {
-	const { clientId = '' } = useBlockEditContext();
-	const blockEditingMode = useSelect(
+	const { clientId = '', blockEditingMode } =
+		useContext( PrivateBlockContext );
+	const { setBlockEditingMode, unsetBlockEditingMode } =
+		useDispatch( blockEditorStore );
+	const globalBlockEditingMode = useSelect(
 		( select ) =>
-			select( blockEditorStore ).getBlockEditingMode( clientId ),
+			// Avoid adding the subscription if not needed!
+			clientId ? null : select( blockEditorStore ).getBlockEditingMode(),
 		[ clientId ]
 	);
-	const { setBlockEditingMode, unsetBlockEditingMode } =
-		useDispatch( blockEditorStore );
 	useEffect( () => {
 		if ( mode ) {
 			setBlockEditingMode( clientId, mode );
@@ -63,5 +65,5 @@ export function useBlockEditingMode( mode ) {
 			}
 		};
 	}, [ clientId, mode, setBlockEditingMode, unsetBlockEditingMode ] );
-	return blockEditingMode;
+	return clientId ? blockEditingMode : globalBlockEditingMode;
 }
diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index f58251ee66583..dd7953299ea2e 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -42,6 +42,7 @@ import { store as blockEditorStore } from '../../store';
 import { useLayout } from './layout';
 import useScrollUponInsertion from './use-scroll-upon-insertion';
 import { useSettings } from '../use-settings';
+import { PrivateBlockContext } from './private-block-context';
 
 const EMPTY_ARRAY = [];
 
@@ -183,6 +184,7 @@ function BlockListBlock( {
 		isParentSelected,
 		order,
 		mayDisplayControls,
+		blockEditingMode,
 	} = useSelect(
 		( select ) => {
 			const {
@@ -196,6 +198,7 @@ function BlockListBlock( {
 				getBlockName,
 				isFirstMultiSelectedBlock,
 				getMultiSelectedBlockClientIds,
+				getBlockEditingMode,
 			} = select( blockEditorStore );
 			const currentBlockType = getBlockType( name || 'core/missing' );
 			const currentBlockCategory = currentBlockType?.category;
@@ -249,6 +252,7 @@ function BlockListBlock( {
 						getMultiSelectedBlockClientIds().every(
 							( id ) => getBlockName( id ) === name
 						) ),
+				blockEditingMode: getBlockEditingMode( clientId ),
 			};
 		},
 		[ clientId, isSelected, name, rootClientId ]
@@ -341,7 +345,7 @@ function BlockListBlock( {
 		order + 1
 	);
 
-	return (
+	const block = (
 		<BlockWrapper
 			accessibilityLabel={ accessibilityLabel }
 			blockCategory={ blockCategory }
@@ -400,6 +404,17 @@ function BlockListBlock( {
 			}
 		</BlockWrapper>
 	);
+
+	return (
+		<PrivateBlockContext.Provider
+			value={ {
+				clientId,
+				blockEditingMode,
+			} }
+		>
+			{ block }
+		</PrivateBlockContext.Provider>
+	);
 }
 
 const applyWithSelect = withSelect( ( select, { clientId, rootClientId } ) => {
diff --git a/packages/block-editor/src/components/block-list/private-block-context.js b/packages/block-editor/src/components/block-list/private-block-context.js
index 1498105896501..4ff3caa43a724 100644
--- a/packages/block-editor/src/components/block-list/private-block-context.js
+++ b/packages/block-editor/src/components/block-list/private-block-context.js
@@ -3,4 +3,4 @@
  */
 import { createContext } from '@wordpress/element';
 
-export const PrivateBlockContext = createContext( null );
+export const PrivateBlockContext = createContext( {} );
diff --git a/packages/block-library/src/cover/test/edit.native.js b/packages/block-library/src/cover/test/edit.native.js
index 6925cfe3f6221..8dd9215074754 100644
--- a/packages/block-library/src/cover/test/edit.native.js
+++ b/packages/block-library/src/cover/test/edit.native.js
@@ -32,6 +32,7 @@ import {
 import { IMAGE_BACKGROUND_TYPE } from '../shared';
 import * as paragraph from '../../paragraph';
 import * as cover from '..';
+import { PrivateBlockContext } from '../../../../block-editor/src/components/block-list/private-block-context';
 
 // Avoid errors due to mocked stylesheet files missing required selectors.
 jest.mock( '@wordpress/compose', () => ( {
@@ -80,14 +81,20 @@ const MEDIA_OPTIONS = [
 // Simplified tree to render Cover edit within slot.
 const CoverEdit = ( props ) => (
 	<SlotFillProvider>
-		<BlockEdit
-			isSelected
-			mayDisplayControls
-			name={ cover.name }
-			clientId={ 0 }
-			{ ...props }
-		/>
-		<BottomSheetSettings isVisible />
+		<PrivateBlockContext.Provider
+			value={ {
+				clientId: 0,
+			} }
+		>
+			<BlockEdit
+				isSelected
+				mayDisplayControls
+				name={ cover.name }
+				clientId={ 0 }
+				{ ...props }
+			/>
+			<BottomSheetSettings isVisible />
+		</PrivateBlockContext.Provider>
 	</SlotFillProvider>
 );
 

From c8ff23b1e0d70c0940362c34022c599569a37e46 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 18 Jan 2024 13:14:30 +0000
Subject: [PATCH 164/296] Use settings icon for view options button (#57964)

---
 packages/dataviews/src/view-actions.js | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/packages/dataviews/src/view-actions.js b/packages/dataviews/src/view-actions.js
index 65c4dff8c36f7..5c0b21ebb7828 100644
--- a/packages/dataviews/src/view-actions.js
+++ b/packages/dataviews/src/view-actions.js
@@ -7,12 +7,13 @@ import {
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 import { memo } from '@wordpress/element';
+import { settings } from '@wordpress/icons';
 
 /**
  * Internal dependencies
  */
 import { unlock } from './lock-unlock';
-import { VIEW_LAYOUTS, LAYOUT_TABLE, SORTING_DIRECTIONS } from './constants';
+import { VIEW_LAYOUTS, SORTING_DIRECTIONS } from './constants';
 
 const {
 	DropdownMenuV2: DropdownMenu,
@@ -260,12 +261,7 @@ const ViewActions = memo( function ViewActions( {
 			trigger={
 				<Button
 					size="compact"
-					icon={
-						VIEW_LAYOUTS.find( ( v ) => v.type === view.type )
-							?.icon ||
-						VIEW_LAYOUTS.find( ( v ) => v.type === LAYOUT_TABLE )
-							.icon
-					}
+					icon={ settings }
 					label={ __( 'View options' ) }
 				/>
 			}

From 013dc17f45cabaf30220ef6722793955b69251d6 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 18 Jan 2024 13:15:41 +0000
Subject: [PATCH 165/296] Update Pages preview field display (#57919)

---
 packages/dataviews/src/style.scss             |  3 +-
 .../src/components/page-pages/index.js        | 43 +++++++++++++------
 .../src/components/page-pages/style.scss      | 23 +++++++++-
 3 files changed, 55 insertions(+), 14 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index a87b4a82c1ecd..4cd5395895c55 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -289,7 +289,7 @@
 		border-bottom: 1px solid $gray-200;
 		background-color: $gray-100;
 
-		> * {
+		img {
 			object-fit: cover;
 			width: 100%;
 			height: 100%;
@@ -400,6 +400,7 @@
 		overflow: hidden;
 		position: relative;
 		flex-shrink: 0;
+		background-color: $gray-100;
 
 		img {
 			width: 100%;
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 5ef05273be02c..35382a25039fa 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -212,18 +212,37 @@ export default function PagePages() {
 				id: 'featured-image',
 				header: __( 'Featured Image' ),
 				getValue: ( { item } ) => item.featured_media,
-				render: ( { item } ) =>
-					!! item.featured_media ? (
-						<Media
-							className="edit-site-page-pages__featured-image"
-							id={ item.featured_media }
-							size={
-								view.type === LAYOUT_GRID
-									? [ 'large', 'full', 'medium', 'thumbnail' ]
-									: [ 'thumbnail', 'medium', 'large', 'full' ]
-							}
-						/>
-					) : null,
+				render: ( { item } ) => (
+					<span
+						className={
+							view.type === LAYOUT_TABLE
+								? 'edit-site-page-pages__media-wrapper'
+								: ''
+						}
+					>
+						{ !! item.featured_media ? (
+							<Media
+								className="edit-site-page-pages__featured-image"
+								id={ item.featured_media }
+								size={
+									view.type === LAYOUT_GRID
+										? [
+												'large',
+												'full',
+												'medium',
+												'thumbnail',
+										  ]
+										: [
+												'thumbnail',
+												'medium',
+												'large',
+												'full',
+										  ]
+								}
+							/>
+						) : null }
+					</span>
+				),
 				enableSorting: false,
 			},
 			{
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index 2bd7c771fd60d..c9169daa58979 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -1,5 +1,26 @@
-.edit-site-page-pages__featured-image {
+.edit-site-page-pages__media-wrapper {
 	width: $grid-unit-50;
 	height: $grid-unit-50;
 	display: block;
+	border-radius: $grid-unit-05;
+	position: relative;
+	background-color: $gray-100;
+	overflow: hidden;
+
+	.edit-site-page-pages__featured-image {
+		height: 100%;
+		object-fit: cover;
+		width: 100%;
+	}
+
+	&::after {
+		border-radius: 4px;
+		box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.1);
+		content: "";
+		height: 100%;
+		left: 0;
+		position: absolute;
+		top: 0;
+		width: 100%;
+	}
 }

From c726d853ebb710424dac17c1821080050e8d742a Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Thu, 18 Jan 2024 14:50:45 +0100
Subject: [PATCH 166/296] Site editor: reduce artificial loading delay from 1s
 to 100ms (#57953)

---
 packages/edit-site/src/components/layout/hooks.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/edit-site/src/components/layout/hooks.js b/packages/edit-site/src/components/layout/hooks.js
index a9bf1b982903a..184e1b44896c5 100644
--- a/packages/edit-site/src/components/layout/hooks.js
+++ b/packages/edit-site/src/components/layout/hooks.js
@@ -46,16 +46,17 @@ export function useIsSiteEditorLoading() {
 	useEffect( () => {
 		if ( inLoadingPause ) {
 			/*
-			 * We're using an arbitrary 1s timeout here to catch brief moments
-			 * without any resolving selectors that would result in displaying
-			 * brief flickers of loading state and loaded state.
+			 * We're using an arbitrary 100ms timeout here to catch brief
+			 * moments without any resolving selectors that would result in
+			 * displaying brief flickers of loading state and loaded state.
 			 *
 			 * It's worth experimenting with different values, since this also
-			 * adds 1s of artificial delay after loading has finished.
+			 * adds 100ms of artificial delay after loading has finished.
 			 */
+			const ARTIFICIAL_DELAY = 100;
 			const timeout = setTimeout( () => {
 				setLoaded( true );
-			}, 1000 );
+			}, ARTIFICIAL_DELAY );
 
 			return () => {
 				clearTimeout( timeout );

From 6ef2cbcfeeab2b1141b718e385cc4e8097f53646 Mon Sep 17 00:00:00 2001
From: Siobhan Bamber <siobhan@automattic.com>
Date: Thu, 18 Jan 2024 14:37:22 +0000
Subject: [PATCH 167/296] Mobile Release v1.111.0 (#57951)

---
 package-lock.json                             |  6 +++---
 packages/react-native-aztec/package.json      |  2 +-
 packages/react-native-bridge/package.json     |  2 +-
 packages/react-native-editor/CHANGELOG.md     |  2 ++
 packages/react-native-editor/ios/Podfile.lock | 10 +++++-----
 packages/react-native-editor/package.json     |  2 +-
 6 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6c47aab7fe1a1..d8b4d1038d8a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55701,7 +55701,7 @@
 		},
 		"packages/react-native-aztec": {
 			"name": "@wordpress/react-native-aztec",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/element": "file:../element",
@@ -55714,7 +55714,7 @@
 		},
 		"packages/react-native-bridge": {
 			"name": "@wordpress/react-native-bridge",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/react-native-aztec": "file:../react-native-aztec"
@@ -55725,7 +55725,7 @@
 		},
 		"packages/react-native-editor": {
 			"name": "@wordpress/react-native-editor",
-			"version": "1.110.0",
+			"version": "1.111.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json
index f91b214758b49..d3fdc4a71709a 100644
--- a/packages/react-native-aztec/package.json
+++ b/packages/react-native-aztec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-aztec",
-	"version": "1.110.0",
+	"version": "1.111.0",
 	"description": "Aztec view for react-native.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json
index 276e536dbf929..9068d83e1dec2 100644
--- a/packages/react-native-bridge/package.json
+++ b/packages/react-native-bridge/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-bridge",
-	"version": "1.110.0",
+	"version": "1.111.0",
 	"description": "Native bridge library used to integrate the block editor into a native App.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 7a1f6997d2a13..c5973ddace958 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,8 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+
+## 1.111.0
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
 -   [*] Fix missing custom color indicator for custom gradients [#57605]
 -   [**] Display a notice when a network connection unavailable [#56934]
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index cf40d621834bd..8e0ec890f1b07 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -13,7 +13,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.71.11)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Gutenberg (1.110.0):
+  - Gutenberg (1.111.0):
     - React-Core (= 0.71.11)
     - React-CoreModules (= 0.71.11)
     - React-RCTImage (= 0.71.11)
@@ -429,7 +429,7 @@ PODS:
     - React-RCTImage
   - RNSVG (13.9.0):
     - React-Core
-  - RNTAztecView (1.110.0):
+  - RNTAztecView (1.111.0):
     - React-Core
     - WordPress-Aztec-iOS (= 1.19.9)
   - SDWebImage (5.11.1):
@@ -610,14 +610,14 @@ EXTERNAL SOURCES:
     :path: "../../../node_modules/react-native/ReactCommon/yoga"
 
 SPEC CHECKSUMS:
-  boost: 57d2868c099736d80fcd648bf211b4431e51a558
+  boost: 7dcd2de282d72e344012f7d6564d024930a6a440
   BVLinearGradient: fbe308a1d19a8133f69e033abc85d8008644f5e3
   DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
   FBLazyVector: c511d4cd0210f416cb5c289bd5ae6b36d909b048
   FBReactNativeSpec: f07662560742d82a5b73cee116c70b0b49bcc220
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  Gutenberg: 758124df95be2159a16909fcf00e289b9299fa39
+  Gutenberg: 904e4e1fe0069106402b3c619fe755ddd6930e48
   hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -662,7 +662,7 @@ SPEC CHECKSUMS:
   RNReanimated: d4f363f4987ae0ade3e36ff81c94e68261bf4b8d
   RNScreens: 68fd1060f57dd1023880bf4c05d74784b5392789
   RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
-  RNTAztecView: 75ea6f071cbdd0f0afe83de7b93c0691a2bebd21
+  RNTAztecView: 1985084da164a50b19ce73e3b82395f89bbac7a6
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index 0a8ceed231ae4..dc559b60332b7 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-editor",
-	"version": "1.110.0",
+	"version": "1.111.0",
 	"description": "Mobile WordPress gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 97e642c05ca9cbcb4d3e577588e15490ed26501d Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Thu, 18 Jan 2024 16:33:16 +0100
Subject: [PATCH 168/296] Tooltip: forward and merge inner tooltip props
 correctly (#57878)

* Tooltip: forward and merge inner tooltip props correctly

* CHANGELOG

* Use internal context instead of connecting to the context system

* Delete unnecessary removeExtraPropsAddedByContext utility

* CHANGELOG

* Add suggested unit test
---
 packages/components/CHANGELOG.md              |  3 +-
 packages/components/src/tooltip/index.tsx     | 55 ++++++++++---------
 .../components/src/tooltip/test/index.tsx     | 11 ++++
 packages/components/src/tooltip/types.ts      |  2 +-
 4 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index a97b666e02944..92ce15dc425f6 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -10,9 +10,10 @@
 -   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 
-### Bug Fixes
+### Bug Fix
 
 -   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
+-   `Tooltip`: Improve props forwarding to children of nested `Tooltip` components ([#57878](https://github.com/WordPress/gutenberg/pull/57878)).
 
 ### Experimental
 
diff --git a/packages/components/src/tooltip/index.tsx b/packages/components/src/tooltip/index.tsx
index 1e652d9a42dbb..f71182b85edb2 100644
--- a/packages/components/src/tooltip/index.tsx
+++ b/packages/components/src/tooltip/index.tsx
@@ -8,34 +8,39 @@ import * as Ariakit from '@ariakit/react';
  * WordPress dependencies
  */
 import { useInstanceId } from '@wordpress/compose';
-import { Children, cloneElement } from '@wordpress/element';
+import {
+	Children,
+	useContext,
+	createContext,
+	forwardRef,
+} from '@wordpress/element';
 import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
  */
-import type { TooltipProps, TooltipInternalContext } from './types';
+import type {
+	TooltipProps,
+	TooltipInternalContext as TooltipInternalContextType,
+} from './types';
 import Shortcut from '../shortcut';
 import { positionToPlacement } from '../popover/utils';
-import {
-	contextConnect,
-	useContextSystem,
-	ContextSystemProvider,
-} from '../context';
 import type { WordPressComponentProps } from '../context';
 
+const TooltipInternalContext = createContext< TooltipInternalContextType >( {
+	isNestedInTooltip: false,
+} );
+
 /**
  * Time over anchor to wait before showing tooltip
  */
 export const TOOLTIP_DELAY = 700;
 
 const CONTEXT_VALUE = {
-	Tooltip: {
-		isNestedInTooltip: true,
-	},
+	isNestedInTooltip: true,
 };
 
-function UnconnectedTooltip(
+function UnforwardedTooltip(
 	props: WordPressComponentProps< TooltipProps, 'div', false >,
 	ref: React.ForwardedRef< any >
 ) {
@@ -48,14 +53,10 @@ function UnconnectedTooltip(
 		shortcut,
 		text,
 
-		// From Internal Context system
-		isNestedInTooltip,
-
 		...restProps
-	} = useContextSystem< typeof props & TooltipInternalContext >(
-		props,
-		'Tooltip'
-	);
+	} = props;
+
+	const { isNestedInTooltip } = useContext( TooltipInternalContext );
 
 	const baseId = useInstanceId( Tooltip, 'tooltip' );
 	const describedById = text || shortcut ? baseId : undefined;
@@ -96,16 +97,15 @@ function UnconnectedTooltip(
 	} );
 
 	if ( isNestedInTooltip ) {
-		return isOnlyChild
-			? cloneElement( children, {
-					...restProps,
-					ref,
-			  } )
-			: children;
+		return isOnlyChild ? (
+			<Ariakit.Role { ...restProps } render={ children } />
+		) : (
+			children
+		);
 	}
 
 	return (
-		<ContextSystemProvider value={ CONTEXT_VALUE }>
+		<TooltipInternalContext.Provider value={ CONTEXT_VALUE }>
 			<Ariakit.TooltipAnchor
 				onClick={ hideOnClick ? tooltipStore.hide : undefined }
 				store={ tooltipStore }
@@ -117,6 +117,7 @@ function UnconnectedTooltip(
 			{ isOnlyChild && ( text || shortcut ) && (
 				<Ariakit.Tooltip
 					{ ...restProps }
+					className="components-tooltip"
 					unmountOnHide
 					gutter={ 4 }
 					id={ describedById }
@@ -134,10 +135,10 @@ function UnconnectedTooltip(
 					) }
 				</Ariakit.Tooltip>
 			) }
-		</ContextSystemProvider>
+		</TooltipInternalContext.Provider>
 	);
 }
 
-export const Tooltip = contextConnect( UnconnectedTooltip, 'Tooltip' );
+export const Tooltip = forwardRef( UnforwardedTooltip );
 
 export default Tooltip;
diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index ed6f7b5f7b4a1..40038bbc5e25a 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -102,6 +102,17 @@ describe( 'Tooltip', () => {
 				screen.queryByRole( 'button', { description: 'tooltip text' } )
 			).not.toBeInTheDocument();
 		} );
+
+		it( 'should not leak Tooltip props to the tooltip anchor', () => {
+			render(
+				<Tooltip data-foo>
+					<button>Anchor</button>
+				</Tooltip>
+			);
+			expect(
+				screen.getByRole( 'button', { name: 'Anchor' } )
+			).not.toHaveAttribute( 'data-foo' );
+		} );
 	} );
 
 	describe( 'keyboard focus', () => {
diff --git a/packages/components/src/tooltip/types.ts b/packages/components/src/tooltip/types.ts
index 3d28a1a0e96c6..11268683bc2ce 100644
--- a/packages/components/src/tooltip/types.ts
+++ b/packages/components/src/tooltip/types.ts
@@ -61,5 +61,5 @@ export type TooltipProps = {
 };
 
 export type TooltipInternalContext = {
-	isNestedInTooltip?: boolean;
+	isNestedInTooltip: boolean;
 };

From 40a2e8ff9fb4d884569b94928ac6e89af4c8a0e3 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Thu, 18 Jan 2024 16:46:42 +0100
Subject: [PATCH 169/296] Block editor: fix performance regression after #57950
 (#57971)

---
 .../src/components/block-edit/context.js      |  1 +
 .../src/components/block-edit/index.js        |  4 ++++
 .../components/block-editing-mode/index.js    | 13 +++++++----
 .../src/components/block-list/block.js        |  1 +
 .../src/components/block-list/block.native.js | 15 ++----------
 .../src/cover/test/edit.native.js             | 23 +++++++------------
 6 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/packages/block-editor/src/components/block-edit/context.js b/packages/block-editor/src/components/block-edit/context.js
index 6b0b1af9ea22d..b280cc9c51f6b 100644
--- a/packages/block-editor/src/components/block-edit/context.js
+++ b/packages/block-editor/src/components/block-edit/context.js
@@ -5,6 +5,7 @@ import { createContext, useContext } from '@wordpress/element';
 
 export const mayDisplayControlsKey = Symbol( 'mayDisplayControls' );
 export const mayDisplayParentControlsKey = Symbol( 'mayDisplayParentControls' );
+export const blockEditingModeKey = Symbol( 'blockEditingMode' );
 
 export const DEFAULT_BLOCK_EDIT_CONTEXT = {
 	name: '',
diff --git a/packages/block-editor/src/components/block-edit/index.js b/packages/block-editor/src/components/block-edit/index.js
index bbef47b27c579..457cd919f8938 100644
--- a/packages/block-editor/src/components/block-edit/index.js
+++ b/packages/block-editor/src/components/block-edit/index.js
@@ -13,6 +13,7 @@ import {
 	useBlockEditContext,
 	mayDisplayControlsKey,
 	mayDisplayParentControlsKey,
+	blockEditingModeKey,
 } from './context';
 
 /**
@@ -28,6 +29,7 @@ export { useBlockEditContext };
 export default function BlockEdit( {
 	mayDisplayControls,
 	mayDisplayParentControls,
+	blockEditingMode,
 	// The remaining props are passed through the BlockEdit filters and are thus
 	// public API!
 	...props
@@ -59,6 +61,7 @@ export default function BlockEdit( {
 					// usage outside of the package (this context is exposed).
 					[ mayDisplayControlsKey ]: mayDisplayControls,
 					[ mayDisplayParentControlsKey ]: mayDisplayParentControls,
+					[ blockEditingModeKey ]: blockEditingMode,
 				} ),
 				[
 					name,
@@ -69,6 +72,7 @@ export default function BlockEdit( {
 					__unstableLayoutClassNames,
 					mayDisplayControls,
 					mayDisplayParentControls,
+					blockEditingMode,
 				]
 			) }
 		>
diff --git a/packages/block-editor/src/components/block-editing-mode/index.js b/packages/block-editor/src/components/block-editing-mode/index.js
index 0f0a65995ff95..7cb500af1e9c0 100644
--- a/packages/block-editor/src/components/block-editing-mode/index.js
+++ b/packages/block-editor/src/components/block-editing-mode/index.js
@@ -2,13 +2,16 @@
  * WordPress dependencies
  */
 import { useSelect, useDispatch } from '@wordpress/data';
-import { useEffect, useContext } from '@wordpress/element';
+import { useEffect } from '@wordpress/element';
 
 /**
  * Internal dependencies
  */
 import { store as blockEditorStore } from '../../store';
-import { PrivateBlockContext } from '../block-list/private-block-context';
+import {
+	useBlockEditContext,
+	blockEditingModeKey,
+} from '../block-edit/context';
 
 /**
  * @typedef {'disabled'|'contentOnly'|'default'} BlockEditingMode
@@ -45,8 +48,8 @@ import { PrivateBlockContext } from '../block-list/private-block-context';
  * @return {BlockEditingMode} The current editing mode.
  */
 export function useBlockEditingMode( mode ) {
-	const { clientId = '', blockEditingMode } =
-		useContext( PrivateBlockContext );
+	const context = useBlockEditContext();
+	const { clientId = '' } = context;
 	const { setBlockEditingMode, unsetBlockEditingMode } =
 		useDispatch( blockEditorStore );
 	const globalBlockEditingMode = useSelect(
@@ -65,5 +68,5 @@ export function useBlockEditingMode( mode ) {
 			}
 		};
 	}, [ clientId, mode, setBlockEditingMode, unsetBlockEditingMode ] );
-	return clientId ? blockEditingMode : globalBlockEditingMode;
+	return clientId ? context[ blockEditingModeKey ] : globalBlockEditingMode;
 }
diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
index 0bfc940865a09..af96f0e3483d1 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -133,6 +133,7 @@ function BlockListBlock( {
 			}
 			mayDisplayControls={ mayDisplayControls }
 			mayDisplayParentControls={ mayDisplayParentControls }
+			blockEditingMode={ context.blockEditingMode }
 		/>
 	);
 
diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index dd7953299ea2e..c4f86cfe25a42 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -42,7 +42,6 @@ import { store as blockEditorStore } from '../../store';
 import { useLayout } from './layout';
 import useScrollUponInsertion from './use-scroll-upon-insertion';
 import { useSettings } from '../use-settings';
-import { PrivateBlockContext } from './private-block-context';
 
 const EMPTY_ARRAY = [];
 
@@ -345,7 +344,7 @@ function BlockListBlock( {
 		order + 1
 	);
 
-	const block = (
+	return (
 		<BlockWrapper
 			accessibilityLabel={ accessibilityLabel }
 			blockCategory={ blockCategory }
@@ -397,6 +396,7 @@ function BlockListBlock( {
 							}
 							wrapperProps={ wrapperProps }
 							mayDisplayControls={ mayDisplayControls }
+							blockEditingMode={ blockEditingMode }
 						/>
 						<View onLayout={ onLayout } />
 					</GlobalStylesContext.Provider>
@@ -404,17 +404,6 @@ function BlockListBlock( {
 			}
 		</BlockWrapper>
 	);
-
-	return (
-		<PrivateBlockContext.Provider
-			value={ {
-				clientId,
-				blockEditingMode,
-			} }
-		>
-			{ block }
-		</PrivateBlockContext.Provider>
-	);
 }
 
 const applyWithSelect = withSelect( ( select, { clientId, rootClientId } ) => {
diff --git a/packages/block-library/src/cover/test/edit.native.js b/packages/block-library/src/cover/test/edit.native.js
index 8dd9215074754..6925cfe3f6221 100644
--- a/packages/block-library/src/cover/test/edit.native.js
+++ b/packages/block-library/src/cover/test/edit.native.js
@@ -32,7 +32,6 @@ import {
 import { IMAGE_BACKGROUND_TYPE } from '../shared';
 import * as paragraph from '../../paragraph';
 import * as cover from '..';
-import { PrivateBlockContext } from '../../../../block-editor/src/components/block-list/private-block-context';
 
 // Avoid errors due to mocked stylesheet files missing required selectors.
 jest.mock( '@wordpress/compose', () => ( {
@@ -81,20 +80,14 @@ const MEDIA_OPTIONS = [
 // Simplified tree to render Cover edit within slot.
 const CoverEdit = ( props ) => (
 	<SlotFillProvider>
-		<PrivateBlockContext.Provider
-			value={ {
-				clientId: 0,
-			} }
-		>
-			<BlockEdit
-				isSelected
-				mayDisplayControls
-				name={ cover.name }
-				clientId={ 0 }
-				{ ...props }
-			/>
-			<BottomSheetSettings isVisible />
-		</PrivateBlockContext.Provider>
+		<BlockEdit
+			isSelected
+			mayDisplayControls
+			name={ cover.name }
+			clientId={ 0 }
+			{ ...props }
+		/>
+		<BottomSheetSettings isVisible />
 	</SlotFillProvider>
 );
 

From 3f010e6c72a04cd6f314d1061842cf40c3b68daa Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Thu, 18 Jan 2024 17:56:16 +0100
Subject: [PATCH 170/296] Interactivity API: Remove unused `state` and rename
 `props` to `attributes` in `getElement()` (#57974)

* Remove state from getElement()

* Refactor props to attributes in getElement()

* Update changelog

* Update spaces in CHANGELOG

* Fix spaces in changelog

* Fix duplicate section

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 packages/interactivity/CHANGELOG.md  |  8 +++-----
 packages/interactivity/src/hooks.tsx | 15 ++++++---------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index b96dce6ffdcd4..71ec27e50a87e 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -4,20 +4,18 @@
 
 ### Enhancements
 
-- Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
+-   Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
+-   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
 
 ### New Features
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
 
-### Enhancements
-
--  Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
-
 ### Breaking Changes
 
 -   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
 -   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
+-   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([#57974](https://github.com/WordPress/gutenberg/pull/57974))
 
 ### Bug Fix
 
diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
index 14f0dc6683b46..0f3bb145b6559 100644
--- a/packages/interactivity/src/hooks.tsx
+++ b/packages/interactivity/src/hooks.tsx
@@ -3,7 +3,6 @@
  */
 import { h, options, createContext, cloneElement } from 'preact';
 import { useRef, useCallback, useContext } from 'preact/hooks';
-import { deepSignal } from 'deepsignal';
 import type { VNode, Context, RefObject } from 'preact';
 
 /**
@@ -60,8 +59,7 @@ interface Scope {
 	evaluate: Evaluate;
 	context: Context< any >;
 	ref: RefObject< HTMLElement >;
-	state: any;
-	props: any;
+	attributes: h.JSX.HTMLAttributes;
 }
 
 interface Evaluate {
@@ -142,11 +140,10 @@ export const getElement = () => {
 			'Cannot call `getElement()` outside getters and actions used by directives.'
 		);
 	}
-	const { ref, state, props } = getScope();
+	const { ref, attributes } = getScope();
 	return Object.freeze( {
 		ref: ref.current,
-		state,
-		props: deepImmutable( props ),
+		attributes: deepImmutable( attributes ),
 	} );
 };
 
@@ -313,12 +310,12 @@ const Directives = ( {
 	scope.context = useContext( context );
 	/* eslint-disable react-hooks/rules-of-hooks */
 	scope.ref = previousScope?.ref || useRef( null );
-	scope.state = previousScope?.state || useRef( deepSignal( {} ) ).current;
 	/* eslint-enable react-hooks/rules-of-hooks */
 
-	// Create a fresh copy of the vnode element and add the props to the scope.
+	// Create a fresh copy of the vnode element and add the props to the scope,
+	// named as attributes (HTML Attributes).
 	element = cloneElement( element, { ref: scope.ref } );
-	scope.props = element.props;
+	scope.attributes = element.props;
 
 	// Recursively render the wrapper for the next priority level.
 	const children =

From 0cce3a70a9a30960851b1848654d782e9235981f Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Thu, 18 Jan 2024 19:13:40 +0100
Subject: [PATCH 171/296] Site editor: avoid parsing ALL patterns on load
 (#57856)

---
 .../src/template-part/edit/index.js           | 104 +++++++++++-------
 1 file changed, 64 insertions(+), 40 deletions(-)

diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 163dfa5403ce6..888f767635924 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -29,6 +29,43 @@ import {
 	useTemplatePartArea,
 } from './utils/hooks';
 
+function ReplaceButton( {
+	isEntityAvailable,
+	area,
+	clientId,
+	templatePartId,
+	isTemplatePartSelectionOpen,
+	setIsTemplatePartSelectionOpen,
+} ) {
+	const { templateParts } = useAlternativeTemplateParts(
+		area,
+		templatePartId
+	);
+	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
+
+	const hasReplacements = !! templateParts.length || !! blockPatterns.length;
+	const canReplace =
+		isEntityAvailable &&
+		hasReplacements &&
+		( area === 'header' || area === 'footer' );
+
+	if ( ! canReplace ) {
+		return null;
+	}
+
+	return (
+		<MenuItem
+			onClick={ () => {
+				setIsTemplatePartSelectionOpen( true );
+			} }
+			aria-expanded={ isTemplatePartSelectionOpen }
+			aria-haspopup="dialog"
+		>
+			{ __( 'Replace' ) }
+		</MenuItem>
+	);
+}
+
 export default function TemplatePartEdit( {
 	attributes,
 	setAttributes,
@@ -81,23 +118,13 @@ export default function TemplatePartEdit( {
 		},
 		[ templatePartId, attributes.area, clientId ]
 	);
-	const { templateParts } = useAlternativeTemplateParts(
-		area,
-		templatePartId
-	);
-	const blockPatterns = useAlternativeBlockPatterns( area, clientId );
-	const hasReplacements = !! templateParts.length || !! blockPatterns.length;
+
 	const areaObject = useTemplatePartArea( area );
 	const blockProps = useBlockProps();
 	const isPlaceholder = ! slug;
 	const isEntityAvailable = ! isPlaceholder && ! isMissing && isResolved;
 	const TagName = tagName || areaObject.tagName;
 
-	const canReplace =
-		isEntityAvailable &&
-		hasReplacements &&
-		( area === 'header' || area === 'footer' );
-
 	// We don't want to render a missing state if we have any inner blocks.
 	// A new template part is automatically created if we have any inner blocks but no entity.
 	if (
@@ -153,36 +180,33 @@ export default function TemplatePartEdit( {
 						/>
 					</TagName>
 				) }
-				{ canReplace && (
-					<BlockSettingsMenuControls>
-						{ ( { selectedClientIds } ) => {
-							// Only enable for single selection that matches the current block.
-							// Ensures menu item doesn't render multiple times.
-							if (
-								! (
-									selectedClientIds.length === 1 &&
-									clientId === selectedClientIds[ 0 ]
-								)
-							) {
-								return null;
-							}
+				<BlockSettingsMenuControls>
+					{ ( { selectedClientIds } ) => {
+						// Only enable for single selection that matches the current block.
+						// Ensures menu item doesn't render multiple times.
+						if (
+							! (
+								selectedClientIds.length === 1 &&
+								clientId === selectedClientIds[ 0 ]
+							)
+						) {
+							return null;
+						}
 
-							return (
-								<MenuItem
-									onClick={ () => {
-										setIsTemplatePartSelectionOpen( true );
-									} }
-									aria-expanded={
-										isTemplatePartSelectionOpen
-									}
-									aria-haspopup="dialog"
-								>
-									{ __( 'Replace' ) }
-								</MenuItem>
-							);
-						} }
-					</BlockSettingsMenuControls>
-				) }
+						return (
+							<ReplaceButton
+								{ ...{
+									isEntityAvailable,
+									area,
+									clientId,
+									templatePartId,
+									isTemplatePartSelectionOpen,
+									setIsTemplatePartSelectionOpen,
+								} }
+							/>
+						);
+					} }
+				</BlockSettingsMenuControls>
 				{ isEntityAvailable && (
 					<TemplatePartInnerBlocks
 						tagName={ TagName }

From 653832dc33ba1f667be05b24d9608829abdc716f Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Thu, 18 Jan 2024 20:02:43 +0100
Subject: [PATCH 172/296] Interactivity API: Add `wp-data-on-window` and
 `wp-data-on-document` directives (#57931)

* Add wp-data-on-window and wp-data-on-document directives

* Update changelog

* Rename directives tests files to unify them

* Use callbacks instead of actions, remove not needed counter

* Add event listener removal tests

* Add documentation

* Test that events are reattached

* Fix docs typos

* Fix docs typos

* Fix indentation in docs

* Fix e2e test
---
 .../directive-on-document/block.json          |  15 ++
 .../directive-on-document/render.php          |  18 ++
 .../directive-on-document/view.js             |  34 ++++
 .../directive-on-window/block.json            |  15 ++
 .../directive-on-window/render.php            |  18 ++
 .../directive-on-window/view.js               |  34 ++++
 packages/interactivity/CHANGELOG.md           |   1 +
 .../interactivity/docs/2-api-reference.md     | 160 +++++++++++++-----
 packages/interactivity/src/directives.js      |  98 +++++++----
 ...es-body.spec.ts => directive-body.spec.ts} |   0
 ...-class.spec.ts => directive-class.spec.ts} |   0
 ...text.spec.ts => directive-context.spec.ts} |   0
 .../directive-on-document.spec.ts             |  47 +++++
 .../interactivity/directive-on-window.spec.ts |  45 +++++
 ...-style.spec.ts => directive-style.spec.ts} |   0
 ...es-text.spec.ts => directive-text.spec.ts} |   0
 16 files changed, 404 insertions(+), 81 deletions(-)
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
 rename test/e2e/specs/interactivity/{directives-body.spec.ts => directive-body.spec.ts} (100%)
 rename test/e2e/specs/interactivity/{directives-class.spec.ts => directive-class.spec.ts} (100%)
 rename test/e2e/specs/interactivity/{directives-context.spec.ts => directive-context.spec.ts} (100%)
 create mode 100644 test/e2e/specs/interactivity/directive-on-document.spec.ts
 create mode 100644 test/e2e/specs/interactivity/directive-on-window.spec.ts
 rename test/e2e/specs/interactivity/{directives-style.spec.ts => directive-style.spec.ts} (100%)
 rename test/e2e/specs/interactivity/{directives-text.spec.ts => directive-text.spec.ts} (100%)

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
new file mode 100644
index 0000000000000..296a9b2f04190
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-on-document",
+	"title": "E2E Interactivity tests - directive on document",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "directive-on-document-view",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
new file mode 100644
index 0000000000000..d04cb79ea5852
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-on-document-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "directive-on-document" }' data-wp-context='{"isVisible":true}'>
+	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
+	<div data-wp-show-mock="context.isVisible">
+		<div data-wp-on-document--keydown="callbacks.keydownHandler">
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
new file mode 100644
index 0000000000000..b3cb891e4d6cb
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
@@ -0,0 +1,34 @@
+/**
+ * WordPress dependencies
+ */
+import { store, directive, getContext } from '@wordpress/interactivity';
+
+// Mock `data-wp-show` directive to test when things are removed from the
+// DOM.  Replace with `data-wp-show` when it's ready.
+directive(
+	'show-mock',
+	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
+		const entry = showMock.find( ( { suffix } ) => suffix === 'default' );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-document', {
+	state: {
+		counter: 0,
+	},
+	callbacks: {
+		keydownHandler: ( ) => {
+			state.counter += 1;
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			const context = getContext();
+			context.isVisible = ! context.isVisible;
+		},
+	}
+} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
new file mode 100644
index 0000000000000..9d55395b087a6
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-on-window",
+	"title": "E2E Interactivity tests - directive on window",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "directive-on-window-view",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
new file mode 100644
index 0000000000000..e9c8792354e2a
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
@@ -0,0 +1,18 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-on-window-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "directive-on-window" }' data-wp-context='{"isVisible":true}'>
+	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
+	<div data-wp-show-mock="context.isVisible">
+		<div data-wp-on-window--resize="callbacks.resizeHandler">
+			<p data-wp-text="state.counter" data-testid="counter">0</p>
+		</div>
+	</div>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
new file mode 100644
index 0000000000000..11d01b7a216d1
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
@@ -0,0 +1,34 @@
+/**
+ * WordPress dependencies
+ */
+import { store, directive, getContext } from '@wordpress/interactivity';
+
+// Mock `data-wp-show` directive to test when things are removed from the
+// DOM.  Replace with `data-wp-show` when it's ready.
+directive(
+	'show-mock',
+	( { directives: { 'show-mock': showMock }, element, evaluate } ) => {
+		const entry = showMock.find( ( { suffix } ) => suffix === 'default' );
+		if ( ! evaluate( entry ) ) {
+			return null;
+		}
+		return element;
+	}
+);
+
+const { state } = store( 'directive-on-window', {
+	state: {
+		counter: 0,
+	},
+	callbacks: {
+		resizeHandler: ( ) => {
+			state.counter += 1;
+		},
+	},
+	actions: {
+		visibilityHandler: () => {
+			const context = getContext();
+			context.isVisible = ! context.isVisible;
+		},
+	}
+} );
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 71ec27e50a87e..d660032cbc038 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -10,6 +10,7 @@
 ### New Features
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
+-   Add `wp-data-on-window` and `wp-data-on-document` directives. ([57931](https://github.com/WordPress/gutenberg/pull/57931))
 
 ### Breaking Changes
 
diff --git a/packages/interactivity/docs/2-api-reference.md b/packages/interactivity/docs/2-api-reference.md
index 7980c31b984f8..922662c10a8e2 100644
--- a/packages/interactivity/docs/2-api-reference.md
+++ b/packages/interactivity/docs/2-api-reference.md
@@ -20,6 +20,8 @@ DOM elements are connected to data stored in the state and context through direc
     - [`wp-style`](#wp-style) ![](https://img.shields.io/badge/ATTRIBUTES-afd2e3.svg)
     - [`wp-text`](#wp-text) ![](https://img.shields.io/badge/CONTENT-afd2e3.svg)
     - [`wp-on`](#wp-on) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
+    - [`wp-on-window`](#wp-on-window) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
+    - [`wp-on-document`](#wp-on-document) ![](https://img.shields.io/badge/EVENT_HANDLERS-afd2e3.svg)
     - [`wp-watch`](#wp-watch) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-init`](#wp-init) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-run`](#wp-run) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
@@ -55,7 +57,7 @@ _Example of directives used in the HTML markup_
   >
     Toggle
   </button>
- 
+
   <p id="p-1" data-bind--hidden="!context.isOpen">
     This element is now visible!
   </p>
@@ -68,13 +70,13 @@ Directives can also be injected dynamically using the [HTML Tag Processor](https
 
 With directives, we can directly manage behavior related to things such as side effects, state, event handlers, attributes or content.
 
-#### `wp-interactive` 
+#### `wp-interactive`
 
 The `wp-interactive` directive "activates" the interactivity for the DOM element and its children through the Interactivity API (directives and store). It includes a namespace to reference a specific store.
 
 ```html
 <!-- Let's make this element and its children interactive and set the namespace -->
-<div 
+<div
   data-wp-interactive='{ "namespace": "myPlugin" }'
   data-wp-context='{ "myColor" : "red", "myBgColor": "yellow" }'
 >
@@ -88,13 +90,13 @@ The `wp-interactive` directive "activates" the interactivity for the DOM element
 > **Note**
 > The use of `data-wp-interactive` is a requirement for the Interactivity API "engine" to work. In the following examples the `data-wp-interactive` has not been added for the sake of simplicity. Also, the `data-wp-interactive` directive will be injected automatically in the future.
 
-#### `wp-context` 
+#### `wp-context`
 
 It provides a **local** state available to a specific HTML node and its children.
 
 The `wp-context` directive accepts a stringified JSON as a value.
 
-_Example of `wp-context` directive_ 
+_Example of `wp-context` directive_
 
 ```php
 //render.php
@@ -139,13 +141,13 @@ Different contexts can be defined at different levels, and deeper levels will me
 </div>
 ```
 
-#### `wp-bind` 
+#### `wp-bind`
 
 It allows setting HTML attributes on elements based on a boolean or string value.
 
 > This directive follows the syntax `data-wp-bind--attribute`.
 
-_Example of `wp-bind` directive_ 
+_Example of `wp-bind` directive_
 
 ```html
 <li data-wp-context='{ "isMenuOpen": false }'>
@@ -183,10 +185,10 @@ store( "myPlugin", {
 
 The `wp-bind` directive is executed:
 
-- When the element is created. 
+- When the element is created.
 - Each time there's a change on any of the properties of the `state` or `context` involved in getting the final value of the directive (inside the callback or the expression passed as reference).
 
-When `wp-bind` directive references a callback to get its final value: 
+When `wp-bind` directive references a callback to get its final value:
 
 - The `wp-bind` directive will be executed each time there's a change on any of the properties of the `state` or `context` used inside this callback.
 - The returned value in the callback function is used to change the value of the associated attribute.
@@ -198,24 +200,24 @@ The `wp-bind` will do different things over the DOM element is applied, dependin
   - If the value is a string, the attribute is added with its value assigned: `<div attribute="value"`.
   - If the attribute name starts with `aria-` or `data-` and the value is boolean (either `true` or `false`), the attribute is added to the DOM with the boolean value assigned as a string: `<div aria-attribute="true">`.
 
-#### `wp-class` 
+#### `wp-class`
 
 It adds or removes a class to an HTML element, depending on a boolean value.
 
 > This directive follows the syntax `data-wp-class--classname`.
 
-_Example of `wp-class` directive_ 
+_Example of `wp-class` directive_
 
 ```html
 <div>
-  <li 
+  <li
     data-wp-context='{ "isSelected": false }'
     data-wp-on--click="actions.toggleSelection"
     data-wp-class--selected="context.isSelected"
   >
     Option 1
   </li>
-  <li 
+  <li
     data-wp-context='{ "isSelected": false }'
     data-wp-on--click="actions.toggleSelection"
     data-wp-class--selected="context.isSelected"
@@ -251,13 +253,13 @@ When `wp-class` directive references a callback to get its final boolean value,
 
 The boolean value received by the directive is used to toggle (add when `true` or remove when `false`) the associated class name from the `class` attribute.
 
-#### `wp-style` 
+#### `wp-style`
 
 It adds or removes inline style to an HTML element, depending on its value.
 
 > This directive follows the syntax `data-wp-style--css-property`.
 
-_Example of `wp-style` directive_ 
+_Example of `wp-style` directive_
 
 ```html
 <div data-wp-context='{ "color": "red" }' >
@@ -296,7 +298,7 @@ The value received by the directive is used to add or remove the style attribute
 - If the value is `false`, the style attribute is removed: `<div>`.
 - If the value is a string, the attribute is added with its value assigned: `<div style="css-property: value;">`.
 
-#### `wp-text` 
+#### `wp-text`
 
 It sets the inner text of an HTML element.
 
@@ -333,13 +335,13 @@ The `wp-text` directive is executed:
 
 The returned value is used to change the inner content of the element: `<div>value</div>`.
 
-#### `wp-on` 
+#### `wp-on`
 
-It runs code on dispatched DOM events like `click` or `keyup`. 
+It runs code on dispatched DOM events like `click` or `keyup`.
 
 > The syntax of this directive is `data-wp-on--[event]` (like `data-wp-on--click` or `data-wp-on--keyup`).
 
-_Example of `wp-on` directive_ 
+_Example of `wp-on` directive_
 
 ```php
 <button data-wp-on--click="actions.logTime" >
@@ -363,20 +365,86 @@ store( "myPlugin", {
 </details>
 <br/>
 
-The `wp-on` directive is executed each time the associated event is triggered. 
+The `wp-on` directive is executed each time the associated event is triggered.
 
 The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored.
 
-#### `wp-watch` 
+#### `wp-on-window`
+
+It allows to attach global window events like `resize`, `copy`, `focus` and then execute a defined callback when those happen.
+
+[List of supported window events.](https://developer.mozilla.org/en-US/docs/Web/API/Window#events)
+
+> The syntax of this directive is `data-wp-on-window--[window-event]` (like `data-wp-on-window--resize`
+or `data-wp-on-window--languagechange`).
+
+_Example of `wp-on-window` directive_
+
+```php
+<div data-wp-on-window--resize="callbacks.logWidth"></div>
+```
+
+<details>
+	<summary><em>See store used with the directive above</em></summary>
+
+```js
+store( "myPlugin", {
+	callbacks: {
+		logWidth() {
+			console.log( 'Window width: ', window.innerWidth );
+		},
+	},
+} );
+```
+
+</details>
+<br/>
+
+The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored. When the element is removed from the DOM, the event listener is also removed.
+
+#### `wp-on-document`
+
+It allows to attach global document events like `scroll`, `mousemove`, `keydown` and then execute a defined callback when those happen.
 
-It runs a callback **when the node is created and runs it again when the state or context changes**. 
+[List of supported document events.](https://developer.mozilla.org/en-US/docs/Web/API/Document#events)
+
+> The syntax of this directive is `data-wp-on-document--[document-event]` (like `data-wp-on-document--keydown`
+or `data-wp-on-document--selectionchange`).
+
+_Example of `wp-on-document` directive_
+
+```php
+<div data-wp-on-document--keydown="callbacks.logKeydown"></div>
+```
+
+<details>
+	<summary><em>See store used with the directive above</em></summary>
+
+```js
+store( "myPlugin", {
+	callbacks: {
+		logKeydown(event) {
+			console.log( 'Key pressed: ', event.key );
+		},
+  },
+} );
+```
+
+</details>
+<br/>
+
+The callback passed as the reference receives [the event](https://developer.mozilla.org/en-US/docs/Web/API/Event) (`event`), and the returned value by this callback is ignored. When the element is removed from the DOM, the event listener is also removed.
+
+#### `wp-watch`
+
+It runs a callback **when the node is created and runs it again when the state or context changes**.
 
 You can attach several side effects to the same DOM element by using the syntax `data-wp-watch--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-watch` directives of that DOM element._
 
 _Example of `wp-watch` directive_
 
 ```html
-<div 
+<div
   data-wp-context='{ "counter": 0 }'
   data-wp-watch="callbacks.logCounter"
 >
@@ -396,14 +464,14 @@ store( "myPlugin", {
       const context = getContext();
       context.counter++;
     },
-    decreaseCounter: () => {	
+    decreaseCounter: () => {
       const context = getContext();
       context.counter--;
     },
   },
   callbacks: {
     logCounter: () => {
-      const { counter } = getContext(); 
+      const { counter } = getContext();
       console.log("Counter is " + counter + " at " + new Date() );
     },
   },
@@ -427,13 +495,13 @@ As a reference, some use cases for this directive may be:
 - Setting the focus on an element with `.focus()`.
 - Changing the state or context when certain conditions are met.
 
-#### `wp-init` 
+#### `wp-init`
 
 It runs a callback **only when the node is created**.
 
 You can attach several `wp-init` to the same DOM element by using the syntax `data-wp-init--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-init` directives of that DOM element._
 
-_Example of `data-wp-init` directive_ 
+_Example of `data-wp-init` directive_
 
 ```html
 <div data-wp-init="callbacks.logTimeInit">
@@ -444,8 +512,8 @@ _Example of `data-wp-init` directive_
 _Example of several `wp-init` directives on the same DOM element_
 
 ```html
-<form 
-  data-wp-init--log="callbacks.logTimeInit" 
+<form
+  data-wp-init--log="callbacks.logTimeInit"
   data-wp-init--focus="callbacks.focusFirstElement"
 >
   <input type="text">
@@ -472,7 +540,7 @@ store( "myPlugin", {
 
 The `wp-init` can return a function. If it does, the returned function will run when the element is removed from the DOM.
 
-#### `wp-run` 
+#### `wp-run`
 
 It runs the passed callback **during node's render execution**.
 
@@ -480,7 +548,7 @@ You can use and compose hooks like `useState`, `useWatch` or `useEffect` inside
 
 You can attach several `wp-run` to the same DOM element by using the syntax `data-wp-run--[unique-id]`. _The unique id doesn't need to be unique globally, it just needs to be different than the other unique ids of the `wp-run` directives of that DOM element._
 
-_Example of `data-wp-run` directive_ 
+_Example of `data-wp-run` directive_
 
 ```html
 <div data-wp-run="callbacks.logInView">
@@ -528,7 +596,7 @@ store( 'myPlugin', {
 </details>
 <br/>
 
-#### `wp-key` 
+#### `wp-key`
 
 The `wp-key` directive assigns a unique key to an element to help the Interactivity API identify it when iterating through arrays of elements. This becomes important if your array elements can move (e.g., due to sorting), get inserted, or get deleted. A well-chosen key value helps the Interactivity API infer what exactly has changed in the array, allowing it to make the correct updates to the DOM.
 
@@ -536,18 +604,18 @@ The key should be a string that uniquely identifies the element among its siblin
 
 ```html
 <ul>
-  <li data-wp-key="unique-id-1">Item 1</li> 
+  <li data-wp-key="unique-id-1">Item 1</li>
   <li data-wp-key="unique-id-2">Item 2</li>
-</ul>  
+</ul>
 ```
 
 But it can also be used on other elements:
 
 ```html
 <div>
-  <a data-wp-key="previous-page" ...>Previous page</a> 
+  <a data-wp-key="previous-page" ...>Previous page</a>
   <a data-wp-key="next-page" ...>Next page</a>
-</div>  
+</div>
 ```
 
 When the list is re-rendered, the Interactivity API will match elements by their keys to determine if an item was added/removed/reordered. Elements without keys might be recreated unnecessarily.
@@ -564,7 +632,7 @@ const { state } = store( "myPlugin", {
     currentVideo: '',
     get isPlaying() {
       return state.currentVideo !== '';
-    } 
+    }
   },
 } );
 ```
@@ -599,13 +667,13 @@ The store is used to create the logic (actions, side effects…) linked to the d
 
 ### Elements of the store
 
-#### State 
+#### State
 
 It defines data available to the HTML nodes of the page. It is important to differentiate between two ways to define the data:
 
 - **Global state**:  It is defined using the `store()` function with the `state` property, and the data is available to all the HTML nodes of the page.
 - **Context/Local State**: It is defined using the `data-wp-context` directive in an HTML node, and the data is available to that HTML node and its children. It can be accessed using the `getContext` function inside of an action, derived state or side effect.
-  
+
 ```html
 <div data-wp-context='{ "someText": "Hello World!" }'>
 
@@ -634,11 +702,11 @@ const { state } = store( "myPlugin", {
 } )
 ```
 
-#### Actions 
+#### Actions
 
 Usually triggered by the `data-wp-on` directive (using event listeners) or other actions.
 
-#### Side Effects 
+#### Side Effects
 
 Automatically react to state changes. Usually triggered by `data-wp-watch` or `data-wp-init` directives.
 
@@ -647,7 +715,7 @@ Automatically react to state changes. Usually triggered by `data-wp-watch` or `d
 They return a computed version of the state. They can access both `state` and `context`.
 
 ```js
-// view.js  
+// view.js
 const { state } = store( "myPlugin", {
   state: {
     amount: 34,
@@ -698,7 +766,7 @@ const { state } = store( "myPlugin", {
 > **Note**
 > All `store()` calls with the same namespace return the same references, i.e., the same `state`, `actions`, etc., containing the result of merging all the store parts passed.
 
-- To access the context inside an action, derived state, or side effect, you can use the `getContext` function. 
+- To access the context inside an action, derived state, or side effect, you can use the `getContext` function.
 - To access the reference, you can use the `getElement` function.
 
 ```js
@@ -740,7 +808,7 @@ This approach enables some functionalities that make directives flexible and pow
 
 *In the `view.js` file of each block* we can define both the state and the elements of the store referencing functions like actions, side effects or derived state.
 
-The `store` method used to set the store in javascript can be imported from `@wordpress/interactivity`.  
+The `store` method used to set the store in javascript can be imported from `@wordpress/interactivity`.
 
 ```js
 // store
@@ -768,11 +836,11 @@ store( "myPlugin", {
 > **Note**
 > We will rename `wp_store` to `wp_initial_state` in a future version.
 
-The state can also be initialized on the server using the `wp_store()` function. You would typically do this in the `render.php` file of your block (the `render.php` templates were [introduced](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/) in WordPress 6.1). 
+The state can also be initialized on the server using the `wp_store()` function. You would typically do this in the `render.php` file of your block (the `render.php` templates were [introduced](https://make.wordpress.org/core/2022/10/12/block-api-changes-in-wordpress-6-1/) in WordPress 6.1).
 
 The state defined on the server with `wp_store()` gets merged with the stores defined in the view.js files.
 
-The `wp_store` function receives an [associative array](https://www.php.net/manual/en/language.types.array.php) as a parameter. 
+The `wp_store` function receives an [associative array](https://www.php.net/manual/en/language.types.array.php) as a parameter.
 
 _Example of store initialized from the server with a `state` = `{ someValue: 123 }`_
 
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index e8fec14be7538..25ba92808614d 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -28,6 +28,64 @@ const mergeDeepSignals = ( target, source, overwrite ) => {
 	}
 };
 
+const newRule =
+	/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\s*)/g;
+const ruleClean = /\/\*[^]*?\*\/|  +/g;
+const ruleNewline = /\n+/g;
+const empty = ' ';
+
+/**
+ * Convert a css style string into a object.
+ *
+ * Made by Cristian Bote (@cristianbote) for Goober.
+ * https://unpkg.com/browse/goober@2.1.13/src/core/astish.js
+ *
+ * @param {string} val CSS string.
+ * @return {Object} CSS object.
+ */
+const cssStringToObject = ( val ) => {
+	const tree = [ {} ];
+	let block, left;
+
+	while ( ( block = newRule.exec( val.replace( ruleClean, '' ) ) ) ) {
+		if ( block[ 4 ] ) {
+			tree.shift();
+		} else if ( block[ 3 ] ) {
+			left = block[ 3 ].replace( ruleNewline, empty ).trim();
+			tree.unshift( ( tree[ 0 ][ left ] = tree[ 0 ][ left ] || {} ) );
+		} else {
+			tree[ 0 ][ block[ 1 ] ] = block[ 2 ]
+				.replace( ruleNewline, empty )
+				.trim();
+		}
+	}
+
+	return tree[ 0 ];
+};
+
+/**
+ * Creates a directive that adds an event listener to the global window or
+ * document object.
+ *
+ * @param {string} type 'window' or 'document'
+ * @return {void}
+ */
+const getGlobalEventDirective =
+	( type ) =>
+	( { directives, evaluate } ) => {
+		directives[ `on-${ type }` ]
+			.filter( ( { suffix } ) => suffix !== 'default' )
+			.forEach( ( entry ) => {
+				useInit( () => {
+					const cb = ( event ) => evaluate( entry, event );
+					const globalVar = type === 'window' ? window : document;
+					globalVar.addEventListener( entry.suffix, cb );
+					return () =>
+						globalVar.removeEventListener( entry.suffix, cb );
+				}, [] );
+			} );
+	};
+
 export default () => {
 	// data-wp-context
 	directive(
@@ -89,6 +147,11 @@ export default () => {
 		);
 	} );
 
+	// data-wp-on-window--[event]
+	directive( 'on-window', getGlobalEventDirective( 'window' ) );
+	// data-wp-on-document--[event]
+	directive( 'on-document', getGlobalEventDirective( 'document' ) );
+
 	// data-wp-class--[classname]
 	directive(
 		'class',
@@ -126,41 +189,6 @@ export default () => {
 		}
 	);
 
-	const newRule =
-		/(?:([\u0080-\uFFFF\w-%@]+) *:? *([^{;]+?);|([^;}{]*?) *{)|(}\s*)/g;
-	const ruleClean = /\/\*[^]*?\*\/|  +/g;
-	const ruleNewline = /\n+/g;
-	const empty = ' ';
-
-	/**
-	 * Convert a css style string into a object.
-	 *
-	 * Made by Cristian Bote (@cristianbote) for Goober.
-	 * https://unpkg.com/browse/goober@2.1.13/src/core/astish.js
-	 *
-	 * @param {string} val CSS string.
-	 * @return {Object} CSS object.
-	 */
-	const cssStringToObject = ( val ) => {
-		const tree = [ {} ];
-		let block, left;
-
-		while ( ( block = newRule.exec( val.replace( ruleClean, '' ) ) ) ) {
-			if ( block[ 4 ] ) {
-				tree.shift();
-			} else if ( block[ 3 ] ) {
-				left = block[ 3 ].replace( ruleNewline, empty ).trim();
-				tree.unshift( ( tree[ 0 ][ left ] = tree[ 0 ][ left ] || {} ) );
-			} else {
-				tree[ 0 ][ block[ 1 ] ] = block[ 2 ]
-					.replace( ruleNewline, empty )
-					.trim();
-			}
-		}
-
-		return tree[ 0 ];
-	};
-
 	// data-wp-style--[style-key]
 	directive( 'style', ( { directives: { style }, element, evaluate } ) => {
 		style
diff --git a/test/e2e/specs/interactivity/directives-body.spec.ts b/test/e2e/specs/interactivity/directive-body.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-body.spec.ts
rename to test/e2e/specs/interactivity/directive-body.spec.ts
diff --git a/test/e2e/specs/interactivity/directives-class.spec.ts b/test/e2e/specs/interactivity/directive-class.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-class.spec.ts
rename to test/e2e/specs/interactivity/directive-class.spec.ts
diff --git a/test/e2e/specs/interactivity/directives-context.spec.ts b/test/e2e/specs/interactivity/directive-context.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-context.spec.ts
rename to test/e2e/specs/interactivity/directive-context.spec.ts
diff --git a/test/e2e/specs/interactivity/directive-on-document.spec.ts b/test/e2e/specs/interactivity/directive-on-document.spec.ts
new file mode 100644
index 0000000000000..824e217f08714
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-document.spec.ts
@@ -0,0 +1,47 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-on-document', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-on-document' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-on-document' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'callbacks should run whenever the specified event is dispatched', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		await expect( counter ).toHaveText( '0' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '1' );
+	} );
+	test( 'the event listener is removed when the element is removed', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+		await expect( counter ).toHaveText( '0' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '1' );
+		// Remove the element.
+		await visibilityButton.click();
+		// This keyboard press should not increase the counter.
+		await page.keyboard.press( 'ArrowDown' );
+		// Add the element back.
+		await visibilityButton.click();
+		await expect( counter ).toHaveText( '1' );
+		await page.keyboard.press( 'ArrowDown' );
+		await expect( counter ).toHaveText( '2' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directive-on-window.spec.ts b/test/e2e/specs/interactivity/directive-on-window.spec.ts
new file mode 100644
index 0000000000000..e1d59e09cd35f
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-on-window.spec.ts
@@ -0,0 +1,45 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-on-window', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-on-window' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-on-window' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'callbacks should run whenever the specified event is dispatched', async ( {
+		page,
+	} ) => {
+		await page.setViewportSize( { width: 600, height: 600 } );
+		const counter = page.getByTestId( 'counter' );
+		await expect( counter ).toHaveText( '1' );
+	} );
+	test( 'the event listener is removed when the element is removed', async ( {
+		page,
+	} ) => {
+		const counter = page.getByTestId( 'counter' );
+		const visibilityButton = page.getByTestId( 'visibility' );
+		await page.setViewportSize( { width: 600, height: 600 } );
+		await expect( counter ).toHaveText( '1' );
+		// Remove the element.
+		await visibilityButton.click();
+		// This resize should not increase the counter.
+		await page.setViewportSize( { width: 300, height: 600 } );
+		// Add the element back.
+		await visibilityButton.click();
+		await expect( counter ).toHaveText( '1' );
+		await page.setViewportSize( { width: 200, height: 600 } );
+		await expect( counter ).toHaveText( '2' );
+	} );
+} );
diff --git a/test/e2e/specs/interactivity/directives-style.spec.ts b/test/e2e/specs/interactivity/directive-style.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-style.spec.ts
rename to test/e2e/specs/interactivity/directive-style.spec.ts
diff --git a/test/e2e/specs/interactivity/directives-text.spec.ts b/test/e2e/specs/interactivity/directive-text.spec.ts
similarity index 100%
rename from test/e2e/specs/interactivity/directives-text.spec.ts
rename to test/e2e/specs/interactivity/directive-text.spec.ts

From 60a9413a1f438b424254ec0d88f74745b9a60bf4 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Fri, 19 Jan 2024 14:59:29 +1100
Subject: [PATCH 173/296] Outline editable blocks that are within a
 content-locked container (#57901)

* Outline editable blocks that are within a content-locked container

Show an outline and pencil icon on blocks that are within a
content-locked container (.is-editing-disabled). This allows users to
more easily see which content can be modified when editing
content-locked patterns, patterns with overrides, and pages.

* Hide outline and pencil icon from previews

* Make outlines look more like the mockup

* remove icon

* only show block outline when hovering

* Only show outlines when hovering over the page editor or locked pattern

* Remove unnecessary css

* Remove unnecessary z-index

---------

Co-authored-by: Saxon Fletcher <saxonafletcher@gmail.com>
---
 .../src/components/block-list/content.scss    | 27 ++++++++++++++++++-
 .../src/components/editor-canvas/index.js     |  3 ++-
 2 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index d907ffd81d9dd..8cd75f6855b62 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -26,7 +26,7 @@
 /* stylelint-disable */
 _::-webkit-full-page-media, _:future, :root .block-editor-block-list__layout::selection,
 _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-block-list__layout::selection {
-	background-color: transparent; 
+	background-color: transparent;
 }
 /* stylelint-enable */
 
@@ -303,6 +303,31 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b
 	}
 }
 
+// Indicate which blocks are editable within a page editor or a content-locked
+// pattern. Only show when user hovers over the page editor or pattern.
+.is-template-locked:hover,
+.block-editor-block-list__block:hover {
+	.block-editor-block-list__block.is-editing-disabled > .block-editor-block-list__block:not(.is-editing-disabled):not(.is-selected):not(.has-child-selected) {
+		&::after {
+			content: "";
+			border-style: dotted;
+			position: absolute;
+			pointer-events: none;
+			top: $border-width;
+			left: $border-width;
+			right: $border-width;
+			bottom: $border-width;
+			border: 1px dotted var(--wp-admin-theme-color);
+			border-radius: $radius-block-ui - $border-width;
+		}
+
+		&.is-hovered::after {
+			background: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+			border: none;
+		}
+	}
+}
+
 // Spotlight mode. Fade out blocks unless they contain a selected block.
 .is-focus-mode .block-editor-block-list__block:not(.has-child-selected) {
 	opacity: 0.2;
diff --git a/packages/editor/src/components/editor-canvas/index.js b/packages/editor/src/components/editor-canvas/index.js
index e5e663f821a64..d6084ef922805 100644
--- a/packages/editor/src/components/editor-canvas/index.js
+++ b/packages/editor/src/components/editor-canvas/index.js
@@ -364,7 +364,8 @@ function EditorCanvas( {
 						'is-' + deviceType.toLowerCase() + '-preview',
 						renderingMode !== 'post-only'
 							? 'wp-site-blocks'
-							: `${ blockListLayoutClass } wp-block-post-content` // Ensure root level blocks receive default/flow blockGap styling rules.
+							: `${ blockListLayoutClass } wp-block-post-content`, // Ensure root level blocks receive default/flow blockGap styling rules.
+						renderingMode !== 'all' && 'is-' + renderingMode
 					) }
 					layout={ blockListLayout }
 					dropZoneElement={

From 7e604b4369aed66d3de68921e2b0e507b741b4e4 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Fri, 19 Jan 2024 18:43:13 +0900
Subject: [PATCH 174/296] Image Block: Make block name affect list view
 (#57955)

---
 packages/block-library/src/image/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/block-library/src/image/index.js b/packages/block-library/src/image/index.js
index 1477fa99c702c..68625bd77cc87 100644
--- a/packages/block-library/src/image/index.js
+++ b/packages/block-library/src/image/index.js
@@ -29,6 +29,12 @@ export const settings = {
 		},
 	},
 	__experimentalLabel( attributes, { context } ) {
+		const customName = attributes?.metadata?.name;
+
+		if ( context === 'list-view' && customName ) {
+			return customName;
+		}
+
 		if ( context === 'accessibility' ) {
 			const { caption, alt, url } = attributes;
 

From 042f99ef0f41d8b02d697b47e5743ae83e9298d9 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Fri, 19 Jan 2024 10:57:55 +0100
Subject: [PATCH 175/296] Site editor: remove store subscription per block
 (#57995)

---
 .../push-changes-to-global-styles/index.js    | 52 +++++++++++--------
 1 file changed, 29 insertions(+), 23 deletions(-)

diff --git a/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js b/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
index 0407b85c4e8bc..4844ec6d03eb5 100644
--- a/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
+++ b/packages/edit-site/src/hooks/push-changes-to-global-styles/index.js
@@ -389,30 +389,36 @@ function PushChangesToGlobalStylesControl( {
 	);
 }
 
-const withPushChangesToGlobalStyles = createHigherOrderComponent(
-	( BlockEdit ) => ( props ) => {
-		const blockEditingMode = useBlockEditingMode();
-		const isBlockBasedTheme = useSelect(
-			( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
-			[]
-		);
-		const supportsStyles = SUPPORTED_STYLES.some( ( feature ) =>
-			hasBlockSupport( props.name, feature )
-		);
-
-		return (
-			<>
-				<BlockEdit { ...props } />
-				{ blockEditingMode === 'default' &&
-					supportsStyles &&
-					isBlockBasedTheme && (
-						<InspectorAdvancedControls>
-							<PushChangesToGlobalStylesControl { ...props } />
-						</InspectorAdvancedControls>
-					) }
-			</>
-		);
+function PushChangesToGlobalStyles( props ) {
+	const blockEditingMode = useBlockEditingMode();
+	const isBlockBasedTheme = useSelect(
+		( select ) => select( coreStore ).getCurrentTheme()?.is_block_theme,
+		[]
+	);
+	const supportsStyles = SUPPORTED_STYLES.some( ( feature ) =>
+		hasBlockSupport( props.name, feature )
+	);
+	const isDisplayed =
+		blockEditingMode === 'default' && supportsStyles && isBlockBasedTheme;
+
+	if ( ! isDisplayed ) {
+		return null;
 	}
+
+	return (
+		<InspectorAdvancedControls>
+			<PushChangesToGlobalStylesControl { ...props } />
+		</InspectorAdvancedControls>
+	);
+}
+
+const withPushChangesToGlobalStyles = createHigherOrderComponent(
+	( BlockEdit ) => ( props ) => (
+		<>
+			<BlockEdit { ...props } />
+			{ props.isSelected && <PushChangesToGlobalStyles { ...props } /> }
+		</>
+	)
 );
 
 addFilter(

From b716ae3b8d5366608e41e565c6f6edbf561d3079 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Fri, 19 Jan 2024 10:40:33 +0000
Subject: [PATCH 176/296] Automate creation of Issue for major release PHP
 synchronisation (#57890)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Initial script

* Linting fun

* Add primitve docs to args

* Ensure since arg cannot be far into the past

* Refactor to avoid passing around octokit vars

* Handle network errors

* Refactor method names to use “fetch” terminology

* Ignore block-library as these changes are handled automatically

* Allow sections with a single PR to remain

* Allow any commit that modifies tests to be also under another section

* Remove block-library specific handling

* Use const to define max nesting level

* Automate ignore of previous release compat dir

* Exclude load.php as it is Plugin specific

* Remove ping debugging

* Prepare for requiring full PR label data

* Flag PRs that may have already been backported

* Fix output of `undefined`

* Tweak warning

* Ignore PRs with given labels

* Update instructions for new label

* Update since arg description
---
 bin/generate-php-sync-issue.mjs | 505 ++++++++++++++++++++++++++++++++
 1 file changed, 505 insertions(+)
 create mode 100644 bin/generate-php-sync-issue.mjs

diff --git a/bin/generate-php-sync-issue.mjs b/bin/generate-php-sync-issue.mjs
new file mode 100644
index 0000000000000..a45d77d354107
--- /dev/null
+++ b/bin/generate-php-sync-issue.mjs
@@ -0,0 +1,505 @@
+/**
+ * External dependencies
+ */
+
+import Octokit from '@octokit/rest';
+import fs from 'fs';
+
+import { fileURLToPath } from 'url';
+import nodePath, { dirname } from 'path';
+
+function getArg( argName ) {
+	const arg = process.argv.find( ( _arg ) =>
+		_arg.startsWith( `--${ argName }=` )
+	);
+	return arg ? arg.split( '=' )[ 1 ] : null;
+}
+
+const OWNER = 'wordpress';
+const REPO = 'gutenberg';
+const MAX_MONTHS_TO_QUERY = 4;
+
+// The following paths will be ignored when generating the issue content.
+const IGNORED_PATHS = [
+	'lib/load.php', // plugin specific code.
+	'lib/experiments-page.php', // experiments are plugin specific.
+	'packages/e2e-tests/plugins', // PHP files related to e2e tests only.
+	'packages/block-library', // this is handled automatically.
+];
+
+// PRs containing the following labels will be ignored when generating the issue content.
+const LABELS_TO_IGNORE = [ 'Backport from WordPress Core' ];
+
+const MAX_NESTING_LEVEL = 3;
+
+const __filename = fileURLToPath( import.meta.url );
+const __dirname = dirname( __filename );
+
+const authToken = getArg( 'token' );
+const stableWPRelease = getArg( 'wpstable' );
+
+async function main() {
+	if ( ! authToken ) {
+		console.error(
+			'Error. The --token argument is required. See: https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-fine-grained-personal-access-token'
+		);
+		process.exit( 1 );
+	}
+
+	if ( ! stableWPRelease ) {
+		console.error(
+			'Error. The --wpstable argument is required. It should be the current stable WordPress release (e.g. 6.4).'
+		);
+		process.exit( 1 );
+	}
+
+	const sinceArg = getArg( 'since' );
+	let since;
+
+	if ( sinceArg ) {
+		if ( validateDate( sinceArg ) ) {
+			since = sinceArg;
+		} else {
+			console.error(
+				`Error: The --since argument cannot be more than ${ MAX_MONTHS_TO_QUERY } months from the current date.`
+			);
+			process.exit( 1 );
+		}
+	} else {
+		console.error(
+			`Error. The --since argument is required (e.g. YYYY-MM-DD). This should be the date of the final Gutenberg release that was included in the last stable WP Core release (see https://developer.wordpress.org/block-editor/contributors/versions-in-wordpress/).`
+		);
+		process.exit( 1 );
+	}
+
+	const lastRcDateArg = getArg( 'lastrcdate' );
+	let lastRcDate;
+
+	if ( lastRcDateArg ) {
+		if (
+			validateDate( lastRcDateArg ) &&
+			isAfter( lastRcDateArg, since )
+		) {
+			lastRcDate = lastRcDateArg;
+		} else {
+			console.error(
+				`Error: The --lastrcdate argument must be a date after the --since date.`
+			);
+			process.exit( 1 );
+		}
+	} else {
+		console.error(
+			`Error: The --lastrcdate argument is required (e.g. YYYY-MM-DD).`
+		);
+		process.exit( 1 );
+	}
+
+	console.log( 'Welcome to the PHP Sync Issue Generator!' );
+
+	console.log( '--------------------------------' );
+	console.log( '• Running script...' );
+
+	// These should be paths where we expect to find PHP files that
+	// will require syncing to WordPress Core. This list should be
+	// extremely selective.
+	const paths = [ '/lib', '/phpunit' ];
+
+	console.log( `• Fetching all commits made to ${ REPO } since: ${ since }` );
+	let commits = await fetchAllCommitsFromPaths( since, paths );
+
+	// Remove identical commits based on sha
+	commits = commits.reduce( ( acc, current ) => {
+		const x = acc.find( ( item ) => item.sha === current.sha );
+		if ( ! x ) {
+			return acc.concat( [ current ] );
+		}
+		return acc;
+	}, [] );
+
+	// Fetch the full commit data for each of the commits.
+	// This is because the /commits endpoint does not include the
+	// information about the `files` modified in the commit.
+	console.log(
+		`• Fetching full commit data for ${ commits.length } commits`
+	);
+	const commitsWithCommitData = await Promise.all(
+		commits.map( async ( commit ) => {
+			const commitData = await fetchCommit( commit.sha );
+
+			// In the future we will want to exclude PRs based on label
+			// so we will need to fetch the full PR data for each commit.
+			// For now we can just set this to null.
+			const fullPRData = null;
+			// const fullPRData = getPullRequestDataForCommit( commit.sha );
+
+			// Our Issue links to the PRs associated with the commits so we must
+			// provide this data. We could also get the PR data from the commit data,
+			// using getPullRequestDataForCommit, but that requires yet another
+			// network request. Therefore we optimise for trying to build
+			// the PR URL from the commit data we have available.
+			commitData.pullRequest = {
+				url: fullPRData?.html_url || buildPRURL( commit ),
+				creator:
+					fullPRData?.user?.login ||
+					commit?.author?.login ||
+					'unknown',
+				labels: fullPRData?.labels || [],
+			};
+
+			// if the PR labels contain any of the labels to ignore, skip this commit
+			// by returning null.
+			if (
+				commitData.pullRequest.labels.some( ( label ) =>
+					LABELS_TO_IGNORE.includes( label.name )
+				)
+			) {
+				return null;
+			}
+
+			// This is temporarily required because PRs merged between Beta 1 (since)
+			// and the final RC may have already been manually backported to Core.
+			// This is however no reliable way to identify these PRs as the `Backport to WP beta/RC`
+			// label is manually removed once the PR has been backported.
+			// In future releases we will add a **new** label `Backported`
+			// to indicate the PR was backported to Core.
+			// As a result, in the future we will be able to exclude any PRs that have
+			// already been backported using the `Backported` label.
+			if ( isAfter( lastRcDate, commitData.commit.committer.date ) ) {
+				commitData.isBeforeLastRCDate = true;
+			}
+
+			return commitData;
+		} )
+	);
+
+	const processResult = pipe(
+		processCommits,
+		reduceNesting,
+		dedupePRsPerLevel,
+		removeEmptyLevels,
+		sortLevels
+	);
+
+	console.log( `• Processing ${ commitsWithCommitData.length } commits` );
+	const result = processResult( commitsWithCommitData );
+
+	console.log( `• Generating Issue content` );
+	const content = generateIssueContent( result );
+
+	// Write the Markdown content to a file
+	fs.writeFileSync( nodePath.join( __dirname, 'issueContent.md' ), content );
+}
+
+/**
+ * Checks if the first date is after the second date.
+ *
+ * @param {string} date1 - The first date.
+ * @param {string} date2 - The second date.
+ * @return {boolean} - Returns true if the first date is after the second date, false otherwise.
+ */
+function isAfter( date1, date2 ) {
+	return new Date( date1 ) > new Date( date2 );
+}
+
+function validateDate( sinceArg ) {
+	const sinceDate = new Date( sinceArg );
+	const maxPreviousDate = new Date();
+	maxPreviousDate.setMonth(
+		maxPreviousDate.getMonth() - MAX_MONTHS_TO_QUERY
+	);
+
+	return sinceDate >= maxPreviousDate;
+}
+
+async function octokitPaginate( method, params ) {
+	return octokitRequest( method, params, { paginate: true } );
+}
+
+async function octokitRequest( method = '', params = {}, settings = {} ) {
+	const octokit = new Octokit( { auth: authToken } );
+	params.owner = OWNER;
+	params.repo = REPO;
+
+	const requestType = settings?.paginate ? 'paginate' : 'request';
+
+	try {
+		const result = await octokit[ requestType ]( method, params );
+
+		if ( requestType === 'paginate' ) {
+			return result;
+		}
+		return result.data;
+	} catch ( error ) {
+		console.error(
+			`Error making request to ${ method }: ${ error.message }`
+		);
+		process.exit( 1 );
+	}
+}
+
+async function fetchAllCommitsFromPaths( since, paths ) {
+	let commits = [];
+
+	for ( const path of paths ) {
+		const pathCommits = await fetchAllCommits( since, path );
+		commits = [ ...commits, ...pathCommits ];
+	}
+
+	return commits;
+}
+
+function buildPRURL( commit ) {
+	const prIdMatch = commit.commit.message.match( /\(#(\d+)\)/ );
+	const prId = prIdMatch ? prIdMatch[ 1 ] : null;
+	return prId
+		? `https://github.com/WordPress/gutenberg/pull/${ prId }`
+		: `[Commit](${ commit.html_url })`;
+}
+
+function sortLevels( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+
+		// Separate directories and files
+		const directories = {};
+		const files = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( key.endsWith( '.php' ) ) {
+				files[ key ] = Array.isArray( value )
+					? value
+					: processLevel( value );
+			} else {
+				directories[ key ] = Array.isArray( value )
+					? value
+					: processLevel( value );
+			}
+		}
+
+		// Combine directories and files
+		Object.assign( processedData, directories, files );
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function removeEmptyLevels( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				if ( value.length > 0 ) {
+					processedData[ key ] = value;
+				}
+			} else {
+				const processedLevel = processLevel( value );
+				if ( Object.keys( processedLevel ).length > 0 ) {
+					processedData[ key ] = processedLevel;
+				}
+			}
+		}
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function dedupePRsPerLevel( data ) {
+	function processLevel( levelData ) {
+		const processedData = {};
+		const prSet = new Set();
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				processedData[ key ] = value.filter( ( commit ) => {
+					if ( ! prSet.has( commit.pullRequest.url ) ) {
+						prSet.add( commit.pullRequest.url );
+						return true;
+					}
+					return false;
+				} );
+			} else {
+				processedData[ key ] = processLevel( value );
+			}
+		}
+
+		return processedData;
+	}
+
+	return processLevel( data );
+}
+
+function reduceNesting( data ) {
+	function processLevel( levelData, level = 1 ) {
+		const processedData = {};
+
+		for ( const [ key, value ] of Object.entries( levelData ) ) {
+			if ( Array.isArray( value ) ) {
+				processedData[ key ] = value;
+			} else if ( level < MAX_NESTING_LEVEL ) {
+				processedData[ key ] = processLevel( value, level + 1 );
+			} else {
+				processedData[ key ] = flattenData( value );
+			}
+		}
+
+		return processedData;
+	}
+
+	function flattenData( nestedData ) {
+		let flatData = [];
+
+		for ( const value of Object.values( nestedData ) ) {
+			if ( Array.isArray( value ) ) {
+				flatData = [ ...flatData, ...value ];
+			} else {
+				flatData = [ ...flatData, ...flattenData( value ) ];
+			}
+		}
+
+		return flatData;
+	}
+
+	return processLevel( data );
+}
+
+function processCommits( commits ) {
+	const result = {};
+
+	// This dir sholud be ignored, since whatever is in there is already in core.
+	// It exists to provide compatibility for older releases, because we have to
+	// support the current and the previous WP versions.
+	// See: https://github.com/WordPress/gutenberg/pull/57890#pullrequestreview-1828994247.
+	const prevReleaseCompatDirToIgnore = `lib/compat/wordpress-${ stableWPRelease }`;
+
+	commits.forEach( ( commit ) => {
+		// Skip commits without an associated pull request
+		if ( ! commit?.pullRequest ) {
+			return;
+		}
+		commit.files.forEach( ( file ) => {
+			// Skip files that are not PHP files.
+			if ( ! file.filename.endsWith( '.php' ) ) {
+				return;
+			}
+
+			if (
+				[ ...IGNORED_PATHS, prevReleaseCompatDirToIgnore ].some(
+					( path ) =>
+						file.filename.startsWith( path ) ||
+						file.filename === path
+				)
+			) {
+				// Skip files within specific packages.
+				return;
+			}
+
+			const parts = file.filename.split( '/' );
+
+			let current = result;
+
+			// If the file is under 'phpunit', always add it to the 'phpunit' key
+			// as it's helpful to have a full list of commits that modify tests.
+			if ( parts.includes( 'phpunit' ) ) {
+				current.phpunit = current.phpunit || [];
+				current.phpunit = [ ...current.phpunit, commit ];
+			}
+
+			for ( let i = 0; i < parts.length; i++ ) {
+				const part = parts[ i ];
+
+				if ( i === parts.length - 1 ) {
+					current[ part ] = current[ part ] || [];
+					current[ part ] = [ ...current[ part ], commit ];
+				} else {
+					current[ part ] = current[ part ] || {};
+					current = current[ part ];
+				}
+			}
+		} );
+	} );
+
+	return result;
+}
+
+function formatPRLine( { pullRequest: pr, isBeforeLastRCDate } ) {
+	return `- [ ] ${ pr.url } - @${
+		pr.creator
+	} | Trac ticket | Core backport PR ${
+		isBeforeLastRCDate ? '(⚠️ Check for existing WP Core backport)' : ''
+	}\n`;
+}
+
+function formatHeading( level, key ) {
+	const emoji = key.endsWith( '.php' ) ? '📄' : '📁';
+	return `${ '#'.repeat( level ) } ${ emoji } ${ key }\n\n`;
+}
+
+function generateIssueContent( result, level = 1 ) {
+	let issueContent = '';
+	let isFirstSection = true;
+
+	for ( const [ key, value ] of Object.entries( result ) ) {
+		// Add horizontal rule divider between sections, but not before the first section
+		if ( level <= 2 && ! isFirstSection ) {
+			issueContent += '\n---\n';
+		}
+
+		issueContent += formatHeading( level, key );
+
+		if ( Array.isArray( value ) ) {
+			value.forEach( ( commit ) => {
+				issueContent += formatPRLine( commit );
+			} );
+		} else {
+			issueContent += generateIssueContent( value, level + 1 );
+		}
+
+		isFirstSection = false;
+	}
+
+	return issueContent;
+}
+
+async function fetchAllCommits( since, path ) {
+	return await octokitPaginate( 'GET /repos/{owner}/{repo}/commits', {
+		since,
+		per_page: 30,
+		path,
+	} );
+}
+
+async function fetchCommit( sha ) {
+	return octokitRequest( 'GET /repos/{owner}/{repo}/commits/{sha}', {
+		sha,
+	} );
+}
+
+// eslint-disable-next-line no-unused-vars
+async function getPullRequestDataForCommit( commitSha ) {
+	const pullRequests = octokitRequest(
+		'GET /repos/{owner}/{repo}/commits/{commit_sha}/pulls',
+		{
+			commit_sha: commitSha,
+		}
+	);
+
+	// If a related Pull Request is found, return its URL and creator
+	if ( pullRequests.length > 0 ) {
+		const pullRequest = pullRequests[ 0 ];
+		return pullRequest;
+	}
+
+	return null;
+}
+
+const pipe =
+	( ...fns ) =>
+	( x ) =>
+		fns.reduce( ( v, f ) => f( v ), x );
+
+main();

From ca3ecb5d1048c9f5425d0f29a14ed60ff04fd622 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Fri, 19 Jan 2024 11:45:59 +0100
Subject: [PATCH 177/296] Template Part & Query: avoid server requests on mount
 (#57987)

---
 .../query/edit/inspector-controls/index.js    | 283 +++++++++---------
 .../src/query/edit/query-content.js           |  16 +-
 .../template-part/edit/advanced-controls.js   |   5 +-
 .../src/template-part/edit/index.js           |  19 +-
 .../edit-site/src/hooks/template-part-edit.js |  24 +-
 5 files changed, 171 insertions(+), 176 deletions(-)

diff --git a/packages/block-library/src/query/edit/inspector-controls/index.js b/packages/block-library/src/query/edit/inspector-controls/index.js
index 398016728c499..eb5abe9c24d98 100644
--- a/packages/block-library/src/query/edit/inspector-controls/index.js
+++ b/packages/block-library/src/query/edit/inspector-controls/index.js
@@ -12,10 +12,7 @@ import {
 	__experimentalToolsPanelItem as ToolsPanelItem,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import {
-	InspectorControls,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
+import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
 import { debounce } from '@wordpress/compose';
 import { useEffect, useState, useCallback } from '@wordpress/element';
 
@@ -138,156 +135,150 @@ export default function QueryInspectorControls( props ) {
 				<CreateNewPostLink { ...props } />
 			</BlockInfo>
 			{ showSettingsPanel && (
-				<InspectorControls>
-					<PanelBody title={ __( 'Settings' ) }>
-						{ showInheritControl && (
-							<ToggleControl
-								__nextHasNoMarginBottom
-								label={ __( 'Inherit query from template' ) }
-								help={ __(
-									'Toggle to use the global query context that is set with the current template, such as an archive or search. Disable to customize the settings independently.'
-								) }
-								checked={ !! inherit }
-								onChange={ ( value ) =>
-									setQuery( { inherit: !! value } )
-								}
-							/>
-						) }
-						{ showPostTypeControl && (
-							<SelectControl
+				<PanelBody title={ __( 'Settings' ) }>
+					{ showInheritControl && (
+						<ToggleControl
+							__nextHasNoMarginBottom
+							label={ __( 'Inherit query from template' ) }
+							help={ __(
+								'Toggle to use the global query context that is set with the current template, such as an archive or search. Disable to customize the settings independently.'
+							) }
+							checked={ !! inherit }
+							onChange={ ( value ) =>
+								setQuery( { inherit: !! value } )
+							}
+						/>
+					) }
+					{ showPostTypeControl && (
+						<SelectControl
+							__nextHasNoMarginBottom
+							options={ postTypesSelectOptions }
+							value={ postType }
+							label={ __( 'Post type' ) }
+							onChange={ onPostTypeChange }
+							help={ __(
+								'WordPress contains different types of content and they are divided into collections called “Post types”. By default there are a few different ones such as blog posts and pages, but plugins could add more.'
+							) }
+						/>
+					) }
+					{ showColumnsControl && (
+						<>
+							<RangeControl
 								__nextHasNoMarginBottom
-								options={ postTypesSelectOptions }
-								value={ postType }
-								label={ __( 'Post type' ) }
-								onChange={ onPostTypeChange }
-								help={ __(
-									'WordPress contains different types of content and they are divided into collections called “Post types”. By default there are a few different ones such as blog posts and pages, but plugins could add more.'
-								) }
-							/>
-						) }
-						{ showColumnsControl && (
-							<>
-								<RangeControl
-									__nextHasNoMarginBottom
-									label={ __( 'Columns' ) }
-									value={ displayLayout.columns }
-									onChange={ ( value ) =>
-										setDisplayLayout( {
-											columns: value,
-										} )
-									}
-									min={ 2 }
-									max={ Math.max( 6, displayLayout.columns ) }
-								/>
-								{ displayLayout.columns > 6 && (
-									<Notice
-										status="warning"
-										isDismissible={ false }
-									>
-										{ __(
-											'This column count exceeds the recommended amount and may cause visual breakage.'
-										) }
-									</Notice>
-								) }
-							</>
-						) }
-						{ showOrderControl && (
-							<OrderControl
-								{ ...{ order, orderBy } }
-								onChange={ setQuery }
-							/>
-						) }
-						{ showStickyControl && (
-							<StickyControl
-								value={ sticky }
+								label={ __( 'Columns' ) }
+								value={ displayLayout.columns }
 								onChange={ ( value ) =>
-									setQuery( { sticky: value } )
+									setDisplayLayout( {
+										columns: value,
+									} )
 								}
+								min={ 2 }
+								max={ Math.max( 6, displayLayout.columns ) }
 							/>
-						) }
-						<EnhancedPaginationControl
-							enhancedPagination={ enhancedPagination }
-							setAttributes={ setAttributes }
-							clientId={ clientId }
+							{ displayLayout.columns > 6 && (
+								<Notice
+									status="warning"
+									isDismissible={ false }
+								>
+									{ __(
+										'This column count exceeds the recommended amount and may cause visual breakage.'
+									) }
+								</Notice>
+							) }
+						</>
+					) }
+					{ showOrderControl && (
+						<OrderControl
+							{ ...{ order, orderBy } }
+							onChange={ setQuery }
+						/>
+					) }
+					{ showStickyControl && (
+						<StickyControl
+							value={ sticky }
+							onChange={ ( value ) =>
+								setQuery( { sticky: value } )
+							}
 						/>
-					</PanelBody>
-				</InspectorControls>
+					) }
+					<EnhancedPaginationControl
+						enhancedPagination={ enhancedPagination }
+						setAttributes={ setAttributes }
+						clientId={ clientId }
+					/>
+				</PanelBody>
 			) }
 			{ ! inherit && showFiltersPanel && (
-				<InspectorControls>
-					<ToolsPanel
-						className="block-library-query-toolspanel__filters"
-						label={ __( 'Filters' ) }
-						resetAll={ () => {
-							setQuery( {
-								author: '',
-								parents: [],
-								search: '',
-								taxQuery: null,
-							} );
-							setQuerySearch( '' );
-						} }
-						dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
-					>
-						{ showTaxControl && (
-							<ToolsPanelItem
-								label={ __( 'Taxonomies' ) }
-								hasValue={ () =>
-									Object.values( taxQuery || {} ).some(
-										( terms ) => !! terms.length
-									)
-								}
-								onDeselect={ () =>
-									setQuery( { taxQuery: null } )
-								}
-							>
-								<TaxonomyControls
-									onChange={ setQuery }
-									query={ query }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showAuthorControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! authorIds }
-								label={ __( 'Authors' ) }
-								onDeselect={ () => setQuery( { author: '' } ) }
-							>
-								<AuthorControl
-									value={ authorIds }
-									onChange={ setQuery }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showSearchControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! querySearch }
+				<ToolsPanel
+					className="block-library-query-toolspanel__filters"
+					label={ __( 'Filters' ) }
+					resetAll={ () => {
+						setQuery( {
+							author: '',
+							parents: [],
+							search: '',
+							taxQuery: null,
+						} );
+						setQuerySearch( '' );
+					} }
+					dropdownMenuProps={ TOOLSPANEL_DROPDOWNMENU_PROPS }
+				>
+					{ showTaxControl && (
+						<ToolsPanelItem
+							label={ __( 'Taxonomies' ) }
+							hasValue={ () =>
+								Object.values( taxQuery || {} ).some(
+									( terms ) => !! terms.length
+								)
+							}
+							onDeselect={ () => setQuery( { taxQuery: null } ) }
+						>
+							<TaxonomyControls
+								onChange={ setQuery }
+								query={ query }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showAuthorControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! authorIds }
+							label={ __( 'Authors' ) }
+							onDeselect={ () => setQuery( { author: '' } ) }
+						>
+							<AuthorControl
+								value={ authorIds }
+								onChange={ setQuery }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showSearchControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! querySearch }
+							label={ __( 'Keyword' ) }
+							onDeselect={ () => setQuerySearch( '' ) }
+						>
+							<TextControl
+								__nextHasNoMarginBottom
 								label={ __( 'Keyword' ) }
-								onDeselect={ () => setQuerySearch( '' ) }
-							>
-								<TextControl
-									__nextHasNoMarginBottom
-									label={ __( 'Keyword' ) }
-									value={ querySearch }
-									onChange={ setQuerySearch }
-								/>
-							</ToolsPanelItem>
-						) }
-						{ showParentControl && (
-							<ToolsPanelItem
-								hasValue={ () => !! parents?.length }
-								label={ __( 'Parents' ) }
-								onDeselect={ () => setQuery( { parents: [] } ) }
-							>
-								<ParentControl
-									parents={ parents }
-									postType={ postType }
-									onChange={ setQuery }
-								/>
-							</ToolsPanelItem>
-						) }
-					</ToolsPanel>
-				</InspectorControls>
+								value={ querySearch }
+								onChange={ setQuerySearch }
+							/>
+						</ToolsPanelItem>
+					) }
+					{ showParentControl && (
+						<ToolsPanelItem
+							hasValue={ () => !! parents?.length }
+							label={ __( 'Parents' ) }
+							onDeselect={ () => setQuery( { parents: [] } ) }
+						>
+							<ParentControl
+								parents={ parents }
+								postType={ postType }
+								onChange={ setQuery }
+							/>
+						</ToolsPanelItem>
+					) }
+				</ToolsPanel>
 			) }
 		</>
 	);
diff --git a/packages/block-library/src/query/edit/query-content.js b/packages/block-library/src/query/edit/query-content.js
index 4d9b8885cb15e..77f9fb211e335 100644
--- a/packages/block-library/src/query/edit/query-content.js
+++ b/packages/block-library/src/query/edit/query-content.js
@@ -112,13 +112,15 @@ export default function QueryContent( {
 				setAttributes={ setAttributes }
 				clientId={ clientId }
 			/>
-			<QueryInspectorControls
-				attributes={ attributes }
-				setQuery={ updateQuery }
-				setDisplayLayout={ updateDisplayLayout }
-				setAttributes={ setAttributes }
-				clientId={ clientId }
-			/>
+			<InspectorControls>
+				<QueryInspectorControls
+					attributes={ attributes }
+					setQuery={ updateQuery }
+					setDisplayLayout={ updateDisplayLayout }
+					setAttributes={ setAttributes }
+					clientId={ clientId }
+				/>
+			</InspectorControls>
 			<BlockControls>
 				<QueryToolbar
 					name={ name }
diff --git a/packages/block-library/src/template-part/edit/advanced-controls.js b/packages/block-library/src/template-part/edit/advanced-controls.js
index 8ad4b4bdbeb1d..44562c472dd4f 100644
--- a/packages/block-library/src/template-part/edit/advanced-controls.js
+++ b/packages/block-library/src/template-part/edit/advanced-controls.js
@@ -4,7 +4,6 @@
 import { useEntityProp } from '@wordpress/core-data';
 import { SelectControl, TextControl } from '@wordpress/components';
 import { sprintf, __ } from '@wordpress/i18n';
-import { InspectorControls } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 
 /**
@@ -70,7 +69,7 @@ export function TemplatePartAdvancedControls( {
 	} ) );
 
 	return (
-		<InspectorControls group="advanced">
+		<>
 			{ isEntityAvailable && (
 				<>
 					<TextControl
@@ -124,6 +123,6 @@ export function TemplatePartAdvancedControls( {
 					setAttributes={ setAttributes }
 				/>
 			) }
-		</InspectorControls>
+		</>
 	);
 }
diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index 888f767635924..ec92996978bd6 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -9,6 +9,7 @@ import {
 	store as blockEditorStore,
 	__experimentalRecursionProvider as RecursionProvider,
 	__experimentalUseHasRecursion as useHasRecursion,
+	InspectorControls,
 } from '@wordpress/block-editor';
 import { Spinner, Modal, MenuItem } from '@wordpress/components';
 import { __, sprintf } from '@wordpress/i18n';
@@ -159,14 +160,16 @@ export default function TemplatePartEdit( {
 	return (
 		<>
 			<RecursionProvider uniqueId={ templatePartId }>
-				<TemplatePartAdvancedControls
-					tagName={ tagName }
-					setAttributes={ setAttributes }
-					isEntityAvailable={ isEntityAvailable }
-					templatePartId={ templatePartId }
-					defaultWrapper={ areaObject.tagName }
-					hasInnerBlocks={ innerBlocks.length > 0 }
-				/>
+				<InspectorControls group="advanced">
+					<TemplatePartAdvancedControls
+						tagName={ tagName }
+						setAttributes={ setAttributes }
+						isEntityAvailable={ isEntityAvailable }
+						templatePartId={ templatePartId }
+						defaultWrapper={ areaObject.tagName }
+						hasInnerBlocks={ innerBlocks.length > 0 }
+					/>
+				</InspectorControls>
 				{ isPlaceholder && (
 					<TagName { ...blockProps }>
 						<TemplatePartPlaceholder
diff --git a/packages/edit-site/src/hooks/template-part-edit.js b/packages/edit-site/src/hooks/template-part-edit.js
index e60b7945448e7..1c5c47a68fbfb 100644
--- a/packages/edit-site/src/hooks/template-part-edit.js
+++ b/packages/edit-site/src/hooks/template-part-edit.js
@@ -52,16 +52,14 @@ function EditTemplatePartMenuItem( { attributes } ) {
 	}
 
 	return (
-		<BlockControls group="other">
-			<ToolbarButton
-				{ ...linkProps }
-				onClick={ ( event ) => {
-					linkProps.onClick( event );
-				} }
-			>
-				{ __( 'Edit' ) }
-			</ToolbarButton>
-		</BlockControls>
+		<ToolbarButton
+			{ ...linkProps }
+			onClick={ ( event ) => {
+				linkProps.onClick( event );
+			} }
+		>
+			{ __( 'Edit' ) }
+		</ToolbarButton>
 	);
 }
 
@@ -72,9 +70,11 @@ export const withEditBlockControls = createHigherOrderComponent(
 
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				{ isDisplayed && (
-					<EditTemplatePartMenuItem attributes={ attributes } />
+					<BlockControls group="other">
+						<EditTemplatePartMenuItem attributes={ attributes } />
+					</BlockControls>
 				) }
 			</>
 		);

From 7aad6a81515d305dde2bbb1256db4a4d0b81b592 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 19 Jan 2024 14:50:00 +0400
Subject: [PATCH 178/296] Migrate 'embedding' e2e tests to Playwright (#57969)

* Migrate 'embedding' e2e tests to Playwright
* Remove old test files
---
 .../__snapshots__/embedding.test.js.snap      |  67 ----
 .../specs/editor/various/embedding.test.js    | 303 -----------------
 .../specs/editor/various/embedding.spec.js    | 310 ++++++++++++++++++
 3 files changed, 310 insertions(+), 370 deletions(-)
 delete mode 100644 packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
 delete mode 100644 packages/e2e-tests/specs/editor/various/embedding.test.js
 create mode 100644 test/e2e/specs/editor/various/embedding.spec.js

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
deleted file mode 100644
index 328b727ac6533..0000000000000
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/embedding.test.js.snap
+++ /dev/null
@@ -1,67 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Embedding content should allow the user to convert unembeddable URLs to a paragraph with a link in it 1`] = `
-"<!-- wp:paragraph -->
-<p><a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a></p>
-<!-- /wp:paragraph -->"
-`;
-
-exports[`Embedding content should allow the user to try embedding a failed URL again 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/wooyaygutenberg123454312","type":"rich","providerNameSlug":"twitter","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter"><div class="wp-block-embed__wrapper">
-https://twitter.com/wooyaygutenberg123454312
-</div></figure>
-<!-- /wp:embed -->"
-`;
-
-exports[`Embedding content should render embeds in the correct state 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/notnownikki","type":"rich","providerNameSlug":"twitter","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-twitter wp-block-embed-twitter"><div class="wp-block-embed__wrapper">
-https://twitter.com/notnownikki
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://twitter.com/wooyaygutenberg123454312","type":"rich","providerNameSlug":"embed-handler","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-embed-handler wp-block-embed-embed-handler"><div class="wp-block-embed__wrapper">
-https://twitter.com/wooyaygutenberg123454312
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://wordpress.org/gutenberg/handbook/"} -->
-<figure class="wp-block-embed"><div class="wp-block-embed__wrapper">
-https://wordpress.org/gutenberg/handbook/
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://twitter.com/thatbunty"} -->
-<figure class="wp-block-embed"><div class="wp-block-embed__wrapper">
-https://twitter.com/thatbunty
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://wordpress.org/gutenberg/handbook/block-api/attributes/","type":"wp-embed","providerNameSlug":"wordpress"} -->
-<figure class="wp-block-embed is-type-wp-embed is-provider-wordpress wp-block-embed-wordpress"><div class="wp-block-embed__wrapper">
-https://wordpress.org/gutenberg/handbook/block-api/attributes/
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://www.youtube.com/watch?v=lXMskKTw3Bc","type":"video","providerNameSlug":"youtube","responsive":true,"className":"wp-embed-aspect-16-9 wp-has-aspect-ratio"} -->
-<figure class="wp-block-embed is-type-video is-provider-youtube wp-block-embed-youtube wp-embed-aspect-16-9 wp-has-aspect-ratio"><div class="wp-block-embed__wrapper">
-https://www.youtube.com/watch?v=lXMskKTw3Bc
-</div></figure>
-<!-- /wp:embed -->
-
-<!-- wp:embed {"url":"https://cloudup.com/cQFlxqtY4ob","type":"photo","providerNameSlug":"cloudup","responsive":true} -->
-<figure class="wp-block-embed is-type-photo is-provider-cloudup wp-block-embed-cloudup"><div class="wp-block-embed__wrapper">
-https://cloudup.com/cQFlxqtY4ob
-</div></figure>
-<!-- /wp:embed -->"
-`;
-
-exports[`Embedding content should retry embeds that could not be embedded with trailing slashes, without the trailing slashes 1`] = `
-"<!-- wp:embed {"url":"https://twitter.com/notnownikki/","type":"rich","providerNameSlug":"embed-handler","responsive":true} -->
-<figure class="wp-block-embed is-type-rich is-provider-embed-handler wp-block-embed-embed-handler"><div class="wp-block-embed__wrapper">
-https://twitter.com/notnownikki/
-</div></figure>
-<!-- /wp:embed -->"
-`;
diff --git a/packages/e2e-tests/specs/editor/various/embedding.test.js b/packages/e2e-tests/specs/editor/various/embedding.test.js
deleted file mode 100644
index 4461fc6233053..0000000000000
--- a/packages/e2e-tests/specs/editor/various/embedding.test.js
+++ /dev/null
@@ -1,303 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	clickBlockAppender,
-	createEmbeddingMatcher,
-	createJSONResponse,
-	createNewPost,
-	createURLMatcher,
-	getEditedPostContent,
-	insertBlock,
-	publishPost,
-	setUpResponseMocking,
-	canvas,
-} from '@wordpress/e2e-test-utils';
-
-const MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE = {
-	url: 'https://wordpress.org/gutenberg/handbook/block-api/attributes/',
-	html: '<div class="wp-embedded-content" data-secret="shhhh it is a secret"></div>',
-	type: 'rich',
-	provider_name: 'WordPress',
-	provider_url: 'https://wordpress.org',
-	version: '1.0',
-};
-
-const MOCK_EMBED_RICH_SUCCESS_RESPONSE = {
-	url: 'https://twitter.com/notnownikki',
-	html: '<p>Mock success response.</p>',
-	type: 'rich',
-	provider_name: 'Twitter',
-	provider_url: 'https://twitter.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_PHOTO_SUCCESS_RESPONSE = {
-	url: 'https://cloudup.com/cQFlxqtY4ob',
-	html: '<p>Mock success response.</p>',
-	type: 'photo',
-	provider_name: 'Cloudup',
-	provider_url: 'https://cloudup.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_VIDEO_SUCCESS_RESPONSE = {
-	url: 'https://www.youtube.com/watch?v=lXMskKTw3Bc',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'video',
-	provider_name: 'YouTube',
-	provider_url: 'https://youtube.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_AUDIO_SUCCESS_RESPONSE = {
-	url: 'https://soundcloud.com/a-boogie-wit-da-hoodie/swervin',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'audio',
-	provider_name: 'SoundCloud',
-	provider_url: 'https://soundcloud.com',
-	version: '1.0',
-};
-
-const MOCK_EMBED_IMAGE_SUCCESS_RESPONSE = {
-	url: 'https://www.instagram.com/p/Bvl97o2AK6x/',
-	html: '<iframe width="16" height="9"></iframe>',
-	type: 'video',
-	provider_name: 'Instagram',
-	provider_url: 'https://www.instagram.com',
-	version: '1.0',
-};
-
-const MOCK_BAD_EMBED_PROVIDER_RESPONSE = {
-	url: 'https://twitter.com/thatbunty',
-	html: false,
-	provider_name: 'Embed Provider',
-	version: '1.0',
-};
-
-const MOCK_CANT_EMBED_RESPONSE = {
-	provider_name: 'Embed Handler',
-	html: '<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
-};
-
-const MOCK_BAD_WORDPRESS_RESPONSE = {
-	code: 'oembed_invalid_url',
-	message: 'Not Found',
-	data: {
-		status: 404,
-	},
-	html: false,
-};
-
-const MOCK_RESPONSES = [
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook'
-		),
-		onRequestMatch: createJSONResponse( MOCK_BAD_WORDPRESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook/'
-		),
-		onRequestMatch: createJSONResponse( MOCK_BAD_WORDPRESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://wordpress.org/gutenberg/handbook/block-api/attributes/'
-		),
-		onRequestMatch: createJSONResponse(
-			MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE
-		),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://www.youtube.com/watch?v=lXMskKTw3Bc'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_VIDEO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://soundcloud.com/a-boogie-wit-da-hoodie/swervin'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_AUDIO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://www.instagram.com/p/Bvl97o2AK6x/'
-		),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_IMAGE_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://cloudup.com/cQFlxqtY4ob' ),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_PHOTO_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/notnownikki' ),
-		onRequestMatch: createJSONResponse( MOCK_EMBED_RICH_SUCCESS_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/notnownikki/' ),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher( 'https://twitter.com/thatbunty' ),
-		onRequestMatch: createJSONResponse( MOCK_BAD_EMBED_PROVIDER_RESPONSE ),
-	},
-	{
-		match: createEmbeddingMatcher(
-			'https://twitter.com/wooyaygutenberg123454312'
-		),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-	// Respond to the instagram URL with a non-image response, doesn't matter what it is,
-	// just make sure the image errors.
-	{
-		match: createURLMatcher( 'https://www.instagram.com/p/Bvl97o2AK6x/' ),
-		onRequestMatch: createJSONResponse( MOCK_CANT_EMBED_RESPONSE ),
-	},
-];
-
-async function insertEmbed( URL ) {
-	await clickBlockAppender();
-	await page.keyboard.type( '/embed' );
-	await page.waitForXPath(
-		`//*[contains(@class, "components-autocomplete__result") and contains(@class, "is-selected") and contains(text(), 'Embed')]`
-	);
-	await page.keyboard.press( 'Enter' );
-	await page.keyboard.type( URL );
-	await page.keyboard.press( 'Enter' );
-}
-
-describe( 'Embedding content', () => {
-	beforeEach( async () => {
-		await setUpResponseMocking( MOCK_RESPONSES );
-		await createNewPost();
-	} );
-
-	it( 'should render embeds in the correct state', async () => {
-		// Valid embed. Should render valid figure element.
-		await insertEmbed( 'https://twitter.com/notnownikki' );
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-
-		// Valid provider; invalid content. Should render failed, edit state.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-		await canvas().waitForSelector(
-			'input[value="https://twitter.com/wooyaygutenberg123454312"]'
-		);
-
-		// WordPress invalid content. Should render failed, edit state.
-		await insertEmbed( 'https://wordpress.org/gutenberg/handbook/' );
-		await canvas().waitForSelector(
-			'input[value="https://wordpress.org/gutenberg/handbook/"]'
-		);
-
-		// Provider whose oembed API has gone wrong. Should render failed, edit
-		// state.
-		await insertEmbed( 'https://twitter.com/thatbunty' );
-		await canvas().waitForSelector(
-			'input[value="https://twitter.com/thatbunty"]'
-		);
-
-		// WordPress content that can be embedded. Should render valid figure
-		// element.
-		await insertEmbed(
-			'https://wordpress.org/gutenberg/handbook/block-api/attributes/'
-		);
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-
-		// Video content. Should render valid figure element, and include the
-		// aspect ratio class.
-		await insertEmbed( 'https://www.youtube.com/watch?v=lXMskKTw3Bc' );
-		await canvas().waitForSelector(
-			'figure.wp-block-embed.is-type-video.wp-embed-aspect-16-9'
-		);
-
-		// Photo content. Should render valid figure element.
-		await insertEmbed( 'https://cloudup.com/cQFlxqtY4ob' );
-		await canvas().waitForSelector(
-			'iframe[title="Embedded content from cloudup"'
-		);
-
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should allow the user to convert unembeddable URLs to a paragraph with a link in it', async () => {
-		// URL that can't be embedded.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-
-		// Wait for the request to fail and present an error. Since placeholder
-		// has styles applied which depend on resize observer, wait for the
-		// expected size class to settle before clicking, since otherwise a race
-		// condition could occur on the placeholder layout vs. click intent.
-		await canvas().waitForSelector(
-			'.components-placeholder.is-large .components-placeholder__error'
-		);
-
-		const button = await canvas().waitForXPath(
-			`//button[contains(text(), 'Convert to link')]`
-		);
-		await button.click();
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async () => {
-		await insertEmbed( 'https://twitter.com/notnownikki/' );
-		// The twitter block should appear correctly.
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should allow the user to try embedding a failed URL again', async () => {
-		// URL that can't be embedded.
-		await insertEmbed( 'https://twitter.com/wooyaygutenberg123454312' );
-
-		// Wait for the request to fail and present an error. Since placeholder
-		// has styles applied which depend on resize observer, wait for the
-		// expected size class to settle before clicking, since otherwise a race
-		// condition could occur on the placeholder layout vs. click intent.
-		await canvas().waitForSelector(
-			'.components-placeholder.is-large .components-placeholder__error'
-		);
-
-		// Set up a different mock to make sure that try again actually does make the request again.
-		await setUpResponseMocking( [
-			{
-				match: createEmbeddingMatcher(
-					'https://twitter.com/wooyaygutenberg123454312'
-				),
-				onRequestMatch: createJSONResponse(
-					MOCK_EMBED_RICH_SUCCESS_RESPONSE
-				),
-			},
-		] );
-		const button = await canvas().waitForXPath(
-			`//button[contains(text(), 'Try again')]`
-		);
-		await button.click();
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
-	it( 'should switch to the WordPress block correctly', async () => {
-		// This test is to make sure that WordPress embeds are detected correctly,
-		// because the HTML can vary, and the block is detected by looking for
-		// classes in the HTML, so we need to flag up if the HTML changes.
-
-		// Publish a post to embed.
-		await insertBlock( 'Paragraph' );
-		await page.keyboard.type( 'Hello there!' );
-		await publishPost();
-		const postUrl = await page.$eval(
-			'.editor-post-publish-panel [id^=inspector-text-control-]',
-			( el ) => el.value
-		);
-
-		// Start a new post, embed the previous post.
-		await createNewPost();
-		await insertEmbed( postUrl );
-
-		// Check the block has become a WordPress block.
-		await canvas().waitForSelector( 'figure.wp-block-embed' );
-	} );
-} );
diff --git a/test/e2e/specs/editor/various/embedding.spec.js b/test/e2e/specs/editor/various/embedding.spec.js
new file mode 100644
index 0000000000000..2fa963f66685d
--- /dev/null
+++ b/test/e2e/specs/editor/various/embedding.spec.js
@@ -0,0 +1,310 @@
+/**
+ * WordPress dependencies
+ */
+const { test, expect } = require( '@wordpress/e2e-test-utils-playwright' );
+
+/** @typedef {import('@playwright/test').Page} Page */
+/** @typedef {import('@wordpress/e2e-test-utils-playwright').Editor} Editor */
+
+const EMBED_URLS = [
+	'/oembed/1.0/proxy',
+	`rest_route=${ encodeURIComponent( '/oembed/1.0/proxy' ) }`,
+];
+
+const MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE = {
+	url: 'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/',
+	html: '<div class="wp-embedded-content" data-secret="shhhh it is a secret"></div>',
+	type: 'rich',
+	provider_name: 'WordPress',
+	provider_url: 'https://wordpress.org',
+	version: '1.0',
+};
+
+const MOCK_EMBED_RICH_SUCCESS_RESPONSE = {
+	url: 'https://twitter.com/notnownikki',
+	html: '<p>Mock success response.</p>',
+	type: 'rich',
+	provider_name: 'Twitter',
+	provider_url: 'https://twitter.com',
+	version: '1.0',
+};
+
+const MOCK_EMBED_PHOTO_SUCCESS_RESPONSE = {
+	url: 'https://cloudup.com/cQFlxqtY4ob',
+	html: '<p>Mock success response.</p>',
+	type: 'photo',
+	provider_name: 'Cloudup',
+	provider_url: 'https://cloudup.com',
+	version: '1.0',
+};
+
+const MOCK_EMBED_VIDEO_SUCCESS_RESPONSE = {
+	url: 'https://www.youtube.com/watch?v=lXMskKTw3Bc',
+	html: '<iframe width="16" height="9"></iframe>',
+	type: 'video',
+	provider_name: 'YouTube',
+	provider_url: 'https://youtube.com',
+	version: '1.0',
+};
+
+const MOCK_BAD_EMBED_PROVIDER_RESPONSE = {
+	url: 'https://twitter.com/thatbunty',
+	html: false,
+	provider_name: 'Embed Provider',
+	version: '1.0',
+};
+
+const MOCK_CANT_EMBED_RESPONSE = {
+	provider_name: 'Embed Handler',
+	html: '<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
+};
+
+const MOCK_BAD_WORDPRESS_RESPONSE = {
+	code: 'oembed_invalid_url',
+	message: 'Not Found',
+	data: {
+		status: 404,
+	},
+	html: false,
+};
+
+test.use( {
+	embedUtils: async ( { page, editor }, use ) => {
+		await use( new EmbedUtils( { page, editor } ) );
+	},
+} );
+
+test.describe( 'Embedding content', () => {
+	test.beforeEach( async ( { admin } ) => {
+		await admin.createNewPost();
+	} );
+
+	test( 'should render embeds in the correct state', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/notnownikki': MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+			'https://wordpress.org/gutenberg/handbook/':
+				MOCK_BAD_WORDPRESS_RESPONSE,
+			'https://twitter.com/thatbunty': MOCK_BAD_EMBED_PROVIDER_RESPONSE,
+			'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/':
+				MOCK_EMBED_WORDPRESS_SUCCESS_RESPONSE,
+			'https://www.youtube.com/watch?v=lXMskKTw3Bc':
+				MOCK_EMBED_VIDEO_SUCCESS_RESPONSE,
+			'https://cloudup.com/cQFlxqtY4ob':
+				MOCK_EMBED_PHOTO_SUCCESS_RESPONSE,
+		} );
+
+		const currenEmbedBlock = editor.canvas
+			.getByRole( 'document', { name: 'Block' } )
+			.last();
+
+		await embedUtils.insertEmbed( 'https://twitter.com/notnownikki' );
+		await expect(
+			currenEmbedBlock.locator( 'iframe' ),
+			'Valid embed. Should render valid element.'
+		).toHaveAttribute( 'title', 'Embedded content from twitter' );
+
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'Valid provider; invalid content. Should render failed, edit state.'
+		).toHaveValue( 'https://twitter.com/wooyaygutenberg123454312' );
+
+		await embedUtils.insertEmbed(
+			'https://wordpress.org/gutenberg/handbook/'
+		);
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'WordPress invalid content. Should render failed, edit state.'
+		).toHaveValue( 'https://wordpress.org/gutenberg/handbook/' );
+
+		await embedUtils.insertEmbed( 'https://twitter.com/thatbunty' );
+		await expect(
+			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
+			'Provider whose oembed API has gone wrong. Should render failed, edit state.'
+		).toHaveValue( 'https://twitter.com/thatbunty' );
+
+		await embedUtils.insertEmbed(
+			'https://developer.wordpress.org/block-editor/reference-guides/block-api/block-attributes/'
+		);
+		await expect(
+			currenEmbedBlock.locator( 'figure' ),
+			'WordPress valid content. Should render valid figure element.'
+		).toHaveClass( 'wp-block-embed' );
+
+		await embedUtils.insertEmbed(
+			'https://www.youtube.com/watch?v=lXMskKTw3Bc'
+		);
+		await expect(
+			currenEmbedBlock.locator( 'figure' ),
+			'Video content. Should render valid figure element, and include the aspect ratio class.'
+		).toHaveClass( /wp-embed-aspect-16-9/ );
+
+		await embedUtils.insertEmbed( 'https://cloudup.com/cQFlxqtY4ob' );
+		await expect(
+			currenEmbedBlock.locator( 'iframe' ),
+			'Photo content. Should render valid iframe element.'
+		).toHaveAttribute( 'title', 'Embedded content from cloudup' );
+	} );
+
+	test( 'should allow the user to convert unembeddable URLs to a paragraph with a link in it', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+		} );
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+
+		const embedBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Embed',
+		} );
+
+		await expect( embedBlock ).toContainText(
+			'Sorry, this content could not be embedded.'
+		);
+
+		await embedBlock
+			.getByRole( 'button', { name: 'Convert to link' } )
+			.click();
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content:
+						'<a href="https://twitter.com/wooyaygutenberg123454312">https://twitter.com/wooyaygutenberg123454312</a>',
+				},
+			},
+		] );
+	} );
+
+	// Reason: A possible regression of https://github.com/WordPress/gutenberg/pull/14705.
+	test.skip( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/notnownikki/': MOCK_CANT_EMBED_RESPONSE,
+			'https://twitter.com/notnownikki': MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+		} );
+		await embedUtils.insertEmbed( 'https://twitter.com/notnownikki/' );
+
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Twitter',
+			} )
+		).toBeVisible();
+	} );
+
+	test( 'should allow the user to try embedding a failed URL again', async ( {
+		editor,
+		embedUtils,
+	} ) => {
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_CANT_EMBED_RESPONSE,
+		} );
+		await embedUtils.insertEmbed(
+			'https://twitter.com/wooyaygutenberg123454312'
+		);
+
+		const embedBlock = editor.canvas.getByRole( 'document', {
+			name: 'Block: Embed',
+		} );
+
+		await expect( embedBlock ).toContainText(
+			'Sorry, this content could not be embedded.'
+		);
+
+		await embedUtils.interceptRequests( {
+			'https://twitter.com/wooyaygutenberg123454312':
+				MOCK_EMBED_RICH_SUCCESS_RESPONSE,
+		} );
+
+		await embedBlock.getByRole( 'button', { name: 'Try again' } ).click();
+		await expect(
+			editor.canvas.getByRole( 'document', {
+				name: 'Block: Twitter',
+			} )
+		).toBeVisible();
+	} );
+
+	test( 'should switch to the WordPress block correctly', async ( {
+		editor,
+		embedUtils,
+		requestUtils,
+	} ) => {
+		const post = await requestUtils.createPost( {
+			title: 'Local embed test',
+			content: 'Hello there!',
+			status: 'publish',
+		} );
+
+		await embedUtils.insertEmbed( post.link );
+		await expect(
+			editor.canvas.getByRole( 'document', { name: 'Block: Embed' } )
+		).toBeVisible();
+	} );
+} );
+
+class EmbedUtils {
+	/** @type {Page} */
+	#page;
+	/** @type {Editor} */
+	#editor;
+
+	constructor( { page, editor } ) {
+		this.#page = page;
+		this.#editor = editor;
+	}
+
+	/**
+	 * @param {URL} url
+	 */
+	isRESTRoute( url ) {
+		return EMBED_URLS.some( ( route ) => {
+			return url.href.includes( route );
+		} );
+	}
+
+	async interceptRequests( responses ) {
+		await this.#page.route(
+			( url ) => this.isRESTRoute( url ),
+			async ( route, request ) => {
+				const embedUrl = new URL( request.url() ).searchParams.get(
+					'url'
+				);
+				const response = responses[ embedUrl ];
+
+				if ( response ) {
+					await route.fulfill( {
+						json: response,
+					} );
+				} else {
+					await route.continue();
+				}
+			}
+		);
+	}
+
+	async insertEmbed( url ) {
+		await test.step( `Inserting embed ${ url }`, async () => {
+			await this.#editor.insertBlock( { name: 'core/embed' } );
+			await this.#editor.canvas
+				.getByRole( 'textbox', { name: 'Embed URL' } )
+				.last()
+				.fill( url );
+			await this.#page.keyboard.press( 'Enter' );
+		} );
+	}
+}

From 2b8287821cfdce69362dcc8cab8c9db70d84cb0c Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Fri, 19 Jan 2024 12:35:45 +0100
Subject: [PATCH 179/296] Site editor: avoid fetching themes on load (#57985)

---
 .../src/components/save-button/index.js       | 11 ++++---
 .../sidebar-navigation-screen/index.js        | 29 ++++++++++++-------
 2 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/packages/edit-site/src/components/save-button/index.js b/packages/edit-site/src/components/save-button/index.js
index e7eac94de5f31..461264bd5a563 100644
--- a/packages/edit-site/src/components/save-button/index.js
+++ b/packages/edit-site/src/components/save-button/index.js
@@ -34,9 +34,7 @@ export default function SaveButton( {
 			const dirtyEntityRecords = __experimentalGetDirtyEntityRecords();
 			const { isSaveViewOpened } = select( editSiteStore );
 			const isActivatingTheme = isResolving( 'activateTheme' );
-			const previewingTheme = select( coreStore ).getTheme(
-				currentlyPreviewingTheme()
-			);
+			const currentlyPreviewingThemeId = currentlyPreviewingTheme();
 
 			return {
 				isDirty: dirtyEntityRecords.length > 0,
@@ -49,7 +47,12 @@ export default function SaveButton( {
 						)
 					) || isActivatingTheme,
 				isSaveViewOpen: isSaveViewOpened(),
-				previewingThemeName: previewingTheme?.name?.rendered,
+				// Do not call `getTheme` with null, it will cause a request to
+				// the server.
+				previewingThemeName: currentlyPreviewingThemeId
+					? select( coreStore ).getTheme( currentlyPreviewingThemeId )
+							?.name?.rendered
+					: undefined,
 			};
 		}, [] );
 	const { setIsSaveViewOpened } = useDispatch( editSiteStore );
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen/index.js b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
index 9ab6f58c81b21..becefe8841fa6 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen/index.js
@@ -41,17 +41,26 @@ export default function SidebarNavigationScreen( {
 	description,
 	backPath: backPathProp,
 } ) {
-	const { dashboardLink, dashboardLinkText } = useSelect( ( select ) => {
-		const { getSettings } = unlock( select( editSiteStore ) );
-		return {
-			dashboardLink: getSettings().__experimentalDashboardLink,
-			dashboardLinkText: getSettings().__experimentalDashboardLinkText,
-		};
-	}, [] );
-	const { getTheme } = useSelect( coreStore );
+	const { dashboardLink, dashboardLinkText, previewingThemeName } = useSelect(
+		( select ) => {
+			const { getSettings } = unlock( select( editSiteStore ) );
+			const currentlyPreviewingThemeId = currentlyPreviewingTheme();
+			return {
+				dashboardLink: getSettings().__experimentalDashboardLink,
+				dashboardLinkText:
+					getSettings().__experimentalDashboardLinkText,
+				// Do not call `getTheme` with null, it will cause a request to
+				// the server.
+				previewingThemeName: currentlyPreviewingThemeId
+					? select( coreStore ).getTheme( currentlyPreviewingThemeId )
+							?.name?.rendered
+					: undefined,
+			};
+		},
+		[]
+	);
 	const location = useLocation();
 	const navigator = useNavigator();
-	const theme = getTheme( currentlyPreviewingTheme() );
 	const icon = isRTL() ? chevronRight : chevronLeft;
 
 	return (
@@ -108,7 +117,7 @@ export default function SidebarNavigationScreen( {
 							? title
 							: sprintf(
 									'Previewing %1$s: %2$s',
-									theme?.name?.rendered,
+									previewingThemeName,
 									title
 							  ) }
 					</Heading>

From 9daa64b9d19ba5460c99d1b89e24516f2e3fd89e Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Fri, 19 Jan 2024 07:36:17 -0500
Subject: [PATCH 180/296] test: Add pasteClipboardToTextBlock utility (#57990)

Enable pasting clipboard contents to text blocks.
---
 .../__device-tests__/helpers/utils.js         | 44 ++++++++++++++-----
 .../__device-tests__/pages/editor-page.js     | 43 ++++++++++++++++++
 2 files changed, 75 insertions(+), 12 deletions(-)

diff --git a/packages/react-native-editor/__device-tests__/helpers/utils.js b/packages/react-native-editor/__device-tests__/helpers/utils.js
index 8af4a0b1a60d7..5af85b9e6847d 100644
--- a/packages/react-native-editor/__device-tests__/helpers/utils.js
+++ b/packages/react-native-editor/__device-tests__/helpers/utils.js
@@ -306,19 +306,11 @@ const clickBeginningOfElement = async ( driver, element ) => {
 		.perform();
 };
 
-// Long press to activate context menu.
-const longPressMiddleOfElement = async (
+async function longPressElement(
 	driver,
 	element,
-	waitTime = 1000,
-	customElementSize
-) => {
-	const location = await element.getLocation();
-	const size = customElementSize || ( await element.getSize() );
-
-	const x = location.x + size.width / 2;
-	const y = location.y + size.height / 2;
-
+	{ waitTime = 1000, offset = { x: 0, y: 0 } } = {}
+) {
 	// Focus on the element first, otherwise on iOS it fails to open the context menu.
 	// We can't do it all in one action because it detects it as a force press and it
 	// is not supported by the simulator.
@@ -331,16 +323,43 @@ const longPressMiddleOfElement = async (
 		.up()
 		.perform();
 
+	const location = await element.getLocation();
+	const size = await element.getSize();
+
+	let offsetX = offset.x;
+	if ( typeof offset.x === 'function' ) {
+		offsetX = offset.x( size.width );
+	}
+	let offsetY = offset.y;
+	if ( typeof offset.y === 'function' ) {
+		offsetY = offset.y( size.height );
+	}
+
 	// Long-press
 	await driver
 		.action( 'pointer', {
 			parameters: { pointerType: 'touch' },
 		} )
-		.move( { x, y } )
+		.move( { x: location.x + offsetX, y: location.y + offsetY } )
 		.down()
 		.pause( waitTime )
 		.up()
 		.perform();
+}
+
+// Long press to activate context menu.
+const longPressMiddleOfElement = async (
+	driver,
+	element,
+	{ waitTime = 1000 } = {}
+) => {
+	await longPressElement( driver, element, {
+		waitTime,
+		offset: {
+			x: ( width ) => width / 2,
+			y: ( height ) => height / 2,
+		},
+	} );
 };
 
 const tapStatusBariOS = async ( driver ) => {
@@ -717,6 +736,7 @@ module.exports = {
 	isElementVisible,
 	isLocalEnvironment,
 	launchApp,
+	longPressElement,
 	longPressMiddleOfElement,
 	selectTextFromElement,
 	setupDriver,
diff --git a/packages/react-native-editor/__device-tests__/pages/editor-page.js b/packages/react-native-editor/__device-tests__/pages/editor-page.js
index b00be20458e80..fe3f410601a8d 100644
--- a/packages/react-native-editor/__device-tests__/pages/editor-page.js
+++ b/packages/react-native-editor/__device-tests__/pages/editor-page.js
@@ -15,6 +15,8 @@ const {
 	clickIfClickable,
 	launchApp,
 	tapStatusBariOS,
+	longPressElement,
+	longPressMiddleOfElement,
 } = require( '../helpers/utils' );
 
 const ADD_BLOCK_ID = isAndroid() ? 'Add block' : 'add-block-button';
@@ -105,6 +107,47 @@ class EditorPage {
 		await typeString( this.driver, block, text, clear );
 	}
 
+	async pasteClipboardToTextBlock( element, { timeout = 1000 } = {} ) {
+		if ( this.driver.isAndroid ) {
+			await longPressMiddleOfElement( this.driver, element );
+		} else {
+			await longPressElement( this.driver, element );
+		}
+
+		if ( this.driver.isAndroid ) {
+			// Long pressing seemingly results in drag-and-drop blurring the input, so
+			// we tap again to re-focus the input.
+			await this.driver
+				.action( 'pointer', {
+					parameters: { pointerType: 'touch' },
+				} )
+				.move( { origin: element } )
+				.down()
+				.up()
+				.perform();
+
+			const location = await element.getLocation();
+			const approximatePasteMenuLocation = {
+				x: location.x + 30,
+				y: location.y - 120,
+			};
+			await this.driver
+				.action( 'pointer', {
+					parameters: { pointerType: 'touch' },
+				} )
+				.move( approximatePasteMenuLocation )
+				.down()
+				.up()
+				.perform();
+		} else {
+			const pasteMenuItem = await this.driver.$(
+				'//XCUIElementTypeMenuItem[@name="Paste"]'
+			);
+			await pasteMenuItem.waitForDisplayed( { timeout } );
+			await pasteMenuItem.click();
+		}
+	}
+
 	// Finds the wd element for new block that was added and sets the element attribute
 	// and accessibilityId attributes on this object and selects the block
 	// position uses one based numbering.

From 4af8902e8e8e8d050669a5ca415719ab692a1f29 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Fri, 19 Jan 2024 18:02:18 +0400
Subject: [PATCH 181/296] Soft deprecate custom 'pure' HoC in favor of
 'React.memo' (#57173)

* Block Supports: Try using 'memo' instead of 'pure'

* Replace more occurrences

* Deprecate 'pure' HoC

* Update native file

* Blame failed search

* Use toHaveWarnedWith

* Soft deprecate

* Add changelong entry
---
 .../block-editor/src/components/block-list/block.js  |  6 +++---
 .../src/components/block-list/block.native.js        | 12 +++++++++---
 .../src/components/block-preview/auto.js             |  6 +++---
 packages/block-editor/src/hooks/typography.native.js |  4 ++--
 packages/block-editor/src/hooks/utils.js             | 10 +++++-----
 packages/compose/CHANGELOG.md                        |  4 ++++
 packages/compose/README.md                           |  2 ++
 packages/compose/src/higher-order/pure/index.tsx     |  2 ++
 8 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/block.js b/packages/block-editor/src/components/block-list/block.js
index af96f0e3483d1..7690386764f6c 100644
--- a/packages/block-editor/src/components/block-list/block.js
+++ b/packages/block-editor/src/components/block-list/block.js
@@ -6,7 +6,7 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useCallback, RawHTML, useContext } from '@wordpress/element';
+import { memo, useCallback, RawHTML, useContext } from '@wordpress/element';
 import {
 	getBlockType,
 	getSaveContent,
@@ -21,7 +21,7 @@ import {
 } from '@wordpress/blocks';
 import { withFilters } from '@wordpress/components';
 import { withDispatch, useDispatch, useSelect } from '@wordpress/data';
-import { compose, pure } from '@wordpress/compose';
+import { compose } from '@wordpress/compose';
 import { safeHTML } from '@wordpress/dom';
 
 /**
@@ -739,4 +739,4 @@ function BlockListBlockProvider( props ) {
 	);
 }
 
-export default pure( BlockListBlockProvider );
+export default memo( BlockListBlockProvider );
diff --git a/packages/block-editor/src/components/block-list/block.native.js b/packages/block-editor/src/components/block-list/block.native.js
index c4f86cfe25a42..1c0de681bd4c2 100644
--- a/packages/block-editor/src/components/block-list/block.native.js
+++ b/packages/block-editor/src/components/block-list/block.native.js
@@ -7,7 +7,13 @@ import classnames from 'classnames';
 /**
  * WordPress dependencies
  */
-import { useCallback, useMemo, useState, useRef } from '@wordpress/element';
+import {
+	useCallback,
+	useMemo,
+	useState,
+	useRef,
+	memo,
+} from '@wordpress/element';
 import {
 	GlobalStylesContext,
 	getMergedGlobalStyles,
@@ -29,7 +35,7 @@ import {
 	withDispatch,
 	withSelect,
 } from '@wordpress/data';
-import { compose, ifCondition, pure } from '@wordpress/compose';
+import { compose, ifCondition } from '@wordpress/compose';
 
 /**
  * Internal dependencies
@@ -682,7 +688,7 @@ const applyWithDispatch = withDispatch( ( dispatch, ownProps, registry ) => {
 } );
 
 export default compose(
-	pure,
+	memo,
 	applyWithSelect,
 	applyWithDispatch,
 	// Block is sometimes not mounted at the right time, causing it be undefined
diff --git a/packages/block-editor/src/components/block-preview/auto.js b/packages/block-editor/src/components/block-preview/auto.js
index 8972370cac689..b4fa5e27b072e 100644
--- a/packages/block-editor/src/components/block-preview/auto.js
+++ b/packages/block-editor/src/components/block-preview/auto.js
@@ -1,9 +1,9 @@
 /**
  * WordPress dependencies
  */
-import { useResizeObserver, pure, useRefEffect } from '@wordpress/compose';
+import { useResizeObserver, useRefEffect } from '@wordpress/compose';
 import { useSelect } from '@wordpress/data';
-import { useMemo } from '@wordpress/element';
+import { memo, useMemo } from '@wordpress/element';
 import { Disabled } from '@wordpress/components';
 
 /**
@@ -55,7 +55,7 @@ function ScaledBlockPreview( {
 	}, [ styles, additionalStyles ] );
 
 	// Initialize on render instead of module top level, to avoid circular dependency issues.
-	MemoizedBlockList = MemoizedBlockList || pure( BlockList );
+	MemoizedBlockList = MemoizedBlockList || memo( BlockList );
 
 	const scale = containerWidth / viewportWidth;
 	const aspectRatio = contentHeight
diff --git a/packages/block-editor/src/hooks/typography.native.js b/packages/block-editor/src/hooks/typography.native.js
index d8cbf71d84e13..f0e9c9c10913d 100644
--- a/packages/block-editor/src/hooks/typography.native.js
+++ b/packages/block-editor/src/hooks/typography.native.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { pure } from '@wordpress/compose';
+import { memo } from '@wordpress/element';
 import { PanelBody } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
 
@@ -57,4 +57,4 @@ function TypographyPanelPure( { clientId, setAttributes, settings } ) {
 // We don't want block controls to re-render when typing inside a block. `pure`
 // will prevent re-renders unless props change, so only pass the needed props
 // and not the whole attributes object.
-export const TypographyPanel = pure( TypographyPanelPure );
+export const TypographyPanel = memo( TypographyPanelPure );
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index cd660c85826c2..e63029e4e34e8 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -2,9 +2,9 @@
  * WordPress dependencies
  */
 import { getBlockSupport } from '@wordpress/blocks';
-import { useMemo, useEffect, useId, useState } from '@wordpress/element';
+import { memo, useMemo, useEffect, useId, useState } from '@wordpress/element';
 import { useDispatch } from '@wordpress/data';
-import { createHigherOrderComponent, pure } from '@wordpress/compose';
+import { createHigherOrderComponent } from '@wordpress/compose';
 import { addFilter } from '@wordpress/hooks';
 
 /**
@@ -402,10 +402,10 @@ export function useBlockSettings( name, parentLayout ) {
 
 export function createBlockEditFilter( features ) {
 	// We don't want block controls to re-render when typing inside a block.
-	// `pure` will prevent re-renders unless props change, so only pass the
+	// `memo` will prevent re-renders unless props change, so only pass the
 	// needed props and not the whole attributes object.
 	features = features.map( ( settings ) => {
-		return { ...settings, Edit: pure( settings.edit ) };
+		return { ...settings, Edit: memo( settings.edit ) };
 	} );
 	const withBlockEditHooks = createHigherOrderComponent(
 		( OriginalBlockEdit ) => ( props ) => {
@@ -488,7 +488,7 @@ function BlockProps( { index, useBlockProps, setAllWrapperProps, ...props } ) {
 	return null;
 }
 
-const BlockPropsPure = pure( BlockProps );
+const BlockPropsPure = memo( BlockProps );
 
 export function createBlockListBlockFilter( features ) {
 	const withBlockListBlockHooks = createHigherOrderComponent(
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index 25ea99778733f..54ff6a16252e3 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 ## Unreleased
 
+### Deprecations
+
+-   The `pure` HoC has been deprecated. Use `memo` or `PureComponent` instead ([#57173](https://github.com/WordPress/gutenberg/pull/57173)).
+
 ## 6.26.0 (2024-01-10)
 
 ## 6.25.0 (2023-12-13)
diff --git a/packages/compose/README.md b/packages/compose/README.md
index ce393f2b5fd18..7eb70a7300f07 100644
--- a/packages/compose/README.md
+++ b/packages/compose/README.md
@@ -141,6 +141,8 @@ _Related_
 
 ### pure
 
+> **Deprecated** Use `memo` or `PureComponent` instead.
+
 Given a component returns the enhanced component augmented with a component only re-rendering when its props/state change
 
 ### throttle
diff --git a/packages/compose/src/higher-order/pure/index.tsx b/packages/compose/src/higher-order/pure/index.tsx
index 65684738b708a..38a85a5eebe9a 100644
--- a/packages/compose/src/higher-order/pure/index.tsx
+++ b/packages/compose/src/higher-order/pure/index.tsx
@@ -17,6 +17,8 @@ import { createHigherOrderComponent } from '../../utils/create-higher-order-comp
 /**
  * Given a component returns the enhanced component augmented with a component
  * only re-rendering when its props/state change
+ *
+ * @deprecated Use `memo` or `PureComponent` instead.
  */
 const pure = createHigherOrderComponent( function < Props extends {} >(
 	WrappedComponent: ComponentType< Props >

From 90d7f567be133cbbde87a351a17a0332b0fa7f48 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Fri, 19 Jan 2024 15:22:18 +0100
Subject: [PATCH 182/296] Data: allow binding registry selector to multiple
 registries (#57943)

---
 packages/data/src/factory.js                 | 12 ++++++----
 packages/data/src/redux-store/index.js       |  5 +++++
 packages/data/src/test/registry-selectors.js | 23 ++++++++++++++++++--
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/packages/data/src/factory.js b/packages/data/src/factory.js
index 389c4a7e2b33a..be4ef8cf673c5 100644
--- a/packages/data/src/factory.js
+++ b/packages/data/src/factory.js
@@ -39,15 +39,19 @@
  * @return {Function} Registry selector that can be registered with a store.
  */
 export function createRegistrySelector( registrySelector ) {
-	let selector;
-	let lastRegistry;
+	const selectorsByRegistry = new WeakMap();
 	// Create a selector function that is bound to the registry referenced by `selector.registry`
 	// and that has the same API as a regular selector. Binding it in such a way makes it
 	// possible to call the selector directly from another selector.
 	const wrappedSelector = ( ...args ) => {
-		if ( ! selector || lastRegistry !== wrappedSelector.registry ) {
+		let selector = selectorsByRegistry.get( wrappedSelector.registry );
+		// We want to make sure the cache persists even when new registry
+		// instances are created. For example patterns create their own editors
+		// with their own core/block-editor stores, so we should keep track of
+		// the cache for each registry instance.
+		if ( ! selector ) {
 			selector = registrySelector( wrappedSelector.registry.select );
-			lastRegistry = wrappedSelector.registry;
+			selectorsByRegistry.set( wrappedSelector.registry, selector );
 		}
 		return selector( ...args );
 	};
diff --git a/packages/data/src/redux-store/index.js b/packages/data/src/redux-store/index.js
index e839408721542..7fdc9331a2474 100644
--- a/packages/data/src/redux-store/index.js
+++ b/packages/data/src/redux-store/index.js
@@ -237,6 +237,11 @@ export default function createReduxStore( key, options ) {
 				const boundSelector = ( ...args ) => {
 					args = normalize( selector, args );
 					const state = store.__unstableOriginalGetState();
+					// Before calling the selector, switch to the correct
+					// registry.
+					if ( selector.isRegistrySelector ) {
+						selector.registry = registry;
+					}
 					return selector( state.root, ...args );
 				};
 
diff --git a/packages/data/src/test/registry-selectors.js b/packages/data/src/test/registry-selectors.js
index bc567474541e2..edcadef8356c6 100644
--- a/packages/data/src/test/registry-selectors.js
+++ b/packages/data/src/test/registry-selectors.js
@@ -78,8 +78,7 @@ describe( 'createRegistrySelector', () => {
 		expect( registry.select( uiStore ).getElementCount() ).toBe( 1 );
 	} );
 
-	// Even without createSelector, this fails in trunk.
-	it.skip( 'can bind one selector to multiple registries', () => {
+	it( 'can bind one selector to multiple registries (createRegistrySelector)', () => {
 		const registry1 = createRegistry();
 		const registry2 = createRegistry();
 
@@ -102,6 +101,26 @@ describe( 'createRegistrySelector', () => {
 		expect( registry2.select( uiStore ).getElementCount() ).toBe( 1 );
 	} );
 
+	it( 'can bind one selector to multiple registries (createRegistrySelector + createSelector)', () => {
+		const registry1 = createRegistry();
+		registry1.register( elementsStore );
+		registry1.register( uiStore );
+		registry1.dispatch( elementsStore ).add( 'Carbon' );
+
+		const registry2 = createRegistry();
+		registry2.register( elementsStore );
+		registry2.register( uiStore );
+		registry2.dispatch( elementsStore ).add( 'Helium' );
+
+		// Expects the `getFilteredElements` to be bound separately and independently to the two registries
+		expect( registry1.select( uiStore ).getFilteredElements() ).toEqual( [
+			'Carbon',
+		] );
+		expect( registry2.select( uiStore ).getFilteredElements() ).toEqual( [
+			'Helium',
+		] );
+	} );
+
 	it( 'can bind a memoized selector to a registry', () => {
 		const registry = createRegistry();
 		registry.register( elementsStore );

From 7105a03f8b614dba2941eee8ad918c99ac1b6e61 Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 19 Jan 2024 16:27:01 +0100
Subject: [PATCH 183/296] Site Editor: Initial routing refactoring to separate
 preview from list view (#57938)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: André Maneiro <583546+oandregal@users.noreply.github.com>
---
 .../edit-site/src/components/layout/index.js  | 176 ++++++++----------
 .../edit-site/src/components/layout/router.js | 103 ++++++++++
 .../src/components/layout/style.scss          |  32 ++--
 .../src/components/page-main/index.js         |  41 ----
 .../src/components/page-pages/index.js        | 166 +++++++----------
 .../src/components/page-patterns/style.scss   |   3 +-
 .../src/components/page-templates/index.js    | 133 +++++--------
 .../src/components/post-preview/index.js      |  16 --
 .../src/components/site-icon/style.scss       |   2 +-
 .../use-init-edited-entity-from-url.js        |  31 ++-
 .../use-sync-path-with-url.js                 |  19 ++
 11 files changed, 363 insertions(+), 359 deletions(-)
 create mode 100644 packages/edit-site/src/components/layout/router.js
 delete mode 100644 packages/edit-site/src/components/page-main/index.js
 delete mode 100644 packages/edit-site/src/components/post-preview/index.js

diff --git a/packages/edit-site/src/components/layout/index.js b/packages/edit-site/src/components/layout/index.js
index e8c45ccdb02a6..163d4fe6e938f 100644
--- a/packages/edit-site/src/components/layout/index.js
+++ b/packages/edit-site/src/components/layout/index.js
@@ -31,17 +31,14 @@ import {
 	useBlockCommands,
 	store as blockEditorStore,
 } from '@wordpress/block-editor';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { privateApis as coreCommandsPrivateApis } from '@wordpress/core-commands';
 
 /**
  * Internal dependencies
  */
 import Sidebar from '../sidebar';
-import Editor from '../editor';
 import ErrorBoundary from '../error-boundary';
 import { store as editSiteStore } from '../../store';
-import getIsListPage from '../../utils/get-is-list-page';
 import Header from '../header-edit-mode';
 import useInitEditedEntityFromURL from '../sync-state-with-url/use-init-edited-entity-from-url';
 import SiteHub from '../site-hub';
@@ -53,12 +50,11 @@ import KeyboardShortcutsRegister from '../keyboard-shortcuts/register';
 import KeyboardShortcutsGlobal from '../keyboard-shortcuts/global';
 import { useCommonCommands } from '../../hooks/commands/use-common-commands';
 import { useEditModeCommands } from '../../hooks/commands/use-edit-mode-commands';
-import PageMain from '../page-main';
 import { useIsSiteEditorLoading } from './hooks';
+import useLayoutAreas from './router';
 
 const { useCommands } = unlock( coreCommandsPrivateApis );
 const { useCommandContext } = unlock( commandsPrivateApis );
-const { useLocation } = unlock( routerPrivateApis );
 const { useGlobalStyle } = unlock( blockEditorPrivateApis );
 
 const ANIMATION_DURATION = 0.5;
@@ -72,10 +68,7 @@ export default function Layout() {
 	useCommonCommands();
 	useBlockCommands();
 
-	const { params } = useLocation();
 	const isMobileViewport = useViewportMatch( 'medium', '<' );
-	const isListPage = getIsListPage( params, isMobileViewport );
-	const isEditorPage = ! isListPage;
 
 	const {
 		isDistractionFree,
@@ -109,26 +102,17 @@ export default function Layout() {
 				select( blockEditorStore ).getBlockSelectionStart(),
 		};
 	}, [] );
-	const isEditing = canvasMode === 'edit';
 	const navigateRegionsProps = useNavigateRegions( {
 		previous: previousShortcut,
 		next: nextShortcut,
 	} );
 	const disableMotion = useReducedMotion();
-	const showSidebar =
-		( isMobileViewport && canvasMode === 'view' && ! isListPage ) ||
-		( ! isMobileViewport && ( canvasMode === 'view' || ! isEditorPage ) );
-	const showCanvas =
-		( isMobileViewport && isEditorPage && isEditing ) ||
-		! isMobileViewport ||
-		! isEditorPage;
-	const isFullCanvas =
-		( isMobileViewport && isListPage ) || ( isEditorPage && isEditing );
 	const [ canvasResizer, canvasSize ] = useResizeObserver();
 	const [ fullResizer ] = useResizeObserver();
 	const isEditorLoading = useIsSiteEditorLoading();
 	const [ isResizableFrameOversized, setIsResizableFrameOversized ] =
 		useState( false );
+	const { areas, widths } = useLayoutAreas();
 
 	// This determines which animation variant should apply to the header.
 	// There is also a `isDistractionFreeHovering` state that gets priority
@@ -154,7 +138,7 @@ export default function Layout() {
 	// Sets the right context for the command palette
 	let commandContext = 'site-editor';
 
-	if ( canvasMode === 'edit' && isEditorPage ) {
+	if ( canvasMode === 'edit' ) {
 		commandContext = 'site-editor-edit';
 	}
 	if ( hasBlockSelected ) {
@@ -185,9 +169,9 @@ export default function Layout() {
 					'edit-site-layout',
 					navigateRegionsProps.className,
 					{
-						'is-distraction-free': isDistractionFree && isEditing,
-						'is-full-canvas': isFullCanvas,
-						'is-edit-mode': isEditing,
+						'is-distraction-free':
+							isDistractionFree && canvasMode === 'edit',
+						'is-full-canvas': canvasMode === 'edit',
 						'has-fixed-toolbar': hasFixedToolbar,
 						'is-block-toolbar-visible': hasBlockSelected,
 					}
@@ -228,7 +212,7 @@ export default function Layout() {
 					/>
 
 					<AnimatePresence initial={ false }>
-						{ isEditorPage && isEditing && (
+						{ canvasMode === 'edit' && (
 							<NavigableRegion
 								key="header"
 								className="edit-site-layout__header"
@@ -272,7 +256,7 @@ export default function Layout() {
 						className="edit-site-layout__sidebar-region"
 					>
 						<AnimatePresence>
-							{ showSidebar && (
+							{ canvasMode === 'view' && (
 								<motion.div
 									initial={ { opacity: 0 } }
 									animate={ { opacity: 1 } }
@@ -296,82 +280,82 @@ export default function Layout() {
 
 					<SavePanel />
 
-					{ showCanvas && (
-						<>
-							{ isListPage && <PageMain /> }
-							{ isEditorPage && (
-								<div className="edit-site-layout__canvas-container">
-									{ canvasResizer }
-									{ !! canvasSize.width && (
-										<motion.div
-											whileHover={
-												isEditorPage &&
-												canvasMode === 'view'
-													? {
-															scale: 1.005,
-															transition: {
-																duration:
-																	disableMotion
-																		? 0
-																		: 0.5,
-																ease: 'easeOut',
-															},
-													  }
-													: {}
+					{ areas.content && canvasMode !== 'edit' && (
+						<div
+							className="edit-site-layout__area"
+							style={ {
+								maxWidth: widths?.content,
+							} }
+						>
+							{ areas.content }
+						</div>
+					) }
+
+					{ areas.preview && (
+						<div className="edit-site-layout__canvas-container">
+							{ canvasResizer }
+							{ !! canvasSize.width && (
+								<motion.div
+									whileHover={
+										canvasMode === 'view'
+											? {
+													scale: 1.005,
+													transition: {
+														duration: disableMotion
+															? 0
+															: 0.5,
+														ease: 'easeOut',
+													},
+											  }
+											: {}
+									}
+									initial={ false }
+									layout="position"
+									className={ classnames(
+										'edit-site-layout__canvas',
+										{
+											'is-right-aligned':
+												isResizableFrameOversized,
+										}
+									) }
+									transition={ {
+										type: 'tween',
+										duration: disableMotion
+											? 0
+											: ANIMATION_DURATION,
+										ease: 'easeOut',
+									} }
+								>
+									<ErrorBoundary>
+										<ResizableFrame
+											isReady={ ! isEditorLoading }
+											isFullWidth={
+												canvasMode === 'edit'
 											}
-											initial={ false }
-											layout="position"
-											className={ classnames(
-												'edit-site-layout__canvas',
-												{
-													'is-right-aligned':
-														isResizableFrameOversized,
-												}
-											) }
-											transition={ {
-												type: 'tween',
-												duration: disableMotion
-													? 0
-													: ANIMATION_DURATION,
-												ease: 'easeOut',
+											defaultSize={ {
+												width:
+													canvasSize.width -
+													24 /* $canvas-padding */,
+												height: canvasSize.height,
+											} }
+											isOversized={
+												isResizableFrameOversized
+											}
+											setIsOversized={
+												setIsResizableFrameOversized
+											}
+											innerContentStyle={ {
+												background:
+													gradientValue ??
+													backgroundColor,
 											} }
 										>
-											<ErrorBoundary>
-												<ResizableFrame
-													isReady={
-														! isEditorLoading
-													}
-													isFullWidth={ isEditing }
-													defaultSize={ {
-														width:
-															canvasSize.width -
-															24 /* $canvas-padding */,
-														height: canvasSize.height,
-													} }
-													isOversized={
-														isResizableFrameOversized
-													}
-													setIsOversized={
-														setIsResizableFrameOversized
-													}
-													innerContentStyle={ {
-														background:
-															gradientValue ??
-															backgroundColor,
-													} }
-												>
-													<Editor
-														isLoading={
-															isEditorLoading
-														}
-													/>
-												</ResizableFrame>
-											</ErrorBoundary>
-										</motion.div>
-									) }
-								</div>
+											{ areas.preview }
+										</ResizableFrame>
+									</ErrorBoundary>
+								</motion.div>
 							) }
-						</>
+						</div>
 					) }
 				</div>
 			</div>
diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
new file mode 100644
index 0000000000000..3f9a8be7f82de
--- /dev/null
+++ b/packages/edit-site/src/components/layout/router.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { privateApis as routerPrivateApis } from '@wordpress/router';
+
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../../lock-unlock';
+import { useIsSiteEditorLoading } from './hooks';
+import Editor from '../editor';
+import DataviewsPatterns from '../page-patterns/dataviews-patterns';
+import PagePages from '../page-pages';
+import PagePatterns from '../page-patterns';
+import PageTemplateParts from '../page-template-parts';
+import PageTemplates from '../page-templates';
+
+const { useLocation } = unlock( routerPrivateApis );
+
+export default function useLayoutAreas() {
+	const isSiteEditorLoading = useIsSiteEditorLoading();
+	const { params } = useLocation();
+	const { postType, postId, path, layout, isCustom } = params ?? {};
+
+	// Regular page
+	if ( path === '/page' ) {
+		const isListLayout =
+			isCustom !== 'true' && ( ! layout || layout === 'list' );
+		return {
+			areas: {
+				content: window.__experimentalAdminViews ? (
+					<PagePages />
+				) : undefined,
+				preview: ( isListLayout ||
+					! window.__experimentalAdminViews ) && (
+					<Editor isLoading={ isSiteEditorLoading } />
+				),
+			},
+			widths: {
+				content:
+					window.__experimentalAdminViews && isListLayout
+						? 380
+						: undefined,
+			},
+		};
+	}
+
+	// Regular other post types
+	if ( postType && postId ) {
+		return {
+			areas: {
+				preview: <Editor isLoading={ isSiteEditorLoading } />,
+			},
+		};
+	}
+
+	// Templates
+	if (
+		path === '/wp_template/all' ||
+		( path === '/wp_template' && window?.__experimentalAdminViews )
+	) {
+		const isListLayout =
+			isCustom !== 'true' && ( ! layout || layout === 'list' );
+		return {
+			areas: {
+				content: <PageTemplates />,
+				preview: isListLayout && (
+					<Editor isLoading={ isSiteEditorLoading } />
+				),
+			},
+			widths: {
+				content: isListLayout ? 380 : undefined,
+			},
+		};
+	}
+
+	// Template parts
+	if ( path === '/wp_template_part/all' ) {
+		return {
+			areas: {
+				content: <PageTemplateParts />,
+			},
+		};
+	}
+
+	// Patterns
+	if ( path === '/patterns' ) {
+		return {
+			areas: {
+				content: window?.__experimentalAdminViews ? (
+					<DataviewsPatterns />
+				) : (
+					<PagePatterns />
+				),
+			},
+		};
+	}
+
+	// Fallback shows the home page preview
+	return {
+		areas: { preview: <Editor isLoading={ isSiteEditorLoading } /> },
+	};
+}
diff --git a/packages/edit-site/src/components/layout/style.scss b/packages/edit-site/src/components/layout/style.scss
index 53d3ed82a88bc..c14d4c2f68274 100644
--- a/packages/edit-site/src/components/layout/style.scss
+++ b/packages/edit-site/src/components/layout/style.scss
@@ -14,11 +14,6 @@
 	height: $header-height;
 	z-index: z-index(".edit-site-layout__hub");
 
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
-		width: $header-height;
-		padding-right: 0;
-	}
-
 	@include break-medium {
 		width: calc(#{$nav-sidebar-width} - #{$grid-unit-30});
 	}
@@ -30,7 +25,7 @@
 		box-shadow: none;
 
 		@include break-medium {
-			width: auto;
+			width: $header-height;
 			padding-right: 0;
 		}
 	}
@@ -156,20 +151,13 @@
 	}
 }
 
-.edit-site-template-pages-list-view,
-.edit-site-page-pages-list-view {
-	max-width: $nav-sidebar-width;
-}
-
 // This shouldn't be necessary (we should have a way to say that a skeletton is relative
 .edit-site-layout__canvas .interface-interface-skeleton,
-.edit-site-page-pages-preview .interface-interface-skeleton,
 .edit-site-template-pages-preview .interface-interface-skeleton {
 	position: relative !important;
 	min-height: 100% !important;
 }
 
-.edit-site-page-pages-preview,
 .edit-site-template-pages-preview {
 	height: 100%;
 }
@@ -187,7 +175,7 @@
 	justify-content: center;
 	border-bottom: 1px solid transparent;
 
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
+	.edit-site-layout.is-full-canvas & {
 		border-bottom-color: $gray-200;
 		transition: border-bottom-color 0.15s 0.4s ease-out;
 	}
@@ -261,8 +249,7 @@
 	}
 }
 
-.is-edit-mode.is-distraction-free {
-
+.edit-site-layout.is-distraction-free {
 	.edit-site-layout__header-container {
 		height: $header-height;
 		position: absolute;
@@ -300,3 +287,16 @@
 	}
 
 }
+
+.edit-site-layout__area {
+	color: $gray-800;
+	background: $white;
+	flex-grow: 1;
+	overflow: auto;
+	margin: 0;
+	margin-top: $header-height;
+	@include break-medium() {
+		border-radius: 8px;
+		margin: $canvas-padding $canvas-padding $canvas-padding 0;
+	}
+}
diff --git a/packages/edit-site/src/components/page-main/index.js b/packages/edit-site/src/components/page-main/index.js
deleted file mode 100644
index fead1b9dbc11e..0000000000000
--- a/packages/edit-site/src/components/page-main/index.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import PagePatterns from '../page-patterns';
-import DataviewsPatterns from '../page-patterns/dataviews-patterns';
-import PageTemplateParts from '../page-template-parts';
-import PageTemplates from '../page-templates';
-import PagePages from '../page-pages';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-export default function PageMain() {
-	const {
-		params: { path },
-	} = useLocation();
-
-	if (
-		path === '/wp_template/all' ||
-		( path === '/wp_template' && window?.__experimentalAdminViews )
-	) {
-		return <PageTemplates />;
-	} else if ( path === '/wp_template_part/all' ) {
-		return <PageTemplateParts />;
-	} else if ( path === '/patterns' ) {
-		return window?.__experimentalAdminViews ? (
-			<DataviewsPatterns />
-		) : (
-			<PagePatterns />
-		);
-	} else if ( window?.__experimentalAdminViews && path === '/page' ) {
-		return <PagePages />;
-	}
-
-	return null;
-}
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 35382a25039fa..048821b048f6a 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -10,7 +10,6 @@ import { dateI18n, getDate, getSettings } from '@wordpress/date';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { useSelect, useDispatch } from '@wordpress/data';
 import { DataViews } from '@wordpress/dataviews';
-import { ENTER, SPACE } from '@wordpress/keycodes';
 
 /**
  * Internal dependencies
@@ -38,7 +37,6 @@ import {
 	viewPostAction,
 	useEditPostAction,
 } from '../actions';
-import PostPreview from '../post-preview';
 import AddNewPageModal from '../add-new-page';
 import Media from '../media';
 import { unlock } from '../../lock-unlock';
@@ -46,13 +44,24 @@ const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
-function useView( type ) {
-	const {
-		params: { activeView = 'all', isCustom = 'false' },
-	} = useLocation();
-	const selectedDefaultView =
-		isCustom === 'false' &&
-		DEFAULT_VIEWS[ type ].find( ( { slug } ) => slug === activeView )?.view;
+function useView( postType ) {
+	const { params } = useLocation();
+	const { activeView = 'all', isCustom = 'false', layout } = params;
+	const history = useHistory();
+	const selectedDefaultView = useMemo( () => {
+		const defaultView =
+			isCustom === 'false' &&
+			DEFAULT_VIEWS[ postType ].find(
+				( { slug } ) => slug === activeView
+			)?.view;
+		if ( isCustom === 'false' && layout ) {
+			return {
+				...defaultView,
+				type: layout,
+			};
+		}
+		return defaultView;
+	}, [ isCustom, activeView, layout, postType ] );
 	const [ view, setView ] = useState( selectedDefaultView );
 
 	useEffect( () => {
@@ -107,13 +116,26 @@ function useView( type ) {
 		[ editEntityRecord, editedViewRecord?.id ]
 	);
 
+	const setDefaultViewAndUpdateUrl = useCallback(
+		( viewToSet ) => {
+			if ( viewToSet.type !== view?.type ) {
+				history.push( {
+					...params,
+					layout: viewToSet.type,
+				} );
+			}
+			setView( viewToSet );
+		},
+		[ params, view?.type, history ]
+	);
+
 	if ( isCustom === 'false' ) {
-		return [ view, setView ];
+		return [ view, setDefaultViewAndUpdateUrl ];
 	} else if ( isCustom === 'true' && customView ) {
 		return [ customView, setCustomView ];
 	}
 	// Loading state where no the view was not found on custom views or default views.
-	return [ DEFAULT_VIEWS[ type ][ 0 ].view, setView ];
+	return [ DEFAULT_VIEWS[ postType ][ 0 ].view, setDefaultViewAndUpdateUrl ];
 }
 
 // See https://github.com/WordPress/gutenberg/issues/55886
@@ -131,12 +153,20 @@ const DEFAULT_STATUSES = 'draft,future,pending,private,publish'; // All but 'tra
 export default function PagePages() {
 	const postType = 'page';
 	const [ view, setView ] = useView( postType );
-	const [ pageId, setPageId ] = useState( null );
 	const history = useHistory();
+	const { params } = useLocation();
+	const { isCustom = 'false' } = params;
 
 	const onSelectionChange = useCallback(
-		( items ) => setPageId( items?.length === 1 ? items[ 0 ].id : null ),
-		[ setPageId ]
+		( items ) => {
+			if ( isCustom === 'false' && view?.type === LAYOUT_LIST ) {
+				history.push( {
+					...params,
+					postId: items.length === 1 ? items[ 0 ].id : undefined,
+				} );
+			}
+		},
+		[ history, params, view?.type, isCustom ]
 	);
 
 	const onDetailsChange = useCallback(
@@ -366,85 +396,33 @@ export default function PagePages() {
 
 	// TODO: we need to handle properly `data={ data || EMPTY_ARRAY }` for when `isLoading`.
 	return (
-		<>
-			<Page
-				className={
-					view.type === LAYOUT_LIST
-						? 'edit-site-page-pages-list-view'
-						: null
-				}
-				title={ __( 'Pages' ) }
-				actions={
-					<>
-						<Button variant="primary" onClick={ openModal }>
-							{ __( 'Add new page' ) }
-						</Button>
-						{ showAddPageModal && (
-							<AddNewPageModal
-								onSave={ handleNewPage }
-								onClose={ closeModal }
-							/>
-						) }
-					</>
-				}
-			>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ pages || EMPTY_ARRAY }
-					isLoading={ isLoadingPages || isLoadingAuthors }
-					view={ view }
-					onChangeView={ onChangeView }
-					onSelectionChange={ onSelectionChange }
-					onDetailsChange={ onDetailsChange }
-				/>
-			</Page>
-			{ view.type === LAYOUT_LIST && (
-				<Page>
-					<div
-						className="edit-site-page-pages-preview"
-						tabIndex={ 0 }
-						role="button"
-						onKeyDown={ ( event ) => {
-							const { keyCode } = event;
-							if ( keyCode === ENTER || keyCode === SPACE ) {
-								history.push( {
-									postId: pageId,
-									postType,
-									canvas: 'edit',
-								} );
-							}
-						} }
-						onClick={ () =>
-							history.push( {
-								postId: pageId,
-								postType,
-								canvas: 'edit',
-							} )
-						}
-					>
-						{ pageId !== null ? (
-							<PostPreview
-								postId={ pageId }
-								postType={ postType }
-							/>
-						) : (
-							<div
-								style={ {
-									display: 'flex',
-									flexDirection: 'column',
-									justifyContent: 'center',
-									textAlign: 'center',
-									height: '100%',
-								} }
-							>
-								<p>{ __( 'Select a page to preview' ) }</p>
-							</div>
-						) }
-					</div>
-				</Page>
-			) }
-		</>
+		<Page
+			title={ __( 'Pages' ) }
+			actions={
+				<>
+					<Button variant="primary" onClick={ openModal }>
+						{ __( 'Add new page' ) }
+					</Button>
+					{ showAddPageModal && (
+						<AddNewPageModal
+							onSave={ handleNewPage }
+							onClose={ closeModal }
+						/>
+					) }
+				</>
+			}
+		>
+			<DataViews
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ pages || EMPTY_ARRAY }
+				isLoading={ isLoadingPages || isLoadingAuthors }
+				view={ view }
+				onChangeView={ onChangeView }
+				onSelectionChange={ onSelectionChange }
+				onDetailsChange={ onDetailsChange }
+			/>
+		</Page>
 	);
 }
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index 6be2f904a65ec..b5d092f438e8e 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -1,10 +1,11 @@
 .edit-site-patterns {
+	background: #1e1e1e;
 	border-left: 1px solid $gray-800;
-	background: none;
 	margin: $header-height 0 0;
 	border-radius: 0;
 	padding: 0;
 	overflow-x: auto;
+	min-height: 100%;
 
 	.components-base-control {
 		width: 100%;
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 4ef099aed6d8d..7deec674f9b41 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -16,7 +16,6 @@ import { __ } from '@wordpress/i18n';
 import { useState, useMemo, useCallback } from '@wordpress/element';
 import { useEntityRecords } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
-import { ENTER, SPACE } from '@wordpress/keycodes';
 import { parse } from '@wordpress/blocks';
 import {
 	BlockPreview,
@@ -53,12 +52,11 @@ import {
 import { postRevisionsAction } from '../actions';
 import usePatternSettings from '../page-patterns/use-pattern-settings';
 import { unlock } from '../../lock-unlock';
-import PostPreview from '../post-preview';
 
 const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
 	blockEditorPrivateApis
 );
-const { useHistory } = unlock( routerPrivateApis );
+const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
@@ -156,18 +154,30 @@ function TemplatePreview( { content, viewType } ) {
 }
 
 export default function DataviewsTemplates() {
-	const [ templateId, setTemplateId ] = useState( null );
-	const [ view, setView ] = useState( DEFAULT_VIEW );
+	const { params } = useLocation();
+	const { layout } = params;
+	const defaultView = useMemo( () => {
+		return {
+			...DEFAULT_VIEW,
+			type: layout ?? DEFAULT_VIEW.type,
+		};
+	}, [ layout ] );
+	const [ view, setView ] = useState( defaultView );
 	const { records: allTemplates, isResolving: isLoadingData } =
 		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
 			per_page: -1,
 		} );
 	const history = useHistory();
-
 	const onSelectionChange = useCallback(
-		( items ) =>
-			setTemplateId( items?.length === 1 ? items[ 0 ].id : null ),
-		[ setTemplateId ]
+		( items ) => {
+			if ( view?.type === LAYOUT_LIST ) {
+				history.push( {
+					...params,
+					postId: items.length === 1 ? items[ 0 ].id : undefined,
+				} );
+			}
+		},
+		[ history, params, view?.type ]
 	);
 
 	const onDetailsChange = useCallback(
@@ -348,90 +358,41 @@ export default function DataviewsTemplates() {
 						...defaultConfigPerViewType[ newView.type ],
 					},
 				};
+
+				history.push( {
+					...params,
+					layout: newView.type,
+				} );
 			}
 
 			setView( newView );
 		},
-		[ view.type, setView ]
+		[ view.type, setView, history, params ]
 	);
 
 	return (
-		<>
-			<Page
-				className={
-					view.type === LAYOUT_LIST
-						? 'edit-site-template-pages-list-view'
-						: null
-				}
-				title={ __( 'Templates' ) }
-				actions={
-					<AddNewTemplate
-						templateType={ TEMPLATE_POST_TYPE }
-						showIcon={ false }
-						toggleProps={ { variant: 'primary' } }
-					/>
-				}
-			>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ data }
-					isLoading={ isLoadingData }
-					view={ view }
-					onChangeView={ onChangeView }
-					onSelectionChange={ onSelectionChange }
-					onDetailsChange={ onDetailsChange }
-					deferredRendering={
-						! view.hiddenFields?.includes( 'preview' )
-					}
+		<Page
+			title={ __( 'Templates' ) }
+			actions={
+				<AddNewTemplate
+					templateType={ TEMPLATE_POST_TYPE }
+					showIcon={ false }
+					toggleProps={ { variant: 'primary' } }
 				/>
-			</Page>
-			{ view.type === LAYOUT_LIST && (
-				<Page>
-					<div
-						className="edit-site-template-pages-preview"
-						tabIndex={ 0 }
-						role="button"
-						onKeyDown={ ( event ) => {
-							const { keyCode } = event;
-							if ( keyCode === ENTER || keyCode === SPACE ) {
-								history.push( {
-									postId: templateId,
-									postType: TEMPLATE_POST_TYPE,
-									canvas: 'edit',
-								} );
-							}
-						} }
-						onClick={ () =>
-							history.push( {
-								postId: templateId,
-								postType: TEMPLATE_POST_TYPE,
-								canvas: 'edit',
-							} )
-						}
-					>
-						{ templateId !== null ? (
-							<PostPreview
-								postId={ templateId }
-								postType={ TEMPLATE_POST_TYPE }
-							/>
-						) : (
-							<div
-								style={ {
-									display: 'flex',
-									flexDirection: 'column',
-									justifyContent: 'center',
-									textAlign: 'center',
-									height: '100%',
-								} }
-							>
-								<p>{ __( 'Select a template to preview' ) }</p>
-							</div>
-						) }
-					</div>
-				</Page>
-			) }
-		</>
+			}
+		>
+			<DataViews
+				paginationInfo={ paginationInfo }
+				fields={ fields }
+				actions={ actions }
+				data={ data }
+				isLoading={ isLoadingData }
+				view={ view }
+				onChangeView={ onChangeView }
+				onSelectionChange={ onSelectionChange }
+				onDetailsChange={ onDetailsChange }
+				deferredRendering={ ! view.hiddenFields?.includes( 'preview' ) }
+			/>
+		</Page>
 	);
 }
diff --git a/packages/edit-site/src/components/post-preview/index.js b/packages/edit-site/src/components/post-preview/index.js
deleted file mode 100644
index 8f325c2627594..0000000000000
--- a/packages/edit-site/src/components/post-preview/index.js
+++ /dev/null
@@ -1,16 +0,0 @@
-/**
- * Internal dependencies
- */
-import Editor from '../editor';
-import { useInitEditedEntity } from '../sync-state-with-url/use-init-edited-entity-from-url';
-import { useIsSiteEditorLoading } from '../layout/hooks';
-
-export default function PostPreview( { postType, postId } ) {
-	useInitEditedEntity( {
-		postId,
-		postType,
-	} );
-	const isEditorLoading = useIsSiteEditorLoading();
-
-	return <Editor isLoading={ isEditorLoading } />;
-}
diff --git a/packages/edit-site/src/components/site-icon/style.scss b/packages/edit-site/src/components/site-icon/style.scss
index ac16279c9fe18..fc680166bf269 100644
--- a/packages/edit-site/src/components/site-icon/style.scss
+++ b/packages/edit-site/src/components/site-icon/style.scss
@@ -9,7 +9,7 @@
 	object-fit: cover;
 	background: #333;
 
-	.edit-site-layout.is-full-canvas.is-edit-mode & {
+	.edit-site-layout.is-full-canvas & {
 		border-radius: 0;
 	}
 }
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 36056cf4b43bd..11c065cf862db 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -27,7 +27,7 @@ const postTypesWithoutParentTemplate = [
 	PATTERN_TYPES.user,
 ];
 
-function useResolveEditedEntityAndContext( { postId, postType } ) {
+function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 	const { hasLoadedAllDependencies, homepageId, url, frontPageTemplateId } =
 		useSelect( ( select ) => {
 			const { getSite, getUnstableBase, getEntityRecords } =
@@ -159,6 +159,11 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 				return resolveTemplateForPostTypeAndId( postType, postId );
 			}
 
+			// Some URLs in list views are different
+			if ( path === '/page' && postId ) {
+				return resolveTemplateForPostTypeAndId( 'page', postId );
+			}
+
 			// If we're rendering the home page, and we have a static home page, resolve its template.
 			if ( homepageId ) {
 				return resolveTemplateForPostTypeAndId( 'page', homepageId );
@@ -176,6 +181,7 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 			url,
 			postId,
 			postType,
+			path,
 			frontPageTemplateId,
 		]
 	);
@@ -189,12 +195,25 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 			return { postType, postId };
 		}
 
+		// Some URLs in list views are different
+		if ( path === '/page' && postId ) {
+			return { postType: 'page', postId };
+		}
+
 		if ( homepageId ) {
 			return { postType: 'page', postId: homepageId };
 		}
 
 		return {};
-	}, [ homepageId, postType, postId ] );
+	}, [ homepageId, postType, postId, path ] );
+
+	if (
+		( path === '/wp_template/all' ||
+			( path === '/wp_template' && window?.__experimentalAdminViews ) ) &&
+		postId
+	) {
+		return { isReady: true, postType: 'wp_template', postId, context };
+	}
 
 	if ( postTypesWithoutParentTemplate.includes( postType ) ) {
 		return { isReady: true, postType, postId, context };
@@ -212,7 +231,8 @@ function useResolveEditedEntityAndContext( { postId, postType } ) {
 	return { isReady: false };
 }
 
-export function useInitEditedEntity( params ) {
+export default function useInitEditedEntityFromURL() {
+	const { params = {} } = useLocation();
 	const { postType, postId, context, isReady } =
 		useResolveEditedEntityAndContext( params );
 
@@ -224,8 +244,3 @@ export function useInitEditedEntity( params ) {
 		}
 	}, [ isReady, postType, postId, context, setEditedEntity ] );
 }
-
-export default function useInitEditedEntityFromURL() {
-	const { params = {} } = useLocation();
-	return useInitEditedEntity( params );
-}
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
index 5f176dff8198d..3eb6d6e6f4fad 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
@@ -82,6 +82,7 @@ export default function useSyncPathWithURL() {
 					postType: navigatorParams?.postType,
 					postId: navigatorParams?.postId,
 					path: undefined,
+					layout: undefined,
 				} );
 			} else if (
 				navigatorLocation.path.startsWith( '/page/' ) &&
@@ -91,6 +92,7 @@ export default function useSyncPathWithURL() {
 					postType: 'page',
 					postId: navigatorParams?.postId,
 					path: undefined,
+					layout: undefined,
 				} );
 			} else if ( navigatorLocation.path === '/patterns' ) {
 				updateUrlParams( {
@@ -99,12 +101,29 @@ export default function useSyncPathWithURL() {
 					canvas: undefined,
 					path: navigatorLocation.path,
 				} );
+			} else if (
+				// These sidebar paths are special in the sense that the url in these pages may or may not have a postId and we need to retain it if it has.
+				// The "type" property should be kept as well.
+				( navigatorLocation.path === '/page' &&
+					window?.__experimentalAdminViews ) ||
+				( navigatorLocation.path === '/wp_template' &&
+					window?.__experimentalAdminViews ) ||
+				( navigatorLocation.path === '/wp_template/all' &&
+					! window?.__experimentalAdminViews )
+			) {
+				updateUrlParams( {
+					postType: undefined,
+					categoryType: undefined,
+					categoryId: undefined,
+					path: navigatorLocation.path,
+				} );
 			} else {
 				updateUrlParams( {
 					postType: undefined,
 					postId: undefined,
 					categoryType: undefined,
 					categoryId: undefined,
+					layout: undefined,
 					path:
 						navigatorLocation.path === '/'
 							? undefined

From 219e0154c4136d86fdd87d72b028178ac021a09f Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Fri, 19 Jan 2024 19:50:39 +0100
Subject: [PATCH 184/296] Preferences: Add a proxy to retrieve the deprecated
 preferences with a deprecation message (#58016)

---
 package-lock.json                           |  2 +
 packages/preferences/package.json           |  1 +
 packages/preferences/src/store/selectors.js | 44 ++++++++++++++++++++-
 3 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d8b4d1038d8a4..56374e1eeb89a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55598,6 +55598,7 @@
 				"@wordpress/components": "file:../components",
 				"@wordpress/compose": "file:../compose",
 				"@wordpress/data": "file:../data",
+				"@wordpress/deprecated": "file:../deprecated",
 				"@wordpress/element": "file:../element",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
@@ -70290,6 +70291,7 @@
 				"@wordpress/components": "file:../components",
 				"@wordpress/compose": "file:../compose",
 				"@wordpress/data": "file:../data",
+				"@wordpress/deprecated": "file:../deprecated",
 				"@wordpress/element": "file:../element",
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index ac1f1c9ade95c..7cab99bfab032 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -33,6 +33,7 @@
 		"@wordpress/components": "file:../components",
 		"@wordpress/compose": "file:../compose",
 		"@wordpress/data": "file:../data",
+		"@wordpress/deprecated": "file:../deprecated",
 		"@wordpress/element": "file:../element",
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
diff --git a/packages/preferences/src/store/selectors.js b/packages/preferences/src/store/selectors.js
index 58b4d18bc362a..e249acf7bbdd3 100644
--- a/packages/preferences/src/store/selectors.js
+++ b/packages/preferences/src/store/selectors.js
@@ -1,3 +1,43 @@
+/**
+ * WordPress dependencies
+ */
+import deprecated from '@wordpress/deprecated';
+
+const withDeprecatedKeys = ( originalGet ) => ( state, scope, name ) => {
+	const settingsToMoveToCore = [
+		'allowRightClickOverrides',
+		'distractionFree',
+		'editorMode',
+		'fixedToolbar',
+		'focusMode',
+		'hiddenBlockTypes',
+		'inactivePanels',
+		'keepCaretInsideBlock',
+		'mostUsedBlocks',
+		'openPanels',
+		'showBlockBreadcrumbs',
+		'showIconLabels',
+		'showListViewByDefault',
+	];
+
+	if (
+		settingsToMoveToCore.includes( name ) &&
+		[ 'core/edit-post', 'core/edit-site' ].includes( scope )
+	) {
+		deprecated(
+			`wp.data.select( 'core/preferences' ).get( '${ scope }', '${ name }' )`,
+			{
+				since: '6.5',
+				alternative: `wp.data.select( 'core/preferences' ).get( 'core', '${ name }' )`,
+			}
+		);
+
+		return originalGet( state, 'core', name );
+	}
+
+	return originalGet( state, scope, name );
+};
+
 /**
  * Returns a boolean indicating whether a prefer is active for a particular
  * scope.
@@ -8,7 +48,7 @@
  *
  * @return {*} Is the feature enabled?
  */
-export function get( state, scope, name ) {
+export const get = withDeprecatedKeys( ( state, scope, name ) => {
 	const value = state.preferences[ scope ]?.[ name ];
 	return value !== undefined ? value : state.defaults[ scope ]?.[ name ];
-}
+} );

From 501f6c82a341ec65ec6c1174d21d8426b414d82a Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Fri, 19 Jan 2024 18:57:26 +0000
Subject: [PATCH 185/296] Bump plugin version to 17.5.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index febd63e0be030..e3ef3d1612722 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.0
+ * Version: 17.5.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 56374e1eeb89a..2a2fc30b96099 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0",
+	"version": "17.5.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.0",
+			"version": "17.5.1",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index 39f4ab82105e8..035c8d69cc56f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0",
+	"version": "17.5.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 9019bf0ccbce7d5138df7d14bcd8b458ec144f13 Mon Sep 17 00:00:00 2001
From: Oguz Kocer <oguzkocer@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:02:20 -0500
Subject: [PATCH 186/296] Update Android publishing group id from
 org.wordpress-mobile to org.wordpress (#58017)

---
 packages/react-native-aztec/android/build.gradle       |  4 ++--
 .../android/react-native-bridge/build.gradle           | 10 +++++-----
 packages/react-native-editor/android/app/build.gradle  |  6 +++---
 packages/react-native-editor/android/build.gradle      |  5 ++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/packages/react-native-aztec/android/build.gradle b/packages/react-native-aztec/android/build.gradle
index 18093ff1c2c13..6c1f4e5b02cce 100644
--- a/packages/react-native-aztec/android/build.gradle
+++ b/packages/react-native-aztec/android/build.gradle
@@ -36,7 +36,7 @@ plugins {
 // import the `readReactNativeVersion()` function
 apply from: 'https://gist.githubusercontent.com/hypest/742448b9588b3a0aa580a5e80ae95bdf/raw/8eb62d40ee7a5104d2fcaeff21ce6f29bd93b054/readReactNativeVersion.gradle'
 
-group = 'org.wordpress-mobile.gutenberg-mobile'
+group = 'org.wordpress.gutenberg-mobile'
 
 // The sample build uses multiple directories to
 // keep boilerplate and common code separate from
@@ -119,7 +119,7 @@ project.afterEvaluate {
             ReactNativeAztecPublication(MavenPublication) {
                 artifact bundleReleaseAar
 
-                groupId 'org.wordpress-mobile.gutenberg-mobile'
+                groupId 'org.wordpress.gutenberg-mobile'
                 artifactId 'react-native-aztec'
                 // version is set by 'publish-to-s3' plugin
 
diff --git a/packages/react-native-bridge/android/react-native-bridge/build.gradle b/packages/react-native-bridge/android/react-native-bridge/build.gradle
index 7800be076c842..c54e73b9a4b6a 100644
--- a/packages/react-native-bridge/android/react-native-bridge/build.gradle
+++ b/packages/react-native-bridge/android/react-native-bridge/build.gradle
@@ -25,7 +25,7 @@ plugins {
 apply from: 'https://gist.githubusercontent.com/hypest/742448b9588b3a0aa580a5e80ae95bdf/raw/8eb62d40ee7a5104d2fcaeff21ce6f29bd93b054/readReactNativeVersion.gradle'
 apply from: '../extractPackageVersion.gradle'
 
-group='org.wordpress-mobile.gutenberg-mobile'
+group='org.wordpress.gutenberg-mobile'
 
 def buildAssetsFolder = 'build/assets'
 
@@ -93,8 +93,8 @@ dependencies {
 
     // Published by `wordpress-mobile/react-native-libraries-publisher`
     // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher`
-    def reactNativeLibrariesPublisherVersion = "v3"
-    def reactNativeLibrariesGroupId = "org.wordpress-mobile.react-native-libraries.$reactNativeLibrariesPublisherVersion"
+    def reactNativeLibrariesPublisherVersion = "v4"
+    def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion"
     implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
@@ -110,7 +110,7 @@ dependencies {
     runtimeOnly "com.facebook.react:hermes-android:$rnVersion"
 
     if (willPublishReactNativeBridgeBinary) {
-        implementation "org.wordpress-mobile.gutenberg-mobile:react-native-aztec:$reactNativeAztecVersion"
+        implementation "org.wordpress.gutenberg-mobile:react-native-aztec:$reactNativeAztecVersion"
    } else {
         api project(':@wordpress_react-native-aztec')
    }
@@ -122,7 +122,7 @@ project.afterEvaluate {
             ReactNativeBridgePublication(MavenPublication) {
                 artifact bundleReleaseAar
 
-                groupId 'org.wordpress-mobile.gutenberg-mobile'
+                groupId 'org.wordpress.gutenberg-mobile'
                 artifactId 'react-native-gutenberg-bridge'
                 // version is set by 'publish-to-s3' plugin
 
diff --git a/packages/react-native-editor/android/app/build.gradle b/packages/react-native-editor/android/app/build.gradle
index ecb63589bcf1c..514c645354232 100644
--- a/packages/react-native-editor/android/app/build.gradle
+++ b/packages/react-native-editor/android/app/build.gradle
@@ -132,7 +132,7 @@ android {
 dependencies {
     def packageJson = '../../package.json'
 
-    implementation "org.wordpress-mobile.gutenberg-mobile:react-native-bridge"
+    implementation "org.wordpress.gutenberg-mobile:react-native-bridge"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation "com.google.android.material:material:1.9.0"
     // The version of react-native is set by the React Native Gradle Plugin
@@ -145,8 +145,8 @@ dependencies {
 
     // Published by `wordpress-mobile/react-native-libraries-publisher`
     // See the documentation for this value in `build.gradle.kts` of `wordpress-mobile/react-native-libraries-publisher`
-    def reactNativeLibrariesPublisherVersion = "v3"
-    def reactNativeLibrariesGroupId = "org.wordpress-mobile.react-native-libraries.$reactNativeLibrariesPublisherVersion"
+    def reactNativeLibrariesPublisherVersion = "v4"
+    def reactNativeLibrariesGroupId = "org.wordpress.react-native-libraries.$reactNativeLibrariesPublisherVersion"
     implementation "$reactNativeLibrariesGroupId:react-native-get-random-values:${extractPackageVersion(packageJson, 'react-native-get-random-values', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-safe-area-context:${extractPackageVersion(packageJson, 'react-native-safe-area-context', 'dependencies')}"
     implementation "$reactNativeLibrariesGroupId:react-native-screens:${extractPackageVersion(packageJson, 'react-native-screens', 'dependencies')}"
diff --git a/packages/react-native-editor/android/build.gradle b/packages/react-native-editor/android/build.gradle
index 7baee554d330c..f08019a79c900 100644
--- a/packages/react-native-editor/android/build.gradle
+++ b/packages/react-native-editor/android/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         compileSdkVersion = 34
         targetSdkVersion = 33
         supportLibVersion = '28.0.0'
-        
+
         // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
         ndkVersion = "23.1.7779620"
     }
@@ -30,8 +30,7 @@ allprojects {
             content {
                 includeGroup "org.wordpress"
                 includeGroup "org.wordpress.aztec"
-                includeGroup "org.wordpress-mobile"
-                includeGroupByRegex "org.wordpress-mobile.react-native-libraries.*"
+                includeGroupByRegex "org.wordpress.react-native-libraries.*"
             }
         }
         maven { url 'https://www.jitpack.io' }

From 2d7be84d7b8f0514371e1f3e18d44306e67c0944 Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Fri, 19 Jan 2024 13:36:23 -0600
Subject: [PATCH 187/296] Remove emoji. (#58023)

---
 docs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/README.md b/docs/README.md
index ba6b35a761f6e..94f640ae46bfc 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # Block Editor Handbook
 
-👋 Welcome to the Block Editor Handbook.
+Welcome to the Block Editor Handbook.
 
 The [**Block Editor**](https://wordpress.org/gutenberg/) is a modern and up-to-date paradigm for WordPress site building and publishing. It uses a modular system of **Blocks** to compose and format content and is designed to create rich and flexible layouts for websites and digital products.
 

From 1a750cf7b36aa426f08c0742c392a0988857c41a Mon Sep 17 00:00:00 2001
From: Marcelo Serpa <81248+fullofcaffeine@users.noreply.github.com>
Date: Fri, 19 Jan 2024 14:08:24 -0600
Subject: [PATCH 188/296] Revert "Bump plugin version to 17.5.1" (#58027)

This reverts commit 501f6c82a341ec65ec6c1174d21d8426b414d82a.
---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index e3ef3d1612722..febd63e0be030 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.1
+ * Version: 17.5.0
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 2a2fc30b96099..56374e1eeb89a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.1",
+	"version": "17.5.0",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.1",
+			"version": "17.5.0",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index 035c8d69cc56f..39f4ab82105e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.1",
+	"version": "17.5.0",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 4df52eac67e1d1d5167e7b7fff20ba5cae84f880 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Fri, 19 Jan 2024 17:08:34 -0300
Subject: [PATCH 189/296] removing version from schema because we won't be
 using that data (#58025)

---
 schemas/json/font-collection.json | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/schemas/json/font-collection.json b/schemas/json/font-collection.json
index a6ca2b1412e6d..4973c71312b60 100644
--- a/schemas/json/font-collection.json
+++ b/schemas/json/font-collection.json
@@ -7,11 +7,6 @@
 			"description": "JSON schema URI for font-collection.json.",
 			"type": "string"
 		},
-		"version": {
-			"description": "Version of font-collection.json schema to use.",
-			"type": "integer",
-			"enum": [ 1 ]
-		},
 		"font_families": {
 			"type": "array",
 			"description": "Array of font families ready to be installed",
@@ -55,5 +50,5 @@
 		}
 	},
 	"additionalProperties": false,
-	"required": [ "$schema", "version", "font_families" ]
+	"required": [ "$schema", "font_families" ]
 }

From a99575c2ea44bc5c5fd172e755f52c16b945d299 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Fri, 19 Jan 2024 21:44:57 +0100
Subject: [PATCH 190/296] Block editor: don't register shortcut for 'inert'
 editor (#57984)

---
 packages/block-editor/src/components/provider/index.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/provider/index.js b/packages/block-editor/src/components/provider/index.js
index c3a87dfb5ff00..b140a2af8c095 100644
--- a/packages/block-editor/src/components/provider/index.js
+++ b/packages/block-editor/src/components/provider/index.js
@@ -46,7 +46,9 @@ export const ExperimentalBlockEditorProvider = withRegistryProvider(
 
 		return (
 			<SlotFillProvider passthrough>
-				<KeyboardShortcuts.Register />
+				{ ! settings.__unstableIsPreviewMode && (
+					<KeyboardShortcuts.Register />
+				) }
 				<BlockRefsProvider>{ children }</BlockRefsProvider>
 			</SlotFillProvider>
 		);

From 7b2350ae84d73957072282ae388aefd35f885825 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Sun, 21 Jan 2024 23:31:07 +0900
Subject: [PATCH 191/296] Embed Block: Retry failing embeds with trailing slash
 (#58007)

---
 packages/block-library/src/embed/edit.js        | 5 +++--
 test/e2e/specs/editor/various/embedding.spec.js | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/embed/edit.js b/packages/block-library/src/embed/edit.js
index 2945fb0fbe888..0b166ebd1e9c7 100644
--- a/packages/block-library/src/embed/edit.js
+++ b/packages/block-library/src/embed/edit.js
@@ -127,16 +127,17 @@ const EmbedEdit = ( props ) => {
 	};
 
 	useEffect( () => {
-		if ( ! preview?.html || ! cannotEmbed || fetching ) {
+		if ( preview?.html || ! cannotEmbed || fetching ) {
 			return;
 		}
+
 		// At this stage, we're not fetching the preview and know it can't be embedded,
 		// so try removing any trailing slash, and resubmit.
 		const newURL = attributesUrl.replace( /\/$/, '' );
 		setURL( newURL );
 		setIsEditingURL( false );
 		setAttributes( { url: newURL } );
-	}, [ preview?.html, attributesUrl, cannotEmbed, fetching ] );
+	}, [ preview?.html, attributesUrl, cannotEmbed, fetching, setAttributes ] );
 
 	// Try a different provider in case the embed url is not supported.
 	useEffect( () => {
diff --git a/test/e2e/specs/editor/various/embedding.spec.js b/test/e2e/specs/editor/various/embedding.spec.js
index 2fa963f66685d..3e04960e7fbf8 100644
--- a/test/e2e/specs/editor/various/embedding.spec.js
+++ b/test/e2e/specs/editor/various/embedding.spec.js
@@ -122,7 +122,7 @@ test.describe( 'Embedding content', () => {
 		await expect(
 			currenEmbedBlock.getByRole( 'textbox', { name: 'Embed URL' } ),
 			'WordPress invalid content. Should render failed, edit state.'
-		).toHaveValue( 'https://wordpress.org/gutenberg/handbook/' );
+		).toHaveValue( 'https://wordpress.org/gutenberg/handbook' );
 
 		await embedUtils.insertEmbed( 'https://twitter.com/thatbunty' );
 		await expect(
@@ -189,7 +189,7 @@ test.describe( 'Embedding content', () => {
 	} );
 
 	// Reason: A possible regression of https://github.com/WordPress/gutenberg/pull/14705.
-	test.skip( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async ( {
+	test( 'should retry embeds that could not be embedded with trailing slashes, without the trailing slashes', async ( {
 		editor,
 		embedUtils,
 	} ) => {

From d7bba1bb0fae296b94f71e90b95366f7834e5b22 Mon Sep 17 00:00:00 2001
From: Carlos Garcia <fluiddot@gmail.com>
Date: Mon, 22 Jan 2024 10:59:41 +0100
Subject: [PATCH 192/296] [RNMobile] Video block: Fix logic for displaying
 empty state based on source presence (#58015)

* Avoid displaying Video block empty state when a source is present

* Add tests to cover empty state visibility logic

* Update `react-native-editor` changelog

* Remove unneeded `await` statements from Video block unit tests

* Update `react-native-editor` changelog
---
 .../block-library/src/video/edit.native.js    |  7 +++-
 .../src/video/test/edit.native.js             | 38 +++++++++++++++++++
 packages/react-native-editor/CHANGELOG.md     |  1 +
 3 files changed, 44 insertions(+), 2 deletions(-)

diff --git a/packages/block-library/src/video/edit.native.js b/packages/block-library/src/video/edit.native.js
index b974e61e10960..e37db3feb63d3 100644
--- a/packages/block-library/src/video/edit.native.js
+++ b/packages/block-library/src/video/edit.native.js
@@ -212,7 +212,7 @@ class VideoEdit extends Component {
 	render() {
 		const { setAttributes, attributes, isSelected, wasBlockJustInserted } =
 			this.props;
-		const { id, src } = attributes;
+		const { id, src, guid } = attributes;
 		const { videoContainerHeight } = this.state;
 
 		const toolbarEditButton = (
@@ -236,7 +236,10 @@ class VideoEdit extends Component {
 			></MediaUpload>
 		);
 
-		if ( ! src ) {
+		// NOTE: `guid` is not part of the block's attribute definition. This case
+		// handled here is a temporary fix until a we find a better approach.
+		const isSourcePresent = src || ( guid && id );
+		if ( ! isSourcePresent ) {
 			return (
 				<View style={ { flex: 1 } }>
 					<MediaPlaceholder
diff --git a/packages/block-library/src/video/test/edit.native.js b/packages/block-library/src/video/test/edit.native.js
index 9b7f4b0bdffbb..ac867406acd74 100644
--- a/packages/block-library/src/video/test/edit.native.js
+++ b/packages/block-library/src/video/test/edit.native.js
@@ -26,4 +26,42 @@ describe( 'Video block', () => {
 
 		expect( screen.getByText( 'Invalid URL.' ) ).toBeVisible();
 	} );
+
+	it( 'should render empty state when source is not present', async () => {
+		await initializeEditor( {
+			initialHtml: `
+<!-- wp:video -->
+<figure class="wp-block-video"></figure>
+<!-- /wp:video -->
+		`,
+		} );
+		const addVideoButton = screen.queryByText( 'Add video' );
+		expect( addVideoButton ).toBeVisible();
+	} );
+
+	it( 'should not render empty state when video source is present', async () => {
+		await initializeEditor( {
+			initialHtml: `
+<!-- wp:video {"id":1234} -->
+<figure class="wp-block-video"><video controls src="https://VIDEO_URL.mp4"></video></figure>
+<!-- /wp:video -->
+		`,
+		} );
+		const addVideoButton = screen.queryByText( 'Add video' );
+		expect( addVideoButton ).toBeNull();
+	} );
+
+	it( `should not render empty state when 'guid' and 'id' attributes are present`, async () => {
+		await initializeEditor( {
+			initialHtml: `
+<!-- wp:video {"guid":"ABCD1234","id":1234 -->
+<figure class="wp-block-video wp-block-embed is-type-video is-provider-videopress"><div class="wp-block-embed__wrapper">
+https://videopress.com/<VIDEO_ID>
+</div></figure>
+<!-- /wp:video -->
+		`,
+		} );
+		const addVideoButton = screen.queryByText( 'Add video' );
+		expect( addVideoButton ).toBeNull();
+	} );
 } );
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index c5973ddace958..fba0781e594fb 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,6 +10,7 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+-   [**] Video block: Fix logic for displaying empty state based on source presence [#58015]
 
 ## 1.111.0
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]

From 8cd2a9da62122c0447e3057e2067ed9a8fdb5770 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Mon, 22 Jan 2024 14:23:28 +0000
Subject: [PATCH 193/296] Add: Footnotes support for other CPT's. (#57353)

---
 packages/block-library/src/footnotes/edit.js  |  3 +-
 .../block-library/src/footnotes/format.js     | 10 ++++--
 .../block-library/src/footnotes/index.php     | 31 ++++++++++++-------
 3 files changed, 29 insertions(+), 15 deletions(-)

diff --git a/packages/block-library/src/footnotes/edit.js b/packages/block-library/src/footnotes/edit.js
index 111e0ba5d3a0e..88254657ced3c 100644
--- a/packages/block-library/src/footnotes/edit.js
+++ b/packages/block-library/src/footnotes/edit.js
@@ -14,10 +14,11 @@ export default function FootnotesEdit( { context: { postType, postId } } ) {
 		'meta',
 		postId
 	);
+	const footnotesSupported = 'string' === typeof meta?.footnotes;
 	const footnotes = meta?.footnotes ? JSON.parse( meta.footnotes ) : [];
 	const blockProps = useBlockProps();
 
-	if ( postType !== 'post' && postType !== 'page' ) {
+	if ( ! footnotesSupported ) {
 		return (
 			<div { ...blockProps }>
 				<Placeholder
diff --git a/packages/block-library/src/footnotes/format.js b/packages/block-library/src/footnotes/format.js
index 0197c427412c0..eda45ac0d30f3 100644
--- a/packages/block-library/src/footnotes/format.js
+++ b/packages/block-library/src/footnotes/format.js
@@ -15,6 +15,7 @@ import {
 	privateApis,
 } from '@wordpress/block-editor';
 import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
+import { useEntityProp } from '@wordpress/core-data';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
 
 /**
@@ -38,12 +39,12 @@ export const format = {
 	},
 	interactive: true,
 	contentEditable: false,
-	[ usesContextKey ]: [ 'postType' ],
+	[ usesContextKey ]: [ 'postType', 'postId' ],
 	edit: function Edit( {
 		value,
 		onChange,
 		isObjectActive,
-		context: { postType },
+		context: { postType, postId },
 	} ) {
 		const registry = useRegistry();
 		const {
@@ -74,6 +75,9 @@ export const format = {
 			return parentCoreBlocks && parentCoreBlocks.length > 0;
 		}, [] );
 
+		const [ meta ] = useEntityProp( 'postType', postType, 'meta', postId );
+		const footnotesSupported = 'string' === typeof meta?.footnotes;
+
 		const { selectionChange, insertBlock } =
 			useDispatch( blockEditorStore );
 
@@ -81,7 +85,7 @@ export const format = {
 			return null;
 		}
 
-		if ( postType !== 'post' && postType !== 'page' ) {
+		if ( ! footnotesSupported ) {
 			return null;
 		}
 
diff --git a/packages/block-library/src/footnotes/index.php b/packages/block-library/src/footnotes/index.php
index bc6291dd21c38..0cd2ad73ef3d4 100644
--- a/packages/block-library/src/footnotes/index.php
+++ b/packages/block-library/src/footnotes/index.php
@@ -68,17 +68,26 @@ function render_block_core_footnotes( $attributes, $content, $block ) {
  * @since 6.3.0
  */
 function register_block_core_footnotes() {
-	foreach ( array( 'post', 'page' ) as $post_type ) {
-		register_post_meta(
-			$post_type,
-			'footnotes',
-			array(
-				'show_in_rest'      => true,
-				'single'            => true,
-				'type'              => 'string',
-				'revisions_enabled' => true,
-			)
-		);
+	$post_types = get_post_types(
+		array(
+			'show_in_rest' => true,
+			'public'       => true,
+		)
+	);
+	foreach ( $post_types as $post_type ) {
+		// Only register the meta field if the post type supports the editor, custom fields, and revisions.
+		if ( post_type_supports( $post_type, 'editor' ) && post_type_supports( $post_type, 'custom-fields' ) && post_type_supports( $post_type, 'revisions' ) ) {
+			register_post_meta(
+				$post_type,
+				'footnotes',
+				array(
+					'show_in_rest'      => true,
+					'single'            => true,
+					'type'              => 'string',
+					'revisions_enabled' => true,
+				)
+			);
+		}
 	}
 	register_block_type_from_metadata(
 		__DIR__ . '/footnotes',

From c35e95aac2bce2fed37539ad11b0dd6908a2f0af Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Mon, 22 Jan 2024 14:34:46 +0000
Subject: [PATCH 194/296] Document files/directories requiring backmerging to
 WP Core for major release (#58064)

* Initial docs stub

* Remove phpunit from list

* Flatten ignore list for absolute clarity

* Correct title
---
 .../code/back-merging-to-wp-core.md           | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 docs/contributors/code/back-merging-to-wp-core.md

diff --git a/docs/contributors/code/back-merging-to-wp-core.md b/docs/contributors/code/back-merging-to-wp-core.md
new file mode 100644
index 0000000000000..2b1ec77df1e55
--- /dev/null
+++ b/docs/contributors/code/back-merging-to-wp-core.md
@@ -0,0 +1,31 @@
+# Back-merging code to WordPress Core
+
+For major releases of the WordPress software, Gutenberg features need to be merged into WordPress Core. Typically this involves taking changes made in `.php` files within the Gutenberg repository and making the equivalent updates in the WP Core codebase.
+
+## Files/Directories
+
+Changes to files within the following files/directories will typically require back-merging to WP Core:
+
+-   `lib/`
+-   `phpunit/`
+
+## Ignored directories/files
+
+The following directories/files do _not_ require back-merging to WP Core:
+
+-   `lib/load.php` - Plugin specific code.
+-   `lib/experiments-page.php` - experiments are Plugin specific.
+-   `packages/block-library` - this is handled automatically during the packages sync process.
+-   `packages/e2e-tests/plugins` - PHP files related to e2e tests only. Mostly fixture data generators.
+-   `phpunit/blocks` - the code is maintained in Gutenberg so the test should be as well.
+
+Please note this list is not exhaustive.
+
+## Pull Request Criteria
+
+In general, all PHP code committed to the Gutenberg repository since the date of the final Gutenberg release that was included in [the _last_ stable WP Core release](https://developer.wordpress.org/block-editor/contributors/versions-in-wordpress/) should be considered for back merging to WP Core.
+
+There are however certain exceptions to that rule. PRs with the following criteria do _not_ require back-merging to WP Core:
+
+-   Does not contain changes to PHP code.
+-   Has label `Backport from WordPress Core` - this code is already in WP Core.

From f4c34a4656521fdb7f151d687d89679c6caebada Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Mon, 22 Jan 2024 15:51:46 +0100
Subject: [PATCH 195/296] Interactivity: Export `withScope()` and allow to use
 it with asynchronous operations. (#58013)

* Initial commit

* Commit to change branches

* Support generators in with scope

* Update changelog
---
 .../interactive-blocks/with-scope/block.json  | 15 ++++++++
 .../interactive-blocks/with-scope/render.php  | 14 +++++++
 .../interactive-blocks/with-scope/view.js     | 20 ++++++++++
 packages/interactivity/CHANGELOG.md           |  7 ++--
 packages/interactivity/src/directives.js      |  1 +
 packages/interactivity/src/hooks.tsx          |  2 +
 packages/interactivity/src/index.js           |  3 +-
 packages/interactivity/src/utils.js           | 38 ++++++++++++++++++-
 .../specs/interactivity/with-scope.spec.ts    | 27 +++++++++++++
 9 files changed, 121 insertions(+), 6 deletions(-)
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js
 create mode 100644 test/e2e/specs/interactivity/with-scope.spec.ts

diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json b/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json
new file mode 100644
index 0000000000000..b9d6a4fc3cf7c
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/with-scope",
+	"title": "E2E Interactivity tests - with scope",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "with-scope-view",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
new file mode 100644
index 0000000000000..e1a844e33246a
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-on`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'with-scope-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "with-scope" }' data-wp-context='{"asyncCounter": 0, "syncCounter": 0}' data-wp-init--a='callbacks.asyncInit' data-wp-init--b='callbacks.syncInit'>
+		<p data-wp-text="context.asyncCounter" data-testid="asyncCounter">0</p>
+		<p data-wp-text="context.syncCounter" data-testid="syncCounter">0</p>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js
new file mode 100644
index 0000000000000..9df421a6f50b7
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/view.js
@@ -0,0 +1,20 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext, withScope } from '@wordpress/interactivity';
+
+store( 'with-scope', {
+	callbacks: {
+		asyncInit: () => {
+			setTimeout( withScope(function*() {
+				yield new Promise(resolve => setTimeout(resolve, 1));
+				const context = getContext()
+				context.asyncCounter += 1;
+			}, 1 ));
+		},
+		syncInit: () => {
+			const context = getContext()
+			context.syncCounter += 1;
+		}
+	},
+} );
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index d660032cbc038..b37fff1bbb5c4 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -5,12 +5,13 @@
 ### Enhancements
 
 -   Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
--   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
+-   Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([#57891](https://github.com/WordPress/gutenberg/pull/57891))
+-   Export `withScope()` and allow to use it with asynchronous operations. ([#58013](https://github.com/WordPress/gutenberg/pull/58013))
 
 ### New Features
 
--   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
--   Add `wp-data-on-window` and `wp-data-on-document` directives. ([57931](https://github.com/WordPress/gutenberg/pull/57931))
+-   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([#57805](https://github.com/WordPress/gutenberg/pull/57805))
+-   Add `wp-data-on-window` and `wp-data-on-document` directives. ([#57931](https://github.com/WordPress/gutenberg/pull/57931))
 
 ### Breaking Changes
 
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index 25ba92808614d..21ab2da29cf27 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -132,6 +132,7 @@ export default () => {
 	// data-wp-init--[name]
 	directive( 'init', ( { directives: { init }, evaluate } ) => {
 		init.forEach( ( entry ) => {
+			// TODO: Replace with useEffect to prevent unneeded scopes.
 			useInit( () => evaluate( entry ) );
 		} );
 	} );
diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
index 0f3bb145b6559..4309f3f0bea7a 100644
--- a/packages/interactivity/src/hooks.tsx
+++ b/packages/interactivity/src/hooks.tsx
@@ -156,6 +156,8 @@ export const resetScope = () => {
 	scopeStack.pop();
 };
 
+export const getNamespace = () => namespaceStack.slice( -1 )[ 0 ];
+
 export const setNamespace = ( namespace: string ) => {
 	namespaceStack.push( namespace );
 };
diff --git a/packages/interactivity/src/index.js b/packages/interactivity/src/index.js
index cf0b4c88cac4b..0864291455310 100644
--- a/packages/interactivity/src/index.js
+++ b/packages/interactivity/src/index.js
@@ -5,9 +5,10 @@ import registerDirectives from './directives';
 import { init } from './router';
 
 export { store } from './store';
-export { directive, getContext, getElement } from './hooks';
+export { directive, getContext, getElement, getNamespace } from './hooks';
 export { navigate, prefetch } from './router';
 export {
+	withScope,
 	useWatch,
 	useInit,
 	useEffect,
diff --git a/packages/interactivity/src/utils.js b/packages/interactivity/src/utils.js
index 021df983cb4f0..84e04803cea4f 100644
--- a/packages/interactivity/src/utils.js
+++ b/packages/interactivity/src/utils.js
@@ -12,7 +12,14 @@ import { effect } from '@preact/signals';
 /**
  * Internal dependencies
  */
-import { getScope, setScope, resetScope } from './hooks';
+import {
+	getScope,
+	setScope,
+	resetScope,
+	getNamespace,
+	setNamespace,
+	resetNamespace,
+} from './hooks';
 
 const afterNextFrame = ( callback ) => {
 	return new Promise( ( resolve ) => {
@@ -71,13 +78,40 @@ export function useSignalEffect( callback ) {
  * @param {Function} func The passed function.
  * @return {Function} The wrapped function.
  */
-const withScope = ( func ) => {
+export const withScope = ( func ) => {
 	const scope = getScope();
+	const ns = getNamespace();
+	if ( func?.constructor?.name === 'GeneratorFunction' ) {
+		return async ( ...args ) => {
+			const gen = func( ...args );
+			let value;
+			let it;
+			while ( true ) {
+				setNamespace( ns );
+				setScope( scope );
+				try {
+					it = gen.next( value );
+				} finally {
+					resetNamespace();
+					resetScope();
+				}
+				try {
+					value = await it.value;
+				} catch ( e ) {
+					gen.throw( e );
+				}
+				if ( it.done ) break;
+			}
+			return value;
+		};
+	}
 	return ( ...args ) => {
+		setNamespace( ns );
 		setScope( scope );
 		try {
 			return func( ...args );
 		} finally {
+			resetNamespace();
 			resetScope();
 		}
 	};
diff --git a/test/e2e/specs/interactivity/with-scope.spec.ts b/test/e2e/specs/interactivity/with-scope.spec.ts
new file mode 100644
index 0000000000000..1cb73cc915aca
--- /dev/null
+++ b/test/e2e/specs/interactivity/with-scope.spec.ts
@@ -0,0 +1,27 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'withScope', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/with-scope' );
+	} );
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/with-scope' ) );
+	} );
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'directives using withScope should work with async and sync functions', async ( {
+		page,
+	} ) => {
+		const asyncCounter = page.getByTestId( 'asyncCounter' );
+		await expect( asyncCounter ).toHaveText( '1' );
+		const syncCounter = page.getByTestId( 'syncCounter' );
+		await expect( syncCounter ).toHaveText( '1' );
+	} );
+} );

From ba13f35f38cdf622ddfc065e146f11683762716d Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Mon, 22 Jan 2024 18:08:54 +0000
Subject: [PATCH 196/296] Bump plugin version to 17.5.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index febd63e0be030..e3ef3d1612722 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.0
+ * Version: 17.5.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 56374e1eeb89a..2a2fc30b96099 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0",
+	"version": "17.5.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.0",
+			"version": "17.5.1",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index 39f4ab82105e8..035c8d69cc56f 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.0",
+	"version": "17.5.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 6f2eaab0aa7322119397a38c461596a48f43d81b Mon Sep 17 00:00:00 2001
From: Siobhan Bamber <siobhan@automattic.com>
Date: Mon, 22 Jan 2024 18:42:30 +0000
Subject: [PATCH 197/296] RNMobile: Avoid crashes by ensuring RichText value
 exists prior to `toString` calls (#58088)

---
 .../rich-text/native/index.native.js          | 20 +++++++++----------
 packages/react-native-editor/CHANGELOG.md     |  1 +
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/packages/block-editor/src/components/rich-text/native/index.native.js b/packages/block-editor/src/components/rich-text/native/index.native.js
index 1f536011b35b6..7a775cad34648 100644
--- a/packages/block-editor/src/components/rich-text/native/index.native.js
+++ b/packages/block-editor/src/components/rich-text/native/index.native.js
@@ -264,7 +264,7 @@ export class RichText extends Component {
 	onCreateUndoLevel() {
 		const { __unstableOnCreateUndoLevel: onCreateUndoLevel } = this.props;
 		// If the content is the same, no level needs to be created.
-		if ( this.lastHistoryValue.toString() === this.value.toString() ) {
+		if ( this.lastHistoryValue?.toString() === this.value?.toString() ) {
 			return;
 		}
 
@@ -317,7 +317,7 @@ export class RichText extends Component {
 			event.nativeEvent.text
 		);
 		// On iOS, onChange can be triggered after selection changes, even though there are no content changes.
-		if ( contentWithoutRootTag === this.value.toString() ) {
+		if ( contentWithoutRootTag === this.value?.toString() ) {
 			return;
 		}
 		this.lastEventCount = event.nativeEvent.eventCount;
@@ -333,7 +333,7 @@ export class RichText extends Component {
 		);
 
 		this.debounceCreateUndoLevel();
-		const refresh = this.value.toString() !== contentWithoutRootTag;
+		const refresh = this.value?.toString() !== contentWithoutRootTag;
 		this.value = contentWithoutRootTag;
 
 		// We don't want to refresh if our goal is just to create a record.
@@ -564,7 +564,7 @@ export class RichText extends Component {
 		// Check if value is up to date with latest state of native AztecView.
 		if (
 			event.nativeEvent.text &&
-			event.nativeEvent.text !== this.props.value.toString()
+			event.nativeEvent.text !== this.props.value?.toString()
 		) {
 			this.onTextUpdate( event );
 		}
@@ -589,7 +589,7 @@ export class RichText extends Component {
 		// this approach is not perfectly reliable.
 		const isManual =
 			this.lastAztecEventType !== 'input' &&
-			this.props.value.toString() === this.value.toString();
+			this.props.value?.toString() === this.value?.toString();
 		if ( hasChanged && isManual ) {
 			const value = this.createRecord();
 			const activeFormats = getActiveFormats( value );
@@ -659,7 +659,7 @@ export class RichText extends Component {
 			event.nativeEvent.text
 		);
 		if (
-			contentWithoutRootTag === this.value.toString() &&
+			contentWithoutRootTag === this.value?.toString() &&
 			realStart === this.selectionStart &&
 			realEnd === this.selectionEnd
 		) {
@@ -756,7 +756,7 @@ export class RichText extends Component {
 			typeof nextProps.value !== 'undefined' &&
 			typeof this.props.value !== 'undefined' &&
 			( ! this.comesFromAztec || ! this.firedAfterTextChanged ) &&
-			nextProps.value.toString() !== this.props.value.toString()
+			nextProps.value?.toString() !== this.props.value?.toString()
 		) {
 			// Gutenberg seems to try to mirror the caret state even on events that only change the content so,
 			//  let's force caret update if state has selection set.
@@ -824,7 +824,7 @@ export class RichText extends Component {
 		const { style, tagName } = this.props;
 		const { currentFontSize } = this.state;
 
-		if ( this.props.value.toString() !== this.value.toString() ) {
+		if ( this.props.value?.toString() !== this.value?.toString() ) {
 			this.value = this.props.value;
 		}
 		const { __unstableIsSelected: prevIsSelected } = prevProps;
@@ -884,8 +884,8 @@ export class RichText extends Component {
 		// On android if content is empty we need to send no content or else the placeholder will not show.
 		if (
 			! this.isIOS &&
-			( value.toString() === '' ||
-				value.toString() === EMPTY_PARAGRAPH_TAGS )
+			( value?.toString() === '' ||
+				value?.toString() === EMPTY_PARAGRAPH_TAGS )
 		) {
 			return '';
 		}
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index fba0781e594fb..3013f9da005cd 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -11,6 +11,7 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 -   [**] Video block: Fix logic for displaying empty state based on source presence [#58015]
+-   [**] Fix crash when RichText values are not defined [#58088]
 
 ## 1.111.0
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]

From b9e3c9f311b5ac3f85646cd24c741f4aa47e5a25 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Mon, 22 Jan 2024 18:55:44 +0000
Subject: [PATCH 198/296] Update Changelog for 17.5.1

---
 changelog.txt | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index b24b8294744d6..193fe8dfe70f6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,22 @@
 == Changelog ==
 
+= 17.5.1 =
+
+## Changelog
+
+### Bug Fixes
+
+- (Preferences)(hotfix)(17.5) Hotfix for missing preferences in the `core` scope([58031](https://github.com/WordPress/gutenberg/pull/58031))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@youknowriad @fullofcaffeine 
+
+
+
+
 = 17.5.0 =
 
 ## Changelog

From b2c2a085e30a50f51414f819220c9ff974cdd328 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Mon, 22 Jan 2024 21:02:37 +0100
Subject: [PATCH 199/296] Fix php unit tests (after variations api change)
 (#58090)

---
 packages/block-library/src/navigation-link/index.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/block-library/src/navigation-link/index.php b/packages/block-library/src/navigation-link/index.php
index 1dcb2996a8e15..71ef26b630d51 100644
--- a/packages/block-library/src/navigation-link/index.php
+++ b/packages/block-library/src/navigation-link/index.php
@@ -338,7 +338,10 @@ function block_core_navigation_link_register_variation( $variation ) {
 		return;
 	}
 
-	$navigation_block_type->variations[] = $variation;
+	$navigation_block_type->variations = array_merge(
+		$navigation_block_type->variations,
+		array( $variation )
+	);
 }
 
 /**
@@ -355,15 +358,16 @@ function block_core_navigation_link_unregister_variation( $name ) {
 	if ( ! $navigation_block_type || empty( $navigation_block_type->variations ) ) {
 		return;
 	}
+	$variations = $navigation_block_type->variations;
 	// Search for the variation and remove it from the array.
-	foreach ( $navigation_block_type->variations as $i => $variation ) {
+	foreach ( $variations as $i => $variation ) {
 		if ( $variation['name'] === $name ) {
-			unset( $navigation_block_type->variations[ $i ] );
+			unset( $variations[ $i ] );
 			break;
 		}
 	}
 	// Reindex array after removing one variation.
-	$navigation_block_type->variations = array_values( $navigation_block_type->variations );
+	$navigation_block_type->variations = array_values( $variations );
 }
 
 /**

From 6ab0f47f646fcd4be1d68b6e3458ac5fe94e3a48 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Tue, 23 Jan 2024 09:59:24 +1100
Subject: [PATCH 200/296] Outline editable blocks when in a pattern that has
 locked children (#57991)

Use :has() to outline editable blocks that are within a pattern that has
locked children but are themselves not locked. For example a pattern
that has multiple paragraphs, not in a container, and some of those
paragraphs allows an override.
---
 .../src/components/block-list/content.scss    | 43 +++++++++++--------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index 8cd75f6855b62..2b778c0892cfa 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -303,27 +303,34 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b
 	}
 }
 
-// Indicate which blocks are editable within a page editor or a content-locked
-// pattern. Only show when user hovers over the page editor or pattern.
+// Indicate which blocks are editable within a locked context.
+// 1. User must be hovering an editor with renderingMode = 'template-lock'; or...
 .is-template-locked:hover,
+// ...a container block.
 .block-editor-block-list__block:hover {
-	.block-editor-block-list__block.is-editing-disabled > .block-editor-block-list__block:not(.is-editing-disabled):not(.is-selected):not(.has-child-selected) {
-		&::after {
-			content: "";
-			border-style: dotted;
-			position: absolute;
-			pointer-events: none;
-			top: $border-width;
-			left: $border-width;
-			right: $border-width;
-			bottom: $border-width;
-			border: 1px dotted var(--wp-admin-theme-color);
-			border-radius: $radius-block-ui - $border-width;
-		}
+	// 2. Look for locked blocks; or...
+	.block-editor-block-list__block.is-editing-disabled,
+	// ...container blocks that have locked children.
+	&:has(> .block-editor-block-list__block.is-editing-disabled) {
+		// 3. Highlight any unlocked children of that locked block.
+		& > .block-editor-block-list__block:not(.is-editing-disabled):not(.is-selected):not(.has-child-selected) {
+			&::after {
+				content: "";
+				border-style: dotted;
+				position: absolute;
+				pointer-events: none;
+				top: $border-width;
+				left: $border-width;
+				right: $border-width;
+				bottom: $border-width;
+				border: 1px dotted var(--wp-admin-theme-color);
+				border-radius: $radius-block-ui - $border-width;
+			}
 
-		&.is-hovered::after {
-			background: rgba(var(--wp-admin-theme-color--rgb), 0.1);
-			border: none;
+			&.is-hovered::after {
+				background: rgba(var(--wp-admin-theme-color--rgb), 0.1);
+				border: none;
+			}
 		}
 	}
 }

From 2997bad8c9119307d0a2767581bc39d7466d439b Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Tue, 23 Jan 2024 10:00:14 +1100
Subject: [PATCH 201/296] List View: Displace list view items when dragging (a
 bit more WYSIWYG) (#56625)

* Include earlier experiment to make drag chip resemble the list view item

* Try displacing list view items via transform: translateY while dragging

* Try adding a bit of styling when nesting

* Try to fix tests

* Offset the top of the table to match the displacement

* Improve the experience when beginning to drag a block

* Smoothly hide gap when dragging outside of the list view area

* Merge in changes from drag to collapsed block to expand PR

* Try collapsing selected blocks down to a single row space while dragging

* Fix jumpiness in Safari

* Try making styling match the selected state

* Try smoothly dropping to the final position

* Fix transitions above dragged items

* Fix flickering issue in Safari

* Try a transparent background color

* Fix drag behaviour in navigation block

* Add vertical drop indicator

* Try using existing drop indicator line

* Add reduced motion, fix e2e test

* Tidy up classname for drag chip in prep for subsequent changes

* Remove indent from drop chip, ensure indent is applied to the position

* Try updating the drag chip to use a border

* Try drop indicator line as preview of final list item

* Try offsets for nesting level of drop indicator, and use darker color if adjacent block has selected branch

* Use drag chip as on trunk, but with opacity of 0.8

* Consolidate drop indicator logic

* Fix drop indicator when dragging files

* Don't add nesting classname when dragging files as the editor thinks we can nest for any block

* Move displacement logic to a helper function, add tests

* Remove unneeded changes from useMovingAnimation

* Add explanatory comments

* Try a timeout for the list view drop zone updates of 50ms instead of 200ms
---
 .../src/components/block-draggable/index.js   |  21 +-
 .../components/list-view/block-contents.js    |   6 +-
 .../src/components/list-view/block.js         |   9 +
 .../src/components/list-view/branch.js        |  40 +++-
 .../components/list-view/drop-indicator.js    | 185 +++++++++++----
 .../src/components/list-view/index.js         |  77 +++++-
 .../src/components/list-view/leaf.js          |   4 +-
 .../src/components/list-view/style.scss       | 115 +++++++--
 .../list-view/test/use-list-view-drop-zone.js |   4 +
 .../src/components/list-view/test/utils.js    | 219 +++++++++++++++++-
 .../list-view/use-list-view-block-indexes.js  |  29 +++
 .../list-view/use-list-view-drop-zone.js      |  84 ++++++-
 .../src/components/list-view/utils.js         | 116 ++++++++++
 .../sidebar-navigation-item/style.scss        |   2 +-
 .../specs/editor/various/list-view.spec.js    |  31 ++-
 15 files changed, 853 insertions(+), 89 deletions(-)
 create mode 100644 packages/block-editor/src/components/list-view/use-list-view-block-indexes.js

diff --git a/packages/block-editor/src/components/block-draggable/index.js b/packages/block-editor/src/components/block-draggable/index.js
index 7191a0f1428a9..c86bc55e8ed07 100644
--- a/packages/block-editor/src/components/block-draggable/index.js
+++ b/packages/block-editor/src/components/block-draggable/index.js
@@ -17,12 +17,15 @@ import { __unstableUseBlockRef as useBlockRef } from '../block-list/use-block-pr
 import { isDropTargetValid } from '../use-block-drop-zone';
 
 const BlockDraggable = ( {
+	appendToOwnerDocument,
 	children,
 	clientIds,
 	cloneClassname,
+	elementId,
 	onDragStart,
 	onDragEnd,
 	fadeWhenDisabled = false,
+	dragComponent,
 } ) => {
 	const {
 		srcRootClientId,
@@ -181,6 +184,7 @@ const BlockDraggable = ( {
 
 	return (
 		<Draggable
+			appendToOwnerDocument={ appendToOwnerDocument }
 			cloneClassname={ cloneClassname }
 			__experimentalTransferDataType="wp-blocks"
 			transferData={ transferData }
@@ -210,12 +214,19 @@ const BlockDraggable = ( {
 				}
 			} }
 			__experimentalDragComponent={
-				<BlockDraggableChip
-					count={ clientIds.length }
-					icon={ icon }
-					fadeWhenDisabled
-				/>
+				// Check against `undefined` so that `null` can be used to disable
+				// the default drag component.
+				dragComponent !== undefined ? (
+					dragComponent
+				) : (
+					<BlockDraggableChip
+						count={ clientIds.length }
+						icon={ icon }
+						fadeWhenDisabled
+					/>
+				)
 			}
+			elementId={ elementId }
 		>
 			{ ( { onDraggableStart, onDraggableEnd } ) => {
 				return children( {
diff --git a/packages/block-editor/src/components/list-view/block-contents.js b/packages/block-editor/src/components/list-view/block-contents.js
index 8d5b03395f3e2..0537a4b48cbe4 100644
--- a/packages/block-editor/src/components/list-view/block-contents.js
+++ b/packages/block-editor/src/components/list-view/block-contents.js
@@ -74,7 +74,11 @@ const ListViewBlockContents = forwardRef(
 						setInsertedBlock={ setInsertedBlock }
 					/>
 				) }
-				<BlockDraggable clientIds={ draggableClientIds }>
+				<BlockDraggable
+					appendToOwnerDocument
+					clientIds={ draggableClientIds }
+					cloneClassname={ 'block-editor-list-view-draggable-chip' }
+				>
 					{ ( { draggable, onDragStart, onDragEnd } ) => (
 						<ListViewBlockSelectButton
 							ref={ ref }
diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
index d756f28e43127..aab9d444a5948 100644
--- a/packages/block-editor/src/components/list-view/block.js
+++ b/packages/block-editor/src/components/list-view/block.js
@@ -43,7 +43,10 @@ import AriaReferencedText from './aria-referenced-text';
 
 function ListViewBlock( {
 	block: { clientId },
+	displacement,
+	isAfterDraggedBlocks,
 	isDragged,
+	isNesting,
 	isSelected,
 	isBranchSelected,
 	selectBlock,
@@ -270,6 +273,11 @@ function ListViewBlock( {
 		'has-single-cell': ! showBlockActions,
 		'is-synced': blockInformation?.isSynced,
 		'is-draggable': canMove,
+		'is-displacement-normal': displacement === 'normal',
+		'is-displacement-up': displacement === 'up',
+		'is-displacement-down': displacement === 'down',
+		'is-after-dragged-blocks': isAfterDraggedBlocks,
+		'is-nesting': isNesting,
 	} );
 
 	// Only include all selected blocks if the currently clicked on block
@@ -296,6 +304,7 @@ function ListViewBlock( {
 	return (
 		<ListViewLeaf
 			className={ classes }
+			isDragged={ isDragged }
 			onKeyDown={ onKeyDown }
 			onMouseEnter={ onMouseEnter }
 			onMouseLeave={ onMouseLeave }
diff --git a/packages/block-editor/src/components/list-view/branch.js b/packages/block-editor/src/components/list-view/branch.js
index e2e27f5f2cb5a..abb36ea4e5d90 100644
--- a/packages/block-editor/src/components/list-view/branch.js
+++ b/packages/block-editor/src/components/list-view/branch.js
@@ -14,7 +14,7 @@ import { AsyncModeProvider, useSelect } from '@wordpress/data';
 import { Appender } from './appender';
 import ListViewBlock from './block';
 import { useListViewContext } from './context';
-import { isClientIdSelected } from './utils';
+import { getDragDisplacementValues, isClientIdSelected } from './utils';
 import { store as blockEditorStore } from '../../store';
 import useBlockDisplayInformation from '../use-block-display-information';
 
@@ -91,7 +91,6 @@ function ListViewBranch( props ) {
 		selectedClientIds,
 		level = 1,
 		path = '',
-		isBranchDragged = false,
 		isBranchSelected = false,
 		listPosition = 0,
 		fixedListWindow,
@@ -115,7 +114,14 @@ function ListViewBranch( props ) {
 		[ parentId ]
 	);
 
-	const { expandedState, draggedClientIds } = useListViewContext();
+	const {
+		blockDropPosition,
+		blockDropTargetIndex,
+		firstDraggedBlockIndex,
+		blockIndexes,
+		expandedState,
+		draggedClientIds,
+	} = useListViewContext();
 
 	if ( ! canParentExpand ) {
 		return null;
@@ -143,6 +149,21 @@ function ListViewBranch( props ) {
 					);
 				}
 
+				const isDragged = !! draggedClientIds?.includes( clientId );
+
+				// Determine the displacement of the block while dragging. This
+				// works out whether the current block should be displaced up or
+				// down, relative to the dragged blocks and the drop target.
+				const { displacement, isAfterDraggedBlocks, isNesting } =
+					getDragDisplacementValues( {
+						blockIndexes,
+						blockDropTargetIndex,
+						blockDropPosition,
+						clientId,
+						firstDraggedBlockIndex,
+						isDragged,
+					} );
+
 				const { itemInView } = fixedListWindow;
 				const blockInView = itemInView( nextPosition );
 
@@ -158,8 +179,6 @@ function ListViewBranch( props ) {
 						? expandedState[ clientId ] ?? isExpanded
 						: undefined;
 
-				const isDragged = !! draggedClientIds?.includes( clientId );
-
 				// Make updates to the selected or dragged blocks synchronous,
 				// but asynchronous for any other block.
 				const isSelected = isClientIdSelected(
@@ -178,7 +197,6 @@ function ListViewBranch( props ) {
 				const showBlock =
 					isDragged ||
 					blockInView ||
-					isBranchDragged ||
 					( isSelected && clientId === selectedClientIds[ 0 ] );
 				return (
 					<AsyncModeProvider key={ clientId } value={ ! isSelected }>
@@ -188,17 +206,20 @@ function ListViewBranch( props ) {
 								selectBlock={ selectBlock }
 								isSelected={ isSelected }
 								isBranchSelected={ isSelectedBranch }
-								isDragged={ isDragged || isBranchDragged }
+								isDragged={ isDragged }
 								level={ level }
 								position={ position }
 								rowCount={ rowCount }
 								siblingBlockCount={ blockCount }
 								showBlockMovers={ showBlockMovers }
 								path={ updatedPath }
-								isExpanded={ shouldExpand }
+								isExpanded={ isDragged ? false : shouldExpand }
 								listPosition={ nextPosition }
 								selectedClientIds={ selectedClientIds }
 								isSyncedBranch={ syncedBranch }
+								displacement={ displacement }
+								isAfterDraggedBlocks={ isAfterDraggedBlocks }
+								isNesting={ isNesting }
 							/>
 						) }
 						{ ! showBlock && (
@@ -206,7 +227,7 @@ function ListViewBranch( props ) {
 								<td className="block-editor-list-view-placeholder" />
 							</tr>
 						) }
-						{ hasNestedBlocks && shouldExpand && (
+						{ hasNestedBlocks && shouldExpand && ! isDragged && (
 							<ListViewBranch
 								parentId={ clientId }
 								blocks={ innerBlocks }
@@ -217,7 +238,6 @@ function ListViewBranch( props ) {
 								listPosition={ nextPosition + 1 }
 								fixedListWindow={ fixedListWindow }
 								isBranchSelected={ isSelectedBranch }
-								isBranchDragged={ isDragged || isBranchDragged }
 								selectedClientIds={ selectedClientIds }
 								isExpanded={ isExpanded }
 								isSyncedBranch={ syncedBranch }
diff --git a/packages/block-editor/src/components/list-view/drop-indicator.js b/packages/block-editor/src/components/list-view/drop-indicator.js
index 04ce87b4a0c8d..ed98922202293 100644
--- a/packages/block-editor/src/components/list-view/drop-indicator.js
+++ b/packages/block-editor/src/components/list-view/drop-indicator.js
@@ -1,15 +1,40 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
-import { Popover } from '@wordpress/components';
+import {
+	__experimentalHStack as HStack,
+	__experimentalTruncate as Truncate,
+	Popover,
+} from '@wordpress/components';
+
 import { getScrollContainer } from '@wordpress/dom';
 import { useCallback, useMemo } from '@wordpress/element';
 import { isRTL } from '@wordpress/i18n';
 
-export default function ListViewDropIndicator( {
+/**
+ * Internal dependencies
+ */
+import BlockIcon from '../block-icon';
+import useBlockDisplayInformation from '../use-block-display-information';
+import useBlockDisplayTitle from '../block-title/use-block-display-title';
+import ListViewExpander from './expander';
+
+export default function ListViewDropIndicatorPreview( {
+	draggedBlockClientId,
 	listViewRef,
 	blockDropTarget,
 } ) {
+	const blockInformation = useBlockDisplayInformation( draggedBlockClientId );
+	const blockTitle = useBlockDisplayTitle( {
+		clientId: draggedBlockClientId,
+		context: 'list-view',
+	} );
+
 	const { rootClientId, clientId, dropPosition } = blockDropTarget || {};
 
 	const [ rootBlockElement, blockElement ] = useMemo( () => {
@@ -35,7 +60,7 @@ export default function ListViewDropIndicator( {
 			: undefined;
 
 		return [ _rootBlockElement, _blockElement ];
-	}, [ rootClientId, clientId ] );
+	}, [ listViewRef, rootClientId, clientId ] );
 
 	// The targetElement is the element that the drop indicator will appear
 	// before or after. When dropping into an empty block list, blockElement
@@ -44,27 +69,6 @@ export default function ListViewDropIndicator( {
 
 	const rtl = isRTL();
 
-	const getDropIndicatorIndent = useCallback(
-		( targetElementRect ) => {
-			if ( ! rootBlockElement ) {
-				return 0;
-			}
-
-			// Calculate the indent using the block icon of the root block.
-			// Using a classname selector here might be flaky and could be
-			// improved.
-			const rootBlockIconElement = rootBlockElement.querySelector(
-				'.block-editor-block-icon'
-			);
-			const rootBlockIconRect =
-				rootBlockIconElement.getBoundingClientRect();
-			return rtl
-				? targetElementRect.right - rootBlockIconRect.left
-				: rootBlockIconRect.right - targetElementRect.left;
-		},
-		[ rootBlockElement, rtl ]
-	);
-
 	const getDropIndicatorWidth = useCallback(
 		( targetElementRect, indent ) => {
 			if ( ! targetElement ) {
@@ -143,12 +147,69 @@ export default function ListViewDropIndicator( {
 		}
 
 		const targetElementRect = targetElement.getBoundingClientRect();
-		const indent = getDropIndicatorIndent( targetElementRect );
 
 		return {
-			width: getDropIndicatorWidth( targetElementRect, indent ),
+			width: getDropIndicatorWidth( targetElementRect, 0 ),
 		};
-	}, [ getDropIndicatorIndent, getDropIndicatorWidth, targetElement ] );
+	}, [ getDropIndicatorWidth, targetElement ] );
+
+	const horizontalScrollOffsetStyle = useMemo( () => {
+		if ( ! targetElement ) {
+			return {};
+		}
+
+		const scrollContainer = getScrollContainer( targetElement );
+		const ownerDocument = targetElement.ownerDocument;
+		const windowScroll =
+			scrollContainer === ownerDocument.body ||
+			scrollContainer === ownerDocument.documentElement;
+
+		if ( scrollContainer && ! windowScroll ) {
+			const scrollContainerRect = scrollContainer.getBoundingClientRect();
+			const targetElementRect = targetElement.getBoundingClientRect();
+
+			const distanceBetweenContainerAndTarget = rtl
+				? scrollContainerRect.right - targetElementRect.right
+				: targetElementRect.left - scrollContainerRect.left;
+
+			if ( ! rtl && scrollContainerRect.left > targetElementRect.left ) {
+				return {
+					transform: `translateX( ${ distanceBetweenContainerAndTarget }px )`,
+				};
+			}
+
+			if ( rtl && scrollContainerRect.right < targetElementRect.right ) {
+				return {
+					transform: `translateX( ${
+						distanceBetweenContainerAndTarget * -1
+					}px )`,
+				};
+			}
+		}
+
+		return {};
+	}, [ rtl, targetElement ] );
+
+	const ariaLevel = useMemo( () => {
+		if ( ! rootBlockElement ) {
+			return 1;
+		}
+
+		const _ariaLevel = parseInt(
+			rootBlockElement.getAttribute( 'aria-level' ),
+			10
+		);
+
+		return _ariaLevel ? _ariaLevel + 1 : 1;
+	}, [ rootBlockElement ] );
+
+	const hasAdjacentSelectedBranch = useMemo( () => {
+		if ( ! targetElement ) {
+			return false;
+		}
+
+		return targetElement.classList.contains( 'is-branch-selected' );
+	}, [ targetElement ] );
 
 	const popoverAnchor = useMemo( () => {
 		const isValidDropPosition =
@@ -163,16 +224,15 @@ export default function ListViewDropIndicator( {
 			contextElement: targetElement,
 			getBoundingClientRect() {
 				const rect = targetElement.getBoundingClientRect();
-				const indent = getDropIndicatorIndent( rect );
 				// In RTL languages, the drop indicator should be positioned
 				// to the left of the target element, with the width of the
 				// indicator determining the indent at the right edge of the
 				// target element. In LTR languages, the drop indicator should
 				// end at the right edge of the target element, with the indent
 				// added to the position of the left edge of the target element.
-				let left = rtl ? rect.left : rect.left + indent;
+				// let left = rtl ? rect.left : rect.left + indent;
+				let left = rect.left;
 				let top = 0;
-				let bottom = 0;
 
 				// In deeply nested lists, where a scrollbar is present,
 				// the width of the drop indicator should be the width of
@@ -212,27 +272,19 @@ export default function ListViewDropIndicator( {
 				}
 
 				if ( dropPosition === 'top' ) {
-					top = rect.top;
-					bottom = rect.top;
+					top = rect.top - rect.height * 2;
 				} else {
 					// `dropPosition` is either `bottom` or `inside`
-					top = rect.bottom;
-					bottom = rect.bottom;
+					top = rect.top;
 				}
 
-				const width = getDropIndicatorWidth( rect, indent );
-				const height = bottom - top;
+				const width = getDropIndicatorWidth( rect, 0 );
+				const height = rect.height;
 
 				return new window.DOMRect( left, top, width, height );
 			},
 		};
-	}, [
-		targetElement,
-		dropPosition,
-		getDropIndicatorIndent,
-		getDropIndicatorWidth,
-		rtl,
-	] );
+	}, [ targetElement, dropPosition, getDropIndicatorWidth, rtl ] );
 
 	if ( ! targetElement ) {
 		return null;
@@ -243,13 +295,54 @@ export default function ListViewDropIndicator( {
 			animate={ false }
 			anchor={ popoverAnchor }
 			focusOnMount={ false }
-			className="block-editor-list-view-drop-indicator"
+			className="block-editor-list-view-drop-indicator--preview"
 			variant="unstyled"
+			flip={ false }
+			resize={ true }
 		>
 			<div
 				style={ style }
-				className="block-editor-list-view-drop-indicator__line"
-			/>
+				className={ classnames(
+					'block-editor-list-view-drop-indicator__line',
+					{
+						'block-editor-list-view-drop-indicator__line--darker':
+							hasAdjacentSelectedBranch,
+					}
+				) }
+			>
+				<div
+					className="block-editor-list-view-leaf"
+					aria-level={ ariaLevel }
+				>
+					<div
+						className={ classnames(
+							'block-editor-list-view-block-select-button',
+							'block-editor-list-view-block-contents'
+						) }
+						style={ horizontalScrollOffsetStyle }
+					>
+						<ListViewExpander onClick={ () => {} } />
+						<BlockIcon
+							icon={ blockInformation?.icon }
+							showColors
+							context="list-view"
+						/>
+						<HStack
+							alignment="center"
+							className="block-editor-list-view-block-select-button__label-wrapper"
+							justify="flex-start"
+							spacing={ 1 }
+						>
+							<span className="block-editor-list-view-block-select-button__title">
+								<Truncate ellipsizeMode="auto">
+									{ blockTitle }
+								</Truncate>
+							</span>
+						</HStack>
+					</div>
+					<div className="block-editor-list-view-block__menu-cell"></div>
+				</div>
+			</div>
 		</Popover>
 	);
 }
diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
index 315a6153839d1..5270a7af3a296 100644
--- a/packages/block-editor/src/components/list-view/index.js
+++ b/packages/block-editor/src/components/list-view/index.js
@@ -1,3 +1,8 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
@@ -28,8 +33,9 @@ import { __ } from '@wordpress/i18n';
  */
 import ListViewBranch from './branch';
 import { ListViewContext } from './context';
-import ListViewDropIndicator from './drop-indicator';
+import ListViewDropIndicatorPreview from './drop-indicator';
 import useBlockSelection from './use-block-selection';
+import useListViewBlockIndexes from './use-list-view-block-indexes';
 import useListViewClientIds from './use-list-view-client-ids';
 import useListViewDropZone from './use-list-view-drop-zone';
 import useListViewExpandSelectedItem from './use-list-view-expand-selected-item';
@@ -105,6 +111,7 @@ function ListViewComponent(
 	const instanceId = useInstanceId( ListViewComponent );
 	const { clientIdsTree, draggedClientIds, selectedClientIds } =
 		useListViewClientIds( { blocks, rootClientId } );
+	const blockIndexes = useListViewBlockIndexes( clientIdsTree );
 
 	const { getBlock } = useSelect( blockEditorStore );
 	const { visibleBlockCount, shouldShowInnerBlocks } = useSelect(
@@ -132,6 +139,8 @@ function ListViewComponent(
 
 	const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
 		dropZoneElement,
+		expandedState,
+		setExpandedState,
 	} );
 	const elementRef = useRef();
 	const treeGridRef = useMergeRefs( [ elementRef, dropZoneRef, ref ] );
@@ -210,11 +219,55 @@ function ListViewComponent(
 		[ updateBlockSelection ]
 	);
 
+	const firstDraggedBlockClientId = draggedClientIds?.[ 0 ];
+
+	// Convert a blockDropTarget into indexes relative to the blocks in the list view.
+	// These values are used to determine which blocks should be displaced to make room
+	// for the drop indicator. See `ListViewBranch` and `getDragDisplacementValues`.
+	const { blockDropTargetIndex, blockDropPosition, firstDraggedBlockIndex } =
+		useMemo( () => {
+			let _blockDropTargetIndex, _firstDraggedBlockIndex;
+
+			if ( blockDropTarget?.clientId ) {
+				const foundBlockIndex =
+					blockIndexes[ blockDropTarget.clientId ];
+				// If dragging below or inside the block, treat the drop target as the next block.
+				_blockDropTargetIndex =
+					foundBlockIndex === undefined ||
+					blockDropTarget?.dropPosition === 'top'
+						? foundBlockIndex
+						: foundBlockIndex + 1;
+			} else if ( blockDropTarget === null ) {
+				// A `null` value is used to indicate that the user is dragging outside of the list view.
+				_blockDropTargetIndex = null;
+			}
+
+			if ( firstDraggedBlockClientId ) {
+				const foundBlockIndex =
+					blockIndexes[ firstDraggedBlockClientId ];
+				_firstDraggedBlockIndex =
+					foundBlockIndex === undefined ||
+					blockDropTarget?.dropPosition === 'top'
+						? foundBlockIndex
+						: foundBlockIndex + 1;
+			}
+
+			return {
+				blockDropTargetIndex: _blockDropTargetIndex,
+				blockDropPosition: blockDropTarget?.dropPosition,
+				firstDraggedBlockIndex: _firstDraggedBlockIndex,
+			};
+		}, [ blockDropTarget, blockIndexes, firstDraggedBlockClientId ] );
+
 	const contextValue = useMemo(
 		() => ( {
+			blockDropPosition,
+			blockDropTargetIndex,
+			blockIndexes,
 			draggedClientIds,
 			expandedState,
 			expand,
+			firstDraggedBlockIndex,
 			collapse,
 			BlockSettingsMenu,
 			listViewInstanceId: instanceId,
@@ -225,9 +278,13 @@ function ListViewComponent(
 			rootClientId,
 		} ),
 		[
+			blockDropPosition,
+			blockDropTargetIndex,
+			blockIndexes,
 			draggedClientIds,
 			expandedState,
 			expand,
+			firstDraggedBlockIndex,
 			collapse,
 			BlockSettingsMenu,
 			instanceId,
@@ -267,7 +324,8 @@ function ListViewComponent(
 
 	return (
 		<AsyncModeProvider value={ true }>
-			<ListViewDropIndicator
+			<ListViewDropIndicatorPreview
+				draggedBlockClientId={ firstDraggedBlockClientId }
 				listViewRef={ elementRef }
 				blockDropTarget={ blockDropTarget }
 			/>
@@ -278,7 +336,11 @@ function ListViewComponent(
 			) }
 			<TreeGrid
 				id={ id }
-				className="block-editor-list-view-tree"
+				className={ classnames( 'block-editor-list-view-tree', {
+					'is-dragging':
+						draggedClientIds?.length > 0 &&
+						blockDropTargetIndex !== undefined,
+				} ) }
 				aria-label={ __( 'Block navigation structure' ) }
 				ref={ treeGridRef }
 				onCollapseRow={ collapseRow }
@@ -286,6 +348,15 @@ function ListViewComponent(
 				onFocusRow={ focusRow }
 				applicationAriaLabel={ __( 'Block navigation structure' ) }
 				aria-describedby={ describedById }
+				style={ {
+					'--wp-admin--list-view-dragged-items-height':
+						draggedClientIds?.length
+							? `${
+									BLOCK_LIST_ITEM_HEIGHT *
+									( draggedClientIds.length - 1 )
+							  }px`
+							: null,
+				} }
 			>
 				<ListViewContext.Provider value={ contextValue }>
 					<ListViewBranch
diff --git a/packages/block-editor/src/components/list-view/leaf.js b/packages/block-editor/src/components/list-view/leaf.js
index c42d696f32b3c..ba6d528746829 100644
--- a/packages/block-editor/src/components/list-view/leaf.js
+++ b/packages/block-editor/src/components/list-view/leaf.js
@@ -21,6 +21,7 @@ const AnimatedTreeGridRow = animated( TreeGridRow );
 const ListViewLeaf = forwardRef(
 	(
 		{
+			isDragged,
 			isSelected,
 			position,
 			level,
@@ -33,8 +34,7 @@ const ListViewLeaf = forwardRef(
 		ref
 	) => {
 		const animationRef = useMovingAnimation( {
-			isSelected,
-			adjustScrolling: false,
+			clientId: props[ 'data-block' ],
 			enableAnimation: true,
 			triggerAnimationOnChange: path,
 		} );
diff --git a/packages/block-editor/src/components/list-view/style.scss b/packages/block-editor/src/components/list-view/style.scss
index 42423328d19e4..11cf1fafa0e14 100644
--- a/packages/block-editor/src/components/list-view/style.scss
+++ b/packages/block-editor/src/components/list-view/style.scss
@@ -9,11 +9,22 @@
 		margin: (-$grid-unit-15) (-$grid-unit-15 * 0.5) 0;
 		width: calc(100% + #{ $grid-unit-15 });
 	}
+
+	// Without setting `pointer-events: none`, when dragging over list view items,
+	// Safari calls onDropZoneLeave causing flickering in the position of the drop indicator.
+	// https://bugs.webkit.org/show_bug.cgi?id=66547
+	// See: https://github.com/WordPress/gutenberg/pull/56625
+	&.is-dragging tbody {
+		pointer-events: none;
+	}
 }
 
 .block-editor-list-view-leaf {
 	// Use position relative for row animation.
 	position: relative;
+	// Set the initial translate position to ensure the UI in Safari doesn't jump
+	// when rows later receive the is-displacement-up or is-displacement-down class.
+	transform: translateY(0);
 
 	&.is-draggable,
 	&.is-draggable .block-editor-list-view-block-contents {
@@ -128,6 +139,66 @@
 		border-radius: 0;
 	}
 
+	// List view items will be displaced up or down relative to their original position
+	// when a user is dragging a block within the list view. This creates a space for a
+	// visual indicator of where the block will be placed when dropped. The `normal` state
+	// is used to allow rows to smoothly transition back into their original position,
+	// without attaching the transition to the list view leaf itself. This prevents rows
+	// from animating too much once the user has dropped the block.
+	&.is-displacement-normal {
+		transition: transform 0.2s;
+		transform: translateY(0);
+		@include reduce-motion("transition");
+	}
+
+	&.is-displacement-up {
+		transition: transform 0.2s;
+		transform: translateY(-36px);
+		@include reduce-motion("transition");
+	}
+
+	&.is-displacement-down {
+		transition: transform 0.2s;
+		transform: translateY(36px);
+		@include reduce-motion("transition");
+	}
+
+	// Collapse multi-selections down into a single row space while dragging. The following
+	// rules ensure that during a multi-selection, the space for additional blocks is factored in
+	// when displacing up and down. The result is that there should only ever be a single row's
+	// worth of space for the visual indicator of where a block will be placed when dropped.
+	&.is-after-dragged-blocks {
+		transition: transform 0.2s;
+		transform: translateY(calc(var(--wp-admin--list-view-dragged-items-height, 36px) * -1));
+		@include reduce-motion("transition");
+	}
+
+	&.is-after-dragged-blocks.is-displacement-up {
+		transition: transform 0.2s;
+		transform: translateY(calc(-36px + var(--wp-admin--list-view-dragged-items-height, 36px) * -1));
+		@include reduce-motion("transition");
+	}
+
+	&.is-after-dragged-blocks.is-displacement-down {
+		transition: transform 0.2s;
+		transform: translateY(calc(36px + var(--wp-admin--list-view-dragged-items-height, 36px) * -1));
+		@include reduce-motion("transition");
+	}
+
+	// To ensure displaced rows behave correctly, ensure that blocks that are currently being dragged
+	// are visually hidden. The below rules are used in favor of `display: none` to ensure that
+	// there is no flicker when a user begins to drag a block.
+	&.is-dragging {
+		opacity: 0;
+		// The row's left position is set to 0 to ensure that the animation
+		// when dropping a block animates from the correct position.
+		left: 0;
+		// Ensure the dragged element does not otherwise affect dropping to
+		// other positions.
+		pointer-events: none;
+		z-index: -9999;
+	}
+
 	// List View renders a fixed number of items and relies on each item having a fixed height of 36px.
 	// If this value changes, we should also change the itemHeight value set in useFixedWindowList.
 	// See: https://github.com/WordPress/gutenberg/pull/35230 for additional context.
@@ -159,6 +230,7 @@
 		}
 	}
 
+	&.is-nesting .block-editor-list-view-block-contents,
 	.block-editor-list-view-block-contents:focus {
 		box-shadow: none;
 
@@ -173,11 +245,6 @@
 			box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 			z-index: 2;
 			pointer-events: none;
-
-			// Hide focus styles while a user is dragging blocks/files etc.
-			.is-dragging-components-draggable & {
-				box-shadow: none;
-			}
 		}
 	}
 
@@ -186,14 +253,10 @@
 		right: 0;
 	}
 
+	&.is-nesting .block-editor-list-view__menu,
 	.block-editor-list-view-block__menu:focus {
 		box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
 		z-index: 1;
-
-		// Hide focus styles while a user is dragging blocks/files etc.
-		.is-dragging-components-draggable & {
-			box-shadow: none;
-		}
 	}
 
 	&.is-visible .block-editor-list-view-block-contents {
@@ -370,6 +433,14 @@
 	}
 }
 
+// First level of indentation is aria-level 2, max indent is 8.
+// Indent is a full icon size, plus 4px which optically aligns child icons to the text label above.
+$block-navigation-max-indent: 8;
+
+.block-editor-list-view-draggable-chip {
+	opacity: 0.8;
+}
+
 .block-editor-list-view-block__contents-cell,
 .block-editor-list-view-appender__cell {
 	.block-editor-list-view-block__contents-container,
@@ -386,9 +457,6 @@
 	cursor: pointer;
 }
 
-// First level of indentation is aria-level 2, max indent is 8.
-// Indent is a full icon size, plus 4px which optically aligns child icons to the text label above.
-$block-navigation-max-indent: 8;
 .block-editor-list-view-leaf[aria-level] .block-editor-list-view__expander {
 	margin-left: ( $icon-size ) * $block-navigation-max-indent + 4 * ( $block-navigation-max-indent - 1 );
 }
@@ -443,6 +511,27 @@ $block-navigation-max-indent: 8;
 	}
 }
 
+.block-editor-list-view-drop-indicator--preview {
+	pointer-events: none;
+
+	// If the drop indicator's popover ever extends to the edge of the screen,
+	// avoid any scrollbars by hiding the overflow.
+	.components-popover__content {
+		overflow: hidden !important;
+	}
+
+	.block-editor-list-view-drop-indicator__line {
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.04);
+		height: 36px;
+		border-radius: 4px;
+		overflow: hidden;
+	}
+
+	.block-editor-list-view-drop-indicator__line--darker {
+		background: rgba(var(--wp-admin-theme-color--rgb), 0.09);
+	}
+}
+
 .block-editor-list-view-placeholder {
 	padding: 0;
 	margin: 0;
diff --git a/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js b/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
index 98c2b31132c60..f1180a9fa27ca 100644
--- a/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
+++ b/packages/block-editor/src/components/list-view/test/use-list-view-drop-zone.js
@@ -127,6 +127,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
@@ -142,6 +143,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-3',
 				dropPosition: 'inside',
 				rootClientId: 'block-3',
 			} );
@@ -244,6 +246,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 1,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
@@ -277,6 +280,7 @@ describe( 'getListViewDropTarget', () => {
 
 			expect( target ).toEqual( {
 				blockIndex: 0,
+				clientId: 'block-1',
 				dropPosition: 'inside',
 				rootClientId: 'block-1',
 			} );
diff --git a/packages/block-editor/src/components/list-view/test/utils.js b/packages/block-editor/src/components/list-view/test/utils.js
index 78d78a9d90069..d603d9ef1bb8b 100644
--- a/packages/block-editor/src/components/list-view/test/utils.js
+++ b/packages/block-editor/src/components/list-view/test/utils.js
@@ -1,7 +1,7 @@
 /**
  * Internal dependencies
  */
-import { getCommonDepthClientIds } from '../utils';
+import { getCommonDepthClientIds, getDragDisplacementValues } from '../utils';
 
 describe( 'getCommonDepthClientIds', () => {
 	it( 'should return start and end when no depth is provided', () => {
@@ -48,3 +48,220 @@ describe( 'getCommonDepthClientIds', () => {
 		expect( result ).toEqual( { start: 'start-3', end: 'clicked-id' } );
 	} );
 } );
+
+describe( 'getDragDisplacementValues', () => {
+	const blockIndexes = {
+		'block-a': 0,
+		'block-b': 1,
+		'block-c': 2,
+		'block-d': 3,
+		'block-e': 4,
+		'block-f': 5,
+		'block-g': 6,
+		'block-h': 7,
+	};
+
+	it( 'should return displacement of normal when block is after dragged block and drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of up when block is after dragged block and before the drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 7,
+			blockDropPosition: 'bottom',
+			clientId: 'block-d',
+			firstDraggedBlockIndex: 2,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'up',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of down when block is before dragged block and after the drop target', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'bottom',
+			clientId: 'block-d',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return isNesting of true when block is just before the drop target and drop position is inside', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'inside',
+			clientId: 'block-a',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: true,
+		} );
+	} );
+
+	it( 'should return isNesting of false when block is not just before the drop target and drop position is inside', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 1,
+			blockDropPosition: 'inside',
+			clientId: 'block-b',
+			firstDraggedBlockIndex: 6,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of up when drop target index is null and block is after dragged block', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'up',
+			isAfterDraggedBlocks: true,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when drop target index is null and block is before dragged block', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-c',
+			firstDraggedBlockIndex: 5,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when dragging a file (no dragged block) and the block is before the target index', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-b',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of down when dragging a file (no dragged block) and the block is after the target index', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'down',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return displacement of normal when dragging a file (no dragged block) and dragging outside the list view (drop target of null)', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: null,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: 'normal',
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return undefined displacement if the target index is undefined', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: undefined,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: undefined,
+			isDragged: false,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: undefined,
+			isAfterDraggedBlocks: false,
+			isNesting: false,
+		} );
+	} );
+
+	it( 'should return all undefined values if the block is dragged', () => {
+		const result = getDragDisplacementValues( {
+			blockIndexes,
+			blockDropTargetIndex: 3,
+			blockDropPosition: 'bottom',
+			clientId: 'block-h',
+			firstDraggedBlockIndex: 7,
+			isDragged: true,
+		} );
+
+		expect( result ).toEqual( {
+			displacement: undefined,
+			isAfterDraggedBlocks: undefined,
+			isNesting: undefined,
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js b/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js
new file mode 100644
index 0000000000000..5890e366d7ce9
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-list-view-block-indexes.js
@@ -0,0 +1,29 @@
+/**
+ * WordPress dependencies
+ */
+import { useMemo } from '@wordpress/element';
+
+export default function useListViewBlockIndexes( blocks ) {
+	const blockIndexes = useMemo( () => {
+		const indexes = {};
+
+		let currentGlobalIndex = 0;
+
+		const traverseBlocks = ( blockList ) => {
+			blockList.forEach( ( block ) => {
+				indexes[ block.clientId ] = currentGlobalIndex;
+				currentGlobalIndex++;
+
+				if ( block.innerBlocks.length > 0 ) {
+					traverseBlocks( block.innerBlocks );
+				}
+			} );
+		};
+
+		traverseBlocks( blocks );
+
+		return indexes;
+	}, [ blocks ] );
+
+	return blockIndexes;
+}
diff --git a/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js b/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
index a1a369d3f9408..3354b3f41d391 100644
--- a/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
+++ b/packages/block-editor/src/components/list-view/use-list-view-drop-zone.js
@@ -2,10 +2,11 @@
  * WordPress dependencies
  */
 import { useSelect } from '@wordpress/data';
-import { useState, useCallback } from '@wordpress/element';
+import { useState, useCallback, useEffect } from '@wordpress/element';
 import {
 	useThrottle,
 	__experimentalUseDropZone as useDropZone,
+	usePrevious,
 } from '@wordpress/compose';
 import { isRTL } from '@wordpress/i18n';
 
@@ -304,6 +305,7 @@ export function getListViewDropTarget( blocksData, position, rtl = false ) {
 
 		return {
 			rootClientId: candidateBlockData.clientId,
+			clientId: candidateBlockData.clientId,
 			blockIndex: newBlockIndex,
 			dropPosition: 'inside',
 		};
@@ -396,15 +398,30 @@ export function getListViewDropTarget( blocksData, position, rtl = false ) {
 	};
 }
 
+// Throttle options need to be defined outside of the hook to avoid
+// re-creating the object on every render. This is due to a limitation
+// of the `useThrottle` hook, where the options object is included
+// in the dependency array for memoization.
+const EXPAND_THROTTLE_OPTIONS = {
+	leading: false, // Don't call the function immediately on the first call.
+	trailing: true, // Do call the function on the last call.
+};
+
 /**
  * A react hook for implementing a drop zone in list view.
  *
- * @param {Object}       props                   Named parameters.
- * @param {?HTMLElement} [props.dropZoneElement] Optional element to be used as the drop zone.
+ * @param {Object}       props                    Named parameters.
+ * @param {?HTMLElement} [props.dropZoneElement]  Optional element to be used as the drop zone.
+ * @param {Object}       [props.expandedState]    The expanded state of the blocks in the list view.
+ * @param {Function}     [props.setExpandedState] Function to set the expanded state of a list of block clientIds.
  *
  * @return {WPListViewDropZoneTarget} The drop target.
  */
-export default function useListViewDropZone( { dropZoneElement } ) {
+export default function useListViewDropZone( {
+	dropZoneElement,
+	expandedState,
+	setExpandedState,
+} ) {
 	const {
 		getBlockRootClientId,
 		getBlockIndex,
@@ -420,6 +437,55 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 
 	const rtl = isRTL();
 
+	const previousRootClientId = usePrevious( targetRootClientId );
+
+	const maybeExpandBlock = useCallback(
+		( _expandedState, _target ) => {
+			// If the user is attempting to drop a block inside a collapsed block,
+			// that is, using a nesting gesture flagged by 'inside' dropPosition,
+			// expand the block within the list view, if it isn't already.
+			const { rootClientId } = _target || {};
+			if ( ! rootClientId ) {
+				return;
+			}
+			if (
+				_target?.dropPosition === 'inside' &&
+				! _expandedState[ rootClientId ]
+			) {
+				setExpandedState( {
+					type: 'expand',
+					clientIds: [ rootClientId ],
+				} );
+			}
+		},
+		[ setExpandedState ]
+	);
+
+	// Throttle the maybeExpandBlock function to avoid expanding the block
+	// too quickly when the user is dragging over the block. This is to
+	// avoid expanding the block when the user is just passing over it.
+	const throttledMaybeExpandBlock = useThrottle(
+		maybeExpandBlock,
+		500,
+		EXPAND_THROTTLE_OPTIONS
+	);
+
+	useEffect( () => {
+		if (
+			target?.dropPosition !== 'inside' ||
+			previousRootClientId !== target?.rootClientId
+		) {
+			throttledMaybeExpandBlock.cancel();
+			return;
+		}
+		throttledMaybeExpandBlock( expandedState, target );
+	}, [
+		expandedState,
+		previousRootClientId,
+		target,
+		throttledMaybeExpandBlock,
+	] );
+
 	const draggedBlockClientIds = getDraggedBlockClientIds();
 	const throttled = useThrottle(
 		useCallback(
@@ -484,7 +550,7 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 				rtl,
 			]
 		),
-		200
+		50
 	);
 
 	const ref = useDropZone( {
@@ -496,6 +562,9 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 		},
 		onDragLeave() {
 			throttled.cancel();
+			// Use `null` value to indicate that the drop target is not valid,
+			// but that the drag is still active. This allows for styling rules
+			// that are active only when a user drags outside of the list view.
 			setTarget( null );
 		},
 		onDragOver( event ) {
@@ -506,7 +575,10 @@ export default function useListViewDropZone( { dropZoneElement } ) {
 		},
 		onDragEnd() {
 			throttled.cancel();
-			setTarget( null );
+			// Use `undefined` value to indicate that the drag has concluded.
+			// This allows styling rules that are active only when a user is
+			// dragging to be removed.
+			setTarget( undefined );
 		},
 	} );
 
diff --git a/packages/block-editor/src/components/list-view/utils.js b/packages/block-editor/src/components/list-view/utils.js
index 632173e120691..ed7a321dea0c8 100644
--- a/packages/block-editor/src/components/list-view/utils.js
+++ b/packages/block-editor/src/components/list-view/utils.js
@@ -93,3 +93,119 @@ export function focusListItem( focusClientId, treeGridElementRef ) {
 		} );
 	}
 }
+
+/**
+ * Get values for the block that flag whether the block should be displaced up or down,
+ * whether the block is being nested, and whether the block appears after the dragged
+ * blocks. These values are used to determine the class names to apply to the block.
+ * The list view rows are displaced visually via CSS rules. Displacement rules:
+ * - `normal`: no displacement — used to apply a translateY of `0` so that the block
+ *  appears in its original position, and moves to that position smoothly when dragging
+ *  outside of the list view area.
+ * - `up`: the block should be displaced up, creating room beneath the block for the drop indicator.
+ * - `down`: the block should be displaced down, creating room above the block for the drop indicator.
+ *
+ * @param {Object}                props
+ * @param {Object}                props.blockIndexes           The indexes of all the blocks in the list view, keyed by clientId.
+ * @param {number|null|undefined} props.blockDropTargetIndex   The index of the block that the user is dropping to.
+ * @param {?string}               props.blockDropPosition      The position relative to the block that the user is dropping to.
+ * @param {string}                props.clientId               The client id for the current block.
+ * @param {?number}               props.firstDraggedBlockIndex The index of the first dragged block.
+ * @param {?boolean}              props.isDragged              Whether the current block is being dragged. Dragged blocks skip displacement.
+ * @return {Object} An object containing the `displacement`, `isAfterDraggedBlocks` and `isNesting` values.
+ */
+export function getDragDisplacementValues( {
+	blockIndexes,
+	blockDropTargetIndex,
+	blockDropPosition,
+	clientId,
+	firstDraggedBlockIndex,
+	isDragged,
+} ) {
+	let displacement;
+	let isNesting;
+	let isAfterDraggedBlocks;
+
+	if ( ! isDragged ) {
+		isNesting = false;
+		const thisBlockIndex = blockIndexes[ clientId ];
+		isAfterDraggedBlocks = thisBlockIndex > firstDraggedBlockIndex;
+
+		// Determine where to displace the position of the current block, relative
+		// to the blocks being dragged (in their original position) and the drop target
+		// (the position where a user is currently dragging the blocks to).
+		if (
+			blockDropTargetIndex !== undefined &&
+			blockDropTargetIndex !== null &&
+			firstDraggedBlockIndex !== undefined
+		) {
+			// If the block is being dragged and there is a valid drop target,
+			// determine if the block being rendered should be displaced up or down.
+
+			if ( thisBlockIndex !== undefined ) {
+				if (
+					thisBlockIndex >= firstDraggedBlockIndex &&
+					thisBlockIndex < blockDropTargetIndex
+				) {
+					// If the current block appears after the set of dragged blocks
+					// (in their original position), but is before the drop target,
+					// then the current block should be displaced up.
+					displacement = 'up';
+				} else if (
+					thisBlockIndex < firstDraggedBlockIndex &&
+					thisBlockIndex >= blockDropTargetIndex
+				) {
+					// If the current block appears before the set of dragged blocks
+					// (in their original position), but is after the drop target,
+					// then the current block should be displaced down.
+					displacement = 'down';
+				} else {
+					displacement = 'normal';
+				}
+				isNesting =
+					typeof blockDropTargetIndex === 'number' &&
+					blockDropTargetIndex - 1 === thisBlockIndex &&
+					blockDropPosition === 'inside';
+			}
+		} else if (
+			blockDropTargetIndex === null &&
+			firstDraggedBlockIndex !== undefined
+		) {
+			// A `null` value for `blockDropTargetIndex` indicates that the
+			// drop target is outside of the valid areas within the list view.
+			// In this case, the drag is still active, but as there is no
+			// valid drop target, we should remove the gap indicating where
+			// the block would be inserted.
+			if (
+				thisBlockIndex !== undefined &&
+				thisBlockIndex >= firstDraggedBlockIndex
+			) {
+				displacement = 'up';
+			} else {
+				displacement = 'normal';
+			}
+		} else if (
+			blockDropTargetIndex !== undefined &&
+			blockDropTargetIndex !== null &&
+			firstDraggedBlockIndex === undefined
+		) {
+			// If the blockdrop target is defined, but there are no dragged blocks,
+			// then the block should be displaced relative to the drop target.
+			if ( thisBlockIndex !== undefined ) {
+				if ( thisBlockIndex < blockDropTargetIndex ) {
+					displacement = 'normal';
+				} else {
+					displacement = 'down';
+				}
+			}
+		} else if ( blockDropTargetIndex === null ) {
+			displacement = 'normal';
+		}
+	}
+
+	return {
+		displacement,
+		isNesting,
+		isAfterDraggedBlocks,
+	};
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-item/style.scss b/packages/edit-site/src/components/sidebar-navigation-item/style.scss
index 88ff27a9c1d2f..908056d52af48 100644
--- a/packages/edit-site/src/components/sidebar-navigation-item/style.scss
+++ b/packages/edit-site/src/components/sidebar-navigation-item/style.scss
@@ -33,5 +33,5 @@
 
 .edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button {
 	cursor: grab;
-	padding: $grid-unit-10;
+	padding: $grid-unit-10 $grid-unit-10 $grid-unit-10 0;
 }
diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index 674801cf94aba..00f21b4e51c5e 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -53,11 +53,40 @@ test.describe( 'List View', () => {
 			name: 'Paragraph',
 			exact: true,
 		} );
+		const imageBlockItem = listView.getByRole( 'gridcell', {
+			name: 'Image',
+			exact: true,
+		} );
 		const headingBlockItem = listView.getByRole( 'gridcell', {
 			name: 'Heading',
 			exact: true,
 		} );
-		await paragraphBlockItem.dragTo( headingBlockItem, { x: 0, y: 0 } );
+
+		await paragraphBlockItem.hover();
+		await page.mouse.down();
+
+		// To work around a drag and drop bug in Safari, the list view applies
+		// `pointer-events: none` to the list view while dragging, so that
+		// `onDragLeave` is not fired when dragging within the list view.
+		// Without the `force: true` option, the `hover` action will fail
+		// as playwright will complain that pointer-events are intercepted.
+		// https://bugs.webkit.org/show_bug.cgi?id=66547
+		// See: https://github.com/WordPress/gutenberg/pull/56625
+
+		// Hover over each block to mimic moving up the list view.
+		// Also, hover twice to ensure a dragover event is dispatched.
+		// See: https://playwright.dev/docs/input#dragging-manually
+		await imageBlockItem.hover( { force: true } );
+		await imageBlockItem.hover( { force: true } );
+		await headingBlockItem.hover( { force: true } );
+		await headingBlockItem.hover( { force: true } );
+
+		// Disable reason: Need to wait until the throttle timeout of 250ms has passed.
+		/* eslint-disable playwright/no-wait-for-timeout */
+		await editor.page.waitForTimeout( 300 );
+		/* eslint-enable playwright/no-wait-for-timeout */
+
+		await page.mouse.up();
 
 		// Ensure the block was dropped correctly.
 		await expect

From 31d0943cbc244479b04362592d9b9e9f9bd35a35 Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Tue, 23 Jan 2024 12:51:22 +1000
Subject: [PATCH 202/296] Fix: Theme.json application of custom root selector
 for styles (#58050)

---
 lib/class-wp-theme-json-gutenberg.php |  4 ++--
 phpunit/class-wp-theme-json-test.php  | 24 ++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index a063ab34d9069..f4266a7ef66dd 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -1010,7 +1010,7 @@ protected static function get_blocks_metadata() {
 
 				if ( $duotone_support ) {
 					$root_selector    = wp_get_block_css_selector( $block_type );
-					$duotone_selector = WP_Theme_JSON_Gutenberg::scope_selector( $root_selector, $duotone_support );
+					$duotone_selector = static::scope_selector( $root_selector, $duotone_support );
 				}
 			}
 
@@ -1185,7 +1185,7 @@ public function get_stylesheet( $types = array( 'variables', 'styles', 'presets'
 				$setting_nodes[ $root_settings_key ]['selector'] = $options['root_selector'];
 			}
 			if ( false !== $root_style_key ) {
-				$setting_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
+				$style_nodes[ $root_style_key ]['selector'] = $options['root_selector'];
 			}
 		}
 
diff --git a/phpunit/class-wp-theme-json-test.php b/phpunit/class-wp-theme-json-test.php
index 89900d45893d9..95d7c92507a62 100644
--- a/phpunit/class-wp-theme-json-test.php
+++ b/phpunit/class-wp-theme-json-test.php
@@ -2451,4 +2451,28 @@ public function test_resolve_variables() {
 		$this->assertEquals( $small_font, $styles['blocks']['core/quote']['variations']['plain']['typography']['fontSize'], 'Block variations: font-size' );
 		$this->assertEquals( $secondary_color, $styles['blocks']['core/quote']['variations']['plain']['color']['background'], 'Block variations: color' );
 	}
+
+	public function test_get_stylesheet_custom_root_selector() {
+		$theme_json = new WP_Theme_JSON_Gutenberg(
+			array(
+				'version' => WP_Theme_JSON_Gutenberg::LATEST_SCHEMA,
+				'styles'  => array(
+					'color' => array(
+						'text' => 'teal',
+					),
+				),
+			),
+			'default'
+		);
+
+		$options = array( 'root_selector' => '.custom' );
+		$actual  = $theme_json->get_stylesheet( array( 'styles' ), null, $options );
+
+		// Results also include root site blocks styles which hard code
+		// `body { margin: 0;}`.
+		$this->assertEquals(
+			'body { margin: 0;}.wp-site-blocks > .alignleft { float: left; margin-right: 2em; }.wp-site-blocks > .alignright { float: right; margin-left: 2em; }.wp-site-blocks > .aligncenter { justify-content: center; margin-left: auto; margin-right: auto; }.custom{color: teal;}',
+			$actual
+		);
+	}
 }

From d1d1921b43f5819ae0936e29af57bce54aa56a77 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Tue, 23 Jan 2024 01:50:28 -0300
Subject: [PATCH 203/296] [Fonts API] removing files and files loading no
 longer needed (#57972)

* removing files and files loading no longer needed

* redeclaration guard in load.php

* format php

* Removes all tests

* Comment adjustments to load.php

---------

Co-authored-by: hellofromtonya <tonya.mork@automattic.com>
---
 .../class-gutenberg-fonts-api-bc-layer.php    |   96 --
 .../fonts-api/bc-layer/class-wp-web-fonts.php |  703 ---------
 .../class-wp-webfonts-provider-local.php      |  284 ----
 .../bc-layer/class-wp-webfonts-provider.php   |   66 -
 .../bc-layer/class-wp-webfonts-utils.php      |   85 -
 .../fonts-api/bc-layer/class-wp-webfonts.php  |  238 ---
 .../bc-layer/webfonts-deprecations.php        |  260 ---
 .../class-wp-fonts-provider-local.php         |  236 ---
 .../fonts-api/class-wp-fonts-provider.php     |  129 --
 .../fonts-api/class-wp-fonts-resolver.php     |  408 -----
 .../fonts-api/class-wp-fonts-utils.php        |  122 --
 lib/experimental/fonts-api/class-wp-fonts.php |  753 ---------
 lib/experimental/fonts-api/fonts-api.php      |  259 ---
 lib/load.php                                  |  105 +-
 phpunit/tests/fonts-api/base.php              |  391 -----
 phpunit/tests/fonts-api/bc-layer/base.php     |   46 -
 .../bc-layer/bc-layer-tests-dataset.php       |  483 ------
 .../isDeprecatedStructure.php                 |   35 -
 .../migrateDeprecatedStructure.php            |   38 -
 .../fonts-api/bc-layer/wpRegisterWebfonts.php |   62 -
 .../bc-layer/wpWebfonts/getAllWebfonts.php    |   33 -
 .../bc-layer/wpWebfonts/getFontSlug.php       |  134 --
 .../wpWebfonts/getRegisteredWebfonts.php      |   32 -
 .../bc-layer/wpWebfonts/registerWebfont.php   |  113 --
 .../fonts-api/wp-fonts-tests-dataset.php      | 1396 -----------------
 .../fonts-api/wpDeregisterFontFamily.php      |   74 -
 .../fonts-api/wpDeregisterFontVariation.php   |  298 ----
 .../fonts-api/wpEnqueueFontVariations.php     |   82 -
 phpunit/tests/fonts-api/wpEnqueueFonts.php    |  122 --
 phpunit/tests/fonts-api/wpFonts.php           |   38 -
 phpunit/tests/fonts-api/wpFonts/add.php       |   44 -
 .../tests/fonts-api/wpFonts/addFontFamily.php |   65 -
 .../tests/fonts-api/wpFonts/addVariation.php  |  149 --
 phpunit/tests/fonts-api/wpFonts/dequeue.php   |   72 -
 phpunit/tests/fonts-api/wpFonts/doItem.php    |  336 ----
 phpunit/tests/fonts-api/wpFonts/doItems.php   |  196 ---
 phpunit/tests/fonts-api/wpFonts/enqueue.php   |   53 -
 .../tests/fonts-api/wpFonts/getEnqueued.php   |   57 -
 .../tests/fonts-api/wpFonts/getProviders.php  |   62 -
 .../tests/fonts-api/wpFonts/getRegistered.php |   90 --
 phpunit/tests/fonts-api/wpFonts/query.php     |  151 --
 .../fonts-api/wpFonts/registerProvider.php    |  116 --
 phpunit/tests/fonts-api/wpFonts/remove.php    |  118 --
 .../fonts-api/wpFonts/removeFontFamily.php    |   89 --
 .../fonts-api/wpFonts/removeVariation.php     |  278 ----
 .../tests/fonts-api/wpFontsProviderLocal.php  |  180 ---
 .../addMissingFontsToThemeJson.php            |  252 ---
 .../enqueueUserSelectedFonts.php              |  131 --
 .../registerFontsFromThemeJson.php            |  297 ----
 .../convertFontFamilyIntoHandle.php           |   84 -
 .../convertVariationIntoHandle.php            |  122 --
 .../getFontFamilyFromVariation.php            |  134 --
 .../fonts-api/wpFontsUtils/isDefined.php      |   61 -
 phpunit/tests/fonts-api/wpPrintFonts.php      |  230 ---
 .../fonts-api/wpRegisterFontProvider.php      |   95 --
 phpunit/tests/fonts-api/wpRegisterFonts.php   |  104 --
 56 files changed, 35 insertions(+), 10652 deletions(-)
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php
 delete mode 100644 lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php
 delete mode 100644 lib/experimental/fonts-api/class-wp-fonts-provider-local.php
 delete mode 100644 lib/experimental/fonts-api/class-wp-fonts-provider.php
 delete mode 100644 lib/experimental/fonts-api/class-wp-fonts-resolver.php
 delete mode 100644 lib/experimental/fonts-api/class-wp-fonts-utils.php
 delete mode 100644 lib/experimental/fonts-api/class-wp-fonts.php
 delete mode 100644 lib/experimental/fonts-api/fonts-api.php
 delete mode 100644 phpunit/tests/fonts-api/base.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/base.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php
 delete mode 100644 phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php
 delete mode 100644 phpunit/tests/fonts-api/wp-fonts-tests-dataset.php
 delete mode 100644 phpunit/tests/fonts-api/wpDeregisterFontFamily.php
 delete mode 100644 phpunit/tests/fonts-api/wpDeregisterFontVariation.php
 delete mode 100644 phpunit/tests/fonts-api/wpEnqueueFontVariations.php
 delete mode 100644 phpunit/tests/fonts-api/wpEnqueueFonts.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/add.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/addFontFamily.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/addVariation.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/dequeue.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/doItem.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/doItems.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/enqueue.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/getEnqueued.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/getProviders.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/getRegistered.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/query.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/registerProvider.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/remove.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/removeFontFamily.php
 delete mode 100644 phpunit/tests/fonts-api/wpFonts/removeVariation.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsProviderLocal.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php
 delete mode 100644 phpunit/tests/fonts-api/wpFontsUtils/isDefined.php
 delete mode 100644 phpunit/tests/fonts-api/wpPrintFonts.php
 delete mode 100644 phpunit/tests/fonts-api/wpRegisterFontProvider.php
 delete mode 100644 phpunit/tests/fonts-api/wpRegisterFonts.php

diff --git a/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php b/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php
deleted file mode 100644
index 8c85976987523..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Fonts API BC Layer helpers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- * This file is now part of the API's Backwards-Compatibility (BC) layer.
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- * @since      15.7.0
- */
-
-/**
- * Class Gutenberg_Fonts_API_BC_Layer
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- */
-class Gutenberg_Fonts_API_BC_Layer {
-
-	/**
-	 * Determines if the given fonts array is the deprecated array structure.
-	 *
-	 * @param array $fonts Array of fonts to check.
-	 * @return bool True when deprecated structure, else false.
-	 */
-	public static function is_deprecated_structure( array $fonts ) {
-		/*
-		 * Iterates over the array's first dimension keys, which should
-		 * be the variation's font-family. If a key is empty or a non-string,
-		 * then the fonts are using a deprecated structure.
-		 */
-		foreach ( array_keys( $fonts ) as $font_family ) {
-			if ( ! WP_Fonts_Utils::is_defined( $font_family ) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Migrates deprecated fonts structure into new API data structure,
-	 * i.e. variations grouped by their font-family.
-	 *
-	 * @param array $fonts               Array of fonts to migrate.
-	 * @param bool  $silence_deprecation Optional. Silences the deprecation notice. For internal use.
-	 *                                   Default false.
-	 * @return array
-	 */
-	public static function migrate_deprecated_structure( array $fonts, $silence_deprecation = false ) {
-		if ( ! self::is_deprecated_structure( $fonts ) ) {
-			return $fonts;
-		}
-
-		if ( ! $silence_deprecation ) {
-			_deprecated_argument(
-				__METHOD__,
-				'14.9.1',
-				'A deprecated fonts array structure passed to wp_register_fonts(). Variations must be grouped and keyed by their font family.'
-			);
-		}
-
-		$new_fonts = array();
-		foreach ( $fonts as $font ) {
-			$font_family = WP_Fonts_Utils::get_font_family_from_variation( $font );
-			if ( ! $font_family ) {
-				continue;
-			}
-
-			if ( ! isset( $new_fonts[ $font_family ] ) ) {
-				$new_fonts[ $font_family ] = array();
-			}
-
-			$new_fonts[ $font_family ][] = $font;
-		}
-
-		return $new_fonts;
-	}
-
-	/**
-	 * Handle the deprecated fonts structure.
-	 *
-	 * @param array  $font    Font for extracting font family.
-	 * @param string $message Deprecation message to throw.
-	 * @return string|null The font family slug if successfully registered. Else null.
-	 */
-	protected static function extract_font_family_from_deprecated_fonts_structure( array $font, $message ) {
-		_deprecated_argument( __METHOD__, '14.9.1', $message );
-
-		$font_family = WP_Fonts_Utils::get_font_family_from_variation( $font );
-		if ( ! $font_family ) {
-			return null;
-		}
-
-		return WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php b/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php
deleted file mode 100644
index 550940935b7db..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-web-fonts.php
+++ /dev/null
@@ -1,703 +0,0 @@
-<?php
-/**
- * Web Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Web_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Web_Fonts
- *
- * @since GB 14.9.1
- * @deprecated GB 15.1 Use WP_Fonts instead.
- */
-class WP_Web_Fonts extends WP_Webfonts {
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts' );
-
-		/**
-		 * Filters the web font variation's property defaults.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param array $defaults {
-		 *     An array of required web font properties and defaults.
-		 *
-		 *     @type string $provider     The provider ID. Default 'local'.
-		 *     @type string $font-family  The font-family property. Default empty string.
-		 *     @type string $font-style   The font-style property. Default 'normal'.
-		 *     @type string $font-weight  The font-weight property. Default '400'.
-		 *     @type string $font-display The font-display property. Default 'fallback'.
-		 * }
-		 */
-		$this->variation_property_defaults = apply_filters( 'wp_webfont_variation_defaults', $this->variation_property_defaults );
-
-		/**
-		 * Fires when the WP_Webfonts instance is initialized.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param WP_Web_Fonts $wp_webfonts WP_Web_Fonts instance (passed by reference).
-		 */
-		do_action_ref_array( 'wp_default_webfonts', array( &$this ) );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array $providers {
-	 *     An associative array of registered providers, keyed by their unique ID.
-	 *
-	 *     @type string $provider_id => array {
-	 *         An associate array of provider's class name and fonts.
-	 *
-	 *         @type string $class_name Fully qualified name of the provider's class.
-	 *         @type string[] $fonts    An array of enqueued font handles for this provider.
-	 *     }
-	 * }
-	 */
-	public function get_providers() {
-		return $this->providers;
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider's unique ID.
-	 * @param string $class_name  The provider class name.
-	 * @return bool True if successfully registered, else false.
-	 */
-	public function register_provider( $provider_id, $class_name ) {
-		if ( empty( $provider_id ) || empty( $class_name ) || ! class_exists( $class_name ) ) {
-			return false;
-		}
-
-		$this->providers[ $provider_id ] = array(
-			'class' => $class_name,
-			'fonts' => array(),
-		);
-		return true;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		$font_families = array();
-		foreach ( $this->registered as $handle => $obj ) {
-			if ( $obj->extra['is_font_family'] ) {
-				$font_families[] = $handle;
-			}
-		}
-		return $font_families;
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered() {
-		return array_keys( $this->registered );
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued() {
-		return $this->queue;
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family name to register.
-	 * @return string|null Font family handle when registration successes. Null on failure.
-	 */
-	public function add_font_family( $font_family ) {
-		$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-		if ( ! $font_family_handle ) {
-			return null;
-		}
-
-		if ( isset( $this->registered[ $font_family_handle ] ) ) {
-			return $font_family_handle;
-		}
-
-		$registered = $this->add( $font_family_handle, false );
-		if ( ! $registered ) {
-			return null;
-		}
-
-		$this->add_data( $font_family_handle, 'font-properties', array( 'font-family' => $font_family ) );
-		$this->add_data( $font_family_handle, 'is_font_family', true );
-
-		return $font_family_handle;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	public function remove_font_family( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return;
-		}
-
-		$variations = $this->registered[ $font_family_handle ]->deps;
-
-		foreach ( $variations as $variation ) {
-			$this->remove( $variation );
-		}
-
-		$this->remove( $font_family_handle );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $variation_handle   Optional. The variation's handle. When none is provided, the
-	 *                                   handle will be dynamically generated.
-	 *                                   Default empty string.
-	 * @return string|null Variation handle on success. Else null.
-	 */
-	public function add_variation( $font_family_handle, array $variation, $variation_handle = '' ) {
-		if ( ! WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			trigger_error( 'Font family handle must be a non-empty string.' );
-			return null;
-		}
-
-		// When there is a variation handle, check it.
-		if ( '' !== $variation_handle && ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			trigger_error( 'Variant handle must be a non-empty string.' );
-			return null;
-		}
-
-		// Register the font family when it does not yet exist.
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			if ( ! $this->add_font_family( $font_family_handle ) ) {
-				return null;
-			}
-		}
-
-		$variation = $this->validate_variation( $variation );
-
-		// Variation validation failed.
-		if ( ! $variation ) {
-			return null;
-		}
-
-		// When there's no variation handle, attempt to create one.
-		if ( '' === $variation_handle ) {
-			$variation_handle = WP_Fonts_Utils::convert_variation_into_handle( $font_family_handle, $variation );
-			if ( is_null( $variation_handle ) ) {
-				return null;
-			}
-		}
-
-		// Bail out if the variant is already registered.
-		if ( $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return $variation_handle;
-		}
-
-		$variation_src = array_key_exists( 'src', $variation ) ? $variation['src'] : false;
-		$result        = $this->add( $variation_handle, $variation_src );
-
-		// Bail out if the registration failed.
-		if ( ! $result ) {
-			return null;
-		}
-
-		$this->add_data( $variation_handle, 'font-properties', $variation );
-		$this->add_data( $variation_handle, 'is_font_family', false );
-
-		// Add the font variation as a dependency to the registered font family.
-		$this->add_dependency( $font_family_handle, $variation_handle );
-
-		$this->providers[ $variation['provider'] ]['fonts'][] = $variation_handle;
-
-		return $variation_handle;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	public function remove_variation( $font_family_handle, $variation_handle ) {
-		if ( isset( $this->registered[ $variation_handle ] ) ) {
-			$this->remove( $variation_handle );
-		}
-
-		if ( ! $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return;
-		}
-
-		// Remove the variation as a dependency from its font family.
-		$this->registered[ $font_family_handle ]->deps = array_values(
-			array_diff(
-				$this->registered[ $font_family_handle ]->deps,
-				array( $variation_handle )
-			)
-		);
-	}
-
-	/**
-	 * Checks if the variation is registered.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   Variation's handle.
-	 * @return bool True when registered to the given font family. Else false.
-	 */
-	private function is_variation_registered( $font_family_handle, $variation_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return false;
-		}
-
-		return in_array( $variation_handle, $this->registered[ $font_family_handle ]->deps, true );
-	}
-
-	/**
-	 * Adds a variation as a dependency to the given font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   The variation's handle.
-	 */
-	private function add_dependency( $font_family_handle, $variation_handle ) {
-		$this->registered[ $font_family_handle ]->deps[] = $variation_handle;
-	}
-
-	/**
-	 * Validates and sanitizes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation  Variation properties to add.
-	 * @return false|array Validated variation on success. Else, false.
-	 */
-	private function validate_variation( $variation ) {
-		$variation = wp_parse_args( $variation, $this->variation_property_defaults );
-
-		// Check the font-family.
-		if ( empty( $variation['font-family'] ) || ! is_string( $variation['font-family'] ) ) {
-			trigger_error( 'Webfont font-family must be a non-empty string.' );
-			return false;
-		}
-
-		// Local fonts need a "src".
-		if ( 'local' === $variation['provider'] ) {
-			// Make sure that local fonts have 'src' defined.
-			if ( empty( $variation['src'] ) || ( ! is_string( $variation['src'] ) && ! is_array( $variation['src'] ) ) ) {
-				trigger_error( 'Webfont src must be a non-empty string or an array of strings.' );
-				return false;
-			}
-		} elseif ( ! isset( $this->providers[ $variation['provider'] ] ) ) {
-			trigger_error( sprintf( 'The provider "%s" is not registered', $variation['provider'] ) );
-			return false;
-		} elseif ( ! class_exists( $this->providers[ $variation['provider'] ]['class'] ) ) {
-			trigger_error( sprintf( 'The provider class "%s" does not exist', $variation['provider'] ) );
-			return false;
-		}
-
-		// Validate the 'src' property.
-		if ( ! empty( $variation['src'] ) ) {
-			foreach ( (array) $variation['src'] as $src ) {
-				if ( empty( $src ) || ! is_string( $src ) ) {
-					trigger_error( 'Each webfont src must be a non-empty string.' );
-					return false;
-				}
-			}
-		}
-
-		// Check the font-weight.
-		if ( ! is_string( $variation['font-weight'] ) && ! is_int( $variation['font-weight'] ) ) {
-			trigger_error( 'Webfont font-weight must be a properly formatted string or integer.' );
-			return false;
-		}
-
-		// Check the font-display.
-		if ( ! in_array( $variation['font-display'], array( 'auto', 'block', 'fallback', 'swap', 'optional' ), true ) ) {
-			$variation['font-display'] = 'fallback';
-		}
-
-		$valid_props = array(
-			'ascent-override',
-			'descent-override',
-			'font-display',
-			'font-family',
-			'font-stretch',
-			'font-style',
-			'font-weight',
-			'font-variant',
-			'font-feature-settings',
-			'font-variation-settings',
-			'line-gap-override',
-			'size-adjust',
-			'src',
-			'unicode-range',
-
-			// Exceptions.
-			'provider',
-		);
-
-		foreach ( $variation as $prop => $value ) {
-			if ( ! in_array( $prop, $valid_props, true ) ) {
-				unset( $variation[ $prop ] );
-			}
-		}
-
-		return $variation;
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array|string[] Array of web font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	public function do_items( $handles = false, $group = false ) {
-		$handles = $this->prepare_handles_for_printing( $handles );
-
-		if ( empty( $handles ) ) {
-			return $this->done;
-		}
-
-		$this->all_deps( $handles );
-		if ( empty( $this->to_do ) ) {
-			return $this->done;
-		}
-
-		$this->to_do_keyed_handles = array_flip( $this->to_do );
-
-		foreach ( $this->get_providers() as $provider_id => $provider ) {
-			// Alert and skip if the provider class does not exist.
-			if ( ! class_exists( $provider['class'] ) ) {
-				/* translators: %s is the provider name. */
-				trigger_error(
-					sprintf(
-						'Class "%s" not found for "%s" web font provider',
-						$provider['class'],
-						$provider_id
-					)
-				);
-				continue;
-			}
-
-			$this->do_item( $provider_id, $group );
-		}
-
-		$this->process_font_families_after_printing( $handles );
-
-		return $this->done;
-	}
-
-	/**
-	 * Prepares the given handles for printing.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Handles to prepare.
-	 *                                      Default false.
-	 * @return array Array of handles.
-	 */
-	private function prepare_handles_for_printing( $handles = false ) {
-		if ( false !== $handles ) {
-			$handles = $this->validate_handles( $handles );
-			// Bail out when invalid.
-			if ( empty( $handles ) ) {
-				return array();
-			}
-		}
-
-		// Use the enqueued queue.
-		if ( empty( $handles ) ) {
-			if ( empty( $this->queue ) ) {
-				return array();
-			}
-			$handles = $this->queue;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Validates handle(s) to ensure each is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $handles Handles to prepare.
-	 * @return string[]|null Array of handles on success. Else null.
-	 */
-	private function validate_handles( $handles ) {
-		// Validate each element is a non-empty string handle.
-		$handles = array_filter( (array) $handles, array( WP_Fonts_Utils::class, 'is_defined' ) );
-
-		if ( empty( $handles ) ) {
-			trigger_error( 'Handles must be a non-empty string or array of non-empty strings' );
-			return null;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Bail out if the provider is not registered.
-		if ( ! isset( $this->providers[ $provider_id ] ) ) {
-			return false;
-		}
-
-		$font_handles = $this->get_enqueued_fonts_for_provider( $provider_id );
-		if ( empty( $font_handles ) ) {
-			return false;
-		}
-
-		$properties_by_font = $this->get_font_properties_for_provider( $font_handles );
-		if ( empty( $properties_by_font ) ) {
-			return false;
-		}
-
-		// Invoke provider to print its styles.
-		$provider = $this->get_provider_instance( $provider_id );
-		$provider->set_fonts( $properties_by_font );
-		$provider->print_styles();
-
-		// Clean up.
-		$this->update_queues_for_printed_fonts( $font_handles );
-
-		return true;
-	}
-
-	/**
-	 * Retrieves a list of enqueued web font variations for a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to process.
-	 * @return array[] Webfonts organized by providers.
-	 */
-	private function get_enqueued_fonts_for_provider( $provider_id ) {
-		$providers = $this->get_providers();
-
-		if ( empty( $providers[ $provider_id ] ) ) {
-			return array();
-		}
-
-		return array_intersect(
-			$providers[ $provider_id ]['fonts'],
-			$this->to_do
-		);
-	}
-
-	/**
-	 * Gets a list of font properties for each of the given font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 * @return array A list of fonts with each font's properties.
-	 */
-	private function get_font_properties_for_provider( array $font_handles ) {
-		$font_properties = array();
-
-		foreach ( $font_handles as $font_handle ) {
-			$properties = $this->get_data( $font_handle, 'font-properties' );
-			if ( ! $properties ) {
-				continue;
-			}
-			$font_properties[ $font_handle ] = $properties;
-		}
-
-		return $font_properties;
-	}
-
-	/**
-	 * Gets the instance of the provider from the WP_Webfonts::$provider_instance store.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to get.
-	 * @return object Instance of the provider.
-	 */
-	private function get_provider_instance( $provider_id ) {
-		if ( ! isset( $this->provider_instances[ $provider_id ] ) ) {
-			$this->provider_instances[ $provider_id ] = new $this->providers[ $provider_id ]['class']();
-		}
-		return $this->provider_instances[ $provider_id ];
-	}
-
-	/**
-	 * Update queues for the given printed fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 */
-	private function update_queues_for_printed_fonts( array $font_handles ) {
-		foreach ( $font_handles as $font_handle ) {
-			$this->set_as_done( $font_handle );
-			$this->remove_from_to_do_queues( $font_handle );
-		}
-	}
-
-	/**
-	 * Processes the font families after printing the variations.
-	 *
-	 * For each queued font family:
-	 *
-	 * a. if any of their variations were printed, the font family is added to the `done` list.
-	 * b. removes each from the to_do queues.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $handles Handles to process.
-	 */
-	private function process_font_families_after_printing( array $handles ) {
-		foreach ( $handles as $handle ) {
-			if (
-				! $this->get_data( $handle, 'is_font_family' ) ||
-				! isset( $this->to_do_keyed_handles[ $handle ] )
-			) {
-				continue;
-			}
-			$font_family = $this->registered[ $handle ];
-
-			// Add the font family to `done` list if any of its variations were printed.
-			if ( ! empty( $font_family->deps ) ) {
-				$processed = array_intersect( $font_family->deps, $this->done );
-				if ( ! empty( $processed ) ) {
-					$this->set_as_done( $handle );
-				}
-			}
-
-			$this->remove_from_to_do_queues( $handle );
-		}
-	}
-
-	/**
-	 * Removes the handle from the `to_do` and `to_do_keyed_handles` lists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to remove.
-	 */
-	private function remove_from_to_do_queues( $handle ) {
-		unset(
-			$this->to_do[ $this->to_do_keyed_handles[ $handle ] ],
-			$this->to_do_keyed_handles[ $handle ]
-		);
-	}
-
-	/**
-	 * Sets the given handle to done by adding it to the `done` list.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to set as done.
-	 */
-	private function set_as_done( $handle ) {
-		if ( ! is_array( $this->done ) ) {
-			$this->done = array();
-		}
-		$this->done[] = $handle;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle Font family to convert.
-	 * @return array Webfonts in theme.json structural format.
-	 */
-	public function to_theme_json( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return array();
-		}
-
-		$font_family_name  = $this->registered[ $font_family_handle ]->extra['font-properties']['font-family'];
-		$theme_json_format = array(
-			'fontFamily' => str_contains( $font_family_name, ' ' ) ? "'{$font_family_name}'" : $font_family_name,
-			'name'       => $font_family_name,
-			'slug'       => $font_family_handle,
-			'fontFace'   => array(),
-		);
-
-		foreach ( $this->registered[ $font_family_handle ]->deps as $variation_handle ) {
-			if ( ! isset( $this->registered[ $variation_handle ] ) ) {
-				continue;
-			}
-
-			$variation_obj        = $this->registered[ $variation_handle ];
-			$variation_properties = array( 'origin' => 'gutenberg_wp_fonts_api' );
-			foreach ( $variation_obj->extra['font-properties'] as $property_name => $property_value ) {
-				$property_in_camelcase                          = lcfirst( str_replace( '-', '', ucwords( $property_name, '-' ) ) );
-				$variation_properties[ $property_in_camelcase ] = $property_value;
-			}
-			$theme_json_format['fontFace'][ $variation_obj->handle ] = $variation_properties;
-		}
-
-		return $theme_json_format;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php
deleted file mode 100644
index b6fd5d78a1435..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php
+++ /dev/null
@@ -1,284 +0,0 @@
-<?php
-/**
- * Fonts API: Provider for locally-hosted fonts.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A deprecated core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use `WP_Fonts_Provider_Local` instead.
- */
-class WP_Webfonts_Provider_Local extends WP_Webfonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.1.0
-	 */
-	public function __construct() {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Provider_Local' );
-
-		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-			&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
-		) {
-			$this->style_tag_atts = array( 'type' => 'text/css' );
-		}
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * This method does the following processing tasks:
-	 *    1. Orchestrates an optimized `src` (with format) for browser support.
-	 *    2. Generates the `@font-face` for all its webfonts.
-	 *
-	 * For example, when given these webfonts:
-	 * <code>
-	 * array(
-	 *      'source-serif-pro.normal.200 900' => array(
-	 *          'provider'    => 'local',
-	 *          'font_family' => 'Source Serif Pro',
-	 *          'font_weight' => '200 900',
-	 *          'font_style'  => 'normal',
-	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-	 *      ),
-	 *      'source-serif-pro.italic.400 900' => array(
-	 *          'provider'    => 'local',
-	 *          'font_family' => 'Source Serif Pro',
-	 *          'font_weight' => '200 900',
-	 *          'font_style'  => 'italic',
-	 *          'src'         => 'https://example.com/wp-content/themes/twentytwentytwo/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2' ),
-	 *      ),
-	 * )
-	 * </code>
-	 *
-	 * the following `@font-face` styles are generated and returned:
-	 * <code>
-	 *
-	 * @font-face{
-	 *      font-family:"Source Serif Pro";
-	 *      font-style:normal;
-	 *      font-weight:200 900;
-	 *      font-stretch:normal;
-	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');
-	 * }
-	 * @font-face{
-	 *      font-family:"Source Serif Pro";
-	 *      font-style:italic;
-	 *      font-weight:200 900;
-	 *      font-stretch:normal;
-	 *      src:local("Source Serif Pro"), url('/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');
-	 * }
-	 * </code>
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	public function get_css() {
-		$css = '';
-
-		foreach ( $this->webfonts as $webfont ) {
-			// Order the webfont's `src` items to optimize for browser support.
-			$webfont = $this->order_src( $webfont );
-
-			// Build the @font-face CSS for this webfont.
-			$css .= '@font-face{' . $this->build_font_face_css( $webfont ) . '}';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Order `src` items to optimize for browser support.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $webfont Webfont to process.
-	 * @return array
-	 */
-	private function order_src( array $webfont ) {
-		if ( ! is_array( $webfont['src'] ) ) {
-			$webfont['src'] = (array) $webfont['src'];
-		}
-
-		$src         = array();
-		$src_ordered = array();
-
-		foreach ( $webfont['src'] as $url ) {
-			// Add data URIs first.
-			if ( str_starts_with( trim( $url ), 'data:' ) ) {
-				$src_ordered[] = array(
-					'url'    => $url,
-					'format' => 'data',
-				);
-				continue;
-			}
-			$format         = pathinfo( $url, PATHINFO_EXTENSION );
-			$src[ $format ] = $url;
-		}
-
-		// Add woff2.
-		if ( ! empty( $src['woff2'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff2'],
-				'format' => 'woff2',
-			);
-		}
-
-		// Add woff.
-		if ( ! empty( $src['woff'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff'],
-				'format' => 'woff',
-			);
-		}
-
-		// Add ttf.
-		if ( ! empty( $src['ttf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['ttf'],
-				'format' => 'truetype',
-			);
-		}
-
-		// Add eot.
-		if ( ! empty( $src['eot'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['eot'],
-				'format' => 'embedded-opentype',
-			);
-		}
-
-		// Add otf.
-		if ( ! empty( $src['otf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['otf'],
-				'format' => 'opentype',
-			);
-		}
-		$webfont['src'] = $src_ordered;
-
-		return $webfont;
-	}
-
-	/**
-	 * Builds the font-family's CSS.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $webfont Webfont to process.
-	 * @return string This font-family's CSS.
-	 */
-	private function build_font_face_css( array $webfont ) {
-		$css = '';
-
-		// Wrap font-family in quotes if it contains spaces
-		// and is not already wrapped in quotes.
-		if (
-			str_contains( $webfont['font-family'], ' ' ) &&
-			! str_contains( $webfont['font-family'], '"' ) &&
-			! str_contains( $webfont['font-family'], "'" )
-		) {
-			$webfont['font-family'] = '"' . $webfont['font-family'] . '"';
-		}
-
-		foreach ( $webfont as $key => $value ) {
-
-			// Skip "provider", since it's for internal API use,
-			// and not a valid CSS property.
-			if ( 'provider' === $key ) {
-				continue;
-			}
-
-			// Compile the "src" parameter.
-			if ( 'src' === $key ) {
-				$value = $this->compile_src( $webfont['font-family'], $value );
-			}
-
-			// If font-variation-settings is an array, convert it to a string.
-			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-				$value = $this->compile_variations( $value );
-			}
-
-			if ( ! empty( $value ) ) {
-				$css .= "$key:$value;";
-			}
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Compiles the `src` into valid CSS.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param string $font_family Font family.
-	 * @param array  $value       Value to process.
-	 * @return string The CSS.
-	 */
-	private function compile_src( $font_family, array $value ) {
-		$src = "local($font_family)";
-
-		foreach ( $value as $item ) {
-
-			if ( str_starts_with( $item['url'], get_site_url() ) ) {
-				$item['url'] = wp_make_link_relative( $item['url'] );
-			}
-
-			$src .= ( 'data' === $item['format'] )
-				? ", url({$item['url']})"
-				: ", url('{$item['url']}') format('{$item['format']}')";
-		}
-		return $src;
-	}
-
-	/**
-	 * Compiles the font variation settings.
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param array $font_variation_settings Array of font variation settings.
-	 * @return string The CSS.
-	 */
-	private function compile_variations( array $font_variation_settings ) {
-		$variations = '';
-
-		foreach ( $font_variation_settings as $key => $value ) {
-			$variations .= "$key $value";
-		}
-
-		return $variations;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php
deleted file mode 100644
index 5b7f5ece335b1..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Part of the backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Deprecated abstract class for Fonts API providers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use `WP_Fonts_Provider` instead.
- */
-abstract class WP_Webfonts_Provider extends WP_Fonts_Provider {
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use WP_Fonts_Provider::$fonts property instead.
-	 *
-	 * @var array[]
-	 */
-	protected $webfonts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use WP_Fonts_Provider::set_fonts() instead.
-	 *
-	 * @param array[] $fonts Fonts to be processed.
-	 */
-	public function set_webfonts( array $fonts ) {
-		_deprecated_function( __METHOD__, 'X.X.X', 'WP_Fonts_Provider::set_fonts()' );
-
-		parent::set_fonts( $fonts );
-		$this->webfonts = $this->fonts;
-	}
-
-	/**
-	 * This method is here to wire WP_Fonts_Provider::do_item() to this
-	 * deprecated class to ensure the fonts get set.
-	 *
-	 * @param array[] $fonts Fonts to be processed.
-	 */
-	public function set_fonts( array $fonts ) {
-		parent::set_fonts( $fonts );
-		$this->webfonts = $this->fonts;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php
deleted file mode 100644
index d0242acf9a2b6..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?php
-/**
- * Webfont API's utility helpers.
- *
- * BACKPORT NOTE: Do not backport this file to Core.
- * This file is now part of the API's Backwards-Compatibility (BC) layer.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Webfonts API.
- *
- * @since X.X.X
- * @deprecated GB 15.1 Use WP_Fonts_Utils instead.
- */
-class WP_Webfonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_font_family_into_handle() instead.
-	 *
-	 * @param string $font_family Font family to convert into a handle.
-	 * @return string|null The font family handle on success. Else, null.
-	 */
-	public static function convert_font_family_into_handle( $font_family ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::convert_font_family_into_handle()' );
-
-		return WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::convert_variation_into_handle() instead.
-	 *
-	 * @param string $font_family The font family's handle for this variation.
-	 * @param array  $variation   An array of variation properties.
-	 * @return string|null The variation handle.
-	 */
-	public static function convert_variation_into_handle( $font_family, array $variation ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::convert_variation_into_handle()' );
-
-		return WP_Fonts_Utils::convert_variation_into_handle( $variation );
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::get_font_family_from_variation() instead.
-	 *
-	 * @param array $variation An array of variation properties to search.
-	 * @return string|null The font family if defined. Else, null.
-	 */
-	public static function get_font_family_from_variation( array $variation ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::get_font_family_from_variation()' );
-
-		return WP_Fonts_Utils::get_font_family_from_variation( $variation );
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 * @deprecated 15.1 Use WP_Fonts_Utils::is_defined() instead.
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		_deprecated_function( __METHOD__, 'GB 15.1', 'WP_Fonts_Utils::is_defined()' );
-
-		return WP_Fonts_Utils::is_defined( $input );
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php b/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php
deleted file mode 100644
index 58633b9f8082b..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/class-wp-webfonts.php
+++ /dev/null
@@ -1,238 +0,0 @@
-<?php
-/**
- * Webfonts API class: backwards-compatibility (BC) layer for all
- * deprecated publicly exposed methods and functionality.
- *
- * This class/file will NOT be backported to Core. Rather for sites
- * using the previous API, it exists to prevent breakages, giving
- * developers time to upgrade their code.
- *
- * @package    Gutenberg
- * @subpackage Fonts API's BC Layer
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Webfonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Webfonts
- *
- * @deprecated GB 15.1 Use WP_Fonts instead.
- */
-class WP_Webfonts {
-	/**
-	 * Instance of WP_Fonts.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $wp_fonts;
-
-	/**
-	 * Instantiate an instance of WP_Webfonts.
-	 *
-	 * @param null|WP_Fonts $wp_fonts Optional. Instance of WP_Fonts.
-	 *                                Default uses wp_fonts().
-	 */
-	public function __construct( $wp_fonts = null ) {
-		$this->wp_fonts = ! empty( $wp_fonts ) ? $wp_fonts : wp_fonts();
-	}
-
-	/**
-	 * Gets the font slug.
-	 *
-	 * @since X.X.X
-	 * @deprecated Use WP_Fonts_Utils::convert_font_family_into_handle() or WP_Fonts_Utils::get_font_family_from_variation().
-	 *
-	 * @param array|string $to_convert The value to convert into a slug. Expected as the web font's array
-	 *                                 or a font-family as a string.
-	 * @return string|false The font slug on success, or false if the font-family cannot be determined.
-	 */
-	public static function get_font_slug( $to_convert ) {
-		$message = is_array( $to_convert )
-			? 'Use WP_Fonts_Utils::get_font_family_from_variation() to get the font family from an array and then WP_Fonts_Utils::convert_font_family_into_handle() to convert the font-family name into a handle'
-			: 'Use WP_Fonts_Utils::convert_font_family_into_handle() to convert the font-family name into a handle';
-		_deprecated_function( __METHOD__, 'GB 14.9.1', $message );
-
-		if ( empty( $to_convert ) ) {
-			return false;
-		}
-
-		$font_family_name = is_array( $to_convert )
-			? WP_Fonts_Utils::get_font_family_from_variation( $to_convert )
-			: $to_convert;
-
-		$slug = false;
-		if ( ! empty( $font_family_name ) ) {
-			$slug = WP_Fonts_Utils::convert_font_family_into_handle( $font_family_name );
-		}
-
-		return $slug;
-	}
-
-	/**
-	 * Initializes the API.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts().
-	 */
-	public static function init() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()' );
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.8.0 Use wp_fonts()->get_registered_font_families().
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		_deprecated_function( __METHOD__, 'GB 15.8.0', 'wp_fonts()->get_registered_font_families()' );
-
-		return $this->wp_fonts->get_registered_font_families();
-	}
-
-	/**
-	 * Gets the list of registered fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_fonts()->get_registered().
-	 *
-	 * @return array[]
-	 */
-	public function get_registered_webfonts() {
-		_deprecated_function( __METHOD__, '14.9.1', 'wp_fonts()->get_registered()' );
-
-		return $this->_get_registered_webfonts();
-	}
-
-	/**
-	 * Gets the list of enqueued fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_enqueued().
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued_webfonts() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()->get_enqueued()' );
-
-		return $this->wp_fonts->queue;
-	}
-
-	/**
-	 * Gets the list of all fonts.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_registered().
-	 *
-	 * @return array[]
-	 */
-	public function get_all_webfonts() {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_fonts()->get_registered()' );
-
-		return $this->_get_registered_webfonts();
-	}
-
-	/**
-	 * Registers a webfont.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_register_fonts().
-	 *
-	 * @param array  $webfont             Web font to register.
-	 * @param string $font_family_handle  Optional. Font family handle for the given variation.
-	 *                                    Default empty string.
-	 * @param string $variation_handle    Optional. Handle for the variation to register.
-	 * @param bool   $silence_deprecation Optional. Silences the deprecation notice. For internal use.
-	 * @return string|false The font family slug if successfully registered, else false.
-	 */
-	public function register_webfont( array $webfont, $font_family_handle = '', $variation_handle = '', $silence_deprecation = false ) {
-		if ( ! $silence_deprecation ) {
-			_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_register_fonts()' );
-		}
-
-		// Bail out if no variation passed as there's not to register.
-		if ( empty( $webfont ) ) {
-			return false;
-		}
-
-		// Restructure definition: keyed by font-family and array of variations.
-		$font = array( $webfont );
-		if ( WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			$font = array( $font_family_handle => $font );
-		} else {
-			$font               = Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $font, true );
-			$font_family_handle = array_key_first( $font );
-		}
-
-		if ( empty( $font ) || empty( $font_family_handle ) ) {
-			return false;
-		}
-
-		// If the variation handle was passed, add it as variation key.
-		if ( WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			$font[ $font_family_handle ] = array( $variation_handle => $font[ $font_family_handle ][0] );
-		}
-
-		// Register with the Fonts API.
-		$handle = wp_register_fonts( $font );
-		if ( empty( $handle ) ) {
-			return false;
-		}
-		return array_pop( $handle );
-	}
-
-	/**
-	 * Enqueue a font-family that has been already registered.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_enqueue_fonts().
-	 *
-	 * @param string $font_family_name The font family name to be enqueued.
-	 * @return bool True if successfully enqueued, else false.
-	 */
-	public function enqueue_webfont( $font_family_name ) {
-		_deprecated_function( __METHOD__, 'GB 14.9.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( array( $font_family_name ) );
-		return true;
-	}
-
-	/**
-	 * Gets the registered webfonts in the original web font property structure keyed by each handle.
-	 *
-	 * @return array[]
-	 */
-	private function _get_registered_webfonts() {
-		$font_families = array();
-		$registered    = array();
-
-		// Find the registered font families.
-		foreach ( $this->wp_fonts->registered as $handle => $obj ) {
-			if ( ! $obj->extra['is_font_family'] ) {
-				continue;
-			}
-
-			if ( ! isset( $registered[ $handle ] ) ) {
-				$registered[ $handle ] = array();
-			}
-
-			$font_families[ $handle ] = $obj->deps;
-		}
-
-		// Build the return array structure.
-		foreach ( $font_families as $font_family_handle => $variations ) {
-			foreach ( $variations as $variation_handle ) {
-				$variation_obj = $this->wp_fonts->registered[ $variation_handle ];
-
-				$registered[ $font_family_handle ][ $variation_handle ] = $variation_obj->extra['font-properties'];
-			}
-		}
-
-		return $registered;
-	}
-}
diff --git a/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php b/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php
deleted file mode 100644
index 7a3a7bd013eea..0000000000000
--- a/lib/experimental/fonts-api/bc-layer/webfonts-deprecations.php
+++ /dev/null
@@ -1,260 +0,0 @@
-<?php
-/**
- * Deprecated functions provided here to give extenders time to change
- * their plugins/themes before this API is introduced into Core.
- *
- * BACKPORT NOTE: Do not backport these deprecated functions to Core.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( ! function_exists( 'wp_webfonts' ) ) {
-	/**
-	 * Initialize $wp_webfonts if it has not been set.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_fonts() instead.
-	 *
-	 * @global WP_Webfonts $wp_webfonts
-	 *
-	 * @return WP_Webfonts WP_Webfonts instance.
-	 */
-	function wp_webfonts() {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_fonts()' );
-
-		global $wp_webfonts;
-
-		if ( ! ( $wp_webfonts instanceof WP_Webfonts ) ) {
-			$wp_webfonts = new WP_Webfonts( wp_fonts() );
-		}
-
-		return $wp_webfonts;
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfonts' ) ) {
-	/**
-	 * Registers one or more font-families and each of their variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_register_fonts() instead.
-	 *
-	 * @param array[] $webfonts {
-	 *     Web fonts to be registered, grouped by each font-family.
-	 *
-	 *     @type string $font-family => array[] $variations {
-	 *          An array of web font variations for this font-family.
-	 *          Each variation has the following structure.
-	 *
-	 *          @type array $variation {
-	 *              @type string $provider     The provider ID. Default 'local'.
-	 *              @type string $font-style   The font-style property. Default 'normal'.
-	 *              @type string $font-weight  The font-weight property. Default '400'.
-	 *              @type string $font-display The font-display property. Default 'fallback'.
-	 *         }
-	 *     }
-	 * }
-	 * @return string[] Array of registered font family handles.
-	 */
-	function wp_register_webfonts( array $webfonts ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_register_fonts()' );
-
-		$webfonts = Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $webfonts );
-
-		return wp_register_fonts( $webfonts );
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfont' ) ) {
-	/**
-	 * Registers a single webfont.
-	 *
-	 * Example of how to register Source Serif Pro font with font-weight range of 200-900:
-	 *
-	 * If the font file is contained within the theme:
-	 *
-	 * <code>
-	 * wp_register_webfont(
-	 *      array(
-	 *          'provider'    => 'local',
-	 *          'font-family' => 'Source Serif Pro',
-	 *          'font-weight' => '200 900',
-	 *          'font-style'  => 'normal',
-	 *          'src'         => get_theme_file_uri( 'assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2' ),
-	 *      )
-	 * );
-	 * </code>
-	 *
-	 * @since 6.0.0
-	 * @deprecated 14.9.1 Use wp_register_fonts().
-	 *
-	 * @param array $webfont Webfont to be registered.
-	 * @return string|false The font family slug if successfully registered, else false.
-	 */
-	function wp_register_webfont( array $webfont ) {
-		_deprecated_function( __FUNCTION__, '14.9.1', 'wp_register_fonts()' );
-
-		return wp_fonts()->register_webfont( $webfont, '', '', false );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfonts' ) ) {
-	/**
-	 * Enqueues one or more font family and all of its variations.
-	 *
-	 * @since X.X.X
-	 * @since GB 15.1 Use wp_enqueue_fonts() ihstead.
-	 *
-	 * @param string[] $font_families Font family(ies) to enqueue.
-	 */
-	function wp_enqueue_webfonts( array $font_families ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( $font_families );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfont' ) ) {
-	/**
-	 * Enqueue a single font family that has been registered beforehand.
-	 *
-	 * Example of how to enqueue Source Serif Pro font:
-	 *
-	 * <code>
-	 * wp_enqueue_webfont( 'Source Serif Pro' );
-	 * </code>
-	 *
-	 * Font families should be enqueued from the `init` hook or later.
-	 *
-	 * @since 6.0.0
-	 * @deprecated GB 14.9.1 Use wp_enqueue_fonts() instead.
-	 *
-	 * @param string $font_family_name The font family name to be enqueued.
-	 * @return bool True if successfully enqueued, else false.
-	 */
-	function wp_enqueue_webfont( $font_family_name ) {
-		_deprecated_function( __FUNCTION__, 'GB 14.9.1', 'wp_enqueue_fonts()' );
-
-		wp_enqueue_fonts( array( $font_family_name ) );
-		return true;
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_webfont_variations' ) ) {
-	/**
-	 * Enqueues a specific set of web font variations.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_enqueue_font_variations() instead.
-	 *
-	 * @param string|string[] $variation_handles Variation handle (string) or handles (array of strings).
-	 */
-	function wp_enqueue_webfont_variations( $variation_handles ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_enqueue_font_variations()' );
-
-		wp_enqueue_font_variations( $variation_handles );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_webfont_variation' ) ) {
-	/**
-	 * Deregisters a font variation.
-	 *
-	 * @since GB 14.9.1
-	 * @deprecated GB 15.1 Use wp_deregister_font_variation() instead.
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	function wp_deregister_webfont_variation( $font_family_handle, $variation_handle ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_deregister_font_variation()' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_get_webfont_providers' ) ) {
-	/**
-	 * Gets all registered providers.
-	 *
-	 * Return an array of providers, each keyed by their unique
-	 * ID (i.e. the `$id` property in the provider's object) with
-	 * an instance of the provider (object):
-	 *     ID => provider instance
-	 *
-	 * Each provider contains the business logic for how to
-	 * process its specific font service (i.e. local or remote)
-	 * and how to generate the `@font-face` styles for its service.
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 14.9.1 Use wp_fonts()->get_providers().
-	 *
-	 * @return string[] All registered providers, each keyed by their unique ID.
-	 */
-	function wp_get_webfont_providers() {
-		_deprecated_function( __FUNCTION__, '14.9.1', 'wp_fonts()->get_providers()' );
-
-		$providers = array();
-		foreach ( wp_fonts()->get_providers() as $id => $config ) {
-			$providers[ $id ] = $config['class'];
-		}
-
-		return $providers;
-	}
-}
-
-if ( ! function_exists( 'wp_register_webfont_provider' ) ) {
-	/**
-	 * Registers a custom font service provider.
-	 *
-	 * A webfont provider contains the business logic for how to
-	 * interact with a remote font service and how to generate
-	 * the `@font-face` styles for that remote service.
-	 *
-	 * How to register a custom font service provider:
-	 *    1. Load its class file into memory before registration.
-	 *    2. Pass the class' name to this function.
-	 *
-	 * For example, for a class named `My_Custom_Font_Service_Provider`:
-	 * ```
-	 *    wp_register_webfont_provider( My_Custom_Font_Service_Provider::class );
-	 * ```
-	 *
-	 * @since X.X.X
-	 * @deprecated GB 15.1 Use wp_register_font_provider() instead.
-	 *
-	 * @param string $name      The provider's name.
-	 * @param string $classname The provider's class name.
-	 *                          The class should be a child of `WP_Webfonts_Provider`.
-	 *                          See {@see WP_Webfonts_Provider}.
-	 *
-	 * @return bool True if successfully registered, else false.
-	 */
-	function wp_register_webfont_provider( $name, $classname ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_register_font_provider' );
-
-		return wp_register_font_provider( $name, $classname );
-	}
-}
-
-if ( ! function_exists( 'wp_print_webfonts' ) ) {
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since GB 14.9.1
-	 * @deprecated GB 15.1 Use wp_print_fonts() instead.
-	 *
-	 * @param string|string[]|false $handles Optional. Items to be processed: queue (false),
-	 *                                       single item (string), or multiple items (array of strings).
-	 *                                       Default false.
-	 * @return array|string[] Array of web font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	function wp_print_webfonts( $handles = false ) {
-		_deprecated_function( __FUNCTION__, 'GB 15.1', 'wp_print_fonts' );
-
-		return wp_print_fonts( $handles );
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-provider-local.php b/lib/experimental/fonts-api/class-wp-fonts-provider-local.php
deleted file mode 100644
index 019861a9ae191..0000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-provider-local.php
+++ /dev/null
@@ -1,236 +0,0 @@
-<?php
-/**
- * Webfonts API: Provider for locally-hosted fonts.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider_Local' ) ) {
-	return;
-}
-
-/**
- * A core bundled provider for generating `@font-face` styles
- * from locally-hosted font files.
- *
- * This provider builds an optimized `src` (for browser support)
- * and then generates the `@font-face` styles.
- *
- * All know-how (business logic) for how to interact with and
- * generate styles from locally-hosted font files is contained
- * in this provider.
- *
- * @since X.X.X
- */
-class WP_Fonts_Provider_Local extends WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	protected $id = 'local';
-
-	/**
-	 * Constructor.
-	 *
-	 * @since 6.1.0
-	 */
-	public function __construct() {
-		if (
-			function_exists( 'is_admin' ) && ! is_admin()
-			&&
-			function_exists( 'current_theme_supports' ) && ! current_theme_supports( 'html5', 'style' )
-		) {
-			$this->style_tag_atts = array( 'type' => 'text/css' );
-		}
-	}
-
-	/**
-	 * Gets the `@font-face` CSS styles for locally-hosted font files.
-	 *
-	 * This method does the following processing tasks:
-	 *    1. Orchestrates an optimized `src` (with format) for browser support.
-	 *    2. Generates the `@font-face` for all its fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	public function get_css() {
-		$css = '';
-
-		foreach ( $this->fonts as $font ) {
-			// Order the font's `src` items to optimize for browser support.
-			$font = $this->order_src( $font );
-
-			// Build the @font-face CSS for this font.
-			$css .= '@font-face{' . $this->build_font_face_css( $font ) . '}';
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Order `src` items to optimize for browser support.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font Font to process.
-	 * @return array
-	 */
-	private function order_src( array $font ) {
-		if ( ! is_array( $font['src'] ) ) {
-			$font['src'] = (array) $font['src'];
-		}
-
-		$src         = array();
-		$src_ordered = array();
-
-		foreach ( $font['src'] as $url ) {
-			// Add data URIs first.
-			if ( str_starts_with( trim( $url ), 'data:' ) ) {
-				$src_ordered[] = array(
-					'url'    => $url,
-					'format' => 'data',
-				);
-				continue;
-			}
-			$format         = pathinfo( $url, PATHINFO_EXTENSION );
-			$src[ $format ] = $url;
-		}
-
-		// Add woff2.
-		if ( ! empty( $src['woff2'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff2'],
-				'format' => 'woff2',
-			);
-		}
-
-		// Add woff.
-		if ( ! empty( $src['woff'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['woff'],
-				'format' => 'woff',
-			);
-		}
-
-		// Add ttf.
-		if ( ! empty( $src['ttf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['ttf'],
-				'format' => 'truetype',
-			);
-		}
-
-		// Add eot.
-		if ( ! empty( $src['eot'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['eot'],
-				'format' => 'embedded-opentype',
-			);
-		}
-
-		// Add otf.
-		if ( ! empty( $src['otf'] ) ) {
-			$src_ordered[] = array(
-				'url'    => $src['otf'],
-				'format' => 'opentype',
-			);
-		}
-		$font['src'] = $src_ordered;
-
-		return $font;
-	}
-
-	/**
-	 * Builds the font-family's CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font Font to process.
-	 * @return string This font-family's CSS.
-	 */
-	private function build_font_face_css( array $font ) {
-		$css = '';
-
-		// Wrap font-family in quotes if it contains spaces
-		// and is not already wrapped in quotes.
-		if (
-			str_contains( $font['font-family'], ' ' ) &&
-			! str_contains( $font['font-family'], '"' ) &&
-			! str_contains( $font['font-family'], "'" )
-		) {
-			$font['font-family'] = '"' . $font['font-family'] . '"';
-		}
-
-		foreach ( $font as $key => $value ) {
-
-			// Skip "provider", since it's for internal API use,
-			// and not a valid CSS property.
-			if ( 'provider' === $key ) {
-				continue;
-			}
-
-			// Compile the "src" parameter.
-			if ( 'src' === $key ) {
-				$value = $this->compile_src( $value );
-			}
-
-			// If font-variation-settings is an array, convert it to a string.
-			if ( 'font-variation-settings' === $key && is_array( $value ) ) {
-				$value = $this->compile_variations( $value );
-			}
-
-			if ( ! empty( $value ) ) {
-				$css .= "$key:$value;";
-			}
-		}
-
-		return $css;
-	}
-
-	/**
-	 * Compiles the `src` into valid CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $value Value to process.
-	 * @return string The CSS.
-	 */
-	private function compile_src( array $value ) {
-		$src = '';
-
-		foreach ( $value as $item ) {
-			$src .= ( 'data' === $item['format'] )
-				? ", url({$item['url']})"
-				: ", url('{$item['url']}') format('{$item['format']}')";
-		}
-
-		$src = ltrim( $src, ', ' );
-		return $src;
-	}
-
-	/**
-	 * Compiles the font variation settings.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_variation_settings Array of font variation settings.
-	 * @return string The CSS.
-	 */
-	private function compile_variations( array $font_variation_settings ) {
-		$variations = '';
-
-		foreach ( $font_variation_settings as $key => $value ) {
-			$variations .= "$key $value";
-		}
-
-		return $variations;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-provider.php b/lib/experimental/fonts-api/class-wp-fonts-provider.php
deleted file mode 100644
index b59c59d6b8938..0000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-provider.php
+++ /dev/null
@@ -1,129 +0,0 @@
-<?php
-/**
- * Fonts API: Provider abstract class.
- *
- * Individual fonts providers should extend this class and implement.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Provider' ) ) {
-	return;
-}
-
-/**
- * Abstract class for Fonts API providers.
- *
- * The starting point to building a font service provider.
- *
- * What is a Provider?
- *
- * A provider contains the know-how (business logic) for how to
- * process its specific font service (i.e. local or remote)
- * and how to generate the `@font-face` styles for its service.
- *
- * It receives a collection of fonts from the Controller
- * {@see WP_Fonts_Provider::set_fonts()}, and when requested
- * {@see WP_Fonts_Provider::get_css()}, it transforms them
- * into styles (in a performant way for the provider service
- * it manages).
- *
- * @since X.X.X
- */
-abstract class WP_Fonts_Provider {
-
-	/**
-	 * The provider's unique ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	protected $id = '';
-
-	/**
-	 * Fonts to be processed.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array[]
-	 */
-	protected $fonts = array();
-
-	/**
-	 * Array of Font-face style tag's attribute(s)
-	 * where the key is the attribute name and the
-	 * value is its value.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[]
-	 */
-	protected $style_tag_atts = array();
-
-	/**
-	 * Sets this provider's fonts property.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array[] $fonts Registered fonts.
-	 */
-	public function set_fonts( array $fonts ) {
-		$this->fonts = $fonts;
-	}
-
-	/**
-	 * Prints the generated styles.
-	 *
-	 * @since X.X.X
-	 */
-	public function print_styles() {
-		printf(
-			$this->get_style_element(),
-			$this->get_css()
-		);
-	}
-
-	/**
-	 * Gets the `@font-face` CSS for the provider's fonts.
-	 *
-	 * This method is where the provider does it processing to build the
-	 * needed `@font-face` CSS for all of its fonts. Specifics of how
-	 * this processing is done is contained in each provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The `@font-face` CSS.
-	 */
-	abstract public function get_css();
-
-	/**
-	 * Gets the `<style>` element for wrapping the `@font-face` CSS.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string The style element.
-	 */
-	protected function get_style_element() {
-		$attributes = $this->generate_style_element_attributes();
-
-		return "<style id='wp-fonts-{$this->id}'{$attributes}>\n%s\n</style>\n";
-	}
-
-	/**
-	 * Gets the defined <style> element's attributes.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string A string of attribute=value when defined, else, empty string.
-	 */
-	private function generate_style_element_attributes() {
-		$attributes = '';
-		foreach ( $this->style_tag_atts as $name => $value ) {
-			$attributes .= " {$name}='{$value}'";
-		}
-		return $attributes;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-resolver.php b/lib/experimental/fonts-api/class-wp-fonts-resolver.php
deleted file mode 100644
index efa66839cd39c..0000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-resolver.php
+++ /dev/null
@@ -1,408 +0,0 @@
-<?php
-/**
- * WP_Fonts_Resolver class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Resolver' ) ) {
-	return;
-}
-
-/**
- * The Fonts API Resolver abstracts the processing of different data sources
- * (such as theme.json and global styles) for font interactions with the API.
- *
- * This class is for internal core usage and is not supposed to be used by
- * extenders (plugins and/or themes).
- *
- * @access private
- */
-class WP_Fonts_Resolver {
-	/**
-	 * Defines the key structure in global styles to the fontFamily
-	 * user-selected font.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[][]
-	 */
-	protected static $global_styles_font_family_structure = array(
-		array( 'elements', 'link', 'typography', 'fontFamily' ),
-		array( 'elements', 'heading', 'typography', 'fontFamily' ),
-		array( 'elements', 'caption', 'typography', 'fontFamily' ),
-		array( 'elements', 'button', 'typography', 'fontFamily' ),
-		array( 'typography', 'fontFamily' ),
-	);
-
-	/**
-	 * Enqueues user-selected fonts via global styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array User selected font-families when exists, else empty array.
-	 */
-	public static function enqueue_user_selected_fonts() {
-		$user_selected_fonts = array();
-		$user_global_styles  = WP_Theme_JSON_Resolver_Gutenberg::get_user_data()->get_raw_data();
-		if ( isset( $user_global_styles['styles'] ) ) {
-			$user_selected_fonts = static::get_user_selected_fonts( $user_global_styles['styles'] );
-		}
-
-		if ( empty( $user_selected_fonts ) ) {
-			return array();
-		}
-
-		wp_enqueue_fonts( $user_selected_fonts );
-		return $user_selected_fonts;
-	}
-
-	/**
-	 * Gets the user-selected font-family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param  array $global_styles Global styles potentially containing user-selected fonts.
-	 * @return array User-selected font-families.
-	 */
-	private static function get_user_selected_fonts( array $global_styles ) {
-		$font_families = array();
-
-		foreach ( static::$global_styles_font_family_structure as $path ) {
-			$style_value = _wp_array_get( $global_styles, $path, '' );
-
-			$font_family = static::get_value_from_style( $style_value );
-			if ( '' !== $font_family ) {
-				$font_families[] = $font_family;
-			}
-		}
-
-		return array_unique( $font_families );
-	}
-
-	/**
-	 * Get the value (i.e. preset slug) from the given style value.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $style       The style to parse.
-	 * @param string $preset_type Optional. The type to parse. Default 'font-family'.
-	 * @return string Preset slug.
-	 */
-	private static function get_value_from_style( $style, $preset_type = 'font-family' ) {
-		if ( '' === $style ) {
-			return '';
-		}
-
-		$starting_pattern = "var(--wp--preset--{$preset_type}--";
-		$ending_pattern   = ')';
-		if ( ! str_starts_with( $style, $starting_pattern ) ) {
-			return '';
-		}
-
-		$offset = strlen( $starting_pattern );
-		$length = strpos( $style, $ending_pattern ) - $offset;
-		return substr( $style, $offset, $length );
-	}
-
-	/**
-	 * Register fonts defined in theme.json.
-	 *
-	 * @since X.X.X
-	 */
-	public static function register_fonts_from_theme_json() {
-
-		$settings = static::get_settings();
-		// Bail out early if there are no settings for fonts.
-		if ( empty( $settings['typography'] ) || empty( $settings['typography']['fontFamilies'] ) ) {
-			return;
-		}
-
-		list( $fonts, $handles ) = static::parse_font_families( $settings );
-
-		wp_register_fonts( $fonts );
-		wp_enqueue_fonts( $handles );
-	}
-
-	/**
-	 * Add missing fonts to the global styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param WP_Theme_JSON_Gutenberg|WP_Theme_JSON $data The global styles.
-	 * @return WP_Theme_JSON_Gutenberg|WP_Theme_JSON The global styles with missing fonts.
-	 */
-	public static function add_missing_fonts_to_theme_json( $data ) {
-		$font_families_registered = wp_fonts()->get_registered_font_families();
-
-		$raw_data = $data->get_raw_data();
-
-		$font_families_from_theme = ! empty( $raw_data['settings']['typography']['fontFamilies']['theme'] )
-			? $raw_data['settings']['typography']['fontFamilies']['theme']
-			: array();
-
-		// Find missing fonts that are not in the theme's theme.json.
-		$to_add = array();
-		if ( ! empty( $font_families_registered ) ) {
-			$to_add = array_diff( $font_families_registered, static::get_font_families( $font_families_from_theme ) );
-		}
-
-		// Bail out early if there are no missing fonts.
-		if ( empty( $to_add ) ) {
-			return $data;
-		}
-
-		/*
-		 * Make sure the path to settings.typography.fontFamilies.theme exists
-		 * before adding missing fonts.
-		 */
-		if ( empty( $raw_data['settings'] ) ) {
-			$raw_data['settings'] = array();
-		}
-		$raw_data['settings'] = static::set_tyopgraphy_settings_array_structure( $raw_data['settings'] );
-
-		foreach ( $to_add as $font_family_handle ) {
-			$raw_data['settings']['typography']['fontFamilies']['theme'][] = wp_fonts()->to_theme_json( $font_family_handle );
-		}
-
-		return new WP_Theme_JSON_Gutenberg( $raw_data );
-	}
-
-	/**
-	 * Returns theme's settings and adds fonts defined in variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array An array containing theme's settings.
-	 */
-	private static function get_settings() {
-		// Get settings.
-		$settings = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_settings();
-
-		if ( ! is_admin() && ! ( defined( 'REST_REQUEST' ) && REST_REQUEST ) ) {
-			return $settings;
-		}
-
-		// If in the editor, add fonts defined in variations.
-		$variations          = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
-		$set_theme_structure = true;
-
-		foreach ( $variations as $variation ) {
-
-			// Skip if settings.typography.fontFamilies are not defined in the variation.
-			if ( empty( $variation['settings']['typography']['fontFamilies'] ) ) {
-				continue;
-			}
-
-			// One time, set any missing parts of the array structure.
-			if ( $set_theme_structure ) {
-				$set_theme_structure = false;
-				$settings            = static::set_tyopgraphy_settings_array_structure( $settings );
-			}
-
-			// Initialize the font families from variation if set and is an array, otherwise default to an empty array.
-			$variation_font_families = ( isset( $variation['settings']['typography']['fontFamilies']['theme'] ) && is_array( $variation['settings']['typography']['fontFamilies']['theme'] ) )
-				? $variation['settings']['typography']['fontFamilies']['theme']
-				: array();
-
-			// Merge the variation settings with the global settings.
-			$settings['typography']['fontFamilies']['theme'] = array_merge(
-				$settings['typography']['fontFamilies']['theme'],
-				$variation_font_families
-			);
-
-			// Make sure there are no duplicates.
-			$settings['typography']['fontFamilies'] = array_unique( $settings['typography']['fontFamilies'], SORT_REGULAR );
-
-			// The font families from settings might become null after running the `array_unique`.
-			if ( ! isset( $settings['typography']['fontFamilies']['theme'] ) || ! is_array( $settings['typography']['fontFamilies']['theme'] ) ) {
-				$settings['typography']['fontFamilies']['theme'] = array();
-			}
-		}
-
-		return $settings;
-	}
-
-	/**
-	 * Converts a list of font families into font handles and returns them as an array.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $families_data An array of font families data.
-	 * @return array An array containing font handles.
-	 */
-	private static function get_font_families( $families_data ) {
-		$families = array();
-		foreach ( $families_data as $family ) {
-			$font_family = WP_Fonts_Utils::get_font_family_from_variation( $family );
-			$handle      = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-			if ( ! empty( $handle ) ) {
-				$families[ $handle ] = true;
-			}
-		}
-
-		return ! empty( $families ) ? array_keys( $families ) : array();
-	}
-
-	/**
-	 * Parse font families from theme.json.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $settings Font settings to parse.
-	 * @return array Returns an array that contains font data and corresponding handles.
-	 */
-	private static function parse_font_families( array $settings ) {
-		$handles = array();
-		$fonts   = array();
-
-		// Look for fontFamilies.
-		foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
-			foreach ( $font_families as $font_family ) {
-
-				// Skip if fontFace is not defined.
-				if ( empty( $font_family['fontFace'] ) ) {
-					continue;
-				}
-
-				$font_family['fontFace'] = (array) $font_family['fontFace'];
-				$font_family_slug        = isset( $font_family['slug'] ) ? $font_family['slug'] : '';
-
-				foreach ( $font_family['fontFace'] as $font_face ) {
-					// Skip if the font was registered through the Fonts API.
-					if ( isset( $font_face['origin'] ) && WP_Fonts::REGISTERED_ORIGIN === $font_face['origin'] ) {
-						continue;
-					}
-
-					// For each font "src", convert the "file:./" placeholder into a theme font file URI.
-					if ( ! empty( $font_face['src'] ) ) {
-						$font_face['src'] = static::to_theme_file_uri( (array) $font_face['src'] );
-					}
-
-					// Convert font-face properties into kebab-case.
-					$font_face = static::to_kebab_case( $font_face );
-
-					// Convert font-face properties into kebab-case.
-					$font_face = static::to_kebab_case( $font_face );
-
-					$font_family_handle = static::get_font_family_handle( $font_family_slug, $font_face );
-
-					// Skip if no font-family handle was found.
-					if ( null === $font_family_handle ) {
-						continue;
-					}
-
-					$handles[] = $font_family_handle;
-					if ( ! array_key_exists( $font_family_handle, $fonts ) ) {
-						$fonts[ $font_family_handle ] = array();
-					}
-
-					$fonts[ $font_family_handle ][] = $font_face;
-				}
-			}
-		}
-
-		return array( $fonts, $handles );
-	}
-
-	/**
-	 * Sets the typography.fontFamilies.theme structure in the given array, if not already set.
-	 * if not already set.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $data The target array to process.
-	 * @return array Data array with typography.fontFamilies.theme structure set.
-	 */
-	private static function set_tyopgraphy_settings_array_structure( array $data ) {
-		if ( empty( $data['typography'] ) ) {
-			$data['typography'] = array();
-		}
-		if ( empty( $data['typography']['fontFamilies'] ) ) {
-			$data['typography']['fontFamilies'] = array();
-		}
-		if ( empty( $data['typography']['fontFamilies']['theme'] ) ) {
-			$data['typography']['fontFamilies']['theme'] = array();
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Converts each 'file:./' placeholder into a URI to the font file in the theme.
-	 *
-	 * The 'file:./' is specified in the theme's `theme.json` as a placeholder to be
-	 * replaced with the URI to the font file's location in the theme. When a "src"
-	 * beings with this placeholder, it is replaced, converting the src into a URI.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $src An array of font file sources to process.
-	 * @return array An array of font file src URI(s).
-	 */
-	private static function to_theme_file_uri( array $src ) {
-		$placeholder = 'file:./';
-
-		foreach ( $src as $src_key => $src_url ) {
-			// Skip if the src doesn't start with the placeholder, as there's nothing to replace.
-			if ( ! str_starts_with( $src_url, $placeholder ) ) {
-				continue;
-			}
-
-			$src_file        = str_replace( $placeholder, '', $src_url );
-			$src[ $src_key ] = get_theme_file_uri( $src_file );
-		}
-
-		return $src;
-	}
-
-	/**
-	 * Converts all first dimension keys into kebab-case.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $data The array to process.
-	 */
-	private static function to_kebab_case( array $data ) {
-		foreach ( $data as $key => $value ) {
-			$kebab_case          = _wp_to_kebab_case( $key );
-			$data[ $kebab_case ] = $value;
-			if ( $kebab_case !== $key ) {
-				unset( $data[ $key ] );
-			}
-		}
-
-		return $data;
-	}
-
-	/**
-	 * Gets the font-family handle if defined in the "slug" or font-face variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_slug Font-family "slug".
-	 * @param array  $font_face        Font-face (variation) to search.
-	 * @return string|null Font-family handle on success, else null if not found.
-	 */
-	private static function get_font_family_handle( $font_family_slug, array $font_face ) {
-		$font_family_handle = WP_Fonts_Utils::get_font_family_from_variation( $font_face );
-
-		// Use the defined slug if no handle found.
-		if ( empty( $font_family_handle ) ) {
-			$font_family_handle = $font_family_slug;
-		}
-
-		if ( ! empty( $font_family_handle ) ) {
-			$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family_handle );
-		}
-
-		if ( empty( $font_family_handle ) ) {
-			_doing_it_wrong( __FUNCTION__, __( 'Font family not defined in the variation or "slug".', 'gutenberg' ), '6.1.0' );
-			return null;
-		}
-
-		return $font_family_handle;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts-utils.php b/lib/experimental/fonts-api/class-wp-fonts-utils.php
deleted file mode 100644
index 8204dc965fc8b..0000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts-utils.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Font API's utility helpers.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts_Utils' ) ) {
-	return;
-}
-
-/**
- * Utility helpers for the Fonts API.
- *
- * @since X.X.X
- */
-class WP_Fonts_Utils {
-
-	/**
-	 * Converts the given font family into a handle.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family to convert into a handle.
-	 * @return string|null The font family handle on success. Else, null.
-	 */
-	public static function convert_font_family_into_handle( $font_family ) {
-		if ( ! self::is_defined( $font_family ) ) {
-			return null;
-		}
-
-		// If the font-family is a comma-separated list (example: "Inter, sans-serif" ), use just the first font.
-		if ( str_contains( $font_family, ',' ) ) {
-			$font_family = explode( ',', $font_family )[0];
-		}
-
-		return sanitize_title( $font_family );
-	}
-
-	/**
-	 * Converts the given variation and its font-family into a handle.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family The font family's handle for this variation.
-	 * @param array  $variation   An array of variation properties.
-	 * @return string|null The variation handle.
-	 */
-	public static function convert_variation_into_handle( $font_family, array $variation ) {
-		$handle = '';
-		foreach ( array( 'font-weight', 'font-style' ) as $property ) {
-			if ( ! array_key_exists( $property, $variation ) || ! static::is_defined( $variation[ $property ] ) ) {
-				continue;
-			}
-
-			$handle .= ' ' . $variation[ $property ];
-		}
-
-		if ( '' === $handle ) {
-			trigger_error( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-			return null;
-		}
-
-		return sanitize_title( $font_family . $handle );
-	}
-
-	/**
-	 * Gets the font family from the variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation An array of variation properties to search.
-	 * @return string|null The font family if defined. Else, null.
-	 */
-	public static function get_font_family_from_variation( array $variation ) {
-		return static::search_for_font_family( $variation );
-	}
-
-	/**
-	 * Checks if the given input is defined, i.e. meaning is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $input The input to check.
-	 * @return bool True when non-empty string. Else false.
-	 */
-	public static function is_defined( $input ) {
-		return ( is_string( $input ) && ! empty( $input ) );
-	}
-
-	/**
-	 * Searches the variation array to extract the font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $haystack An array of variation properties to search.
-	 * @return string|null The font family when found. Else, null.
-	 */
-	private static function search_for_font_family( array $haystack ) {
-		if ( array_key_exists( 'fontFamily', $haystack ) ) {
-			$key = 'fontFamily';
-		} elseif ( array_key_exists( 'font-family', $haystack ) ) {
-			$key = 'font-family';
-		} else {
-			trigger_error( 'Font family not found.' );
-			return null;
-		}
-
-		if ( static::is_defined( $haystack[ $key ] ) ) {
-			// If the font-family is a comma-separated list (example: "Inter, sans-serif" ), use just the first font.
-			if ( strpos( $haystack[ $key ], ',' ) !== false ) {
-				return explode( ',', $haystack[ $key ] )[0];
-			}
-			return $haystack[ $key ];
-		}
-
-		trigger_error( 'Font family not defined in the variation.' );
-		return null;
-	}
-}
diff --git a/lib/experimental/fonts-api/class-wp-fonts.php b/lib/experimental/fonts-api/class-wp-fonts.php
deleted file mode 100644
index b6d965d5bbc5e..0000000000000
--- a/lib/experimental/fonts-api/class-wp-fonts.php
+++ /dev/null
@@ -1,753 +0,0 @@
-<?php
-/**
- * WP Fonts API class.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( class_exists( 'WP_Fonts' ) ) {
-	return;
-}
-
-/**
- * Class WP_Web_Fonts
- *
- * @since X.X.X
- */
-class WP_Fonts extends WP_Dependencies {
-
-	/**
-	 * Registered "origin", indicating the font is registered in the API.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string
-	 */
-	const REGISTERED_ORIGIN = 'gutenberg_wp_fonts_api';
-
-	/**
-	 * An array of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $providers = array();
-
-	/**
-	 * The flipped $to_do array of font handles.
-	 *
-	 * Used for a faster lookup of the font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var string[]
-	 */
-	private $to_do_keyed_handles;
-
-	/**
-	 * Provider instance store, keyed by provider ID.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $provider_instances = array();
-
-	/**
-	 * Variation property defaults.
-	 *
-	 * @since X.X.X
-	 *
-	 * @var array
-	 */
-	private $variation_property_defaults = array(
-		'provider'     => 'local',
-		'font-family'  => '',
-		'font-style'   => 'normal',
-		'font-weight'  => '400',
-		'font-display' => 'fallback',
-	);
-
-	/**
-	 * Constructor.
-	 *
-	 * @since X.X.X
-	 */
-	public function __construct() {
-		/**
-		 * Filters the font variation's property defaults.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param array $defaults {
-		 *     An array of required font properties and defaults.
-		 *
-		 *     @type string $provider     The provider ID. Default 'local'.
-		 *     @type string $font-family  The font-family property. Default empty string.
-		 *     @type string $font-style   The font-style property. Default 'normal'.
-		 *     @type string $font-weight  The font-weight property. Default '400'.
-		 *     @type string $font-display The font-display property. Default 'fallback'.
-		 * }
-		 */
-		$this->variation_property_defaults = apply_filters( 'wp_font_variation_defaults', $this->variation_property_defaults );
-
-		/**
-		 * Fires when the WP_Fonts instance is initialized.
-		 *
-		 * @since X.X.X
-		 *
-		 * @param WP_Fonts $wp_fonts WP_Fonts instance (passed by reference).
-		 */
-		do_action_ref_array( 'wp_default_fonts', array( &$this ) );
-	}
-
-	/**
-	 * Get the list of registered providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array $providers {
-	 *     An associative array of registered providers, keyed by their unique ID.
-	 *
-	 *     @type string $provider_id => array {
-	 *         An associate array of provider's class name and fonts.
-	 *
-	 *         @type string $class_name Fully qualified name of the provider's class.
-	 *         @type string[] $fonts    An array of enqueued font handles for this provider.
-	 *     }
-	 * }
-	 */
-	public function get_providers() {
-		return $this->providers;
-	}
-
-	/**
-	 * Register a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider's unique ID.
-	 * @param string $class_name  The provider class name.
-	 * @return bool True if successfully registered, else false.
-	 */
-	public function register_provider( $provider_id, $class_name ) {
-		if ( empty( $provider_id ) || empty( $class_name ) || ! class_exists( $class_name ) ) {
-			return false;
-		}
-
-		$this->providers[ $provider_id ] = array(
-			'class' => $class_name,
-			'fonts' => array(),
-		);
-		return true;
-	}
-
-	/**
-	 * Get the list of all registered font family handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered_font_families() {
-		$font_families = array();
-		foreach ( $this->registered as $handle => $obj ) {
-			if ( $obj->extra['is_font_family'] ) {
-				$font_families[] = $handle;
-			}
-		}
-		return $font_families;
-	}
-
-	/**
-	 * Get the list of all registered font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	public function get_registered() {
-		return array_keys( $this->registered );
-	}
-
-	/**
-	 * Get the list of enqueued font families and their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array[]
-	 */
-	public function get_enqueued() {
-		return $this->queue;
-	}
-
-	/**
-	 * Registers a font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family Font family name to register.
-	 * @return string|null Font family handle when registration successes. Null on failure.
-	 */
-	public function add_font_family( $font_family ) {
-		$font_family_handle = WP_Fonts_Utils::convert_font_family_into_handle( $font_family );
-		if ( ! $font_family_handle ) {
-			return null;
-		}
-
-		if ( isset( $this->registered[ $font_family_handle ] ) ) {
-			return $font_family_handle;
-		}
-
-		$registered = $this->add( $font_family_handle, false );
-		if ( ! $registered ) {
-			return null;
-		}
-
-		$this->add_data( $font_family_handle, 'font-properties', array( 'font-family' => $font_family ) );
-		$this->add_data( $font_family_handle, 'is_font_family', true );
-
-		return $font_family_handle;
-	}
-
-	/**
-	 * Removes a font family and all registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	public function remove_font_family( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return;
-		}
-
-		$variations = $this->registered[ $font_family_handle ]->deps;
-
-		foreach ( $variations as $variation ) {
-			$this->remove( $variation );
-		}
-
-		$this->remove( $font_family_handle );
-	}
-
-	/**
-	 * Add a variation to an existing family or register family if none exists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $variation_handle   Optional. The variation's handle. When none is provided, the
-	 *                                   handle will be dynamically generated.
-	 *                                   Default empty string.
-	 * @return string|null Variation handle on success. Else null.
-	 */
-	public function add_variation( $font_family_handle, array $variation, $variation_handle = '' ) {
-		if ( ! WP_Fonts_Utils::is_defined( $font_family_handle ) ) {
-			trigger_error( 'Font family handle must be a non-empty string.' );
-			return null;
-		}
-
-		// When there is a variation handle, check it.
-		if ( '' !== $variation_handle && ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-			trigger_error( 'Variant handle must be a non-empty string.' );
-			return null;
-		}
-
-		// Register the font family when it does not yet exist.
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			if ( ! $this->add_font_family( $font_family_handle ) ) {
-				return null;
-			}
-		}
-
-		$variation = $this->validate_variation( $variation );
-
-		// Variation validation failed.
-		if ( ! $variation ) {
-			return null;
-		}
-
-		// When there's no variation handle, attempt to create one.
-		if ( '' === $variation_handle ) {
-			$variation_handle = WP_Fonts_Utils::convert_variation_into_handle( $font_family_handle, $variation );
-			if ( is_null( $variation_handle ) ) {
-				return null;
-			}
-		}
-
-		// Bail out if the variant is already registered.
-		if ( $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return $variation_handle;
-		}
-
-		$variation_src = array_key_exists( 'src', $variation ) ? $variation['src'] : false;
-		$result        = $this->add( $variation_handle, $variation_src );
-
-		// Bail out if the registration failed.
-		if ( ! $result ) {
-			return null;
-		}
-
-		$this->add_data( $variation_handle, 'font-properties', $variation );
-		$this->add_data( $variation_handle, 'is_font_family', false );
-
-		// Add the font variation as a dependency to the registered font family.
-		$this->add_dependency( $font_family_handle, $variation_handle );
-
-		$this->providers[ $variation['provider'] ]['fonts'][] = $variation_handle;
-
-		return $variation_handle;
-	}
-
-	/**
-	 * Removes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	public function remove_variation( $font_family_handle, $variation_handle ) {
-		if ( isset( $this->registered[ $variation_handle ] ) ) {
-			$this->remove( $variation_handle );
-		}
-
-		if ( ! $this->is_variation_registered( $font_family_handle, $variation_handle ) ) {
-			return;
-		}
-
-		// Remove the variation as a dependency from its font family.
-		$this->registered[ $font_family_handle ]->deps = array_values(
-			array_diff(
-				$this->registered[ $font_family_handle ]->deps,
-				array( $variation_handle )
-			)
-		);
-	}
-
-	/**
-	 * Checks if the variation is registered.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   Variation's handle.
-	 * @return bool True when registered to the given font family. Else false.
-	 */
-	private function is_variation_registered( $font_family_handle, $variation_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return false;
-		}
-
-		return in_array( $variation_handle, $this->registered[ $font_family_handle ]->deps, true );
-	}
-
-	/**
-	 * Adds a variation as a dependency to the given font family.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param string $variation_handle   The variation's handle.
-	 */
-	private function add_dependency( $font_family_handle, $variation_handle ) {
-		$this->registered[ $font_family_handle ]->deps[] = $variation_handle;
-	}
-
-	/**
-	 * Validates and sanitizes a variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $variation  Variation properties to add.
-	 * @return false|array Validated variation on success. Else, false.
-	 */
-	private function validate_variation( $variation ) {
-		$variation = wp_parse_args( $variation, $this->variation_property_defaults );
-
-		// Check the font-family.
-		if ( empty( $variation['font-family'] ) || ! is_string( $variation['font-family'] ) ) {
-			trigger_error( 'Webfont font-family must be a non-empty string.' );
-			return false;
-		}
-
-		// Local fonts need a "src".
-		if ( 'local' === $variation['provider'] ) {
-			// Make sure that local fonts have 'src' defined.
-			if ( empty( $variation['src'] ) || ( ! is_string( $variation['src'] ) && ! is_array( $variation['src'] ) ) ) {
-				trigger_error( 'Webfont src must be a non-empty string or an array of strings.' );
-				return false;
-			}
-		} elseif ( ! isset( $this->providers[ $variation['provider'] ] ) ) {
-			trigger_error( sprintf( 'The provider "%s" is not registered', $variation['provider'] ) );
-			return false;
-		} elseif ( ! class_exists( $this->providers[ $variation['provider'] ]['class'] ) ) {
-			trigger_error( sprintf( 'The provider class "%s" does not exist', $variation['provider'] ) );
-			return false;
-		}
-
-		// Validate the 'src' property.
-		if ( ! empty( $variation['src'] ) ) {
-			foreach ( (array) $variation['src'] as $src ) {
-				if ( empty( $src ) || ! is_string( $src ) ) {
-					trigger_error( 'Each font src must be a non-empty string.' );
-					return false;
-				}
-			}
-		}
-
-		// Check the font-weight.
-		if ( ! is_string( $variation['font-weight'] ) && ! is_int( $variation['font-weight'] ) ) {
-			trigger_error( 'Webfont font-weight must be a properly formatted string or integer.' );
-			return false;
-		}
-
-		// Check the font-display.
-		if ( ! in_array( $variation['font-display'], array( 'auto', 'block', 'fallback', 'swap', 'optional' ), true ) ) {
-			$variation['font-display'] = 'fallback';
-		}
-
-		$valid_props = array(
-			'ascent-override',
-			'descent-override',
-			'font-display',
-			'font-family',
-			'font-stretch',
-			'font-style',
-			'font-weight',
-			'font-variant',
-			'font-feature-settings',
-			'font-variation-settings',
-			'line-gap-override',
-			'size-adjust',
-			'src',
-			'unicode-range',
-
-			// Exceptions.
-			'provider',
-		);
-
-		foreach ( $variation as $prop => $value ) {
-			if ( ! in_array( $prop, $valid_props, true ) ) {
-				unset( $variation[ $prop ] );
-			}
-		}
-
-		return $variation;
-	}
-
-	/**
-	 * Processes the items and dependencies.
-	 *
-	 * Processes the items passed to it or the queue, and their dependencies.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      single item (string), or multiple items (array of strings).
-	 *                                      Default false.
-	 * @param int|false            $group   Optional. Group level: level (int), no group (false).
-	 *
-	 * @return array|string[] Array of font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	public function do_items( $handles = false, $group = false ) {
-		$handles = $this->prepare_handles_for_printing( $handles );
-
-		if ( empty( $handles ) ) {
-			return $this->done;
-		}
-
-		$this->all_deps( $handles );
-		if ( empty( $this->to_do ) ) {
-			return $this->done;
-		}
-
-		$this->to_do_keyed_handles = array_flip( $this->to_do );
-
-		foreach ( $this->get_providers() as $provider_id => $provider ) {
-			// Alert and skip if the provider class does not exist.
-			if ( ! class_exists( $provider['class'] ) ) {
-				/* translators: %s is the provider name. */
-				trigger_error(
-					sprintf(
-						'Class "%s" not found for "%s" font provider',
-						$provider['class'],
-						$provider_id
-					)
-				);
-				continue;
-			}
-
-			$this->do_item( $provider_id, $group );
-		}
-
-		$this->process_font_families_after_printing( $handles );
-
-		return $this->done;
-	}
-
-	/**
-	 * Prepares the given handles for printing.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Handles to prepare.
-	 *                                      Default false.
-	 * @return array Array of handles.
-	 */
-	private function prepare_handles_for_printing( $handles = false ) {
-		if ( false !== $handles ) {
-			$handles = $this->validate_handles( $handles );
-			// Bail out when invalid.
-			if ( empty( $handles ) ) {
-				return array();
-			}
-		}
-
-		// Use the enqueued queue.
-		if ( empty( $handles ) ) {
-			if ( empty( $this->queue ) ) {
-				return array();
-			}
-			$handles = $this->queue;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Validates handle(s) to ensure each is a non-empty string.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $handles Handles to prepare.
-	 * @return string[]|null Array of handles on success. Else null.
-	 */
-	private function validate_handles( $handles ) {
-		// Validate each element is a non-empty string handle.
-		$handles = array_filter( (array) $handles, array( WP_Fonts_Utils::class, 'is_defined' ) );
-
-		if ( empty( $handles ) ) {
-			trigger_error( 'Handles must be a non-empty string or array of non-empty strings' );
-			return null;
-		}
-
-		return $handles;
-	}
-
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @see WP_Dependencies::do_item()
-	 *
-	 * @param string    $provider_id The provider to process.
-	 * @param int|false $group       Not used.
-	 * @return bool
-	 */
-	public function do_item( $provider_id, $group = false ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
-		// Bail out if the provider is not registered.
-		if ( ! isset( $this->providers[ $provider_id ] ) ) {
-			return false;
-		}
-
-		$font_handles = $this->get_enqueued_fonts_for_provider( $provider_id );
-		if ( empty( $font_handles ) ) {
-			return false;
-		}
-
-		$properties_by_font = $this->get_font_properties_for_provider( $font_handles );
-		if ( empty( $properties_by_font ) ) {
-			return false;
-		}
-
-		// Invoke provider to print its styles.
-		$provider = $this->get_provider_instance( $provider_id );
-		$provider->set_fonts( $properties_by_font );
-		$provider->print_styles();
-
-		// Clean up.
-		$this->update_queues_for_printed_fonts( $font_handles );
-
-		return true;
-	}
-
-	/**
-	 * Retrieves a list of enqueued font variations for a provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to process.
-	 * @return array[] Webfonts organized by providers.
-	 */
-	private function get_enqueued_fonts_for_provider( $provider_id ) {
-		$providers = $this->get_providers();
-
-		if ( empty( $providers[ $provider_id ] ) ) {
-			return array();
-		}
-
-		return array_intersect(
-			$providers[ $provider_id ]['fonts'],
-			$this->to_do
-		);
-	}
-
-	/**
-	 * Gets a list of font properties for each of the given font handles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 * @return array A list of fonts with each font's properties.
-	 */
-	private function get_font_properties_for_provider( array $font_handles ) {
-		$font_properties = array();
-
-		foreach ( $font_handles as $font_handle ) {
-			$properties = $this->get_data( $font_handle, 'font-properties' );
-			if ( ! $properties ) {
-				continue;
-			}
-			$font_properties[ $font_handle ] = $properties;
-		}
-
-		return $font_properties;
-	}
-
-	/**
-	 * Gets the instance of the provider from the WP_Webfonts::$provider_instance store.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id The provider to get.
-	 * @return object Instance of the provider.
-	 */
-	private function get_provider_instance( $provider_id ) {
-		if ( ! isset( $this->provider_instances[ $provider_id ] ) ) {
-			$this->provider_instances[ $provider_id ] = new $this->providers[ $provider_id ]['class']();
-		}
-		return $this->provider_instances[ $provider_id ];
-	}
-
-	/**
-	 * Update queues for the given printed fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $font_handles Font handles to get properties.
-	 */
-	private function update_queues_for_printed_fonts( array $font_handles ) {
-		foreach ( $font_handles as $font_handle ) {
-			$this->set_as_done( $font_handle );
-			$this->remove_from_to_do_queues( $font_handle );
-		}
-	}
-
-	/**
-	 * Processes the font families after printing the variations.
-	 *
-	 * For each queued font family:
-	 *
-	 * a. if any of their variations were printed, the font family is added to the `done` list.
-	 * b. removes each from the to_do queues.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array $handles Handles to process.
-	 */
-	private function process_font_families_after_printing( array $handles ) {
-		foreach ( $handles as $handle ) {
-			if (
-				! $this->get_data( $handle, 'is_font_family' ) ||
-				! isset( $this->to_do_keyed_handles[ $handle ] )
-			) {
-				continue;
-			}
-			$font_family = $this->registered[ $handle ];
-
-			// Add the font family to `done` list if any of its variations were printed.
-			if ( ! empty( $font_family->deps ) ) {
-				$processed = array_intersect( $font_family->deps, $this->done );
-				if ( ! empty( $processed ) ) {
-					$this->set_as_done( $handle );
-				}
-			}
-
-			$this->remove_from_to_do_queues( $handle );
-		}
-	}
-
-	/**
-	 * Removes the handle from the `to_do` and `to_do_keyed_handles` lists.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to remove.
-	 */
-	private function remove_from_to_do_queues( $handle ) {
-		unset(
-			$this->to_do[ $this->to_do_keyed_handles[ $handle ] ],
-			$this->to_do_keyed_handles[ $handle ]
-		);
-	}
-
-	/**
-	 * Sets the given handle to done by adding it to the `done` list.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $handle Handle to set as done.
-	 */
-	private function set_as_done( $handle ) {
-		if ( ! is_array( $this->done ) ) {
-			$this->done = array();
-		}
-		$this->done[] = $handle;
-	}
-
-	/**
-	 * Converts the font family and its variations into theme.json structural format.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle Font family to convert.
-	 * @return array Webfonts in theme.json structural format.
-	 */
-	public function to_theme_json( $font_family_handle ) {
-		if ( ! isset( $this->registered[ $font_family_handle ] ) ) {
-			return array();
-		}
-
-		$font_family_name  = $this->registered[ $font_family_handle ]->extra['font-properties']['font-family'];
-		$theme_json_format = array(
-			'fontFamily' => str_contains( $font_family_name, ' ' ) ? "'{$font_family_name}'" : $font_family_name,
-			'name'       => $font_family_name,
-			'slug'       => $font_family_handle,
-			'fontFace'   => array(),
-		);
-
-		foreach ( $this->registered[ $font_family_handle ]->deps as $variation_handle ) {
-			if ( ! isset( $this->registered[ $variation_handle ] ) ) {
-				continue;
-			}
-
-			$variation_obj        = $this->registered[ $variation_handle ];
-			$variation_properties = array( 'origin' => static::REGISTERED_ORIGIN );
-			foreach ( $variation_obj->extra['font-properties'] as $property_name => $property_value ) {
-				$property_in_camelcase                          = lcfirst( str_replace( '-', '', ucwords( $property_name, '-' ) ) );
-				$variation_properties[ $property_in_camelcase ] = $property_value;
-			}
-			$theme_json_format['fontFace'][ $variation_obj->handle ] = $variation_properties;
-		}
-
-		return $theme_json_format;
-	}
-}
diff --git a/lib/experimental/fonts-api/fonts-api.php b/lib/experimental/fonts-api/fonts-api.php
deleted file mode 100644
index 2ff0ff07208d7..0000000000000
--- a/lib/experimental/fonts-api/fonts-api.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-/**
- * Fonts API functions.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @since      X.X.X
- */
-
-if ( ! function_exists( 'wp_fonts' ) ) {
-	/**
-	 * Initialize $wp_fonts if it has not been set.
-	 *
-	 * @since X.X.X
-	 *
-	 * @global WP_Fonts $wp_fonts
-	 *
-	 * @return WP_Fonts WP_Fonts instance.
-	 */
-	function wp_fonts() {
-		global $wp_fonts;
-
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = new WP_Fonts();
-
-			// Initialize.
-			$wp_fonts->register_provider( 'local', 'WP_Fonts_Provider_Local' );
-			add_action( 'wp_head', 'wp_print_fonts', 50 );
-			add_action( 'admin_print_styles', 'wp_print_fonts', 50 );
-		}
-
-		return $wp_fonts;
-	}
-}
-
-if ( ! function_exists( 'wp_register_fonts' ) ) {
-	/**
-	 * Registers one or more font-families and each of their variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array[] $fonts {
-	 *     Fonts to be registered, grouped by each font-family.
-	 *
-	 *     @type string $font-family => array[] $variations {
-	 *          An array of web font variations for this font-family.
-	 *          Each variation has the following structure.
-	 *
-	 *          @type array $variation {
-	 *              @type string $provider     The provider ID. Default 'local'.
-	 *              @type string $font-style   The font-style property. Default 'normal'.
-	 *              @type string $font-weight  The font-weight property. Default '400'.
-	 *              @type string $font-display The font-display property. Default 'fallback'.
-	 *         }
-	 *     }
-	 * }
-	 * @return string[] Array of registered font family handles.
-	 */
-	function wp_register_fonts( array $fonts ) {
-		$registered = array();
-		$wp_fonts   = wp_fonts();
-
-		foreach ( $fonts as $font_family => $variations ) {
-			$font_family_handle = $wp_fonts->add_font_family( $font_family );
-			if ( ! $font_family_handle ) {
-				continue;
-			}
-
-			// Register each of the variations for this font family.
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! WP_Fonts_Utils::is_defined( $variation_handle ) ) {
-					$variation_handle = '';
-				}
-
-				$wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-			}
-
-			$registered[] = $font_family_handle;
-		}
-
-		return $registered;
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_fonts' ) ) {
-	/**
-	 * Enqueues one or more font family and all of its variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string[] $font_families Font family(ies) to enqueue.
-	 */
-	function wp_enqueue_fonts( array $font_families ) {
-		$handles = array_map( array( WP_Fonts_Utils::class, 'convert_font_family_into_handle' ), $font_families );
-
-		wp_fonts()->enqueue( $handles );
-	}
-}
-
-if ( ! function_exists( 'wp_enqueue_font_variations' ) ) {
-	/**
-	 * Enqueues a specific set of font variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[] $variation_handles Variation handle (string) or handles (array of strings).
-	 */
-	function wp_enqueue_font_variations( $variation_handles ) {
-		wp_fonts()->enqueue( $variation_handles );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_font_family' ) ) {
-	/**
-	 * Deregisters a font family and all of its registered variations.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family to remove.
-	 */
-	function wp_deregister_font_family( $font_family_handle ) {
-		wp_fonts()->remove_font_family( $font_family_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_deregister_font_variation' ) ) {
-	/**
-	 * Deregisters a font variation.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $font_family_handle The font family for this variation.
-	 * @param string $variation_handle   The variation's handle to remove.
-	 */
-	function wp_deregister_font_variation( $font_family_handle, $variation_handle ) {
-		wp_fonts()->remove_variation( $font_family_handle, $variation_handle );
-	}
-}
-
-if ( ! function_exists( 'wp_register_font_provider' ) ) {
-	/**
-	 * Registers a custom font service provider.
-	 *
-	 * A webfont provider contains the business logic for how to
-	 * interact with a remote font service and how to generate
-	 * the `@font-face` styles for that remote service.
-	 *
-	 * How to register a custom font service provider:
-	 *    1. Load its class file into memory before registration.
-	 *    2. Pass the class' name to this function.
-	 *
-	 * For example, for a class named `My_Custom_Font_Service_Provider`:
-	 * ```
-	 *    wp_register_font_provider( My_Custom_Font_Service_Provider::class );
-	 * ```
-	 *
-	 * @since 6.0.0
-	 *
-	 * @param string $name      The provider's name.
-	 * @param string $classname The provider's class name.
-	 *                          The class should be a child of `WP_Webfonts_Provider`.
-	 *                          See {@see WP_Webfonts_Provider}.
-	 *
-	 * @return bool True if successfully registered, else false.
-	 */
-	function wp_register_font_provider( $name, $classname ) {
-		return wp_fonts()->register_provider( $name, $classname );
-	}
-}
-
-if ( ! function_exists( 'wp_print_fonts' ) ) {
-	/**
-	 * Invokes each provider to process and print its styles.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string|string[]|bool $handles Optional. Items to be processed: queue (false),
-	 *                                      for iframed editor assets (true), single item (string),
-	 *                                      or multiple items (array of strings).
-	 *                                      Default false.
-	 * @return array|string[] Array of font handles that have been processed.
-	 *                        An empty array if none were processed.
-	 */
-	function wp_print_fonts( $handles = false ) {
-		$wp_fonts          = wp_fonts();
-		$registered        = $wp_fonts->get_registered_font_families();
-		$in_iframed_editor = true === $handles;
-
-		// Nothing to print, as no fonts are registered.
-		if ( empty( $registered ) ) {
-			return array();
-		}
-
-		if ( empty( $handles ) ) {
-			// Automatically enqueue all user-selected fonts.
-			WP_Fonts_Resolver::enqueue_user_selected_fonts();
-			$handles = false;
-		} elseif ( $in_iframed_editor ) {
-			// Print all registered fonts for the iframed editor.
-			$queue           = $wp_fonts->queue;
-			$done            = $wp_fonts->done;
-			$wp_fonts->done  = array();
-			$wp_fonts->queue = $registered;
-			$handles         = false;
-		}
-
-		_wp_scripts_maybe_doing_it_wrong( __FUNCTION__ );
-
-		$printed = $wp_fonts->do_items( $handles );
-
-		// Reset the API.
-		if ( $in_iframed_editor ) {
-			$wp_fonts->done  = $done;
-			$wp_fonts->queue = $queue;
-		}
-
-		return $printed;
-	}
-}
-
-/**
- * Add webfonts mime types.
- */
-add_filter(
-	'mime_types',
-	static function ( $mime_types ) {
-		// Webfonts formats.
-		$mime_types['woff2'] = 'font/woff2';
-		$mime_types['woff']  = 'font/woff';
-		$mime_types['ttf']   = 'font/ttf';
-		$mime_types['eot']   = 'application/vnd.ms-fontobject';
-		$mime_types['otf']   = 'application/x-font-opentype';
-
-		return $mime_types;
-	}
-);
-
-/*
- * To make sure blocks are registered before any Theme_JSON operations take place, a priority of 21 is used.
- *
- * Why 21?
- * Blocks are registered via the "init" hook with a priority value of `20`, which is dynamically added
- * during the build. See: tools/webpack/blocks.js.
- */
-add_action( 'init', 'WP_Fonts_Resolver::register_fonts_from_theme_json', 21 );
-
-add_filter(
-	'block_editor_settings_all',
-	static function ( $settings ) {
-		ob_start();
-		wp_print_fonts( true );
-		$styles = ob_get_clean();
-
-		// Add the font-face styles to iframed editor assets.
-		$settings['__unstableResolvedAssets']['styles'] .= $styles;
-		return $settings;
-	},
-	11
-);
diff --git a/lib/load.php b/lib/load.php
index 61a300447415d..37e4d61c36832 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -139,78 +139,43 @@ function gutenberg_is_experiment_enabled( $name ) {
 // Fonts API / Font Face.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
 
+// Loads the Font Library.
+require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php';
+require __DIR__ . '/experimental/fonts/font-library/font-library.php';
+
+// Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
+if ( ! class_exists( 'WP_Font_Face' ) ) {
+	require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php';
+	require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php';
+}
+
 /*
- * If the Font Library is available, load the Font Face files, else load the Fonts API.
- * This strategy is temporary until the Font Library is merged. It's used here to allow
- * the Font Face (redesigned Fonts API) to be merged before the Font Library while
- * keeping Fonts API available for sites that are using it.
+ * As _gutenberg_get_iframed_editor_assets_6_4() overrides Core's _wp_get_iframed_editor_assets(),
+ * load this file to ensure wp_print_font_faces() is invoked to load the styles into the
+ * iframed editor.
  */
-if (
-	! defined( 'FONT_LIBRARY_DISABLED' ) || ! FONT_LIBRARY_DISABLED
-) {
-	// Loads the Font Library.
-	if ( ! class_exists( 'WP_Font_Library' ) ) {
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
-		require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php';
-		require __DIR__ . '/experimental/fonts/font-library/font-library.php';
-	}
-
-	// Load the Font Face.
-	if ( ! class_exists( 'WP_Font_Face' ) ) {
-		require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face.php';
-		require __DIR__ . '/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php';
-	}
-
-	/*
-	 * As _gutenberg_get_iframed_editor_assets_6_4() overrides Core's _wp_get_iframed_editor_assets(),
-	 * load this file to ensure wp_print_font_faces() is invoked to load the styles into the
-	 * iframed editor.
-	 */
-	require __DIR__ . '/compat/wordpress-6.4/fonts/fonts.php';
-
-	// Load the BC Layer to avoid fatal errors of extenders using the Fonts API.
-	// @core-merge: do not merge the BC layer files into WordPress Core.
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php';
-	require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php';
-} elseif ( ! class_exists( 'WP_Fonts' ) ) {
-
-	// Turns off Font Face hooks in Core.
-	// @since 6.4.0.
-	remove_action( 'wp_head', 'wp_print_font_faces', 50 );
-	remove_action( 'admin_print_styles', 'wp_print_font_faces', 50 );
-
-	// Fonts API files.
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-utils.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts-api/class-wp-fonts-resolver.php';
-	require __DIR__ . '/experimental/fonts-api/fonts-api.php';
-
-	// BC Layer files, which will not be backported to WP Core.
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/webfonts-deprecations.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-utils.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-provider.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts-provider-local.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-webfonts.php';
-	require __DIR__ . '/experimental/fonts-api/bc-layer/class-wp-web-fonts.php';
-}
+require __DIR__ . '/compat/wordpress-6.4/fonts/fonts.php';
+
+// Load the BC Layer to avoid fatal errors of extenders using the Fonts API.
+// @core-merge: do not merge the BC layer files into WordPress Core.
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-utils.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-provider-local.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-fonts-resolver.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-gutenberg-fonts-api-bc-layer.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/webfonts-deprecations.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-utils.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts-provider-local.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-webfonts.php';
+require __DIR__ . '/experimental/fonts/font-face/bc-layer/class-wp-web-fonts.php';
 
 // Plugin specific code.
 require __DIR__ . '/script-loader.php';
diff --git a/phpunit/tests/fonts-api/base.php b/phpunit/tests/fonts-api/base.php
deleted file mode 100644
index 5d03e2733964a..0000000000000
--- a/phpunit/tests/fonts-api/base.php
+++ /dev/null
@@ -1,391 +0,0 @@
-<?php
-/**
- * Test case for the Fonts API tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/wp-fonts-tests-dataset.php';
-
-/**
- * Abstracts the common tasks for the API's tests.
- */
-abstract class WP_Fonts_TestCase extends WP_UnitTestCase {
-	use WP_Fonts_Tests_Datasets;
-
-	/**
-	 * Original WP_Fonts instance, before the tests.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $old_wp_fonts;
-
-	/**
-	 * Current error reporting level (before a test changes it).
-	 *
-	 * @var null|int
-	 */
-	protected $error_reporting_level = null;
-
-	/**
-	 * Reflection data store for non-public property access.
-	 *
-	 * @var ReflectionProperty[]
-	 */
-	protected $property = array();
-
-	/**
-	 * Indicates the test class uses `switch_theme()` and requires
-	 * set_up and tear_down fixtures to set and reset hooks and memory.
-	 *
-	 * If a test class switches themes, set this property to `true`.
-	 *
-	 * @var bool
-	 */
-	protected static $requires_switch_theme_fixtures = false;
-
-	/**
-	 * Theme root directory.
-	 *
-	 * @var string
-	 */
-	protected static $theme_root;
-
-	/**
-	 * Original theme directory.
-	 *
-	 * @var string
-	 */
-	protected $orig_theme_dir;
-
-	/**
-	 * Administrator ID.
-	 *
-	 * @var int
-	 */
-	protected static $administrator_id = 0;
-
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			self::$theme_root = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
-		}
-	}
-
-	public static function tear_down_after_class() {
-		// Reset static flags.
-		self::$requires_switch_theme_fixtures = false;
-
-		parent::tear_down_after_class();
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->old_wp_fonts  = $GLOBALS['wp_fonts'];
-		$GLOBALS['wp_fonts'] = null;
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$this->orig_theme_dir = $GLOBALS['wp_theme_directories'];
-
-			// /themes is necessary as theme.php functions assume /themes is the root if there is only one root.
-			$GLOBALS['wp_theme_directories'] = array( WP_CONTENT_DIR . '/themes', self::$theme_root );
-
-			// Set up the new root.
-			add_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			add_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			// Clear caches.
-			wp_clean_themes_cache();
-			unset( $GLOBALS['wp_themes'] );
-		}
-	}
-
-	public function tear_down() {
-		$this->property      = array();
-		$GLOBALS['wp_fonts'] = $this->old_wp_fonts;
-
-		// Reset the error reporting when modified within a test.
-		if ( is_int( $this->error_reporting_level ) ) {
-			error_reporting( $this->error_reporting_level );
-			$this->error_reporting_level = null;
-		}
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			// Clean up the filters to modify the theme root.
-			remove_filter( 'theme_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'stylesheet_root', array( $this, 'filter_set_theme_root' ) );
-			remove_filter( 'template_root', array( $this, 'filter_set_theme_root' ) );
-
-			WP_Theme_JSON_Resolver::clean_cached_data();
-			if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
-				WP_Theme_JSON_Resolver_Gutenberg::clean_cached_data();
-			}
-		}
-
-		parent::tear_down();
-	}
-
-	public function clean_up_global_scope() {
-		parent::clean_up_global_scope();
-
-		if ( self::$requires_switch_theme_fixtures ) {
-			$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-			wp_clean_themes_cache();
-
-			if ( function_exists( 'wp_clean_theme_json_cache' ) ) {
-				wp_clean_theme_json_cache();
-			}
-
-			if ( function_exists( '_gutenberg_clean_theme_json_caches' ) ) {
-				_gutenberg_clean_theme_json_caches();
-			}
-
-			unset( $GLOBALS['wp_themes'] );
-		}
-	}
-
-	public function filter_set_theme_root() {
-		return self::$theme_root;
-	}
-
-	protected function set_up_mock( $method ) {
-		$mock = $this->setup_object_mock( $method, WP_Fonts::class );
-
-		// Set the global.
-		$GLOBALS['wp_fonts'] = $mock;
-
-		return $mock;
-	}
-
-	protected function setup_object_mock( $method, $class_name ) {
-		if ( is_string( $method ) ) {
-			$method = array( $method );
-		}
-
-		return $this->getMockBuilder( $class_name )->setMethods( $method )->getMock();
-	}
-
-	protected function get_registered_handles() {
-		return array_keys( $this->get_registered() );
-	}
-
-	protected function get_registered() {
-		return wp_fonts()->registered;
-	}
-
-	protected function get_variations( $font_family, $wp_fonts = null ) {
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		return $wp_fonts->registered[ $font_family ]->deps;
-	}
-
-	protected function get_enqueued_handles() {
-		return wp_fonts()->queue;
-	}
-
-	protected function get_queued_before_register( $wp_fonts = null ) {
-		return $this->get_property_value( 'queued_before_register', WP_Dependencies::class, $wp_fonts );
-	}
-
-	protected function get_reflection_property( $property_name, $class_name = 'WP_Fonts' ) {
-		$property = new ReflectionProperty( $class_name, $property_name );
-		$property->setAccessible( true );
-
-		return $property;
-	}
-
-	protected function get_property_value( $property_name, $class_name, $wp_fonts = null ) {
-		$property = $this->get_reflection_property( $property_name, $class_name );
-
-		if ( ! $wp_fonts ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		return $property->getValue( $wp_fonts );
-	}
-
-	protected function setup_property( $class_name, $property_name ) {
-		$key = $this->get_property_key( $class_name, $property_name );
-
-		if ( ! isset( $this->property[ $key ] ) ) {
-			$this->property[ $key ] = new ReflectionProperty( $class_name, 'providers' );
-			$this->property[ $key ]->setAccessible( true );
-		}
-
-		return $this->property[ $key ];
-	}
-
-	protected function get_property_key( $class_name, $property_name ) {
-		return $class_name . '::$' . $property_name;
-	}
-
-	/**
-	 * Opens the accessibility to access the given private or protected method.
-	 *
-	 * @param string $method_name Name of the method to open.
-	 * @return ReflectionMethod Instance of the method, ie to invoke it in the test.
-	 */
-	protected function get_reflection_method( $method_name ) {
-		$method = new ReflectionMethod( WP_Fonts::class, $method_name );
-		$method->setAccessible( true );
-
-		return $method;
-	}
-
-	/**
-	 * Sets up multiple font family and variation mocks.
-	 *
-	 * @param array    $inputs   Array of array( font-family => variations ) to setup.
-	 * @param WP_Fonts $wp_fonts Instance of WP_Fonts.
-	 * @return stdClass[] Array of registered mocks.
-	 */
-	protected function setup_registration_mocks( array $inputs, WP_Fonts $wp_fonts ) {
-		$mocks = array();
-
-		$build_mock = static function ( $font_family, $is_font_family = false ) use ( &$mocks, $wp_fonts ) {
-			$mock        = new stdClass();
-			$mock->deps  = array();
-			$mock->extra = array( 'is_font_family' => $is_font_family );
-			if ( $is_font_family ) {
-				$mock->extra['font-family'] = $font_family;
-			}
-
-			$handle = $is_font_family ? WP_Fonts_Utils::convert_font_family_into_handle( $font_family ) : $font_family;
-
-			// Add to each queue.
-			$mocks[ $handle ]                = $mock;
-			$wp_fonts->registered[ $handle ] = $mock;
-
-			return $mock;
-		};
-
-		foreach ( $inputs as $font_family => $variations ) {
-			$font_mock = $build_mock( $font_family, true );
-
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! is_string( $variation_handle ) ) {
-					$variation_handle = $variation;
-				}
-				$variation_mock                           = $build_mock( $variation_handle );
-				$variation_mock->extra['font-properties'] = $variation;
-				$font_mock->deps[]                        = $variation_handle;
-			}
-		}
-
-		return $mocks;
-	}
-
-	/**
-	 * Register one or more font-family and its variations to set up a test.
-	 *
-	 * @param string        $font_family Font family to test.
-	 * @param array         $variations  Variations.
-	 * @param WP_Fonts|null $wp_fonts    Optional. Instance of the WP_Fonts.
-	 */
-	protected function setup_register( $font_family, $variations, $wp_fonts = null ) {
-		if ( ! ( $wp_fonts instanceof WP_Fonts ) ) {
-			$wp_fonts = wp_fonts();
-		}
-
-		$font_family_handle = $wp_fonts->add_font_family( $font_family );
-
-		foreach ( $variations as $variation_handle => $variation ) {
-			if ( ! is_string( $variation_handle ) ) {
-				$variation_handle = '';
-			}
-			$wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		}
-	}
-
-	/**
-	 * Sets up the WP_Fonts::$provider property.
-	 *
-	 * @param WP_Fonts     $wp_fonts     Instance of WP_Fonts.
-	 * @param string|array $provider     Provider ID when string. Else provider definition with 'id' and 'class' keys.
-	 * @param array        $font_handles Optional. Font handles for this provider.
-	 */
-	protected function setup_provider_property_mock( WP_Fonts $wp_fonts, $provider, array $font_handles = array() ) {
-		if ( is_string( $provider ) ) {
-			$provider = $this->get_provider_definitions( $provider );
-		}
-
-		$property  = $this->setup_property( WP_Fonts::class, 'providers' );
-		$providers = $property->getValue( $wp_fonts );
-
-		if ( ! isset( $providers[ $provider['id'] ] ) ) {
-			$providers[ $provider['id'] ] = array(
-				'class' => $provider['class'],
-				'fonts' => $font_handles,
-			);
-		} else {
-			$providers[ $provider['id'] ] = array_merge( $font_handles, $providers[ $provider['id'] ]['fonts'] );
-		}
-
-		$property->setValue( $wp_fonts, $providers );
-	}
-
-	/**
-	 * Gets the variation handles for the provider from the given fonts.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param array  $fonts       Fonts definitions keyed by font family.
-	 * @param string $provider_id Provider ID.
-	 * @return array|string[] Array of handles on success. Else empty array.
-	 */
-	protected function get_handles_for_provider( array $fonts, $provider_id ) {
-		$handles = array();
-
-		foreach ( $fonts as $variations ) {
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( $provider_id !== $variation['provider'] ) {
-					continue;
-				}
-				$handles[] = $variation_handle;
-			}
-		}
-
-		return $handles;
-	}
-
-	protected static function set_up_admin_user() {
-		self::$administrator_id = self::factory()->user->create(
-			array(
-				'role'       => 'administrator',
-				'user_email' => 'administrator@example.com',
-			)
-		);
-	}
-
-	/**
-	 * Sets up the global styles.
-	 *
-	 * @param array $styles User-selected styles structure.
-	 * @param array $theme  Optional. Theme to switch to for the test. Default 'fonts-block-theme'.
-	 */
-	protected function set_up_global_styles( array $styles, $theme = 'fonts-block-theme' ) {
-		switch_theme( $theme );
-
-		if ( empty( $styles ) ) {
-			return;
-		}
-
-		// Make sure there is data from the user origin.
-		wp_set_current_user( self::$administrator_id );
-		$user_cpt = WP_Theme_JSON_Resolver::get_user_data_from_wp_global_styles( wp_get_theme(), true );
-		$config   = json_decode( $user_cpt['post_content'], true );
-
-		// Add the test styles.
-		$config['styles'] = $styles;
-
-		// Update the global styles and settings post.
-		$user_cpt['post_content'] = wp_json_encode( $config );
-		wp_update_post( $user_cpt, true, false );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/base.php b/phpunit/tests/fonts-api/bc-layer/base.php
deleted file mode 100644
index 27a4d43f7188a..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/base.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Test case for the Fonts API's BC Layer tests.
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once __DIR__ . '/bc-layer-tests-dataset.php';
-
-/**
- * Abstracts the common tasks for the Font API's BC Layer tests.
- */
-abstract class Fonts_BcLayer_TestCase extends WP_Fonts_TestCase {
-	use BC_Layer_Tests_Datasets;
-
-	/**
-	 * Original WP_Webfonts instance, before the tests.
-	 *
-	 * @var WP_Fonts
-	 */
-	private $old_wp_webfonts;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->old_wp_webfonts  = isset( $GLOBALS['wp_webfonts'] ) ? $GLOBALS['wp_webfonts'] : null;
-		$GLOBALS['wp_webfonts'] = null;
-	}
-
-	public function tear_down() {
-		$GLOBALS['wp_webfonts'] = $this->old_wp_webfonts;
-
-		parent::tear_down();
-	}
-
-	protected function set_up_webfonts_mock( $method ) {
-		$mock = $this->setup_object_mock( $method, WP_Webfonts::class );
-
-		// Set the global.
-		$GLOBALS['wp_webfonts'] = $mock;
-
-		return $mock;
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php b/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php
deleted file mode 100644
index 6366aaec7df73..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/bc-layer-tests-dataset.php
+++ /dev/null
@@ -1,483 +0,0 @@
-<?php
-/**
- * Fonts API BC Layer datasets for unit and integration tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-/**
- * Trait for reusing datasets within the Fonts API's BC Layer tests.
- */
-trait BC_Layer_Tests_Datasets {
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_deprecated_structure() {
-		return array(
-			'1 font'                           => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Merriweather' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Merriweather',
-								'font-style'   => 'normal',
-								'font-weight'  => '200 900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'merriweather' ),
-					'get_registered'       => array( 'merriweather', 'merriweather-200-900-normal' ),
-				),
-			),
-			'2 font in same font family'       => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Source Serif Pro' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'normal',
-								'font-weight'  => '300',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'italic',
-								'font-weight'  => '900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'source-serif-pro' ),
-					'get_registered'       => array(
-						'source-serif-pro',
-						'source-serif-pro-300-normal',
-						'source-serif-pro-900-italic',
-					),
-				),
-			),
-			'Fonts in different font families' => array(
-				'fonts'    => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected' => array(
-					'migration'            => array(
-						'Source Serif Pro' => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'normal',
-								'font-weight'  => '300',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Source Serif Pro',
-								'font-style'   => 'italic',
-								'font-weight'  => '900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-								'font-display' => 'fallback',
-							),
-						),
-						'Merriweather'     => array(
-							array(
-								'provider'     => 'local',
-								'font-family'  => 'Merriweather',
-								'font-style'   => 'normal',
-								'font-weight'  => '200 900',
-								'font-display' => 'fallback',
-								'font-stretch' => 'normal',
-								'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-							),
-						),
-					),
-					'wp_register_webfonts' => array( 'source-serif-pro', 'merriweather' ),
-					'get_registered'       => array(
-						'source-serif-pro',
-						'source-serif-pro-300-normal',
-						'source-serif-pro-900-italic',
-						'merriweather',
-						'merriweather-200-900-normal',
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_not_deprecated_structure() {
-		return array(
-			'1 font'                           => array(
-				array(
-					'Merriweather' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-			'2 font in same font family'       => array(
-				array(
-					'Source Serif Pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-			),
-			'Fonts in different font families' => array(
-				array(
-					'source-serif-pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-					'merriweather'     => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_deprecated_structure_with_invalid_font_family() {
-		return array(
-			'non-string'                                  => array(
-				'fonts'            => array(
-					array(
-						'provider'     => 'local',
-						'font-family'  => null,
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-			'empty string in deprecated structure'        => array(
-				'fonts'            => array(
-					'0' => array(
-						'provider'     => 'local',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'incorrect parameter in deprecated structure' => array(
-				'fonts'            => array(
-					array(
-						'provider'     => 'local',
-						'FontFamily'   => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '300',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-					array(
-						'provider'     => 'local',
-						'font_family'  => 'Merriweather',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					array(
-						'provider'     => 'local',
-						'font family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						'font-display' => 'fallback',
-					),
-				),
-				'expected_message' => 'Font family not found.',
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_return_registered_webfonts() {
-		return array(
-			'Single variation'       => array(
-				'fonts'    => array(
-					'Merriweather' => array(
-						array(
-							'font-family' => 'Merriweather',
-							'font-style'  => 'normal',
-							'font-weight' => '400',
-							'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'merriweather' => array(
-						'merriweather-400-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '400',
-							'font-display' => 'fallback',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-			),
-			'2 variations'           => array(
-				'fonts'    => array(
-					'Source Serif Pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'source-serif-pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-			),
-			'Multiple font families' => array(
-				'fonts'    => array(
-					'Merriweather'     => array(
-						array(
-							'font-family' => 'Merriweather',
-							'font-style'  => 'normal',
-							'font-weight' => '400',
-							'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'Source Serif Pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'merriweather'     => array(
-						'merriweather-400-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Merriweather',
-							'font-style'   => 'normal',
-							'font-weight'  => '400',
-							'font-display' => 'fallback',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'source-serif-pro' => array(
-						'source-serif-pro-200-900-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-						),
-						'source-serif-pro-200-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-display' => 'fallback',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php b/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php
deleted file mode 100644
index d76de3f205005..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/isDeprecatedStructure.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-/**
- * Integration tests for Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure
- */
-class Tests_Fonts_GutenbergFontsApiBcLayer_IsDeprecatedStructure extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_detect_deprecated_structure( array $fonts ) {
-		$this->assertTrue( Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure( $fonts ) );
-	}
-
-	/**
-	 * @dataProvider data_not_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_not_detect_deprecated_structure( array $fonts ) {
-		$this->assertFalse( Gutenberg_Fonts_API_BC_Layer::is_deprecated_structure( $fonts ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php b/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php
deleted file mode 100644
index b98481dfbf942..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/gutenbergFontsApiBcLayer/migrateDeprecatedStructure.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Integration tests for Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
- */
-class Tests_Fonts_GutenbergFontsApiBcLayer_MigrateDeprecatedStructure extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 *
-	 * @param array $fonts    Fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_migrate_dprecated_structure_and_throw_deprecation( array $fonts, array $expected ) {
-		$this->assertSameSets( $expected['migration'], Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $fonts ) );
-	}
-
-	/**
-	 * @dataProvider data_not_deprecated_structure
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_return_fonts_and_not_throw_deprecation( array $fonts ) {
-		$this->assertSameSets( $fonts, Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure( $fonts ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php
deleted file mode 100644
index 59e0a9d314a13..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpRegisterWebfonts.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Integration tests for wp_register_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers ::wp_register_webfonts
- */
-class Tests_Fonts_WpRegisterWebfonts extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array $fonts Fonts to test.
-	 */
-	public function test_should_throw_deprecations( array $fonts ) {
-		wp_register_webfonts( $fonts );
-	}
-
-	/**
-	 * @dataProvider data_deprecated_structure
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array $fonts    Fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_register_with_deprecated_structure( array $fonts, array $expected ) {
-		$actual = wp_register_webfonts( $fonts );
-		$this->assertSame( $expected['wp_register_webfonts'], $actual, 'Font family handle(s) should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Fonts should match registered queue' );
-	}
-
-	/**
-	 * @dataProvider data_deprecated_structure_with_invalid_font_family
-	 *
-	 * @expectedDeprecated Gutenberg_Fonts_API_BC_Layer::migrate_deprecated_structure
-	 * @expectedDeprecated wp_register_webfonts
-	 *
-	 * @param array  $fonts            Fonts to test.
-	 * @param string $expected_message Expected notice message.
-	 */
-	public function test_should_not_register_with_undefined_font_family( array $fonts, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$actual = wp_register_webfonts( $fonts );
-		$this->assertSame( array(), $actual, 'Return value should be an empty array' );
-		$this->assertEmpty( $this->get_registered_handles(), 'No fonts should have registered' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php
deleted file mode 100644
index 7a217a343c535..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getAllWebfonts.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_all_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_all_webfonts
- */
-class Tests_Fonts_WpWebfonts_GetAllWebfonts extends Fonts_BcLayer_TestCase {
-	use BC_Layer_Tests_Datasets;
-
-	/**
-	 * @dataProvider data_should_return_registered_webfonts
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::get_all_webfonts
-	 *
-	 * @param array $fonts    Fonts to register.
-	 * @param array $expected Expected result.
-	 */
-	public function test_should_return_registered_webfonts( array $fonts, array $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->assertSame( $expected, wp_webfonts()->get_all_webfonts() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php
deleted file mode 100644
index 7c05f24b03752..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getFontSlug.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_font_slug().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_font_slug
- */
-class Tests_Fonts_WpWebfonts_GetFontSlug extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider data_should_get_font_slug
-	 *
-	 * @expectedDeprecated WP_Webfonts::get_font_slug
-	 *
-	 * @param array|string $to_convert Value to test.
-	 * @param string       $expected   Expected result.
-	 */
-	public function test_should_get_font_slug( $to_convert, $expected ) {
-		$this->assertSame( $expected, WP_Webfonts::get_font_slug( $to_convert ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_get_font_slug() {
-		return array(
-			'font family: single word'                    => array(
-				'to_convert' => 'Merriweather',
-				'expected'   => 'merriweather',
-			),
-			'variation: single word font-family'          => array(
-				'to_convert' => array(
-					'font-family' => 'Merriweather',
-					'font-style'  => 'normal',
-					'font-weight' => '400',
-				),
-				'expected'   => 'merriweather',
-			),
-			'font family: multiword'                      => array(
-				'to_convert' => 'Source Sans Pro',
-				'expected'   => 'source-sans-pro',
-			),
-			'variation: multiword font-family'            => array(
-				'to_convert' => array(
-					'font-family' => 'Source Serif Pro',
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-				),
-				'expected'   => 'source-serif-pro',
-			),
-			'font family: delimited by hyphens'           => array(
-				'to_convert' => 'source-serif-pro',
-				'expected'   => 'source-serif-pro',
-			),
-			'variation: font-family delimited by hyphens' => array(
-				'to_convert' => array(
-					'font-family' => 'source-serif-pro',
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-				),
-				'expected'   => 'source-serif-pro',
-			),
-			'font family: delimited by underscore'        => array(
-				'to_convert' => 'source_serif_pro',
-				'expected'   => 'source_serif_pro',
-			),
-			'variation: font family delimited by underscore' => array(
-				'to_convert' => array(
-					'font-style'  => 'normal',
-					'font-weight' => '200 900',
-					'font-family' => 'Source_Serif_Pro',
-				),
-				'expected'   => 'source_serif_pro',
-			),
-			'font family: delimited by hyphens and underscore' => array(
-				'to_convert' => 'my-custom_font_family',
-				'expected'   => 'my-custom_font_family',
-			),
-			'variation: font family delimited by hyphens and underscore' => array(
-				'to_convert' => array(
-					'font-weight' => '700',
-					'font-family' => 'my-custom_font_family',
-					'font-style'  => 'italic',
-				),
-				'expected'   => 'my-custom_font_family',
-			),
-			'font family: delimited mixture'              => array(
-				'to_convert' => 'My custom_font-family',
-				'expected'   => 'my-custom_font-family',
-			),
-			'variation: font family delimited mixture'    => array(
-				'to_convert' => array(
-					'font-style'  => 'italic',
-					'font-family' => 'My custom_font-family',
-					'font-weight' => '700',
-				),
-				'expected'   => 'my-custom_font-family',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_get_font_slug
-	 *
-	 * @expectedDeprecated WP_Webfonts::get_font_slug
-	 *
-	 * @param array|string $to_convert Value to test.
-	 */
-	public function test_should_not_get_font_slug( $to_convert ) {
-		$this->assertFalse( WP_Webfonts::get_font_slug( $to_convert ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_not_get_font_slug() {
-		return array(
-			'Empty string' => array( '' ),
-			'Empty array'  => array( array() ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php
deleted file mode 100644
index 7a8c97a4d8647..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/getRegisteredWebfonts.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::get_registered_webfonts().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::get_registered_webfonts
- */
-class Tests_Fonts_WpWebfonts_GetRegisteredWebfonts extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @dataProvider       data_should_return_registered_webfonts
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::get_registered_webfonts
-	 *
-	 * @param array $fonts    Fonts to register.
-	 * @param array $expected Expected result.
-	 */
-	public function test_should_return_registered_webfonts( array $fonts, array $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->assertSame( $expected, wp_webfonts()->get_registered_webfonts() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php b/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php
deleted file mode 100644
index ccc4249ad4fcc..0000000000000
--- a/phpunit/tests/fonts-api/bc-layer/wpWebfonts/registerWebfont.php
+++ /dev/null
@@ -1,113 +0,0 @@
-<?php
-/**
- * Integration tests for WP_Webfonts::register_webfont().
- *
- * @package    Gutenberg
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  fontsapi-bclayer
- * @covers WP_Webfonts::register_webfont
- */
-class Tests_Fonts_WpWebfonts_RegisterWebfont extends Fonts_BcLayer_TestCase {
-
-	/**
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::register_webfont
-	 */
-	public function test_should_bail_out() {
-		$webfont = array();
-		$this->assertFalse( wp_webfonts()->register_webfont( $webfont ) );
-	}
-
-	/**
-	 * @dataProvider data_should_register_webfont
-	 *
-	 * @expectedDeprecated wp_webfonts
-	 * @expectedDeprecated WP_Webfonts::register_webfont
-	 *
-	 * @param array        $input    Font to register.
-	 * @param string|false $expected Expected result.
-	 */
-	public function test_should_register_webfont( array $input, $expected ) {
-		$this->assertSame( $expected['register_webfont'], wp_webfonts()->register_webfont( ...$input ), 'Font-family handle should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Font should be registered' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_register_webfont() {
-		return array(
-			'No font family or variation handles'   => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Merriweather',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'register_webfont' => 'merriweather',
-					'get_registered'   => array( 'merriweather', 'merriweather-400-italic' ),
-				),
-			),
-			'Has font family handle but no variation handles' => array(
-				'input'    => array(
-					array(
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-display' => 'fallback',
-						'font-stretch' => 'normal',
-						'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					),
-					'source-serif-pro',
-				),
-				'expected' => array(
-					'register_webfont' => 'source-serif-pro',
-					'get_registered'   => array( 'source-serif-pro', 'source-serif-pro-200-900-normal' ),
-				),
-			),
-			'No font family handle but has variation handle' => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Merriweather',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					),
-					'',
-					'merriweather-italic-400',
-				),
-				'expected' => array(
-					'register_webfont' => 'merriweather',
-					'get_registered'   => array( 'merriweather', 'merriweather-italic-400' ),
-				),
-			),
-			'Has font family and variation handles' => array(
-				'input'    => array(
-					array(
-						'font-family' => 'Source Serif Pro',
-						'font-style'  => 'italic',
-						'font-weight' => '200 900',
-						'src'         => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					),
-					'source-serif-pro',
-					'source-serif-pro-variable-italic',
-				),
-				'expected' => array(
-					'register_webfont' => 'source-serif-pro',
-					'get_registered'   => array( 'source-serif-pro', 'source-serif-pro-variable-italic' ),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php b/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php
deleted file mode 100644
index b882965598d36..0000000000000
--- a/phpunit/tests/fonts-api/wp-fonts-tests-dataset.php
+++ /dev/null
@@ -1,1396 +0,0 @@
-<?php
-/**
- * Fonts API datasets for unit and integration tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-/**
- * Trait for reusing datasets within the Fonts API's tests.
- */
-trait WP_Fonts_Tests_Datasets {
-	/**
-	 * Data provider for testing variation registration that has valid structure.
-	 *
-	 * @return array
-	 */
-	public function data_valid_variation() {
-		return array(
-			'font-weight and font-style not defined; without variation handle' => array(
-				'expected'           => 'lato-400-normal',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-			),
-
-			'font-weight and font-style not defined; with variation handle' => array(
-				'expected'           => 'my-custom-handle',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'variation_handle'   => 'my-custom-handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-			),
-
-			'font-weight defined; with variation handle' => array(
-				'expected'           => 'my_custom_handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-				'variation_handle'   => 'my_custom_handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-			),
-
-			'font-weight defined; with variation handle' => array(
-				'expected'           => 'my_custom_handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'font-family'  => 'Source Serif Pro',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-				),
-				'variation_handle'   => 'my_custom_handle',
-			),
-
-			'font-weight defined; without variation handle' => array(
-				'expected'           => 'source-serif-pro-200-900-normal',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-
-			'more variation properties; with variation handle' => array(
-				'expected'           => 'my-custom-handle',
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'variation_handle'   => 'my-custom-handle',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing registration of variations where the font family handle
-	 * is not defined.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_handle_undefined() {
-		return array(
-			'empty string font family handle' => array(
-				'font_family_handle' => '',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-			'empty string font family handle with font-family defined in variant' => array(
-				'font_family_handle' => '',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-			'non string font family handle'   => array(
-				'font_family_handle' => 10,
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message'   => 'Font family handle must be a non-empty string',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing registration of variations where the font family is not defined
-	 * in the variation.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_undefined_in_variation() {
-		$message = 'Webfont font-family must be a non-empty string.';
-		return array(
-			'font-family: undefined'    => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: null'         => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => null,
-					'font-weight' => '200',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: non string'   => array(
-				'font_family_handle' => 'source-serif-pro',
-				'variation'          => array(
-					'provider'     => 'local',
-					'font-family'  => 10,
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message'   => $message,
-			),
-			'font-family: empty string' => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => '',
-					'src'         => 'https://example.com/assets/fonts/lato/lato.ttf.woff2',
-				),
-				'expected_message'   => $message,
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing when the variation's handle can't be determine from the given input.
-	 *
-	 * @return array
-	 */
-	public function data_unable_determine_variation_handle() {
-		return array(
-			'integer values'                               => array(
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => 'Lato',
-					'font-weight' => 400,
-					'font-style'  => 0,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-				'expected_message'   => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'with empty string font-weight and font-style' => array(
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => '',
-					'font-style'  => '',
-					'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-				'expected_message'   => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'integer font-weight, empty string font-style' => array(
-				'font_family'      => 'merriweather',
-				'variation'        => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => 400,
-					'font-style'  => '',
-					'src'         => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-				'expected_message' => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-			'empty string font-weight, integer font-style' => array(
-				'font_family'      => 'lato',
-				'variation'        => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => '',
-					'font-style'  => 400,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-				'expected_message' => 'Variant handle could not be determined as font-weight and/or font-style are require',
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing an invalid variation.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_variation() {
-		return array(
-			'font-family: undefined'          => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'src' => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'font-family: null'               => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => null,
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'font-family: empty string'       => array(
-				'expected'           => 'Webfont font-family must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'font-family' => '',
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-			'src: undefined'                  => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-				),
-			),
-			'src: null'                       => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-					'src'         => null,
-				),
-			),
-			'src: empty string'               => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Some font',
-					'font-weight' => '200',
-					'src'         => '',
-				),
-			),
-			'src: empty array'                => array(
-				'expected'           => 'Webfont src must be a non-empty string or an array of strings.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(),
-				),
-			),
-			'src: array of an empty string'   => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array( '' ),
-				),
-			),
-			'src: array of a non-string'      => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array( null ),
-				),
-			),
-			'src: array with an empty string' => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(
-						'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						'',
-						'https://example.com/assets/fonts/lato.ttf.woff2',
-					),
-				),
-			),
-			'src: array with a non-string'    => array(
-				'expected'           => 'Each font src must be a non-empty string.',
-				'font_family_handle' => 'lato',
-				'variation'          => array(
-					'provider'    => 'local',
-					'font-family' => 'Lato',
-					'font-weight' => '200',
-					'src'         => array(
-						'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						null,
-						'https://example.com/assets/fonts/lato.ttf.woff2',
-					),
-				),
-			),
-			'provider does not exist'         => array(
-				'expected'           => 'The provider "doesnotexit" is not registered',
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'provider'    => 'doesnotexit',
-					'font-family' => 'Merriweather',
-					'font-weight' => '200 900',
-				),
-			),
-			'font-weight: null'               => array(
-				'expected'           => 'Webfont font-weight must be a properly formatted string or integer.',
-				'font_family_handle' => 'merriweather',
-				'variation'          => array(
-					'font-family' => 'Merriweather',
-					'font-weight' => null,
-					'font-style'  => 'normal',
-					'src'         => 'https://example.com/assets/fonts/lato.ttf.woff2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing one or more font families with varying number of variations.
-	 *
-	 * @return array
-	 */
-	public function data_one_to_many_font_families_and_zero_to_many_variations() {
-		return array(
-			'one family family no variations'           => array(
-				'font_family' => 'lato',
-				'inputs'      => array(
-					'lato' => array(),
-				),
-				'handles'     => array( 'lato' ),
-				'expected'    => array(),
-			),
-			'one family family with 1 variation'        => array(
-				'font_family' => 'merriweather',
-				'inputs'      => array(
-					'merriweather' => array(
-						'merriweather-200-900-normal' => array(
-							'font-family'  => 'Merriweather',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-				),
-				'handles'     => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected'    => array(),
-			),
-			'font family with multiple variations'      => array(
-				'font_family' => 'source-serif-pro',
-				'inputs'      => array(
-					'Source Serif Pro' => array(
-						'Source Serif Pro-300-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						'Source Serif Pro-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'handles'     => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-				'expected'    => array(),
-			),
-			'multiple font families without variations' => array(
-				'font_family' => 'source-serif-pro',
-				'inputs'      => array(
-					'lato'             => array(),
-					'my-font'          => array(),
-					'Source Serif Pro' => array(),
-					'some other font'  => array(),
-				),
-				'handles'     => array( 'lato', 'my-font', 'source-serif-pro', 'some-other-font' ),
-				'expected'    => array( 'lato', 'my-font', 'some-other-font' ),
-			),
-			'multiple font families with variations'    => array(
-				'font_family' => 'my-font',
-				'inputs'      => array(
-					'merriweather'     => array(
-						'merriweather-200-900-normal' => array(
-							'font-family'  => 'Merriweather',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-						),
-					),
-					'Source Serif Pro' => array(
-						'Source Serif Pro-300-normal' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '300',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						'Source Serif Pro-900-italic' => array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-					'my-font'          => array(
-						'my-font-300-italic' => array(
-							'font-family' => 'My Font',
-							'font-weight' => '300',
-							'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-						),
-					),
-				),
-				'handles'     => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-					'my-font',
-					'my-font-300-italic',
-				),
-				'expected'    => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_font_family_handles() {
-		return array(
-			'single word handle'   => array( 'lato' ),
-			'multiple word handle' => array( 'source-sans-pro' ),
-			'single word name'     => array( 'Merriweather' ),
-			'multiple word name'   => array( 'My Cool Font' ),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_providers() {
-		$local = array(
-			'local' => array(
-				'class' => WP_Fonts_Provider_Local::class,
-				'fonts' => array(),
-			),
-		);
-		$mock  = array(
-			'mock' => array(
-				'class' => Mock_Provider::class,
-				'fonts' => array(),
-			),
-		);
-
-		return array(
-			'local provider'           => array(
-				'providers' => array(
-					'local' => WP_Fonts_Provider_Local::class,
-				),
-				'expected'  => $local,
-			),
-			'mock provider'            => array(
-				'providers' => array(
-					'mock' => Mock_Provider::class,
-				),
-				'expected'  => $mock,
-			),
-			'local and mock providers' => array(
-				'providers' => array(
-					'local' => WP_Fonts_Provider_Local::class,
-					'mock'  => Mock_Provider::class,
-				),
-				'expected'  => array_merge( $local, $mock ),
-			),
-		);
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_remove_variations() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'      => 'merriweather',
-				'variation_handle' => 'merriweather-200-900-normal',
-				'expected'         => array(
-					'registered'       => array(
-						'merriweather',
-						'source-serif-pro',
-						'Source Serif Pro-300-normal',
-						'Source Serif Pro-900-italic',
-					),
-					'font_family_deps' => array(),
-				),
-			),
-			'Font with multiple variations' => array(
-				'font_family'      => 'source-serif-pro',
-				'variation_handle' => 'Source Serif Pro-300-normal',
-				'expected'         => array(
-					'registered'       => array(
-						'merriweather',
-						'merriweather-200-900-normal',
-						'source-serif-pro',
-						'Source Serif Pro-900-italic',
-					),
-					'font_family_deps' => array( 'Source Serif Pro-900-italic' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_enqueue() {
-		return array(
-			'1 font-family'   => array(
-				'handles'                         => 'lato',
-				'expected_queue'                  => array( 'lato' ),
-				'expected_queued_before_register' => array(
-					'lato' => null,
-				),
-			),
-			'2 font families' => array(
-				'handles'                         => array( 'merriweather', 'my-font' ),
-				'expected_queue'                  => array( 'merriweather', 'my-font' ),
-				'expected_queued_before_register' => array(
-					'merriweather' => null,
-					'my-font'      => null,
-				),
-			),
-			'3 font families' => array(
-				'handles'                         => array( 'merriweather', 'my-font', 'source-serif-pro' ),
-				'expected_queue'                  => array( 'merriweather', 'my-font', 'source-serif-pro' ),
-				'expected_queued_before_register' => array(
-					'merriweather'     => null,
-					'my-font'          => null,
-					'source-serif-pro' => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_enqueue_variations() {
-		return array(
-			'1 variation'                               => array(
-				'handles'                         => array( 'my-font-300-normal' ),
-				'expected_queue'                  => array( 'my-font-300-normal' ),
-				'expected_queued_before_register' => array(
-					'my-font-300-normal' => null,
-				),
-			),
-			'1 variation from different font families'  => array(
-				'handles'                         => array( 'merriweather-200-900-normal', 'my-font-300-normal' ),
-				'expected_queue'                  => array( 'merriweather-200-900-normal', 'my-font-300-normal' ),
-				'expected_queued_before_register' => array(
-					'merriweather-200-900-normal' => null,
-					'my-font-300-normal'          => null,
-				),
-			),
-			'enqueue one variation and its font family' => array(
-				'handles'                         => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_queue'                  => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_queued_before_register' => array(
-					'merriweather'                => null,
-					'merriweather-200-900-normal' => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_enqueued() {
-		$providers          = $this->get_provider_definitions();
-		$mock_fonts         = $this->get_registered_mock_fonts();
-		$mock_font_handles  = $this->get_handles_for_provider( $mock_fonts, 'mock' );
-		$local_fonts        = $this->get_registered_local_fonts();
-		$local_font_handles = $this->get_handles_for_provider( $local_fonts, 'local' );
-		$font_faces         = $this->get_registered_fonts_css();
-
-		$all_variation_handles = array_merge( $mock_font_handles, $local_font_handles );
-		$setup_all             = array(
-			'provider'         => array(
-				'local' => $providers['local'],
-				'mock'  => $providers['mock'],
-			),
-			'provider_handles' => array(
-				'local' => $local_font_handles,
-				'mock'  => $mock_font_handles,
-			),
-			'registered'       => array_merge( $mock_fonts, $local_fonts ),
-		);
-
-		return array(
-
-			// One provider registered with multiple fonts.
-
-			'print font2 for mock provider'             => array(
-				'setup'           => array(
-					'provider'         => array( 'mock' => $providers['mock'] ),
-					'provider_handles' => array( 'mock' => $mock_font_handles ),
-					'registered'       => $mock_fonts,
-					'enqueued'         => array( 'font2' ),
-				),
-				'expected_done'   => array( 'font2', 'font2-200-900-normal', 'font2-200-900-italic' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s</mock>\n',
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic']
-				),
-			),
-			'print all fonts for mock provider'         => array(
-				'setup'           => array(
-					'provider'         => array( 'mock' => $providers['mock'] ),
-					'provider_handles' => array( 'mock' => $mock_font_handles ),
-					'registered'       => $mock_fonts,
-					'enqueued'         => array( 'font1', 'font2', 'font3' ),
-				),
-				'expected_done'   => array(
-					'font1',
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font2',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font3',
-					'font3-bold-normal',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print merriweather for local provider'     => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'merriweather' ),
-				),
-				'expected_done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'print Source Serif Pro for local provider' => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'source-serif-pro' ),
-				),
-				'expected_done'   => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-			'print all fonts for local provider'        => array(
-				'setup'           => array(
-					'provider'         => array( 'local' => $providers['local'] ),
-					'provider_handles' => array( 'local' => $local_font_handles ),
-					'registered'       => $local_fonts,
-					'enqueued'         => array( 'merriweather', 'source-serif-pro' ),
-				),
-				'expected_done'   => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-
-			// All providers registered with multiple fonts.
-
-			'print font1 when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font1' ) ) ),
-				'expected_done'   => array( 'font1', 'font1-300-normal', 'font1-300-italic', 'font1-900-normal' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal']
-				),
-			),
-			'print all mock fonts when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font1', 'font2', 'font3' ) ) ),
-				'expected_done'   => array(
-					'font1',
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font2',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font3',
-					'font3-bold-normal',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print merriweather when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather' ) ) ),
-				'expected_done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'print all local fonts when all providers registered' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather', 'source-serif-pro' ) ) ),
-				'expected_done'   => array(
-					'merriweather',
-					'merriweather-200-900-normal',
-					'source-serif-pro',
-					'Source Serif Pro-300-normal',
-					'Source Serif Pro-900-italic',
-				),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-
-			'print all fonts for all providers'         => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => $all_variation_handles ) ),
-				'expected_done'   => $all_variation_handles,
-				'expected_output' =>
-					sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					) .
-					sprintf(
-						'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-						$font_faces['font1-300-normal'],
-						$font_faces['font1-300-italic'],
-						$font_faces['font1-900-normal'],
-						$font_faces['font2-200-900-normal'],
-						$font_faces['font2-200-900-italic'],
-						$font_faces['font3-bold-normal']
-					),
-			),
-
-			// Specific variations enqueued.
-			// Validates that only these specific variations print once.
-
-			'specific variation: 1 local'               => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal']
-				),
-			),
-			'specific variation: 1 local from different font families' => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['Source Serif Pro-900-italic']
-				),
-			),
-			'specific variation: 1 local and 1 mock'    => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'merriweather-200-900-normal', 'font2-200-900-normal' ) ) ),
-				'expected_done'   => array( 'merriweather-200-900-normal', 'font2-200-900-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n" .
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['merriweather-200-900-normal'],
-					$font_faces['font2-200-900-normal']
-				),
-			),
-			'specific variation: 1 mock and 1 local'    => array(
-				'setup'           => array_merge( $setup_all, array( 'enqueued' => array( 'font2-200-900-normal', 'Source Serif Pro-300-normal' ) ) ),
-				'expected_done'   => array( 'font2-200-900-normal', 'Source Serif Pro-300-normal' ),
-				'expected_output' => sprintf(
-					"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n" .
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['Source Serif Pro-300-normal'],
-					$font_faces['font2-200-900-normal']
-				),
-			),
-		);
-	}
-
-	protected function get_data_registry() {
-		return array(
-			'lato'             => array(),
-			'merriweather'     => array(
-				'merriweather-200-900-normal' => array(
-					'font-family'  => 'Merriweather',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-			),
-			'Source Serif Pro' => array(
-				'Source Serif Pro-300-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '300',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'Source Serif Pro-900-italic' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'italic',
-					'font-weight'  => '900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-			'my-font'          => array(
-				'my-font-300-normal' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '300',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-				'my-font-300-italic' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '300',
-					'font-style'  => 'italic',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-				'my-font-900-normal' => array(
-					'font-family' => 'My Font',
-					'font-weight' => '900',
-					'src'         => 'https://example.com/assets/fonts/my-font.ttf.woff2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets the provider definitions.
-	 *
-	 * @since X.X.X
-	 *
-	 * @param string $provider_id Optional. Provider ID to get. Default empty string.
-	 * @return array
-	 */
-	protected function get_provider_definitions( $provider_id = '' ) {
-		$providers = array(
-			'mock'  => array(
-				'id'    => 'mock',
-				'class' => Mock_Provider::class,
-			),
-			'local' => array(
-				'id'    => 'local',
-				'class' => WP_Fonts_Provider_Local::class,
-			),
-		);
-
-		if ( '' === $provider_id ) {
-			return $providers;
-		}
-
-		if ( isset( $providers[ $provider_id ] ) ) {
-			return $providers[ $provider_id ];
-		}
-
-		return array(
-			'id'    => $provider_id,
-			'class' => '',
-		);
-	}
-
-	/**
-	 * Gets font definitions for both local and mock providers.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array|string[][][]
-	 */
-	protected function get_registered_fonts() {
-		return array_merge(
-			$this->get_registered_local_fonts(),
-			$this->get_registered_mock_fonts()
-		);
-	}
-
-	/**
-	 * Returns an array of font-face styles that matches the font definitions
-	 * in get_registered_local_fonts() and get_registered_mock_fonts().
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[]
-	 */
-	protected function get_registered_fonts_css() {
-		return array(
-			'merriweather-200-900-normal' => <<<CSS
-@font-face{font-family:Merriweather;font-style:normal;font-weight:200 900;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/merriweather.ttf.woff2') format('woff2');}
-CSS
-		,
-			'Source Serif Pro-300-normal' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:300;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');}
-CSS
-		,
-			'Source Serif Pro-900-italic' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:900;font-display:fallback;font-stretch:normal;src:url('https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');}
-CSS
-		,
-			'font1-300-normal'            => 'font1-300-normal',
-			'font1-300-italic'            => 'font1-300-italic',
-			'font1-900-normal'            => 'font1-900-normal',
-			'font2-200-900-normal'        => 'font2-200-900-normal',
-			'font2-200-900-italic'        => 'font2-200-900-italic',
-			'font3-bold-normal'           => 'font3-bold-normal',
-		);
-	}
-
-	/**
-	 * Gets font definitions for local provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[][][]
-	 */
-	protected function get_registered_local_fonts() {
-		return array(
-			'lato'             => array(),
-			'merriweather'     => array(
-				'merriweather-200-900-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Merriweather',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-				),
-			),
-			'Source Serif Pro' => array(
-				'Source Serif Pro-300-normal' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '300',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'Source Serif Pro-900-italic' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'italic',
-					'font-weight'  => '900',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets font definitions for mock provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return string[][][]
-	 */
-	protected function get_registered_mock_fonts() {
-		return array(
-			'font1' => array(
-				'font1-300-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '300',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-				'font1-300-italic' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '300',
-					'font-style'   => 'italic',
-					'font-display' => 'fallback',
-				),
-				'font1-900-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 1',
-					'font-weight'  => '900',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-			),
-			'font2' => array(
-				'font2-200-900-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 2',
-					'font-weight'  => '200 900',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-				),
-				'font2-200-900-italic' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 2',
-					'font-weight'  => '200 900',
-					'font-style'   => 'italic',
-					'font-display' => 'fallback',
-				),
-			),
-			'font3' => array(
-				'font3-bold-normal' => array(
-					'provider'     => 'mock',
-					'font-family'  => 'Font 3',
-					'font-weight'  => 'bold',
-					'font-style'   => 'normal',
-					'font-display' => 'fallback',
-					'font-stretch' => 'normal',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_user_selected_fonts() {
-		$global_styles = $this->get_mock_user_selected_fonts_global_styles();
-		$font_faces    = $this->get_registered_fonts_css();
-
-		return array(
-			'print font1'           => array(
-				'global_styles'   => $global_styles['font1'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal']
-				),
-			),
-			'print font2'           => array(
-				'global_styles'   => $global_styles['font2'],
-				'expected_done'   => array( 'font2-200-900-normal', 'font2-200-900-italic', 'font2' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s</mock>\n',
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic']
-				),
-			),
-			'print font3'           => array(
-				'global_styles'   => $global_styles['font3'],
-				'expected_done'   => array( 'font3', 'font3-bold-normal' ),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s</mock>\n',
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print all fonts'       => array(
-				'global_styles'   => $global_styles['all'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font2',
-					'font3-bold-normal',
-					'font3',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-			'print all valid fonts' => array(
-				'global_styles'   => $global_styles['all with invalid element'],
-				'expected_done'   => array(
-					'font1-300-normal',
-					'font1-300-italic',
-					'font1-900-normal',
-					'font1',
-					'font2-200-900-normal',
-					'font2-200-900-italic',
-					'font2',
-					'font3-bold-normal',
-					'font3',
-				),
-				'expected_output' => sprintf(
-					'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-					$font_faces['font1-300-normal'],
-					$font_faces['font1-300-italic'],
-					$font_faces['font1-900-normal'],
-					$font_faces['font2-200-900-normal'],
-					$font_faces['font2-200-900-italic'],
-					$font_faces['font3-bold-normal']
-				),
-			),
-		);
-	}
-
-	/**
-	 * Gets user-selected fonts for global styles for the mock provider.
-	 *
-	 * @since X.X.X
-	 *
-	 * @return array
-	 */
-	protected function get_mock_user_selected_fonts_global_styles() {
-		return array(
-			'font1'                    => array(
-				'elements'   => array(
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '300',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font1',
-					'fontStyle'  => 'normal',
-					'fontWeight' => '900',
-				),
-			),
-			'font2'                    => array(
-				'elements' => array(
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-			),
-			'font3'                    => array(
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-			'all'                      => array(
-				'elements'   => array(
-					'link'    => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '900',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-			'all with invalid element' => array(
-				'elements'   => array(
-					'link'    => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'heading' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '900',
-						),
-					),
-					'caption' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font1',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '300',
-						),
-					),
-					'button'  => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '200-900',
-						),
-					),
-					'invalid' => array(
-						'typography' => array(
-							'fontFamily' => 'var:preset|font-family|font2',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '200-900',
-						),
-					),
-				),
-				'typography' => array(
-					'fontFamily' => 'var:preset|font-family|font3',
-					'fontStyle'  => 'normal',
-					'fontWeight' => 'bold',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpDeregisterFontFamily.php b/phpunit/tests/fonts-api/wpDeregisterFontFamily.php
deleted file mode 100644
index 59db2e2abc826..0000000000000
--- a/phpunit/tests/fonts-api/wpDeregisterFontFamily.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_deregister_font_family().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fontsapi
- * @group remove_fonts
- * @covers ::wp_deregister_font_family
- * @covers WP_Fonts::remove_font_family
- */
-class Tests_Webfonts_WpDeregisterFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering a font-family that mocks WP_Fonts.
-	 *
-	 * @dataProvider data_font_family_handles
-	 *
-	 * @param string $font_family_handle Font family handle to test.
-	 */
-	public function test_unit_should_deregister( $font_family_handle ) {
-		$mock = $this->set_up_mock( 'remove_font_family' );
-		$mock->expects( $this->once() )
-			->method( 'remove_font_family' )
-			->with(
-				$this->identicalTo( $font_family_handle )
-			);
-
-		wp_deregister_font_family( $font_family_handle );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering a font family and all of its variations.
-	 *
-	 * @dataProvider data_font_family_handles
-	 *
-	 * @param string $font_family Font family to test.
-	 */
-	public function test_should_deregister_before_registration( $font_family ) {
-		wp_deregister_font_family( $font_family );
-
-		$this->assertIsArray( $this->get_registered(), 'Registration queue should be an array' );
-		$this->assertEmpty( $this->get_registered(), 'Registration queue should be empty after deregistering' );
-	}
-
-	/**
-	 * Integration test for deregistering a font family and all of its variations.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_deregister_after_registration( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		foreach ( $inputs as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-		// Test the before state, just to make sure.
-		$this->assertSame( $registered_handles, $this->get_registered_handles(), 'Font family and variations should be registered before deregistering' );
-
-		wp_deregister_font_family( $font_family );
-
-		// Test after deregistering.
-		$this->assertIsArray( $this->get_registered_handles(), 'Registration queue should be an array' );
-		$this->assertSame( $expected, $this->get_registered_handles(), 'Registration queue should match after deregistering' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpDeregisterFontVariation.php b/phpunit/tests/fonts-api/wpDeregisterFontVariation.php
deleted file mode 100644
index 78b4bf51f758a..0000000000000
--- a/phpunit/tests/fonts-api/wpDeregisterFontVariation.php
+++ /dev/null
@@ -1,298 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_deregister_font_variation().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers ::wp_deregister_font_variation
- * @covers WP_Webfonts::remove_variation
- */
-class Tests_Fonts_WpDeregisterFontVariation extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $fonts_to_register = array();
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts          = wp_fonts();
-		$this->fonts_to_register = $this->get_registered_local_fonts();
-	}
-
-	/**
-	 * Sets up the unit test by mocking the WP_Dependencies object using stdClass and
-	 * registering each font family directly to the WP_Webfonts::$registered property
-	 * and its variations to the mocked $deps property.
-	 */
-	private function setup_unit_test() {
-		$this->setup_registration_mocks( $this->fonts_to_register, $this->wp_fonts );
-	}
-
-	/**
-	 * Sets up the integration test by properly registering each font family and its variations
-	 * by using the WP_Webfonts::add() and WP_Webfonts::add_variation() methods.
-	 */
-	private function setup_integration_test() {
-		foreach ( $this->fonts_to_register as $font_family_handle => $variations ) {
-			$this->setup_register( $font_family_handle, $variations, $this->wp_fonts );
-		}
-	}
-
-	/**
-	 * Testing the test setup to ensure it works.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_mocked_setup( $font_family_handle, $variation_handle ) {
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be in the registered queue before removal' );
-		$this->assertContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should be in its font family deps before removal' );
-	}
-
-	/**
-	 * Unit test for deregistering a font-family's variation using mock of WP_Webfonts.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family to test.
-	 * @param string $variation_handle   Variation's handle to test.
-	 */
-	public function test_should_deregister_when_mocked( $font_family_handle, $variation_handle ) {
-		$mock = $this->set_up_mock( 'remove_variation' );
-		$mock->expects( $this->once() )
-			->method( 'remove_variation' )
-			->with(
-				$this->identicalTo( $font_family_handle, $variation_handle )
-			);
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_should_do_nothing
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_unit_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_unit_test();
-		$registered_queue = $this->wp_fonts->registered;
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSame( $registered_queue, $this->wp_fonts->registered, 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_should_do_nothing
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_integration_test();
-		$registered_queue = $this->wp_fonts->get_registered();
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSameSets( $registered_queue, $this->wp_fonts->get_registered(), 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_should_do_nothing() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'        => 'merriweather',
-				'font_family_handle' => 'merriweather',
-				'variation_handle'   => 'merriweather-200-900-normal',
-			),
-			'Font with multiple variations' => array(
-				'font_family'        => 'Source Serif Pro',
-				'font_family_handle' => 'source-serif-pro',
-				'variation_handle'   => 'Source Serif Pro-300-normal',
-			),
-		);
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		wp_deregister_font_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Remove the variation handle from the font family's deps.
-	 *
-	 * @param string $font_family_handle Font family.
-	 * @param string $variation_handle   The variation handle to remove.
-	 */
-	private function setup_remove_from_font_family_deps( $font_family_handle, $variation_handle ) {
-		foreach ( $this->wp_fonts->registered[ $font_family_handle ]->deps as $index => $vhandle ) {
-			if ( $variation_handle !== $vhandle ) {
-				continue;
-			}
-			unset( $this->wp_fonts->registered[ $font_family_handle ]->deps[ $index ] );
-			break;
-		}
-	}
-
-	/**
-	 * Removes the variation from the WP_Webfonts::$registered queue.
-	 *
-	 * @param string $variation_handle The variation handle to remove.
-	 */
-	private function setup_remove_variation_from_registered( $variation_handle ) {
-		unset( $this->wp_fonts->registered[ $variation_handle ] );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpEnqueueFontVariations.php b/phpunit/tests/fonts-api/wpEnqueueFontVariations.php
deleted file mode 100644
index 6e026d99f5889..0000000000000
--- a/phpunit/tests/fonts-api/wpEnqueueFontVariations.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_enqueue_font_variations().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_enqueue_font_variations
- * @covers WP_Webfonts::enqueue
- */
-class Tests_Fonts_WpEnqueueFontVariations extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering one or more specific variations that mocks WP_Webfonts.
-	 *
-	 * @dataProvider data_variation_handles
-	 *
-	 * @param string|string[] $handles Variation handles to test.
-	 */
-	public function test_unit_should_enqueue( $handles ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $handles )
-			);
-
-		wp_enqueue_font_variations( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_variation_handles() {
-		return array(
-			'1 variation handle'                   => array( 'merriweather-200-900-normal' ),
-			'multiple same font family handles'    => array( array( 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ) ),
-			'handles from different font families' => array( array( 'merriweather-200-900-normal', 'Source Serif Pro-900-italic' ) ),
-		);
-	}
-
-	/**
-	 * Integration test for enqueuing one or more specific variations.
-	 *
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Variation handles to test.
-	 * @param array           $expected Expected queue.
-	 */
-	public function test_should_enqueue_after_registration( $handles, array $expected ) {
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-
-		wp_enqueue_font_variations( $handles );
-		$this->assertEmpty( $this->get_queued_before_register(), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected, $this->get_enqueued_handles(), 'Queue should contain the given handles' );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering one or more specific variations.
-	 *
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Variation handles to test.
-	 * @param array           $not_used Not used.
-	 * @param array           $expected Expected "queued_before_register" queue.
-	 */
-	public function test_should_enqueue_before_registration( $handles, array $not_used, array $expected ) {
-		wp_enqueue_font_variations( $handles );
-
-		$this->assertSame( $expected, $this->get_queued_before_register(), '"queued_before_register" queue should contain the given handles' );
-		$this->assertEmpty( $this->get_enqueued_handles(), 'Queue should be empty' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpEnqueueFonts.php b/phpunit/tests/fonts-api/wpEnqueueFonts.php
deleted file mode 100644
index c00fb0f2dfdae..0000000000000
--- a/phpunit/tests/fonts-api/wpEnqueueFonts.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_enqueue_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_enqueue_fonts
- * @covers WP_Fonts::enqueue
- */
-class Tests_Fonts_WpEnqueueFonts extends WP_Fonts_TestCase {
-
-	/**
-	 * Unit test for registering a font-family that mocks WP_Fonts.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_unit_should_enqueue( $font_families, $expected_handles ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $expected_handles )
-			);
-
-		wp_enqueue_fonts( $font_families );
-	}
-
-	/**
-	 * Integration test for enqueuing a font family and all of its variations.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_should_enqueue_after_registration( $font_families, $expected_handles ) {
-		// Register the font-families.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations );
-		}
-
-		wp_enqueue_fonts( $font_families );
-
-		$this->assertEmpty( $this->get_queued_before_register(), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected_handles, $this->get_enqueued_handles(), 'Queue should contain the given font family(ies)' );
-	}
-
-	/**
-	 * Integration test for enqueuing before registering a font family and all of its variations.
-	 *
-	 * @dataProvider data_should_enqueue
-	 *
-	 * @param string[] $font_families    Font families to test.
-	 * @param string[] $expected_handles Expected handles passed to WP_Fonts::enqueue().
-	 */
-	public function test_should_enqueue_before_registration( $font_families, $expected_handles ) {
-		wp_enqueue_fonts( $font_families );
-
-		// Set up what "queued_before_register" queue should be.
-		$expected = array();
-		foreach ( $expected_handles as $handle ) {
-			$expected[ $handle ] = null;
-		}
-		$this->assertSame( $expected, $this->get_queued_before_register(), '"queued_before_register" queue should contain the given font family(ies)' );
-		$this->assertEmpty( $this->get_enqueued_handles(), 'Queue should be empty' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_enqueue() {
-		return array(
-			'1: single word handle'                 => array(
-				'font_families'    => array( 'lato' ),
-				'expected_handles' => array( 'lato' ),
-			),
-			'1: multiple word handle'               => array(
-				'font_families'    => array( 'source-serif-pro' ),
-				'expected_handles' => array( 'source-serif-pro' ),
-			),
-			'1: single word name'                   => array(
-				'font_families'    => array( 'Merriweather' ),
-				'expected_handles' => array( 'merriweather' ),
-			),
-			'1: multiple word name'                 => array(
-				'font_families'    => array( 'My Font' ),
-				'expected_handles' => array( 'my-font' ),
-			),
-			'>1: single word handle'                => array(
-				'font_families'    => array( 'lato', 'merriweather' ),
-				'expected_handles' => array( 'lato', 'merriweather' ),
-			),
-			'>1: multiple word handle'              => array(
-				'font_families'    => array( 'source-serif-pro', 'my-font' ),
-				'expected_handles' => array( 'source-serif-pro', 'my-font' ),
-			),
-			'>1: single word name'                  => array(
-				'font_families'    => array( 'Lato', 'Merriweather' ),
-				'expected_handles' => array( 'lato', 'merriweather' ),
-			),
-			'>1: multiple word name'                => array(
-				'font_families'    => array( 'My Font', 'Source Serif Pro' ),
-				'expected_handles' => array( 'my-font', 'source-serif-pro' ),
-			),
-			'>1: mixture of word handles and names' => array(
-				'font_families'    => array( 'Source Serif Pro', 'Merriweather', 'my-font', 'Lato' ),
-				'expected_handles' => array( 'source-serif-pro', 'merriweather', 'my-font', 'lato' ),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts.php b/phpunit/tests/fonts-api/wpFonts.php
deleted file mode 100644
index 3b33e58edf299..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_fonts
- */
-class Tests_Fonts_WpFonts extends WP_Fonts_TestCase {
-
-	public function test_returns_instance() {
-		$this->assertInstanceOf( WP_Fonts::class, wp_fonts() );
-	}
-
-	public function test_global_set() {
-		global $wp_fonts;
-		$this->assertNull( $wp_fonts );
-		$instance = wp_fonts();
-		$this->assertInstanceOf( WP_Fonts::class, $wp_fonts );
-		$this->assertSame( $instance, $wp_fonts );
-	}
-
-	public function test_local_provider_is_automatically_registered() {
-		$expected = array(
-			'local' => array(
-				'class' => 'WP_Fonts_Provider_Local',
-				'fonts' => array(),
-			),
-		);
-		$this->assertSame( $expected, wp_fonts()->get_providers() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/add.php b/phpunit/tests/fonts-api/wpFonts/add.php
deleted file mode 100644
index 85d3d98c0f355..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/add.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * WP_Fonts::add() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add
- */
-class Tests_Fonts_WpFonts_Add extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_handles
-	 *
-	 * @param string $handle Handle to register.
-	 */
-	public function test_add( $handle ) {
-		$wp_fonts = new WP_Fonts();
-
-		$this->assertTrue( $wp_fonts->add( $handle, false ), 'Registering a handle should return true' );
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_handles() {
-		return array(
-			'name: multiple'    => array( 'Source Serif Pro' ),
-			'handle: multiple'  => array( 'source-serif-pro' ),
-			'name: single'      => array( 'Merriweather' ),
-			'handle: single'    => array( 'merriweather' ),
-			'handle: variation' => array( 'my-custom-font-200-900-normal' ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/addFontFamily.php b/phpunit/tests/fonts-api/wpFonts/addFontFamily.php
deleted file mode 100644
index 69b6bccf5ae35..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/addFontFamily.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-/**
- * WP_Fonts::add_font_family() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add_font_family
- */
-class Tests_Fonts_WpFonts_AddFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_handles
-	 *
-	 * @param string $font_family Font family to register.
-	 * @param string $expected    Expected handle.
-	 */
-	public function test_should_register( $font_family, $expected ) {
-		$wp_fonts           = new WP_Fonts();
-		$font_family_handle = $wp_fonts->add_font_family( $font_family );
-
-		$this->assertSame( $expected, $font_family_handle, 'Registering a font-family should return its handle' );
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_handles() {
-		return array(
-			'name: multiple'               => array(
-				'font_family' => 'Source Serif Pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'handle: multiple'             => array(
-				'font_family' => 'source-serif-pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'name: single'                 => array(
-				'font_family' => 'Merriweather',
-				'expected'    => 'merriweather',
-			),
-			'handle: single'               => array(
-				'font_family' => 'merriweather',
-				'expected'    => 'merriweather',
-			),
-			'handle: variation'            => array(
-				'font_family' => 'my-custom-font-200-900-normal',
-				'expected'    => 'my-custom-font-200-900-normal',
-			),
-			'name: multiple font-families' => array(
-				'font_family' => 'Source Serif Pro, Merriweather',
-				'expected'    => 'source-serif-pro',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/addVariation.php b/phpunit/tests/fonts-api/wpFonts/addVariation.php
deleted file mode 100644
index 5b6d93bcc99fe..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/addVariation.php
+++ /dev/null
@@ -1,149 +0,0 @@
-<?php
-/**
- * WP_Fonts::add_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::add_variation
- */
-class Tests_Fonts_WpFonts_AddVariation extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_register_variation_when_font_family_is_registered( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variation_handle, 'Registering a variation should return its handle' );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-		$this->assertSame( array( $expected ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should be registered to font family' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_not_reregister_font_family( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-
-		// Font family should appear only once in the registered queue.
-		$expected = array( $font_family_handle, $variation_handle );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Font family should not be re-registered after registering a variation' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_not_reregister_variation( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add( $font_family_handle, false );
-
-		// Set up the test.
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-
-		// Run the test.
-		$variant_handle_on_reregister = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variant_handle_on_reregister, 'Variation should be registered to font family' );
-		$this->assertSame( $variation_handle, $variant_handle_on_reregister, 'Variation should return the previously registered variant handle' );
-		$this->assertSame( array( $variation_handle ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should only be registered once' );
-
-		$this->assertCount( 2, $wp_fonts->registered );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-	}
-
-	/**
-	 * @dataProvider data_valid_variation
-	 *
-	 * @param string|bool $expected           Expected results.
-	 * @param string      $font_family_handle The font family's handle for this variation.
-	 * @param array       $variation          An array of variation properties to add.
-	 * @param string      $variation_handle   Optional. The variation's handle.
-	 */
-	public function test_should_register_font_family_and_variation( $expected, $font_family_handle, array $variation, $variation_handle = '' ) {
-		$wp_fonts = new WP_Fonts();
-
-		$variation_handle = $wp_fonts->add_variation( $font_family_handle, $variation, $variation_handle );
-		$this->assertSame( $expected, $variation_handle, 'Variation should return its registered handle' );
-
-		// Extra checks to ensure both are registered.
-		$this->assertCount( 2, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered, 'Font family handle should be in the registry after registration' );
-		$this->assertArrayHasKey( $variation_handle, $wp_fonts->registered, 'Variation handle should be in the registry after registration' );
-		$this->assertSame( array( $variation_handle ), $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should be registered to the font family' );
-	}
-
-	/**
-	 * @dataProvider data_font_family_handle_undefined
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 */
-	public function test_should_not_register_font_family_or_variant( $font_family_handle, array $variation ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Font family handle must be a non-empty string.' );
-
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add_variation( $font_family_handle, $variation );
-
-		$this->assertEmpty( $wp_fonts->registered, 'Registered queue should be empty' );
-		$this->assertEmpty( $this->get_variations( $font_family_handle, $wp_fonts ), 'Variation should not be registered to the font family' );
-	}
-
-	/**
-	 * @dataProvider data_font_family_undefined_in_variation
-	 * @dataProviders data_unable_determine_variation_handle
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 * @param string $expected_message   Expected notice message.
-	 */
-	public function test_should_not_register_variation_when_font_family_not_defined( $font_family_handle, array $variation, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$wp_fonts = new WP_Fonts();
-		$this->assertNull( $wp_fonts->add_variation( $font_family_handle, $variation ) );
-	}
-
-	/**
-	 * @dataProvider data_unable_determine_variation_handle
-	 *
-	 * @param string $font_family_handle The font family's handle for this variation.
-	 * @param array  $variation          An array of variation properties to add.
-	 */
-	public function test_should_register_font_family_when_variant_fails_to_register( $font_family_handle, array $variation ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->add_variation( $font_family_handle, $variation );
-
-		$this->assertCount( 1, $wp_fonts->registered );
-		$this->assertArrayHasKey( $font_family_handle, $wp_fonts->registered );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/dequeue.php b/phpunit/tests/fonts-api/wpFonts/dequeue.php
deleted file mode 100644
index 6cd11dc55b937..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/dequeue.php
+++ /dev/null
@@ -1,72 +0,0 @@
-<?php
-/**
- * WP_Fonts::dequeue() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::dequeue
- */
-class Tests_Fonts_WpFonts_Dequeue extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_do_nothing_when_handles_not_queued( $handles ) {
-		$wp_fonts = new WP_Fonts();
-
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue should be empty' );
-		$this->assertEmpty( $wp_fonts->queue, 'Queue should be empty' );
-	}
-
-	/**
-	 * Integration test for dequeuing from queue. It first registers and then enqueues before dequeuing.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_dequeue_from_queue( $handles ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register and enqueue.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-		$wp_fonts->enqueue( $handles );
-
-		// To make sure the handles are in the queue before dequeuing.
-		$this->assertNotEmpty( $wp_fonts->queue, 'Queue not be empty before dequeueing' );
-
-		// Run the test.
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $wp_fonts->queue, 'Queue should be empty after dequeueing' );
-	}
-
-	/**
-	 * Integration test for dequeuing from prequeue. It enqueues first.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_dequeue_from_prequeue( $handles ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->enqueue( $handles );
-		$this->assertNotEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue not be empty before dequeueing' );
-
-		$wp_fonts->dequeue( $handles );
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), 'Prequeue should be empty after dequeueing' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/doItem.php b/phpunit/tests/fonts-api/wpFonts/doItem.php
deleted file mode 100644
index a92bd244d1f2a..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/doItem.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?php
-/**
- * WP_Fonts::do_item() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  printfonts
- * @covers WP_Fonts::do_item
- */
-class Tests_Fonts_WpFonts_DoItem extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	public function test_should_return_false_when_provider_not_registered() {
-		$this->assertFalse( $this->wp_fonts->do_item( 'provider_not_registered' ) );
-	}
-
-	/**
-	 * @dataProvider data_provider_definitions
-	 *
-	 * @param array $provider Provider to mock.
-	 */
-	public function test_should_return_false_when_no_fonts_enqueued_for_provider( array $provider ) {
-		$this->setup_provider_property_mock( $this->wp_fonts, $provider );
-		$this->assertFalse( $this->wp_fonts->do_item( $provider['id'] ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_provider_definitions() {
-		$providers = $this->get_provider_definitions();
-
-		return array(
-			'mock'  => array( $providers['mock'] ),
-			'local' => array( $providers['local'] ),
-		);
-	}
-
-	/**
-	 * Test the test set up to ensure the `Tests_Fonts_WpFonts_DoItem_::setup_provider_property_mock()`
-	 * method works as expected.
-	 */
-	public function test_mocking_providers_property() {
-		$font_handles = array( 'font1', 'font2', 'font3' );
-		$expected     = array(
-			'mock' => array(
-				'class' => Mock_Provider::class,
-				'fonts' => $font_handles,
-			),
-		);
-
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-		$actual = $this->property['WP_Fonts::$providers']->getValue( $this->wp_fonts );
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Test the private method WP_Fonts::get_enqueued_fonts_for_provider().
-	 *
-	 * Why? This test validates the right fonts are returned for use within
-	 * WP_Fonts::do_item().
-	 *
-	 * @dataProvider data_get_enqueued_fonts_for_provider
-	 *
-	 * @param array $font_handles Array of handles for the provider.
-	 * @param array $to_do        Handles to set for the WP_Fonts::$to_do property.
-	 * @param array $expected     Expected result.
-	 */
-	public function test_get_enqueued_fonts_for_provider( $font_handles, $to_do, $expected ) {
-		// Set up the `to_do` property.
-		$this->wp_fonts->to_do = $to_do;
-
-		// Open the method's visibility for testing.
-		$get_enqueued_fonts_for_provider = $this->get_reflection_method( 'get_enqueued_fonts_for_provider' );
-
-		// Mock the WP_Fonts::$property to set up the test.
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-
-		$actual = $get_enqueued_fonts_for_provider->invoke( $this->wp_fonts, 'mock' );
-		$this->assertSameSets( $expected, $actual );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_enqueued_fonts_for_provider() {
-		return array(
-			'to_do queue is empty'                   => array(
-				'font_handles ' => array( 'font1', 'font2', 'font3' ),
-				'to_do'         => array(),
-				'expected'      => array(),
-			),
-			'fonts not in to_do queue'               => array(
-				'font_handles ' => array( 'font1', 'font2', 'font3' ),
-				'to_do'         => array( 'font12', 'font13' ),
-				'expected'      => array(),
-			),
-			'2 of the provider fonts in to_do queue' => array(
-				'font_handles ' => array( 'font11', 'font12', 'font13' ),
-				'to_do'         => array( 'font11', 'font13' ),
-				'expected'      => array( 'font11', 'font13' ),
-			),
-			'do all of the provider fonts'           => array(
-				'font_handles ' => array( 'font21', 'font22', 'font23' ),
-				'to_do'         => array( 'font21', 'font22', 'font23' ),
-				'expected'      => array( 'font21', 'font22', 'font23' ),
-			),
-		);
-	}
-
-	/**
-	 * Test the private method WP_Fonts::get_font_properties_for_provider().
-	 *
-	 * Why? This test validates the right font properties are returned for use within
-	 * WP_Fonts::do_item().
-	 *
-	 * @dataProvider data_get_font_properties_for_provider
-	 *
-	 * @param array $font_handles Web fonts for testing.
-	 * @param array $expected     Expected result.
-	 */
-	public function test_get_font_properties_for_provider( $font_handles, $expected ) {
-		// Set up the fonts for WP_Dependencies:get_data().
-		$fonts = $this->get_registered_fonts();
-		// Set all variations to 'mock' provider.
-
-		// Mock the WP_Fonts::$property to set up the test.
-		$this->setup_provider_property_mock( $this->wp_fonts, $this->get_provider_definitions( 'mock' ), $font_handles );
-		$this->setup_registration_mocks( $fonts, $this->wp_fonts );
-
-		// Open the method's visibility for testing.
-		$method = $this->get_reflection_method( 'get_font_properties_for_provider' );
-
-		$actual = $method->invoke( $this->wp_fonts, $font_handles );
-		$this->assertSame( $expected, $actual );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_font_properties_for_provider() {
-		$fonts = $this->get_registered_fonts();
-
-		return array(
-			'handles not registered'                => array(
-				'font_handles' => array( 'font-not-registered1', 'font-not-registered2', 'font-not-registered3' ),
-				'expected'     => array(),
-			),
-			'registered and non-registered handles' => array(
-				'font_handles' => array( 'Source Serif Pro-300-normal', 'not-registered-handle', 'Source Serif Pro-900-italic' ),
-				'expected'     => array(
-					'Source Serif Pro-300-normal' => $fonts['Source Serif Pro']['Source Serif Pro-300-normal'],
-					'Source Serif Pro-900-italic' => $fonts['Source Serif Pro']['Source Serif Pro-900-italic'],
-				),
-			),
-			'font-family handles, ie no "font-properties" extra data' => array(
-				'font_handles' => array( 'font1', 'font2', 'merriweather' ),
-				'expected'     => array(),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_print_enqueued_fonts
-	 *
-	 * @param array $provider Define provider.
-	 * @param array $fonts    Fonts to register and enqueue.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_trigger_provider_when_mocked( array $provider, array $fonts, array $expected ) {
-		$this->setup_print_deps( $provider, $fonts );
-
-		$provider_mock = $this->setup_object_mock( array( 'set_fonts', 'print_styles' ), $provider['class'] );
-
-		// Test the provider's methods are invoked.
-		$provider_mock->expects( $this->once() )->method( 'set_fonts' )->with( $this->identicalTo( $expected['set_fonts'] ) );
-		$provider_mock->expects( $this->once() )->method( 'print_styles' );
-
-		// Set up the WP_Fonts::$provider_instances property.
-		$provider_instances = $this->get_reflection_property( 'provider_instances' );
-		$provider_instances->setValue( $this->wp_fonts, array( $provider['id'] => $provider_mock ) );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( '' );
-		$this->assertTrue( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return true' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_print_enqueued_fonts
-	 *
-	 * @param array $provider Define provider.
-	 * @param array $fonts    Fonts to register and enqueue.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_print( array $provider, array $fonts, array $expected ) {
-		$this->setup_print_deps( $provider, $fonts );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( $expected['printed_output'] );
-		$this->assertTrue( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return true' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_print_enqueued_fonts() {
-		$mock       = $this->get_registered_mock_fonts();
-		$local      = $this->get_registered_local_fonts();
-		$font_faces = $this->get_registered_fonts_css();
-
-		return array(
-			'mock'  => array(
-				'provider' => $this->get_provider_definitions( 'mock' ),
-				'fonts'    => $mock,
-				'expected' => array(
-					'set_fonts'      => array_merge( $mock['font1'], $mock['font2'], $mock['font3'] ),
-					'printed_output' => sprintf(
-						'<mock id="wp-fonts-mock" attr="some-attr">%s; %s; %s; %s; %s; %s</mock>\n',
-						$font_faces['font1-300-normal'],
-						$font_faces['font1-300-italic'],
-						$font_faces['font1-900-normal'],
-						$font_faces['font2-200-900-normal'],
-						$font_faces['font2-200-900-italic'],
-						$font_faces['font3-bold-normal']
-					),
-				),
-			),
-			'local' => array(
-				'provider' => $this->get_provider_definitions( 'local' ),
-				'fonts'    => $local,
-				'expected' => array(
-					'set_fonts'      => array_merge( $local['merriweather'], $local['Source Serif Pro'] ),
-					'printed_output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_not_print_enqueued_fonts
-	 *
-	 * @param array $provider    Define provider.
-	 * @param array $fonts       Fonts to register and enqueue.
-	 * @param array $expected    Not used.
-	 * @param array $to_do_queue Value to set in the WP_Fonts::$to_do queue.
-	 */
-	public function test_should_not_print_when_to_do_queue_empty( array $provider, array $fonts, $expected, $to_do_queue ) {
-		$this->setup_print_deps( $provider, $fonts, $to_do_queue );
-
-		// Test the method successfully processes the provider.
-		$this->expectOutputString( '' );
-		$this->assertFalse( $this->wp_fonts->do_item( $provider['id'] ), 'WP_Fonts::do_item() should return false' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_not_print_enqueued_fonts() {
-		$mock  = $this->get_registered_mock_fonts();
-		$local = $this->get_registered_local_fonts();
-
-		return array(
-			'mock provider when to_do queue is empty'  => array(
-				'provider'    => $this->get_provider_definitions( 'mock' ),
-				'fonts'       => $mock,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-			'local provider when to_do queue is empty' => array(
-				'provider'    => $this->get_provider_definitions( 'local' ),
-				'fonts'       => $local,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-			'fonts not in to_do queue'                 => array(
-				'provider'    => $this->get_provider_definitions( 'mock' ),
-				'fonts'       => $mock,
-				'expected'    => array(),
-				'to_do_queue' => array(),
-			),
-		);
-	}
-
-	/**
-	 * Sets up the print dependencies.
-	 *
-	 * @param array      $provider    Provider id and class.
-	 * @param array      $fonts       Fonts to register and enqueue.
-	 * @param array|null $to_do_queue Set the WP_Fonts:$to_do queue.
-	 */
-	private function setup_print_deps( $provider, $fonts, $to_do_queue = null ) {
-		// Set up the fonts for WP_Dependencies:get_data().
-		$mocks   = $this->setup_registration_mocks( $fonts, $this->wp_fonts );
-		$handles = array_keys( $mocks );
-		$this->setup_provider_property_mock( $this->wp_fonts, $provider, $handles );
-
-		// Set up the `WP_Fonts::$to_do` and `WP_Fonts::$to_do_keyed_handles` properties.
-		if ( null === $to_do_queue ) {
-			$to_do_queue = $handles;
-		}
-
-		$this->wp_fonts->to_do = $to_do_queue;
-		$to_do_keyed_handles   = $this->get_reflection_property( 'to_do_keyed_handles' );
-		$to_do_keyed_handles->setValue( $this->wp_fonts, array_flip( $to_do_queue ) );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/doItems.php b/phpunit/tests/fonts-api/wpFonts/doItems.php
deleted file mode 100644
index 8a29e7463406a..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/doItems.php
+++ /dev/null
@@ -1,196 +0,0 @@
-<?php
-/**
- * WP_Fonts::do_items() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @group  printfonts
- * @covers WP_Fonts::do_items
- */
-class Tests_Fonts_WpFonts_DoItems extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	public function test_should_not_process_when_no_providers_registered() {
-		$this->setup_deps( array( 'enqueued' => 'font1' ) );
-
-		$done = $this->wp_fonts->do_items();
-
-		$this->assertSame( array(), $done, 'WP_Fonts::do_items() should return an empty array' );
-		$this->assertSame( array(), $this->wp_fonts->to_do, 'WP_Fonts::$to_do should be an empty array' );
-	}
-
-	/**
-	 * @dataProvider data_invalid_handles
-	 *
-	 * @param mixed $handles Handles to test.
-	 */
-	public function test_should_throw_notice_when_invalid_handles( $handles ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Handles must be a non-empty string or array of non-empty strings' );
-
-		$this->wp_fonts->do_items( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_handles() {
-		return array(
-			'null'                         => array( null ),
-			'empty array'                  => array( array() ),
-			'empty string'                 => array( '' ),
-			'array of empty strings'       => array( array( '', '' ) ),
-			'array of mixed falsey values' => array( array( '', false, null, array() ) ),
-		);
-	}
-
-	public function test_should_throw_notice_when_provider_class_not_found() {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Class "Provider_Does_Not_Exist" not found for "doesnotexist" font provider' );
-
-		$setup = array(
-			'provider'         => array(
-				'doesnotexist' => array(
-					'id'    => 'doesnotexist',
-					'class' => 'Provider_Does_Not_Exist',
-				),
-			),
-			'provider_handles' => array( 'doesnotexist' => array( 'font1' ) ),
-			'registered'       => array(
-				'doesnotexist' => array(
-					'font1' => array(
-						'font1-300-normal' => array(
-							'provider'     => 'doesnotexist',
-							'font-weight'  => '300',
-							'font-style'   => 'normal',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-			),
-			'enqueued'         => array( 'font1', 'font1-300-normal' ),
-		);
-		$this->setup_deps( $setup );
-
-		$this->wp_fonts->do_items();
-	}
-
-	/**
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_mocked_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_deps( $setup );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = $this->wp_fonts->do_items();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test that registers providers and fonts and then enqueues before
-	 * testing the printing functionality.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_integrated_deps( $setup );
-
-		$this->expectOutputString( $expected_output, 'Printed @font-face styles should match' );
-		$actual_done = $this->wp_fonts->do_items();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test to validate printing given handles. Rather than mocking internal functionality,
-	 * it registers providers and fonts but does not enqueue.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_handles_when_not_enqueued( $setup, $expected_done, $expected_output ) {
-		$this->setup_integrated_deps( $setup, false );
-		// Do not enqueue. Instead, pass the handles to WP_Fonts::do_items().
-		$handles = $setup['enqueued'];
-		$this->assertEmpty( $this->wp_fonts->queue, 'No fonts should be enqueued' );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = $this->wp_fonts->do_items( $handles );
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Sets up the dependencies for the mocked test.
-	 *
-	 * @param array $setup Dependencies to set up.
-	 */
-	private function setup_deps( array $setup ) {
-		$setup = array_merge(
-			array(
-				'provider'         => array(),
-				'provider_handles' => array(),
-				'registered'       => array(),
-				'enqueued'         => array(),
-			),
-			$setup
-		);
-
-		if ( ! empty( $setup['provider'] ) ) {
-			foreach ( $setup['provider'] as $provider_id => $provider ) {
-				$this->setup_provider_property_mock( $this->wp_fonts, $provider, $setup['provider_handles'][ $provider_id ] );
-			}
-		}
-
-		if ( ! empty( $setup['registered'] ) ) {
-			$this->setup_registration_mocks( $setup['registered'], $this->wp_fonts );
-		}
-
-		if ( ! empty( $setup['enqueued'] ) ) {
-			$queue = $this->get_reflection_property( 'queue' );
-			$queue->setValue( $this->wp_fonts, $setup['enqueued'] );
-		}
-	}
-
-	/**
-	 * Sets up the dependencies for integration test.
-	 *
-	 * @param array $setup   Dependencies to set up.
-	 * @param bool  $enqueue Whether to enqueue. Default true.
-	 */
-	private function setup_integrated_deps( array $setup, $enqueue = true ) {
-		foreach ( $setup['provider'] as $provider ) {
-			$this->wp_fonts->register_provider( $provider['id'], $provider['class'] );
-		}
-		foreach ( $setup['registered'] as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $this->wp_fonts );
-		}
-
-		if ( $enqueue ) {
-			$this->wp_fonts->enqueue( $setup['enqueued'] );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/enqueue.php b/phpunit/tests/fonts-api/wpFonts/enqueue.php
deleted file mode 100644
index 09c14676c7ae0..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/enqueue.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-/**
- * WP_Fonts::enqueue() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::enqueue
- */
-class Tests_Fonts_WpFonts_Enqueue extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_enqueue
-	 * @dataProvider data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Handles to test.
-	 * @param array           $not_used Not used.
-	 * @param array           $expected Expected "queued_before_register" queue.
-	 */
-	public function test_should_prequeue_when_not_registered( $handles, $not_used, $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$wp_fonts->enqueue( $handles );
-
-		$this->assertSame( $expected, $this->get_queued_before_register( $wp_fonts ), 'Handles should be added to before registered queue' );
-		$this->assertEmpty( $wp_fonts->queue, 'Handles should not be added to the enqueue queue when not registered' );
-	}
-
-	/**
-	 * Integration test for enqueuing (a) a font family and all of its variations or (b) specific variations.
-	 *
-	 * @dataProvider data_enqueue
-	 * @dataProviders data_enqueue_variations
-	 *
-	 * @param string|string[] $handles  Handles to test.
-	 * @param array           $expected Expected queue.
-	 */
-	public function test_should_enqueue_when_registered( $handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		foreach ( $this->get_data_registry() as $font_family => $variations ) {
-			$this->setup_register( $font_family, $variations, $wp_fonts );
-		}
-
-		$wp_fonts->enqueue( $handles );
-
-		$this->assertEmpty( $this->get_queued_before_register( $wp_fonts ), '"queued_before_register" queue should be empty' );
-		$this->assertSame( $expected, $wp_fonts->queue, 'Queue should contain the given handles' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getEnqueued.php b/phpunit/tests/fonts-api/wpFonts/getEnqueued.php
deleted file mode 100644
index bacb8a31aa650..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getEnqueued.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_enqueued() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_enqueued
- */
-class Tests_Fonts_WpFonts_GetEnqueued extends WP_Fonts_TestCase {
-
-	public function test_should_return_empty_when_non_enqueued() {
-		$wp_fonts = new WP_Fonts();
-		$this->assertEmpty( $wp_fonts->get_enqueued() );
-	}
-
-	/**
-	 * Unit test for when font families are enqueued.
-	 *
-	 * @dataProvider data_enqueue
-	 *
-	 * @param string|string[] $not_used Not used.
-	 * @param array           $expected    Expected queue.
-	 */
-	public function test_should_return_queue_when_property_has_font_families( $not_used, array $expected ) {
-		$wp_fonts        = new WP_Fonts();
-		$wp_fonts->queue = $expected;
-
-		$this->assertSame( $expected, $wp_fonts->get_enqueued() );
-	}
-
-	/**
-	 * Full integration test that registers and enqueues the queue
-	 * is properly wired for "get_enqueued()".
-	 *
-	 * @dataProvider data_enqueue
-	 *
-	 * @param string|string[] $font_family Font family to test.
-	 * @param array           $expected    Expected queue.
-	 */
-	public function test_should_return_queue_when_font_families_registered_and_enqueued( $font_family, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register and enqueue.
-		foreach ( $this->get_data_registry() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-		$wp_fonts->enqueue( $font_family );
-
-		$this->assertSame( $expected, $wp_fonts->get_enqueued() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getProviders.php b/phpunit/tests/fonts-api/wpFonts/getProviders.php
deleted file mode 100644
index 410adaace286a..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getProviders.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_providers() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_providers
- */
-class Tests_Fonts_WpFonts_GetProviders extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $providers_property;
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts = new WP_Fonts();
-
-		$this->providers_property = new ReflectionProperty( WP_Fonts::class, 'providers' );
-		$this->providers_property->setAccessible( true );
-	}
-
-	public function test_should_be_empty() {
-		$actual = $this->wp_fonts->get_providers();
-		$this->assertIsArray( $actual, 'Should return an empty array' );
-		$this->assertEmpty( $actual, 'Should return an empty array when no providers are registered' );
-	}
-
-	/**
-	 * @dataProvider data_get_providers
-	 *
-	 * @param array $providers Array of providers to test.
-	 * @param array $expected  Expected results.
-	 */
-	public function test_get_providers( array $providers, array $expected ) {
-		$this->setup_providers( $providers );
-		$this->assertSame( $expected, $this->wp_fonts->get_providers() );
-	}
-
-	/**
-	 * Sets up the given providers and stores them in the `WP_Fonts::providers` property.
-	 *
-	 * @param array $providers Array of providers to set up.
-	 */
-	private function setup_providers( array $providers ) {
-		$data = array();
-
-		foreach ( $providers as $provider_id => $class ) {
-			$data[ $provider_id ] = array(
-				'class' => $class,
-				'fonts' => array(),
-			);
-		}
-
-		$this->providers_property->setValue( $this->wp_fonts, $data );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/getRegistered.php b/phpunit/tests/fonts-api/wpFonts/getRegistered.php
deleted file mode 100644
index 7dc116f587539..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/getRegistered.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-/**
- * WP_Fonts::get_registered() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::get_registered
- */
-class Tests_Fonts_WpFonts_GetRegistered extends WP_Fonts_TestCase {
-
-	public function test_should_return_empty_when_none_registered() {
-		$wp_fonts = new WP_Fonts();
-		$this->assertEmpty( $wp_fonts->get_registered() );
-	}
-
-	/**
-	 * Unit test for when font families are enqueued.
-	 *
-	 * @dataProvider data_get_registered
-	 *
-	 * @param array $inputs Font family(ies) and variations to register.
-	 */
-	public function test_should_return_queue_when_mocking_registered_property( array $inputs ) {
-		$wp_fonts = new WP_Fonts();
-		$mocks    = $this->setup_registration_mocks( $inputs, $wp_fonts );
-		$expected = array_keys( $mocks );
-
-		$this->assertSame( $expected, $wp_fonts->get_registered() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_registered() {
-		return array(
-			'no variations'                          => array(
-				'inputs' => array(
-					'lato' => array(),
-				),
-			),
-			'with 1 variation'                       => array(
-				'inputs' => array(
-					'Source Serif Pro' => array( 'variation-1' ),
-				),
-			),
-			'with 2 variations'                      => array(
-				'inputs' => array(
-					'my-cool-font' => array( 'cool-1', 'cool-2' ),
-				),
-			),
-			'when multiple font families registered' => array(
-				'inputs' => array(
-					'font-family-1' => array( 'variation-11', 'variation-12' ),
-					'font-family-2' => array( 'variation-21', 'variation-22' ),
-					'font-family-3' => array( 'variation-31', 'variation-32' ),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Full integration test that registers varying number of font families and variations
-	 * to validate if "get_registered()" internals is property wired to the registered queue.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family Not used.
-	 * @param array  $inputs      Font family(ies) and variations to register.
-	 * @param array  $expected    Expected results.
-	 */
-	public function test_should_return_queue_when_items_are_registered( $font_family, array $inputs, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-
-		// Register before testing.
-		foreach ( $inputs as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-
-		$this->assertSame( $expected, $wp_fonts->get_registered() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/query.php b/phpunit/tests/fonts-api/wpFonts/query.php
deleted file mode 100644
index 0e56b515e7ebf..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/query.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * WP_Fonts::query() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::query
- */
-class Tests_Fonts_WpFonts_Query extends WP_Fonts_TestCase {
-	private $wp_fonts;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->wp_fonts = new WP_Fonts();
-	}
-
-	/**
-	 * @dataProvider data_invalid_query
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_should_fail_when_handles_not_registered( $query_handle ) {
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'registered' ) );
-	}
-
-	/**
-	 * @dataProvider data_invalid_query
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_should_fail_when_handles_not_registered_or_enqueued( $query_handle ) {
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'queue' ) );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_registered_query_should_succeed_when_registered( $query_handle ) {
-		$this->setup_registry();
-
-		$actual = $this->wp_fonts->query( $query_handle, 'registered' );
-		$this->assertInstanceOf( '_WP_Dependency', $actual, 'Query should return an instance of _WP_Dependency' );
-		$this->assertSame( $query_handle, $actual->handle, 'Query object handle should match the given handle to query' );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_enqueued_query_should_succeed_when_registered_and_enqueued( $query_handle ) {
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( $query_handle );
-
-		$this->assertTrue( $this->wp_fonts->query( $query_handle, 'enqueued' ) );
-	}
-
-	/**
-	 * @dataProvider data_valid_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_enqueued_query_should_fail_when_not_registered_but_enqueued( $query_handle ) {
-		$this->wp_fonts->enqueue( $query_handle );
-
-		$this->assertFalse( $this->wp_fonts->query( $query_handle, 'enqueued' ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_query() {
-		return array(
-			'DM Sans' => array( 'DM Sans' ),
-			'roboto'  => array( 'roboto' ),
-			'my-font' => array( 'my-font' ),
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_valid_query() {
-		return array(
-			'lato'             => array( 'lato' ),
-			'merriweather'     => array( 'merriweather' ),
-			'Source Serif Pro' => array( 'source-serif-pro' ),
-		);
-	}
-
-	public function test_done_query_should_fail_when_no_variations() {
-		$this->wp_fonts->register_provider( 'local', WP_Fonts_Provider_Local::class );
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( 'lato' );
-
-		$this->wp_fonts->do_items( 'lato' );
-
-		$this->assertFalse( $this->wp_fonts->query( 'lato', 'done' ) );
-	}
-
-	/**
-	 * @dataProvider data_done_query
-	 *
-	 * @param string $query_handle Handle to test.
-	 */
-	public function test_done_query_should_succeed_when_registered_and_enqueued( $query_handle ) {
-		$this->wp_fonts->register_provider( 'local', WP_Fonts_Provider_Local::class );
-		$this->setup_registry();
-		$this->wp_fonts->enqueue( $query_handle );
-
-		// Process the fonts while ignoring all the printed output.
-		$this->expectOutputRegex( '`.`' );
-		$this->wp_fonts->do_items( $query_handle );
-		$this->getActualOutput();
-
-		$this->assertTrue( $this->wp_fonts->query( $query_handle, 'done' ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_done_query() {
-		return array(
-			'merriweather'     => array( 'merriweather' ),
-			'Source Serif Pro' => array( 'source-serif-pro' ),
-		);
-	}
-
-	private function setup_registry() {
-		foreach ( $this->get_registered_local_fonts() as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $this->wp_fonts );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/registerProvider.php b/phpunit/tests/fonts-api/wpFonts/registerProvider.php
deleted file mode 100644
index c67976e0a6865..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/registerProvider.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * WP_Fonts::register_provider() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts::register_provider
- */
-class Tests_Fonts_WpFonts_RegisterProvider extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_register_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 * @param array  $expected    Expected providers queue.
-	 */
-	public function test_should_register_provider( $provider_id, $class_name, $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$this->assertTrue( $wp_fonts->register_provider( $provider_id, $class_name ), 'WP_Fonts::register_provider() should return true' );
-		$this->assertSame( $expected, $wp_fonts->get_providers(), 'Provider "' . $provider_id . '" should be registered in providers queue' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_register_providers() {
-		return array(
-			'mock'  => array(
-				'provider_id' => 'mock',
-				'class'       => Mock_Provider::class,
-				'expected'    => array(
-					'mock' => array(
-						'class' => Mock_Provider::class,
-						'fonts' => array(),
-					),
-				),
-			),
-			'local' => array(
-				'provider_id' => 'local',
-				'class'       => WP_Fonts_Provider_Local::class,
-				'expected'    => array(
-					'local' => array(
-						'class' => WP_Fonts_Provider_Local::class,
-						'fonts' => array(),
-					),
-				),
-			),
-		);
-	}
-
-	public function test_should_register_multiple_providers() {
-		$wp_fonts  = new WP_Fonts();
-		$providers = $this->get_provider_definitions();
-		foreach ( $providers as $provider ) {
-			$this->assertTrue( $wp_fonts->register_provider( $provider['id'], $provider['class'] ), 'WP_Fonts::register_provider() should return true for provider ' . $provider['id'] );
-		}
-
-		$expected = array(
-			'mock'  => array(
-				'class' => $providers['mock']['class'],
-				'fonts' => array(),
-			),
-			'local' => array(
-				'class' => $providers['local']['class'],
-				'fonts' => array(),
-			),
-		);
-
-		$this->assertSame( $expected, $wp_fonts->get_providers(), 'Both local and mock providers should be registered' );
-	}
-
-	/**
-	 * @dataProvider data_invalid_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_not_register( $provider_id, $class_name ) {
-		$wp_fonts = new WP_Fonts();
-
-		$this->assertFalse( $wp_fonts->register_provider( $provider_id, $class_name ), 'WP_Fonts::register_provider() should return false' );
-		$this->assertArrayNotHasKey( $provider_id, $wp_fonts->get_providers(), 'Both local and mock providers should be registered' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_providers() {
-		return array(
-			'provider_id is empty' => array(
-				'provider_id' => '',
-				'class'       => Mock_Provider::class,
-			),
-			'class is empty'       => array(
-				'provider_id' => 'local',
-				'class'       => '',
-			),
-			'class does not exist' => array(
-				'provider_id' => 'doesnotexist',
-				'class'       => 'Provider_Does_Not_Exist',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/remove.php b/phpunit/tests/fonts-api/wpFonts/remove.php
deleted file mode 100644
index 208bd58c3d2c3..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/remove.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers WP_Fonts::remove
- */
-class Tests_Fonts_WpFonts_Remove extends WP_Fonts_TestCase {
-
-	public function test_should_not_remove_when_none_registered() {
-		$wp_fonts = new WP_Fonts();
-
-		$wp_fonts->remove( array( 'handle-1', 'handle2' ) );
-
-		$this->assertEmpty( $wp_fonts->registered );
-	}
-
-	/**
-	 * @dataProvider data_remove_when_registered
-	 *
-	 * @param array $handles  Handles to remove.
-	 * @param array $expected Expected handles are running test.
-	 */
-	public function test_should_remove_when_registered( array $handles, array $expected ) {
-		$wp_fonts             = new WP_Fonts();
-		$wp_fonts->registered = $this->generate_registered_queue();
-
-		$wp_fonts->remove( $handles );
-
-		$this->assertSameSets( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing handles' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_remove_when_registered() {
-		$all = array(
-			'handle-1',
-			'handle-2',
-			'handle-3',
-			'handle-4',
-			'handle-5',
-			'handle-6',
-			'handle-7',
-			'handle-8',
-			'handle-9',
-			'handle-10',
-		);
-
-		return array(
-			'remove none'                 => array(
-				'handles'  => array(),
-				'expected' => $all,
-			),
-			'remove handle-5'             => array(
-				'handles'  => array( 'handle-5' ),
-				'expected' => array(
-					'handle-1',
-					'handle-2',
-					'handle-3',
-					'handle-4',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-					'handle-9',
-					'handle-10',
-				),
-			),
-			'remove 2 from start and end' => array(
-				'handles'  => array( 'handle-1', 'handle-2', 'handle-9', 'handle-10' ),
-				'expected' => array(
-					'handle-3',
-					'handle-4',
-					'handle-5',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-				),
-			),
-			'remove all'                  => array(
-				'handles'  => $all,
-				'expected' => array(),
-			),
-			'remove only registered'      => array(
-				'handles'  => array( 'handle-1', 'handle-10', 'handle-abc', 'handle-5' ),
-				'expected' => array(
-					'handle-2',
-					'handle-3',
-					'handle-4',
-					'handle-6',
-					'handle-7',
-					'handle-8',
-					'handle-9',
-				),
-			),
-		);
-	}
-
-	private function generate_registered_queue() {
-		$queue = array();
-		for ( $num = 1; $num <= 10; $num++ ) {
-			$handle           = "handle-{$num}";
-			$queue[ $handle ] = $num;
-		}
-
-		return $queue;
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php b/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php
deleted file mode 100644
index 6e762307d0520..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/removeFontFamily.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove_font_family() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @group remove_fonts
- * @covers WP_Fonts::remove_font_family
- */
-class Tests_Fonts_WpFonts_RemoveFontFamily extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_dequeue_when_mocks_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		$this->setup_registration_mocks( $inputs, $wp_fonts );
-		// Test the before state, just to make sure.
-		$this->assertArrayHasKey( $font_family, $wp_fonts->registered, 'Registered queue should contain the font family before remove' );
-		$this->assertSame( $registered_handles, array_keys( $wp_fonts->registered ), 'Font family and variations should be registered before remove' );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-
-	/**
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Not used.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_bail_out_when_not_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		unset( $inputs[ $font_family ] );
-		$this->setup_registration_mocks( $inputs, $wp_fonts );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-
-	/**
-	 * Integration test for removing a font family and all of its variation when font family is registered.
-	 *
-	 * @dataProvider data_one_to_many_font_families_and_zero_to_many_variations
-	 *
-	 * @param string $font_family        Font family to test.
-	 * @param array  $inputs             Font family(ies) and variations to pre-register.
-	 * @param array  $registered_handles Expected handles after registering.
-	 * @param array  $expected           Array of expected handles.
-	 */
-	public function test_should_deregister_when_registered( $font_family, array $inputs, array $registered_handles, array $expected ) {
-		$wp_fonts = new WP_Fonts();
-		// Register all font families and their variations.
-		foreach ( $inputs as $input_font_family => $variations ) {
-			$handle = $wp_fonts->add_font_family( $input_font_family );
-			foreach ( $variations as $variation_handle => $variation ) {
-				if ( ! is_string( $variation_handle ) ) {
-					$variation_handle = '';
-				}
-				$wp_fonts->add_variation( $handle, $variation, $variation_handle );
-			}
-		}
-		// Test the before state, just to make sure.
-		$this->assertArrayHasKey( $font_family, $wp_fonts->registered, 'Registered queue should contain the font family before remove' );
-		$this->assertSame( $registered_handles, array_keys( $wp_fonts->registered ), 'Font family and variations should be registered before remove' );
-
-		$wp_fonts->remove_font_family( $font_family );
-
-		$this->assertArrayNotHasKey( $font_family, $wp_fonts->registered, 'Registered queue should not contain the font family' );
-		$this->assertSame( $expected, array_keys( $wp_fonts->registered ), 'Registered queue should match after removing font family' );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFonts/removeVariation.php b/phpunit/tests/fonts-api/wpFonts/removeVariation.php
deleted file mode 100644
index 508c8ce264d8f..0000000000000
--- a/phpunit/tests/fonts-api/wpFonts/removeVariation.php
+++ /dev/null
@@ -1,278 +0,0 @@
-<?php
-/**
- * WP_Fonts::remove_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @group  remove_fonts
- * @covers WP_Fonts::remove_variation
- */
-class Tests_Fonts_WpFonts_RemoveVariation extends WP_Fonts_TestCase {
-	private $wp_fonts;
-	private $fonts_to_register = array();
-
-	public function set_up() {
-		parent::set_up();
-		$this->wp_fonts          = new WP_Fonts();
-		$this->fonts_to_register = $this->get_registered_local_fonts();
-	}
-
-	/**
-	 * Sets up the unit test by mocking the WP_Dependencies object using stdClass and
-	 * registering each font family directly to the WP_Fonts::$registered property
-	 * and its variations to the mocked $deps property.
-	 */
-	private function setup_unit_test() {
-		$this->setup_registration_mocks( $this->fonts_to_register, $this->wp_fonts );
-	}
-
-	/**
-	 * Sets up the integration test by properly registering each font family and its variations
-	 * by using the WP_Fonts::add() and WP_Fonts::add_variation() methods.
-	 */
-	private function setup_integration_test() {
-		foreach ( $this->fonts_to_register as $font_family_handle => $variations ) {
-			$this->setup_register( $font_family_handle, $variations, $this->wp_fonts );
-		}
-	}
-
-	/**
-	 * Testing the test setup to ensure it works.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_mocked_setup( $font_family_handle, $variation_handle ) {
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be in the registered queue before removal' );
-		$this->assertContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should be in its font family deps before removal' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_should_do_nothing_when_variation_and_font_family_not_registered
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_unit_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_unit_test();
-		$registered_queue = $this->wp_fonts->registered;
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSame( $registered_queue, $this->wp_fonts->registered, 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_should_do_nothing_when_variation_and_font_family_not_registered
-	 *
-	 * @param string $font_family        Font family name.
-	 * @param string $font_family_handle Font family handle.
-	 * @param string $variation_handle   Variation handle to remove.
-	 */
-	public function test_should_do_nothing_when_variation_and_font_family_not_registered( $font_family, $font_family_handle, $variation_handle ) {
-		// Set up the test.
-		unset( $this->fonts_to_register[ $font_family ] );
-		$this->setup_integration_test();
-		$registered_queue = $this->wp_fonts->get_registered();
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $font_family_handle, $this->wp_fonts->registered, 'Font family should not be registered' );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertSameSets( $registered_queue, $this->wp_fonts->get_registered(), 'Registered queue should not have changed' );
-	}
-
-	/**
-	 * Data provider for testing removal of variations.
-	 *
-	 * @return array
-	 */
-	public function data_should_do_nothing_when_variation_and_font_family_not_registered() {
-		return array(
-			'Font with 1 variation'         => array(
-				'font_family'        => 'merriweather',
-				'font_family_handle' => 'merriweather',
-				'variation_handle'   => 'merriweather-200-900-normal',
-			),
-			'Font with multiple variations' => array(
-				'font_family'        => 'Source Serif Pro',
-				'font_family_handle' => 'source-serif-pro',
-				'variation_handle'   => 'Source Serif Pro-300-normal',
-			),
-		);
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_only_remove_from_font_family_deps_when_variation_not_in_queue( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_variation_from_registered( $variation_handle );
-
-		// Run the tests.
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variant should not be registered' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_registered_queue_though_font_family_not_registered( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-		$this->setup_remove_from_font_family_deps( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should not be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Unit test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_unit_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_unit_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Integration test.
-	 *
-	 * @dataProvider data_remove_variations
-	 *
-	 * @param string $font_family_handle Font family for the variation.
-	 * @param string $variation_handle   Variation handle to remove.
-	 * @param array  $expected           Expected results.
-	 */
-	public function test_should_remove_variation_from_queue_and_font_family_deps( $font_family_handle, $variation_handle, $expected ) {
-		// Set up the test.
-		$this->setup_integration_test();
-
-		$this->assertArrayHasKey( $variation_handle, array_flip( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Variation should be in its font family deps before removal' );
-
-		$this->wp_fonts->remove_variation( $font_family_handle, $variation_handle );
-
-		$this->assertArrayNotHasKey( $variation_handle, $this->wp_fonts->registered, 'Variation should be not be in registered queue' );
-		$this->assertNotContains( $variation_handle, $this->wp_fonts->registered[ $font_family_handle ]->deps, 'Variation should not be its font family deps' );
-		$this->assertSameSets( $expected['font_family_deps'], array_values( $this->wp_fonts->registered[ $font_family_handle ]->deps ), 'Only the tested variation handle should be removed from font family deps' );
-	}
-
-	/**
-	 * Remove the variation handle from the font family's deps.
-	 *
-	 * @param string $font_family_handle Font family.
-	 * @param string $variation_handle   The variation handle to remove.
-	 */
-	private function setup_remove_from_font_family_deps( $font_family_handle, $variation_handle ) {
-		foreach ( $this->wp_fonts->registered[ $font_family_handle ]->deps as $index => $vhandle ) {
-			if ( $variation_handle !== $vhandle ) {
-				continue;
-			}
-			unset( $this->wp_fonts->registered[ $font_family_handle ]->deps[ $index ] );
-			break;
-		}
-	}
-
-	/**
-	 * Removes the variation from the WP_Fonts::$registered queue.
-	 *
-	 * @param string $variation_handle The variation handle to remove.
-	 */
-	private function setup_remove_variation_from_registered( $variation_handle ) {
-		unset( $this->wp_fonts->registered[ $variation_handle ] );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsProviderLocal.php b/phpunit/tests/fonts-api/wpFontsProviderLocal.php
deleted file mode 100644
index f9319390c3b6b..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsProviderLocal.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-/**
- * WP_Fonts_Local_Provider tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fontsapi
- */
-class Tests_Fonts_WpFontsProviderLocal extends WP_UnitTestCase {
-	private $provider;
-	private $theme_root;
-	private $orig_theme_dir;
-
-	public function set_up() {
-		parent::set_up();
-
-		$this->provider = new WP_Fonts_Provider_Local();
-
-		$this->set_up_theme();
-	}
-
-	public function tear_down() {
-		// Restore the original theme directory setup.
-		$GLOBALS['wp_theme_directories'] = $this->orig_theme_dir;
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
-
-		parent::tear_down();
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::set_fonts
-	 */
-	public function test_set_fonts() {
-		$fonts = array(
-			'source-serif-pro-200-900-normal-local' => array(
-				'provider'     => 'local',
-				'font-family'  => 'Source Serif Pro',
-				'font-style'   => 'normal',
-				'font-weight'  => '200 900',
-				'font-stretch' => 'normal',
-				'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-			),
-			'source-serif-pro-200-900-italic-local' => array(
-				'provider'     => 'local',
-				'font-family'  => 'Source Serif Pro',
-				'font-style'   => 'italic',
-				'font-weight'  => '200 900',
-				'font-stretch' => 'normal',
-				'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-			),
-		);
-
-		$this->provider->set_fonts( $fonts );
-
-		$property = $this->get_fonts_property();
-		$this->assertSame( $fonts, $property->getValue( $this->provider ) );
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::get_css
-	 *
-	 * @dataProvider data_get_css_print_styles
-	 *
-	 * @param array  $fonts Prepared fonts (to store in WP_Fonts_Provider_Local::$fonts property).
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_get_css( array $fonts, $expected ) {
-		$property = $this->get_fonts_property();
-		$property->setValue( $this->provider, $fonts );
-
-		$this->assertSame( $expected['font-face-css'], $this->provider->get_css() );
-	}
-
-	/**
-	 * @covers WP_Fonts_Provider_Local::print_styles
-	 *
-	 * @dataProvider data_get_css_print_styles
-	 *
-	 * @param array  $fonts Prepared fonts (to store in WP_Fonts_Provider_Local::$fonts property).
-	 * @param string $expected Expected CSS.
-	 */
-	public function test_print_styles( array $fonts, $expected ) {
-		$property = $this->get_fonts_property();
-		$property->setValue( $this->provider, $fonts );
-
-		$expected_output = sprintf( $expected['style-element'], $expected['font-face-css'] );
-		$this->expectOutputString( $expected_output );
-		$this->provider->print_styles();
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_get_css_print_styles() {
-		return array(
-			'truetype format' => array(
-				'fonts'    => array(
-					'open-sans-bold-italic-local' => array(
-						'provider'    => 'local',
-						'font-family' => 'Open Sans',
-						'font-style'  => 'italic',
-						'font-weight' => 'bold',
-						'src'         => 'http://example.org/assets/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf',
-					),
-				),
-				'expected' => array(
-					'style-element' => "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					'font-face-css' => <<<CSS
-@font-face{font-family:"Open Sans";font-style:italic;font-weight:bold;src:url('http://example.org/assets/fonts/OpenSans-Italic-VariableFont_wdth,wght.ttf') format('truetype');}
-CSS
-					,
-				),
-			),
-			'woff2 format'    => array(
-				'fonts'    => array(
-					'source-serif-pro-200-900-normal-local' => array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'normal',
-						'font-weight'  => '200 900',
-						'font-stretch' => 'normal',
-						'src'          => 'http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					),
-					'source-serif-pro-400-900-italic-local' => array(
-						'provider'     => 'local',
-						'font-family'  => 'Source Serif Pro',
-						'font-style'   => 'italic',
-						'font-weight'  => '200 900',
-						'font-stretch' => 'normal',
-						'src'          => 'http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-					),
-				),
-				'expected' => array(
-					'style-element' => "<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-					'font-face-css' => <<<CSS
-@font-face{font-family:"Source Serif Pro";font-style:normal;font-weight:200 900;font-stretch:normal;src:url('http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2') format('woff2');}@font-face{font-family:"Source Serif Pro";font-style:italic;font-weight:200 900;font-stretch:normal;src:url('http://example.org/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2') format('woff2');}
-CSS
-
-					,
-				),
-			),
-		);
-	}
-
-	/**
-	 * Local `src` paths to need to be relative to the theme. This method sets up the
-	 * `wp-content/themes/` directory to ensure consistency when running tests.
-	 */
-	private function set_up_theme() {
-		$this->theme_root                = realpath( GUTENBERG_DIR_TESTDATA . '/themedir1' );
-		$this->orig_theme_dir            = $GLOBALS['wp_theme_directories'];
-		$GLOBALS['wp_theme_directories'] = array( $this->theme_root );
-
-		$theme_root_callback = function () {
-			return $this->theme_root;
-		};
-		add_filter( 'theme_root', $theme_root_callback );
-		add_filter( 'stylesheet_root', $theme_root_callback );
-		add_filter( 'template_root', $theme_root_callback );
-
-		// Clear caches.
-		wp_clean_themes_cache();
-		unset( $GLOBALS['wp_themes'] );
-	}
-
-	private function get_fonts_property() {
-		$property = new ReflectionProperty( $this->provider, 'fonts' );
-		$property->setAccessible( true );
-
-		return $property;
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php b/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php
deleted file mode 100644
index d6e45561e5e33..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/addMissingFontsToThemeJson.php
+++ /dev/null
@@ -1,252 +0,0 @@
-<?php
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * Test WP_Fonts_Resolver::add_missing_fonts_to_theme_json().
- *
- * @package WordPress
- * @subpackage Fonts API
- *
- * @since X.X.X
- * @group fontsapi
- * @covers WP_Fonts_Resolver::add_missing_fonts_to_theme_json
- */
-class Tests_Fonts_WPFontsResolver_AddMissingFontsToThemeJson extends WP_Fonts_TestCase {
-	const FONTS_THEME = 'fonts-block-theme';
-
-	/**
-	 * Cache of test themes' `theme.json` contents.
-	 *
-	 * @var array
-	 */
-	private static $theme_json_data = array();
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		$themes = array(
-			'block-theme',
-			'fonts-block-theme',
-		);
-		foreach ( $themes as $theme ) {
-			$file                            = self::$theme_root . "/{$theme}/theme.json";
-			self::$theme_json_data[ $theme ] = json_decode( file_get_contents( $file ), true );
-		}
-	}
-
-	/**
-	 * @dataProvider data_themes
-	 *
-	 * @param string $theme Theme to use.
-	 */
-	public function test_should_return_instance( $theme ) {
-		switch_theme( $theme );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertInstanceOf( WP_Theme_JSON_Gutenberg::class, $actual, 'Instance of WP_Theme_JSON_Gutenberg should be returned' );
-	}
-
-	/**
-	 * @dataProvider data_themes
-	 *
-	 * @param string $theme Theme to use.
-	 */
-	public function test_should_bail_out_when_no_registered_fonts( $theme ) {
-		switch_theme( $theme );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertEmpty( wp_fonts()->get_registered_font_families(), 'No fonts should be registered in Fonts API' );
-		$this->assertSame( $data, $actual, 'Same instance of WP_Theme_JSON_Gutenberg should be returned' );
-	}
-
-	/**
-	 * Data Provider.
-	 *
-	 * @return array
-	 */
-	public function data_themes() {
-		return array(
-			'no fonts defined'    => array( 'block-theme' ),
-			'no fonts registered' => array( static::FONTS_THEME ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_add_non_theme_json_fonts
-	 *
-	 * @param string $theme    Theme to use.
-	 * @param array  $fonts    Fonts to register.
-	 * @param array  $expected Expected fonts to be added.
-	 */
-	public function test_should_add_non_theme_json_fonts( $theme, $fonts, $expected ) {
-		switch_theme( static::FONTS_THEME );
-
-		// Register the fonts.
-		wp_register_fonts( $fonts );
-
-		$data   = new WP_Theme_JSON_Gutenberg( self::$theme_json_data[ $theme ] );
-		$actual = WP_Fonts_Resolver::add_missing_fonts_to_theme_json( $data );
-
-		$this->assertNotSame( $data, $actual, 'New instance of WP_Theme_JSON_Gutenberg should be returned' );
-		$actual_raw_data = $actual->get_raw_data();
-
-		$this->assertArrayHasKey( 'typography', $actual_raw_data['settings'] );
-		$this->assertArrayHasKey( 'fontFamilies', $actual_raw_data['settings']['typography'] );
-		$this->assertArrayHasKey( 'theme', $actual_raw_data['settings']['typography']['fontFamilies'] );
-
-		$this->assertContains(
-			$expected,
-			$actual_raw_data['settings']['typography']['fontFamilies']['theme'],
-			'Fonts should be added after running WP_Fonts_Resolver::add_missing_fonts_to_theme_json()'
-		);
-	}
-
-	/**
-	 * Data Provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_add_non_theme_json_fonts() {
-		$lato = array(
-			'Lato' => array(
-				array(
-					'font-family' => 'Lato',
-					'font-style'  => 'normal',
-					'font-weight' => '400',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-				),
-				array(
-					'font-family' => 'Lato',
-					'font-style'  => 'italic',
-					'font-weight' => '400',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-				),
-			),
-		);
-
-		$expected_lato = array(
-			'fontFamily' => 'Lato',
-			'name'       => 'Lato',
-			'slug'       => 'lato',
-			'fontFace'   => array(
-				'lato-400-normal' => array(
-					'origin'      => 'gutenberg_wp_fonts_api',
-					'provider'    => 'local',
-					'fontFamily'  => 'Lato',
-					'fontStyle'   => 'normal',
-					'fontWeight'  => '400',
-					'fontDisplay' => 'fallback',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-				),
-				'lato-400-italic' => array(
-					'origin'      => 'gutenberg_wp_fonts_api',
-					'provider'    => 'local',
-					'fontFamily'  => 'Lato',
-					'fontStyle'   => 'italic',
-					'fontWeight'  => '400',
-					'fontDisplay' => 'fallback',
-					'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-				),
-			),
-		);
-
-		return array(
-			'theme with no fonts defined'              => array(
-				'theme'    => 'block-theme',
-				'fonts'    => $lato,
-				'expected' => $expected_lato,
-			),
-			'theme with fonts: new fonts not in theme' => array(
-				'theme'    => static::FONTS_THEME,
-				'fonts'    => $lato,
-				'expected' => $expected_lato,
-			),
-
-			/*
-			 * @TODO Add these tests fixing https://github.com/WordPress/gutenberg/issues/50047.
-			 *
-			'theme with fonts: new variations registered' => array(
-				'theme'    => static::FONTS_THEME,
-				'fonts'    => array(
-					'DM Sans' => array(
-						'dm-sans-500-normal' => array(
-							'font-family' => 'DM Sans',
-							'font-style'  => 'normal',
-							'font-weight' => '500',
-							'src'         => 'https://example.com/tests/assets/fonts/dm-sans/DMSans-Medium.woff2',
-						),
-						'dm-sans-500-italic' => array(
-							'font-family' => 'DM Sans',
-							'font-style'  => 'italic',
-							'font-weight' => '500',
-							'src'         => 'https://example.com/tests/assets/fonts/dm-sans/DMSans-Medium.woff2',
-						),
-					),
-				),
-				'expected' => array(
-					'fontFace'   => array(
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '400',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Regular.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '400',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Regular-Italic.woff2' ),
-						),
-						'dm-sans-500-normal' => array(
-							'origin'      => 'gutenberg_wp_fonts_api',
-							'provider'    => 'local',
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '500',
-							'fontDisplay' => 'fallback',
-							'src'         => array( get_stylesheet_directory_uri() . 'assets/fonts/dm-sans/DMSans-Medium.woff2' ),
-						),
-						'dm-sans-500-italic' => array(
-							'origin'      => 'gutenberg_wp_fonts_api',
-							'provider'    => 'local',
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '500',
-							'fontDisplay' => 'fallback',
-							'src'         => array( get_stylesheet_directory_uri() . 'assets/fonts/dm-sans/DMSans-Medium-Italic.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'normal',
-							'fontWeight'  => '700',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Bold.woff2' ),
-						),
-						array(
-							'fontFamily'  => 'DM Sans',
-							'fontStretch' => 'normal',
-							'fontStyle'   => 'italic',
-							'fontWeight'  => '700',
-							'src'         => array( 'file:./assets/fonts/dm-sans/DMSans-Bold-Italic.woff2' ),
-						),
-					),
-					'fontFamily' => '"DM Sans", sans-serif',
-					'name'       => 'DM Sans',
-					'slug'       => 'dm-sans',
-				),
-			),
-			*/
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php b/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php
deleted file mode 100644
index 9ff01f1c3166c..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/enqueueUserSelectedFonts.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?php
-/**
- * WP_Fonts_Resolver::enqueue_user_selected_fonts() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers WP_Fonts_Resolver::enqueue_user_selected_fonts
- */
-class Tests_Fonts_WpFontsResolver_EnqueueUserSelectedFonts extends WP_Fonts_TestCase {
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		self::$administrator_id = self::factory()->user->create(
-			array(
-				'role'       => 'administrator',
-				'user_email' => 'administrator@example.com',
-			)
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_enqueue_when_no_user_selected_fonts
-	 *
-	 * @param array $styles Optional. Test styles. Default empty array.
-	 */
-	public function test_should_not_enqueue_when_no_user_selected_fonts( $styles = array() ) {
-		$this->set_up_global_styles( $styles );
-
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->never() )
-			->method( 'enqueue' );
-
-		$expected = array();
-		$this->assertSame( $expected, WP_Fonts_Resolver::enqueue_user_selected_fonts() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_not_enqueue_when_no_user_selected_fonts() {
-		return array(
-			'no user-selected styles' => array(),
-			'invalid element'         => array(
-				array(
-					'elements' => array(
-						'invalid' => array(
-							'typography' => array(
-								'fontFamily' => 'var:preset|font-family|font1',
-								'fontStyle'  => 'normal',
-								'fontWeight' => '400',
-							),
-						),
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_enqueue_when_user_selected_fonts
-	 *
-	 * @param array $styles   Test styles.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_enqueue_when_user_selected_fonts( $styles, $expected ) {
-		$mock = $this->set_up_mock( 'enqueue' );
-		$mock->expects( $this->once() )
-			->method( 'enqueue' )
-			->with(
-				$this->identicalTo( $expected )
-			);
-
-		$this->set_up_global_styles( $styles );
-
-		$this->assertSameSets( $expected, WP_Fonts_Resolver::enqueue_user_selected_fonts() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_enqueue_when_user_selected_fonts() {
-		$global_styles = $this->get_mock_user_selected_fonts_global_styles();
-
-		return array(
-			'heading, caption, text'   => array(
-				'styles'   => $global_styles['font1'],
-				'expected' => array( 'font1' ),
-			),
-			'heading, button'          => array(
-				'styles'   => $global_styles['font2'],
-				'expected' => array( 'font2' ),
-			),
-			'text'                     => array(
-				'styles'   => $global_styles['font3'],
-				'expected' => array( 'font3' ),
-			),
-			'all'                      => array(
-				'styles'   => $global_styles['all'],
-				'expected' => array(
-					0 => 'font1',
-					// font1 occurs 2 more times and gets removed as duplicates.
-					3 => 'font2',
-					4 => 'font3',
-				),
-			),
-			'all with invalid element' => array(
-				'styles'   => $global_styles['all with invalid element'],
-				'expected' => array(
-					0 => 'font1',
-					// font1 occurs 2 more times and gets removed as duplicates.
-					3 => 'font2',
-					// Skips font2 for the "invalid" element.
-					4 => 'font3',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php b/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php
deleted file mode 100644
index 0186dbf34f3fd..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsResolver/registerFontsFromThemeJson.php
+++ /dev/null
@@ -1,297 +0,0 @@
-<?php
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * Test WP_Fonts_Resolver::register_fonts_from_theme_json().
- *
- * @package WordPress
- * @subpackage Fonts API
- *
- * @since X.X.X
- * @group fontsapi
- * @covers WP_Fonts_Resolver::register_fonts_from_theme_json
- */
-class Tests_Fonts_WPFontsResolver_RegisterFontsFromThemeJson extends WP_Fonts_TestCase {
-	const FONTS_THEME   = 'fonts-block-theme';
-	const FONT_FAMILIES = array(
-		'fonts-block-theme' => array(
-			// From theme.json.
-			'dm-sans',
-			'source-serif-pro',
-			// From style variation.
-			'open-sans',
-		),
-	);
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-	}
-
-	public function test_should_bails_out_when_no_fonts_defined() {
-		switch_theme( 'block-theme' );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$this->assertEmpty( $wp_fonts->get_registered() );
-		$this->assertEmpty( $wp_fonts->get_enqueued() );
-	}
-
-	public function test_should_register_and_enqueue_style_variation_fonts() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$this->assertContains( 'open-sans', $wp_fonts->get_registered_font_families(), 'Font families should be registered' );
-		$this->assertContains( 'open-sans', $wp_fonts->get_enqueued(), 'Font families should be enqueued' );
-	}
-
-	/**
-	 * Tests all font families are registered and enqueued. "All" means all font families from
-	 * the theme's theme.json and within the style variations.
-	 */
-	public function test_should_register_and_enqueue_all_defined_font_families() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		$expected = static::FONT_FAMILIES[ static::FONTS_THEME ];
-		$this->assertSameSetsWithIndex( $expected, $wp_fonts->get_registered_font_families(), 'Font families should be registered' );
-		$this->assertSameSetsWithIndex( $expected, $wp_fonts->get_enqueued(), 'Font families should be enqueued' );
-	}
-
-	/**
-	 * Test ensures duplicate fonts and variations in the style variations
-	 * are not re-registered.
-	 *
-	 * The Dm Sans fonts are duplicated in the theme's /styles/variations-duplicate-fonts.json.
-	 */
-	public function test_should_not_reregister_duplicate_fonts_from_style_variations() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-		$wp_fonts = wp_fonts();
-
-		// Font families are not duplicated.
-		$this->assertSameSetsWithIndex(
-			static::FONT_FAMILIES[ static::FONTS_THEME ],
-			$wp_fonts->get_registered_font_families(),
-			'Font families should not be duplicated'
-		);
-
-		// Font variations are not duplicated.
-		$this->assertSameSets(
-			array(
-				// From theme.json.
-				'dm-sans',
-				'dm-sans-400-normal',
-				'dm-sans-400-italic',
-				'dm-sans-700-normal',
-				'dm-sans-700-italic',
-				'source-serif-pro',
-				'source-serif-pro-200-900-normal',
-				'source-serif-pro-200-900-italic',
-				// From style variation.
-				'open-sans',
-				'open-sans-400-normal',
-				'open-sans-400-italic',
-				'dm-sans-500-normal',
-				'dm-sans-500-italic',
-			),
-			$wp_fonts->get_registered(),
-			'Font families and their variations should not be duplicated'
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_replace_src_file_placeholder
-	 *
-	 * @param string $handle   Variation's handle.
-	 * @param string $expected Expected src.
-	 */
-	public function test_should_replace_src_file_placeholder( $handle, $expected ) {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		$variation = wp_fonts()->registered[ $handle ];
-		$actual    = array_pop( $variation->src );
-		$expected  = get_stylesheet_directory_uri() . $expected;
-
-		$this->assertStringNotContainsString( 'file:./', $actual, 'Font src should not contain the "file:./" placeholder' );
-		$this->assertSame( $expected, $actual, 'Font src should be an URL to its file' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_replace_src_file_placeholder() {
-		return array(
-			// Theme's theme.json.
-			'DM Sans: 400 normal'                          => array(
-				'handle'   => 'dm-sans-400-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Regular.woff2',
-			),
-			'DM Sans: 400 italic'                          => array(
-				'handle'   => 'dm-sans-400-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Regular-Italic.woff2',
-			),
-			'DM Sans: 700 normal'                          => array(
-				'handle'   => 'dm-sans-700-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Bold.woff2',
-			),
-			'DM Sans: 700 italic'                          => array(
-				'handle'   => 'dm-sans-700-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Bold-Italic.woff2',
-			),
-			'Source Serif Pro: 200-900 normal'             => array(
-				'handle'   => 'source-serif-pro-200-900-normal',
-				'expected' => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-			),
-			'Source Serif Pro: 200-900 italic'             => array(
-				'handle'   => 'source-serif-pro-200-900-italic',
-				'expected' => '/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-			),
-
-			// Style Variation: variation-with-new-font-family.json.
-			'Style Variation: new font-family'             => array(
-				'handle'   => 'open-sans-400-normal',
-				'expected' => '/assets/fonts/open-sans/OpenSans-VariableFont_wdth,wght.tff',
-			),
-			'Style Variation: new font-family italic variation' => array(
-				'handle'   => 'open-sans-400-italic',
-				'expected' => '/assets/fonts/open-sans/OpenSans-Italic-VariableFont_wdth,wght.tff',
-			),
-
-			// Style Variation: variation-with-new-variation.json.
-			'Style Variation: new medium variation'        => array(
-				'handle'   => 'dm-sans-500-normal',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Medium.woff2',
-			),
-			'Style Variation: new medium italic variation' => array(
-				'handle'   => 'dm-sans-500-italic',
-				'expected' => '/assets/fonts/dm-sans/DMSans-Medium-Italic.woff2',
-			),
-		);
-	}
-
-	public function test_should_convert_font_face_properties_into_kebab_case() {
-		switch_theme( static::FONTS_THEME );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		// Testing only one variation since this theme's fonts use the same properties.
-		$variation         = wp_fonts()->registered['dm-sans-400-normal'];
-		$actual_properties = $variation->extra['font-properties'];
-
-		$this->assertArrayHasKey( 'font-family', $actual_properties, 'fontFamily should have been converted into font-family' );
-		$this->assertArrayNotHasKey( 'fontFamily', $actual_properties, 'fontFamily should not exist.' );
-		$this->assertArrayHasKey( 'font-stretch', $actual_properties, 'fontStretch should have been converted into font-stretch' );
-		$this->assertArrayNotHasKey( 'fontStretch', $actual_properties, 'fontStretch should not exist' );
-		$this->assertArrayHasKey( 'font-style', $actual_properties, 'fontStyle should have been converted into font-style' );
-		$this->assertArrayNotHasKey( 'fontStyle', $actual_properties, 'fontStyle should not exist.' );
-		$this->assertArrayHasKey( 'font-weight', $actual_properties, 'fontWeight should have been converted into font-weight' );
-		$this->assertArrayNotHasKey( 'fontWeight', $actual_properties, 'fontWeight should not exist' );
-	}
-
-	/**
-	 * Tests that WP_Fonts_Resolver::register_fonts_from_theme_json() skips fonts that are already registered
-	 * in the Fonts API. How does it do that? Using the 'origin' property when checking each variation.
-	 * This property is added when WP_Theme_JSON_Resolver_Gutenberg::get_merged_data() runs.
-	 *
-	 * To simulate this scenario, a font is registered first, but not enqueued. Then after running,
-	 * it checks if the WP_Fonts_Resolver::register_fonts_from_theme_json() enqueued the font. If no, then
-	 * it was skipped as expected.
-	 */
-	public function test_should_skip_registered_fonts() {
-		switch_theme( static::FONTS_THEME );
-
-		// Register Lato font.
-		wp_register_fonts(
-			array(
-				'Lato' => array(
-					array(
-						'font-family' => 'Lato',
-						'font-style'  => 'normal',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular.woff2',
-					),
-					array(
-						'font-family' => 'Lato',
-						'font-style'  => 'italic',
-						'font-weight' => '400',
-						'src'         => 'https://example.com/tests/assets/fonts/lato/Lato-Regular-Italic.woff2',
-					),
-				),
-			)
-		);
-
-		// Pre-check to ensure no fonts are enqueued.
-		$this->assertEmpty( wp_fonts()->get_enqueued(), 'No fonts should be enqueued before running WP_Fonts_Resolver::register_fonts_from_theme_json()' );
-
-		/*
-		 * When this function runs, it invokes WP_Theme_JSON_Resolver_Gutenberg::get_merged_data(),
-		 * which will include the Lato fonts with a 'origin' property set in each variation.
-		 */
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		$actual_enqueued_fonts = wp_fonts()->get_enqueued();
-
-		$this->assertNotContains( 'lato', $actual_enqueued_fonts, 'Lato font-family should not be enqueued' );
-		$this->assertSameSets( static::FONT_FAMILIES[ static::FONTS_THEME ], $actual_enqueued_fonts, 'Only the theme font families should be enqueued' );
-	}
-
-	public function test_should_skip_when_font_face_not_defined() {
-		switch_theme( static::FONTS_THEME );
-		$expected_font_family = 'source-serif-pro';
-
-		/**
-		 * Callback that removes the 'fontFace' of the expected font family from the theme's theme.json data.
-		 * This callback is invoked at the start of WP_Fonts_Resolver::register_fonts_from_theme_json() before processing
-		 * within that function. How? It's in the call stack of WP_Theme_JSON_Resolver_Gutenberg::get_merged_data().
-		 *
-		 * @param WP_Theme_JSON_Data_Gutenberg| WP_Theme_JSON_Data $theme_json_data Instance of the Data object.
-		 * @return WP_Theme_JSON_Data_Gutenberg| WP_Theme_JSON_Data Modified instance.
-		 * @throws ReflectionException
-		 */
-		$remove_expected_font_family = static function ( $theme_json_data ) use ( $expected_font_family ) {
-			// Need to get the underlying data array which is in WP_Theme_JSON_Gutenberg | WP_Theme_JSON object.
-			$property = new ReflectionProperty( $theme_json_data, 'theme_json' );
-			$property->setAccessible( true );
-			$theme_json_object = $property->getValue( $theme_json_data );
-
-			$property = new ReflectionProperty( $theme_json_object, 'theme_json' );
-			$property->setAccessible( true );
-			$data = $property->getValue( $theme_json_object );
-
-			// Loop through the fonts to find the expected font-family to modify.
-			foreach ( $data['settings']['typography']['fontFamilies']['theme'] as $index => $definitions ) {
-				if ( $expected_font_family !== $definitions['slug'] ) {
-					continue;
-				}
-
-				// Remove the 'fontFace' element, which removes the font's variations.
-				unset( $data['settings']['typography']['fontFamilies']['theme'][ $index ]['fontFace'] );
-				break;
-			}
-
-			$theme_json_data->update_with( $data );
-
-			return $theme_json_data;
-		};
-		add_filter( 'wp_theme_json_data_theme', $remove_expected_font_family );
-
-		WP_Fonts_Resolver::register_fonts_from_theme_json();
-
-		remove_filter( 'wp_theme_json_data_theme', $remove_expected_font_family );
-
-		$this->assertNotContains( $expected_font_family, wp_fonts()->get_registered_font_families() );
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php b/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php
deleted file mode 100644
index 19b2f15c826ed..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/convertFontFamilyIntoHandle.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::convert_font_family_into_handle() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::convert_font_family_into_handle
- */
-class Tests_Fonts_WpFontsUtils_ConvertFontFamilyIntoHandle extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_input
-	 *
-	 * @param mixed  $font_family Font family to test.
-	 * @param string $expected    Expected results.
-	 */
-	public function test_should_convert_with_valid_input( $font_family, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::convert_font_family_into_handle( $font_family ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_input() {
-		return array(
-			'font family single word name'               => array(
-				'font_family' => 'Merriweather',
-				'expected'    => 'merriweather',
-			),
-			'font family multiword name'                 => array(
-				'font_family' => 'Source Sans Pro',
-				'expected'    => 'source-sans-pro',
-			),
-			'font family handle delimited by hyphens'    => array(
-				'font_family' => 'source-serif-pro',
-				'expected'    => 'source-serif-pro',
-			),
-			'font family handle delimited by underscore' => array(
-				'font_family' => 'source_serif_pro',
-				'expected'    => 'source_serif_pro',
-			),
-			'font family handle delimited by hyphens and underscore' => array(
-				'font_family' => 'my-custom_font_family',
-				'expected'    => 'my-custom_font_family',
-			),
-			'font family handle delimited mixture'       => array(
-				'font_family' => 'My custom_font-family',
-				'expected'    => 'my-custom_font-family',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @covers WP_Fonts_Utils::convert_font_family_into_handle
-	 *
-	 * @param mixed $invalid_input Invalid input.
-	 */
-	public function test_should_not_convert_with_invalid_input( $invalid_input ) {
-		$this->assertNull( WP_Fonts_Utils::convert_font_family_into_handle( $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'empty string'                    => array( '' ),
-			'integer'                         => array( 10 ),
-			'font family wrapped in an array' => array( array( 'source-serif-pro' ) ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php b/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php
deleted file mode 100644
index 9268aac8ce372..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/convertVariationIntoHandle.php
+++ /dev/null
@@ -1,122 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::convert_variation_into_handle() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::convert_variation_into_handle
- */
-class Tests_Fonts_WpFontsUtils_ConvertVariationIntoHandle extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_input
-	 *
-	 * @param string $font_family Font family to test.
-	 * @param array  $variation   Variation to test.
-	 * @param string $expected    Expected results.
-	 */
-	public function test_should_convert_with_valid_inputs( $font_family, array $variation, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::convert_variation_into_handle( $font_family, $variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_input() {
-		return array(
-			'with only font-weight'                  => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => '400',
-				),
-				'expected'    => 'merriweather-400',
-			),
-			'with no font-style'                     => array(
-				'font_family' => 'source-sans-pro',
-				'variation'   => array(
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected'    => 'source-sans-pro-200-900',
-			),
-			'with font family name and full variant' => array(
-				'font_family' => 'source-sans-pro',
-				'variation'   => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'    => 'source-sans-pro-200-900-normal',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @param string $font_family   Font family to test.
-	 * @param array  $invalid_input Variation to test.
-	 */
-	public function tests_should_convert_with_invalid_input( $font_family, $invalid_input ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( 'Variant handle could not be determined as font-weight and/or font-style are require' );
-
-		$this->assertNull( WP_Fonts_Utils::convert_variation_into_handle( $font_family, $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'with no font-weight or font-style' => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'provider'     => 'local',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-			),
-			'with non-string font-weight'       => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => 400,
-				),
-			),
-			'with non-string font-style'        => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-style' => 0,
-				),
-			),
-			'with empty string font-weight'     => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-weight' => '',
-				),
-			),
-			'with empty string font-style'      => array(
-				'font_family' => 'merriweather',
-				'variation'   => array(
-					'font-style' => '',
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php b/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php
deleted file mode 100644
index 2b3e3689c4317..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/getFontFamilyFromVariation.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::get_font_family_from_variation() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::get_font_family_from_variation
- */
-class Tests_Fonts_WpFontsUtils_GetFontFamilyFromVariation extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_with_valid_variation
-	 *
-	 * @param array  $variation Variation to test.
-	 * @param string $expected  Expected results.
-	 */
-	public function test_with_valid_variation( array $variation, $expected ) {
-		$this->assertSame( $expected, WP_Fonts_Utils::get_font_family_from_variation( $variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_valid_variation() {
-		return array(
-			'keyed by font-family'                   => array(
-				'variation' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'  => 'Source Serif Pro',
-			),
-			'keyed by fontFamily and as a handle'    => array(
-				'variation' => array(
-					'fontFamily'  => 'source-sans-pro',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected'  => 'source-sans-pro',
-			),
-			'with font family name and full variant' => array(
-				'variation' => array(
-					'provider'     => 'local',
-					'font-family'  => 'Merriweather',
-					'font-style'   => 'normal',
-					'font-weight'  => '400 600',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/merriweather.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected'  => 'Merriweather',
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_with_invalid_input
-	 *
-	 * @param array  $invalid_variation Variation to test.
-	 * @param string $expected_message  Expected notice message.
-	 */
-	public function test_with_invalid_input( array $invalid_variation, $expected_message ) {
-		$this->expectNotice();
-		$this->expectNoticeMessage( $expected_message );
-
-		$this->assertNull( WP_Fonts_Utils::get_font_family_from_variation( $invalid_variation ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_with_invalid_input() {
-		return array(
-			'keyed with underscore'       => array(
-				'variation'        => array(
-					'provider'     => 'local',
-					'font_family'  => 'Source Serif Pro',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'keyed with space'            => array(
-				'variation'        => array(
-					'font family' => 'Source Sans Pro',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected_message' => 'Font family not found.',
-			),
-			'fontFamily => empty string'  => array(
-				'variation'        => array(
-					'fontFamily'  => '',
-					'font-weight' => '200 900',
-					'src'         => 'https://example.com/assets/fonts/source-sans-pro/source-sans-pro.ttf.woff2',
-					'provider'    => 'local',
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-			'font-family => empty string' => array(
-				'variation'        => array(
-					'provider'     => 'local',
-					'font-family'  => '',
-					'font-style'   => 'normal',
-					'font-weight'  => '200 900',
-					'font-stretch' => 'normal',
-					'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-					'font-display' => 'fallback',
-				),
-				'expected_message' => 'Font family not defined in the variation.',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php b/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php
deleted file mode 100644
index 3ae48ad52671a..0000000000000
--- a/phpunit/tests/fonts-api/wpFontsUtils/isDefined.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * WP_Fonts_Utils::is_defined() tests.
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once dirname( __DIR__ ) . '/base.php';
-
-/**
- * @group fontsapi
- * @covers WP_Fonts_Utils::is_defined
- */
-class Tests_Fonts_WpFontsUtils_IsDefined extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_when_defined
-	 *
-	 * @param mixed $input Input to test.
-	 */
-	public function test_should_return_true_when_defined( $input ) {
-		$this->assertTrue( WP_Fonts_Utils::is_defined( $input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_when_defined() {
-		return array(
-			'name: non empty string'   => array( 'Some Font Family' ),
-			'handle: non empty string' => array( 'some-font-family' ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_when_not_defined
-	 *
-	 * @param mixed $invalid_input Input to test.
-	 */
-	public function test_should_return_false_when_not_defined( $invalid_input ) {
-		$this->assertFalse( WP_Fonts_Utils::is_defined( $invalid_input ) );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_when_not_defined() {
-		return array(
-			'empty string'               => array( '' ),
-			'string 0'                   => array( '0' ),
-			'integer'                    => array( 10 ),
-			'name wrapped in an array'   => array( array( 'Some Font Family' ) ),
-			'handle wrapped in an array' => array( array( 'some-font-family' ) ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpPrintFonts.php b/phpunit/tests/fonts-api/wpPrintFonts.php
deleted file mode 100644
index 40b416aa56421..0000000000000
--- a/phpunit/tests/fonts-api/wpPrintFonts.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Unit and integration tests for wp_print_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_print_fonts
- */
-class Tests_Fonts_WpPrintFonts extends WP_Fonts_TestCase {
-
-	public static function set_up_before_class() {
-		self::$requires_switch_theme_fixtures = true;
-
-		parent::set_up_before_class();
-
-		static::set_up_admin_user();
-	}
-
-	public function test_should_return_empty_array_when_no_fonts_registered() {
-		$this->assertSame( array(), wp_print_fonts() );
-	}
-
-	/**
-	 * Unit test which mocks WP_Fonts methods.
-	 *
-	 * @dataProvider data_mocked_handles
-	 *
-	 * @param string|string[] $handles Handles to test.
-	 */
-	public function test_should_return_mocked_handles( $handles ) {
-		$mock = $this->set_up_mock( array( 'get_registered_font_families', 'do_items' ) );
-		$mock->expects( $this->once() )
-			->method( 'get_registered_font_families' )
-			->will( $this->returnValue( $handles ) );
-
-		$mock->expects( $this->once() )
-			->method( 'do_items' )
-			->with(
-				$this->identicalTo( $handles )
-			)
-			->will( $this->returnValue( $handles ) );
-
-		wp_print_fonts( $handles );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_mocked_handles() {
-		return array(
-			'font family'            => array(
-				array( 'my-custom-font' ),
-			),
-			'multiple font families' => array(
-				array(
-					'font1',
-					'font2',
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test that registers providers and fonts and then enqueues before
-	 * testing the printing functionality.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_enqueued( $setup, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$this->setup_integrated_deps( $setup, $wp_fonts );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = wp_print_fonts();
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * Integration test to validate printing given handles. Rather than mocking internal functionality,
-	 * it registers providers and fonts but does not enqueue.
-	 *
-	 * @dataProvider data_print_enqueued
-	 *
-	 * @param array  $setup           Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_handles_when_not_enqueued( $setup, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$this->setup_integrated_deps( $setup, $wp_fonts, false );
-		// Do not enqueue. Instead, pass the handles to wp_print_fonts().
-		$handles = $setup['enqueued'];
-		$this->assertEmpty( $wp_fonts->queue, 'No fonts should be enqueued' );
-
-		$this->expectOutputString( $expected_output );
-		$actual_done = wp_print_fonts( $handles );
-		$this->assertSameSets( $expected_done, $actual_done, 'Printed handles should match' );
-	}
-
-	/**
-	 * @dataProvider data_should_print_all_registered_fonts_for_iframed_editor
-	 *
-	 * @param string $fonts    Fonts to register.
-	 * @param array  $expected Expected results.
-	 */
-	public function test_should_print_all_registered_fonts_for_iframed_editor( $fonts, $expected ) {
-		wp_register_fonts( $fonts );
-
-		$this->expectOutputString( $expected['output'] );
-		$actual_done = wp_print_fonts( true );
-		$this->assertSameSets( $expected['done'], $actual_done, 'All registered font-family handles should be returned' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_print_all_registered_fonts_for_iframed_editor() {
-		$local_fonts = $this->get_registered_local_fonts();
-		$font_faces  = $this->get_registered_fonts_css();
-
-		return array(
-			'Merriweather with 1 variation'      => array(
-				'fonts'    => array( 'merriweather' => $local_fonts['merriweather'] ),
-				'expected' => array(
-					'done'   => array( 'merriweather', 'merriweather-200-900-normal' ),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal']
-					),
-				),
-			),
-			'Source Serif Pro with 2 variations' => array(
-				'fonts'    => array( 'Source Serif Pro' => $local_fonts['Source Serif Pro'] ),
-				'expected' => array(
-					'done'   => array( 'source-serif-pro', 'Source Serif Pro-300-normal', 'Source Serif Pro-900-italic' ),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s\n</style>\n",
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-			'all fonts'                          => array(
-				'fonts'    => $local_fonts,
-				'expected' => array(
-					'done'   => array(
-						'merriweather',
-						'merriweather-200-900-normal',
-						'source-serif-pro',
-						'Source Serif Pro-300-normal',
-						'Source Serif Pro-900-italic',
-					),
-					'output' => sprintf(
-						"<style id='wp-fonts-local' type='text/css'>\n%s%s%s\n</style>\n",
-						$font_faces['merriweather-200-900-normal'],
-						$font_faces['Source Serif Pro-300-normal'],
-						$font_faces['Source Serif Pro-900-italic']
-					),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Integration test for printing user-selected global fonts.
-	 * This test registers providers and fonts and then enqueues before testing the printing functionality.
-	 *
-	 * @dataProvider data_print_user_selected_fonts
-	 *
-	 * @param array  $global_styles   Test set up information for provider, fonts, and enqueued.
-	 * @param array  $expected_done   Expected array of printed handles.
-	 * @param string $expected_output Expected printed output.
-	 */
-	public function test_should_print_user_selected_fonts( $global_styles, $expected_done, $expected_output ) {
-		$wp_fonts = wp_fonts();
-
-		$setup = array(
-			'provider'      => array( 'mock' => $this->get_provider_definitions( 'mock' ) ),
-			'registered'    => $this->get_registered_mock_fonts(),
-			'global_styles' => $global_styles,
-		);
-		$this->setup_integrated_deps( $setup, $wp_fonts, false );
-
-		$this->expectOutputString( $expected_output );
-		$actual_printed_fonts = wp_print_fonts();
-		$this->assertSameSets( $expected_done, $actual_printed_fonts, 'Should print font-faces for given user-selected fonts' );
-	}
-
-
-	/**
-	 * Sets up the dependencies for integration test.
-	 *
-	 * @param array    $setup    Dependencies to set up.
-	 * @param WP_Fonts $wp_fonts Instance of WP_Fonts.
-	 * @param bool     $enqueue  Whether to enqueue. Default true.
-	 */
-	private function setup_integrated_deps( array $setup, $wp_fonts, $enqueue = true ) {
-		foreach ( $setup['provider'] as $provider ) {
-			$wp_fonts->register_provider( $provider['id'], $provider['class'] );
-		}
-		foreach ( $setup['registered'] as $handle => $variations ) {
-			$this->setup_register( $handle, $variations, $wp_fonts );
-		}
-
-		if ( $enqueue ) {
-			$wp_fonts->enqueue( $setup['enqueued'] );
-		}
-
-		if ( ! empty( $setup['global_styles'] ) ) {
-			$this->set_up_global_styles( $setup['global_styles'] );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpRegisterFontProvider.php b/phpunit/tests/fonts-api/wpRegisterFontProvider.php
deleted file mode 100644
index 907355bdc91c8..0000000000000
--- a/phpunit/tests/fonts-api/wpRegisterFontProvider.php
+++ /dev/null
@@ -1,95 +0,0 @@
-<?php
-/**
- * Unit tests for wp_register_font_provider().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-require_once GUTENBERG_DIR_TESTFIXTURES . '/mock-provider.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_register_font_provider
- */
-class Tests_Fonts_WpRegisterFontProvider extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_register_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_register_provider( $provider_id, $class_name ) {
-		$mock = $this->set_up_mock( 'register_provider' );
-		$mock->expects( $this->once() )
-			->method( 'register_provider' )
-			->with(
-				$this->identicalTo( $provider_id ),
-				$this->identicalTo( $class_name )
-			)
-			->will( $this->returnValue( true ) );
-
-		$this->assertTrue( wp_register_font_provider( $provider_id, $class_name ), 'wp_register_font_provider() should return true' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_register_providers() {
-		return array(
-			'mock'  => array(
-				'provider_id' => 'mock',
-				'class'       => Mock_Provider::class,
-			),
-			'local' => array(
-				'provider_id' => 'local',
-				'class'       => WP_Fonts_Provider_Local::class,
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_invalid_providers
-	 *
-	 * @param string $provider_id Provider ID.
-	 * @param string $class_name  Provider class name.
-	 */
-	public function test_should_not_register( $provider_id, $class_name ) {
-		$mock = $this->set_up_mock( 'register_provider' );
-		$mock->expects( $this->once() )
-			->method( 'register_provider' )
-			->with(
-				$this->identicalTo( $provider_id ),
-				$this->identicalTo( $class_name )
-			)
-			->will( $this->returnValue( false ) );
-
-		$this->assertFalse( wp_register_font_provider( $provider_id, $class_name ), 'wp_register_font_provider() should return false' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_invalid_providers() {
-		return array(
-			'provider_id is empty' => array(
-				'provider_id' => '',
-				'class'       => Mock_Provider::class,
-			),
-			'class is empty'       => array(
-				'provider_id' => 'local',
-				'class'       => '',
-			),
-			'class does not exist' => array(
-				'provider_id' => 'doesnotexist',
-				'class'       => 'Provider_Does_Not_Exist',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts-api/wpRegisterFonts.php b/phpunit/tests/fonts-api/wpRegisterFonts.php
deleted file mode 100644
index c57c1406a6cac..0000000000000
--- a/phpunit/tests/fonts-api/wpRegisterFonts.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * Integration tests for wp_register_fonts().
- *
- * @package    WordPress
- * @subpackage Fonts API
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group  fontsapi
- * @covers ::wp_register_fonts
- * @covers WP_Fonts::add
- * @covers WP_Fonts::add_variation
- */
-class Tests_Fonts_WpRegisterFonts extends WP_Fonts_TestCase {
-
-	/**
-	 * @dataProvider data_fonts
-	 *
-	 * @param array $fonts Array of fonts to test.
-	 * @param array $expected Expected results.
-	 */
-	public function test_should_register( array $fonts, array $expected ) {
-		$actual = wp_register_fonts( $fonts );
-		$this->assertSame( $expected['wp_register_fonts'], $actual, 'Font family handle(s) should be returned' );
-		$this->assertSame( $expected['get_registered'], $this->get_registered_handles(), 'Web fonts should match registered queue' );
-	}
-
-	/**
-	 * @dataProvider data_fonts
-	 *
-	 * @param array $fonts Array of fonts to test.
-	 */
-	public function test_should_not_enqueue_on_registration( array $fonts ) {
-		wp_register_fonts( $fonts );
-		$this->assertEmpty( $this->get_enqueued_handles() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_fonts() {
-		return array(
-			'font family keyed with slug' => array(
-				'fonts'    => array(
-					'source-serif-pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'expected' => array(
-					'wp_register_fonts' => array( 'source-serif-pro' ),
-					'get_registered'    => array(
-						'source-serif-pro',
-						'source-serif-pro-200-900-normal',
-					),
-				),
-			),
-			'font family keyed with name' => array(
-				'fonts'    => array(
-					'Source Serif Pro' => array(
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'normal',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Roman.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-						array(
-							'provider'     => 'local',
-							'font-family'  => 'Source Serif Pro',
-							'font-style'   => 'italic',
-							'font-weight'  => '200 900',
-							'font-stretch' => 'normal',
-							'src'          => 'https://example.com/assets/fonts/source-serif-pro/SourceSerif4Variable-Italic.ttf.woff2',
-							'font-display' => 'fallback',
-						),
-					),
-				),
-				'expected' => array(
-					'wp_register_fonts' => array( 'source-serif-pro' ),
-					'get_registered'    => array(
-						'source-serif-pro',
-						'source-serif-pro-200-900-normal',
-						'source-serif-pro-200-900-italic',
-					),
-				),
-			),
-		);
-	}
-}

From cf3dbbcaf3b9839a77e281c82dc2f841f7342d08 Mon Sep 17 00:00:00 2001
From: Brian Coords <bacoords@gmail.com>
Date: Mon, 22 Jan 2024 22:33:11 -0800
Subject: [PATCH 204/296] Docs: prefixes all php filters with wpdocs_ (#53914)

---
 docs/reference-guides/filters/block-filters.md   | 16 ++++++++--------
 docs/reference-guides/filters/editor-filters.md  |  8 ++++----
 .../filters/global-styles-filters.md             |  4 ++--
 docs/reference-guides/filters/parser-filters.md  |  4 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/docs/reference-guides/filters/block-filters.md b/docs/reference-guides/filters/block-filters.md
index 4c7e3df7cec12..7e164a10e6c93 100644
--- a/docs/reference-guides/filters/block-filters.md
+++ b/docs/reference-guides/filters/block-filters.md
@@ -19,11 +19,11 @@ _Example_:
 ```php
 <?php
 
-function filter_metadata_registration( $metadata ) {
+function wpdocs_filter_metadata_registration( $metadata ) {
 	$metadata['apiVersion'] = 1;
 	return $metadata;
 };
-add_filter( 'block_type_metadata', 'filter_metadata_registration' );
+add_filter( 'block_type_metadata', 'wpdocs_filter_metadata_registration' );
 
 register_block_type( __DIR__ );
 ```
@@ -40,11 +40,11 @@ The filter takes two params:
 _Example:_
 
 ```php
-function filter_metadata_registration( $settings, $metadata ) {
+function wpdocs_filter_metadata_registration( $settings, $metadata ) {
 	$settings['api_version'] = $metadata['apiVersion'] + 1;
 	return $settings;
 };
-add_filter( 'block_type_metadata_settings', 'filter_metadata_registration', 10, 2 );
+add_filter( 'block_type_metadata_settings', 'wpdocs_filter_metadata_registration', 10, 2 );
 
 register_block_type( __DIR__ );
 ```
@@ -352,14 +352,14 @@ On the server, you can filter the list of blocks shown in the inserter using the
 <?php
 // my-plugin.php
 
-function filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
+function wpdocs_filter_allowed_block_types_when_post_provided( $allowed_block_types, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		return array( 'core/paragraph', 'core/heading' );
 	}
 	return $allowed_block_types;
 }
 
-add_filter( 'allowed_block_types_all', 'filter_allowed_block_types_when_post_provided', 10, 2 );
+add_filter( 'allowed_block_types_all', 'wpdocs_filter_allowed_block_types_when_post_provided', 10, 2 );
 ```
 
 ## Managing block categories
@@ -374,7 +374,7 @@ It is possible to filter the list of default block categories using the `block_c
 <?php
 // my-plugin.php
 
-function filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
+function wpdocs_filter_block_categories_when_post_provided( $block_categories, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push(
 			$block_categories,
@@ -388,7 +388,7 @@ function filter_block_categories_when_post_provided( $block_categories, $editor_
 	return $block_categories;
 }
 
-add_filter( 'block_categories_all', 'filter_block_categories_when_post_provided', 10, 2 );
+add_filter( 'block_categories_all', 'wpdocs_filter_block_categories_when_post_provided', 10, 2 );
 ```
 
 ### `wp.blocks.updateCategory`
diff --git a/docs/reference-guides/filters/editor-filters.md b/docs/reference-guides/filters/editor-filters.md
index 59f6d7ef8213f..943e161a1df49 100644
--- a/docs/reference-guides/filters/editor-filters.md
+++ b/docs/reference-guides/filters/editor-filters.md
@@ -84,14 +84,14 @@ _Example:_
 <?php
 // my-plugin.php
 
-function filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
+function wpdocs_filter_block_editor_settings_when_post_provided( $editor_settings, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		$editor_settings['maxUploadFileSize'] = 12345;
 	}
 	return $editor_settings;
 }
 
-add_filter( 'block_editor_settings_all', 'filter_block_editor_settings_when_post_provided', 10, 2 );
+add_filter( 'block_editor_settings_all', 'wpdocs_filter_block_editor_settings_when_post_provided', 10, 2 );
 ```
 
 #### `block_editor_rest_api_preload_paths`
@@ -104,14 +104,14 @@ _Example:_
 <?php
 // my-plugin.php
 
-function filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
+function wpdocs_filter_block_editor_rest_api_preload_paths_when_post_provided( $preload_paths, $editor_context ) {
 	if ( ! empty( $editor_context->post ) ) {
 		array_push( $preload_paths, array( '/wp/v2/blocks', 'OPTIONS' ) );
 	}
 	return $preload_paths;
 }
 
-add_filter( 'block_editor_rest_api_preload_paths', 'filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
+add_filter( 'block_editor_rest_api_preload_paths', 'wpdocs_filter_block_editor_rest_api_preload_paths_when_post_provided', 10, 2 );
 ```
 
 ### Available default editor settings
diff --git a/docs/reference-guides/filters/global-styles-filters.md b/docs/reference-guides/filters/global-styles-filters.md
index 7d3b6be95768b..59bbbfcd5921d 100644
--- a/docs/reference-guides/filters/global-styles-filters.md
+++ b/docs/reference-guides/filters/global-styles-filters.md
@@ -14,7 +14,7 @@ _Example:_
 This is how to pass a new color palette for the theme and disable the text color UI:
 
 ```php
-function filter_theme_json_theme( $theme_json ){
+function wpdocs_filter_theme_json_theme( $theme_json ){
 	$new_data = array(
 		'version'  => 2,
 		'settings' => array(
@@ -38,5 +38,5 @@ function filter_theme_json_theme( $theme_json ){
 
 	return $theme_json->update_with( $new_data );
 }
-add_filter( 'wp_theme_json_data_theme', 'filter_theme_json_theme' );
+add_filter( 'wp_theme_json_data_theme', 'wpdocs_filter_theme_json_theme' );
 ```
diff --git a/docs/reference-guides/filters/parser-filters.md b/docs/reference-guides/filters/parser-filters.md
index 3acfb2489182d..7adc68cc0bf7e 100644
--- a/docs/reference-guides/filters/parser-filters.md
+++ b/docs/reference-guides/filters/parser-filters.md
@@ -26,11 +26,11 @@ class EmptyParser {
   }
 }
 
-function my_plugin_select_empty_parser( $prev_parser_class ) {
+function wpdocs_select_empty_parser( $prev_parser_class ) {
     return 'EmptyParser';
 }
 
-add_filter( 'block_parser_class', 'my_plugin_select_empty_parser', 10, 1 );
+add_filter( 'block_parser_class', 'wpdocs_select_empty_parser', 10, 1 );
 ```
 
 > **Note**: At the present time it's not possible to replace the client-side parser.

From 38f8eaa3aa1472a73419edb3d192035b1759613f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 23 Jan 2024 08:40:27 +0100
Subject: [PATCH 205/296] DataViews: revert list view as default for templates
 (#58079)

* Revert "DataViews: use table layout for templates when experiment disabled (#57960)"

This reverts commit e67f6fc22fecfd41b50b0d1fcab90e825bc493bd.

* Revert list layout as default for templates

* Make table layout the default, even with the experiment active

* Revert changes to init edited entity
---
 .../edit-site/src/components/layout/router.js |  9 ++++----
 .../src/components/page-templates/index.js    | 15 +------------
 .../edit-site/src/components/sidebar/index.js |  6 +----
 .../use-init-edited-entity-from-url.js        |  6 +----
 .../edit-site/src/utils/get-is-list-page.js   |  1 -
 .../site-editor/new-templates-list.spec.js    | 22 +++----------------
 6 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
index 3f9a8be7f82de..f91de7767f5bd 100644
--- a/packages/edit-site/src/components/layout/router.js
+++ b/packages/edit-site/src/components/layout/router.js
@@ -55,12 +55,11 @@ export default function useLayoutAreas() {
 	}
 
 	// Templates
-	if (
-		path === '/wp_template/all' ||
-		( path === '/wp_template' && window?.__experimentalAdminViews )
-	) {
+	if ( path === '/wp_template/all' ) {
 		const isListLayout =
-			isCustom !== 'true' && ( ! layout || layout === 'list' );
+			isCustom !== 'true' &&
+			layout === 'list' &&
+			window?.__experimentalAdminViews;
 		return {
 			areas: {
 				content: <PageTemplates />,
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates/index.js
index 7deec674f9b41..7995ebe376b57 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates/index.js
@@ -75,7 +75,7 @@ const defaultConfigPerViewType = {
 };
 
 const DEFAULT_VIEW = {
-	type: window?.__experimentalAdminViews ? LAYOUT_LIST : LAYOUT_TABLE,
+	type: LAYOUT_TABLE,
 	search: '',
 	page: 1,
 	perPage: 20,
@@ -180,18 +180,6 @@ export default function DataviewsTemplates() {
 		[ history, params, view?.type ]
 	);
 
-	const onDetailsChange = useCallback(
-		( items ) => {
-			if ( items?.length === 1 ) {
-				history.push( {
-					postId: items[ 0 ].id,
-					postType: TEMPLATE_POST_TYPE,
-				} );
-			}
-		},
-		[ history ]
-	);
-
 	const authors = useMemo( () => {
 		if ( ! allTemplates ) {
 			return EMPTY_ARRAY;
@@ -390,7 +378,6 @@ export default function DataviewsTemplates() {
 				view={ view }
 				onChangeView={ onChangeView }
 				onSelectionChange={ onSelectionChange }
-				onDetailsChange={ onDetailsChange }
 				deferredRendering={ ! view.hiddenFields?.includes( 'preview' ) }
 			/>
 		</Page>
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 1d0be62982e87..73c6aea7e328c 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -76,11 +76,7 @@ function SidebarScreens() {
 				<SidebarNavigationScreenPage />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/:postType(wp_template)">
-				{ window?.__experimentalAdminViews ? (
-					<SidebarNavigationScreenTemplatesBrowse />
-				) : (
-					<SidebarNavigationScreenTemplates />
-				) }
+				<SidebarNavigationScreenTemplates />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/patterns">
 				<SidebarNavigationScreenPatterns />
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 11c065cf862db..4c2214b76abd3 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -207,11 +207,7 @@ function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 		return {};
 	}, [ homepageId, postType, postId, path ] );
 
-	if (
-		( path === '/wp_template/all' ||
-			( path === '/wp_template' && window?.__experimentalAdminViews ) ) &&
-		postId
-	) {
+	if ( path === '/wp_template/all' && postId ) {
 		return { isReady: true, postType: 'wp_template', postId, context };
 	}
 
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 3028b0e65d786..9530cd85bf04b 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -16,7 +16,6 @@ export default function getIsListPage(
 	return (
 		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
 		( path === '/page' && window?.__experimentalAdminViews ) ||
-		( path === '/wp_template' && window?.__experimentalAdminViews ) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.
diff --git a/test/e2e/specs/site-editor/new-templates-list.spec.js b/test/e2e/specs/site-editor/new-templates-list.spec.js
index 272a3ffff80bf..13484abcb13ad 100644
--- a/test/e2e/specs/site-editor/new-templates-list.spec.js
+++ b/test/e2e/specs/site-editor/new-templates-list.spec.js
@@ -18,11 +18,7 @@ test.describe( 'Templates', () => {
 		] );
 	} );
 	test( 'Sorting', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template' } );
-		// Switch to table layout.
-		await page.getByLabel( 'View options' ).click();
-		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
-		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
+		await admin.visitSiteEditor( { path: '/wp_template/all' } );
 		// Descending by title.
 		await page
 			.getByRole( 'button', { name: 'Template', exact: true } )
@@ -52,13 +48,7 @@ test.describe( 'Templates', () => {
 			title: 'Date Archives',
 			content: 'hi',
 		} );
-		await admin.visitSiteEditor( { path: '/wp_template' } );
-
-		// Switch to table layout.
-		await page.getByLabel( 'View options' ).click();
-		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
-		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
-
+		await admin.visitSiteEditor( { path: '/wp_template/all' } );
 		// Global search.
 		await page.getByRole( 'searchbox', { name: 'Filter list' } ).click();
 		await page.keyboard.type( 'tag' );
@@ -94,13 +84,7 @@ test.describe( 'Templates', () => {
 		await expect( titles ).toHaveCount( 2 );
 	} );
 	test( 'Field visibility', async ( { admin, page } ) => {
-		await admin.visitSiteEditor( { path: '/wp_template' } );
-
-		// Switch to table layout.
-		await page.getByLabel( 'View options' ).click();
-		await page.getByRole( 'menuitem', { name: 'Layout' } ).click();
-		await page.getByRole( 'menuitemradio', { name: 'Table' } ).click();
-
+		await admin.visitSiteEditor( { path: '/wp_template/all' } );
 		await page.getByRole( 'button', { name: 'Description' } ).click();
 		await page.getByRole( 'menuitem', { name: 'Hide' } ).click();
 		await expect(

From c6ac9c010551aed63a5e31f12b0796b08e941747 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Tue, 23 Jan 2024 16:49:32 +0800
Subject: [PATCH 206/296] Stabilize the pattern overrides block context
 (#58102)

* Add pattern/overrides context to individual block.json files

* Remove addition of block context usage via blocks supports

* Add overrides attribute to pattern block and share it via providesContext

* Revert "Add overrides attribute to pattern block and share it via providesContext"

This reverts commit aca9b906e676a16bfa117ebfaa406e9141b72817.

* Remove the experiment flag after reverting pattern block index.php changes

* Register overrides attribute in block.json
---
 docs/reference-guides/core-blocks.md          |  2 +-
 lib/block-supports/pattern.php                | 46 -------------------
 lib/load.php                                  |  1 -
 packages/block-library/src/block/block.json   |  3 ++
 packages/block-library/src/block/index.php    | 34 ++------------
 packages/block-library/src/button/block.json  |  1 +
 packages/block-library/src/heading/block.json |  1 +
 packages/block-library/src/image/block.json   |  7 ++-
 .../block-library/src/paragraph/block.json    |  2 +-
 9 files changed, 16 insertions(+), 81 deletions(-)
 delete mode 100644 lib/block-supports/pattern.php

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index bee68530eeb23..ab6bb52b6b3b2 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -42,7 +42,7 @@ Create and save content to reuse across your site. Update the pattern, and the c
 -	**Name:** core/block
 -	**Category:** reusable
 -	**Supports:** ~~customClassName~~, ~~html~~, ~~inserter~~, ~~renaming~~
--	**Attributes:** ref
+-	**Attributes:** overrides, ref
 
 ## Button
 
diff --git a/lib/block-supports/pattern.php b/lib/block-supports/pattern.php
deleted file mode 100644
index 0c5868c1fea0c..0000000000000
--- a/lib/block-supports/pattern.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Pattern block support flag.
- *
- * @package gutenberg
- */
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-	/**
-	 * Registers the overrides context for block types that support it.
-	 *
-	 * @param WP_Block_Type $block_type Block Type.
-	 */
-	function gutenberg_register_pattern_support( $block_type ) {
-		// Note that this should be a duplicate or a subset of the $allowed_blocks
-		// defined in the `process_block_bindings` function.
-		// It should also match the client side config defined in
-		// `packages/patterns/src/constants.js`.
-		$allowed_blocks  = array(
-			'core/paragraph' => array( 'content' ),
-			'core/heading'   => array( 'content' ),
-			'core/image'     => array( 'url', 'title', 'alt' ),
-			'core/button'    => array( 'url', 'text' ),
-		);
-		$pattern_support = array_key_exists( $block_type->name, $allowed_blocks );
-
-		if ( $pattern_support ) {
-			if ( ! $block_type->uses_context ) {
-				$block_type->uses_context = array();
-			}
-
-			if ( ! in_array( 'pattern/overrides', $block_type->uses_context, true ) ) {
-				$block_type->uses_context[] = 'pattern/overrides';
-			}
-		}
-	}
-
-	// Register the block support.
-	WP_Block_Supports::get_instance()->register(
-		'pattern',
-		array(
-			'register_attribute' => 'gutenberg_register_pattern_support',
-		)
-	);
-}
diff --git a/lib/load.php b/lib/load.php
index 37e4d61c36832..8c9c8532d573c 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -213,7 +213,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/block-supports/duotone.php';
 require __DIR__ . '/block-supports/shadow.php';
 require __DIR__ . '/block-supports/background.php';
-require __DIR__ . '/block-supports/pattern.php';
 
 // Data views.
 require_once __DIR__ . '/experimental/data-views.php';
diff --git a/packages/block-library/src/block/block.json b/packages/block-library/src/block/block.json
index aeccdbfc1051d..b30c865e57a7f 100644
--- a/packages/block-library/src/block/block.json
+++ b/packages/block-library/src/block/block.json
@@ -10,6 +10,9 @@
 	"attributes": {
 		"ref": {
 			"type": "number"
+		},
+		"overrides": {
+			"type": "object"
 		}
 	},
 	"supports": {
diff --git a/packages/block-library/src/block/index.php b/packages/block-library/src/block/index.php
index 54b54fad139ff..444001fa49859 100644
--- a/packages/block-library/src/block/index.php
+++ b/packages/block-library/src/block/index.php
@@ -46,17 +46,14 @@ function render_block_core_block( $attributes ) {
 	$content = $wp_embed->run_shortcode( $reusable_block->post_content );
 	$content = $wp_embed->autoembed( $content );
 
-	$gutenberg_experiments        = get_option( 'gutenberg-experiments' );
-	$has_partial_synced_overrides = $gutenberg_experiments
-		&& array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
-		&& isset( $attributes['overrides'] );
+	$has_pattern_overrides = isset( $attributes['overrides'] );
 
 	/**
 	 * We set the `pattern/overrides` context through the `render_block_context`
 	 * filter so that it is available when a pattern's inner blocks are
 	 * rendering via do_blocks given it only receives the inner content.
 	 */
-	if ( $has_partial_synced_overrides ) {
+	if ( $has_pattern_overrides ) {
 		$filter_block_context = static function ( $context ) use ( $attributes ) {
 			$context['pattern/overrides'] = $attributes['overrides'];
 			return $context;
@@ -67,7 +64,7 @@ function render_block_core_block( $attributes ) {
 	$content = do_blocks( $content );
 	unset( $seen_refs[ $attributes['ref'] ] );
 
-	if ( $has_partial_synced_overrides ) {
+	if ( $has_pattern_overrides ) {
 		remove_filter( 'render_block_context', $filter_block_context, 1 );
 	}
 
@@ -86,28 +83,3 @@ function register_block_core_block() {
 	);
 }
 add_action( 'init', 'register_block_core_block' );
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-	/**
-	 * Registers the overrides attribute for core/block.
-	 *
-	 * @param array  $args       Array of arguments for registering a block type.
-	 * @param string $block_name Block name including namespace.
-	 * @return array $args
-	 */
-	function register_block_core_block_args( $args, $block_name ) {
-		if ( 'core/block' === $block_name ) {
-			$args['attributes'] = array_merge(
-				$args['attributes'],
-				array(
-					'overrides' => array(
-						'type' => 'object',
-					),
-				)
-			);
-		}
-		return $args;
-	}
-	add_filter( 'register_block_type_args', 'register_block_core_block_args', 10, 2 );
-}
diff --git a/packages/block-library/src/button/block.json b/packages/block-library/src/button/block.json
index 3c232700a876e..f04d4642bb98e 100644
--- a/packages/block-library/src/button/block.json
+++ b/packages/block-library/src/button/block.json
@@ -8,6 +8,7 @@
 	"description": "Prompt visitors to take action with a button-style link.",
 	"keywords": [ "link" ],
 	"textdomain": "default",
+	"usesContext": [ "pattern/overrides" ],
 	"attributes": {
 		"tagName": {
 			"type": "string",
diff --git a/packages/block-library/src/heading/block.json b/packages/block-library/src/heading/block.json
index 72cc67caddd9e..a1eb3fce32ef1 100644
--- a/packages/block-library/src/heading/block.json
+++ b/packages/block-library/src/heading/block.json
@@ -7,6 +7,7 @@
 	"description": "Introduce new sections and organize content to help visitors (and search engines) understand the structure of your content.",
 	"keywords": [ "title", "subtitle" ],
 	"textdomain": "default",
+	"usesContext": [ "pattern/overrides" ],
 	"attributes": {
 		"textAlign": {
 			"type": "string"
diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
index c5191e3dd8654..a9357d28815b6 100644
--- a/packages/block-library/src/image/block.json
+++ b/packages/block-library/src/image/block.json
@@ -4,7 +4,12 @@
 	"name": "core/image",
 	"title": "Image",
 	"category": "media",
-	"usesContext": [ "allowResize", "imageCrop", "fixedHeight" ],
+	"usesContext": [
+		"allowResize",
+		"imageCrop",
+		"fixedHeight",
+		"pattern/overrides"
+	],
 	"description": "Insert an image to make a visual statement.",
 	"keywords": [ "img", "photo", "picture" ],
 	"textdomain": "default",
diff --git a/packages/block-library/src/paragraph/block.json b/packages/block-library/src/paragraph/block.json
index a81d754d8ca1b..25a9a36fa8bf0 100644
--- a/packages/block-library/src/paragraph/block.json
+++ b/packages/block-library/src/paragraph/block.json
@@ -7,7 +7,7 @@
 	"description": "Start with the basic building block of all narrative.",
 	"keywords": [ "text" ],
 	"textdomain": "default",
-	"usesContext": [ "postId" ],
+	"usesContext": [ "postId", "pattern/overrides" ],
 	"attributes": {
 		"align": {
 			"type": "string"

From bf65a9fa3337018757285f50fcb692d2e3ba49e5 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Tue, 23 Jan 2024 10:53:44 +0100
Subject: [PATCH 207/296] Interactivity API: Add `wp-each` directive (#57859)

* Copy the wp-each implementation

* Scaffold files for wp-each e2e tests

* Process template nodes inside `toVdom()`

* Add tests for several list manipulations

* Add a new test to implement

* Add SSRed elements in PHP

* Add SSRed elements to letters test

* Add more test cases

* Test support for siblings in template

* Implement tests for wp-each on navigation

* Update changelog

* Add `wp-each` documentation

* Extract localName

* Add missing comment for `data-wp-each-child` elements in tests

Co-authored-by: Luis Herranz <luisherranz@gmail.com>

* Clarify that `data-wp-each-child` is added automatically

Co-authored-by: Luis Herranz <luisherranz@gmail.com>

* Add test for nested lists

* Do nothing if element is not a template

* Add SSRed elements to nested testing

* Add tests for non-template elements

* Add `wp-each` to the table of contents

* Fix name of nested list tests

* Add tests for derived state as keys

* Fix broken tests

* Add missing inner templates in SSR

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 .../directive-each/block.json                 |  15 +
 .../directive-each/render.php                 | 226 ++++++++
 .../interactive-blocks/directive-each/view.js | 189 +++++++
 packages/interactivity/CHANGELOG.md           |   1 +
 .../interactivity/docs/2-api-reference.md     |  73 +++
 packages/interactivity/src/directives.js      |  47 +-
 packages/interactivity/src/hooks.tsx          |   2 +-
 packages/interactivity/src/vdom.js            |  26 +-
 .../interactivity/directive-each.spec.ts      | 486 ++++++++++++++++++
 9 files changed, 1053 insertions(+), 12 deletions(-)
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
 create mode 100644 packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
 create mode 100644 test/e2e/specs/interactivity/directive-each.spec.ts

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json b/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json
new file mode 100644
index 0000000000000..0d35e46105668
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/block.json
@@ -0,0 +1,15 @@
+{
+	"$schema": "https://schemas.wp.org/trunk/block.json",
+	"apiVersion": 2,
+	"name": "test/directive-each",
+	"title": "E2E Interactivity tests - directive each",
+	"category": "text",
+	"icon": "heart",
+	"description": "",
+	"supports": {
+		"interactivity": true
+	},
+	"textdomain": "e2e-interactivity",
+	"viewScript": "directive-each-view",
+	"render": "file:./render.php"
+}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
new file mode 100644
index 0000000000000..b9deee18abe57
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
@@ -0,0 +1,226 @@
+<?php
+/**
+ * HTML for testing the directive `data-wp-each`.
+ *
+ * @package gutenberg-test-interactive-blocks
+ */
+
+gutenberg_enqueue_module( 'directive-each-view' );
+?>
+
+<div data-wp-interactive='{ "namespace": "directive-each" }'>
+	<div data-testid="letters">
+		<template data-wp-each="state.letters">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>A</p>
+		<p data-testid="item" data-wp-each-child>B</p>
+		<p data-testid="item" data-wp-each-child>C</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="fruits">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateFruits"
+		>Rotate</button>
+		<button
+			data-testid="add" data-wp-on--click="actions.addFruit"
+		>Add</button>
+		<button
+			data-testid="replace" data-wp-on--click="actions.replaceFruit"
+		>Replace</button>
+		<template data-wp-each--fruit="state.fruits">
+			<p
+				data-testid="item"
+				data-wp-text="context.fruit"
+				data-wp-on--click="actions.removeFruit"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>avocado</p>
+		<p data-testid="item" data-wp-each-child>banana</p>
+		<p data-testid="item" data-wp-each-child>cherimoya</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="books">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateBooks"
+		>Rotate</button>
+		<button
+			data-testid="add" data-wp-on--click="actions.addBook"
+		>Add</button>
+		<button
+			data-testid="replace" data-wp-on--click="actions.replaceBook"
+		>Replace</button>
+		<button
+			data-testid="modify" data-wp-on--click="actions.modifyBook"
+		>Modify</button>
+		<template
+			data-wp-each--book="state.books"
+			data-wp-each-key="context.book.isbn"
+		>
+			<p
+				data-testid="item"
+				data-wp-text="context.book.title"
+				data-wp-on--click="actions.removeBook"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>A Game of Thrones</p>
+		<p data-testid="item" data-wp-each-child>A Clash of Kings</p>
+		<p data-testid="item" data-wp-each-child>A Storm of Swords</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="numbers">
+		<button
+			data-testid="shift" data-wp-on--click="actions.shiftNumber"
+		>Shift</button>
+		<button
+			data-testid="unshift" data-wp-on--click="actions.unshiftNumber"
+		>Unshift</button>
+		<template data-wp-each="state.numbers">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<p data-testid="item" data-wp-each-child>1</p>
+		<p data-testid="item" data-wp-each-child>2</p>
+		<p data-testid="item" data-wp-each-child>3</p>
+		<p data-testid="item">4</p>
+	</div>
+
+	<hr>
+
+	<div data-testid="empty">
+		<button
+			data-testid="add" data-wp-on--click="actions.addItem"
+		>Add</button>
+		<template data-wp-each="state.emptyList">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</template>
+		<p data-testid="item">item X</p>
+	</div>
+
+	<div data-testid="siblings">
+		<button
+			data-testid="unshift"
+			data-wp-on--click="actions.unshiftNumberAndName"
+		>Unshift</button>
+		<template
+			data-wp-each="state.numbersAndNames"
+			data-wp-each-key="context.item.value"
+		>
+			<p data-wp-text="context.item.name" data-testid="item"></p>
+			<p data-wp-text="context.item.value" data-testid="item"></p>
+		</template>
+		<p data-testid="item" data-wp-each-child>two</p>
+		<p data-testid="item" data-wp-each-child>2</p>
+		<p data-testid="item" data-wp-each-child>three</p>
+		<p data-testid="item" data-wp-each-child>3</p>
+		<p data-testid="item">four</p>
+		<p data-testid="item">4</p>
+	</div>
+
+	<div data-testid="nested">
+		<button
+			data-testid="add animal"
+			data-wp-on--click="actions.addAnimal"
+		>Add animal</button>
+		<button
+			data-testid="add breeds"
+			data-wp-on--click="actions.addBreeds"
+		>Add breeds</button>
+
+		<ul>
+			<template
+				data-wp-each--animal="state.animalBreeds"
+				data-wp-each-key="context.animal.name"
+			>
+				<li data-testid="animal">
+					<span
+						data-testid="name"
+						data-wp-text="context.animal.name"
+					></span>
+					<ul>
+						<template data-wp-each--breed="context.animal.breeds">
+							<li data-wp-text="context.breed"></li>
+						</template>
+					</ul>
+				</li>
+			</template>
+			<!-- SSRed elements; they should be removed on hydration -->
+			<li data-testid="animal" data-wp-each-child>
+				<span data-testid="name">Dog</span>
+				<ul>
+					<template data-wp-each--breed="context.animal.breeds">
+						<li data-wp-text="context.breed"></li>
+					</template>
+					<li data-wp-each-child>Chihuahua</li>
+					<li data-wp-each-child>Rottweiler</li>
+				</ul>
+			</li>
+			<li data-testid="animal" data-wp-each-child>
+				<span data-testid="name">Cat</span>
+				<ul>
+					<template data-wp-each--breed="context.animal.breeds">
+						<li data-wp-text="context.breed"></li>
+					</template>
+					<li data-wp-each-child>Sphynx</li>
+					<li data-wp-each-child>Siamese</li>
+				</ul>
+			</li>
+		</ul>
+	</div>
+
+	<div data-testid="invalid tag">
+		<div data-wp-each="state.letters">
+			<p data-wp-text="context.item" data-testid="item"></p>
+		</div>
+	</div>
+
+
+	<div data-testid="derived state">
+		<button
+			data-testid="rotate" data-wp-on--click="actions.rotateFruits"
+		>Rotate</button>
+		<template
+			data-wp-context='{ "idPrefix": "fruit-" }'
+			data-wp-each--fruit="state.fruits"
+			data-wp-each-key="state.fruitId"
+		>
+			<p
+				data-testid="item"
+				data-wp-text="context.fruit"
+				data-wp-bind--data-fruit-id="state.fruitId"
+			></p>
+		</template>
+		<!-- SSRed elements; they should be removed on hydration -->
+		<p data-testid="item" data-wp-each-child>avocado</p>
+		<p data-testid="item" data-wp-each-child>banana</p>
+		<p data-testid="item" data-wp-each-child>cherimoya</p>
+	</div>
+</div>
+
+<hr>
+
+<div
+	data-wp-interactive='{ "namespace": "directive-each" }'
+	data-wp-navigation-id="navigation-updated list"
+	data-wp-context='{ "list": [ "beta", "gamma", "delta" ] }'
+	data-testid="navigation-updated list"
+>
+	<button
+		data-testid="navigate"
+		data-wp-on--click="actions.navigate"
+	>Navigate</button>
+	<template data-wp-each="context.list">
+		<p data-wp-text="context.item" data-testid="item"></p>
+	</template>
+	<p data-testid="item" data-wp-each-child>beta</p>
+	<p data-testid="item" data-wp-each-child>gamma</p>
+	<p data-testid="item" data-wp-each-child>delta</p>
+</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
new file mode 100644
index 0000000000000..55677c9629ad3
--- /dev/null
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
@@ -0,0 +1,189 @@
+/**
+ * WordPress dependencies
+ */
+import { store, getContext, navigate } from '@wordpress/interactivity';
+
+const { state } = store( 'directive-each' );
+
+store( 'directive-each', {
+	state: {
+		letters: [ 'A', 'B', 'C' ],
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		fruits: [ 'avocado', 'banana', 'cherimoya' ],
+		get fruitId() {
+			const { idPrefix, fruit } = getContext();
+			return `${idPrefix}${fruit}`;
+		}
+	},
+	actions: {
+		removeFruit() {
+			const { fruit } = getContext();
+			state.fruits.splice( state.fruits.indexOf( fruit ), 1 );
+		},
+		rotateFruits() {
+			const fruit = state.fruits.pop();
+			state.fruits.splice( 0, 0, fruit );
+		},
+		addFruit() {
+			state.fruits.splice( 0, 0, 'ananas' );
+		},
+		replaceFruit() {
+			state.fruits.splice( 0, 1, 'ananas' );
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		books: [
+			{
+				title: 'A Game of Thrones',
+				author: 'George R.R. Martin',
+				isbn: "9780553588484",
+			},
+			{
+				title: 'A Clash of Kings',
+				author: 'George R.R. Martin',
+				isbn: "9780553381696",
+			},
+			{
+				title: 'A Storm of Swords',
+				author: 'George R.R. Martin',
+				isbn: "9780553573428",
+			},
+		],
+	},
+	actions: {
+		removeBook() {
+			const { book } = getContext();
+			state.books.splice( state.books.indexOf( book ), 1 );
+		},
+		rotateBooks() {
+			const book = state.books.pop();
+			state.books.splice( 0, 0, book );
+		},
+		addBook() {
+			const book = {
+				title: 'A Feast for Crows',
+				author: 'George R.R. Martin',
+				isbn: "9780553582024",
+			};
+			state.books.splice( 0, 0, book );
+		},
+		replaceBook() {
+			const book = {
+				title: 'A Feast for Crows',
+				author: 'George R.R. Martin',
+				isbn: "9780553582024",
+			};
+			state.books.splice( 0, 1, book );
+		},
+		modifyBook() {
+			const [ book ] = state.books;
+			book.title = book.title.toUpperCase();
+		},
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		numbers: [ 1, 2, 3 ],
+	},
+	actions: {
+		shiftNumber() {
+			state.numbers.shift();
+		},
+		unshiftNumber() {
+			if ( state.numbers.length > 0 ) {
+				state.numbers.unshift( state.numbers[ 0 ] - 1 );
+			}
+		}
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		emptyList: []
+	},
+	actions: {
+		addItem() {
+			state.emptyList.push( `item ${ state.emptyList.length }` );
+		}
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		numbersAndNames: [
+			{ name: "two", value: 2 },
+			{ name: "three", value: 3 },
+		],
+	},
+	actions: {
+		unshiftNumberAndName() {
+			state.numbersAndNames.unshift( { name: "one", value: 1 } );
+		}
+	},
+} );
+
+store( 'directive-each', {
+	state: {
+		animalBreeds: [
+			{ name: "Dog", breeds: [ 'chihuahua', 'rottweiler' ] },
+			{ name: "Cat", breeds: [ 'sphynx', 'siamese' ] },
+		],
+	},
+	actions: {
+		addAnimal() {
+			state.animalBreeds.unshift( {
+				name: "Rat", breeds: [ 'dumbo', 'rex' ]
+			} );
+		},
+		addBreeds() {
+			state
+				.animalBreeds
+				.forEach( ( { name, breeds } ) => {
+					if ( name === 'Dog') breeds.unshift( 'german shepherd' );
+					if ( name === 'Cat') breeds.unshift( 'maine coon' );
+					if ( name === 'Rat') breeds.unshift( 'satin' );
+				} );
+		}
+	}
+} );
+
+const html = `
+<div
+	data-wp-interactive='{ "namespace": "directive-each" }'
+	data-wp-navigation-id="navigation-updated list"
+	data-wp-context='{ "list": [ "alpha", "beta", "gamma", "delta" ] }'
+	data-testid="navigation-updated list"
+>
+	<button
+		data-testid="navigate"
+		data-wp-on--click="actions.navigate"
+	>Navigate</button>
+	<template data-wp-each="context.list">
+		<p data-wp-text="context.item" data-testid="item"></p>
+	</template>
+	<p data-testid="item" data-wp-each-child>alpha</p>
+	<p data-testid="item" data-wp-each-child>beta</p>
+	<p data-testid="item" data-wp-each-child>gamma</p>
+	<p data-testid="item" data-wp-each-child>delta</p>
+</div>
+`;
+
+store( 'directive-each', {
+	actions: {
+		navigate() {
+			return navigate( window.location, {
+				force: true,
+				html,
+			} );
+		},
+	}
+} );
+
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index b37fff1bbb5c4..252b200f9d4d0 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 -   Add the `data-wp-run` directive along with the `useInit` and `useWatch` hooks. ([#57805](https://github.com/WordPress/gutenberg/pull/57805))
 -   Add `wp-data-on-window` and `wp-data-on-document` directives. ([#57931](https://github.com/WordPress/gutenberg/pull/57931))
+-   Add the `data-wp-each` directive to render lists of items using a template. ([57859](https://github.com/WordPress/gutenberg/pull/57859))
 
 ### Breaking Changes
 
diff --git a/packages/interactivity/docs/2-api-reference.md b/packages/interactivity/docs/2-api-reference.md
index 922662c10a8e2..bae15e9a7fcf2 100644
--- a/packages/interactivity/docs/2-api-reference.md
+++ b/packages/interactivity/docs/2-api-reference.md
@@ -26,6 +26,7 @@ DOM elements are connected to data stored in the state and context through direc
     - [`wp-init`](#wp-init) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-run`](#wp-run) ![](https://img.shields.io/badge/SIDE_EFFECTS-afd2e3.svg)
     - [`wp-key`](#wp-key) ![](https://img.shields.io/badge/TEMPLATING-afd2e3.svg)
+    - [`wp-each`](#wp-each) ![](https://img.shields.io/badge/TEMPLATING-afd2e3.svg)
   - [Values of directives are references to store properties](#values-of-directives-are-references-to-store-properties)
 - [The store](#the-store)
   - [Elements of the store](#elements-of-the-store)
@@ -620,6 +621,78 @@ But it can also be used on other elements:
 
 When the list is re-rendered, the Interactivity API will match elements by their keys to determine if an item was added/removed/reordered. Elements without keys might be recreated unnecessarily.
 
+
+#### `wp-each`
+
+The `wp-each` directive is intended to render a list of elements. The directive can be used in `<template>` tags, being the value a path to an array stored in the global state or the context. The content inside the `<template>` tag is the template used to render each of the items.
+
+Each item is included in the context under the `item` name by default, so directives inside the template can access the current item.
+
+For example, let's consider the following HTML.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+  <template data-wp-each="context.list" >
+    <li data-wp-text="context.item"></li>
+  </template>
+</ul>
+```
+
+It would generate the following output:
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+  <li data-wp-text="context.item">hello</li>
+  <li data-wp-text="context.item">hola</li>
+  <li data-wp-text="context.item">olá</li>
+</ul>
+```
+
+The prop that holds the item in the context can be changed by passing a suffix to the directive name. In the following example, we change the default prop `item` to `greeting`.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+  <template data-wp-each--greeting="context.list" >
+    <li data-wp-text="context.greeting"></li>
+  </template>
+</ul>
+```
+
+By default, it uses each element as the key for the rendered nodes, but you can also specify a path to retrieve the key if necessary, e.g., when the list contains objects.
+
+For that, you must use `data-wp-each-key` in the `<template>` tag and not `data-wp-key` inside the template content. This is because `data-wp-each` creates
+a context provider wrapper around each rendered item, and those wrappers are the ones that need the `key` property.
+
+```html
+<ul data-wp-context='{
+  "list": [
+    { "id": "en", "value": "hello" },
+    { "id": "es", "value": "hola" },
+    { "id": "pt", "value": "olá" }
+  ]
+}'>
+  <template
+    data-wp-each--greeting="context.list"
+    data-wp-each-key="context.greeting.id"
+  >
+    <li data-wp-text="context.greeting.value"></li>
+  </template>
+</ul>
+```
+
+For server-side rendered lists, another directive called `data-wp-each-child` ensures hydration works as expected. This directive is added automatically when the directive is processed on the server.
+
+```html
+<ul data-wp-context='{ "list": [ "hello", "hola", "olá" ] }'>
+  <template data-wp-each--greeting="context.list" >
+    <li data-wp-text="context.greeting"></li>
+  </template>
+  <li data-wp-each-child>hello</li>
+  <li data-wp-each-child>hola</li>
+  <li data-wp-each-child>olá</li>
+</ul>
+```
+
 ### Values of directives are references to store properties
 
 The value assigned to a directive is a string pointing to a specific state, action, or side effect.
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index 21ab2da29cf27..c1879af1fe19a 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -9,7 +9,7 @@ import { deepSignal, peek } from 'deepsignal';
  */
 import { createPortal } from './portals';
 import { useWatch, useInit } from './utils';
-import { directive } from './hooks';
+import { directive, getScope, getEvaluate } from './hooks';
 
 const isObject = ( item ) =>
 	item && typeof item === 'object' && ! Array.isArray( item );
@@ -313,4 +313,49 @@ export default () => {
 	directive( 'run', ( { directives: { run }, evaluate } ) => {
 		run.forEach( ( entry ) => evaluate( entry ) );
 	} );
+
+	// data-wp-each--[item]
+	directive(
+		'each',
+		( {
+			directives: { each, 'each-key': eachKey },
+			context: inheritedContext,
+			element,
+			evaluate,
+		} ) => {
+			if ( element.type !== 'template' ) return;
+
+			const { Provider } = inheritedContext;
+			const inheritedValue = useContext( inheritedContext );
+
+			const [ entry ] = each;
+			const { namespace, suffix } = entry;
+
+			const list = evaluate( entry );
+			return list.map( ( item ) => {
+				const mergedContext = deepSignal( {} );
+
+				const itemProp = suffix === 'default' ? 'item' : suffix;
+				const newValue = deepSignal( {
+					[ namespace ]: { [ itemProp ]: item },
+				} );
+				mergeDeepSignals( newValue, inheritedValue );
+				mergeDeepSignals( mergedContext, newValue, true );
+
+				const scope = { ...getScope(), context: mergedContext };
+				const key = eachKey
+					? getEvaluate( { scope } )( eachKey[ 0 ] )
+					: item;
+
+				return (
+					<Provider value={ mergedContext } key={ key }>
+						{ element.props.content }
+					</Provider>
+				);
+			} );
+		},
+		{ priority: 20 }
+	);
+
+	directive( 'each-child', () => null );
 };
diff --git a/packages/interactivity/src/hooks.tsx b/packages/interactivity/src/hooks.tsx
index 4309f3f0bea7a..c133eb9981880 100644
--- a/packages/interactivity/src/hooks.tsx
+++ b/packages/interactivity/src/hooks.tsx
@@ -261,7 +261,7 @@ const resolve = ( path, namespace ) => {
 };
 
 // Generate the evaluate function.
-const getEvaluate: GetEvaluate =
+export const getEvaluate: GetEvaluate =
 	( { scope } ) =>
 	( entry, ...args ) => {
 		let { value: path, namespace } = entry;
diff --git a/packages/interactivity/src/vdom.js b/packages/interactivity/src/vdom.js
index 860a3149e6ffd..4a7cfff9f9d0d 100644
--- a/packages/interactivity/src/vdom.js
+++ b/packages/interactivity/src/vdom.js
@@ -43,7 +43,7 @@ export function toVdom( root ) {
 	);
 
 	function walk( node ) {
-		const { attributes, nodeType } = node;
+		const { attributes, nodeType, localName } = node;
 
 		if ( nodeType === 3 ) return [ node.data ];
 		if ( nodeType === 4 ) {
@@ -93,7 +93,7 @@ export function toVdom( root ) {
 
 		if ( ignore && ! island )
 			return [
-				h( node.localName, {
+				h( localName, {
 					...props,
 					innerHTML: node.innerHTML,
 					__directives: { ignore: true },
@@ -118,20 +118,26 @@ export function toVdom( root ) {
 			);
 		}
 
-		let child = treeWalker.firstChild();
-		if ( child ) {
-			while ( child ) {
-				const [ vnode, nextChild ] = walk( child );
-				if ( vnode ) children.push( vnode );
-				child = nextChild || treeWalker.nextSibling();
+		if ( localName === 'template' ) {
+			props.content = [ ...node.content.childNodes ].map( ( childNode ) =>
+				toVdom( childNode )
+			);
+		} else {
+			let child = treeWalker.firstChild();
+			if ( child ) {
+				while ( child ) {
+					const [ vnode, nextChild ] = walk( child );
+					if ( vnode ) children.push( vnode );
+					child = nextChild || treeWalker.nextSibling();
+				}
+				treeWalker.parentNode();
 			}
-			treeWalker.parentNode();
 		}
 
 		// Restore previous namespace.
 		if ( island ) namespaces.pop();
 
-		return [ h( node.localName, props, children ) ];
+		return [ h( localName, props, children ) ];
 	}
 
 	return walk( treeWalker.currentNode );
diff --git a/test/e2e/specs/interactivity/directive-each.spec.ts b/test/e2e/specs/interactivity/directive-each.spec.ts
new file mode 100644
index 0000000000000..4f024b1f828a9
--- /dev/null
+++ b/test/e2e/specs/interactivity/directive-each.spec.ts
@@ -0,0 +1,486 @@
+/**
+ * Internal dependencies
+ */
+import { test, expect } from './fixtures';
+
+test.describe( 'data-wp-each', () => {
+	test.beforeAll( async ( { interactivityUtils: utils } ) => {
+		await utils.activatePlugins();
+		await utils.addPostWithBlock( 'test/directive-each' );
+	} );
+
+	test.beforeEach( async ( { interactivityUtils: utils, page } ) => {
+		await page.goto( utils.getLink( 'test/directive-each' ) );
+	} );
+
+	test.afterAll( async ( { interactivityUtils: utils } ) => {
+		await utils.deactivatePlugins();
+		await utils.deleteAllPosts();
+	} );
+
+	test( 'should use `item` as the defaul item name in the context', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'letters' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ 'A', 'B', 'C' ] );
+	} );
+
+	test( 'should use the specified item name in the context', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [
+			'avocado',
+			'banana',
+			'cherimoya',
+		] );
+	} );
+
+	test.describe( 'without `wp-each-key`', () => {
+		test.beforeEach( async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			// These tags are included to check that the elements are not unmounted
+			// and mounted again. If an element remounts, its tag should be missing.
+			await elements.evaluateAll( ( refs ) =>
+				refs.forEach( ( ref, index ) => {
+					if ( ref instanceof HTMLElement ) {
+						ref.dataset.tag = `${ index }`;
+					}
+				} )
+			);
+		} );
+
+		test( 'should preserve elements on deletion', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			// An item is removed when clicked.
+			await elements.first().click();
+
+			await expect( elements ).toHaveText( [ 'banana', 'cherimoya' ] );
+			await expect( elements.getByText( 'avocado' ) ).toBeHidden();
+
+			// Get the tags. They should not have disappeared.
+			const [ banana, cherimoya ] = await elements.all();
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on reordering', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'rotate' ).click();
+
+			await expect( elements ).toHaveText( [
+				'cherimoya',
+				'avocado',
+				'banana',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ cherimoya, avocado, banana ] = await elements.all();
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+			await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+		} );
+
+		test( 'should preserve elements on addition', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'add' ).click();
+
+			await expect( elements ).toHaveText( [
+				'ananas',
+				'avocado',
+				'banana',
+				'cherimoya',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ ananas, avocado, banana, cherimoya ] = await elements.all();
+			await expect( ananas ).not.toHaveAttribute( 'data-tag' );
+			await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on replacement', async ( { page } ) => {
+			const elements = page.getByTestId( 'fruits' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'fruits' ).getByTestId( 'replace' ).click();
+
+			await expect( elements ).toHaveText( [
+				'ananas',
+				'banana',
+				'cherimoya',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ ananas, banana, cherimoya ] = await elements.all();
+			await expect( ananas ).not.toHaveAttribute( 'data-tag' );
+			await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+			await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		} );
+	} );
+
+	test.describe( 'with `wp-each-key`', () => {
+		test.beforeEach( async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			// These tags are included to check that the elements are not unmounted
+			// and mounted again. If an element remounts, its tag should be missing.
+			await elements.evaluateAll( ( refs ) =>
+				refs.forEach( ( ref, index ) => {
+					if ( ref instanceof HTMLElement ) {
+						ref.dataset.tag = `${ index }`;
+					}
+				} )
+			);
+		} );
+
+		test( 'should preserve elements on deletion', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await expect( elements ).toHaveText( [
+				'A Game of Thrones',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// An item is removed when clicked.
+			await elements.first().click();
+
+			await expect( elements ).toHaveText( [
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared.
+			const [ acok, asos ] = await elements.all();
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on reordering', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'rotate' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Storm of Swords',
+				'A Game of Thrones',
+				'A Clash of Kings',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ asos, agot, acok ] = await elements.all();
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+		} );
+
+		test( 'should preserve elements on addition', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'add' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Feast for Crows',
+				'A Game of Thrones',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ affc, agot, acok, asos ] = await elements.all();
+			await expect( affc ).not.toHaveAttribute( 'data-tag' );
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on replacement', async ( { page } ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'replace' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A Feast for Crows',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed,
+			// except for the newly created element.
+			const [ affc, acok, asos ] = await elements.all();
+			await expect( affc ).not.toHaveAttribute( 'data-tag' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+
+		test( 'should preserve elements on modification', async ( {
+			page,
+		} ) => {
+			const elements = page.getByTestId( 'books' ).getByTestId( 'item' );
+
+			await page.getByTestId( 'books' ).getByTestId( 'modify' ).click();
+
+			await expect( elements ).toHaveText( [
+				'A GAME OF THRONES',
+				'A Clash of Kings',
+				'A Storm of Swords',
+			] );
+
+			// Get the tags. They should not have disappeared or changed.
+			const [ agot, acok, asos ] = await elements.all();
+			await expect( agot ).toHaveAttribute( 'data-tag', '0' );
+			await expect( acok ).toHaveAttribute( 'data-tag', '1' );
+			await expect( asos ).toHaveAttribute( 'data-tag', '2' );
+		} );
+	} );
+
+	test( 'should respect elements after', async ( { page } ) => {
+		const elements = page.getByTestId( 'numbers' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ '1', '2', '3', '4' ] );
+		await page.getByTestId( 'numbers' ).getByTestId( 'shift' ).click();
+		await expect( elements ).toHaveText( [ '2', '3', '4' ] );
+		await page
+			.getByTestId( 'numbers' )
+			.getByTestId( 'unshift' )
+			.click( { clickCount: 2 } );
+		await expect( elements ).toHaveText( [ '0', '1', '2', '3', '4' ] );
+	} );
+
+	test( 'should support initial empty lists', async ( { page } ) => {
+		const elements = page.getByTestId( 'empty' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [ 'item X' ] );
+		await page
+			.getByTestId( 'empty' )
+			.getByTestId( 'add' )
+			.click( { clickCount: 2 } );
+
+		await expect( elements ).toHaveText( [ 'item 0', 'item 1', 'item X' ] );
+	} );
+
+	test( 'should support multiple siblings inside the template', async ( {
+		page,
+	} ) => {
+		const elements = page.getByTestId( 'siblings' ).getByTestId( 'item' );
+		await expect( elements ).toHaveText( [
+			'two',
+			'2',
+			'three',
+			'3',
+			'four',
+			'4',
+		] );
+		await page.getByTestId( 'siblings' ).getByTestId( 'unshift' ).click();
+		await expect( elements ).toHaveText( [
+			'one',
+			'1',
+			'two',
+			'2',
+			'three',
+			'3',
+			'four',
+			'4',
+		] );
+	} );
+
+	test( 'should work on navigation', async ( { page } ) => {
+		const elements = page
+			.getByTestId( 'navigation-updated list' )
+			.getByTestId( 'item' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		await elements.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await expect( elements ).toHaveText( [ 'beta', 'gamma', 'delta' ] );
+
+		await page
+			.getByTestId( 'navigation-updated list' )
+			.getByTestId( 'navigate' )
+			.click();
+
+		await expect( elements ).toHaveText( [
+			'alpha',
+			'beta',
+			'gamma',
+			'delta',
+		] );
+
+		// Get the tags. They should not have disappeared or changed,
+		// except for the newly created element.
+		const [ alpha, beta, gamma, delta ] = await elements.all();
+		await expect( alpha ).not.toHaveAttribute( 'data-tag' );
+		await expect( beta ).toHaveAttribute( 'data-tag', '0' );
+		await expect( gamma ).toHaveAttribute( 'data-tag', '1' );
+		await expect( delta ).toHaveAttribute( 'data-tag', '2' );
+	} );
+
+	test( 'should work with nested lists', async ( { page } ) => {
+		const mainElement = page.getByTestId( 'nested' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		const listItems = mainElement.getByRole( 'listitem' );
+		await listItems.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		const animals = mainElement.getByTestId( 'animal' );
+
+		{
+			// Ensure it hydrates correctly.
+			const [ dog, cat ] = await animals.all();
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'sphynx',
+				'siamese',
+			] );
+		}
+
+		await mainElement.getByTestId( 'add animal' ).click();
+
+		{
+			// Ensure it works when the top list is modified.
+			const [ rat, dog, cat ] = await animals.all();
+			await expect( rat.getByTestId( 'name' ) ).toHaveText( 'Rat' );
+			await expect( rat.getByRole( 'listitem' ) ).toHaveText( [
+				'dumbo',
+				'rex',
+			] );
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'sphynx',
+				'siamese',
+			] );
+			await expect( rat ).not.toHaveAttribute( 'data-tag' );
+			const [ d1, d2 ] = await dog.getByRole( 'listitem' ).all();
+			await expect( dog ).toHaveAttribute( 'data-tag', '0' );
+			await expect( d1 ).toHaveAttribute( 'data-tag', '1' );
+			await expect( d2 ).toHaveAttribute( 'data-tag', '2' );
+			const [ c1, c2 ] = await cat.getByRole( 'listitem' ).all();
+			await expect( cat ).toHaveAttribute( 'data-tag', '3' );
+			await expect( c1 ).toHaveAttribute( 'data-tag', '4' );
+			await expect( c2 ).toHaveAttribute( 'data-tag', '5' );
+		}
+
+		// Reset tags so the added elements have one.
+		await listItems.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await mainElement.getByTestId( 'add breeds' ).click();
+
+		{
+			// Ensure it works when the top list is modified.
+			const [ rat, dog, cat ] = await animals.all();
+			await expect( rat.getByTestId( 'name' ) ).toHaveText( 'Rat' );
+			await expect( rat.getByRole( 'listitem' ) ).toHaveText( [
+				'satin',
+				'dumbo',
+				'rex',
+			] );
+			await expect( dog.getByTestId( 'name' ) ).toHaveText( 'Dog' );
+			await expect( dog.getByRole( 'listitem' ) ).toHaveText( [
+				'german shepherd',
+				'chihuahua',
+				'rottweiler',
+			] );
+			await expect( cat.getByTestId( 'name' ) ).toHaveText( 'Cat' );
+			await expect( cat.getByRole( 'listitem' ) ).toHaveText( [
+				'maine coon',
+				'sphynx',
+				'siamese',
+			] );
+			const [ r1, r2, r3 ] = await rat.getByRole( 'listitem' ).all();
+			await expect( rat ).toHaveAttribute( 'data-tag', '0' );
+			await expect( r1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( r2 ).toHaveAttribute( 'data-tag', '1' );
+			await expect( r3 ).toHaveAttribute( 'data-tag', '2' );
+			const [ d1, d2, d3 ] = await dog.getByRole( 'listitem' ).all();
+			await expect( dog ).toHaveAttribute( 'data-tag', '3' );
+			await expect( d1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( d2 ).toHaveAttribute( 'data-tag', '4' );
+			await expect( d3 ).toHaveAttribute( 'data-tag', '5' );
+			const [ c1, c2, c3 ] = await cat.getByRole( 'listitem' ).all();
+			await expect( cat ).toHaveAttribute( 'data-tag', '6' );
+			await expect( c1 ).not.toHaveAttribute( 'data-tag' );
+			await expect( c2 ).toHaveAttribute( 'data-tag', '7' );
+			await expect( c3 ).toHaveAttribute( 'data-tag', '8' );
+		}
+	} );
+
+	test( 'should do nothing when used on non-template elements', async ( {
+		page,
+	} ) => {
+		const elements = page
+			.getByTestId( 'invalid tag' )
+			.getByTestId( 'item' );
+
+		await expect( elements ).toHaveCount( 1 );
+		await expect( elements ).toBeEmpty();
+	} );
+
+	test( 'should work with derived state as keys', async ( { page } ) => {
+		const elements = page
+			.getByTestId( 'derived state' )
+			.getByTestId( 'item' );
+
+		// These tags are included to check that the elements are not unmounted
+		// and mounted again. If an element remounts, its tag should be missing.
+		await elements.evaluateAll( ( refs ) =>
+			refs.forEach( ( ref, index ) => {
+				if ( ref instanceof HTMLElement ) {
+					ref.dataset.tag = `${ index }`;
+				}
+			} )
+		);
+
+		await page
+			.getByTestId( 'derived state' )
+			.getByTestId( 'rotate' )
+			.click();
+
+		await expect( elements ).toHaveText( [
+			'cherimoya',
+			'avocado',
+			'banana',
+		] );
+
+		// Get the tags. They should not have disappeared or changed.
+		const [ cherimoya, avocado, banana ] = await elements.all();
+		await expect( cherimoya ).toHaveAttribute( 'data-tag', '2' );
+		await expect( avocado ).toHaveAttribute( 'data-tag', '0' );
+		await expect( banana ).toHaveAttribute( 'data-tag', '1' );
+	} );
+} );

From 379863d5b3f7f1c2d522862458a3839de1ae0423 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Tue, 23 Jan 2024 11:07:54 +0100
Subject: [PATCH 208/296] Interactivity API: Fix data-wp-on-document flaky test
 (#58008)

* Fix data-wp-on-document flaky test

* Add a tick to wait until the effects run and reattach the event listeners

* Remove raf

* Add extra state to wait until effects run

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 .../directive-on-document/render.php          | 19 +++++++++++++++----
 .../directive-on-document/view.js             | 13 +++++++++----
 .../directive-on-document.spec.ts             | 11 +++++++++++
 3 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
index d04cb79ea5852..b6f8a2b1b5497 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
@@ -8,10 +8,21 @@
 gutenberg_enqueue_module( 'directive-on-document-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-on-document" }' data-wp-context='{"isVisible":true}'>
-	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
-	<div data-wp-show-mock="context.isVisible">
-		<div data-wp-on-document--keydown="callbacks.keydownHandler">
+<div data-wp-interactive='{ "namespace": "directive-on-document" }'>
+	<button 
+		data-testid="visibility"
+		data-wp-on--click="actions.visibilityHandler"
+	>
+		Switch visibility
+	</button>
+
+	<div data-wp-text="state.isEventAttached" data-testid="isEventAttached">no</div>
+
+	<div data-wp-show-mock="state.isVisible">
+		<div
+			data-wp-on-document--keydown="callbacks.keydownHandler"
+			data-wp-init="callbacks.init"
+		>
 			<p data-wp-text="state.counter" data-testid="counter">0</p>
 		</div>
 	</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
index b3cb891e4d6cb..b7f2a52b42baa 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, directive, getContext } from '@wordpress/interactivity';
+import { store, directive } from '@wordpress/interactivity';
 
 // Mock `data-wp-show` directive to test when things are removed from the
 // DOM.  Replace with `data-wp-show` when it's ready.
@@ -19,16 +19,21 @@ directive(
 const { state } = store( 'directive-on-document', {
 	state: {
 		counter: 0,
+		isVisible: true,
+		isEventAttached: 'no',
 	},
 	callbacks: {
-		keydownHandler: ( ) => {
+		keydownHandler() {
 			state.counter += 1;
 		},
+		init() {
+			state.isEventAttached = 'yes';
+		},
 	},
 	actions: {
 		visibilityHandler: () => {
-			const context = getContext();
-			context.isVisible = ! context.isVisible;
+			state.isEventAttached = 'no';
+			state.isVisible = ! state.isVisible;
 		},
 	}
 } );
diff --git a/test/e2e/specs/interactivity/directive-on-document.spec.ts b/test/e2e/specs/interactivity/directive-on-document.spec.ts
index 824e217f08714..56ac7e91d3121 100644
--- a/test/e2e/specs/interactivity/directive-on-document.spec.ts
+++ b/test/e2e/specs/interactivity/directive-on-document.spec.ts
@@ -30,17 +30,28 @@ test.describe( 'data-wp-on-document', () => {
 		page,
 	} ) => {
 		const counter = page.getByTestId( 'counter' );
+		const isEventAttached = page.getByTestId( 'isEventAttached' );
 		const visibilityButton = page.getByTestId( 'visibility' );
+
 		await expect( counter ).toHaveText( '0' );
+		await expect( isEventAttached ).toHaveText( 'yes' );
 		await page.keyboard.press( 'ArrowDown' );
 		await expect( counter ).toHaveText( '1' );
+
 		// Remove the element.
 		await visibilityButton.click();
 		// This keyboard press should not increase the counter.
 		await page.keyboard.press( 'ArrowDown' );
+
 		// Add the element back.
 		await visibilityButton.click();
 		await expect( counter ).toHaveText( '1' );
+		await expect( counter ).toHaveText( '1' );
+
+		// Wait until the effects run again.
+		await expect( isEventAttached ).toHaveText( 'yes' );
+
+		// Check that the event listener is attached again.
 		await page.keyboard.press( 'ArrowDown' );
 		await expect( counter ).toHaveText( '2' );
 	} );

From e6cc440f834f772121943f63963f1e4e7470a362 Mon Sep 17 00:00:00 2001
From: Jarda Snajdr <jsnajdr@gmail.com>
Date: Tue, 23 Jan 2024 11:29:17 +0100
Subject: [PATCH 209/296] DownloadableBlocksPanel: remove withSelect in favor
 of useSelect (#58109)

---
 .../downloadable-blocks-panel/index.js        | 133 +++++++++---------
 .../index.js                                  |   9 +-
 2 files changed, 69 insertions(+), 73 deletions(-)

diff --git a/packages/block-directory/src/components/downloadable-blocks-panel/index.js b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
index 4686600312851..4ceee3ddcb16e 100644
--- a/packages/block-directory/src/components/downloadable-blocks-panel/index.js
+++ b/packages/block-directory/src/components/downloadable-blocks-panel/index.js
@@ -3,9 +3,8 @@
  */
 import { __ } from '@wordpress/i18n';
 import { Spinner } from '@wordpress/components';
-import { compose } from '@wordpress/compose';
 import { store as coreStore } from '@wordpress/core-data';
-import { withSelect } from '@wordpress/data';
+import { useSelect } from '@wordpress/data';
 import { getBlockType } from '@wordpress/blocks';
 
 /**
@@ -18,16 +17,71 @@ import { store as blockDirectoryStore } from '../../store';
 
 const EMPTY_ARRAY = [];
 
-function DownloadableBlocksPanel( {
-	downloadableItems,
+const useDownloadableBlocks = ( filterValue ) =>
+	useSelect(
+		( select ) => {
+			const {
+				getDownloadableBlocks,
+				isRequestingDownloadableBlocks,
+				getInstalledBlockTypes,
+			} = select( blockDirectoryStore );
+
+			const hasPermission = select( coreStore ).canUser(
+				'read',
+				'block-directory/search'
+			);
+
+			let downloadableBlocks = EMPTY_ARRAY;
+			if ( hasPermission ) {
+				downloadableBlocks = getDownloadableBlocks( filterValue );
+
+				// Filter out blocks that are already installed.
+				const installedBlockTypes = getInstalledBlockTypes();
+				const installableBlocks = downloadableBlocks.filter(
+					( { name } ) => {
+						// Check if the block has just been installed, in which case it
+						// should still show in the list to avoid suddenly disappearing.
+						// `installedBlockTypes` only returns blocks stored in state
+						// immediately after installation, not all installed blocks.
+						const isJustInstalled = installedBlockTypes.some(
+							( blockType ) => blockType.name === name
+						);
+						const isPreviouslyInstalled = getBlockType( name );
+						return isJustInstalled || ! isPreviouslyInstalled;
+					}
+				);
+
+				// Keep identity of the `downloadableBlocks` array if nothing was filtered out
+				if ( installableBlocks.length !== downloadableBlocks.length ) {
+					downloadableBlocks = installableBlocks;
+				}
+
+				// Return identical empty array when there are no blocks
+				if ( downloadableBlocks.length === 0 ) {
+					downloadableBlocks = EMPTY_ARRAY;
+				}
+			}
+
+			return {
+				hasPermission,
+				downloadableBlocks,
+				isLoading: isRequestingDownloadableBlocks( filterValue ),
+			};
+		},
+		[ filterValue ]
+	);
+
+export default function DownloadableBlocksPanel( {
 	onSelect,
 	onHover,
 	hasLocalBlocks,
-	hasPermission,
-	isLoading,
 	isTyping,
+	filterValue,
 } ) {
-	if ( typeof hasPermission === 'undefined' || isLoading || isTyping ) {
+	const { hasPermission, downloadableBlocks, isLoading } =
+		useDownloadableBlocks( filterValue );
+
+	if ( hasPermission === undefined || isLoading || isTyping ) {
 		return (
 			<>
 				{ hasPermission && ! hasLocalBlocks && (
@@ -55,71 +109,20 @@ function DownloadableBlocksPanel( {
 		return null;
 	}
 
-	return !! downloadableItems.length ? (
+	if ( downloadableBlocks.length === 0 ) {
+		return hasLocalBlocks ? null : <DownloadableBlocksNoResults />;
+	}
+
+	return (
 		<DownloadableBlocksInserterPanel
-			downloadableItems={ downloadableItems }
+			downloadableItems={ downloadableBlocks }
 			hasLocalBlocks={ hasLocalBlocks }
 		>
 			<DownloadableBlocksList
-				items={ downloadableItems }
+				items={ downloadableBlocks }
 				onSelect={ onSelect }
 				onHover={ onHover }
 			/>
 		</DownloadableBlocksInserterPanel>
-	) : (
-		! hasLocalBlocks && <DownloadableBlocksNoResults />
 	);
 }
-
-export default compose( [
-	withSelect( ( select, { filterValue } ) => {
-		const {
-			getDownloadableBlocks,
-			isRequestingDownloadableBlocks,
-			getInstalledBlockTypes,
-		} = select( blockDirectoryStore );
-
-		const hasPermission = select( coreStore ).canUser(
-			'read',
-			'block-directory/search'
-		);
-
-		function getInstallableBlocks( term ) {
-			const downloadableBlocks = getDownloadableBlocks( term );
-			const installedBlockTypes = getInstalledBlockTypes();
-			// Filter out blocks that are already installed.
-			const installableBlocks = downloadableBlocks.filter( ( block ) => {
-				// Check if the block has just been installed, in which case it
-				// should still show in the list to avoid suddenly disappearing.
-				// `installedBlockTypes` only returns blocks stored in state
-				// immediately after installation, not all installed blocks.
-				const isJustInstalled = !! installedBlockTypes.find(
-					( blockType ) => blockType.name === block.name
-				);
-				const isPreviouslyInstalled = getBlockType( block.name );
-				return isJustInstalled || ! isPreviouslyInstalled;
-			} );
-
-			if ( downloadableBlocks.length === installableBlocks.length ) {
-				return downloadableBlocks;
-			}
-			return installableBlocks;
-		}
-
-		let downloadableItems = hasPermission
-			? getInstallableBlocks( filterValue )
-			: [];
-
-		if ( downloadableItems.length === 0 ) {
-			downloadableItems = EMPTY_ARRAY;
-		}
-
-		const isLoading = isRequestingDownloadableBlocks( filterValue );
-
-		return {
-			downloadableItems,
-			hasPermission,
-			isLoading,
-		};
-	} ),
-] )( DownloadableBlocksPanel );
diff --git a/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js b/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
index badcc407c78cb..34fc9011b9a1c 100644
--- a/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
+++ b/packages/block-directory/src/plugins/inserter-menu-downloadable-blocks-panel/index.js
@@ -16,13 +16,7 @@ function InserterMenuDownloadableBlocksPanel() {
 
 	return (
 		<__unstableInserterMenuExtension>
-			{ ( {
-				onSelect,
-				onHover,
-				filterValue,
-				hasItems,
-				rootClientId,
-			} ) => {
+			{ ( { onSelect, onHover, filterValue, hasItems } ) => {
 				if ( debouncedFilterValue !== filterValue ) {
 					debouncedSetFilterValue( filterValue );
 				}
@@ -35,7 +29,6 @@ function InserterMenuDownloadableBlocksPanel() {
 					<DownloadableBlocksPanel
 						onSelect={ onSelect }
 						onHover={ onHover }
-						rootClientId={ rootClientId }
 						filterValue={ debouncedFilterValue }
 						hasLocalBlocks={ hasItems }
 						isTyping={ filterValue !== debouncedFilterValue }

From 234dfe3a806dbf716ad46d9f3b854771f26e8a0e Mon Sep 17 00:00:00 2001
From: Riad Benguella <benguella@gmail.com>
Date: Tue, 23 Jan 2024 11:48:59 +0100
Subject: [PATCH 210/296] Pattern Categories: Fix capitalization (#58112)

---
 lib/compat/wordpress-6.5/block-patterns.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/compat/wordpress-6.5/block-patterns.php b/lib/compat/wordpress-6.5/block-patterns.php
index f43acda2a1035..cce97cb19c690 100644
--- a/lib/compat/wordpress-6.5/block-patterns.php
+++ b/lib/compat/wordpress-6.5/block-patterns.php
@@ -49,7 +49,7 @@ function gutenberg_register_taxonomy_patterns() {
 			'singular_name'              => _x( 'Pattern Category', 'taxonomy singular name' ),
 			'add_new_item'               => __( 'Add New Category' ),
 			'add_or_remove_items'        => __( 'Add or remove pattern categories' ),
-			'back_to_items'              => __( '&larr; Go to pattern categories' ),
+			'back_to_items'              => __( '&larr; Go to Pattern Categories' ),
 			'choose_from_most_used'      => __( 'Choose from the most used pattern categories' ),
 			'edit_item'                  => __( 'Edit Pattern Category' ),
 			'item_link'                  => __( 'Pattern Category Link' ),

From 65c1f46db7ed277e5932c81664e57558d9a981c6 Mon Sep 17 00:00:00 2001
From: David Calhoun <github@davidcalhoun.me>
Date: Tue, 23 Jan 2024 06:00:35 -0500
Subject: [PATCH 211/296] Mobile Release v1.110.1 (#58092)

* Release script: Update react-native-editor version to 1.110.0

* Release script: Update CHANGELOG for version 1.110.0

* Release script: Update podfile

* RNMobile: Avoid crashes by ensuring RichText value exists prior to `toString` calls (#58088)

* Release script: Update react-native-editor version to 1.110.1

* Release script: Update CHANGELOG for version 1.110.1

* Release script: Update podfile

* Revert version to 1.111.0

---------

Co-authored-by: Gerardo <gerardo.pacheco@automattic.com>
Co-authored-by: Siobhan Bamber <siobhan@automattic.com>
Co-authored-by: Derek Blank <derekpblank@gmail.com>
Co-authored-by: Carlos Garcia <fluiddot@gmail.com>
---
 packages/react-native-editor/CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index 3013f9da005cd..aec71c35186f0 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -11,13 +11,15 @@ For each user feature we should also add a importance categorization label  to i
 
 ## Unreleased
 -   [**] Video block: Fix logic for displaying empty state based on source presence [#58015]
--   [**] Fix crash when RichText values are not defined [#58088]
 
 ## 1.111.0
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
 -   [*] Fix missing custom color indicator for custom gradients [#57605]
 -   [**] Display a notice when a network connection unavailable [#56934]
 
+## 1.110.1
+-   [**] Fix crash when RichText values are not defined [#58088]
+
 ## 1.110.0
 -   [*] [internal] Move InserterButton from components package to block-editor package [#56494]
 -   [*] [internal] Move ImageLinkDestinationsScreen from components package to block-editor package [#56775]

From a74dec969ee7a9e2559ba35c7e2d165043a2a270 Mon Sep 17 00:00:00 2001
From: Jarda Snajdr <jsnajdr@gmail.com>
Date: Tue, 23 Jan 2024 12:35:51 +0100
Subject: [PATCH 212/296] Element: start reexporting PureComponent (#58076)

* Element: start reexporting PureComponent

* Add PR reference to changelog
---
 packages/element/CHANGELOG.md | 2 ++
 packages/element/README.md    | 6 ++++++
 packages/element/src/react.js | 6 ++++++
 3 files changed, 14 insertions(+)

diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index e57fc1e022e45..f3edc7994bf7a 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+-   Started exporting the `PureComponent` React API ([#58076](https://github.com/WordPress/gutenberg/pull/58076)).
+
 ## 5.26.0 (2024-01-10)
 
 ## 5.25.0 (2023-12-13)
diff --git a/packages/element/README.md b/packages/element/README.md
index 96aeeea37a462..5636fdda56a52 100755
--- a/packages/element/README.md
+++ b/packages/element/README.md
@@ -262,6 +262,12 @@ const placeholderLabel = Platform.select( {
 } );
 ```
 
+### PureComponent
+
+_Related_
+
+-   <https://reactjs.org/docs/react-api.html#reactpurecomponent>
+
 ### RawHTML
 
 Component used as equivalent of Fragment with unescaped HTML, in cases where it is desirable to render dangerous HTML without needing a wrapper element. To preserve additional props, a `div` wrapper _will_ be created if any props aside from `children` are passed.
diff --git a/packages/element/src/react.js b/packages/element/src/react.js
index 6882f9ad3344a..14bd4a66d2e0d 100644
--- a/packages/element/src/react.js
+++ b/packages/element/src/react.js
@@ -13,6 +13,7 @@ import {
 	Fragment,
 	isValidElement,
 	memo,
+	PureComponent,
 	StrictMode,
 	useCallback,
 	useContext,
@@ -238,6 +239,11 @@ export { lazy };
  */
 export { Suspense };
 
+/**
+ * @see https://reactjs.org/docs/react-api.html#reactpurecomponent
+ */
+export { PureComponent };
+
 /**
  * Concatenate two or more React children objects.
  *

From ebbb0428f36e0f2aee7ccfd75d7fa60239be42fc Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Tue, 23 Jan 2024 20:46:12 +0900
Subject: [PATCH 213/296] Docs: Fix typo in "The block wrapper" document
 (#58106)

---
 .../fundamentals/block-wrapper.md             | 50 +++++++++----------
 1 file changed, 25 insertions(+), 25 deletions(-)

diff --git a/docs/getting-started/fundamentals/block-wrapper.md b/docs/getting-started/fundamentals/block-wrapper.md
index 1f2404eca9b03..cf588cf33cf6f 100644
--- a/docs/getting-started/fundamentals/block-wrapper.md
+++ b/docs/getting-started/fundamentals/block-wrapper.md
@@ -2,7 +2,7 @@
 
 Each block's markup is wrapped by a container HTML tag that needs to have the proper attributes to fully work in the Block Editor and to reflect the proper block's style settings when rendered in the Block Editor and the front end. As developers, we have full control over the block's markup, and WordPress provides the tools to add the attributes that need to exist on the wrapper to our block's markup.
 
-Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like `supports`. 
+Ensuring proper attributes to the block wrapper is especially important when using custom styling or features like `supports`.
 
 <div class="callout callout-info">
 The use of <code>supports</code> generates a set of properties that need to be manually added to the wrapping element of the block so they're properly stored as part of the block data.
@@ -10,8 +10,8 @@ The use of <code>supports</code> generates a set of properties that need to be m
 
 A block can have three sets of markup defined, each one of them with a specific target and purpose:
 
-- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client. 
-- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client. 
+- The one for the **Block Editor**, defined through a `edit` React component passed to [`registerBlockType`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-registration/#registerblocktype) when registering the block in the client.
+- The one used to **save the block in the DB**, defined through a `save` function passed to `registerBlockType` when registering the block in the client.
     - This markup will be returned to the front end on request if no dynamic render has been defined for the block.
 - The one used to **dynamically render the markup of the block** returned to the front end on request, defined through the `render_callback` on [`register_block_type`](https://developer.wordpress.org/reference/functions/register_block_type/) or the [`render`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#render) PHP file in `block.json`
     - If defined, this server-side generated markup will be returned to the front end, ignoring the markup stored in DB.
@@ -21,13 +21,13 @@ For the [`edit` React component and the `save` function](https://developer.wordp
 
 ## The Edit component's markup
 
-The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper. 
+The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper.
 
 Among other things, the `useBlockProps()` hook takes care of including in this wrapper:
-- An `id` for the block's markup 
-- Some accesibility and `data-` attributes
+- An `id` for the block's markup
+- Some accessibility and `data-` attributes
 - Classes and inline styles reflecting custom settings, which include by default:
-    - The `wp-block` class 
+    - The `wp-block` class
     - A class that contains the name of the block with its namespace
 
 For example, for the following piece of code of a block's registration in the client...
@@ -43,18 +43,18 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/b
 
 ...the markup of the block in the Block Editor could look like this:
 ```html
-<p 
-    tabindex="0" 
-    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    role="document" 
-    aria-label="Block: Minimal Gutenberg Block ca6eda" 
-    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe" 
-    data-type="block-development-examples/minimal-block-ca6eda" 
-    data-title="Minimal Gutenberg Block ca6eda" 
+<p
+    tabindex="0"
+    id="block-4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    role="document"
+    aria-label="Block: Minimal Gutenberg Block ca6eda"
+    data-block="4462939a-b918-44bb-9b7c-35a0db5ab8fe"
+    data-type="block-development-examples/minimal-block-ca6eda"
+    data-title="Minimal Gutenberg Block ca6eda"
     class="
-        block-editor-block-list__block 
-        wp-block 
-        is-selected 
+        block-editor-block-list__block
+        wp-block
+        is-selected
         wp-block-block-development-examples-minimal-block-ca6eda
     "
 >Hello World - Block Editor</p>
@@ -87,16 +87,16 @@ _(see the [code above](https://github.com/WordPress/block-development-examples/b
 <p class="wp-block-block-development-examples-minimal-block-ca6eda">Hello World – Frontend</p>
 ```
 
-Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)). 
+Any additional classes and attributes for the `save` function of the block should be passed as an argument of `useBlockProps.save()` (see [example](https://github.com/WordPress/block-development-examples/blob/trunk/plugins/stylesheets-79a4c3/src/save.js)).
 
 When you add `supports` for any feature, the proper classes get added to the object returned by the `useBlockProps.save()` hook.
 
 ```html
 <p class="
-    wp-block-block-development-examples-block-supports-6aa4dd 
-    has-accent-4-color 
-    has-contrast-background-color 
-    has-text-color 
+    wp-block-block-development-examples-block-supports-6aa4dd
+    has-accent-4-color
+    has-contrast-background-color
+    has-text-color
     has-background
 ">Hello World</p>
 ```
@@ -105,10 +105,10 @@ _(check the [example](https://github.com/WordPress/block-development-examples/tr
 
 ## The server-side render markup
 
-Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)). 
+Any markup in the server-side render definition for the block can use the [`get_block_wrapper_attributes()`](https://developer.wordpress.org/reference/functions/get_block_wrapper_attributes/) function to generate the string of attributes required to reflect the block settings (see [example](https://github.com/WordPress/block-development-examples/blob/f68640f42d993f0866d1879f67c73910285ca114/plugins/block-dynamic-rendering-64756b/src/render.php#L11)).
 
 ```php
 <p <?php echo get_block_wrapper_attributes(); ?>>
 	<?php esc_html_e( 'Block with Dynamic Rendering – hello!!!', 'block-development-examples' ); ?>
 </p>
-```
\ No newline at end of file
+```

From 9e670780fd56052acbb1c4f0617a9faf329c5418 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Tue, 23 Jan 2024 20:47:36 +0900
Subject: [PATCH 214/296] DataViews: Don't always display horizontal scrollbar
 (#58101)

---
 packages/dataviews/src/style.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 4cd5395895c55..9a460bc07867c 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -60,7 +60,7 @@
 }
 
 .dataviews-view-table-wrapper {
-	overflow-x: scroll;
+	overflow-x: auto;
 }
 
 .dataviews-view-table {

From 4c96f5e5e595e78d0379a6496c41905487f1e27e Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Tue, 23 Jan 2024 16:45:18 +0400
Subject: [PATCH 215/296] Docs: Use 'key' in 'editor.BlockEdit' filter code
 examples (#58119)

---
 .../block-tutorial/extending-the-query-loop-block.md          | 4 ++--
 docs/reference-guides/filters/block-filters.md                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
index 9be4f3a993d20..d3628d991f872 100644
--- a/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
+++ b/docs/how-to-guides/block-tutorial/extending-the-query-loop-block.md
@@ -208,13 +208,13 @@ export const withBookQueryControls = ( BlockEdit ) => ( props ) => {
 	// function to handle that.
 	return isMyBooksVariation( props ) ? (
 		<>
-			<BlockEdit { ...props } />
+			<BlockEdit key="edit" { ...props } />
 			<InspectorControls>
 				<BookAuthorSelector /> { /** Our custom component */ }
 			</InspectorControls>
 		</>
 	) : (
-		<BlockEdit { ...props } />
+		<BlockEdit key="edit" { ...props } />
 	);
 };
 
diff --git a/docs/reference-guides/filters/block-filters.md b/docs/reference-guides/filters/block-filters.md
index 7e164a10e6c93..35a041052889c 100644
--- a/docs/reference-guides/filters/block-filters.md
+++ b/docs/reference-guides/filters/block-filters.md
@@ -189,7 +189,7 @@ const withMyPluginControls = createHigherOrderComponent( ( BlockEdit ) => {
 	return ( props ) => {
 		return (
 			<>
-				<BlockEdit { ...props } />
+				<BlockEdit key="edit" { ...props } />
 				<InspectorControls>
 					<PanelBody>My custom control</PanelBody>
 				</InspectorControls>

From 16c4d122f09e12481418ee9883397798d87fc6bb Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Tue, 23 Jan 2024 15:22:28 +0200
Subject: [PATCH 216/296] DataViews: Update template parts view (#57952)

* DataViews: Update template parts view

* fix initialization of edited entity for template parts

* make the view stable

* add clarification message
---
 .../edit-site/src/components/layout/router.js |  31 +++-
 .../components/page-template-parts/index.js   |  99 -------------
 .../actions.js}                               |  13 +-
 .../add-new-template-part.js                  |   0
 .../index.js                                  | 133 +++++++++++-------
 .../style.scss                                |   0
 .../use-init-edited-entity-from-url.js        |   4 +
 .../edit-site/src/store/private-actions.js    |  94 ++++++++-----
 packages/edit-site/src/style.scss             |   2 +-
 9 files changed, 183 insertions(+), 193 deletions(-)
 delete mode 100644 packages/edit-site/src/components/page-template-parts/index.js
 rename packages/edit-site/src/components/{page-templates/template-actions.js => page-templates-template-parts/actions.js} (95%)
 rename packages/edit-site/src/components/{page-template-parts => page-templates-template-parts}/add-new-template-part.js (100%)
 rename packages/edit-site/src/components/{page-templates => page-templates-template-parts}/index.js (78%)
 rename packages/edit-site/src/components/{page-templates => page-templates-template-parts}/style.scss (100%)

diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
index f91de7767f5bd..f3c6c572db607 100644
--- a/packages/edit-site/src/components/layout/router.js
+++ b/packages/edit-site/src/components/layout/router.js
@@ -12,8 +12,12 @@ import Editor from '../editor';
 import DataviewsPatterns from '../page-patterns/dataviews-patterns';
 import PagePages from '../page-pages';
 import PagePatterns from '../page-patterns';
-import PageTemplateParts from '../page-template-parts';
-import PageTemplates from '../page-templates';
+import PageTemplatesTemplateParts from '../page-templates-template-parts';
+
+import {
+	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
+} from '../../utils/constants';
 
 const { useLocation } = unlock( routerPrivateApis );
 
@@ -21,7 +25,6 @@ export default function useLayoutAreas() {
 	const isSiteEditorLoading = useIsSiteEditorLoading();
 	const { params } = useLocation();
 	const { postType, postId, path, layout, isCustom } = params ?? {};
-
 	// Regular page
 	if ( path === '/page' ) {
 		const isListLayout =
@@ -62,7 +65,11 @@ export default function useLayoutAreas() {
 			window?.__experimentalAdminViews;
 		return {
 			areas: {
-				content: <PageTemplates />,
+				content: (
+					<PageTemplatesTemplateParts
+						postType={ TEMPLATE_POST_TYPE }
+					/>
+				),
 				preview: isListLayout && (
 					<Editor isLoading={ isSiteEditorLoading } />
 				),
@@ -75,9 +82,23 @@ export default function useLayoutAreas() {
 
 	// Template parts
 	if ( path === '/wp_template_part/all' ) {
+		const isListLayout =
+			isCustom !== 'true' &&
+			layout === 'list' &&
+			window?.__experimentalAdminViews;
 		return {
 			areas: {
-				content: <PageTemplateParts />,
+				content: (
+					<PageTemplatesTemplateParts
+						postType={ TEMPLATE_PART_POST_TYPE }
+					/>
+				),
+				preview: isListLayout && (
+					<Editor isLoading={ isSiteEditorLoading } />
+				),
+			},
+			widths: {
+				content: isListLayout ? 380 : undefined,
 			},
 		};
 	}
diff --git a/packages/edit-site/src/components/page-template-parts/index.js b/packages/edit-site/src/components/page-template-parts/index.js
deleted file mode 100644
index 2a8c41e333ce2..0000000000000
--- a/packages/edit-site/src/components/page-template-parts/index.js
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	VisuallyHidden,
-	__experimentalHeading as Heading,
-	__experimentalVStack as VStack,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import { useEntityRecords } from '@wordpress/core-data';
-import { decodeEntities } from '@wordpress/html-entities';
-import { privateApis as routerPrivateApis } from '@wordpress/router';
-
-/**
- * Internal dependencies
- */
-import Page from '../page';
-import Table from '../table';
-import Link from '../routes/link';
-import AddedBy from '../list/added-by';
-import TemplateActions from '../template-actions';
-import AddNewTemplatePart from './add-new-template-part';
-import { TEMPLATE_PART_POST_TYPE } from '../../utils/constants';
-import { unlock } from '../../lock-unlock';
-
-const { useLocation } = unlock( routerPrivateApis );
-
-export default function PageTemplateParts() {
-	const {
-		params: { didAccessPatternsPage },
-	} = useLocation();
-
-	const { records: templateParts } = useEntityRecords(
-		'postType',
-		TEMPLATE_PART_POST_TYPE,
-		{
-			per_page: -1,
-		}
-	);
-
-	const columns = [
-		{
-			header: __( 'Template Part' ),
-			cell: ( templatePart ) => (
-				<VStack>
-					<Heading as="h3" level={ 5 }>
-						<Link
-							params={ {
-								postId: templatePart.id,
-								postType: templatePart.type,
-								didAccessPatternsPage: !! didAccessPatternsPage
-									? 1
-									: undefined,
-							} }
-							state={ {
-								backPath: '/wp_template_part/all',
-							} }
-						>
-							{ decodeEntities(
-								templatePart.title?.rendered ||
-									templatePart.slug
-							) }
-						</Link>
-					</Heading>
-				</VStack>
-			),
-			maxWidth: 400,
-		},
-		{
-			header: __( 'Added by' ),
-			cell: ( templatePart ) => (
-				<AddedBy
-					postType={ templatePart.type }
-					postId={ templatePart.id }
-				/>
-			),
-		},
-		{
-			header: <VisuallyHidden>{ __( 'Actions' ) }</VisuallyHidden>,
-			cell: ( templatePart ) => (
-				<TemplateActions
-					postType={ templatePart.type }
-					postId={ templatePart.id }
-				/>
-			),
-		},
-	];
-
-	return (
-		<Page
-			title={ __( 'Template Parts' ) }
-			actions={ <AddNewTemplatePart /> }
-		>
-			{ templateParts && (
-				<Table data={ templateParts } columns={ columns } />
-			) }
-		</Page>
-	);
-}
diff --git a/packages/edit-site/src/components/page-templates/template-actions.js b/packages/edit-site/src/components/page-templates-template-parts/actions.js
similarity index 95%
rename from packages/edit-site/src/components/page-templates/template-actions.js
rename to packages/edit-site/src/components/page-templates-template-parts/actions.js
index 7029d464ca867..7f9fff72660ff 100644
--- a/packages/edit-site/src/components/page-templates/template-actions.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/actions.js
@@ -167,8 +167,17 @@ export const deleteTemplateAction = {
 export const renameTemplateAction = {
 	id: 'rename-template',
 	label: __( 'Rename' ),
-	isEligible: ( template ) =>
-		isTemplateRemovable( template ) && template.is_custom,
+	isEligible: ( template ) => {
+		// We can only remove templates or template parts that can be removed.
+		// Additionally in the case of templates, we can only remove custom templates.
+		if (
+			! isTemplateRemovable( template ) ||
+			( template.type === TEMPLATE_POST_TYPE && ! template.is_custom )
+		) {
+			return false;
+		}
+		return true;
+	},
 	RenderModal: ( { items: templates, closeModal } ) => {
 		const template = templates[ 0 ];
 		const title = decodeEntities( template.title.rendered );
diff --git a/packages/edit-site/src/components/page-template-parts/add-new-template-part.js b/packages/edit-site/src/components/page-templates-template-parts/add-new-template-part.js
similarity index 100%
rename from packages/edit-site/src/components/page-template-parts/add-new-template-part.js
rename to packages/edit-site/src/components/page-templates-template-parts/add-new-template-part.js
diff --git a/packages/edit-site/src/components/page-templates/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
similarity index 78%
rename from packages/edit-site/src/components/page-templates/index.js
rename to packages/edit-site/src/components/page-templates-template-parts/index.js
index 7995ebe376b57..f2240fec5bd12 100644
--- a/packages/edit-site/src/components/page-templates/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -37,6 +37,7 @@ import AddNewTemplate from '../add-new-template';
 import { useAddedBy, AvatarImage } from '../list/added-by';
 import {
 	TEMPLATE_POST_TYPE,
+	TEMPLATE_PART_POST_TYPE,
 	ENUMERATION_TYPE,
 	OPERATOR_IN,
 	OPERATOR_NOT_IN,
@@ -48,10 +49,11 @@ import {
 	useResetTemplateAction,
 	deleteTemplateAction,
 	renameTemplateAction,
-} from './template-actions';
+} from './actions';
 import { postRevisionsAction } from '../actions';
 import usePatternSettings from '../page-patterns/use-pattern-settings';
 import { unlock } from '../../lock-unlock';
+import AddNewTemplatePart from './add-new-template-part';
 
 const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
 	blockEditorPrivateApis
@@ -90,19 +92,24 @@ function normalizeSearchInput( input = '' ) {
 	return removeAccents( input.trim().toLowerCase() );
 }
 
-function TemplateTitle( { item, viewType } ) {
+function Title( { item, viewType } ) {
 	if ( viewType === LAYOUT_LIST ) {
 		return decodeEntities( item.title?.rendered ) || __( '(no title)' );
 	}
-
+	const linkProps = {
+		params: {
+			postId: item.id,
+			postType: item.type,
+			canvas: 'edit',
+		},
+	};
+	if ( item.type === TEMPLATE_PART_POST_TYPE ) {
+		linkProps.state = {
+			backPath: '/wp_template_part/all',
+		};
+	}
 	return (
-		<Link
-			params={ {
-				postId: item.id,
-				postType: item.type,
-				canvas: 'edit',
-			} }
-		>
+		<Link { ...linkProps }>
 			{ decodeEntities( item.title?.rendered ) || __( '(no title)' ) }
 		</Link>
 	);
@@ -125,7 +132,7 @@ function AuthorField( { item, viewType } ) {
 	);
 }
 
-function TemplatePreview( { content, viewType } ) {
+function Preview( { content, viewType } ) {
 	const settings = usePatternSettings();
 	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
 	const blocks = useMemo( () => {
@@ -153,7 +160,7 @@ function TemplatePreview( { content, viewType } ) {
 	);
 }
 
-export default function DataviewsTemplates() {
+export default function PageTemplatesTemplateParts( { postType } ) {
 	const { params } = useLocation();
 	const { layout } = params;
 	const defaultView = useMemo( () => {
@@ -163,10 +170,13 @@ export default function DataviewsTemplates() {
 		};
 	}, [ layout ] );
 	const [ view, setView ] = useState( defaultView );
-	const { records: allTemplates, isResolving: isLoadingData } =
-		useEntityRecords( 'postType', TEMPLATE_POST_TYPE, {
+	const { records, isResolving: isLoadingData } = useEntityRecords(
+		'postType',
+		postType,
+		{
 			per_page: -1,
-		} );
+		}
+	);
 	const history = useHistory();
 	const onSelectionChange = useCallback(
 		( items ) => {
@@ -181,27 +191,27 @@ export default function DataviewsTemplates() {
 	);
 
 	const authors = useMemo( () => {
-		if ( ! allTemplates ) {
+		if ( ! records ) {
 			return EMPTY_ARRAY;
 		}
 		const authorsSet = new Set();
-		allTemplates.forEach( ( template ) => {
+		records.forEach( ( template ) => {
 			authorsSet.add( template.author_text );
 		} );
 		return Array.from( authorsSet ).map( ( author ) => ( {
 			value: author,
 			label: author,
 		} ) );
-	}, [ allTemplates ] );
+	}, [ records ] );
 
-	const fields = useMemo(
-		() => [
+	const fields = useMemo( () => {
+		const _fields = [
 			{
 				header: __( 'Preview' ),
 				id: 'preview',
 				render: ( { item } ) => {
 					return (
-						<TemplatePreview
+						<Preview
 							content={ item.content.raw }
 							viewType={ view.type }
 						/>
@@ -212,16 +222,21 @@ export default function DataviewsTemplates() {
 				enableSorting: false,
 			},
 			{
-				header: __( 'Template' ),
+				header:
+					postType === TEMPLATE_POST_TYPE
+						? __( 'Template' )
+						: __( 'Template Part' ),
 				id: 'title',
 				getValue: ( { item } ) => item.title?.rendered,
 				render: ( { item } ) => (
-					<TemplateTitle item={ item } viewType={ view.type } />
+					<Title item={ item } viewType={ view.type } />
 				),
 				maxWidth: 400,
 				enableHiding: false,
 			},
-			{
+		];
+		if ( postType === TEMPLATE_POST_TYPE ) {
+			_fields.push( {
 				header: __( 'Description' ),
 				id: 'description',
 				getValue: ( { item } ) => item.description,
@@ -246,35 +261,37 @@ export default function DataviewsTemplates() {
 				maxWidth: 400,
 				minWidth: 320,
 				enableSorting: false,
+			} );
+		}
+		// TODO: The plan is to support fields reordering, which would require an API like `order` or something
+		// similar. With the aforementioned API we wouldn't need to construct the fields array like this.
+		_fields.push( {
+			header: __( 'Author' ),
+			id: 'author',
+			getValue: ( { item } ) => item.author_text,
+			render: ( { item } ) => {
+				return <AuthorField viewType={ view.type } item={ item } />;
 			},
-			{
-				header: __( 'Author' ),
-				id: 'author',
-				getValue: ( { item } ) => item.author_text,
-				render: ( { item } ) => {
-					return <AuthorField viewType={ view.type } item={ item } />;
-				},
-				enableHiding: false,
-				type: ENUMERATION_TYPE,
-				elements: authors,
-				width: '1%',
-			},
-		],
-		[ authors, view.type ]
-	);
+			enableHiding: false,
+			type: ENUMERATION_TYPE,
+			elements: authors,
+			width: '1%',
+		} );
+		return _fields;
+	}, [ postType, authors, view.type ] );
 
 	const { data, paginationInfo } = useMemo( () => {
-		if ( ! allTemplates ) {
+		if ( ! records ) {
 			return {
 				data: EMPTY_ARRAY,
 				paginationInfo: { totalItems: 0, totalPages: 0 },
 			};
 		}
-		let filteredTemplates = [ ...allTemplates ];
+		let filteredData = [ ...records ];
 		// Handle global search.
 		if ( view.search ) {
 			const normalizedSearch = normalizeSearchInput( view.search );
-			filteredTemplates = filteredTemplates.filter( ( item ) => {
+			filteredData = filteredData.filter( ( item ) => {
 				const title = item.title?.rendered || item.slug;
 				return (
 					normalizeSearchInput( title ).includes(
@@ -295,7 +312,7 @@ export default function DataviewsTemplates() {
 					filter.operator === OPERATOR_IN &&
 					!! filter.value
 				) {
-					filteredTemplates = filteredTemplates.filter( ( item ) => {
+					filteredData = filteredData.filter( ( item ) => {
 						return item.author_text === filter.value;
 					} );
 				} else if (
@@ -303,7 +320,7 @@ export default function DataviewsTemplates() {
 					filter.operator === OPERATOR_NOT_IN &&
 					!! filter.value
 				) {
-					filteredTemplates = filteredTemplates.filter( ( item ) => {
+					filteredData = filteredData.filter( ( item ) => {
 						return item.author_text !== filter.value;
 					} );
 				}
@@ -312,8 +329,8 @@ export default function DataviewsTemplates() {
 
 		// Handle sorting.
 		if ( view.sort ) {
-			filteredTemplates = sortByTextFields( {
-				data: filteredTemplates,
+			filteredData = sortByTextFields( {
+				data: filteredData,
 				view,
 				fields,
 				textFields: [ 'title' ],
@@ -321,10 +338,10 @@ export default function DataviewsTemplates() {
 		}
 		// Handle pagination.
 		return getPaginationResults( {
-			data: filteredTemplates,
+			data: filteredData,
 			view,
 		} );
-	}, [ allTemplates, view, fields ] );
+	}, [ records, view, fields ] );
 
 	const resetTemplateAction = useResetTemplateAction();
 	const actions = useMemo(
@@ -360,13 +377,21 @@ export default function DataviewsTemplates() {
 
 	return (
 		<Page
-			title={ __( 'Templates' ) }
+			title={
+				postType === TEMPLATE_POST_TYPE
+					? __( 'Templates' )
+					: __( 'Template Parts' )
+			}
 			actions={
-				<AddNewTemplate
-					templateType={ TEMPLATE_POST_TYPE }
-					showIcon={ false }
-					toggleProps={ { variant: 'primary' } }
-				/>
+				postType === TEMPLATE_POST_TYPE ? (
+					<AddNewTemplate
+						templateType={ postType }
+						showIcon={ false }
+						toggleProps={ { variant: 'primary' } }
+					/>
+				) : (
+					<AddNewTemplatePart />
+				)
 			}
 		>
 			<DataViews
diff --git a/packages/edit-site/src/components/page-templates/style.scss b/packages/edit-site/src/components/page-templates-template-parts/style.scss
similarity index 100%
rename from packages/edit-site/src/components/page-templates/style.scss
rename to packages/edit-site/src/components/page-templates-template-parts/style.scss
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 4c2214b76abd3..579097866a360 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -211,6 +211,10 @@ function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 		return { isReady: true, postType: 'wp_template', postId, context };
 	}
 
+	if ( path === '/wp_template_part/all' && postId ) {
+		return { isReady: true, postType: 'wp_template_part', postId, context };
+	}
+
 	if ( postTypesWithoutParentTemplate.includes( postType ) ) {
 		return { isReady: true, postType, postId, context };
 	}
diff --git a/packages/edit-site/src/store/private-actions.js b/packages/edit-site/src/store/private-actions.js
index 71f35dc66399e..930e89c625410 100644
--- a/packages/edit-site/src/store/private-actions.js
+++ b/packages/edit-site/src/store/private-actions.js
@@ -9,6 +9,11 @@ import { store as noticesStore } from '@wordpress/notices';
 import { __, sprintf } from '@wordpress/i18n';
 import { decodeEntities } from '@wordpress/html-entities';
 
+/**
+ * Internal dependencies
+ */
+import { TEMPLATE_POST_TYPE } from '../utils/constants';
+
 /**
  * Action that switches the canvas mode.
  *
@@ -57,19 +62,20 @@ export const setEditorCanvasContainerView =
 /**
  * Action that removes an array of templates.
  *
- * @param {Array} templates An array of template objects to remove.
+ * @param {Array} items An array of template or template part objects to remove.
  */
 export const removeTemplates =
-	( templates ) =>
+	( items ) =>
 	async ( { registry } ) => {
+		const isTemplate = items[ 0 ].type === TEMPLATE_POST_TYPE;
 		const promiseResult = await Promise.allSettled(
-			templates.map( ( template ) => {
+			items.map( ( item ) => {
 				return registry
 					.dispatch( coreStore )
 					.deleteEntityRecord(
 						'postType',
-						template.type,
-						template.id,
+						item.type,
+						item.id,
 						{ force: true },
 						{ throwOnError: true }
 					);
@@ -80,20 +86,22 @@ export const removeTemplates =
 		if ( promiseResult.every( ( { status } ) => status === 'fulfilled' ) ) {
 			let successMessage;
 
-			if ( templates.length === 1 ) {
+			if ( items.length === 1 ) {
 				// Depending on how the entity was retrieved its title might be
 				// an object or simple string.
-				const templateTitle =
-					typeof templates[ 0 ].title === 'string'
-						? templates[ 0 ].title
-						: templates[ 0 ].title?.rendered;
+				const title =
+					typeof items[ 0 ].title === 'string'
+						? items[ 0 ].title
+						: items[ 0 ].title?.rendered;
 				successMessage = sprintf(
 					/* translators: The template/part's name. */
 					__( '"%s" deleted.' ),
-					decodeEntities( templateTitle )
+					decodeEntities( title )
 				);
 			} else {
-				successMessage = __( 'Templates deleted.' );
+				successMessage = isTemplate
+					? __( 'Templates deleted.' )
+					: __( 'Template parts deleted.' );
 			}
 
 			registry
@@ -110,9 +118,11 @@ export const removeTemplates =
 				if ( promiseResult[ 0 ].reason?.message ) {
 					errorMessage = promiseResult[ 0 ].reason.message;
 				} else {
-					errorMessage = __(
-						'An error occurred while deleting the template.'
-					);
+					errorMessage = isTemplate
+						? __( 'An error occurred while deleting the template.' )
+						: __(
+								'An error occurred while deleting the template part.'
+						  );
 				}
 				// If we were trying to delete a multiple templates
 			} else {
@@ -126,25 +136,45 @@ export const removeTemplates =
 					}
 				}
 				if ( errorMessages.size === 0 ) {
-					errorMessage = __(
-						'An error occurred while deleting the templates.'
-					);
+					errorMessage = isTemplate
+						? __(
+								'An error occurred while deleting the templates.'
+						  )
+						: __(
+								'An error occurred while deleting the template parts.'
+						  );
 				} else if ( errorMessages.size === 1 ) {
-					errorMessage = sprintf(
-						/* translators: %s: an error message */
-						__(
-							'An error occurred while deleting the templates: %s'
-						),
-						[ ...errorMessages ][ 0 ]
-					);
+					errorMessage = isTemplate
+						? sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while deleting the templates: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+						  )
+						: sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while deleting the template parts: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+						  );
 				} else {
-					errorMessage = sprintf(
-						/* translators: %s: a list of comma separated error messages */
-						__(
-							'Some errors occurred while deleting the templates: %s'
-						),
-						[ ...errorMessages ].join( ',' )
-					);
+					errorMessage = isTemplate
+						? sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while deleting the templates: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+						  )
+						: sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while deleting the template parts: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+						  );
 				}
 			}
 			registry
diff --git a/packages/edit-site/src/style.scss b/packages/edit-site/src/style.scss
index 164a8523b1962..e6cb953b0b186 100644
--- a/packages/edit-site/src/style.scss
+++ b/packages/edit-site/src/style.scss
@@ -12,7 +12,7 @@
 @import "./components/page/style.scss";
 @import "./components/page-pages/style.scss";
 @import "./components/page-patterns/style.scss";
-@import "./components/page-templates/style.scss";
+@import "./components/page-templates-template-parts/style.scss";
 @import "./components/table/style.scss";
 @import "./components/sidebar-edit-mode/style.scss";
 @import "./components/sidebar-edit-mode/page-panels/style.scss";

From 6c83bf60cde1d212eef62fe1849f2f88e2c9a311 Mon Sep 17 00:00:00 2001
From: Miguel Fonseca <150562+mcsf@users.noreply.github.com>
Date: Tue, 23 Jan 2024 13:28:10 +0000
Subject: [PATCH 217/296] Block editor: Stabilize RecursionProvider and
 useHasRecursion APIs (#58120)

Addresses #57672
---
 packages/block-editor/CHANGELOG.md            |  2 ++
 packages/block-editor/README.md               | 32 +++++++++++++++++++
 packages/block-editor/src/components/index.js |  6 ++--
 .../src/components/index.native.js            |  6 ++--
 .../components/recursion-provider/README.md   |  4 +--
 .../components/recursion-provider/index.js    | 17 ++++++++++
 packages/block-library/src/block/edit.js      |  4 +--
 packages/block-library/src/block/v1/edit.js   |  4 +--
 .../block-library/src/block/v1/edit.native.js |  4 +--
 .../src/navigation/edit/index.js              |  4 +--
 .../block-library/src/post-content/edit.js    |  4 +--
 .../src/template-part/edit/index.js           |  4 +--
 .../src/components/editor-canvas/index.js     |  2 +-
 13 files changed, 74 insertions(+), 19 deletions(-)

diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index a66143dd30ac9..ec4793ec970ee 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Deprecated `__experimentalRecursionProvider` and `__experimentalUseHasRecursion` in favor of their new stable counterparts `RecursionProvider` and `useHasRecursion`.
+
 ## 12.17.0 (2024-01-10)
 
 ## 12.16.0 (2023-12-13)
diff --git a/packages/block-editor/README.md b/packages/block-editor/README.md
index 5917ac235505c..6fc51d8451212 100644
--- a/packages/block-editor/README.md
+++ b/packages/block-editor/README.md
@@ -707,6 +707,23 @@ _Related_
 
 Private @wordpress/block-editor APIs.
 
+### RecursionProvider
+
+A React context provider for use with the `useHasRecursion` hook to prevent recursive renders.
+
+Wrap block content with this provider and provide the same `uniqueId` prop as used with `useHasRecursion`.
+
+_Parameters_
+
+-   _props_ `Object`:
+-   _props.uniqueId_ `*`: Any value that acts as a unique identifier for a block instance.
+-   _props.blockName_ `string`: Optional block name.
+-   _props.children_ `JSX.Element`: React children.
+
+_Returns_
+
+-   `JSX.Element`: A React element.
+
 ### ReusableBlocksRenameHint
 
 Undocumented declaration.
@@ -941,6 +958,21 @@ _Returns_
 
 -   `any`: value
 
+### useHasRecursion
+
+A React hook for keeping track of blocks previously rendered up in the block tree. Blocks susceptible to recursion can use this hook in their `Edit` function to prevent said recursion.
+
+Use this with the `RecursionProvider` component, using the same `uniqueId` value for both the hook and the provider.
+
+_Parameters_
+
+-   _uniqueId_ `*`: Any value that acts as a unique identifier for a block instance.
+-   _blockName_ `string`: Optional block name.
+
+_Returns_
+
+-   `boolean`: A boolean describing whether the provided id has already been rendered.
+
 ### useInnerBlocksProps
 
 This hook is used to lightly mark an element as an inner blocks wrapper element. Call this hook and pass the returned props to the element to mark as an inner blocks wrapper, automatically rendering inner blocks as children. If you define a ref for the element, it is important to pass the ref to this hook, which the hook in turn will pass to the component through the props it returns. Optionally, you can also pass any other props through this hook, and they will be merged and returned.
diff --git a/packages/block-editor/src/components/index.js b/packages/block-editor/src/components/index.js
index 08247d8cdb014..5263ca3332b25 100644
--- a/packages/block-editor/src/components/index.js
+++ b/packages/block-editor/src/components/index.js
@@ -152,8 +152,10 @@ export { default as WritingFlow } from './writing-flow';
 export { default as useBlockDisplayInformation } from './use-block-display-information';
 export { default as __unstableIframe } from './iframe';
 export {
-	RecursionProvider as __experimentalRecursionProvider,
-	useHasRecursion as __experimentalUseHasRecursion,
+	RecursionProvider,
+	DeprecatedExperimentalRecursionProvider as __experimentalRecursionProvider,
+	useHasRecursion,
+	DeprecatedExperimentalUseHasRecursion as __experimentalUseHasRecursion,
 } from './recursion-provider';
 export { default as __experimentalBlockPatternsList } from './block-patterns-list';
 export { default as __experimentalPublishDateTimePicker } from './publish-date-time-picker';
diff --git a/packages/block-editor/src/components/index.native.js b/packages/block-editor/src/components/index.native.js
index 21a9b1114ce5f..ac4b45af3609c 100644
--- a/packages/block-editor/src/components/index.native.js
+++ b/packages/block-editor/src/components/index.native.js
@@ -61,8 +61,10 @@ export { default as PanelColorSettings } from './panel-color-settings';
 export { default as __experimentalPanelColorGradientSettings } from './colors-gradients/panel-color-gradient-settings';
 export { useSettings, default as useSetting } from './use-settings';
 export {
-	RecursionProvider as __experimentalRecursionProvider,
-	useHasRecursion as __experimentalUseHasRecursion,
+	RecursionProvider,
+	DeprecatedExperimentalRecursionProvider as __experimentalRecursionProvider,
+	useHasRecursion,
+	DeprecatedExperimentalUseHasRecursion as __experimentalUseHasRecursion,
 } from './recursion-provider';
 export { default as Warning } from './warning';
 export { default as ContrastChecker } from './contrast-checker';
diff --git a/packages/block-editor/src/components/recursion-provider/README.md b/packages/block-editor/src/components/recursion-provider/README.md
index 4538fd6a7d350..37af15d75c191 100644
--- a/packages/block-editor/src/components/recursion-provider/README.md
+++ b/packages/block-editor/src/components/recursion-provider/README.md
@@ -11,8 +11,8 @@ To help with detecting infinite loops on the client, the `RecursionProvider` com
  * WordPress dependencies
  */
 import {
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	useBlockProps,
 	Warning,
 } from '@wordpress/block-editor';
diff --git a/packages/block-editor/src/components/recursion-provider/index.js b/packages/block-editor/src/components/recursion-provider/index.js
index 2c38087a8731d..4f462cb33ef2a 100644
--- a/packages/block-editor/src/components/recursion-provider/index.js
+++ b/packages/block-editor/src/components/recursion-provider/index.js
@@ -2,6 +2,7 @@
  * WordPress dependencies
  */
 import { createContext, useContext, useMemo } from '@wordpress/element';
+import deprecated from '@wordpress/deprecated';
 
 /**
  * Internal dependencies
@@ -82,3 +83,19 @@ export function useHasRecursion( uniqueId, blockName = '' ) {
 	blockName = blockName || name;
 	return Boolean( previouslyRenderedBlocks[ blockName ]?.has( uniqueId ) );
 }
+
+export const DeprecatedExperimentalRecursionProvider = ( props ) => {
+	deprecated( 'wp.blockEditor.__experimentalRecursionProvider', {
+		since: '6.5',
+		alternative: 'wp.blockEditor.RecursionProvider',
+	} );
+	return <RecursionProvider { ...props } />;
+};
+
+export const DeprecatedExperimentalUseHasRecursion = ( props ) => {
+	deprecated( 'wp.blockEditor.__experimentalUseHasRecursion', {
+		since: '6.5',
+		alternative: 'wp.blockEditor.useHasRecursion',
+	} );
+	return useHasRecursion( ...props );
+};
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index c53f52bfb703e..cd04e09605ff4 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -18,8 +18,8 @@ import {
 import { __ } from '@wordpress/i18n';
 import {
 	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	InnerBlocks,
 	useBlockProps,
 	Warning,
diff --git a/packages/block-library/src/block/v1/edit.js b/packages/block-library/src/block/v1/edit.js
index 5975711376c65..aa8f680c83792 100644
--- a/packages/block-library/src/block/v1/edit.js
+++ b/packages/block-library/src/block/v1/edit.js
@@ -20,8 +20,8 @@ import {
 import { __ } from '@wordpress/i18n';
 import {
 	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	InnerBlocks,
 	InspectorControls,
 	useBlockProps,
diff --git a/packages/block-library/src/block/v1/edit.native.js b/packages/block-library/src/block/v1/edit.native.js
index 3a649921b3dda..9077988456b70 100644
--- a/packages/block-library/src/block/v1/edit.native.js
+++ b/packages/block-library/src/block/v1/edit.native.js
@@ -27,8 +27,8 @@ import {
 import { useSelect, useDispatch } from '@wordpress/data';
 import { __, sprintf } from '@wordpress/i18n';
 import {
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	InnerBlocks,
 	Warning,
 	store as blockEditorStore,
diff --git a/packages/block-library/src/navigation/edit/index.js b/packages/block-library/src/navigation/edit/index.js
index 5589e8ea9e60f..14ef6fc73d48f 100644
--- a/packages/block-library/src/navigation/edit/index.js
+++ b/packages/block-library/src/navigation/edit/index.js
@@ -16,8 +16,8 @@ import {
 import {
 	InspectorControls,
 	useBlockProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	store as blockEditorStore,
 	withColors,
 	ContrastChecker,
diff --git a/packages/block-library/src/post-content/edit.js b/packages/block-library/src/post-content/edit.js
index ae3bb938c90ee..041a3b4fa02f6 100644
--- a/packages/block-library/src/post-content/edit.js
+++ b/packages/block-library/src/post-content/edit.js
@@ -5,8 +5,8 @@ import { __ } from '@wordpress/i18n';
 import {
 	useBlockProps,
 	useInnerBlocksProps,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	Warning,
 } from '@wordpress/block-editor';
 import {
diff --git a/packages/block-library/src/template-part/edit/index.js b/packages/block-library/src/template-part/edit/index.js
index ec92996978bd6..72fc06338e780 100644
--- a/packages/block-library/src/template-part/edit/index.js
+++ b/packages/block-library/src/template-part/edit/index.js
@@ -7,8 +7,8 @@ import {
 	useBlockProps,
 	Warning,
 	store as blockEditorStore,
-	__experimentalRecursionProvider as RecursionProvider,
-	__experimentalUseHasRecursion as useHasRecursion,
+	RecursionProvider,
+	useHasRecursion,
 	InspectorControls,
 } from '@wordpress/block-editor';
 import { Spinner, Modal, MenuItem } from '@wordpress/components';
diff --git a/packages/editor/src/components/editor-canvas/index.js b/packages/editor/src/components/editor-canvas/index.js
index d6084ef922805..a06c8096134cf 100644
--- a/packages/editor/src/components/editor-canvas/index.js
+++ b/packages/editor/src/components/editor-canvas/index.js
@@ -12,7 +12,7 @@ import {
 	__unstableUseTypewriter as useTypewriter,
 	__unstableUseTypingObserver as useTypingObserver,
 	useSettings,
-	__experimentalRecursionProvider as RecursionProvider,
+	RecursionProvider,
 	privateApis as blockEditorPrivateApis,
 	__experimentalUseResizeCanvas as useResizeCanvas,
 } from '@wordpress/block-editor';

From 22276a293d943f98ec05004ed8a8438003354082 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Tue, 23 Jan 2024 14:39:03 +0100
Subject: [PATCH 218/296] Tooltip and Button: tidy up unit tests (#57975)

* Use vanilla button instead of `Button` in tooltip tests

* Add more Tooltip tests to the Button component

* CHANGELOG

* Remove unncecessary input
---
 packages/components/CHANGELOG.md              |  1 +
 packages/components/src/button/test/index.tsx | 85 +++++++++++++++++++
 .../components/src/tooltip/test/index.tsx     | 21 ++---
 3 files changed, 94 insertions(+), 13 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 92ce15dc425f6..8dda4d475e6b2 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -9,6 +9,7 @@
 -   `PaletteEdit`: improve unit tests ([#57645](https://github.com/WordPress/gutenberg/pull/57645)).
 -   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
+-   `Tooltip` and `Button`: tidy up unit tests ([#57975](https://github.com/WordPress/gutenberg/pull/57975)).
 
 ### Bug Fix
 
diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index fb6c6a72b9adc..345ae3813fe06 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -112,6 +112,91 @@ describe( 'Button', () => {
 			);
 		} );
 
+		it( 'should render correctly as a tooltip anchor', async () => {
+			const user = userEvent.setup();
+
+			render(
+				<>
+					<Tooltip text="Tooltip text">
+						<Button icon={ plusCircle } label="Tooltip anchor" />
+					</Tooltip>
+					<Button>Focus me</Button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Tooltip anchor',
+			} );
+
+			await user.tab();
+
+			expect( anchor ).toHaveFocus();
+
+			const tooltip = await screen.findByRole( 'tooltip', {
+				name: 'Tooltip text',
+			} );
+
+			expect( tooltip ).toBeVisible();
+
+			await user.tab();
+
+			expect(
+				screen.getByRole( 'button', { name: 'Focus me' } )
+			).toHaveFocus();
+
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Tooltip text',
+				} )
+			).not.toBeInTheDocument();
+		} );
+
+		it( 'should render correctly as a tooltip anchor, ignoring its internal tooltip in favour of the external tooltip', async () => {
+			const user = userEvent.setup();
+
+			render(
+				<>
+					<Tooltip text="Tooltip text">
+						<Button icon={ plusCircle } label="Button label" />
+					</Tooltip>
+					<Button>Focus me</Button>
+				</>
+			);
+
+			const anchor = screen.getByRole( 'button', {
+				name: 'Button label',
+			} );
+
+			await user.tab();
+
+			expect( anchor ).toHaveFocus();
+
+			const tooltip = await screen.findByRole( 'tooltip', {
+				name: 'Tooltip text',
+			} );
+
+			expect( tooltip ).toBeVisible();
+			// Check that the tooltip that would be normally rendered internally by
+			// the `Button` component is ignored, because of an outer tooltip.
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Button label',
+				} )
+			).not.toBeInTheDocument();
+
+			await user.tab();
+
+			expect(
+				screen.getByRole( 'button', { name: 'Focus me' } )
+			).toHaveFocus();
+
+			expect(
+				screen.queryByRole( 'tooltip', {
+					name: 'Tooltip text',
+				} )
+			).not.toBeInTheDocument();
+		} );
+
 		it( 'should add a disabled prop to the button', () => {
 			render( <Button disabled /> );
 
diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index 40038bbc5e25a..cbe09dc321412 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -12,12 +12,11 @@ import { shortcutAriaLabel } from '@wordpress/keycodes';
 /**
  * Internal dependencies
  */
-import Button from '../../button';
 import Modal from '../../modal';
 import Tooltip, { TOOLTIP_DELAY } from '..';
 
 const props = {
-	children: <Button>Tooltip anchor</Button>,
+	children: <button>Tooltip anchor</button>,
 	text: 'tooltip text',
 };
 
@@ -56,8 +55,8 @@ describe( 'Tooltip', () => {
 			render(
 				// @ts-expect-error Tooltip cannot have more than one child element
 				<Tooltip { ...props }>
-					<Button>First button</Button>
-					<Button>Second button</Button>
+					<button>First button</button>
+					<button>Second button</button>
 				</Tooltip>
 			);
 
@@ -153,9 +152,7 @@ describe( 'Tooltip', () => {
 			render(
 				<>
 					<Tooltip { ...props }>
-						<Button disabled __experimentalIsFocusable>
-							Tooltip anchor
-						</Button>
+						<button aria-disabled="true">Tooltip anchor</button>
 					</Tooltip>
 					<button>Focus me</button>
 				</>
@@ -207,9 +204,7 @@ describe( 'Tooltip', () => {
 			render(
 				<>
 					<Tooltip { ...props }>
-						<Button disabled __experimentalIsFocusable>
-							Tooltip anchor
-						</Button>
+						<button aria-disabled="true">Tooltip anchor</button>
 					</Tooltip>
 					<button>Focus me</button>
 				</>
@@ -321,12 +316,12 @@ describe( 'Tooltip', () => {
 
 			render(
 				<Tooltip { ...props }>
-					<Button
+					<button
 						onMouseEnter={ onMouseEnterMock }
 						onMouseLeave={ onMouseLeaveMock }
 					>
 						Tooltip anchor
-					</Button>
+					</button>
 				</Tooltip>
 			);
 
@@ -454,7 +449,7 @@ describe( 'Tooltip', () => {
 				<Tooltip text="Outer tooltip">
 					<Tooltip text="Middle tooltip">
 						<Tooltip text="Inner tooltip">
-							<Button>Tooltip anchor</Button>
+							<button>Tooltip anchor</button>
 						</Tooltip>
 					</Tooltip>
 				</Tooltip>

From 773d03bd56f8d71a7774813108b9bd2e5fed134a Mon Sep 17 00:00:00 2001
From: Gan Eng Chin <ecgan@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:39:53 +0800
Subject: [PATCH 219/296] Remove unneeded `margin: 0` override for `Notice`
 component consumer (#57794)

* Remove unneeded `margin: 0` override.

This is because margin from the Notice component has been removed in PR https://github.com/WordPress/gutenberg/pull/54800.

* Remove import of deleted stylesheet.
---
 packages/block-editor/src/components/block-list/content.scss  | 3 ---
 .../block-editor/src/components/contrast-checker/style.scss   | 3 ---
 packages/block-editor/src/style.scss                          | 1 -
 packages/block-library/src/page-list/editor.scss              | 4 ----
 packages/edit-widgets/src/components/notices/style.scss       | 1 -
 packages/editor/src/components/editor-notices/style.scss      | 1 -
 6 files changed, 13 deletions(-)
 delete mode 100644 packages/block-editor/src/components/contrast-checker/style.scss

diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index 2b778c0892cfa..a650710bfb119 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -199,9 +199,6 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b
 		width: 100%;
 
 		.components-notice {
-			margin-left: 0;
-			margin-right: 0;
-
 			.components-notice__content {
 				font-size: $default-font-size;
 			}
diff --git a/packages/block-editor/src/components/contrast-checker/style.scss b/packages/block-editor/src/components/contrast-checker/style.scss
deleted file mode 100644
index b3b08d6230d05..0000000000000
--- a/packages/block-editor/src/components/contrast-checker/style.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.block-editor-contrast-checker > .components-notice {
-	margin: 0;
-}
diff --git a/packages/block-editor/src/style.scss b/packages/block-editor/src/style.scss
index 2d7b154739445..43fb047710b8d 100644
--- a/packages/block-editor/src/style.scss
+++ b/packages/block-editor/src/style.scss
@@ -24,7 +24,6 @@
 @import "./components/block-variation-transforms/style.scss";
 @import "./components/border-radius-control/style.scss";
 @import "./components/colors-gradients/style.scss";
-@import "./components/contrast-checker/style.scss";
 @import "./components/date-format-picker/style.scss";
 @import "./components/duotone-control/style.scss";
 @import "./components/font-appearance-control/style.scss";
diff --git a/packages/block-library/src/page-list/editor.scss b/packages/block-library/src/page-list/editor.scss
index 18ecf904e3919..b3f70746acd57 100644
--- a/packages/block-library/src/page-list/editor.scss
+++ b/packages/block-library/src/page-list/editor.scss
@@ -58,10 +58,6 @@
 	}
 }
 
-.wp-block-page-list .components-notice {
-	margin-left: 0;
-}
-
 // Space spinner to give it breathing
 // room when block is selected and has focus outline.
 .wp-block-page-list__loading-indicator-container {
diff --git a/packages/edit-widgets/src/components/notices/style.scss b/packages/edit-widgets/src/components/notices/style.scss
index c0b1f01836fd3..78aaecc883ba4 100644
--- a/packages/edit-widgets/src/components/notices/style.scss
+++ b/packages/edit-widgets/src/components/notices/style.scss
@@ -11,7 +11,6 @@
 .edit-widgets-notices__pinned {
 	.components-notice {
 		box-sizing: border-box;
-		margin: 0;
 		border-bottom: $border-width solid rgba(0, 0, 0, 0.2);
 		padding: 0 $grid-unit-15;
 
diff --git a/packages/editor/src/components/editor-notices/style.scss b/packages/editor/src/components/editor-notices/style.scss
index f3b1f76285874..85cd148bfea76 100644
--- a/packages/editor/src/components/editor-notices/style.scss
+++ b/packages/editor/src/components/editor-notices/style.scss
@@ -9,7 +9,6 @@
 
 	.components-notice {
 		box-sizing: border-box;
-		margin: 0;
 		border-bottom: $border-width solid rgba(0, 0, 0, 0.2);
 		padding: 0 $grid-unit-15;
 

From 9b71fecbac589c295832f37c654b9f5d56d1c7f5 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Tue, 23 Jan 2024 15:27:39 +0100
Subject: [PATCH 220/296] Tooltip: accept specific tooltip props (#58125)

* Only accept tooltip props

* CHANGELOG
---
 packages/components/CHANGELOG.md          | 1 +
 packages/components/src/tooltip/index.tsx | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 8dda4d475e6b2..950d902a9502f 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -15,6 +15,7 @@
 
 -   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 -   `Tooltip`: Improve props forwarding to children of nested `Tooltip` components ([#57878](https://github.com/WordPress/gutenberg/pull/57878)).
+-   `Tooltip`: revert prop types to only accept component-specific props ([#58125](https://github.com/WordPress/gutenberg/pull/58125)).
 
 ### Experimental
 
diff --git a/packages/components/src/tooltip/index.tsx b/packages/components/src/tooltip/index.tsx
index f71182b85edb2..87c7506a9c5f7 100644
--- a/packages/components/src/tooltip/index.tsx
+++ b/packages/components/src/tooltip/index.tsx
@@ -25,7 +25,6 @@ import type {
 } from './types';
 import Shortcut from '../shortcut';
 import { positionToPlacement } from '../popover/utils';
-import type { WordPressComponentProps } from '../context';
 
 const TooltipInternalContext = createContext< TooltipInternalContextType >( {
 	isNestedInTooltip: false,
@@ -41,7 +40,7 @@ const CONTEXT_VALUE = {
 };
 
 function UnforwardedTooltip(
-	props: WordPressComponentProps< TooltipProps, 'div', false >,
+	props: TooltipProps,
 	ref: React.ForwardedRef< any >
 ) {
 	const {

From b3b844d6febd9a76388a47edb152ad63f2d626ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:49:12 +0100
Subject: [PATCH 221/296] DataViews: better management of `layout` param in
 templates & parts (#58116)

---
 .../page-templates-template-parts/index.js    |  4 +++-
 .../use-sync-path-with-url.js                 | 19 ++++++++++++++++---
 2 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index f2240fec5bd12..56b124dc31523 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -166,7 +166,9 @@ export default function PageTemplatesTemplateParts( { postType } ) {
 	const defaultView = useMemo( () => {
 		return {
 			...DEFAULT_VIEW,
-			type: layout ?? DEFAULT_VIEW.type,
+			type: window?.__experimentalAdminViews
+				? layout ?? DEFAULT_VIEW.type
+				: DEFAULT_VIEW.type,
 		};
 	}, [ layout ] );
 	const [ view, setView ] = useState( defaultView );
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
index 3eb6d6e6f4fad..7804745973928 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
@@ -101,15 +101,28 @@ export default function useSyncPathWithURL() {
 					canvas: undefined,
 					path: navigatorLocation.path,
 				} );
+			} else if (
+				navigatorLocation.path === '/wp_template/all' &&
+				! window?.__experimentalAdminViews
+			) {
+				// When the experiment is disabled, we only support table layout.
+				// Clear it out from the URL, so layouts other than table cannot be accessed.
+				updateUrlParams( {
+					postType: undefined,
+					categoryType: undefined,
+					categoryId: undefined,
+					path: navigatorLocation.path,
+					layout: undefined,
+				} );
 			} else if (
 				// These sidebar paths are special in the sense that the url in these pages may or may not have a postId and we need to retain it if it has.
 				// The "type" property should be kept as well.
 				( navigatorLocation.path === '/page' &&
 					window?.__experimentalAdminViews ) ||
-				( navigatorLocation.path === '/wp_template' &&
-					window?.__experimentalAdminViews ) ||
 				( navigatorLocation.path === '/wp_template/all' &&
-					! window?.__experimentalAdminViews )
+					window?.__experimentalAdminViews ) ||
+				( navigatorLocation.path === '/wp_template_part/all' &&
+					window?.__experimentalAdminViews )
 			) {
 				updateUrlParams( {
 					postType: undefined,

From 44237cad7d05100b9a4f93aa7140a2b627620e85 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Tue, 23 Jan 2024 15:01:00 +0000
Subject: [PATCH 222/296] Move backported Block Renaming metadata registration
 code to 6.5 dir (#58126)

---
 lib/blocks.php                      | 21 ---------------------
 lib/compat/wordpress-6.5/blocks.php | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/lib/blocks.php b/lib/blocks.php
index d5283afeb7f99..e1d4622a0f23d 100644
--- a/lib/blocks.php
+++ b/lib/blocks.php
@@ -440,27 +440,6 @@ function gutenberg_legacy_wp_block_post_meta( $value, $object_id, $meta_key, $si
 add_filter( 'default_post_metadata', 'gutenberg_legacy_wp_block_post_meta', 10, 4 );
 
 
-/**
- * Registers the metadata block attribute for all block types.
- *
- * @param array $args Array of arguments for registering a block type.
- * @return array $args
- */
-function gutenberg_register_metadata_attribute( $args ) {
-	// Setup attributes if needed.
-	if ( ! isset( $args['attributes'] ) || ! is_array( $args['attributes'] ) ) {
-		$args['attributes'] = array();
-	}
-
-	if ( ! array_key_exists( 'metadata', $args['attributes'] ) ) {
-		$args['attributes']['metadata'] = array(
-			'type' => 'object',
-		);
-	}
-
-	return $args;
-}
-add_filter( 'register_block_type_args', 'gutenberg_register_metadata_attribute' );
 
 /**
  * Strips all HTML from the content of footnotes, and sanitizes the ID.
diff --git a/lib/compat/wordpress-6.5/blocks.php b/lib/compat/wordpress-6.5/blocks.php
index b6890c14dc1f9..f5a9968f9210b 100644
--- a/lib/compat/wordpress-6.5/blocks.php
+++ b/lib/compat/wordpress-6.5/blocks.php
@@ -22,3 +22,26 @@ function gutenberg_register_block_type_args_shim( $args ) {
 if ( ! method_exists( 'WP_Block_Type', 'get_variations' ) ) {
 	add_filter( 'register_block_type_args', 'gutenberg_register_block_type_args_shim' );
 }
+
+
+/**
+ * Registers the metadata block attribute for all block types.
+ *
+ * @param array $args Array of arguments for registering a block type.
+ * @return array $args
+ */
+function gutenberg_register_metadata_attribute( $args ) {
+	// Setup attributes if needed.
+	if ( ! isset( $args['attributes'] ) || ! is_array( $args['attributes'] ) ) {
+		$args['attributes'] = array();
+	}
+
+	if ( ! array_key_exists( 'metadata', $args['attributes'] ) ) {
+		$args['attributes']['metadata'] = array(
+			'type' => 'object',
+		);
+	}
+
+	return $args;
+}
+add_filter( 'register_block_type_args', 'gutenberg_register_metadata_attribute' );

From 57472fcf93108867043c395341c75b9767283e3e Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Tue, 23 Jan 2024 17:27:49 +0200
Subject: [PATCH 223/296] DataViews: Use button for patterns, pages and
 templates preview field (#58071)

* DataViews: Make patterns and templates preview a button

* add button to pages preview

* focus styles

* Use focus-visible

* use buttons even if a media/preview is missing

* Page / Template preview should always link to editor

* render button only for editable patterns

* Templates: Add "Empty template" text

* Patterns: Apply border-radius to locked patterns

* fixes from rebase

---------

Co-authored-by: James Koster <james@jameskoster.co.uk>
Co-authored-by: Tetsuaki Hamano <tetsuaki.hamano@gmail.com>
---
 packages/dataviews/src/style.scss             |  2 +-
 .../src/components/page-pages/index.js        | 69 +++++++++++--------
 .../src/components/page-pages/style.scss      | 19 +++++
 .../page-patterns/dataviews-patterns.js       | 53 ++++++++++++--
 .../src/components/page-patterns/style.scss   | 26 ++++++-
 .../page-templates-template-parts/index.js    | 37 ++++++----
 .../page-templates-template-parts/style.scss  | 27 ++++++++
 7 files changed, 182 insertions(+), 51 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 9a460bc07867c..07797d3624af7 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -285,9 +285,9 @@
 		width: 100%;
 		min-height: 200px;
 		aspect-ratio: 1/1;
-		overflow: hidden;
 		border-bottom: 1px solid $gray-200;
 		background-color: $gray-100;
+		border-radius: 3px 3px 0 0;
 
 		img {
 			object-fit: cover;
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index 048821b048f6a..b221be5390591 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -15,7 +15,7 @@ import { DataViews } from '@wordpress/dataviews';
  * Internal dependencies
  */
 import Page from '../page';
-import Link from '../routes/link';
+import { default as Link, useLink } from '../routes/link';
 import {
 	DEFAULT_VIEWS,
 	DEFAULT_CONFIG_PER_VIEW_TYPE,
@@ -40,6 +40,7 @@ import {
 import AddNewPageModal from '../add-new-page';
 import Media from '../media';
 import { unlock } from '../../lock-unlock';
+
 const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
@@ -150,6 +151,42 @@ const STATUSES = [
 ];
 const DEFAULT_STATUSES = 'draft,future,pending,private,publish'; // All but 'trash'.
 
+function FeaturedImage( { item, viewType } ) {
+	const { onClick } = useLink( {
+		postId: item.id,
+		postType: item.type,
+		canvas: 'edit',
+	} );
+	const hasMedia = !! item.featured_media;
+	return (
+		<span
+			className={ {
+				'edit-site-page-pages__media-wrapper':
+					viewType === LAYOUT_TABLE,
+			} }
+		>
+			<button
+				className="page-pages-preview-field__button"
+				type="button"
+				onClick={ onClick }
+				aria-label={ item.title?.rendered || __( '(no title)' ) }
+			>
+				{ hasMedia && (
+					<Media
+						className="edit-site-page-pages__featured-image"
+						id={ item.featured_media }
+						size={
+							viewType === LAYOUT_GRID
+								? [ 'large', 'full', 'medium', 'thumbnail' ]
+								: [ 'thumbnail', 'medium', 'large', 'full' ]
+						}
+					/>
+				) }
+			</button>
+		</span>
+	);
+}
+
 export default function PagePages() {
 	const postType = 'page';
 	const [ view, setView ] = useView( postType );
@@ -243,35 +280,7 @@ export default function PagePages() {
 				header: __( 'Featured Image' ),
 				getValue: ( { item } ) => item.featured_media,
 				render: ( { item } ) => (
-					<span
-						className={
-							view.type === LAYOUT_TABLE
-								? 'edit-site-page-pages__media-wrapper'
-								: ''
-						}
-					>
-						{ !! item.featured_media ? (
-							<Media
-								className="edit-site-page-pages__featured-image"
-								id={ item.featured_media }
-								size={
-									view.type === LAYOUT_GRID
-										? [
-												'large',
-												'full',
-												'medium',
-												'thumbnail',
-										  ]
-										: [
-												'thumbnail',
-												'medium',
-												'large',
-												'full',
-										  ]
-								}
-							/>
-						) : null }
-					</span>
+					<FeaturedImage item={ item } viewType={ view.type } />
 				),
 				enableSorting: false,
 			},
diff --git a/packages/edit-site/src/components/page-pages/style.scss b/packages/edit-site/src/components/page-pages/style.scss
index c9169daa58979..1125bbb1919b5 100644
--- a/packages/edit-site/src/components/page-pages/style.scss
+++ b/packages/edit-site/src/components/page-pages/style.scss
@@ -24,3 +24,22 @@
 		width: 100%;
 	}
 }
+
+.page-pages-preview-field__button {
+	box-shadow: none;
+	border: none;
+	padding: 0;
+	background-color: unset;
+	box-sizing: border-box;
+	cursor: pointer;
+	overflow: hidden;
+	height: 100%;
+	width: 100%;
+	border-radius: 3px 3px 0 0;
+
+	&:focus-visible {
+		box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+		// Windows High Contrast mode will show this outline, but not the box-shadow.
+		outline: 2px solid transparent;
+	}
+}
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
index 19b9b6381ec3b..9bf37a8fabbba 100644
--- a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
+++ b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
@@ -104,7 +104,24 @@ const SYNC_FILTERS = [
 	},
 ];
 
-function Preview( { item, viewType } ) {
+function PreviewWrapper( { item, onClick, ariaDescribedBy, children } ) {
+	if ( item.type === PATTERN_TYPES.theme ) {
+		return children;
+	}
+	return (
+		<button
+			className="page-patterns-preview-field__button"
+			type="button"
+			onClick={ onClick }
+			aria-label={ item.title }
+			aria-describedby={ ariaDescribedBy }
+		>
+			{ children }
+		</button>
+	);
+}
+
+function Preview( { item, categoryId, viewType } ) {
 	const descriptionId = useId();
 	const isUserPattern = item.type === PATTERN_TYPES.user;
 	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
@@ -129,15 +146,37 @@ function Preview( { item, viewType } ) {
 		);
 	}
 	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
+	const { onClick } = useLink( {
+		postType: item.type,
+		postId: isUserPattern ? item.id : item.name,
+		categoryId,
+		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
+	} );
+
 	return (
 		<>
 			<div
 				className={ `page-patterns-preview-field is-viewtype-${ viewType }` }
 				style={ { backgroundColor } }
 			>
-				{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
-				{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
-				{ ! isEmpty && <BlockPreview blocks={ item.blocks } /> }
+				<PreviewWrapper
+					item={ item }
+					onClick={ onClick }
+					ariaDescribedBy={
+						ariaDescriptions.length
+							? ariaDescriptions
+									.map(
+										( _, index ) =>
+											`${ descriptionId }-${ index }`
+									)
+									.join( ' ' )
+							: undefined
+					}
+				>
+					{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
+					{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
+					{ ! isEmpty && <BlockPreview blocks={ item.blocks } /> }
+				</PreviewWrapper>
 			</div>
 			{ ariaDescriptions.map( ( ariaDescription, index ) => (
 				<div
@@ -245,7 +284,11 @@ export default function DataviewsPatterns() {
 				header: __( 'Preview' ),
 				id: 'preview',
 				render: ( { item } ) => (
-					<Preview item={ item } viewType={ view.type } />
+					<Preview
+						item={ item }
+						categoryId={ categoryId }
+						viewType={ view.type }
+					/>
 				),
 				enableSorting: false,
 				enableHiding: false,
diff --git a/packages/edit-site/src/components/page-patterns/style.scss b/packages/edit-site/src/components/page-patterns/style.scss
index b5d092f438e8e..0f119773bdf21 100644
--- a/packages/edit-site/src/components/page-patterns/style.scss
+++ b/packages/edit-site/src/components/page-patterns/style.scss
@@ -231,9 +231,33 @@
  */
 .edit-site-page-patterns-dataviews {
 	.page-patterns-preview-field {
+		display: flex;
+		flex-direction: column;
+		height: 100%;
+		border-radius: 3px 3px 0 0;
+
 		&.is-viewtype-grid {
 			.block-editor-block-preview__container {
-				height: auto;
+				height: 100%;
+				border-radius: 3px 3px 0 0;
+			}
+		}
+
+		.page-patterns-preview-field__button {
+			box-shadow: none;
+			border: none;
+			padding: 0;
+			background-color: unset;
+			box-sizing: border-box;
+			cursor: pointer;
+			overflow: hidden;
+			height: 100%;
+			border-radius: 3px 3px 0 0;
+
+			&:focus-visible {
+				box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+				// Windows High Contrast mode will show this outline, but not the box-shadow.
+				outline: 2px solid transparent;
 			}
 		}
 	}
diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index 56b124dc31523..923b733ae7d73 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -32,7 +32,7 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
  * Internal dependencies
  */
 import Page from '../page';
-import Link from '../routes/link';
+import { default as Link, useLink } from '../routes/link';
 import AddNewTemplate from '../add-new-template';
 import { useAddedBy, AvatarImage } from '../list/added-by';
 import {
@@ -132,15 +132,18 @@ function AuthorField( { item, viewType } ) {
 	);
 }
 
-function Preview( { content, viewType } ) {
+function Preview( { item, viewType } ) {
 	const settings = usePatternSettings();
 	const [ backgroundColor = 'white' ] = useGlobalStyle( 'color.background' );
 	const blocks = useMemo( () => {
-		return parse( content );
-	}, [ content ] );
-	if ( ! blocks?.length ) {
-		return null;
-	}
+		return parse( item.content.raw );
+	}, [ item.content.raw ] );
+	const { onClick } = useLink( {
+		postId: item.id,
+		postType: item.type,
+		canvas: 'edit',
+	} );
+	const isEmpty = ! blocks?.length;
 	// Wrap everything in a block editor provider to ensure 'styles' that are needed
 	// for the previews are synced between the site editor store and the block editor store.
 	// Additionally we need to have the `__experimentalBlockPatterns` setting in order to
@@ -154,7 +157,18 @@ function Preview( { content, viewType } ) {
 				className={ `page-templates-preview-field is-viewtype-${ viewType }` }
 				style={ { backgroundColor } }
 			>
-				<BlockPreview blocks={ blocks } />
+				<button
+					className="page-templates-preview-field__button"
+					type="button"
+					onClick={ onClick }
+					aria-label={ item.title?.rendered || item.title }
+				>
+					{ isEmpty &&
+						( item.type === TEMPLATE_POST_TYPE
+							? __( 'Empty template' )
+							: __( 'Empty template part' ) ) }
+					{ ! isEmpty && <BlockPreview blocks={ blocks } /> }
+				</button>
 			</div>
 		</ExperimentalBlockEditorProvider>
 	);
@@ -212,12 +226,7 @@ export default function PageTemplatesTemplateParts( { postType } ) {
 				header: __( 'Preview' ),
 				id: 'preview',
 				render: ( { item } ) => {
-					return (
-						<Preview
-							content={ item.content.raw }
-							viewType={ view.type }
-						/>
-					);
+					return <Preview item={ item } viewType={ view.type } />;
 				},
 				minWidth: 120,
 				maxWidth: 120,
diff --git a/packages/edit-site/src/components/page-templates-template-parts/style.scss b/packages/edit-site/src/components/page-templates-template-parts/style.scss
index 9fdca6d15d560..72e12d9808ddd 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/style.scss
+++ b/packages/edit-site/src/components/page-templates-template-parts/style.scss
@@ -1,4 +1,27 @@
 .page-templates-preview-field {
+	display: flex;
+	flex-direction: column;
+	height: 100%;
+	border-radius: 3px 3px 0 0;
+
+	.page-templates-preview-field__button {
+		box-shadow: none;
+		border: none;
+		padding: 0;
+		background-color: unset;
+		box-sizing: border-box;
+		cursor: pointer;
+		overflow: hidden;
+		height: 100%;
+		border-radius: 3px;
+
+		&:focus-visible {
+			box-shadow: 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color);
+			// Windows High Contrast mode will show this outline, but not the box-shadow.
+			outline: 2px solid transparent;
+		}
+	}
+
 	&.is-viewtype-list {
 		.block-editor-block-preview__container {
 			height: 120px;
@@ -9,6 +32,10 @@
 		.block-editor-block-preview__container {
 			height: auto;
 		}
+
+		.page-templates-preview-field__button {
+			border-radius: 3px 3px 0 0;
+		}
 	}
 }
 

From a3e4ee58c057cf2b91ba685b8ef3d8c3664ced44 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:47:51 +0200
Subject: [PATCH 224/296] Footnotes: combine format store subscription (#58129)

---
 .../block-library/src/footnotes/format.js     | 65 +++++++++----------
 1 file changed, 32 insertions(+), 33 deletions(-)

diff --git a/packages/block-library/src/footnotes/format.js b/packages/block-library/src/footnotes/format.js
index eda45ac0d30f3..def721c21eecd 100644
--- a/packages/block-library/src/footnotes/format.js
+++ b/packages/block-library/src/footnotes/format.js
@@ -15,7 +15,7 @@ import {
 	privateApis,
 } from '@wordpress/block-editor';
 import { useSelect, useDispatch, useRegistry } from '@wordpress/data';
-import { useEntityProp } from '@wordpress/core-data';
+import { store as coreDataStore } from '@wordpress/core-data';
 import { createBlock, store as blocksStore } from '@wordpress/blocks';
 
 /**
@@ -54,43 +54,42 @@ export const format = {
 			getBlockName,
 			getBlockParentsByBlockName,
 		} = registry.select( blockEditorStore );
-		const hasFootnotesBlockType = useSelect(
-			( select ) =>
-				!! select( blocksStore ).getBlockType( 'core/footnotes' ),
-			[]
+		const isFootnotesSupported = useSelect(
+			( select ) => {
+				if (
+					! select( blocksStore ).getBlockType( 'core/footnotes' )
+				) {
+					return false;
+				}
+
+				const entityRecord = select( coreDataStore ).getEntityRecord(
+					'postType',
+					postType,
+					postId
+				);
+
+				if ( 'string' !== typeof entityRecord?.meta?.footnotes ) {
+					return false;
+				}
+
+				// Checks if the selected block lives within a pattern.
+				const {
+					getBlockParentsByBlockName: _getBlockParentsByBlockName,
+					getSelectedBlockClientId: _getSelectedBlockClientId,
+				} = select( blockEditorStore );
+				const parentCoreBlocks = _getBlockParentsByBlockName(
+					_getSelectedBlockClientId(),
+					SYNCED_PATTERN_BLOCK_NAME
+				);
+				return ! parentCoreBlocks || parentCoreBlocks.length === 0;
+			},
+			[ postType, postId ]
 		);
-		/*
-		 * This useSelect exists because we need to use its return value
-		 * outside the event callback.
-		 */
-		const isBlockWithinPattern = useSelect( ( select ) => {
-			const {
-				getBlockParentsByBlockName: _getBlockParentsByBlockName,
-				getSelectedBlockClientId: _getSelectedBlockClientId,
-			} = select( blockEditorStore );
-			const parentCoreBlocks = _getBlockParentsByBlockName(
-				_getSelectedBlockClientId(),
-				SYNCED_PATTERN_BLOCK_NAME
-			);
-			return parentCoreBlocks && parentCoreBlocks.length > 0;
-		}, [] );
-
-		const [ meta ] = useEntityProp( 'postType', postType, 'meta', postId );
-		const footnotesSupported = 'string' === typeof meta?.footnotes;
 
 		const { selectionChange, insertBlock } =
 			useDispatch( blockEditorStore );
 
-		if ( ! hasFootnotesBlockType ) {
-			return null;
-		}
-
-		if ( ! footnotesSupported ) {
-			return null;
-		}
-
-		// Checks if the selected block lives within a pattern.
-		if ( isBlockWithinPattern ) {
+		if ( ! isFootnotesSupported ) {
 			return null;
 		}
 

From fab426ae5ea3925bdebfbec09d3247883bc001f0 Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Tue, 23 Jan 2024 15:56:44 +0000
Subject: [PATCH 225/296] Fix site editor layout regressions (#58077)

---
 packages/edit-site/src/components/layout/style.scss | 5 +----
 packages/edit-site/src/components/page/style.scss   | 9 +--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/packages/edit-site/src/components/layout/style.scss b/packages/edit-site/src/components/layout/style.scss
index c14d4c2f68274..eabe9e6b5d731 100644
--- a/packages/edit-site/src/components/layout/style.scss
+++ b/packages/edit-site/src/components/layout/style.scss
@@ -289,12 +289,9 @@
 }
 
 .edit-site-layout__area {
-	color: $gray-800;
-	background: $white;
 	flex-grow: 1;
-	overflow: auto;
 	margin: 0;
-	margin-top: $header-height;
+	overflow: hidden;
 	@include break-medium() {
 		border-radius: 8px;
 		margin: $canvas-padding $canvas-padding $canvas-padding 0;
diff --git a/packages/edit-site/src/components/page/style.scss b/packages/edit-site/src/components/page/style.scss
index fd69544bb6cd7..ef76f4fc22e26 100644
--- a/packages/edit-site/src/components/page/style.scss
+++ b/packages/edit-site/src/components/page/style.scss
@@ -1,14 +1,7 @@
 .edit-site-page {
 	color: $gray-800;
 	background: $white;
-	flex-grow: 1;
-	overflow: hidden;
-	margin: 0;
-	margin-top: $header-height;
-	@include break-medium() {
-		border-radius: 8px;
-		margin: $canvas-padding $canvas-padding $canvas-padding 0;
-	}
+	height: 100%;
 }
 
 .edit-site-page-header {

From 41d6a41cce6e55126bfc3faf2a022fc748f07610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 23 Jan 2024 16:58:49 +0100
Subject: [PATCH 226/296] DataViews: revert list view as default for pages
 (#58081)

Co-authored-by: ntsekouras <ntsekouras@outlook.com>
---
 .../edit-site/src/components/layout/router.js | 27 +++++++++++--------
 .../src/components/page-pages/index.js        | 13 ---------
 .../sidebar-dataviews/default-views.js        |  2 +-
 .../src/components/sidebar-dataviews/index.js |  2 +-
 .../index.js                                  |  1 +
 .../edit-site/src/components/sidebar/index.js | 11 ++++----
 .../use-init-edited-entity-from-url.js        |  4 +--
 .../use-sync-path-with-url.js                 |  2 +-
 .../edit-site/src/utils/get-is-list-page.js   |  2 +-
 9 files changed, 29 insertions(+), 35 deletions(-)

diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
index f3c6c572db607..a59b18a7f9ffd 100644
--- a/packages/edit-site/src/components/layout/router.js
+++ b/packages/edit-site/src/components/layout/router.js
@@ -27,23 +27,28 @@ export default function useLayoutAreas() {
 	const { postType, postId, path, layout, isCustom } = params ?? {};
 	// Regular page
 	if ( path === '/page' ) {
-		const isListLayout =
-			isCustom !== 'true' && ( ! layout || layout === 'list' );
 		return {
 			areas: {
-				content: window.__experimentalAdminViews ? (
-					<PagePages />
-				) : undefined,
-				preview: ( isListLayout ||
-					! window.__experimentalAdminViews ) && (
+				content: undefined,
+				preview: <Editor isLoading={ isSiteEditorLoading } />,
+			},
+			widths: {
+				content: undefined,
+			},
+		};
+	}
+
+	if ( path === '/pages' && window?.__experimentalAdminViews ) {
+		const isListLayout = isCustom !== 'true' && layout === 'list';
+		return {
+			areas: {
+				content: <PagePages />,
+				preview: isListLayout && (
 					<Editor isLoading={ isSiteEditorLoading } />
 				),
 			},
 			widths: {
-				content:
-					window.__experimentalAdminViews && isListLayout
-						? 380
-						: undefined,
+				content: isListLayout ? 380 : undefined,
 			},
 		};
 	}
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index b221be5390591..ebad4e05aa024 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -206,18 +206,6 @@ export default function PagePages() {
 		[ history, params, view?.type, isCustom ]
 	);
 
-	const onDetailsChange = useCallback(
-		( items ) => {
-			if ( !! postType && items?.length === 1 ) {
-				history.push( {
-					postId: items[ 0 ].id,
-					postType,
-				} );
-			}
-		},
-		[ history, postType ]
-	);
-
 	const queryArgs = useMemo( () => {
 		const filters = {};
 		view.filters.forEach( ( filter ) => {
@@ -430,7 +418,6 @@ export default function PagePages() {
 				view={ view }
 				onChangeView={ onChangeView }
 				onSelectionChange={ onSelectionChange }
-				onDetailsChange={ onDetailsChange }
 			/>
 		</Page>
 	);
diff --git a/packages/edit-site/src/components/sidebar-dataviews/default-views.js b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
index 329103bd2b97d..d6e7ebe72df21 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/default-views.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/default-views.js
@@ -29,7 +29,7 @@ export const DEFAULT_CONFIG_PER_VIEW_TYPE = {
 };
 
 const DEFAULT_PAGE_BASE = {
-	type: LAYOUT_LIST,
+	type: LAYOUT_TABLE,
 	search: '',
 	filters: [],
 	page: 1,
diff --git a/packages/edit-site/src/components/sidebar-dataviews/index.js b/packages/edit-site/src/components/sidebar-dataviews/index.js
index 9748600907e33..991a4a30e9973 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/index.js
@@ -15,7 +15,7 @@ import DataViewItem from './dataview-item';
 import CustomDataViewsList from './custom-dataviews-list';
 
 const PATH_TO_TYPE = {
-	'/page': 'page',
+	'/pages': 'page',
 };
 
 export default function DataViewsSidebarContent() {
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
index ade28989ff955..3bb3c9c0c8fe0 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages-dataviews/index.js
@@ -78,6 +78,7 @@ export default function SidebarNavigationScreenPagesDataViews() {
 			title={ __( 'Pages' ) }
 			description={ __( 'Browse and manage pages.' ) }
 			content={ <DataViewsSidebarContent /> }
+			backPath="/page"
 			footer={
 				<VStack spacing={ 0 }>
 					{ templates?.map( ( item ) => (
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index 73c6aea7e328c..fd2cfa67ce004 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -66,12 +66,13 @@ function SidebarScreens() {
 				<SidebarNavigationScreenGlobalStyles />
 			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/page">
-				{ window?.__experimentalAdminViews ? (
-					<SidebarNavigationScreenPagesDataViews />
-				) : (
-					<SidebarNavigationScreenPages />
-				) }
+				<SidebarNavigationScreenPages />
 			</SidebarScreenWrapper>
+			{ window?.__experimentalAdminViews && (
+				<SidebarScreenWrapper path="/pages">
+					<SidebarNavigationScreenPagesDataViews />
+				</SidebarScreenWrapper>
+			) }
 			<SidebarScreenWrapper path="/page/:postId">
 				<SidebarNavigationScreenPage />
 			</SidebarScreenWrapper>
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
index 579097866a360..839996e2ebdf9 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-init-edited-entity-from-url.js
@@ -160,7 +160,7 @@ function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 			}
 
 			// Some URLs in list views are different
-			if ( path === '/page' && postId ) {
+			if ( path === '/pages' && postId ) {
 				return resolveTemplateForPostTypeAndId( 'page', postId );
 			}
 
@@ -196,7 +196,7 @@ function useResolveEditedEntityAndContext( { path, postId, postType } ) {
 		}
 
 		// Some URLs in list views are different
-		if ( path === '/page' && postId ) {
+		if ( path === '/pages' && postId ) {
 			return { postType: 'page', postId };
 		}
 
diff --git a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
index 7804745973928..3f57a62fba728 100644
--- a/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
+++ b/packages/edit-site/src/components/sync-state-with-url/use-sync-path-with-url.js
@@ -117,7 +117,7 @@ export default function useSyncPathWithURL() {
 			} else if (
 				// These sidebar paths are special in the sense that the url in these pages may or may not have a postId and we need to retain it if it has.
 				// The "type" property should be kept as well.
-				( navigatorLocation.path === '/page' &&
+				( navigatorLocation.path === '/pages' &&
 					window?.__experimentalAdminViews ) ||
 				( navigatorLocation.path === '/wp_template/all' &&
 					window?.__experimentalAdminViews ) ||
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index 9530cd85bf04b..d89c0e321679f 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -15,7 +15,7 @@ export default function getIsListPage(
 ) {
 	return (
 		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
-		( path === '/page' && window?.__experimentalAdminViews ) ||
+		( path === '/pages' && window?.__experimentalAdminViews ) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.

From e8dbce08c28d870bbee9f4e6eb9aacb5253d860d Mon Sep 17 00:00:00 2001
From: Bernie Reiter <96308+ockham@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:00:01 +0100
Subject: [PATCH 227/296] Block Hooks: Do not remove toggle if hooked block is
 present elsewhere (#57928)

Don't remove hooked block toggle from "Plugins" panel if the hooked block is not in its expected location but elsewhere in the block tree.

Fixes https://core.trac.wordpress.org/ticket/59955.
---
 .../block-editor/src/hooks/block-hooks.js     | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/packages/block-editor/src/hooks/block-hooks.js b/packages/block-editor/src/hooks/block-hooks.js
index f9d7026e48545..1e0b8e894d206 100644
--- a/packages/block-editor/src/hooks/block-hooks.js
+++ b/packages/block-editor/src/hooks/block-hooks.js
@@ -55,8 +55,7 @@ function BlockHooksControlPure( { name, clientId } ) {
 			const _hookedBlockClientIds = hookedBlocksForCurrentBlock.reduce(
 				( clientIds, block ) => {
 					// If the block doesn't exist anywhere in the block tree,
-					// we know that we have to display the toggle for it, and set
-					// it to disabled.
+					// we know that we have to set the toggle to disabled.
 					if ( getGlobalBlockCount( block.name ) === 0 ) {
 						return clientIds;
 					}
@@ -96,13 +95,8 @@ function BlockHooksControlPure( { name, clientId } ) {
 					}
 
 					// If no hooked block was found in any of its designated locations,
-					// but it exists elsewhere in the block tree, we consider it manually inserted.
-					// In this case, we take note and will remove the corresponding toggle from the
-					// block inspector panel.
-					return {
-						...clientIds,
-						[ block.name ]: false,
-					};
+					// we set the toggle to disabled.
+					return clientIds;
 				},
 				{}
 			);
@@ -118,13 +112,7 @@ function BlockHooksControlPure( { name, clientId } ) {
 
 	const { insertBlock, removeBlock } = useDispatch( blockEditorStore );
 
-	// Remove toggle if block isn't present in the designated location but elsewhere in the block tree.
-	const hookedBlocksForCurrentBlockIfNotPresentElsewhere =
-		hookedBlocksForCurrentBlock?.filter(
-			( block ) => hookedBlockClientIds?.[ block.name ] !== false
-		);
-
-	if ( ! hookedBlocksForCurrentBlockIfNotPresentElsewhere.length ) {
+	if ( ! hookedBlocksForCurrentBlock.length ) {
 		return null;
 	}
 

From 46446b853d740c309c0675c7bf2ca4170a618c42 Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 23 Jan 2024 16:07:27 +0000
Subject: [PATCH 228/296] Update: Show template sources on templates Dataviews
 sidebar. (#58124)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update: Show template sources on templates Dataviews sidebar.

* Fix rebase

* Remove leftover suffix

* Make sidebar work for templates & parts

* Fix view name

* Update component

* Do not reset layout

---------

Co-authored-by: André Maneiro <583546+oandregal@users.noreply.github.com>
---
 .../page-templates-template-parts/index.js    | 32 +++++++-
 .../sidebar-dataviews/dataview-item.js        |  3 +-
 .../content.js                                | 73 +++++++++++++++++++
 .../index.js                                  | 11 ++-
 4 files changed, 114 insertions(+), 5 deletions(-)
 create mode 100644 packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js

diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index 923b733ae7d73..e5fcb5e7661cf 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -13,7 +13,7 @@ import {
 	VisuallyHidden,
 } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
-import { useState, useMemo, useCallback } from '@wordpress/element';
+import { useState, useMemo, useCallback, useEffect } from '@wordpress/element';
 import { useEntityRecords } from '@wordpress/core-data';
 import { decodeEntities } from '@wordpress/html-entities';
 import { parse } from '@wordpress/blocks';
@@ -176,16 +176,42 @@ function Preview( { item, viewType } ) {
 
 export default function PageTemplatesTemplateParts( { postType } ) {
 	const { params } = useLocation();
-	const { layout } = params;
+	const { activeView = 'all', layout } = params;
 	const defaultView = useMemo( () => {
 		return {
 			...DEFAULT_VIEW,
 			type: window?.__experimentalAdminViews
 				? layout ?? DEFAULT_VIEW.type
 				: DEFAULT_VIEW.type,
+			filters:
+				activeView !== 'all'
+					? [
+							{
+								field: 'author',
+								operator: 'in',
+								value: activeView,
+							},
+					  ]
+					: [],
 		};
-	}, [ layout ] );
+	}, [ layout, activeView ] );
 	const [ view, setView ] = useState( defaultView );
+	useEffect( () => {
+		setView( ( currentView ) => ( {
+			...currentView,
+			filters:
+				activeView !== 'all'
+					? [
+							{
+								field: 'author',
+								operator: 'in',
+								value: activeView,
+							},
+					  ]
+					: [],
+		} ) );
+	}, [ activeView ] );
+
 	const { records, isResolving: isLoadingData } = useEntityRecords(
 		'postType',
 		postType,
diff --git a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
index cbcb4f2f8ed59..586d1b602e0df 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/dataview-item.js
@@ -29,7 +29,7 @@ export default function DataViewItem( {
 	suffix,
 } ) {
 	const {
-		params: { path },
+		params: { path, layout },
 	} = useLocation();
 
 	const iconToUse =
@@ -37,6 +37,7 @@ export default function DataViewItem( {
 
 	const linkInfo = useLink( {
 		path,
+		layout,
 		activeView: isCustom === 'true' ? customViewId : slug,
 		isCustom,
 	} );
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js
new file mode 100644
index 0000000000000..2188fade413db
--- /dev/null
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/content.js
@@ -0,0 +1,73 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityRecords } from '@wordpress/core-data';
+import { useMemo } from '@wordpress/element';
+import { __experimentalItemGroup as ItemGroup } from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
+import DataViewItem from '../sidebar-dataviews/dataview-item';
+import { useAddedBy } from '../list/added-by';
+import { layout } from '@wordpress/icons';
+
+const EMPTY_ARRAY = [];
+
+function TemplateDataviewItem( { template, isActive } ) {
+	const { text, icon } = useAddedBy( template.type, template.id );
+	return (
+		<DataViewItem
+			key={ text }
+			slug={ text }
+			title={ text }
+			icon={ icon }
+			isActive={ isActive }
+			isCustom="false"
+		/>
+	);
+}
+
+export default function DataviewsTemplatesSidebarContent( {
+	activeView,
+	postType,
+	config,
+} ) {
+	const { records } = useEntityRecords( 'postType', postType, {
+		per_page: -1,
+	} );
+	const firstItemPerAuthorText = useMemo( () => {
+		const firstItemPerAuthor = records?.reduce( ( acc, template ) => {
+			const author = template.author_text;
+			if ( author && ! acc[ author ] ) {
+				acc[ author ] = template;
+			}
+			return acc;
+		}, {} );
+		return (
+			( firstItemPerAuthor && Object.values( firstItemPerAuthor ) ) ??
+			EMPTY_ARRAY
+		);
+	}, [ records ] );
+
+	return (
+		<ItemGroup>
+			<DataViewItem
+				slug={ 'all' }
+				title={ config[ postType ].title }
+				icon={ layout }
+				isActive={ activeView === 'all' }
+				isCustom="false"
+			/>
+			{ firstItemPerAuthorText.map( ( template ) => {
+				return (
+					<TemplateDataviewItem
+						key={ template.author_text }
+						template={ template }
+						isActive={ activeView === template.author_text }
+					/>
+				);
+			} ) }
+		</ItemGroup>
+	);
+}
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
index a07e08a44f8b4..a97bb8e803059 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-templates-browse/index.js
@@ -3,6 +3,7 @@
  */
 import { __ } from '@wordpress/i18n';
 import { useSelect } from '@wordpress/data';
+
 import { __experimentalUseNavigator as useNavigator } from '@wordpress/components';
 import { privateApis as routerPrivateApis } from '@wordpress/router';
 
@@ -16,6 +17,7 @@ import {
 	TEMPLATE_PART_POST_TYPE,
 } from '../../utils/constants';
 import { unlock } from '../../lock-unlock';
+import DataviewsTemplatesSidebarContent from './content';
 
 const config = {
 	[ TEMPLATE_POST_TYPE ]: {
@@ -40,7 +42,7 @@ export default function SidebarNavigationScreenTemplatesBrowse() {
 		params: { postType },
 	} = useNavigator();
 	const {
-		params: { didAccessPatternsPage },
+		params: { didAccessPatternsPage, activeView = 'all' },
 	} = useLocation();
 
 	const isTemplatePartsMode = useSelect( ( select ) => {
@@ -56,6 +58,13 @@ export default function SidebarNavigationScreenTemplatesBrowse() {
 			title={ config[ postType ].title }
 			description={ config[ postType ].description }
 			backPath={ config[ postType ].backPath }
+			content={
+				<DataviewsTemplatesSidebarContent
+					activeView={ activeView }
+					postType={ postType }
+					config={ config }
+				/>
+			}
 		/>
 	);
 }

From 733d8a520f3b1418ff6bb62611e5afb1c098af8b Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Tue, 23 Jan 2024 17:44:43 +0100
Subject: [PATCH 229/296] Fix flaky test on-window (#58134)

---
 .../directive-on-window/render.php               | 16 ++++++++++++----
 .../directive-on-window/view.js                  | 13 +++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
index e9c8792354e2a..9c067d33cb34a 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
@@ -8,10 +8,18 @@
 gutenberg_enqueue_module( 'directive-on-window-view' );
 ?>
 
-<div data-wp-interactive='{ "namespace": "directive-on-window" }' data-wp-context='{"isVisible":true}'>
-	<button data-wp-on--click="actions.visibilityHandler" data-testid="visibility">Switch visibility</button>
-	<div data-wp-show-mock="context.isVisible">
-		<div data-wp-on-window--resize="callbacks.resizeHandler">
+<div data-wp-interactive='{ "namespace": "directive-on-window" }'>
+	<button
+		data-wp-on--click="actions.visibilityHandler"
+		data-testid="visibility">
+		Switch visibility
+	</button>
+	<div data-wp-text="state.isEventAttached" data-testid="isEventAttached">no</div>
+	<div data-wp-show-mock="state.isVisible">
+		<div
+			data-wp-on-window--resize="callbacks.resizeHandler"
+			data-wp-init="callbacks.init"
+		>
 			<p data-wp-text="state.counter" data-testid="counter">0</p>
 		</div>
 	</div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
index 11d01b7a216d1..1743311dee6cb 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, directive, getContext } from '@wordpress/interactivity';
+import { store, directive } from '@wordpress/interactivity';
 
 // Mock `data-wp-show` directive to test when things are removed from the
 // DOM.  Replace with `data-wp-show` when it's ready.
@@ -19,16 +19,21 @@ directive(
 const { state } = store( 'directive-on-window', {
 	state: {
 		counter: 0,
+		isVisible: true,
+		isEventAttached: 'no',
 	},
 	callbacks: {
-		resizeHandler: ( ) => {
+		resizeHandler() {
 			state.counter += 1;
 		},
+		init() {
+			state.isEventAttached = 'yes';
+		}
 	},
 	actions: {
 		visibilityHandler: () => {
-			const context = getContext();
-			context.isVisible = ! context.isVisible;
+			state.isEventAttached = 'no';
+			state.isVisible = ! state.isVisible;
 		},
 	}
 } );

From 189f9f247f6246f172d3968645b43640306f000b Mon Sep 17 00:00:00 2001
From: Jorge Costa <jorge.costa@developer.pt>
Date: Tue, 23 Jan 2024 17:07:27 +0000
Subject: [PATCH 230/296] Dataviews: Add Bulk actions to page (#57826)

* Add: bulk actions to pages.

* fixes
---
 .../edit-site/src/components/actions/index.js | 313 +++++++++++++-----
 1 file changed, 228 insertions(+), 85 deletions(-)

diff --git a/packages/edit-site/src/components/actions/index.js b/packages/edit-site/src/components/actions/index.js
index efe6762095c73..eb6e7565aff25 100644
--- a/packages/edit-site/src/components/actions/index.js
+++ b/packages/edit-site/src/components/actions/index.js
@@ -32,21 +32,28 @@ export const trashPostAction = {
 	isEligible( { status } ) {
 		return status !== 'trash';
 	},
+	supportsBulk: true,
 	hideModalHeader: true,
-	RenderModal: ( { items: posts, closeModal } ) => {
-		// Todo - handle multiple posts
-		const post = posts[ 0 ];
+	RenderModal: ( { items: posts, closeModal, onPerform } ) => {
 		const { createSuccessNotice, createErrorNotice } =
 			useDispatch( noticesStore );
 		const { deleteEntityRecord } = useDispatch( coreStore );
 		return (
 			<VStack spacing="5">
 				<Text>
-					{ sprintf(
-						// translators: %s: The page's title.
-						__( 'Are you sure you want to delete "%s"?' ),
-						decodeEntities( post.title.rendered )
-					) }
+					{ posts.length === 1
+						? sprintf(
+								// translators: %s: The page's title.
+								__( 'Are you sure you want to delete "%s"?' ),
+								decodeEntities( posts[ 0 ].title.rendered )
+						  )
+						: sprintf(
+								// translators: %d: The number of pages (2 or more).
+								__(
+									'Are you sure you want to delete %d pages?'
+								),
+								posts.length
+						  ) }
 				</Text>
 				<HStack justify="right">
 					<Button variant="tertiary" onClick={ closeModal }>
@@ -55,38 +62,97 @@ export const trashPostAction = {
 					<Button
 						variant="primary"
 						onClick={ async () => {
-							try {
-								await deleteEntityRecord(
-									'postType',
-									post.type,
-									post.id,
-									{},
-									{ throwOnError: true }
-								);
-								createSuccessNotice(
-									sprintf(
-										/* translators: The page's title. */
+							const promiseResult = await Promise.allSettled(
+								posts.map( ( post ) => {
+									return deleteEntityRecord(
+										'postType',
+										post.type,
+										post.id,
+										{},
+										{ throwOnError: true }
+									);
+								} )
+							);
+							// If all the promises were fulfilled with success.
+							if (
+								promiseResult.every(
+									( { status } ) => status === 'fulfilled'
+								)
+							) {
+								let successMessage;
+								if ( promiseResult.length === 1 ) {
+									successMessage = sprintf(
+										/* translators: The posts's title. */
 										__( '"%s" moved to the Trash.' ),
-										decodeEntities( post.title.rendered )
-									),
-									{
-										type: 'snackbar',
-										id: 'edit-site-page-trashed',
-									}
-								);
-							} catch ( error ) {
-								const errorMessage =
-									error.message &&
-									error.code !== 'unknown_error'
-										? error.message
-										: __(
-												'An error occurred while moving the page to the trash.'
-										  );
-
-								createErrorNotice( errorMessage, {
+										decodeEntities(
+											posts[ 0 ].title.rendered
+										)
+									);
+								} else {
+									successMessage = __(
+										'Pages moved to the Trash.'
+									);
+								}
+								createSuccessNotice( successMessage, {
 									type: 'snackbar',
+									id: 'edit-site-page-trashed',
 								} );
+							} else {
+								// If there was at lease one failure.
+								let errorMessage;
+								// If we were trying to move a single post to the trash.
+								if ( promiseResult.length === 1 ) {
+									if ( promiseResult[ 0 ].reason?.message ) {
+										errorMessage =
+											promiseResult[ 0 ].reason.message;
+									} else {
+										errorMessage = __(
+											'An error occurred while moving the post to the trash.'
+										);
+									}
+									// If we were trying to move multiple posts to the trash
+								} else {
+									const errorMessages = new Set();
+									const failedPromises = promiseResult.filter(
+										( { status } ) => status === 'rejected'
+									);
+									for ( const failedPromise of failedPromises ) {
+										if ( failedPromise.reason?.message ) {
+											errorMessages.add(
+												failedPromise.reason.message
+											);
+										}
+									}
+									if ( errorMessages.size === 0 ) {
+										errorMessage = __(
+											'An error occurred while moving the posts to the trash.'
+										);
+									} else if ( errorMessages.size === 1 ) {
+										errorMessage = sprintf(
+											/* translators: %s: an error message */
+											__(
+												'An error occurred while moving the posts to the trash: %s'
+											),
+											[ ...errorMessages ][ 0 ]
+										);
+									} else {
+										errorMessage = sprintf(
+											/* translators: %s: a list of comma separated error messages */
+											__(
+												'Some errors occurred while moving the pages to the trash: %s'
+											),
+											[ ...errorMessages ].join( ',' )
+										);
+									}
+									createErrorNotice( errorMessage, {
+										type: 'snackbar',
+									} );
+								}
 							}
+							if ( onPerform ) {
+								onPerform();
+							}
+							closeModal();
 						} }
 					>
 						{ __( 'Delete' ) }
@@ -108,40 +174,94 @@ export function usePermanentlyDeletePostAction() {
 			label: __( 'Permanently delete' ),
 			isPrimary: true,
 			icon: trash,
+			supportsBulk: true,
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
 			async callback( posts ) {
-				// Todo - handle multiple posts
-				const post = posts[ 0 ];
-				try {
-					await deleteEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ force: true },
-						{ throwOnError: true }
-					);
-					createSuccessNotice(
-						sprintf(
+				const promiseResult = await Promise.allSettled(
+					posts.map( ( post ) => {
+						return deleteEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{ force: true },
+							{ throwOnError: true }
+						);
+					} )
+				);
+				// If all the promises were fulfilled with success.
+				if (
+					promiseResult.every(
+						( { status } ) => status === 'fulfilled'
+					)
+				) {
+					let successMessage;
+					if ( promiseResult.length === 1 ) {
+						successMessage = sprintf(
 							/* translators: The posts's title. */
 							__( '"%s" permanently deleted.' ),
-							decodeEntities( post.title.rendered )
-						),
-						{
-							type: 'snackbar',
-							id: 'edit-site-post-permanently-deleted',
+							decodeEntities( posts[ 0 ].title.rendered )
+						);
+					} else {
+						successMessage = __(
+							'The posts were permanently deleted.'
+						);
+					}
+					createSuccessNotice( successMessage, {
+						type: 'snackbar',
+						id: 'edit-site-post-permanently-deleted',
+					} );
+				} else {
+					// If there was at lease one failure.
+					let errorMessage;
+					// If we were trying to permanently delete a single post.
+					if ( promiseResult.length === 1 ) {
+						if ( promiseResult[ 0 ].reason?.message ) {
+							errorMessage = promiseResult[ 0 ].reason.message;
+						} else {
+							errorMessage = __(
+								'An error occurred while permanently deleting the post.'
+							);
 						}
-					);
-				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while permanently deleting the post.'
-							  );
-
-					createErrorNotice( errorMessage, { type: 'snackbar' } );
+						// If we were trying to permanently delete multiple posts
+					} else {
+						const errorMessages = new Set();
+						const failedPromises = promiseResult.filter(
+							( { status } ) => status === 'rejected'
+						);
+						for ( const failedPromise of failedPromises ) {
+							if ( failedPromise.reason?.message ) {
+								errorMessages.add(
+									failedPromise.reason.message
+								);
+							}
+						}
+						if ( errorMessages.size === 0 ) {
+							errorMessage = __(
+								'An error occurred while permanently deleting the posts.'
+							);
+						} else if ( errorMessages.size === 1 ) {
+							errorMessage = sprintf(
+								/* translators: %s: an error message */
+								__(
+									'An error occurred while permanently deleting the posts: %s'
+								),
+								[ ...errorMessages ][ 0 ]
+							);
+						} else {
+							errorMessage = sprintf(
+								/* translators: %s: a list of comma separated error messages */
+								__(
+									'Some errors occurred while permanently deleting the posts: %s'
+								),
+								[ ...errorMessages ].join( ',' )
+							);
+						}
+						createErrorNotice( errorMessage, {
+							type: 'snackbar',
+						} );
+					}
 				}
 			},
 		} ),
@@ -161,40 +281,63 @@ export function useRestorePostAction() {
 			label: __( 'Restore' ),
 			isPrimary: true,
 			icon: backup,
+			supportsBulk: true,
 			isEligible( { status } ) {
 				return status === 'trash';
 			},
 			async callback( posts ) {
-				// Todo - handle multiple posts
-				const post = posts[ 0 ];
-				await editEntityRecord( 'postType', post.type, post.id, {
-					status: 'draft',
-				} );
 				try {
-					await saveEditedEntityRecord(
-						'postType',
-						post.type,
-						post.id,
-						{ throwOnError: true }
-					);
+					for ( const post of posts ) {
+						await editEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{
+								status: 'draft',
+							}
+						);
+						await saveEditedEntityRecord(
+							'postType',
+							post.type,
+							post.id,
+							{ throwOnError: true }
+						);
+					}
+
 					createSuccessNotice(
-						sprintf(
-							/* translators: The posts's title. */
-							__( '"%s" has been restored.' ),
-							decodeEntities( post.title.rendered )
-						),
+						posts.length > 1
+							? sprintf(
+									/* translators: The number of posts. */
+									__( '%d posts have been restored.' ),
+									posts.length
+							  )
+							: sprintf(
+									/* translators: The number of posts. */
+									__( '"%s" has been restored.' ),
+									decodeEntities( posts[ 0 ].title.rendered )
+							  ),
 						{
 							type: 'snackbar',
 							id: 'edit-site-post-restored',
 						}
 					);
 				} catch ( error ) {
-					const errorMessage =
-						error.message && error.code !== 'unknown_error'
-							? error.message
-							: __(
-									'An error occurred while restoring the post.'
-							  );
+					let errorMessage;
+					if (
+						error.message &&
+						error.code !== 'unknown_error' &&
+						error.message
+					) {
+						errorMessage = error.message;
+					} else if ( posts.length > 1 ) {
+						errorMessage = __(
+							'An error occurred while restoring the posts.'
+						);
+					} else {
+						errorMessage = __(
+							'An error occurred while restoring the post.'
+						);
+					}
 
 					createErrorNotice( errorMessage, { type: 'snackbar' } );
 				}

From 4fd68086aa28263809d6885def11b81e87358941 Mon Sep 17 00:00:00 2001
From: Siobhan Bamber <siobhan@automattic.com>
Date: Tue, 23 Jan 2024 17:12:15 +0000
Subject: [PATCH 231/296] Mobile Release v1.111.1 (#58115)

Release 1.111.1 of the react-native-editor and Gutenberg-Mobile.
---
 package-lock.json                             | 6 +++---
 packages/react-native-aztec/package.json      | 2 +-
 packages/react-native-bridge/package.json     | 2 +-
 packages/react-native-editor/CHANGELOG.md     | 3 +++
 packages/react-native-editor/ios/Podfile.lock | 8 ++++----
 packages/react-native-editor/package.json     | 2 +-
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 2a2fc30b96099..d1f251092f3a5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -55702,7 +55702,7 @@
 		},
 		"packages/react-native-aztec": {
 			"name": "@wordpress/react-native-aztec",
-			"version": "1.111.0",
+			"version": "1.111.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/element": "file:../element",
@@ -55715,7 +55715,7 @@
 		},
 		"packages/react-native-bridge": {
 			"name": "@wordpress/react-native-bridge",
-			"version": "1.111.0",
+			"version": "1.111.1",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/react-native-aztec": "file:../react-native-aztec"
@@ -55726,7 +55726,7 @@
 		},
 		"packages/react-native-editor": {
 			"name": "@wordpress/react-native-editor",
-			"version": "1.111.0",
+			"version": "1.111.1",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/packages/react-native-aztec/package.json b/packages/react-native-aztec/package.json
index d3fdc4a71709a..bcc9613fddfe7 100644
--- a/packages/react-native-aztec/package.json
+++ b/packages/react-native-aztec/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-aztec",
-	"version": "1.111.0",
+	"version": "1.111.1",
 	"description": "Aztec view for react-native.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-bridge/package.json b/packages/react-native-bridge/package.json
index 9068d83e1dec2..5008c428ad2b2 100644
--- a/packages/react-native-bridge/package.json
+++ b/packages/react-native-bridge/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-bridge",
-	"version": "1.111.0",
+	"version": "1.111.1",
 	"description": "Native bridge library used to integrate the block editor into a native App.",
 	"private": true,
 	"author": "The WordPress Contributors",
diff --git a/packages/react-native-editor/CHANGELOG.md b/packages/react-native-editor/CHANGELOG.md
index aec71c35186f0..88d7c1d089aff 100644
--- a/packages/react-native-editor/CHANGELOG.md
+++ b/packages/react-native-editor/CHANGELOG.md
@@ -10,7 +10,10 @@ For each user feature we should also add a importance categorization label  to i
 -->
 
 ## Unreleased
+
+## 1.111.1
 -   [**] Video block: Fix logic for displaying empty state based on source presence [#58015]
+-   [**] Fix crash when RichText values are not defined [#58088]
 
 ## 1.111.0
 -   [**] Image block media uploads display a custom error message when there is no internet connection [#56937]
diff --git a/packages/react-native-editor/ios/Podfile.lock b/packages/react-native-editor/ios/Podfile.lock
index 8e0ec890f1b07..3852f073303b3 100644
--- a/packages/react-native-editor/ios/Podfile.lock
+++ b/packages/react-native-editor/ios/Podfile.lock
@@ -13,7 +13,7 @@ PODS:
     - ReactCommon/turbomodule/core (= 0.71.11)
   - fmt (6.2.1)
   - glog (0.3.5)
-  - Gutenberg (1.111.0):
+  - Gutenberg (1.111.1):
     - React-Core (= 0.71.11)
     - React-CoreModules (= 0.71.11)
     - React-RCTImage (= 0.71.11)
@@ -429,7 +429,7 @@ PODS:
     - React-RCTImage
   - RNSVG (13.9.0):
     - React-Core
-  - RNTAztecView (1.111.0):
+  - RNTAztecView (1.111.1):
     - React-Core
     - WordPress-Aztec-iOS (= 1.19.9)
   - SDWebImage (5.11.1):
@@ -617,7 +617,7 @@ SPEC CHECKSUMS:
   FBReactNativeSpec: f07662560742d82a5b73cee116c70b0b49bcc220
   fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9
   glog: 04b94705f318337d7ead9e6d17c019bd9b1f6b1b
-  Gutenberg: 904e4e1fe0069106402b3c619fe755ddd6930e48
+  Gutenberg: c251b1260cafc0efee13c29c7b4a22e399e17be2
   hermes-engine: 34c863b446d0135b85a6536fa5fd89f48196f848
   libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913
   libwebp: 60305b2e989864154bd9be3d772730f08fc6a59c
@@ -662,7 +662,7 @@ SPEC CHECKSUMS:
   RNReanimated: d4f363f4987ae0ade3e36ff81c94e68261bf4b8d
   RNScreens: 68fd1060f57dd1023880bf4c05d74784b5392789
   RNSVG: 53c661b76829783cdaf9b7a57258f3d3b4c28315
-  RNTAztecView: 1985084da164a50b19ce73e3b82395f89bbac7a6
+  RNTAztecView: 7f2d1f97d07c00efd7f24a687fd2d0c5aec44669
   SDWebImage: a7f831e1a65eb5e285e3fb046a23fcfbf08e696d
   SDWebImageWebPCoder: 908b83b6adda48effe7667cd2b7f78c897e5111d
   WordPress-Aztec-iOS: fbebd569c61baa252b3f5058c0a2a9a6ada686bb
diff --git a/packages/react-native-editor/package.json b/packages/react-native-editor/package.json
index dc559b60332b7..f2a57980c86ec 100644
--- a/packages/react-native-editor/package.json
+++ b/packages/react-native-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-native-editor",
-	"version": "1.111.0",
+	"version": "1.111.1",
 	"description": "Mobile WordPress gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 3ff31f8ee889570b9a2982ad2399a17f93f7e1b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Tue, 23 Jan 2024 18:50:31 +0100
Subject: [PATCH 232/296] DataViews: enable grid layout for templates & parts
 (#58137)

---
 packages/dataviews/src/view-actions.js               | 12 +++++-------
 .../page-templates-template-parts/index.js           |  5 +++++
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/packages/dataviews/src/view-actions.js b/packages/dataviews/src/view-actions.js
index 5c0b21ebb7828..65cc410849127 100644
--- a/packages/dataviews/src/view-actions.js
+++ b/packages/dataviews/src/view-actions.js
@@ -267,13 +267,11 @@ const ViewActions = memo( function ViewActions( {
 			}
 		>
 			<DropdownMenuGroup>
-				{ window?.__experimentalAdminViews && (
-					<ViewTypeMenu
-						view={ view }
-						onChangeView={ onChangeView }
-						supportedLayouts={ supportedLayouts }
-					/>
-				) }
+				<ViewTypeMenu
+					view={ view }
+					onChangeView={ onChangeView }
+					supportedLayouts={ supportedLayouts }
+				/>
 				<SortMenu
 					fields={ fields }
 					view={ view }
diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index e5fcb5e7661cf..36e4ec084e6b8 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -62,6 +62,10 @@ const { useHistory, useLocation } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
 
+const SUPPORTED_LAYOUTS = window?.__experimentalAdminViews
+	? [ LAYOUT_TABLE, LAYOUT_GRID, LAYOUT_LIST ]
+	: [ LAYOUT_TABLE, LAYOUT_GRID ];
+
 const defaultConfigPerViewType = {
 	[ LAYOUT_TABLE ]: {
 		primaryField: 'title',
@@ -441,6 +445,7 @@ export default function PageTemplatesTemplateParts( { postType } ) {
 				onChangeView={ onChangeView }
 				onSelectionChange={ onSelectionChange }
 				deferredRendering={ ! view.hiddenFields?.includes( 'preview' ) }
+				supportedLayouts={ SUPPORTED_LAYOUTS }
 			/>
 		</Page>
 	);

From 987265aa456387f4e536c96e598f9dfea20e79f9 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Jan 2024 01:51:08 +0800
Subject: [PATCH 233/296] Update block bindings to use wp_kses_post for block
 content (#58055)

---
 lib/experimental/block-bindings/class-wp-block-bindings.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/block-bindings/class-wp-block-bindings.php b/lib/experimental/block-bindings/class-wp-block-bindings.php
index 7eb443dd367a6..fedc652688a24 100644
--- a/lib/experimental/block-bindings/class-wp-block-bindings.php
+++ b/lib/experimental/block-bindings/class-wp-block-bindings.php
@@ -101,7 +101,7 @@ public function replace_html( $block_content, $block_name, $block_attr, $source_
 						foreach ( $selector_attribute_names as $name ) {
 							$selector_attrs[ $name ] = $block_reader->get_attribute( $name );
 						}
-						$selector_markup = "<$selector>" . esc_html( $source_value ) . "</$selector>";
+						$selector_markup = "<$selector>" . wp_kses_post( $source_value ) . "</$selector>";
 						$amended_content = new WP_HTML_Tag_Processor( $selector_markup );
 						$amended_content->next_tag();
 						foreach ( $selector_attrs as $attribute_key => $attribute_value ) {

From c9ce5146dcd22e55e777ff1bff6a6b939cddef3c Mon Sep 17 00:00:00 2001
From: annezazu <annezazu@gmail.com>
Date: Tue, 23 Jan 2024 10:32:47 -0800
Subject: [PATCH 234/296] Update Style Revision top toolbar text (#58057)

* Update style revision top toolbar text

Fixes https://github.com/WordPress/gutenberg/issues/51202 by updating just the copy from "Global styles revisions" to "Style Revisions", matching what we show with "Style Book".

* Styles Revisions -> Style Revisions

* Update test

---------

Co-authored-by: Rich Tabor <hi@richtabor.com>
---
 .../edit-site/src/components/editor-canvas-container/index.js   | 2 +-
 test/e2e/specs/site-editor/user-global-styles-revisions.spec.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/edit-site/src/components/editor-canvas-container/index.js b/packages/edit-site/src/components/editor-canvas-container/index.js
index 5bb7fc72a9c0f..a6dc8b05409e2 100644
--- a/packages/edit-site/src/components/editor-canvas-container/index.js
+++ b/packages/edit-site/src/components/editor-canvas-container/index.js
@@ -35,7 +35,7 @@ function getEditorCanvasContainerTitle( view ) {
 			return __( 'Style Book' );
 		case 'global-styles-revisions':
 		case 'global-styles-revisions:style-book':
-			return __( 'Global styles revisions' );
+			return __( 'Style Revisions' );
 		default:
 			return '';
 	}
diff --git a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
index ff62da26bcfac..9cb8ba53461e0 100644
--- a/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
+++ b/test/e2e/specs/site-editor/user-global-styles-revisions.spec.js
@@ -14,7 +14,7 @@ test.use( {
 	},
 } );
 
-test.describe( 'Global styles revisions', () => {
+test.describe( 'Style Revisions', () => {
 	let stylesPostId;
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [

From 982a517721fded395a3c85b199fc2e3a85865f55 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 24 Jan 2024 03:37:09 +0900
Subject: [PATCH 235/296] Theme: Set `color` on wrapper (#58095)

* Theme: Set `color` on wrapper

* Update changelog
---
 packages/components/CHANGELOG.md        | 1 +
 packages/components/src/theme/styles.ts | 4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 950d902a9502f..e546707a30f59 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -21,6 +21,7 @@
 
 -   `BoxControl`: Update design ([#56665](https://github.com/WordPress/gutenberg/pull/56665)).
 -   `CustomSelect`: adjust `renderSelectedValue` to fix sizing ([#57865](https://github.com/WordPress/gutenberg/pull/57865)).
+-   `Theme`: Set `color` on wrapper div ([#58095](https://github.com/WordPress/gutenberg/pull/58095)).
 
 ## 25.15.0 (2024-01-10)
 
diff --git a/packages/components/src/theme/styles.ts b/packages/components/src/theme/styles.ts
index 650852d346175..948c2d586649f 100644
--- a/packages/components/src/theme/styles.ts
+++ b/packages/components/src/theme/styles.ts
@@ -30,4 +30,6 @@ export const colorVariables = ( { colors }: ThemeOutputValues ) => {
 	];
 };
 
-export const Wrapper = styled.div``;
+export const Wrapper = styled.div`
+	color: var( --wp-components-color-foreground, currentColor );
+`;

From 4979523ff73ba7980780fd0475ba21b2245e0eeb Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 23 Jan 2024 20:46:54 +0200
Subject: [PATCH 236/296] Block editor: avoid list re-rendering on select
 (#57188)

---
 .../src/components/block-list/index.js        | 45 +++++++------------
 .../src/store/private-selectors.js            | 24 ++++++++++
 2 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index 09a4712a3dd6d..22d4de1d6774c 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -155,38 +155,25 @@ function Items( {
 	__experimentalAppenderTagName,
 	layout = defaultLayout,
 } ) {
-	const { order, selectedBlocks, visibleBlocks, temporarilyEditingAsBlocks } =
-		useSelect(
-			( select ) => {
-				const {
-					getBlockOrder,
-					getSelectedBlockClientIds,
-					__unstableGetVisibleBlocks,
-					__unstableGetTemporarilyEditingAsBlocks,
-				} = select( blockEditorStore );
-				return {
-					order: getBlockOrder( rootClientId ),
-					selectedBlocks: getSelectedBlockClientIds(),
-					visibleBlocks: __unstableGetVisibleBlocks(),
-					temporarilyEditingAsBlocks:
-						__unstableGetTemporarilyEditingAsBlocks(),
-				};
-			},
-			[ rootClientId ]
-		);
+	const { order, temporarilyEditingAsBlocks } = useSelect(
+		( select ) => {
+			const {
+				getBlockOrderWithAsyncFlag,
+				__unstableGetTemporarilyEditingAsBlocks,
+			} = unlock( select( blockEditorStore ) );
+			return {
+				order: getBlockOrderWithAsyncFlag( rootClientId ),
+				temporarilyEditingAsBlocks:
+					__unstableGetTemporarilyEditingAsBlocks(),
+			};
+		},
+		[ rootClientId ]
+	);
 
 	return (
 		<LayoutProvider value={ layout }>
-			{ order.map( ( clientId ) => (
-				<AsyncModeProvider
-					key={ clientId }
-					value={
-						// Only provide data asynchronously if the block is
-						// not visible and not selected.
-						! visibleBlocks.has( clientId ) &&
-						! selectedBlocks.includes( clientId )
-					}
-				>
+			{ order.map( ( { clientId, isAsync } ) => (
+				<AsyncModeProvider key={ clientId } value={ isAsync }>
 					<BlockListBlock
 						rootClientId={ rootClientId }
 						clientId={ clientId }
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index e8230eea89daa..c946200b61ad7 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -14,6 +14,8 @@ import {
 	__experimentalGetParsedPattern,
 	canInsertBlockType,
 	__experimentalGetAllowedPatterns,
+	getSelectedBlockClientIds,
+	__unstableGetVisibleBlocks,
 } from './selectors';
 import { getAllPatterns, checkAllowListRecursive } from './utils';
 
@@ -286,3 +288,25 @@ export const hasAllowedPatterns = createSelector(
 export function getLastFocus( state ) {
 	return state.lastFocus;
 }
+
+export const getBlockOrderWithAsyncFlag = createSelector(
+	( state, rootClientId ) => {
+		const order = getBlockOrder( state, rootClientId );
+		const selectedBlocks = getSelectedBlockClientIds( state );
+		const visibleBlocks = __unstableGetVisibleBlocks( state );
+		return order.map( ( clientId ) => ( {
+			clientId,
+			// Only provide data asynchronously if the block is
+			// not visible and not selected.
+			isAsync:
+				! visibleBlocks?.has( clientId ) &&
+				! selectedBlocks?.includes( clientId ),
+		} ) );
+	},
+	( state ) => [
+		state.blocks.order,
+		state.selection.selectionStart.clientId,
+		state.selection.selectionEnd.clientId,
+		state.blockVisibility,
+	]
+);

From 27fc84e04ca4b00a5390b8e2fea70f29e4da7200 Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Wed, 24 Jan 2024 04:03:22 +0900
Subject: [PATCH 237/296] Lightbox: Fix "Expand on click" control being
 disabled unintentionally (#56053)

---
 packages/block-library/src/image/image.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index d8788fde4844f..f2a484b6e03c1 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -355,7 +355,8 @@ export default function Image( {
 	const lightboxChecked =
 		!! lightbox?.enabled || ( ! lightbox && !! lightboxSetting?.enabled );
 
-	const lightboxToggleDisabled = linkDestination !== 'none';
+	const lightboxToggleDisabled =
+		linkDestination && linkDestination !== 'none';
 
 	const dimensionsControl = (
 		<DimensionsTool

From 614e0355500793190d7a94f66a5d4646318abd99 Mon Sep 17 00:00:00 2001
From: Rich Tabor <hi@richtabor.com>
Date: Tue, 23 Jan 2024 14:24:31 -0500
Subject: [PATCH 238/296] Reduce LinkControl preview (#57775)

* Add offset to LinkControl Popover

* Remove additionalControls from preview

* Simplify preview

* Remove unused test

* Revert "Remove unused test"

This reverts commit 33491f0ea7a575f8a288b6872c4682dc8be1c4f1.

* Add back the new tab control

* Tweak offset

* fix unit test

---------

Co-authored-by: MaggieCabrera <maggie.cabrera@automattic.com>
---
 .../components/link-control/link-preview.js   |  65 ++---------
 .../src/components/link-control/style.scss    | 105 +++++-------------
 .../src/components/link-control/test/index.js |   3 +-
 packages/format-library/src/link/inline.js    |   1 +
 4 files changed, 41 insertions(+), 133 deletions(-)

diff --git a/packages/block-editor/src/components/link-control/link-preview.js b/packages/block-editor/src/components/link-control/link-preview.js
index 04a67d4478994..5a5a30969d013 100644
--- a/packages/block-editor/src/components/link-control/link-preview.js
+++ b/packages/block-editor/src/components/link-control/link-preview.js
@@ -10,7 +10,7 @@ import { __ } from '@wordpress/i18n';
 import {
 	Button,
 	ExternalLink,
-	__experimentalText as Text,
+	__experimentalTruncate as Truncate,
 	Tooltip,
 } from '@wordpress/components';
 import { filterURLForDisplay, safeDecodeURI } from '@wordpress/url';
@@ -41,7 +41,7 @@ export default function LinkPreview( {
 	const hasRichData = richData && Object.keys( richData ).length;
 
 	const displayURL =
-		( value && filterURLForDisplay( safeDecodeURI( value.url ), 16 ) ) ||
+		( value && filterURLForDisplay( safeDecodeURI( value.url ), 24 ) ) ||
 		'';
 
 	// url can be undefined if the href attribute is unset
@@ -88,21 +88,21 @@ export default function LinkPreview( {
 					<span className="block-editor-link-control__search-item-details">
 						{ ! isEmptyURL ? (
 							<>
-								<Tooltip
-									text={ value.url }
-									placement="bottom-start"
-								>
+								<Tooltip text={ value.url }>
 									<ExternalLink
 										className="block-editor-link-control__search-item-title"
 										href={ value.url }
 									>
-										{ displayTitle }
+										<Truncate numberOfLines={ 1 }>
+											{ displayTitle }
+										</Truncate>
 									</ExternalLink>
 								</Tooltip>
-
 								{ value?.url && displayTitle !== displayURL && (
 									<span className="block-editor-link-control__search-item-info">
-										{ displayURL }
+										<Truncate numberOfLines={ 1 }>
+											{ displayURL }
+										</Truncate>
 									</span>
 								) }
 							</>
@@ -119,7 +119,7 @@ export default function LinkPreview( {
 					label={ __( 'Edit' ) }
 					className="block-editor-link-control__search-item-action"
 					onClick={ onEditClick }
-					iconSize={ 24 }
+					size="compact"
 				/>
 				{ hasUnlinkControl && (
 					<Button
@@ -127,54 +127,11 @@ export default function LinkPreview( {
 						label={ __( 'Unlink' ) }
 						className="block-editor-link-control__search-item-action block-editor-link-control__unlink"
 						onClick={ onRemove }
-						iconSize={ 24 }
+						size="compact"
 					/>
 				) }
 				<ViewerSlot fillProps={ value } />
 			</div>
-
-			{ !! (
-				( hasRichData &&
-					( richData?.image || richData?.description ) ) ||
-				isFetching
-			) && (
-				<div className="block-editor-link-control__search-item-bottom">
-					{ ( richData?.image || isFetching ) && (
-						<div
-							aria-hidden={ ! richData?.image }
-							className={ classnames(
-								'block-editor-link-control__search-item-image',
-								{
-									'is-placeholder': ! richData?.image,
-								}
-							) }
-						>
-							{ richData?.image && (
-								<img src={ richData?.image } alt="" />
-							) }
-						</div>
-					) }
-
-					{ ( richData?.description || isFetching ) && (
-						<div
-							aria-hidden={ ! richData?.description }
-							className={ classnames(
-								'block-editor-link-control__search-item-description',
-								{
-									'is-placeholder': ! richData?.description,
-								}
-							) }
-						>
-							{ richData?.description && (
-								<Text truncate numberOfLines="2">
-									{ richData.description }
-								</Text>
-							) }
-						</div>
-					) }
-				</div>
-			) }
-
 			{ additionalControls && additionalControls() }
 		</div>
 	);
diff --git a/packages/block-editor/src/components/link-control/style.scss b/packages/block-editor/src/components/link-control/style.scss
index 1a053eabf265c..7b6470df43543 100644
--- a/packages/block-editor/src/components/link-control/style.scss
+++ b/packages/block-editor/src/components/link-control/style.scss
@@ -1,5 +1,4 @@
 $block-editor-link-control-number-of-actions: 1;
-$preview-image-height: 140px;
 
 @keyframes loadingpulse {
 	0% {
@@ -180,6 +179,7 @@ $preview-image-height: 140px;
 		flex-direction: row;
 		align-items: flex-start;
 		margin-right: $grid-unit-10;
+		gap: $grid-unit-10;
 
 		// Force text to wrap to improve UX when encountering long lines
 		// of text, particular those with no spaces.
@@ -188,6 +188,9 @@ $preview-image-height: 140px;
 		overflow-wrap: break-word;
 
 		.block-editor-link-control__search-item-info {
+			color: $gray-700;
+			line-height: 1.1;
+			font-size: $helptext-font-size;
 			word-break: break-all;
 		}
 	}
@@ -206,17 +209,29 @@ $preview-image-height: 140px;
 		word-break: break-all;
 	}
 
+	.block-editor-link-control__search-item-details {
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
+		gap: $grid-unit-05;
+	}
+
+	.block-editor-link-control__search-item-header .block-editor-link-control__search-item-icon {
+		background-color: $gray-100;
+		width: $grid-unit-40;
+		height: $grid-unit-40;
+		border-radius: $radius-block-ui;
+	}
+
 	.block-editor-link-control__search-item-icon {
 		position: relative;
-		margin-right: $grid-unit-10;
-		max-height: 24px;
 		flex-shrink: 0;
-		width: 24px;
 		display: flex;
 		justify-content: center;
+		align-items: center;
 
 		img {
-			width: 16px; // favicons often have a source of 32px
+			width: $grid-unit-20; // favicons often have a source of 32px
 		}
 	}
 
@@ -227,10 +242,13 @@ $preview-image-height: 140px;
 	}
 
 	.block-editor-link-control__search-item-title {
-		display: block;
-		font-weight: 500;
-		position: relative;
-		line-height: $grid-unit-30;
+		border-radius: $radius-block-ui;
+		line-height: 1.1;
+
+		&:focus-visible {
+			@include block-toolbar-button-style__focus();
+			text-decoration: none;
+		}
 
 		mark {
 			font-weight: 600;
@@ -246,58 +264,6 @@ $preview-image-height: 140px;
 			display: none; // specifically requested to be removed visually as well.
 		}
 	}
-
-	.block-editor-link-control__search-item-description {
-		padding-top: 12px;
-		margin: 0;
-
-		&.is-placeholder {
-			margin-top: 12px;
-			padding-top: 0;
-			height: 28px;
-			display: flex;
-			flex-direction: column;
-			justify-content: space-around;
-
-			&::before,
-			&::after {
-				display: block;
-				content: "";
-				height: 0.7em;
-				width: 100%;
-				background-color: $gray-100;
-				border-radius: 3px;
-			}
-		}
-
-		.components-text {
-			font-size: 0.9em;
-		}
-	}
-
-	.block-editor-link-control__search-item-image {
-		display: flex;
-		width: 100%;
-		background-color: $gray-100;
-		justify-content: center;
-		height: $preview-image-height; // limit height
-		max-height: $preview-image-height; // limit height
-		overflow: hidden;
-		border-radius: 2px;
-		margin-top: 12px;
-
-		&.is-placeholder {
-			background-color: $gray-100;
-			border-radius: 3px;
-		}
-
-		img {
-			display: block; // remove unwanted space below image
-			width: 100%;
-			height: 100%;
-			object-fit: contain;
-		}
-	}
 }
 
 .block-editor-link-control__search-item-top {
@@ -307,24 +273,7 @@ $preview-image-height: 140px;
 	align-items: center;
 }
 
-.block-editor-link-control__search-item-bottom {
-	transition: opacity 1.5s;
-	width: 100%;
-}
-
 .block-editor-link-control__search-item.is-fetching {
-	.block-editor-link-control__search-item-description {
-		&::before,
-		&::after {
-			animation: loadingpulse 1s linear infinite;
-			animation-delay: 0.5s; // avoid animating for fast network responses
-		}
-	}
-
-	.block-editor-link-control__search-item-image {
-		animation: loadingpulse 1s linear infinite;
-		animation-delay: 0.5s; // avoid animating for fast network responses
-	}
 
 	.block-editor-link-control__search-item-icon {
 		svg,
diff --git a/packages/block-editor/src/components/link-control/test/index.js b/packages/block-editor/src/components/link-control/test/index.js
index 32db57a55d76e..054f7a3ea8746 100644
--- a/packages/block-editor/src/components/link-control/test/index.js
+++ b/packages/block-editor/src/components/link-control/test/index.js
@@ -2244,7 +2244,8 @@ describe( 'Rich link previews', () => {
 
 		const titlePreview = screen.getByText( selectedLink.title );
 
-		expect( titlePreview ).toHaveClass(
+		// eslint-disable-next-line testing-library/no-node-access
+		expect( titlePreview.parentElement ).toHaveClass(
 			'block-editor-link-control__search-item-title'
 		);
 	} );
diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
index 58da13eb51ab6..39fcc0f3b0734 100644
--- a/packages/format-library/src/link/inline.js
+++ b/packages/format-library/src/link/inline.js
@@ -257,6 +257,7 @@ function InlineLinkUI( {
 			onClose={ stopAddingLink }
 			onFocusOutside={ () => stopAddingLink( false ) }
 			placement="bottom"
+			offset={ 10 }
 			shift
 		>
 			<LinkControl

From 43ac2af5c8655b885147485c919d012f789f874c Mon Sep 17 00:00:00 2001
From: Vicente Canales <1157901+vcanales@users.noreply.github.com>
Date: Tue, 23 Jan 2024 14:38:47 -0500
Subject: [PATCH 239/296] Add effects/box shadow tools to block inspector
 (#57654)

* wip

* wip

* Add effects panel to block inspector

@todo: for some reason, the Effects Panel is rendering, but the Shadow
controls are not.

* add shadow classes for block settings in the editor

* add shadow attribute to template from the UI

* fix typo

* define support key in the supports hook

* remove internal dependencies block

* remove effects panel from multi-selection inspector

* read/write shadow from style attribute

* make sure path and value computed correctly

* fix shadow being applied to block stead of inner element for button

* revert generation of class names for shadows

* revert support for shadow atribute.

* don't use useMemo

* skip serialization for shadow when the support is enabled

* add entry to components changelog

---------

Co-authored-by: madhusudhand <madhusudhan.dollu@gmail.com>
---
 lib/block-supports/shadow.php                 |  5 +-
 .../src/components/block-inspector/index.js   |  4 ++
 .../components/global-styles/effects-panel.js | 17 +++++-
 .../inspector-controls-tabs/styles-tab.js     |  1 +
 .../use-inspector-controls-tabs.js            |  2 +
 .../components/inspector-controls/groups.js   |  2 +
 packages/block-editor/src/hooks/effects.js    | 59 +++++++++++++++++++
 packages/block-editor/src/hooks/index.js      |  1 +
 .../block-editor/src/hooks/index.native.js    |  1 +
 packages/block-editor/src/hooks/style.js      |  8 +++
 packages/block-editor/src/hooks/supports.js   |  2 +
 .../block-editor/src/hooks/test/effects.js    | 39 ++++++++++++
 .../src/hooks/use-shadow-props.js             | 37 ++++++++++++
 packages/block-editor/src/hooks/utils.js      |  6 +-
 packages/block-editor/src/index.js            |  2 +
 packages/block-library/src/button/edit.js     |  3 +
 packages/block-library/src/button/save.js     |  3 +
 packages/components/CHANGELOG.md              |  1 +
 .../bubbles-virtually/use-slot-fills.ts       |  2 +-
 schemas/json/block.json                       |  5 ++
 20 files changed, 194 insertions(+), 6 deletions(-)
 create mode 100644 packages/block-editor/src/hooks/effects.js
 create mode 100644 packages/block-editor/src/hooks/test/effects.js
 create mode 100644 packages/block-editor/src/hooks/use-shadow-props.js

diff --git a/lib/block-supports/shadow.php b/lib/block-supports/shadow.php
index 4a28c98b79325..87258930faf10 100644
--- a/lib/block-supports/shadow.php
+++ b/lib/block-supports/shadow.php
@@ -53,9 +53,8 @@ function gutenberg_apply_shadow_support( $block_type, $block_attributes ) {
 
 	$shadow_block_styles = array();
 
-	$preset_shadow                 = array_key_exists( 'shadow', $block_attributes ) ? "var:preset|shadow|{$block_attributes['shadow']}" : null;
-	$custom_shadow                 = isset( $block_attributes['style']['shadow'] ) ? $block_attributes['style']['shadow'] : null;
-	$shadow_block_styles['shadow'] = $preset_shadow ? $preset_shadow : $custom_shadow;
+	$custom_shadow                 = $block_attributes['style']['shadow'] ?? null;
+	$shadow_block_styles['shadow'] = $custom_shadow;
 
 	$attributes = array();
 	$styles     = gutenberg_style_engine_get_styles( $shadow_block_styles );
diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
index 9cb3b89a7bc25..afdda89b6739a 100644
--- a/packages/block-editor/src/components/block-inspector/index.js
+++ b/packages/block-editor/src/components/block-inspector/index.js
@@ -307,6 +307,10 @@ const BlockInspectorSingleBlock = ( { clientId, blockName } ) => {
 						label={ __( 'Background' ) }
 					/>
 					<PositionControls />
+					<InspectorControls.Slot
+						group="effects"
+						label={ __( 'Effects' ) }
+					/>
 					<div>
 						<AdvancedControls />
 					</div>
diff --git a/packages/block-editor/src/components/global-styles/effects-panel.js b/packages/block-editor/src/components/global-styles/effects-panel.js
index 9a9fd8d1258ed..94c1d119c354c 100644
--- a/packages/block-editor/src/components/global-styles/effects-panel.js
+++ b/packages/block-editor/src/components/global-styles/effects-panel.js
@@ -26,6 +26,7 @@ import { shadow as shadowIcon, Icon, check } from '@wordpress/icons';
 /**
  * Internal dependencies
  */
+import { mergeOrigins } from '../use-settings';
 import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
 import { setImmutably } from '../../utils/object';
 
@@ -81,8 +82,22 @@ export default function EffectsPanel( {
 	// Shadow
 	const hasShadowEnabled = useHasShadowControl( settings );
 	const shadow = decodeValue( inheritedValue?.shadow );
+	const shadowPresets = settings?.shadow?.presets;
+	const mergedShadowPresets = shadowPresets
+		? mergeOrigins( shadowPresets )
+		: [];
 	const setShadow = ( newValue ) => {
-		onChange( setImmutably( value, [ 'shadow' ], newValue ) );
+		const slug = mergedShadowPresets?.find(
+			( { shadow: shadowName } ) => shadowName === newValue
+		)?.slug;
+
+		onChange(
+			setImmutably(
+				value,
+				[ 'shadow' ],
+				slug ? `var:preset|shadow|${ slug }` : newValue || undefined
+			)
+		);
 	};
 	const hasShadow = () => !! value?.shadow;
 	const resetShadow = () => setShadow( undefined );
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
index d42b3bffce4eb..6f24051ea2cfc 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/styles-tab.js
@@ -46,6 +46,7 @@ const StylesTab = ( { blockName, clientId, hasBlockStyles } ) => {
 				label={ __( 'Dimensions' ) }
 			/>
 			<InspectorControls.Slot group="border" label={ __( 'Border' ) } />
+			<InspectorControls.Slot group="effects" label={ __( 'Effects' ) } />
 			<InspectorControls.Slot group="styles" />
 		</>
 	);
diff --git a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
index 2a47ae5267ca4..ff68be82a829f 100644
--- a/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
+++ b/packages/block-editor/src/components/inspector-controls-tabs/use-inspector-controls-tabs.js
@@ -40,6 +40,7 @@ export default function useInspectorControlsTabs( blockName ) {
 		position: positionGroup,
 		styles: stylesGroup,
 		typography: typographyGroup,
+		effects: effectsGroup,
 	} = InspectorControlsGroups;
 
 	// List View Tab: If there are any fills for the list group add that tab.
@@ -55,6 +56,7 @@ export default function useInspectorControlsTabs( blockName ) {
 		...( useSlotFills( dimensionsGroup.Slot.__unstableName ) || [] ),
 		...( useSlotFills( stylesGroup.Slot.__unstableName ) || [] ),
 		...( useSlotFills( typographyGroup.Slot.__unstableName ) || [] ),
+		...( useSlotFills( effectsGroup.Slot.__unstableName ) || [] ),
 	];
 	const hasStyleFills = styleFills.length;
 
diff --git a/packages/block-editor/src/components/inspector-controls/groups.js b/packages/block-editor/src/components/inspector-controls/groups.js
index b4eada4b6b4be..9ca1a72b9918a 100644
--- a/packages/block-editor/src/components/inspector-controls/groups.js
+++ b/packages/block-editor/src/components/inspector-controls/groups.js
@@ -20,6 +20,7 @@ const InspectorControlsTypography = createSlotFill(
 );
 const InspectorControlsListView = createSlotFill( 'InspectorControlsListView' );
 const InspectorControlsStyles = createSlotFill( 'InspectorControlsStyles' );
+const InspectorControlsEffects = createSlotFill( 'InspectorControlsEffects' );
 
 const groups = {
 	default: InspectorControlsDefault,
@@ -28,6 +29,7 @@ const groups = {
 	border: InspectorControlsBorder,
 	color: InspectorControlsColor,
 	dimensions: InspectorControlsDimensions,
+	effects: InspectorControlsEffects,
 	filter: InspectorControlsFilter,
 	list: InspectorControlsListView,
 	position: InspectorControlsPosition,
diff --git a/packages/block-editor/src/hooks/effects.js b/packages/block-editor/src/hooks/effects.js
new file mode 100644
index 0000000000000..92d9a2310f1c4
--- /dev/null
+++ b/packages/block-editor/src/hooks/effects.js
@@ -0,0 +1,59 @@
+/**
+ * WordPress dependencies
+ */
+import { hasBlockSupport } from '@wordpress/blocks';
+import { useSelect } from '@wordpress/data';
+/**
+ * Internal dependencies
+ */
+import StylesEffectsPanel, {
+	useHasEffectsPanel,
+} from '../components/global-styles/effects-panel';
+import { InspectorControls } from '../components';
+import { store as blockEditorStore } from '../store';
+
+export const SHADOW_SUPPORT_KEY = 'shadow';
+export const EFFECTS_SUPPORT_KEYS = [ SHADOW_SUPPORT_KEY ];
+
+export function hasEffectsSupport( blockName ) {
+	return EFFECTS_SUPPORT_KEYS.some( ( key ) =>
+		hasBlockSupport( blockName, key )
+	);
+}
+
+function EffectsInspectorControl( { children, resetAllFilter } ) {
+	return (
+		<InspectorControls group="effects" resetAllFilter={ resetAllFilter }>
+			{ children }
+		</InspectorControls>
+	);
+}
+export function EffectsPanel( { clientId, setAttributes, settings } ) {
+	const isEnabled = useHasEffectsPanel( settings );
+	const blockAttributes = useSelect(
+		( select ) => select( blockEditorStore ).getBlockAttributes( clientId ),
+		[ clientId ]
+	);
+	const shadow = blockAttributes?.style?.shadow;
+	const value = { shadow };
+
+	const onChange = ( newValue ) => {
+		setAttributes( {
+			style: { ...blockAttributes.style, shadow: newValue.shadow },
+		} );
+	};
+
+	if ( ! isEnabled ) {
+		return null;
+	}
+
+	return (
+		<StylesEffectsPanel
+			as={ EffectsInspectorControl }
+			panelId={ clientId }
+			settings={ settings }
+			value={ value }
+			onChange={ onChange }
+		/>
+	);
+}
diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js
index f17c0a22166e4..cb0ca4e2ff3e5 100644
--- a/packages/block-editor/src/hooks/index.js
+++ b/packages/block-editor/src/hooks/index.js
@@ -68,6 +68,7 @@ createBlockSaveFilter( [
 export { useCustomSides } from './dimensions';
 export { useLayoutClasses, useLayoutStyles } from './layout';
 export { getBorderClassesAndStyles, useBorderProps } from './use-border-props';
+export { getShadowClassesAndStyles, useShadowProps } from './use-shadow-props';
 export { getColorClassesAndStyles, useColorProps } from './use-color-props';
 export { getSpacingClassesAndStyles } from './use-spacing-props';
 export { getTypographyClassesAndStyles } from './use-typography-props';
diff --git a/packages/block-editor/src/hooks/index.native.js b/packages/block-editor/src/hooks/index.native.js
index 55ae7e19df703..6e4c1c6a17ba5 100644
--- a/packages/block-editor/src/hooks/index.native.js
+++ b/packages/block-editor/src/hooks/index.native.js
@@ -28,6 +28,7 @@ createBlockSaveFilter( [
 ] );
 
 export { getBorderClassesAndStyles, useBorderProps } from './use-border-props';
+export { getShadowClassesAndStyles, useShadowProps } from './use-shadow-props';
 export { getColorClassesAndStyles, useColorProps } from './use-color-props';
 export { getSpacingClassesAndStyles } from './use-spacing-props';
 export { useCachedTruthy } from './use-cached-truthy';
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
index 7221de63456cd..dec046f888a46 100644
--- a/packages/block-editor/src/hooks/style.js
+++ b/packages/block-editor/src/hooks/style.js
@@ -27,6 +27,11 @@ import {
 	SPACING_SUPPORT_KEY,
 	DimensionsPanel,
 } from './dimensions';
+import {
+	EFFECTS_SUPPORT_KEYS,
+	SHADOW_SUPPORT_KEY,
+	EffectsPanel,
+} from './effects';
 import {
 	shouldSkipSerialization,
 	useStyleOverride,
@@ -37,6 +42,7 @@ import { useBlockEditingMode } from '../components/block-editing-mode';
 
 const styleSupportKeys = [
 	...TYPOGRAPHY_SUPPORT_KEYS,
+	...EFFECTS_SUPPORT_KEYS,
 	BORDER_SUPPORT_KEY,
 	COLOR_SUPPORT_KEY,
 	DIMENSIONS_SUPPORT_KEY,
@@ -110,6 +116,7 @@ const skipSerializationPathsEdit = {
 	[ `${ SPACING_SUPPORT_KEY }.__experimentalSkipSerialization` ]: [
 		SPACING_SUPPORT_KEY,
 	],
+	[ `${ SHADOW_SUPPORT_KEY }` ]: [ SHADOW_SUPPORT_KEY ],
 };
 
 /**
@@ -336,6 +343,7 @@ function BlockStyleControls( {
 			<TypographyPanel { ...passedProps } />
 			<BorderPanel { ...passedProps } />
 			<DimensionsPanel { ...passedProps } />
+			<EffectsPanel { ...passedProps } />
 		</>
 	);
 }
diff --git a/packages/block-editor/src/hooks/supports.js b/packages/block-editor/src/hooks/supports.js
index 2cf08d46fa8fe..4e116494029bf 100644
--- a/packages/block-editor/src/hooks/supports.js
+++ b/packages/block-editor/src/hooks/supports.js
@@ -59,8 +59,10 @@ const TYPOGRAPHY_SUPPORT_KEYS = [
 	WRITING_MODE_SUPPORT_KEY,
 	LETTER_SPACING_SUPPORT_KEY,
 ];
+const EFFECTS_SUPPORT_KEYS = [ 'shadow' ];
 const SPACING_SUPPORT_KEY = 'spacing';
 const styleSupportKeys = [
+	...EFFECTS_SUPPORT_KEYS,
 	...TYPOGRAPHY_SUPPORT_KEYS,
 	BORDER_SUPPORT_KEY,
 	COLOR_SUPPORT_KEY,
diff --git a/packages/block-editor/src/hooks/test/effects.js b/packages/block-editor/src/hooks/test/effects.js
new file mode 100644
index 0000000000000..b4fe61745744b
--- /dev/null
+++ b/packages/block-editor/src/hooks/test/effects.js
@@ -0,0 +1,39 @@
+/**
+ * Internal dependencies
+ */
+import { hasEffectsSupport } from '../effects';
+
+describe( 'effects', () => {
+	describe( 'hasEffectsSupport', () => {
+		it( 'should return false if the block does not support effects', () => {
+			const settings = {
+				supports: {
+					shadow: false,
+				},
+			};
+
+			expect( hasEffectsSupport( settings ) ).toBe( false );
+		} );
+
+		it( 'should return true if the block supports effects', () => {
+			const settings = {
+				supports: {
+					shadow: true,
+				},
+			};
+
+			expect( hasEffectsSupport( settings ) ).toBe( true );
+		} );
+
+		it( 'should return true if the block supports effects and other features', () => {
+			const settings = {
+				supports: {
+					shadow: true,
+					align: true,
+				},
+			};
+
+			expect( hasEffectsSupport( settings ) ).toBe( true );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/hooks/use-shadow-props.js b/packages/block-editor/src/hooks/use-shadow-props.js
new file mode 100644
index 0000000000000..fdc601366245c
--- /dev/null
+++ b/packages/block-editor/src/hooks/use-shadow-props.js
@@ -0,0 +1,37 @@
+/**
+ * Internal dependencies
+ */
+import { getInlineStyles } from './style';
+
+// This utility is intended to assist where the serialization of the shadow
+// block support is being skipped for a block but the shadow related CSS classes
+// & styles still need to be generated so they can be applied to inner elements.
+
+/**
+ * Provides the CSS class names and inline styles for a block's shadow support
+ * attributes.
+ *
+ * @param {Object} attributes Block attributes.
+ * @return {Object} Shadow block support derived CSS classes & styles.
+ */
+export function getShadowClassesAndStyles( attributes ) {
+	const shadow = attributes.style?.shadow || '';
+
+	return {
+		className: undefined,
+		style: getInlineStyles( { shadow } ),
+	};
+}
+
+/**
+ * Derives the shadow related props for a block from its shadow block support
+ * attributes.
+ *
+ * @param {Object} attributes Block attributes.
+ *
+ * @return {Object} ClassName & style props from shadow block support.
+ */
+export function useShadowProps( attributes ) {
+	const shadowProps = getShadowClassesAndStyles( attributes );
+	return shadowProps;
+}
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index e63029e4e34e8..ea31a516ac634 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -221,6 +221,7 @@ export function useBlockSettings( name, parentLayout ) {
 		isTextEnabled,
 		isHeadingEnabled,
 		isButtonEnabled,
+		shadow,
 	] = useSettings(
 		'background.backgroundImage',
 		'background.backgroundSize',
@@ -268,7 +269,8 @@ export function useBlockSettings( name, parentLayout ) {
 		'color.link',
 		'color.text',
 		'color.heading',
-		'color.button'
+		'color.button',
+		'shadow'
 	);
 
 	const rawSettings = useMemo( () => {
@@ -345,6 +347,7 @@ export function useBlockSettings( name, parentLayout ) {
 			},
 			layout,
 			parentLayout,
+			shadow,
 		};
 	}, [
 		backgroundImage,
@@ -395,6 +398,7 @@ export function useBlockSettings( name, parentLayout ) {
 		isTextEnabled,
 		isHeadingEnabled,
 		isButtonEnabled,
+		shadow,
 	] );
 
 	return useSettingsForBlockElement( rawSettings, name );
diff --git a/packages/block-editor/src/index.js b/packages/block-editor/src/index.js
index 1dbc4501e9218..83475b9358723 100644
--- a/packages/block-editor/src/index.js
+++ b/packages/block-editor/src/index.js
@@ -11,6 +11,8 @@ export {
 	useCustomSides as __experimentalUseCustomSides,
 	getSpacingClassesAndStyles as __experimentalGetSpacingClassesAndStyles,
 	getGapCSSValue as __experimentalGetGapCSSValue,
+	getShadowClassesAndStyles as __experimentalGetShadowClassesAndStyles,
+	useShadowProps as __experimentalUseShadowProps,
 	useCachedTruthy,
 } from './hooks';
 export * from './components';
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index b46e145d760ad..a0994ce3f84b1 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -32,6 +32,7 @@ import {
 	__experimentalUseBorderProps as useBorderProps,
 	__experimentalUseColorProps as useColorProps,
 	__experimentalGetSpacingClassesAndStyles as useSpacingProps,
+	__experimentalUseShadowProps as useShadowProps,
 	__experimentalLinkControl as LinkControl,
 	__experimentalGetElementClassName,
 	store as blockEditorStore,
@@ -184,6 +185,7 @@ function ButtonEdit( props ) {
 	const borderProps = useBorderProps( attributes );
 	const colorProps = useColorProps( attributes );
 	const spacingProps = useSpacingProps( attributes );
+	const shadowProps = useShadowProps( attributes );
 	const ref = useRef();
 	const richTextRef = useRef();
 	const blockProps = useBlockProps( {
@@ -266,6 +268,7 @@ function ButtonEdit( props ) {
 						...borderProps.style,
 						...colorProps.style,
 						...spacingProps.style,
+						...shadowProps.style,
 					} }
 					onSplit={ ( value ) =>
 						createBlock( 'core/button', {
diff --git a/packages/block-library/src/button/save.js b/packages/block-library/src/button/save.js
index e12936e8c9245..ba0fbd45f083c 100644
--- a/packages/block-library/src/button/save.js
+++ b/packages/block-library/src/button/save.js
@@ -12,6 +12,7 @@ import {
 	__experimentalGetBorderClassesAndStyles as getBorderClassesAndStyles,
 	__experimentalGetColorClassesAndStyles as getColorClassesAndStyles,
 	__experimentalGetSpacingClassesAndStyles as getSpacingClassesAndStyles,
+	__experimentalGetShadowClassesAndStyles as getShadowClassesAndStyles,
 	__experimentalGetElementClassName,
 } from '@wordpress/block-editor';
 
@@ -40,6 +41,7 @@ export default function save( { attributes, className } ) {
 	const borderProps = getBorderClassesAndStyles( attributes );
 	const colorProps = getColorClassesAndStyles( attributes );
 	const spacingProps = getSpacingClassesAndStyles( attributes );
+	const shadowProps = getShadowClassesAndStyles( attributes );
 	const buttonClasses = classnames(
 		'wp-block-button__link',
 		colorProps.className,
@@ -56,6 +58,7 @@ export default function save( { attributes, className } ) {
 		...borderProps.style,
 		...colorProps.style,
 		...spacingProps.style,
+		...shadowProps.style,
 	};
 
 	// The use of a `title` attribute here is soft-deprecated, but still applied
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index e546707a30f59..e732cbda994af 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -10,6 +10,7 @@
 -   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 -   `Tooltip` and `Button`: tidy up unit tests ([#57975](https://github.com/WordPress/gutenberg/pull/57975)).
+-	`SlotFill`: fix typo in use-slot-fills return docs ([#57654](https://github.com/WordPress/gutenberg/pull/57654))
 
 ### Bug Fix
 
diff --git a/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts b/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
index 599f0bc566771..0131bbfc434e5 100644
--- a/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
+++ b/packages/components/src/slot-fill/bubbles-virtually/use-slot-fills.ts
@@ -19,6 +19,6 @@ export default function useSlotFills( name: SlotKey ) {
 	const fills = useSnapshot( registry.fills, { sync: true } );
 	// The important bit here is that this call ensures that the hook
 	// only causes a re-render if the "fills" of a given slot name
-	// change change, not any fills.
+	// change, not any fills.
 	return fills.get( name );
 }
diff --git a/schemas/json/block.json b/schemas/json/block.json
index fd69ea1badb33..9cc7a83c2304d 100644
--- a/schemas/json/block.json
+++ b/schemas/json/block.json
@@ -543,6 +543,11 @@
 						}
 					}
 				},
+				"shadow": {
+					"type": "boolean",
+					"description": "Allow blocks to define a box shadow.",
+					"default": false
+				},
 				"typography": {
 					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to typography. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific typography property, its attributes definition is extended to include the style attribute.",

From a7333b96d76b43a94d80fb03abdd89794c0f77d0 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 23 Jan 2024 21:51:01 +0200
Subject: [PATCH 240/296] Meta boxes: don't initialise if there are none
 (#57182)

---
 packages/edit-post/src/components/meta-boxes/index.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/edit-post/src/components/meta-boxes/index.js b/packages/edit-post/src/components/meta-boxes/index.js
index 6575a78be7a6c..14728c97cf6b6 100644
--- a/packages/edit-post/src/components/meta-boxes/index.js
+++ b/packages/edit-post/src/components/meta-boxes/index.js
@@ -30,14 +30,16 @@ export default function MetaBoxes( { location } ) {
 		[ location ]
 	);
 
+	const hasMetaBoxes = !! metaBoxes?.length;
+
 	// When editor is ready, initialize postboxes (wp core script) and metabox
 	// saving. This initializes all meta box locations, not just this specific
 	// one.
 	useEffect( () => {
-		if ( isEditorReady && ! areMetaBoxesInitialized ) {
+		if ( isEditorReady && hasMetaBoxes && ! areMetaBoxesInitialized ) {
 			registry.dispatch( editPostStore ).initializeMetaBoxes();
 		}
-	}, [ isEditorReady, areMetaBoxesInitialized ] );
+	}, [ isEditorReady, hasMetaBoxes, areMetaBoxesInitialized ] );
 
 	if ( ! areMetaBoxesInitialized ) {
 		return null;

From 1a0e79ce55425764bdef25112dabe7efc4a13e4c Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Tue, 23 Jan 2024 22:18:28 +0200
Subject: [PATCH 241/296] Revert "Block editor: avoid list re-rendering on
 select" (#58147)

---
 .../src/components/block-list/index.js        | 45 ++++++++++++-------
 .../src/store/private-selectors.js            | 24 ----------
 2 files changed, 29 insertions(+), 40 deletions(-)

diff --git a/packages/block-editor/src/components/block-list/index.js b/packages/block-editor/src/components/block-list/index.js
index 22d4de1d6774c..09a4712a3dd6d 100644
--- a/packages/block-editor/src/components/block-list/index.js
+++ b/packages/block-editor/src/components/block-list/index.js
@@ -155,25 +155,38 @@ function Items( {
 	__experimentalAppenderTagName,
 	layout = defaultLayout,
 } ) {
-	const { order, temporarilyEditingAsBlocks } = useSelect(
-		( select ) => {
-			const {
-				getBlockOrderWithAsyncFlag,
-				__unstableGetTemporarilyEditingAsBlocks,
-			} = unlock( select( blockEditorStore ) );
-			return {
-				order: getBlockOrderWithAsyncFlag( rootClientId ),
-				temporarilyEditingAsBlocks:
-					__unstableGetTemporarilyEditingAsBlocks(),
-			};
-		},
-		[ rootClientId ]
-	);
+	const { order, selectedBlocks, visibleBlocks, temporarilyEditingAsBlocks } =
+		useSelect(
+			( select ) => {
+				const {
+					getBlockOrder,
+					getSelectedBlockClientIds,
+					__unstableGetVisibleBlocks,
+					__unstableGetTemporarilyEditingAsBlocks,
+				} = select( blockEditorStore );
+				return {
+					order: getBlockOrder( rootClientId ),
+					selectedBlocks: getSelectedBlockClientIds(),
+					visibleBlocks: __unstableGetVisibleBlocks(),
+					temporarilyEditingAsBlocks:
+						__unstableGetTemporarilyEditingAsBlocks(),
+				};
+			},
+			[ rootClientId ]
+		);
 
 	return (
 		<LayoutProvider value={ layout }>
-			{ order.map( ( { clientId, isAsync } ) => (
-				<AsyncModeProvider key={ clientId } value={ isAsync }>
+			{ order.map( ( clientId ) => (
+				<AsyncModeProvider
+					key={ clientId }
+					value={
+						// Only provide data asynchronously if the block is
+						// not visible and not selected.
+						! visibleBlocks.has( clientId ) &&
+						! selectedBlocks.includes( clientId )
+					}
+				>
 					<BlockListBlock
 						rootClientId={ rootClientId }
 						clientId={ clientId }
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index c946200b61ad7..e8230eea89daa 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -14,8 +14,6 @@ import {
 	__experimentalGetParsedPattern,
 	canInsertBlockType,
 	__experimentalGetAllowedPatterns,
-	getSelectedBlockClientIds,
-	__unstableGetVisibleBlocks,
 } from './selectors';
 import { getAllPatterns, checkAllowListRecursive } from './utils';
 
@@ -288,25 +286,3 @@ export const hasAllowedPatterns = createSelector(
 export function getLastFocus( state ) {
 	return state.lastFocus;
 }
-
-export const getBlockOrderWithAsyncFlag = createSelector(
-	( state, rootClientId ) => {
-		const order = getBlockOrder( state, rootClientId );
-		const selectedBlocks = getSelectedBlockClientIds( state );
-		const visibleBlocks = __unstableGetVisibleBlocks( state );
-		return order.map( ( clientId ) => ( {
-			clientId,
-			// Only provide data asynchronously if the block is
-			// not visible and not selected.
-			isAsync:
-				! visibleBlocks?.has( clientId ) &&
-				! selectedBlocks?.includes( clientId ),
-		} ) );
-	},
-	( state ) => [
-		state.blocks.order,
-		state.selection.selectionStart.clientId,
-		state.selection.selectionEnd.clientId,
-		state.blockVisibility,
-	]
-);

From 986ad30aaaa924fba5d19774eb426108d57824b1 Mon Sep 17 00:00:00 2001
From: Grant Kinney <creativecoder@users.noreply.github.com>
Date: Tue, 23 Jan 2024 15:44:36 -0600
Subject: [PATCH 242/296] Font Library Refactor (#57688)

* Font Library: add wp_font_face post type and scaffold font face REST API controller (#57656)

* Font Library: create font faces through the REST API (#57702)

* Refactor Font Family Controller (#57785)

* Font Family and Font Face REST API endpoints: better data handling and errors  (#57843)

* Font Families REST API endpoint: ensure unique font family slugs (#57861)

* Font Library: delete child font faces and font assets when deleting parent (#57867)

* Font Library: refactor client side install functions to work with revised API (#57844)

* Cleanup/font library view error handling (#57926)

* Font Faces endpoint: prevent creating font faces with duplicate settings (#57903)

* Font Library: Update uninstall/delete on client side (#57932)

* Font Library: address JS feedback in #57688 (#57961)

* Font Library REST API endpoints: address initial feedback from feature branch (#57946)

* Font Library: font collection refactor to use the new schema (#57884)

* Fix font asset download when font faces are installed (#58021)

* Font Families and Faces: disable autosaves using empty class (#58018)

* Adds migration for legacy font family content (#58032)

---------

Co-authored-by: Jeff Ong <jonger4@gmail.com>
Co-authored-by: Matias Benedetto <matias.benedetto@gmail.com>
Co-authored-by: Jason Crist <jcrist@pbking.com>
Co-authored-by: Sarah Norris <sarah@sekai.co.uk>
Co-authored-by: Jonny Harris <spacedmonkey@users.noreply.github.com>
---
 .../font-library/class-wp-font-collection.php | 183 +++-
 .../class-wp-font-family-utils.php            |  82 +-
 .../font-library/class-wp-font-library.php    |  12 +-
 ...rest-autosave-font-families-controller.php |  25 -
 ...ss-wp-rest-font-collections-controller.php |  66 +-
 .../class-wp-rest-font-faces-controller.php   | 836 +++++++++++++++++
 ...class-wp-rest-font-families-controller.php | 680 ++++++++------
 .../fonts/font-library/font-library.php       | 204 +++-
 lib/load.php                                  |   2 +-
 .../font-library-modal/context.js             | 205 +++-
 .../font-library-modal/font-collection.js     |  55 +-
 .../font-library-modal/fonts-grid.js          |   8 +-
 .../global-styles/font-library-modal/index.js |   8 +-
 .../font-library-modal/installed-fonts.js     |  25 +-
 .../font-library-modal/library-font-card.js   |   3 +-
 .../library-font-variant.js                   |  19 +-
 .../font-library-modal/local-fonts.js         |  18 +-
 .../font-library-modal/resolvers.js           |  67 +-
 .../font-library-modal/style.scss             |   1 +
 .../font-library-modal/utils/filter-fonts.js  |  21 +-
 .../utils/get-intersecting-font-faces.js      |  58 --
 .../utils/get-notice-from-response.js         |  62 --
 .../font-library-modal/utils/index.js         | 130 ++-
 .../utils/preview-styles.js                   |  10 +-
 .../utils/test/filter-fonts.spec.js           |  50 +-
 .../test/getIntersectingFontFaces.spec.js     | 271 ------
 .../test/makeFormDataFromFontFamily.spec.js   |  58 --
 .../utils/test/preview-styles.spec.js         |  10 +-
 phpunit/data/fonts/OpenSans-Regular.otf       | Bin 0 -> 254960 bytes
 phpunit/data/fonts/OpenSans-Regular.ttf       | Bin 0 -> 130976 bytes
 phpunit/data/fonts/OpenSans-Regular.woff      | Bin 0 -> 63712 bytes
 phpunit/data/fonts/OpenSans-Regular.woff2     | Bin 0 -> 47016 bytes
 .../fontFamilyBackwardsCompatibility.php      | 164 ++++
 .../fonts/font-library/fontLibraryHooks.php   |  85 ++
 .../wpFontCollection/__construct.php          |  51 +-
 .../wpFontCollection/getConfig.php            |  14 +-
 .../{getConfigAndData.php => getContent.php}  |  70 +-
 .../wpFontCollection/isConfigValid.php        | 103 ++
 .../font-library/wpFontFamily/__construct.php |   6 +-
 .../wpFontFamilyUtils/formatFontFamily.php    |   6 +-
 .../wpFontFamilyUtils/getFontFaceSlug.php     |  81 ++
 .../wpFontLibrary/registerFontCollection.php  |  18 +-
 .../wpRestFontCollectionsController.php       | 163 ++++
 .../wpRestFontCollectionsController/base.php  |  42 -
 .../getFontCollection.php                     | 126 ---
 .../getFontCollections.php                    |  45 -
 .../registerRoutes.php                        |  24 -
 .../wpRestFontFacesController.php             | 887 ++++++++++++++++++
 .../wpRestFontFamiliesController.php          | 866 +++++++++++++++++
 .../wpRestFontFamiliesController/base.php     |  43 -
 .../installFonts.php                          | 334 -------
 .../uninstallFonts.php                        |  96 --
 52 files changed, 4605 insertions(+), 1788 deletions(-)
 delete mode 100644 lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php
 create mode 100644 lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php
 delete mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js
 delete mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js
 delete mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js
 delete mode 100644 packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js
 create mode 100644 phpunit/data/fonts/OpenSans-Regular.otf
 create mode 100644 phpunit/data/fonts/OpenSans-Regular.ttf
 create mode 100644 phpunit/data/fonts/OpenSans-Regular.woff
 create mode 100644 phpunit/data/fonts/OpenSans-Regular.woff2
 create mode 100644 phpunit/tests/fonts/font-library/fontFamilyBackwardsCompatibility.php
 create mode 100644 phpunit/tests/fonts/font-library/fontLibraryHooks.php
 rename phpunit/tests/fonts/font-library/wpFontCollection/{getConfigAndData.php => getContent.php} (52%)
 create mode 100644 phpunit/tests/fonts/font-library/wpFontCollection/isConfigValid.php
 create mode 100644 phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFontFaceSlug.php
 create mode 100644 phpunit/tests/fonts/font-library/wpRestFontCollectionsController.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontCollectionsController/base.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
 create mode 100644 phpunit/tests/fonts/font-library/wpRestFontFacesController.php
 create mode 100644 phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpRestFontFamiliesController/uninstallFonts.php

diff --git a/lib/experimental/fonts/font-library/class-wp-font-collection.php b/lib/experimental/fonts/font-library/class-wp-font-collection.php
index 6189da5fa984b..1ff96b1343b45 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-collection.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-collection.php
@@ -21,41 +21,128 @@
 class WP_Font_Collection {
 
 	/**
-	 * Font collection configuration.
+	 * The unique slug for the font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $slug;
+
+	/**
+	 * The name of the font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $name;
+
+	/**
+	 * Description of the font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $description;
+
+	/**
+	 * Source of the font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var string
+	 */
+	private $src;
+
+	/**
+	 * Array of font families in the collection.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @var array
 	 */
-	private $config;
+	private $font_families;
+
+	/**
+	 * Categories associated with the font collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @var array
+	 */
+	private $categories;
+
 
 	/**
 	 * WP_Font_Collection constructor.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array $config Font collection config options.
-	 *  See {@see wp_register_font_collection()} for the supported fields.
-	 * @throws Exception If the required parameters are missing.
+	 * @param array $config Font collection config options. {
+	 *      @type string $slug        The font collection's unique slug.
+	 *      @type string $name        The font collection's name.
+	 *      @type string $description The font collection's description.
+	 *      @type string $src         The font collection's source.
+	 *      @type array  $font_families An array of font families in the font collection.
+	 *      @type array  $categories The font collection's categories.
+	 *  }
 	 */
 	public function __construct( $config ) {
-		if ( empty( $config ) || ! is_array( $config ) ) {
-			throw new Exception( 'Font Collection config options is required as a non-empty array.' );
-		}
+		$this->is_config_valid( $config );
+
+		$this->slug          = isset( $config['slug'] ) ? $config['slug'] : '';
+		$this->name          = isset( $config['name'] ) ? $config['name'] : '';
+		$this->description   = isset( $config['description'] ) ? $config['description'] : '';
+		$this->src           = isset( $config['src'] ) ? $config['src'] : '';
+		$this->font_families = isset( $config['font_families'] ) ? $config['font_families'] : array();
+		$this->categories    = isset( $config['categories'] ) ? $config['categories'] : array();
+	}
 
-		if ( empty( $config['slug'] ) || ! is_string( $config['slug'] ) ) {
-			throw new Exception( 'Font Collection config slug is required as a non-empty string.' );
+	/**
+	 * Checks if the font collection config is valid.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $config Font collection config options. {
+	 *      @type string $slug        The font collection's unique slug.
+	 *      @type string $name        The font collection's name.
+	 *      @type string $description The font collection's description.
+	 *      @type string $src         The font collection's source.
+	 *      @type array  $font_families An array of font families in the font collection.
+	 *      @type array  $categories The font collection's categories.
+	 *  }
+	 * @return bool True if the font collection config is valid and false otherwise.
+	 */
+	public static function is_config_valid( $config ) {
+		if ( empty( $config ) || ! is_array( $config ) ) {
+			_doing_it_wrong( __METHOD__, __( 'Font Collection config options are required as a non-empty array.', 'gutenberg' ), '6.5.0' );
+			return false;
 		}
 
-		if ( empty( $config['name'] ) || ! is_string( $config['name'] ) ) {
-			throw new Exception( 'Font Collection config name is required as a non-empty string.' );
+		$required_keys = array( 'slug', 'name' );
+		foreach ( $required_keys as $key ) {
+			if ( empty( $config[ $key ] ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					// translators: %s: Font collection config key.
+					sprintf( __( 'Font Collection config %s is required as a non-empty string.', 'gutenberg' ), $key ),
+					'6.5.0'
+				);
+				return false;
+			}
 		}
 
-		if ( ( empty( $config['src'] ) || ! is_string( $config['src'] ) ) && ( empty( $config['data'] ) ) ) {
-			throw new Exception( 'Font Collection config "src" option OR "data" option is required.' );
+		if (
+			( empty( $config['src'] ) && empty( $config['font_families'] ) ) ||
+			( ! empty( $config['src'] ) && ! empty( $config['font_families'] ) )
+		) {
+			_doing_it_wrong( __METHOD__, __( 'Font Collection config "src" option OR "font_families" option are required.', 'gutenberg' ), '6.5.0' );
+			return false;
 		}
 
-		$this->config = $config;
+		return true;
 	}
 
 	/**
@@ -73,56 +160,59 @@ public function __construct( $config ) {
 	 */
 	public function get_config() {
 		return array(
-			'slug'        => $this->config['slug'],
-			'name'        => $this->config['name'],
-			'description' => $this->config['description'] ?? '',
+			'slug'        => $this->slug,
+			'name'        => $this->name,
+			'description' => $this->description,
 		);
 	}
 
 	/**
-	 * Gets the font collection config and data.
+	 * Gets the font collection content.
 	 *
-	 * This function returns an array containing the font collection's unique ID,
-	 * name, and its data as a PHP array.
+	 * Load the font collection data from the src if it is not already loaded.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return array {
-	 *     An array of font collection config and data.
+	 * @return array|WP_Error {
+	 *     An array of font collection contents.
 	 *
-	 *     @type string $slug          The font collection's unique ID.
-	 *     @type string $name        The font collection's name.
-	 *     @type string $description The font collection's description.
-	 *     @type array  $data        The font collection's data as a PHP array.
+	 *     @type array $font_families      The font collection's font families.
+	 *     @type string $categories        The font collection's categories.
 	 * }
+	 *
+	 * A WP_Error object if there was an error loading the font collection data.
 	 */
-	public function get_config_and_data() {
-		$config_and_data         = $this->get_config();
-		$config_and_data['data'] = $this->load_data();
-		return $config_and_data;
+	public function get_content() {
+		// If the font families are not loaded, and the src is not empty, load the data from the src.
+		if ( empty( $this->font_families ) && ! empty( $this->src ) ) {
+			$data = $this->load_contents_from_src();
+			if ( is_wp_error( $data ) ) {
+				return $data;
+			}
+		}
+
+		return array(
+			'font_families' => $this->font_families,
+			'categories'    => $this->categories,
+		);
 	}
 
 	/**
-	 * Loads the font collection data.
+	 * Loads the font collection data from the src.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @return array|WP_Error An array containing the list of font families in font-collection.json format on success,
 	 *                        else an instance of WP_Error on failure.
 	 */
-	public function load_data() {
-
-		if ( ! empty( $this->config['data'] ) ) {
-			return $this->config['data'];
-		}
-
+	private function load_contents_from_src() {
 		// If the src is a URL, fetch the data from the URL.
-		if ( str_contains( $this->config['src'], 'http' ) && str_contains( $this->config['src'], '://' ) ) {
-			if ( ! wp_http_validate_url( $this->config['src'] ) ) {
+		if ( preg_match( '#^https?://#', $this->src ) ) {
+			if ( ! wp_http_validate_url( $this->src ) ) {
 				return new WP_Error( 'font_collection_read_error', __( 'Invalid URL for Font Collection data.', 'gutenberg' ) );
 			}
 
-			$response = wp_remote_get( $this->config['src'] );
+			$response = wp_remote_get( $this->src );
 			if ( is_wp_error( $response ) || 200 !== wp_remote_retrieve_response_code( $response ) ) {
 				return new WP_Error( 'font_collection_read_error', __( 'Error fetching the Font Collection data from a URL.', 'gutenberg' ) );
 			}
@@ -133,15 +223,22 @@ public function load_data() {
 			}
 			// If the src is a file path, read the data from the file.
 		} else {
-			if ( ! file_exists( $this->config['src'] ) ) {
+			if ( ! file_exists( $this->src ) ) {
 				return new WP_Error( 'font_collection_read_error', __( 'Font Collection data JSON file does not exist.', 'gutenberg' ) );
 			}
-			$data = wp_json_file_decode( $this->config['src'], array( 'associative' => true ) );
+			$data = wp_json_file_decode( $this->src, array( 'associative' => true ) );
 			if ( empty( $data ) ) {
 				return new WP_Error( 'font_collection_read_error', __( 'Error reading the Font Collection data JSON file contents.', 'gutenberg' ) );
 			}
 		}
 
+		if ( empty( $data['font_families'] ) ) {
+			return new WP_Error( 'font_collection_contents_error', __( 'Font Collection data JSON file does not contain font families.', 'gutenberg' ) );
+		}
+
+		$this->font_families = $data['font_families'];
+		$this->categories    = $data['categories'] ?? array();
+
 		return $data;
 	}
 }
diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
index 35e6856e50aad..71a3bb262e600 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
@@ -91,7 +91,7 @@ public static function format_font_family( $font_family ) {
 				function ( $family ) {
 					$trimmed = trim( $family );
 					if ( ! empty( $trimmed ) && strpos( $trimmed, ' ' ) !== false && strpos( $trimmed, "'" ) === false && strpos( $trimmed, '"' ) === false ) {
-							return "'" . $trimmed . "'";
+							return '"' . $trimmed . '"';
 					}
 					return $trimmed;
 				},
@@ -107,4 +107,84 @@ function ( $family ) {
 
 		return $font_family;
 	}
+
+	/**
+	 * Generates a slug from font face properties, e.g. `open sans;normal;400;100%;U+0-10FFFF`
+	 *
+	 * Used for comparison with other font faces in the same family, to prevent duplicates
+	 * that would both match according the CSS font matching spec. Uses only simple case-insensitive
+	 * matching for fontFamily and unicodeRange, so does not handle overlapping font-family lists or
+	 * unicode ranges.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @link https://drafts.csswg.org/css-fonts/#font-style-matching
+	 *
+	 * @param array $settings {
+	 *     Font face settings.
+	 *
+	 *     @type string $fontFamily   Font family name.
+	 *     @type string $fontStyle    Optional font style, defaults to 'normal'.
+	 *     @type string $fontWeight   Optional font weight, defaults to 400.
+	 *     @type string $fontStretch  Optional font stretch, defaults to '100%'.
+	 *     @type string $unicodeRange Optional unicode range, defaults to 'U+0-10FFFF'.
+	 * }
+	 * @return string Font face slug.
+	 */
+	public static function get_font_face_slug( $settings ) {
+		$settings = wp_parse_args(
+			$settings,
+			array(
+				'fontFamily'   => '',
+				'fontStyle'    => 'normal',
+				'fontWeight'   => '400',
+				'fontStretch'  => '100%',
+				'unicodeRange' => 'U+0-10FFFF',
+			)
+		);
+
+		// Convert all values to lowercase for comparison.
+		// Font family names may use multibyte characters.
+		$font_family   = mb_strtolower( $settings['fontFamily'] );
+		$font_style    = strtolower( $settings['fontStyle'] );
+		$font_weight   = strtolower( $settings['fontWeight'] );
+		$font_stretch  = strtolower( $settings['fontStretch'] );
+		$unicode_range = strtoupper( $settings['unicodeRange'] );
+
+		// Convert weight keywords to numeric strings.
+		$font_weight = str_replace( 'normal', '400', $font_weight );
+		$font_weight = str_replace( 'bold', '700', $font_weight );
+
+		// Convert stretch keywords to numeric strings.
+		$font_stretch_map = array(
+			'ultra-condensed' => '50%',
+			'extra-condensed' => '62.5%',
+			'condensed'       => '75%',
+			'semi-condensed'  => '87.5%',
+			'normal'          => '100%',
+			'semi-expanded'   => '112.5%',
+			'expanded'        => '125%',
+			'extra-expanded'  => '150%',
+			'untra-expanded'  => '200%',
+		);
+		$font_stretch     = str_replace( array_keys( $font_stretch_map ), array_values( $font_stretch_map ), $font_stretch );
+
+		$slug_elements = array( $font_family, $font_style, $font_weight, $font_stretch, $unicode_range );
+
+		$slug_elements = array_map(
+			function ( $elem ) {
+				// Remove quotes to normalize font-family names, and ';' to use as a separator.
+				$elem = trim( str_replace( array( '"', "'", ';' ), '', $elem ) );
+
+				// Normalize comma separated lists by removing whitespace in between items,
+				// but keep whitespace within items (e.g. "Open Sans" and "OpenSans" are different fonts).
+				// CSS spec for whitespace includes: U+000A LINE FEED, U+0009 CHARACTER TABULATION, or U+0020 SPACE,
+				// which by default are all matched by \s in PHP.
+				return preg_replace( '/,\s+/', ',', $elem );
+			},
+			$slug_elements
+		);
+
+		return join( ';', $slug_elements );
+	}
 }
diff --git a/lib/experimental/fonts/font-library/class-wp-font-library.php b/lib/experimental/fonts/font-library/class-wp-font-library.php
index fd36f6ba073c4..51a84b957ea11 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-library.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-library.php
@@ -62,11 +62,17 @@ public static function get_expected_font_mime_types_per_php_version( $php_versio
 	 * @return WP_Font_Collection|WP_Error A font collection is it was registered successfully and a WP_Error otherwise.
 	 */
 	public static function register_font_collection( $config ) {
+		if ( ! WP_Font_Collection::is_config_valid( $config ) ) {
+			$error_message = __( 'Font collection config is invalid.', 'gutenberg' );
+			return new WP_Error( 'font_collection_registration_error', $error_message );
+		}
+
 		$new_collection = new WP_Font_Collection( $config );
-		if ( self::is_collection_registered( $config['slug'] ) ) {
+
+		if ( self::is_collection_registered( $new_collection->get_config()['slug'] ) ) {
 			$error_message = sprintf(
 				/* translators: %s: Font collection slug. */
-				__( 'Font collection with slug: "%s" is already registered.', 'default' ),
+				__( 'Font collection with slug: "%s" is already registered.', 'gutenberg' ),
 				$config['slug']
 			);
 			_doing_it_wrong(
@@ -76,7 +82,7 @@ public static function register_font_collection( $config ) {
 			);
 			return new WP_Error( 'font_collection_registration_error', $error_message );
 		}
-		self::$collections[ $config['slug'] ] = $new_collection;
+		self::$collections[ $new_collection->get_config()['slug'] ] = $new_collection;
 		return $new_collection;
 	}
 
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php
deleted file mode 100644
index 0e31bd4004b40..0000000000000
--- a/lib/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-/**
- * Autosave Rest Font Families Controller.
- *
- * This file contains the class for the Autosave REST API Font Families Controller.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_REST_Autosave_Font_Families_Controller' ) ) {
-	return;
-}
-
-/**
- * Autosave Font Families Controller class.
- *
- * @since 6.5.0
- */
-class WP_REST_Autosave_Font_Families_Controller {
-	public function register_routes() {
-		// disable autosave endpoints for font families
-	}
-}
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
index c7595a56413b9..51fd14fffaa95 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php
@@ -42,8 +42,8 @@ public function register_routes() {
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_font_collections' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
 				),
 			)
 		);
@@ -54,13 +54,29 @@ public function register_routes() {
 			array(
 				array(
 					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_font_collection' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
 				),
 			)
 		);
 	}
 
+	/**
+	 * Gets the font collections available.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function get_items( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+		$collections = array();
+		foreach ( WP_Font_Library::get_font_collections() as $collection ) {
+			$collections[] = $collection->get_config();
+		}
+
+		return rest_ensure_response( $collections, 200 );
+	}
+
 	/**
 	 * Gets a font collection.
 	 *
@@ -69,54 +85,42 @@ public function register_routes() {
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function get_font_collection( $request ) {
+	public function get_item( $request ) {
 		$slug       = $request->get_param( 'slug' );
 		$collection = WP_Font_Library::get_font_collection( $slug );
+
 		// If the collection doesn't exist returns a 404.
 		if ( is_wp_error( $collection ) ) {
 			$collection->add_data( array( 'status' => 404 ) );
 			return $collection;
 		}
-		$config_and_data = $collection->get_config_and_data();
-		$collection_data = $config_and_data['data'];
 
-		// If there was an error getting the collection data, return the error.
-		if ( is_wp_error( $collection_data ) ) {
-			$collection_data->add_data( array( 'status' => 500 ) );
-			return $collection_data;
-		}
-
-		return new WP_REST_Response( $config_and_data );
-	}
+		$config   = $collection->get_config();
+		$contents = $collection->get_content();
 
-	/**
-	 * Gets the font collections available.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
-	 */
-	public function get_font_collections() {
-		$collections = array();
-		foreach ( WP_Font_Library::get_font_collections() as $collection ) {
-			$collections[] = $collection->get_config_and_data();
+		// If there was an error getting the collection data, return the error.
+		if ( is_wp_error( $contents ) ) {
+			$contents->add_data( array( 'status' => 500 ) );
+			return $contents;
 		}
 
-		return new WP_REST_Response( $collections, 200 );
+		$collection_data = array_merge( $config, $contents );
+		return rest_ensure_response( $collection_data );
 	}
 
 	/**
-	 * Checks whether the user has permissions to update the Font Library.
+	 * Checks whether the user has permissions to use the Fonts Collections.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @return true|WP_Error True if the request has write access for the item, WP_Error object otherwise.
 	 */
-	public function update_font_library_permissions_check() {
+	public function get_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable
+
 		if ( ! current_user_can( 'edit_theme_options' ) ) {
 			return new WP_Error(
-				'rest_cannot_update_font_library',
-				__( 'Sorry, you are not allowed to update the Font Library on this site.', 'gutenberg' ),
+				'rest_cannot_read',
+				__( 'Sorry, you are not allowed to use the Font Library on this site.', 'gutenberg' ),
 				array(
 					'status' => rest_authorization_required_code(),
 				)
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php
new file mode 100644
index 0000000000000..fac32362325f4
--- /dev/null
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php
@@ -0,0 +1,836 @@
+<?php
+/**
+ * REST API: WP_REST_Font_Faces_Controller class
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.5.0
+ */
+
+if ( class_exists( 'WP_REST_Font_Faces_Controller' ) ) {
+	return;
+}
+
+/**
+ * Class to access font faces through the REST API.
+ */
+class WP_REST_Font_Faces_Controller extends WP_REST_Posts_Controller {
+	/**
+	 * Whether the controller supports batching.
+	 *
+	 * @since 6.5.0
+	 * @var false
+	 */
+	protected $allow_batch = false;
+
+	/**
+	 * Registers the routes for posts.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @see register_rest_route()
+	 */
+	public function register_routes() {
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base,
+			array(
+				'args'   => array(
+					'font_family_id' => array(
+						'description' => __( 'The ID for the parent font family of the font face.', 'gutenberg' ),
+						'type'        => 'integer',
+						'required'    => true,
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_items' ),
+					'permission_callback' => array( $this, 'get_items_permissions_check' ),
+					'args'                => $this->get_collection_params(),
+				),
+				array(
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => array( $this, 'create_item' ),
+					'permission_callback' => array( $this, 'create_item_permissions_check' ),
+					'args'                => $this->get_create_params(),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
+
+		register_rest_route(
+			$this->namespace,
+			'/' . $this->rest_base . '/(?P<id>[\d]+)',
+			array(
+				'args'   => array(
+					'font_family_id' => array(
+						'description' => __( 'The ID for the parent font family of the font face.', 'gutenberg' ),
+						'type'        => 'integer',
+						'required'    => true,
+					),
+					'id'             => array(
+						'description' => __( 'Unique identifier for the font face.', 'gutenberg' ),
+						'type'        => 'integer',
+						'required'    => true,
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => array( $this, 'get_item' ),
+					'permission_callback' => array( $this, 'get_item_permissions_check' ),
+					'args'                => array(
+						'context' => $this->get_context_param( array( 'default' => 'edit' ) ),
+					),
+				),
+				array(
+					'methods'             => WP_REST_Server::DELETABLE,
+					'callback'            => array( $this, 'delete_item' ),
+					'permission_callback' => array( $this, 'delete_item_permissions_check' ),
+					'args'                => array(
+						'force' => array(
+							'type'        => 'boolean',
+							'default'     => false,
+							'description' => __( 'Whether to bypass Trash and force deletion.', 'default' ),
+						),
+					),
+				),
+				'schema' => array( $this, 'get_public_item_schema' ),
+			)
+		);
+	}
+
+	/**
+	 * Checks if a given request has access to font faces.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable -- required by parent class
+		$post_type = get_post_type_object( $this->post_type );
+
+		if ( ! current_user_can( $post_type->cap->read ) ) {
+			return new WP_Error(
+				'rest_cannot_read',
+				__( 'Sorry, you are not allowed to access font faces.', 'gutenberg' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
+
+		return true;
+	}
+
+	/**
+	 * Checks if a given request has access to a font face.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
+	 */
+	public function get_item_permissions_check( $request ) {
+		return $this->get_items_permissions_check( $request );
+	}
+
+	/**
+	 * Validates settings when creating a font face.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string          $value   Encoded JSON string of font face settings.
+	 * @param WP_REST_Request $request Request object.
+	 * @return false|WP_Error True if the settings are valid, otherwise a WP_Error object.
+	 */
+	public function validate_create_font_face_settings( $value, $request ) {
+		$settings = json_decode( $value, true );
+
+		// Check settings string is valid JSON.
+		if ( null === $settings ) {
+			return new WP_Error(
+				'rest_invalid_param',
+				__( 'font_face_settings parameter must be a valid JSON string.', 'gutenberg' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		// Check that the font face settings match the theme.json schema.
+		$schema             = $this->get_item_schema()['properties']['font_face_settings'];
+		$has_valid_settings = rest_validate_value_from_schema( $settings, $schema, 'font_face_settings' );
+
+		if ( is_wp_error( $has_valid_settings ) ) {
+			$has_valid_settings->add_data( array( 'status' => 400 ) );
+			return $has_valid_settings;
+		}
+
+		// Check that none of the required settings are empty values.
+		$required = $schema['required'];
+		foreach ( $required as $key ) {
+			if ( isset( $settings[ $key ] ) && ! $settings[ $key ] ) {
+				return new WP_Error(
+					'rest_invalid_param',
+					/* translators: %s: Font family setting key. */
+					sprintf( __( 'font_face_setting[%s] cannot be empty.', 'gutenberg' ), $key ),
+					array( 'status' => 400 )
+				);
+			}
+		}
+
+		$srcs = is_array( $settings['src'] ) ? $settings['src'] : array( $settings['src'] );
+
+		// Check that srcs are non-empty strings.
+		$filtered_src = array_filter( array_filter( $srcs, 'is_string' ) );
+		if ( empty( $filtered_src ) ) {
+			return new WP_Error(
+				'rest_invalid_param',
+				__( 'font_face_settings[src] values must be non-empty strings.', 'gutenberg' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		// Check that each file in the request references a src in the settings.
+		$files = $request->get_file_params();
+		foreach ( array_keys( $files ) as $file ) {
+			if ( ! in_array( $file, $srcs, true ) ) {
+				return new WP_Error(
+					'rest_invalid_param',
+					// translators: %s: File key (e.g. `file-0`) in the request data.
+					sprintf( __( 'File %1$s must be used in font_face_settings[src].', 'gutenberg' ), $file ),
+					array( 'status' => 400 )
+				);
+			}
+		}
+
+		return true;
+	}
+
+	/**
+	 * Sanitizes the font face settings when creating a font face.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string          $value   Encoded JSON string of font face settings.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Decoded array of font face settings.
+	 */
+	public function sanitize_font_face_settings( $value ) {
+		// Settings arrive as stringified JSON, since this is a multipart/form-data request.
+		$settings = json_decode( $value, true );
+
+		if ( isset( $settings['fontFamily'] ) ) {
+			$settings['fontFamily'] = WP_Font_Family_Utils::format_font_family( $settings['fontFamily'] );
+		}
+
+		return $settings;
+	}
+
+	/**
+	 * Retrieves a collection of font faces within the parent font family.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function get_items( $request ) {
+		$font_family = $this->get_parent_font_family_post( $request['font_family_id'] );
+		if ( is_wp_error( $font_family ) ) {
+			return $font_family;
+		}
+
+		return parent::get_items( $request );
+	}
+
+	/**
+	 * Retrieves a single font face within the parent font family.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function get_item( $request ) {
+		$post = $this->get_post( $request['id'] );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		// Check that the font face has a valid parent font family.
+		$font_family = $this->get_parent_font_family_post( $request['font_family_id'] );
+		if ( is_wp_error( $font_family ) ) {
+			return $font_family;
+		}
+
+		if ( (int) $font_family->ID !== (int) $post->post_parent ) {
+			return new WP_Error(
+				'rest_font_face_parent_id_mismatch',
+				/* translators: %d: A post id. */
+				sprintf( __( 'The font face does not belong to the specified font family with id of "%d"', 'gutenberg' ), $font_family->ID ),
+				array( 'status' => 404 )
+			);
+		}
+
+		return parent::get_item( $request );
+	}
+
+	/**
+	 * Creates a font face for the parent font family.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function create_item( $request ) {
+		$font_family = $this->get_parent_font_family_post( $request['font_family_id'] );
+		if ( is_wp_error( $font_family ) ) {
+			return $font_family;
+		}
+
+		// Settings have already been decoded by ::sanitize_font_face_settings().
+		$settings    = $request->get_param( 'font_face_settings' );
+		$file_params = $request->get_file_params();
+
+		// Check that the necessary font face properties are unique.
+		$query = new WP_Query(
+			array(
+				'post_type'              => $this->post_type,
+				'posts_per_page'         => 1,
+				'title'                  => WP_Font_Family_Utils::get_font_face_slug( $settings ),
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+			)
+		);
+		if ( ! empty( $query->get_posts() ) ) {
+			return new WP_Error(
+				'rest_duplicate_font_face',
+				__( 'A font face matching those settings already exists.', 'gutenberg' ),
+				array( 'status' => 400 )
+			);
+		}
+
+		// Move the uploaded font asset from the temp folder to the fonts directory.
+		if ( ! function_exists( 'wp_handle_upload' ) ) {
+			require_once ABSPATH . 'wp-admin/includes/file.php';
+		}
+
+		$srcs           = is_string( $settings['src'] ) ? array( $settings['src'] ) : $settings['src'];
+		$processed_srcs = array();
+		$font_file_meta = array();
+
+		foreach ( $srcs as $src ) {
+			// If src not a file reference, use it as is.
+			if ( ! isset( $file_params[ $src ] ) ) {
+				$processed_srcs[] = $src;
+				continue;
+			}
+
+			$file      = $file_params[ $src ];
+			$font_file = $this->handle_font_file_upload( $file );
+			if ( is_wp_error( $font_file ) ) {
+				return $font_file;
+			}
+
+			$processed_srcs[] = $font_file['url'];
+			$font_file_meta[] = $this->relative_fonts_path( $font_file['file'] );
+		}
+
+		// Store the updated settings for prepare_item_for_database to use.
+		$settings['src'] = count( $processed_srcs ) === 1 ? $processed_srcs[0] : $processed_srcs;
+		$request->set_param( 'font_face_settings', $settings );
+
+		// Ensure that $settings data is slashed, so values with quotes are escaped.
+		// WP_REST_Posts_Controller::create_item uses wp_slash() on the post_content.
+		$font_face_post = parent::create_item( $request );
+
+		if ( is_wp_error( $font_face_post ) ) {
+			return $font_face_post;
+		}
+
+		$font_face_id = $font_face_post->data['id'];
+
+		foreach ( $font_file_meta as $font_file_path ) {
+			add_post_meta( $font_face_id, '_wp_font_face_file', $font_file_path );
+		}
+
+		return $font_face_post;
+	}
+
+	/**
+	 * Deletes a single font face.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
+	 */
+	public function delete_item( $request ) {
+		$post = $this->get_post( $request['id'] );
+		if ( is_wp_error( $post ) ) {
+			return $post;
+		}
+
+		$font_family = $this->get_parent_font_family_post( $request['font_family_id'] );
+		if ( is_wp_error( $font_family ) ) {
+			return $font_family;
+		}
+
+		if ( (int) $font_family->ID !== (int) $post->post_parent ) {
+			return new WP_Error(
+				'rest_font_face_parent_id_mismatch',
+				/* translators: %d: A post id. */
+				sprintf( __( 'The font face does not belong to the specified font family with id of "%d"', 'gutenberg' ), $font_family->ID ),
+				array( 'status' => 404 )
+			);
+		}
+
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
+
+		// We don't support trashing for font faces.
+		if ( ! $force ) {
+			return new WP_Error(
+				'rest_trash_not_supported',
+				/* translators: %s: force=true */
+				sprintf( __( "Font faces do not support trashing. Set '%s' to delete.", 'gutenberg' ), 'force=true' ),
+				array( 'status' => 501 )
+			);
+		}
+
+		return parent::delete_item( $request );
+	}
+
+	/**
+	 * Prepares a single font face output for response.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Post         $item    Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response Response object.
+	 */
+	public function prepare_item_for_response( $item, $request ) {
+		$fields = $this->get_fields_for_response( $request );
+		$data   = array();
+
+		if ( rest_is_field_included( 'id', $fields ) ) {
+			$data['id'] = $item->ID;
+		}
+		if ( rest_is_field_included( 'theme_json_version', $fields ) ) {
+			$data['theme_json_version'] = 2;
+		}
+
+		if ( rest_is_field_included( 'parent', $fields ) ) {
+			$data['parent'] = $item->post_parent;
+		}
+
+		if ( rest_is_field_included( 'font_face_settings', $fields ) ) {
+			$data['font_face_settings'] = $this->get_settings_from_post( $item );
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'edit';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
+			$links = $this->prepare_links( $item );
+			$response->add_links( $links );
+		}
+
+		/**
+		 * Filters the font face data for a REST API response.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Post          $post     Font face post object.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'rest_prepare_wp_font_face', $response, $item, $request );
+	}
+
+	/**
+	 * Retrieves the post's schema, conforming to JSON Schema.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return array Item schema data.
+	 */
+	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			// Base properties for every Post.
+			'properties' => array(
+				'id'                 => array(
+					'description' => __( 'Unique identifier for the post.', 'default' ),
+					'type'        => 'integer',
+					'context'     => array( 'edit', 'embed' ),
+					'readonly'    => true,
+				),
+				'theme_json_version' => array(
+					'description' => __( 'Version of the theme.json schema used for the typography settings.', 'gutenberg' ),
+					'type'        => 'integer',
+					'default'     => 2,
+					'minimum'     => 2,
+					'maximum'     => 2,
+					'context'     => array( 'edit', 'embed' ),
+				),
+				'parent'             => array(
+					'description' => __( 'The ID for the parent font family of the font face.', 'gutenberg' ),
+					'type'        => 'integer',
+					'context'     => array( 'edit', 'embed' ),
+				),
+				// Font face settings come directly from theme.json schema
+				// See https://schemas.wp.org/trunk/theme.json
+				'font_face_settings' => array(
+					'description'          => __( 'font-face declaration in theme.json format.', 'gutenberg' ),
+					'type'                 => 'object',
+					'context'              => array( 'edit', 'embed' ),
+					'properties'           => array(
+						'fontFamily'            => array(
+							'description' => __( 'CSS font-family value.', 'gutenberg' ),
+							'type'        => 'string',
+							'default'     => '',
+						),
+						'fontStyle'             => array(
+							'description' => __( 'CSS font-style value.', 'gutenberg' ),
+							'type'        => 'string',
+							'default'     => 'normal',
+						),
+						'fontWeight'            => array(
+							'description' => __( 'List of available font weights, separated by a space.', 'gutenberg' ),
+							'default'     => '400',
+							// Changed from `oneOf` to avoid errors from loose type checking.
+							// e.g. a fontWeight of "400" validates as both a string and an integer due to is_numeric check.
+							'type'        => array( 'string', 'integer' ),
+						),
+						'fontDisplay'           => array(
+							'description' => __( 'CSS font-display value.', 'gutenberg' ),
+							'type'        => 'string',
+							'default'     => 'fallback',
+							'enum'        => array(
+								'auto',
+								'block',
+								'fallback',
+								'swap',
+								'optional',
+							),
+						),
+						'src'                   => array(
+							'description' => __( 'Paths or URLs to the font files.', 'gutenberg' ),
+							// Changed from `oneOf` to `anyOf` due to rest_sanitize_array converting a string into an array.
+							'anyOf'       => array(
+								array(
+									'type' => 'string',
+								),
+								array(
+									'type'  => 'array',
+									'items' => array(
+										'type' => 'string',
+									),
+								),
+							),
+							'default'     => array(),
+						),
+						'fontStretch'           => array(
+							'description' => __( 'CSS font-stretch value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'ascentOverride'        => array(
+							'description' => __( 'CSS ascent-override value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'descentOverride'       => array(
+							'description' => __( 'CSS descent-override value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'fontVariant'           => array(
+							'description' => __( 'CSS font-variant value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'fontFeatureSettings'   => array(
+							'description' => __( 'CSS font-feature-settings value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'fontVariationSettings' => array(
+							'description' => __( 'CSS font-variation-settings value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'lineGapOverride'       => array(
+							'description' => __( 'CSS line-gap-override value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'sizeAdjust'            => array(
+							'description' => __( 'CSS size-adjust value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'unicodeRange'          => array(
+							'description' => __( 'CSS unicode-range value.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+						'preview'               => array(
+							'description' => __( 'URL to a preview image of the font face.', 'gutenberg' ),
+							'type'        => 'string',
+						),
+					),
+					'required'             => array( 'fontFamily', 'src' ),
+					'additionalProperties' => false,
+				),
+			),
+		);
+
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
+	}
+
+	/**
+	 * Retrieves the query params for the font face collection.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return array Collection parameters.
+	 */
+	public function get_collection_params() {
+		$query_params = parent::get_collection_params();
+
+		$query_params['context']['default'] = 'edit';
+
+		// Remove unneeded params.
+		unset( $query_params['after'] );
+		unset( $query_params['modified_after'] );
+		unset( $query_params['before'] );
+		unset( $query_params['modified_before'] );
+		unset( $query_params['search'] );
+		unset( $query_params['search_columns'] );
+		unset( $query_params['slug'] );
+		unset( $query_params['status'] );
+
+		$query_params['orderby']['default'] = 'id';
+		$query_params['orderby']['enum']    = array( 'id', 'include' );
+
+		/**
+		 * Filters collection parameters for the font face controller.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param array $query_params JSON Schema-formatted collection parameters.
+		 */
+		return apply_filters( 'rest_wp_font_face_collection_params', $query_params );
+	}
+
+	/**
+	 * Get the params used when creating a new font face.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return array Font face create arguments.
+	 */
+	public function get_create_params() {
+		$properties = $this->get_item_schema()['properties'];
+		return array(
+			'theme_json_version' => $properties['theme_json_version'],
+			// When creating, font_face_settings is stringified JSON, to work with multipart/form-data used
+			// when uploading font files.
+			'font_face_settings' => array(
+				'description'       => __( 'font-face declaration in theme.json format, encoded as a string.', 'gutenberg' ),
+				'type'              => 'string',
+				'required'          => true,
+				'validate_callback' => array( $this, 'validate_create_font_face_settings' ),
+				'sanitize_callback' => array( $this, 'sanitize_font_face_settings' ),
+			),
+		);
+	}
+
+	/**
+	 * Get the parent font family, if the ID is valid.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param int $font_family_id Supplied ID.
+	 * @return WP_Post|WP_Error Post object if ID is valid, WP_Error otherwise.
+	 */
+	protected function get_parent_font_family_post( $font_family_id ) {
+		$error = new WP_Error(
+			'rest_post_invalid_parent',
+			__( 'Invalid post parent ID.', 'default' ),
+			array( 'status' => 404 )
+		);
+
+		if ( (int) $font_family_id <= 0 ) {
+			return $error;
+		}
+
+		$font_family_post = get_post( (int) $font_family_id );
+
+		if ( empty( $font_family_post ) || empty( $font_family_post->ID )
+		|| 'wp_font_family' !== $font_family_post->post_type
+		) {
+			return $error;
+		}
+
+		return $font_family_post;
+	}
+
+	/**
+	 * Prepares links for the request.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Post $post Post object.
+	 * @return array Links for the given post.
+	 */
+	protected function prepare_links( $post ) {
+		// Entity meta.
+		$links = array(
+			'self'       => array(
+				'href' => rest_url( $this->namespace . '/font-families/' . $post->post_parent . '/font-faces/' . $post->ID ),
+			),
+			'collection' => array(
+				'href' => rest_url( $this->namespace . '/font-families/' . $post->post_parent . '/font-faces' ),
+			),
+			'parent'     => array(
+				'href' => rest_url( $this->namespace . '/font-families/' . $post->post_parent ),
+			),
+		);
+
+		return $links;
+	}
+
+	/**
+	 * Prepares a single font face post for creation.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return stdClass|WP_Error Post object or WP_Error.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$prepared_post = new stdClass();
+
+		// Settings have already been decoded by ::sanitize_font_face_settings().
+		$settings = $request->get_param( 'font_face_settings' );
+
+		// Store this "slug" as the post_title rather than post_name, since it uses the fontFamily setting,
+		// which may contain multibyte characters.
+		$title = WP_Font_Family_Utils::get_font_face_slug( $settings );
+
+		$prepared_post->post_type    = $this->post_type;
+		$prepared_post->post_parent  = $request['font_family_id'];
+		$prepared_post->post_status  = 'publish';
+		$prepared_post->post_title   = $title;
+		$prepared_post->post_name    = sanitize_title( $title );
+		$prepared_post->post_content = wp_json_encode( $settings );
+
+		return $prepared_post;
+	}
+
+	/**
+	 * Handles the upload of a font file using wp_handle_upload().
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $file Single file item from $_FILES.
+	 * @return array Array containing uploaded file attributes on success, or error on failure.
+	 */
+	protected function handle_font_file_upload( $file ) {
+		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
+		add_filter( 'upload_dir', 'wp_get_font_dir' );
+
+		$overrides = array(
+			'upload_error_handler' => array( $this, 'handle_font_file_upload_error' ),
+			// Arbitrary string to avoid the is_uploaded_file() check applied
+			// when using 'wp_handle_upload'.
+			'action'               => 'wp_handle_font_upload',
+			// Not testing a form submission.
+			'test_form'            => false,
+			// Seems mime type for files that are not images cannot be tested.
+			// See wp_check_filetype_and_ext().
+			'test_type'            => true,
+			// Only allow uploading font files for this request.
+			'mimes'                => WP_Font_Library::get_expected_font_mime_types_per_php_version(),
+		);
+
+		$uploaded_file = wp_handle_upload( $file, $overrides );
+
+		remove_filter( 'upload_dir', 'wp_get_font_dir' );
+		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
+
+		return $uploaded_file;
+	}
+
+	/**
+	 * Handles file upload error.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array  $file    File upload data.
+	 * @param string $message Error message from wp_handle_upload().
+	 * @return WP_Error WP_Error object.
+	 */
+	public function handle_font_file_upload_error( $file, $message ) {
+		$status = 500;
+		$code   = 'rest_font_upload_unknown_error';
+
+		if ( __( 'Sorry, you are not allowed to upload this file type.', 'default' ) === $message ) {
+			$status = 400;
+			$code   = 'rest_font_upload_invalid_file_type';
+		}
+
+		return new WP_Error( $code, $message, array( 'status' => $status ) );
+	}
+
+	/**
+	* Returns relative path to an uploaded font file.
+	*
+	* The path is relative to the current fonts dir.
+	*
+	* @since 6.5.0
+	* @access private
+	*
+	* @param string $path Full path to the file.
+	* @return string Relative path on success, unchanged path on failure.
+	*/
+	protected function relative_fonts_path( $path ) {
+		$new_path = $path;
+
+		$fonts_dir = wp_get_font_dir();
+		if ( str_starts_with( $new_path, $fonts_dir['path'] ) ) {
+			$new_path = str_replace( $fonts_dir, '', $new_path );
+			$new_path = ltrim( $new_path, '/' );
+		}
+
+		return $new_path;
+	}
+
+	/**
+	 * Gets the font face's settings from the post.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Post $post Font face post object.
+	 * @return array Font face settings array.
+	 */
+	protected function get_settings_from_post( $post ) {
+		$settings   = json_decode( $post->post_content, true );
+		$properties = $this->get_item_schema()['properties']['font_face_settings']['properties'];
+
+		// Provide required, empty settings if needed.
+		if ( null === $settings ) {
+			$settings = array(
+				'fontFamily' => '',
+				'src'        => array(),
+			);
+		}
+
+		// Only return the properties defined in the schema.
+		return array_intersect_key( $settings, $properties );
+	}
+}
diff --git a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
index ede8762c88c6d..887a8a5250cc3 100644
--- a/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
+++ b/lib/experimental/fonts/font-library/class-wp-rest-font-families-controller.php
@@ -1,12 +1,10 @@
 <?php
 /**
- * Rest Font Families Controller.
+ * REST API: WP_REST_Font_Families_Controller class
  *
- * This file contains the class for the REST API Font Families Controller.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.5.0
  */
 
 if ( class_exists( 'WP_REST_Font_Families_Controller' ) ) {
@@ -19,388 +17,512 @@
  * @since 6.5.0
  */
 class WP_REST_Font_Families_Controller extends WP_REST_Posts_Controller {
-
 	/**
-	 * Constructor.
+	 * Whether the controller supports batching.
 	 *
 	 * @since 6.5.0
+	 * @var false
 	 */
-	public function __construct() {
-		$this->rest_base = 'font-families';
-		$this->namespace = 'wp/v2';
-		$this->post_type = 'wp_font_family';
-	}
+	protected $allow_batch = false;
 
 	/**
-	 * Registers the routes for the objects of the controller.
+	 * Checks if a given request has access to font families.
 	 *
 	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
-	public function register_routes() {
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::READABLE,
-					'callback'            => array( $this, 'get_items' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-				),
-			)
-		);
+	public function get_items_permissions_check( $request ) { // phpcs:ignore VariableAnalysis.CodeAnalysis.VariableAnalysis.UnusedVariable -- required by parent class
+		$post_type = get_post_type_object( $this->post_type );
 
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::EDITABLE,
-					'callback'            => array( $this, 'install_fonts' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-					'args'                => array(
-						'font_family_settings' => array(
-							'required'          => true,
-							'type'              => 'string',
-							'validate_callback' => array( $this, 'validate_install_font_families' ),
-						),
-					),
-				),
-			)
-		);
+		if ( ! current_user_can( $post_type->cap->read ) ) {
+			return new WP_Error(
+				'rest_cannot_read',
+				__( 'Sorry, you are not allowed to access font families.', 'gutenberg' ),
+				array( 'status' => rest_authorization_required_code() )
+			);
+		}
 
-		register_rest_route(
-			$this->namespace,
-			'/' . $this->rest_base,
-			array(
-				array(
-					'methods'             => WP_REST_Server::DELETABLE,
-					'callback'            => array( $this, 'uninstall_fonts' ),
-					'permission_callback' => array( $this, 'update_font_library_permissions_check' ),
-					'args'                => $this->uninstall_schema(),
-				),
-			)
-		);
+		return true;
 	}
 
 	/**
-	 * Returns validation errors in font families data for installation.
+	 * Checks if a given request has access to a font family.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array[] $font_families Font families to install.
-	 * @param array   $files         Files to install.
-	 * @return array $error_messages Array of error messages.
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return true|WP_Error True if the request has read access, WP_Error object otherwise.
 	 */
-	private function get_validation_errors( $font_family_settings, $files ) {
-		$error_messages = array();
+	public function get_item_permissions_check( $request ) {
+		return $this->get_items_permissions_check( $request );
+	}
 
-		if ( ! is_array( $font_family_settings ) ) {
-			$error_messages[] = __( 'font_family_settings should be a font family definition.', 'gutenberg' );
-			return $error_messages;
+	/**
+	 * Validates settings when creating or updating a font family.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string          $value   Encoded JSON string of font family settings.
+	 * @param WP_REST_Request $request Request object.
+	 * @return false|WP_Error True if the settings are valid, otherwise a WP_Error object.
+	 */
+	public function validate_font_family_settings( $value, $request ) {
+		$settings = json_decode( $value, true );
+
+		// Check settings string is valid JSON.
+		if ( null === $settings ) {
+			return new WP_Error(
+				'rest_invalid_param',
+				__( 'font_family_settings parameter must be a valid JSON string.', 'gutenberg' ),
+				array( 'status' => 400 )
+			);
 		}
 
-		if (
-			! isset( $font_family_settings['slug'] ) ||
-			! isset( $font_family_settings['name'] ) ||
-			! isset( $font_family_settings['fontFamily'] )
-		) {
-			$error_messages[] = __( 'Font family should have slug, name and fontFamily properties defined.', 'gutenberg' );
+		$schema   = $this->get_item_schema()['properties']['font_family_settings'];
+		$required = $schema['required'];
 
-			return $error_messages;
-		}
+		if ( isset( $request['id'] ) ) {
+			// Allow sending individual properties if we are updating an existing font family.
+			unset( $schema['required'] );
 
-		if ( isset( $font_family_settings['fontFace'] ) ) {
-			if ( ! is_array( $font_family_settings['fontFace'] ) ) {
-				$error_messages[] = __( 'Font family should have fontFace property defined as an array.', 'gutenberg' );
+			// But don't allow updating the slug, since it is used as a unique identifier.
+			if ( isset( $settings['slug'] ) ) {
+				return new WP_Error(
+					'rest_invalid_param',
+					__( 'font_family_settings[slug] cannot be updated.', 'gutenberg' ),
+					array( 'status' => 400 )
+				);
 			}
+		}
 
-			if ( count( $font_family_settings['fontFace'] ) < 1 ) {
-				$error_messages[] = __( 'Font family should have at least one font face definition.', 'gutenberg' );
-			}
+		// Check that the font face settings match the theme.json schema.
+		$has_valid_settings = rest_validate_value_from_schema( $settings, $schema, 'font_family_settings' );
 
-			if ( ! empty( $font_family_settings['fontFace'] ) ) {
-				for ( $face_index = 0; $face_index < count( $font_family_settings['fontFace'] ); $face_index++ ) {
-
-					$font_face = $font_family_settings['fontFace'][ $face_index ];
-					if ( ! isset( $font_face['fontWeight'] ) || ! isset( $font_face['fontStyle'] ) ) {
-						$error_messages[] = sprintf(
-							// translators: font face index.
-							__( 'Font family Font face [%1$s] should have fontWeight and fontStyle properties defined.', 'gutenberg' ),
-							$face_index
-						);
-					}
-
-					if ( isset( $font_face['downloadFromUrl'] ) && isset( $font_face['uploadedFile'] ) ) {
-						$error_messages[] = sprintf(
-							// translators: font face index.
-							__( 'Font family Font face [%1$s] should have only one of the downloadFromUrl or uploadedFile properties defined and not both.', 'gutenberg' ),
-							$face_index
-						);
-					}
-
-					if ( isset( $font_face['uploadedFile'] ) ) {
-						if ( ! isset( $files[ $font_face['uploadedFile'] ] ) ) {
-							$error_messages[] = sprintf(
-								// translators: font face index.
-								__( 'Font family Font face [%1$s] file is not defined in the request files.', 'gutenberg' ),
-								$face_index
-							);
-						}
-					}
-				}
+		if ( is_wp_error( $has_valid_settings ) ) {
+			$has_valid_settings->add_data( array( 'status' => 400 ) );
+			return $has_valid_settings;
+		}
+
+		// Check that none of the required settings are empty values.
+		foreach ( $required as $key ) {
+			if ( isset( $settings[ $key ] ) && ! $settings[ $key ] ) {
+				return new WP_Error(
+					'rest_invalid_param',
+					/* translators: %s: Font family setting key. */
+					sprintf( __( 'font_family_settings[%s] cannot be empty.', 'gutenberg' ), $key ),
+					array( 'status' => 400 )
+				);
 			}
 		}
 
-		return $error_messages;
+		return true;
 	}
 
 	/**
-	 * Validate input for the install endpoint.
+	 * Sanitizes the font family settings when creating or updating a font family.
 	 *
-	 * @since 6.5.0
+	* @since 6.5.0
 	 *
-	 * @param string          $param The font families to install.
-	 * @param WP_REST_Request $request The request object.
-	 * @return true|WP_Error True if the parameter is valid, WP_Error otherwise.
+	 * @param string          $value   Encoded JSON string of font family settings.
+	 * @param WP_REST_Request $request Request object.
+	 * @return array                   Decoded array font family settings.
 	 */
-	public function validate_install_font_families( $param, $request ) {
-		$font_family_settings = json_decode( $param, true );
-		$files                = $request->get_file_params();
-		$error_messages       = $this->get_validation_errors( $font_family_settings, $files );
+	public function sanitize_font_family_settings( $value ) {
+		$settings = json_decode( $value, true );
 
-		if ( empty( $error_messages ) ) {
-			return true;
+		if ( isset( $settings['fontFamily'] ) ) {
+			$settings['fontFamily'] = WP_Font_Family_Utils::format_font_family( $settings['fontFamily'] );
 		}
 
-		return new WP_Error( 'rest_invalid_param', implode( ', ', $error_messages ), array( 'status' => 400 ) );
+		// Provide default for preview, if not provided.
+		if ( ! isset( $settings['preview'] ) ) {
+			$settings['preview'] = '';
+		}
+
+		return $settings;
 	}
 
 	/**
-	 * Gets the schema for the uninstall endpoint.
+	 * Creates a single font family.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return array Schema array.
+	 * @param WP_REST_Request $request Full details about the request.
+	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function uninstall_schema() {
-		return array(
-			'font_families' => array(
-				'type'        => 'array',
-				'description' => __( 'The font families to install.', 'gutenberg' ),
-				'required'    => true,
-				'minItems'    => 1,
-				'items'       => array(
-					'required'   => true,
-					'type'       => 'object',
-					'properties' => array(
-						'slug' => array(
-							'type'        => 'string',
-							'description' => __( 'The font family slug.', 'gutenberg' ),
-							'required'    => true,
-						),
-					),
-				),
-			),
+	public function create_item( $request ) {
+		$settings = $request->get_param( 'font_family_settings' );
+
+		// Check that the font family slug is unique.
+		$query = new WP_Query(
+			array(
+				'post_type'              => $this->post_type,
+				'posts_per_page'         => 1,
+				'name'                   => $settings['slug'],
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+			)
 		);
+		if ( ! empty( $query->get_posts() ) ) {
+			return new WP_Error(
+				'rest_duplicate_font_family',
+				/* translators: %s: Font family slug. */
+				sprintf( __( 'A font family with slug "%s" already exists.', 'gutenberg' ), $settings['slug'] ),
+				array( 'status' => 400 )
+			);
+		}
+
+		return parent::create_item( $request );
 	}
 
 	/**
-	 * Removes font families from the Font Library and all their assets.
+	 * Deletes a single font family.
 	 *
 	 * @since 6.5.0
 	 *
 	 * @param WP_REST_Request $request Full details about the request.
 	 * @return WP_REST_Response|WP_Error Response object on success, or WP_Error object on failure.
 	 */
-	public function uninstall_fonts( $request ) {
-		$fonts_to_uninstall = $request->get_param( 'font_families' );
+	public function delete_item( $request ) {
+		$force = isset( $request['force'] ) ? (bool) $request['force'] : false;
 
-		$errors    = array();
-		$successes = array();
-
-		if ( empty( $fonts_to_uninstall ) ) {
-			$errors[] = new WP_Error(
-				'no_fonts_to_install',
-				__( 'No fonts to uninstall', 'gutenberg' )
-			);
-			$data     = array(
-				'successes' => $successes,
-				'errors'    => $errors,
+		// We don't support trashing for font families.
+		if ( ! $force ) {
+			return new WP_Error(
+				'rest_trash_not_supported',
+				/* translators: %s: force=true */
+				sprintf( __( "Font faces do not support trashing. Set '%s' to delete.", 'gutenberg' ), 'force=true' ),
+				array( 'status' => 501 )
 			);
-			$response = rest_ensure_response( $data );
-			$response->set_status( 400 );
-			return $response;
 		}
 
-		foreach ( $fonts_to_uninstall as $font_data ) {
-			$font   = new WP_Font_Family( $font_data );
-			$result = $font->uninstall();
-			if ( is_wp_error( $result ) ) {
-				$errors[] = $result;
-			} else {
-				$successes[] = $result;
-			}
-		}
-		$data = array(
-			'successes' => $successes,
-			'errors'    => $errors,
-		);
-		return rest_ensure_response( $data );
+		return parent::delete_item( $request );
 	}
 
 	/**
-	 * Checks whether the user has permissions to update the Font Library.
+	 * Prepares a single font family output for response.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return true|WP_Error True if the request has write access for the item, WP_Error object otherwise.
+	 * @param WP_Post         $item    Post object.
+	 * @param WP_REST_Request $request Request object.
+	 * @return WP_REST_Response Response object.
 	 */
-	public function update_font_library_permissions_check() {
-		if ( ! current_user_can( 'edit_theme_options' ) ) {
-			return new WP_Error(
-				'rest_cannot_update_font_library',
-				__( 'Sorry, you are not allowed to update the Font Library on this site.', 'gutenberg' ),
-				array(
-					'status' => rest_authorization_required_code(),
-				)
-			);
+	public function prepare_item_for_response( $item, $request ) {
+		$fields = $this->get_fields_for_response( $request );
+		$data   = array();
+
+		if ( rest_is_field_included( 'id', $fields ) ) {
+			$data['id'] = $item->ID;
 		}
-		return true;
+
+		if ( rest_is_field_included( 'theme_json_version', $fields ) ) {
+			$data['theme_json_version'] = 2;
+		}
+
+		if ( rest_is_field_included( 'font_faces', $fields ) ) {
+			$data['font_faces'] = $this->get_font_face_ids( $item->ID );
+		}
+
+		if ( rest_is_field_included( 'font_family_settings', $fields ) ) {
+			$data['font_family_settings'] = $this->get_settings_from_post( $item );
+		}
+
+		$context = ! empty( $request['context'] ) ? $request['context'] : 'edit';
+		$data    = $this->add_additional_fields_to_object( $data, $request );
+		$data    = $this->filter_response_by_context( $data, $context );
+
+		$response = rest_ensure_response( $data );
+
+		if ( rest_is_field_included( '_links', $fields ) ) {
+			$links = $this->prepare_links( $item );
+			$response->add_links( $links );
+		}
+
+		/**
+		 * Filters the font family data for a REST API response.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_REST_Response $response The response object.
+		 * @param WP_Post          $post     Font family post object.
+		 * @param WP_REST_Request  $request  Request object.
+		 */
+		return apply_filters( 'rest_prepare_wp_font_family', $response, $item, $request );
+	}
+
+		/**
+	 * Retrieves the post's schema, conforming to JSON Schema.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return array Item schema data.
+	 */
+	public function get_item_schema() {
+		if ( $this->schema ) {
+			return $this->add_additional_fields_schema( $this->schema );
+		}
+
+		$schema = array(
+			'$schema'    => 'http://json-schema.org/draft-04/schema#',
+			'title'      => $this->post_type,
+			'type'       => 'object',
+			// Base properties for every Post.
+			'properties' => array(
+				'id'                   => array(
+					'description' => __( 'Unique identifier for the post.', 'default' ),
+					'type'        => 'integer',
+					'context'     => array( 'edit' ),
+					'readonly'    => true,
+				),
+				'theme_json_version'   => array(
+					'description' => __( 'Version of the theme.json schema used for the typography settings.', 'gutenberg' ),
+					'type'        => 'integer',
+					'default'     => 2,
+					'minimum'     => 2,
+					'maximum'     => 2,
+					'context'     => array( 'edit' ),
+				),
+				'font_faces'           => array(
+					'description' => __( 'The IDs of the child font faces in the font family.', 'gutenberg' ),
+					'type'        => 'array',
+					'context'     => array( 'edit' ),
+					'items'       => array(
+						'type' => 'integer',
+					),
+				),
+				// Font family settings come directly from theme.json schema
+				// See https://schemas.wp.org/trunk/theme.json
+				'font_family_settings' => array(
+					'description'          => __( 'font-face declaration in theme.json format.', 'gutenberg' ),
+					'type'                 => 'object',
+					'context'              => array( 'edit' ),
+					'properties'           => array(
+						'name'       => array(
+							'description' => 'Name of the font family preset, translatable.',
+							'type'        => 'string',
+						),
+						'slug'       => array(
+							'description' => 'Kebab-case unique identifier for the font family preset.',
+							'type'        => 'string',
+						),
+						'fontFamily' => array(
+							'description' => 'CSS font-family value.',
+							'type'        => 'string',
+						),
+						'preview'    => array(
+							'description' => 'URL to a preview image of the font family.',
+							'type'        => 'string',
+						),
+					),
+					'required'             => array( 'name', 'slug', 'fontFamily' ),
+					'additionalProperties' => false,
+				),
+			),
+		);
+
+		$this->schema = $schema;
+
+		return $this->add_additional_fields_schema( $this->schema );
 	}
 
 	/**
-	 * Checks whether the font directory exists or not.
+	 * Retrieves the query params for the font family collection.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return bool Whether the font directory exists.
+	 * @return array Collection parameters.
 	 */
-	private function has_upload_directory() {
-		$upload_dir = wp_get_font_dir()['path'];
-		return is_dir( $upload_dir );
+	public function get_collection_params() {
+		$query_params = parent::get_collection_params();
+
+		$query_params['context']['default'] = 'edit';
+
+		// Remove unneeded params.
+		unset( $query_params['after'] );
+		unset( $query_params['modified_after'] );
+		unset( $query_params['before'] );
+		unset( $query_params['modified_before'] );
+		unset( $query_params['search'] );
+		unset( $query_params['search_columns'] );
+		unset( $query_params['status'] );
+
+		$query_params['orderby']['default'] = 'id';
+		$query_params['orderby']['enum']    = array( 'id', 'include' );
+
+		/**
+		 * Filters collection parameters for the font family controller.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param array $query_params JSON Schema-formatted collection parameters.
+		 */
+		return apply_filters( 'rest_wp_font_family_collection_params', $query_params );
 	}
 
 	/**
-	 * Checks whether the user has write permissions to the temp and fonts directories.
+	 * Retrieves the query params for the font family collection, defaulting to the 'edit' context.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @return true|WP_Error True if the user has write permissions, WP_Error object otherwise.
+	 * @param array $args Optional. Additional arguments for context parameter. Default empty array.
+	 * @return array Context parameter details.
 	 */
-	private function has_write_permission() {
-		// The update endpoints requires write access to the temp and the fonts directories.
-		$temp_dir   = get_temp_dir();
-		$upload_dir = wp_get_font_dir()['path'];
-		if ( ! is_writable( $temp_dir ) || ! wp_is_writable( $upload_dir ) ) {
-			return false;
+	public function get_context_param( $args = array() ) {
+		if ( isset( $args['default'] ) ) {
+			$args['default'] = 'edit';
 		}
-		return true;
+		return parent::get_context_param( $args );
 	}
 
 	/**
-	 * Checks whether the request needs write permissions.
+	 * Get the arguments used when creating or updating a font family.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param array[] $font_family_settings Font family definition.
-	 * @return bool Whether the request needs write permissions.
+	 * @return array Font family create/edit arguments.
 	 */
-	private function needs_write_permission( $font_family_settings ) {
-		if ( isset( $font_family_settings['fontFace'] ) ) {
-			foreach ( $font_family_settings['fontFace'] as $face ) {
-				// If the font is being downloaded from a URL or uploaded, it needs write permissions.
-				if ( isset( $face['downloadFromUrl'] ) || isset( $face['uploadedFile'] ) ) {
-					return true;
-				}
-			}
+	public function get_endpoint_args_for_item_schema( $method = WP_REST_Server::CREATABLE ) {
+		if ( WP_REST_Server::CREATABLE === $method || WP_REST_Server::EDITABLE === $method ) {
+			$properties = $this->get_item_schema()['properties'];
+			return array(
+				'theme_json_version'   => $properties['theme_json_version'],
+				// When creating or updating, font_family_settings is stringified JSON, to work with multipart/form-data.
+				// Font families don't currently support file uploads, but may accept preview files in the future.
+				'font_family_settings' => array(
+					'description'       => __( 'font-family declaration in theme.json format, encoded as a string.', 'gutenberg' ),
+					'type'              => 'string',
+					'required'          => true,
+					'validate_callback' => array( $this, 'validate_font_family_settings' ),
+					'sanitize_callback' => array( $this, 'sanitize_font_family_settings' ),
+				),
+			);
 		}
-		return false;
+
+		return parent::get_endpoint_args_for_item_schema( $method );
 	}
 
 	/**
-	 * Installs new fonts.
+	 * Get the child font face post IDs.
 	 *
-	 * Takes a request containing new fonts to install, downloads their assets, and adds them
-	 * to the Font Library.
+	 * @since 6.5.0
+	 *
+	 * @param int $font_family_id Font family post ID.
+	 * @return int[] Array of child font face post IDs.
+	 * .
+	 */
+	protected function get_font_face_ids( $font_family_id ) {
+		$query = new WP_Query(
+			array(
+				'fields'                 => 'ids',
+				'post_parent'            => $font_family_id,
+				'post_type'              => 'wp_font_face',
+				'posts_per_page'         => 99,
+				'order'                  => 'ASC',
+				'orderby'                => 'id',
+				'update_post_meta_cache' => false,
+				'update_post_term_cache' => false,
+			)
+		);
+
+		return $query->get_posts();
+	}
+
+	/**
+	 * Prepares font family links for the request.
 	 *
 	 * @since 6.5.0
 	 *
-	 * @param WP_REST_Request $request The request object containing the new fonts to install
-	 *                                 in the request parameters.
-	 * @return WP_REST_Response|WP_Error The updated Font Library post content.
+	 * @param WP_Post $post Post object.
+	 * @return array Links for the given post.
 	 */
-	public function install_fonts( $request ) {
-		// Get new fonts to install.
-		$font_family_settings = $request->get_param( 'font_family_settings' );
-
-		/*
-		 * As this is receiving form data, the font families are encoded as a string.
-		 * The form data is used  because local fonts need to use that format to
-		 * attach the files in the request.
-		 */
-		$font_family_settings = json_decode( $font_family_settings, true );
+	protected function prepare_links( $post ) {
+		// Entity meta.
+		$links = parent::prepare_links( $post );
 
-		$successes       = array();
-		$errors          = array();
-		$response_status = 200;
+		return array(
+			'self'       => $links['self'],
+			'collection' => $links['collection'],
+			'font_faces' => $this->prepare_font_face_links( $post->ID ),
+		);
+	}
 
-		if ( empty( $font_family_settings ) ) {
-			$errors[]        = new WP_Error(
-				'no_fonts_to_install',
-				__( 'No fonts to install', 'gutenberg' )
+	/**
+	 * Prepares child font face links for the request.
+	 *
+	 * @param int $font_family_id Font family post ID.
+	 * @return array Links for the child font face posts.
+	 */
+	protected function prepare_font_face_links( $font_family_id ) {
+		$font_face_ids = $this->get_font_face_ids( $font_family_id );
+		$links         = array();
+		foreach ( $font_face_ids as $font_face_id ) {
+			$links[] = array(
+				'embeddable' => true,
+				'href'       => rest_url( $this->namespace . '/' . $this->rest_base . '/' . $font_family_id . '/font-faces/' . $font_face_id ),
 			);
-			$response_status = 400;
 		}
+		return $links;
+	}
 
-		if ( $this->needs_write_permission( $font_family_settings ) ) {
-			$upload_dir = wp_get_font_dir()['path'];
-			if ( ! $this->has_upload_directory() ) {
-				if ( ! wp_mkdir_p( $upload_dir ) ) {
-					$errors[] = new WP_Error(
-						'cannot_create_fonts_folder',
-						sprintf(
-							/* translators: %s: Directory path. */
-							__( 'Error: Unable to create directory %s.', 'gutenberg' ),
-							esc_html( $upload_dir )
-						)
-					);
-					$response_status = 500;
-				}
+	/**
+	 * Prepares a single font family post for create or update.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_REST_Request $request Request object.
+	 * @return stdClass|WP_Error Post object or WP_Error.
+	 */
+	protected function prepare_item_for_database( $request ) {
+		$prepared_post = new stdClass();
+		// Settings have already been decoded by ::sanitize_font_family_settings().
+		$settings = $request->get_param( 'font_family_settings' );
+
+		// This is an update and we merge with the existing font family.
+		if ( isset( $request['id'] ) ) {
+			$existing_post = $this->get_post( $request['id'] );
+			if ( is_wp_error( $existing_post ) ) {
+				return $existing_post;
 			}
 
-			if ( $this->has_upload_directory() && ! $this->has_write_permission() ) {
-				$errors[]        = new WP_Error(
-					'cannot_write_fonts_folder',
-					__( 'Error: WordPress does not have permission to write the fonts folder on your server.', 'gutenberg' )
-				);
-				$response_status = 500;
-			}
+			$prepared_post->ID = $existing_post->ID;
+			$existing_settings = $this->get_settings_from_post( $existing_post );
+			$settings          = array_merge( $existing_settings, $settings );
 		}
 
-		if ( ! empty( $errors ) ) {
-			$data     = array(
-				'successes' => $successes,
-				'errors'    => $errors,
-			);
-			$response = rest_ensure_response( $data );
-			$response->set_status( $response_status );
-			return $response;
-		}
+		$prepared_post->post_type   = $this->post_type;
+		$prepared_post->post_status = 'publish';
+		$prepared_post->post_title  = $settings['name'];
+		$prepared_post->post_name   = sanitize_title( $settings['slug'] );
 
-		// Get uploaded files (used when installing local fonts).
-		$files  = $request->get_file_params();
-		$font   = new WP_Font_Family( $font_family_settings );
-		$result = $font->install( $files );
-		if ( is_wp_error( $result ) ) {
-			$errors[] = $result;
-		} else {
-			$successes[] = $result;
-		}
+		// Remove duplicate information from settings.
+		unset( $settings['name'] );
+		unset( $settings['slug'] );
+
+		$prepared_post->post_content = wp_json_encode( $settings );
 
-		$data = array(
-			'successes' => $successes,
-			'errors'    => $errors,
+		return $prepared_post;
+	}
+
+	/**
+	 * Gets the font family's settings from the post.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param WP_Post $post Font family post object.
+	 * @return array Font family settings array.
+	 */
+	protected function get_settings_from_post( $post ) {
+		$settings_json = json_decode( $post->post_content, true );
+
+		// Default to empty strings if the settings are missing.
+		return array(
+			'name'       => isset( $post->post_title ) && $post->post_title ? $post->post_title : '',
+			'slug'       => isset( $post->post_name ) && $post->post_name ? $post->post_name : '',
+			'fontFamily' => isset( $settings_json['fontFamily'] ) && $settings_json['fontFamily'] ? $settings_json['fontFamily'] : '',
+			'preview'    => isset( $settings_json['preview'] ) && $settings_json['preview'] ? $settings_json['preview'] : '',
 		);
-		return rest_ensure_response( $data );
 	}
 }
diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index d1ad8e1447ad9..a6a324b17731c 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -22,16 +22,73 @@
 function gutenberg_init_font_library_routes() {
 	// @core-merge: This code will go into Core's `create_initial_post_types()`.
 	$args = array(
+		'labels'                         => array(
+			'name'          => __( 'Font Families', 'gutenberg' ),
+			'singular_name' => __( 'Font Family', 'gutenberg' ),
+		),
 		'public'                         => false,
-		'_builtin'                       => true,  /* internal use only. don't use this when registering your own post type. */
-		'label'                          => 'Font Family',
+		'_builtin'                       => true, /* internal use only. don't use this when registering your own post type. */
+		'hierarchical'                   => false,
+		'capabilities'                   => array(
+			'read'                   => 'edit_theme_options',
+			'read_post'              => 'edit_theme_options',
+			'read_private_posts'     => 'edit_theme_options',
+			'create_posts'           => 'edit_theme_options',
+			'publish_posts'          => 'edit_theme_options',
+			'edit_post'              => 'edit_theme_options',
+			'edit_posts'             => 'edit_theme_options',
+			'edit_others_posts'      => 'edit_theme_options',
+			'edit_published_posts'   => 'edit_theme_options',
+			'delete_post'            => 'edit_theme_options',
+			'delete_posts'           => 'edit_theme_options',
+			'delete_others_posts'    => 'edit_theme_options',
+			'delete_published_posts' => 'edit_theme_options',
+		),
+		'map_meta_cap'                   => false,
+		'query_var'                      => false,
 		'show_in_rest'                   => true,
 		'rest_base'                      => 'font-families',
 		'rest_controller_class'          => 'WP_REST_Font_Families_Controller',
-		'autosave_rest_controller_class' => 'WP_REST_Autosave_Font_Families_Controller',
+		// Disable autosave endpoints for font families.
+		'autosave_rest_controller_class' => 'stdClass',
 	);
 	register_post_type( 'wp_font_family', $args );
 
+	register_post_type(
+		'wp_font_face',
+		array(
+			'labels'                         => array(
+				'name'          => __( 'Font Faces', 'gutenberg' ),
+				'singular_name' => __( 'Font Face', 'gutenberg' ),
+			),
+			'public'                         => false,
+			'_builtin'                       => true, /* internal use only. don't use this when registering your own post type. */
+			'hierarchical'                   => false,
+			'capabilities'                   => array(
+				'read'                   => 'edit_theme_options',
+				'read_post'              => 'edit_theme_options',
+				'read_private_posts'     => 'edit_theme_options',
+				'create_posts'           => 'edit_theme_options',
+				'publish_posts'          => 'edit_theme_options',
+				'edit_post'              => 'edit_theme_options',
+				'edit_posts'             => 'edit_theme_options',
+				'edit_others_posts'      => 'edit_theme_options',
+				'edit_published_posts'   => 'edit_theme_options',
+				'delete_post'            => 'edit_theme_options',
+				'delete_posts'           => 'edit_theme_options',
+				'delete_others_posts'    => 'edit_theme_options',
+				'delete_published_posts' => 'edit_theme_options',
+			),
+			'map_meta_cap'                   => false,
+			'query_var'                      => false,
+			'show_in_rest'                   => true,
+			'rest_base'                      => 'font-families/(?P<font_family_id>[\d]+)/font-faces',
+			'rest_controller_class'          => 'WP_REST_Font_Faces_Controller',
+			// Disable autosave endpoints for font faces.
+			'autosave_rest_controller_class' => 'stdClass',
+		)
+	);
+
 	// @core-merge: This code will go into Core's `create_initial_rest_routes()`.
 	$font_collections_controller = new WP_REST_Font_Collections_Controller();
 	$font_collections_controller->register_routes();
@@ -79,7 +136,8 @@ function wp_unregister_font_collection( $collection_id ) {
 	'slug'        => 'default-font-collection',
 	'name'        => 'Google Fonts',
 	'description' => __( 'Add from Google Fonts. Fonts are copied to and served from your site.', 'gutenberg' ),
-	'src'         => 'https://s.w.org/images/fonts/16.7/collections/google-fonts-with-preview.json',
+	// TODO: This URL needs to be updated to the wporg hosted one prior to the Gutenberg 17.6 release.
+	'src'         => 'https://raw.githubusercontent.com/WordPress/google-fonts-to-wordpress-collection/main/releases/gutenberg-17.6/collections/google-fonts.json',
 );
 
 wp_register_font_collection( $default_font_collection );
@@ -132,3 +190,141 @@ function wp_get_font_dir( $defaults = array() ) {
 		return apply_filters( 'font_dir', $defaults );
 	}
 }
+
+// @core-merge: Filters should go in `src/wp-includes/default-filters.php`,
+// functions in a general file for font library.
+if ( ! function_exists( '_wp_after_delete_font_family' ) ) {
+	/**
+	 * Deletes child font faces when a font family is deleted.
+	 *
+	 * @access private
+	 * @since 6.5.0
+	 *
+	 * @param int     $post_id Post ID.
+	 * @param WP_Post $post    Post object.
+	 * @return void
+	 */
+	function _wp_after_delete_font_family( $post_id, $post ) {
+		if ( 'wp_font_family' !== $post->post_type ) {
+			return;
+		}
+
+		$font_faces = get_children(
+			array(
+				'post_parent' => $post_id,
+				'post_type'   => 'wp_font_face',
+			)
+		);
+
+		foreach ( $font_faces as $font_face ) {
+			wp_delete_post( $font_face->ID, true );
+		}
+	}
+	add_action( 'deleted_post', '_wp_after_delete_font_family', 10, 2 );
+}
+
+if ( ! function_exists( '_wp_before_delete_font_face' ) ) {
+	/**
+	 * Deletes associated font files when a font face is deleted.
+	 *
+	 * @access private
+	 * @since 6.5.0
+	 *
+	 * @param int     $post_id Post ID.
+	 * @param WP_Post $post    Post object.
+	 * @return void
+	 */
+	function _wp_before_delete_font_face( $post_id, $post ) {
+		if ( 'wp_font_face' !== $post->post_type ) {
+			return;
+		}
+
+		$font_files = get_post_meta( $post_id, '_wp_font_face_file', false );
+
+		foreach ( $font_files as $font_file ) {
+			wp_delete_file( wp_get_font_dir()['path'] . '/' . $font_file );
+		}
+	}
+	add_action( 'before_delete_post', '_wp_before_delete_font_face', 10, 2 );
+}
+
+// @core-merge: Do not merge this back compat function, it is for supporting a legacy font family format only in Gutenberg.
+/**
+ * Convert legacy font family posts to the new format.
+ *
+ * @return void
+ */
+function gutenberg_convert_legacy_font_family_format() {
+	if ( get_option( 'gutenberg_font_family_format_converted' ) ) {
+		return;
+	}
+
+	$font_families = new WP_Query(
+		array(
+			'post_type'              => 'wp_font_family',
+			// Set a maximum, but in reality there will be far less than this.
+			'posts_per_page'         => 999,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+		)
+	);
+
+	foreach ( $font_families->get_posts() as $font_family ) {
+		$already_converted = get_post_meta( $font_family->ID, '_gutenberg_legacy_font_family', true );
+		if ( $already_converted ) {
+			continue;
+		}
+
+		// Stash the old font family content in a meta field just in case we need it.
+		update_post_meta( $font_family->ID, '_gutenberg_legacy_font_family', $font_family->post_content );
+
+		$font_family_json = json_decode( $font_family->post_content, true );
+		if ( ! $font_family_json ) {
+			continue;
+		}
+
+		$font_faces = $font_family_json['fontFace'] ?? array();
+		unset( $font_family_json['fontFace'] );
+
+		// Save wp_font_face posts within the family.
+		foreach ( $font_faces as $font_face ) {
+			$args                 = array();
+			$args['post_type']    = 'wp_font_face';
+			$args['post_title']   = WP_Font_Family_Utils::get_font_face_slug( $font_face );
+			$args['post_name']    = sanitize_title( $args['post_title'] );
+			$args['post_status']  = 'publish';
+			$args['post_parent']  = $font_family->ID;
+			$args['post_content'] = wp_json_encode( $font_face );
+
+			$font_face_id = wp_insert_post( wp_slash( $args ) );
+
+			$file_urls = (array) $font_face['src'] ?? array();
+
+			foreach ( $file_urls as $file_url ) {
+				// continue if the file is not local.
+				if ( false === strpos( $file_url, site_url() ) ) {
+					continue;
+				}
+
+				$relative_path = basename( $file_url );
+				update_post_meta( $font_face_id, '_wp_font_face_file', $relative_path );
+			}
+		}
+
+		// Update the font family post to remove the font face data.
+		$args               = array();
+		$args['ID']         = $font_family->ID;
+		$args['post_title'] = $font_family_json['name'] ?? '';
+		$args['post_name']  = sanitize_title( $font_family_json['slug'] );
+
+		unset( $font_family_json['name'] );
+		unset( $font_family_json['slug'] );
+
+		$args['post_content'] = wp_json_encode( $font_family_json );
+
+		wp_update_post( wp_slash( $args ) );
+	}
+
+	update_option( 'gutenberg_font_family_format_converted', true );
+}
+add_action( 'init', 'gutenberg_convert_legacy_font_family_format' );
diff --git a/lib/load.php b/lib/load.php
index 8c9c8532d573c..2dd33962e355b 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -145,8 +145,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
+require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-autosave-font-families-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/font-library.php';
 
 // Load the Font Face and Font Face Resolver, if not already loaded by WordPress Core.
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/context.js b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
index 364742901bd5f..864d703f260b4 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/context.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/context.js
@@ -9,13 +9,15 @@ import {
 	useEntityRecords,
 	store as coreStore,
 } from '@wordpress/core-data';
+import { __, sprintf } from '@wordpress/i18n';
 
 /**
  * Internal dependencies
  */
 import {
-	fetchInstallFont,
-	fetchUninstallFonts,
+	fetchGetFontFamilyBySlug,
+	fetchInstallFontFamily,
+	fetchUninstallFontFamily,
 	fetchFontCollections,
 	fetchFontCollection,
 } from './resolvers';
@@ -26,10 +28,12 @@ import {
 	mergeFontFamilies,
 	loadFontFaceInBrowser,
 	getDisplaySrcFromFontFace,
-	makeFormDataFromFontFamily,
+	makeFontFacesFormData,
+	makeFontFamilyFormData,
+	batchInstallFontFaces,
+	checkFontFaceInstalled,
 } from './utils';
 import { toggleFont } from './utils/toggleFont';
-import getIntersectingFontFaces from './utils/get-intersecting-font-faces';
 
 export const FontLibraryContext = createContext( {} );
 
@@ -60,12 +64,22 @@ function FontLibraryProvider( { children } ) {
 		records: libraryPosts = [],
 		isResolving: isResolvingLibrary,
 		hasResolved: hasResolvedLibrary,
-	} = useEntityRecords( 'postType', 'wp_font_family', { refreshKey } );
+	} = useEntityRecords( 'postType', 'wp_font_family', {
+		refreshKey,
+		_embed: true,
+	} );
 
 	const libraryFonts =
-		( libraryPosts || [] ).map( ( post ) =>
-			JSON.parse( post.content.raw )
-		) || [];
+		( libraryPosts || [] ).map( ( fontFamilyPost ) => {
+			return {
+				id: fontFamilyPost.id,
+				...fontFamilyPost.font_family_settings,
+				fontFace:
+					fontFamilyPost?._embedded?.font_faces.map(
+						( face ) => face.font_face_settings
+					) || [],
+			};
+		} ) || [];
 
 	// Global Styles (settings) font families
 	const [ fontFamilies, setFontFamilies ] = useGlobalSetting(
@@ -157,11 +171,12 @@ function FontLibraryProvider( { children } ) {
 
 	const getAvailableFontsOutline = ( availableFontFamilies ) => {
 		const outline = availableFontFamilies.reduce( ( acc, font ) => {
-			const availableFontFaces = Array.isArray( font?.fontFace )
-				? font?.fontFace.map(
-						( face ) => `${ face.fontStyle + face.fontWeight }`
-				  )
-				: [ 'normal400' ]; // If the font doesn't have fontFace, we assume it is a system font and we add the defaults: normal 400
+			const availableFontFaces =
+				font?.fontFace && font.fontFace?.length > 0
+					? font?.fontFace.map(
+							( face ) => `${ face.fontStyle + face.fontWeight }`
+					  )
+					: [ 'normal400' ]; // If the font doesn't have fontFace, we assume it is a system font and we add the defaults: normal 400
 
 			acc[ font.slug ] = availableFontFaces;
 			return acc;
@@ -192,44 +207,133 @@ function FontLibraryProvider( { children } ) {
 		return getActivatedFontsOutline( source )[ slug ] || [];
 	};
 
-	async function installFont( font ) {
+	async function installFont( fontFamilyToInstall ) {
 		setIsInstalling( true );
 		try {
-			// Prepare formData to install.
-			const formData = makeFormDataFromFontFamily( font );
+			// Get the font family if it already exists.
+			let installedFontFamily = await fetchGetFontFamilyBySlug(
+				fontFamilyToInstall.slug
+			);
+
+			// Otherwise create it.
+			if ( ! installedFontFamily ) {
+				// Prepare font family form data to install.
+				installedFontFamily = await fetchInstallFontFamily(
+					makeFontFamilyFormData( fontFamilyToInstall )
+				);
+			}
+
+			// Collect font faces that have already been installed (to be activated later)
+			const alreadyInstalledFontFaces =
+				installedFontFamily.fontFace && fontFamilyToInstall.fontFace
+					? installedFontFamily.fontFace.filter(
+							( fontFaceToInstall ) =>
+								checkFontFaceInstalled(
+									fontFaceToInstall,
+									fontFamilyToInstall.fontFace
+								)
+					  )
+					: [];
+
+			// Filter out Font Faces that have already been installed (so that they are not re-installed)
+			if (
+				installedFontFamily.fontFace &&
+				fontFamilyToInstall.fontFace
+			) {
+				fontFamilyToInstall.fontFace =
+					fontFamilyToInstall.fontFace.filter(
+						( fontFaceToInstall ) =>
+							! checkFontFaceInstalled(
+								fontFaceToInstall,
+								installedFontFamily.fontFace
+							)
+					);
+			}
+
 			// Install the fonts (upload the font files to the server and create the post in the database).
-			const response = await fetchInstallFont( formData );
-			const fontsInstalled = response?.successes || [];
-			// Get intersecting font faces between the fonts we tried to installed and the fonts that were installed
-			// (to avoid activating a non installed font).
-			const fontToBeActivated = getIntersectingFontFaces(
-				fontsInstalled,
-				[ font ]
+			let sucessfullyInstalledFontFaces = [];
+			let unsucessfullyInstalledFontFaces = [];
+			if ( fontFamilyToInstall?.fontFace?.length > 0 ) {
+				const response = await batchInstallFontFaces(
+					installedFontFamily.id,
+					makeFontFacesFormData( fontFamilyToInstall )
+				);
+				sucessfullyInstalledFontFaces = response?.successes;
+				unsucessfullyInstalledFontFaces = response?.errors;
+			}
+
+			const detailedErrorMessage = unsucessfullyInstalledFontFaces.reduce(
+				( errorMessageCollection, error ) => {
+					return `${ errorMessageCollection } ${ error.message }`;
+				},
+				''
 			);
-			// Activate the font families (add the font families to the global styles).
-			activateCustomFontFamilies( fontToBeActivated );
+
+			// If there were no successes and nothing already installed then we don't need to activate anything and can bounce now.
+			if (
+				fontFamilyToInstall?.fontFace?.length > 0 &&
+				sucessfullyInstalledFontFaces.length === 0 &&
+				alreadyInstalledFontFaces.length === 0
+			) {
+				throw new Error(
+					sprintf(
+						/* translators: %s: Specific error message returned from server. */
+						__( 'No font faces were installed. %s' ),
+						detailedErrorMessage
+					)
+				);
+			}
+
+			// Use the sucessfully installed font faces
+			// As well as any font faces that were already installed (those will be activated)
+			if (
+				sucessfullyInstalledFontFaces?.length > 0 ||
+				alreadyInstalledFontFaces?.length > 0
+			) {
+				fontFamilyToInstall.fontFace = [
+					...sucessfullyInstalledFontFaces,
+					...alreadyInstalledFontFaces,
+				];
+			}
+
+			// Activate the font family (add the font family to the global styles).
+			activateCustomFontFamilies( [ fontFamilyToInstall ] );
+
 			// Save the global styles to the database.
 			saveSpecifiedEntityEdits( 'root', 'globalStyles', globalStylesId, [
 				'settings.typography.fontFamilies',
 			] );
+
 			refreshLibrary();
-			return response;
-		} catch ( error ) {
-			return {
-				errors: [ error ],
-			};
+
+			if ( unsucessfullyInstalledFontFaces.length > 0 ) {
+				throw new Error(
+					sprintf(
+						/* translators: %s: Specific error message returned from server. */
+						__(
+							'Some font faces were installed. There were some errors. %s'
+						),
+						detailedErrorMessage
+					)
+				);
+			}
 		} finally {
 			setIsInstalling( false );
 		}
 	}
 
-	async function uninstallFont( font ) {
+	async function uninstallFontFamily( fontFamilyToUninstall ) {
 		try {
-			// Uninstall the font (remove the font files from the server and the post from the database).
-			const response = await fetchUninstallFonts( [ font ] );
-			// Deactivate the font family (remove the font family from the global styles).
-			if ( 0 === response.errors.length ) {
-				deactivateFontFamily( font );
+			// Uninstall the font family.
+			// (Removes the font files from the server and the posts from the database).
+			const uninstalledFontFamily = await fetchUninstallFontFamily(
+				fontFamilyToUninstall.id
+			);
+
+			// Deactivate the font family if delete request is successful
+			// (Removes the font family from the global styles).
+			if ( uninstalledFontFamily.deleted ) {
+				deactivateFontFamily( fontFamilyToUninstall );
 				// Save the global styles to the database.
 				await saveSpecifiedEntityEdits(
 					'root',
@@ -238,15 +342,18 @@ function FontLibraryProvider( { children } ) {
 					[ 'settings.typography.fontFamilies' ]
 				);
 			}
-			// Refresh the library (the the library font families from database).
+
+			// Refresh the library (the library font families from database).
 			refreshLibrary();
-			return response;
+
+			return uninstalledFontFamily;
 		} catch ( error ) {
 			// eslint-disable-next-line no-console
-			console.error( error );
-			return {
-				errors: [ error ],
-			};
+			console.error(
+				`There was an error uninstalling the font family:`,
+				error
+			);
+			throw error;
 		}
 	}
 
@@ -321,16 +428,16 @@ function FontLibraryProvider( { children } ) {
 		const response = await fetchFontCollections();
 		setFontCollections( response );
 	};
-	const getFontCollection = async ( id ) => {
+	const getFontCollection = async ( slug ) => {
 		try {
 			const hasData = !! collections.find(
-				( collection ) => collection.id === id
-			)?.data;
+				( collection ) => collection.slug === slug
+			)?.font_families;
 			if ( hasData ) return;
-			const response = await fetchFontCollection( id );
+			const response = await fetchFontCollection( slug );
 			const updatedCollections = collections.map( ( collection ) =>
-				collection.id === id
-					? { ...collection, data: { ...response?.data } }
+				collection.slug === slug
+					? { ...collection, ...response }
 					: collection
 			);
 			setFontCollections( updatedCollections );
@@ -358,7 +465,7 @@ function FontLibraryProvider( { children } ) {
 				getFontFacesActivated,
 				loadFontFaceAsset,
 				installFont,
-				uninstallFont,
+				uninstallFontFamily,
 				toggleActivateFont,
 				getAvailableFontsOutline,
 				modalTabOpen,
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
index f7f33032f1e3f..46363365363bb 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/font-collection.js
@@ -30,15 +30,14 @@ import CollectionFontDetails from './collection-font-details';
 import { toggleFont } from './utils/toggleFont';
 import { getFontsOutline } from './utils/fonts-outline';
 import GoogleFontsConfirmDialog from './google-fonts-confirm-dialog';
-import { getNoticeFromInstallResponse } from './utils/get-notice-from-response';
 import { downloadFontFaceAsset } from './utils';
 
 const DEFAULT_CATEGORY = {
-	id: 'all',
+	slug: 'all',
 	name: __( 'All' ),
 };
-function FontCollection( { id } ) {
-	const requiresPermission = id === 'default-font-collection';
+function FontCollection( { slug } ) {
+	const requiresPermission = slug === 'default-font-collection';
 
 	const getGoogleFontsPermissionFromStorage = () => {
 		return (
@@ -58,7 +57,7 @@ function FontCollection( { id } ) {
 	const { collections, getFontCollection, installFont } =
 		useContext( FontLibraryContext );
 	const selectedCollection = collections.find(
-		( collection ) => collection.id === id
+		( collection ) => collection.slug === slug
 	);
 
 	useEffect( () => {
@@ -70,12 +69,12 @@ function FontCollection( { id } ) {
 		handleStorage();
 		window.addEventListener( 'storage', handleStorage );
 		return () => window.removeEventListener( 'storage', handleStorage );
-	}, [ id, requiresPermission ] );
+	}, [ slug, requiresPermission ] );
 
 	useEffect( () => {
 		const fetchFontCollection = async () => {
 			try {
-				await getFontCollection( id );
+				await getFontCollection( slug );
 				resetFilters();
 			} catch ( e ) {
 				setNotice( {
@@ -86,12 +85,12 @@ function FontCollection( { id } ) {
 			}
 		};
 		fetchFontCollection();
-	}, [ id, getFontCollection ] );
+	}, [ slug, getFontCollection ] );
 
 	useEffect( () => {
 		setSelectedFont( null );
 		setNotice( null );
-	}, [ id ] );
+	}, [ slug ] );
 
 	useEffect( () => {
 		// If the selected fonts change, reset the selected fonts to install
@@ -109,10 +108,10 @@ function FontCollection( { id } ) {
 	}, [ notice ] );
 
 	const collectionFonts = useMemo(
-		() => selectedCollection?.data?.fontFamilies ?? [],
+		() => selectedCollection?.font_families ?? [],
 		[ selectedCollection ]
 	);
-	const collectionCategories = selectedCollection?.data?.categories ?? [];
+	const collectionCategories = selectedCollection?.categories ?? [];
 
 	const categories = [ DEFAULT_CATEGORY, ...collectionCategories ];
 
@@ -161,11 +160,10 @@ function FontCollection( { id } ) {
 			if ( fontFamily?.fontFace ) {
 				await Promise.all(
 					fontFamily.fontFace.map( async ( fontFace ) => {
-						if ( fontFace.downloadFromUrl ) {
+						if ( fontFace.src ) {
 							fontFace.file = await downloadFontFaceAsset(
-								fontFace.downloadFromUrl
+								fontFace.src
 							);
-							delete fontFace.downloadFromUrl;
 						}
 					} )
 				);
@@ -182,9 +180,18 @@ function FontCollection( { id } ) {
 			return;
 		}
 
-		const response = await installFont( fontFamily );
-		const installNotice = getNoticeFromInstallResponse( response );
-		setNotice( installNotice );
+		try {
+			await installFont( fontFamily );
+			setNotice( {
+				type: 'success',
+				message: __( 'Fonts were installed successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message: error.message,
+			} );
+		}
 		resetFontsToInstall();
 	};
 
@@ -256,8 +263,8 @@ function FontCollection( { id } ) {
 							{ categories &&
 								categories.map( ( category ) => (
 									<option
-										value={ category.id }
-										key={ category.id }
+										value={ category.slug }
+										key={ category.slug }
 									>
 										{ category.name }
 									</option>
@@ -269,11 +276,11 @@ function FontCollection( { id } ) {
 
 			<Spacer margin={ 4 } />
 			{ ! renderConfirmDialog &&
-				! selectedCollection?.data?.fontFamilies &&
+				! selectedCollection?.font_families &&
 				! notice && <Spinner /> }
 
 			{ ! renderConfirmDialog &&
-				!! selectedCollection?.data?.fontFamilies?.length &&
+				!! selectedCollection?.font_families?.length &&
 				! fonts.length && (
 					<Text>
 						{ __(
@@ -294,10 +301,10 @@ function FontCollection( { id } ) {
 				<FontsGrid>
 					{ fonts.map( ( font ) => (
 						<FontCard
-							key={ font.slug }
-							font={ font }
+							key={ font.font_family_settings.slug }
+							font={ font.font_family_settings }
 							onClick={ () => {
-								setSelectedFont( font );
+								setSelectedFont( font.font_family_settings );
 							} }
 						/>
 					) ) }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js b/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js
index 55e7a8a5cf393..9700831a7adef 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/fonts-grid.js
@@ -42,9 +42,13 @@ function FontsGrid( { title, children, pageSize = 32 } ) {
 				<div className="font-library-modal__fonts-grid__main">
 					{ items.map( ( child, i ) => {
 						if ( i === itemsLimit - 1 ) {
-							return <div ref={ setLastItem }>{ child }</div>;
+							return (
+								<div key={ child.key } ref={ setLastItem }>
+									{ child }
+								</div>
+							);
 						}
-						return child;
+						return <div key={ child.key }>{ child }</div>;
 					} ) }
 				</div>
 			</VStack>
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/index.js
index 65a284560687c..a68c42ec01041 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/index.js
@@ -31,10 +31,10 @@ const DEFAULT_TABS = [
 ];
 
 const tabsFromCollections = ( collections ) =>
-	collections.map( ( { id, name } ) => ( {
-		id,
+	collections.map( ( { slug, name } ) => ( {
+		id: slug,
 		title:
-			collections.length === 1 && id === 'default-font-collection'
+			collections.length === 1 && slug === 'default-font-collection'
 				? __( 'Install Fonts' )
 				: name,
 	} ) );
@@ -76,7 +76,7 @@ function FontLibraryModal( {
 								contents = <InstalledFonts />;
 								break;
 							default:
-								contents = <FontCollection id={ id } />;
+								contents = <FontCollection slug={ id } />;
 						}
 						return (
 							<Tabs.TabPanel
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
index 0a9e29892be47..3a13a720dc7c9 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/installed-fonts.js
@@ -22,7 +22,6 @@ import FontsGrid from './fonts-grid';
 import LibraryFontDetails from './library-font-details';
 import LibraryFontCard from './library-font-card';
 import ConfirmDeleteDialog from './confirm-delete-dialog';
-import { getNoticeFromUninstallResponse } from './utils/get-notice-from-response';
 import { unlock } from '../../../lock-unlock';
 const { ProgressBar } = unlock( componentsPrivateApis );
 
@@ -33,7 +32,7 @@ function InstalledFonts() {
 		baseThemeFonts,
 		handleSetLibraryFontSelected,
 		refreshLibrary,
-		uninstallFont,
+		uninstallFontFamily,
 		isResolvingLibrary,
 	} = useContext( FontLibraryContext );
 	const [ isConfirmDeleteOpen, setIsConfirmDeleteOpen ] = useState( false );
@@ -49,14 +48,24 @@ function InstalledFonts() {
 	const [ notice, setNotice ] = useState( null );
 
 	const handleConfirmUninstall = async () => {
-		const response = await uninstallFont( libraryFontSelected );
-		const uninstallNotice = getNoticeFromUninstallResponse( response );
-		setNotice( uninstallNotice );
-		// If the font was succesfully uninstalled it is unselected
-		if ( ! response?.errors?.length ) {
+		try {
+			await uninstallFontFamily( libraryFontSelected );
+			setNotice( {
+				type: 'success',
+				message: __( 'Font family uninstalled successfully.' ),
+			} );
+
+			// If the font was succesfully uninstalled it is unselected.
 			handleUnselectFont();
+			setIsConfirmDeleteOpen( false );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message:
+					__( 'There was an error uninstalling the font family. ' ) +
+					error.message,
+			} );
 		}
-		setIsConfirmDeleteOpen( false );
 	};
 
 	const handleUninstallClick = async () => {
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js
index 16454595dc7f2..e37a28a5c9528 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-card.js
@@ -13,7 +13,8 @@ import { FontLibraryContext } from './context';
 function LibraryFontCard( { font, ...props } ) {
 	const { getFontFacesActivated } = useContext( FontLibraryContext );
 
-	const variantsInstalled = font.fontFace?.length || 1;
+	const variantsInstalled =
+		font?.fontFace?.length > 0 ? font.fontFace.length : 1;
 	const variantsActive = getFontFacesActivated(
 		font.slug,
 		font.source
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
index d74a5f74f019b..94fee2852478e 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/library-font-variant.js
@@ -20,17 +20,18 @@ function LibraryFontVariant( { face, font } ) {
 	const { isFontActivated, toggleActivateFont } =
 		useContext( FontLibraryContext );
 
-	const isIstalled = font?.fontFace
-		? isFontActivated(
-				font.slug,
-				face.fontStyle,
-				face.fontWeight,
-				font.source
-		  )
-		: isFontActivated( font.slug, null, null, font.source );
+	const isIstalled =
+		font?.fontFace?.length > 0
+			? isFontActivated(
+					font.slug,
+					face.fontStyle,
+					face.fontWeight,
+					font.source
+			  )
+			: isFontActivated( font.slug, null, null, font.source );
 
 	const handleToggleActivation = () => {
-		if ( font?.fontFace ) {
+		if ( font?.fontFace?.length > 0 ) {
 			toggleActivateFont( font, face );
 			return;
 		}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
index d4221b420cb61..145f4164a8760 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/local-fonts.js
@@ -23,7 +23,6 @@ import { FontLibraryContext } from './context';
 import { Font } from '../../../../lib/lib-font.browser';
 import makeFamiliesFromFaces from './utils/make-families-from-faces';
 import { loadFontFaceInBrowser } from './utils';
-import { getNoticeFromInstallResponse } from './utils/get-notice-from-response';
 import { unlock } from '../../../lock-unlock';
 
 const { ProgressBar } = unlock( componentsPrivateApis );
@@ -161,12 +160,23 @@ function LocalFonts() {
 					'Variants from only one font family can be uploaded at a time.'
 				),
 			} );
+			setIsUploading( false );
 			return;
 		}
 
-		const response = await installFont( fontFamilies[ 0 ] );
-		const installNotice = getNoticeFromInstallResponse( response );
-		setNotice( installNotice );
+		try {
+			await installFont( fontFamilies[ 0 ] );
+			setNotice( {
+				type: 'success',
+				message: __( 'Fonts were installed successfully.' ),
+			} );
+		} catch ( error ) {
+			setNotice( {
+				type: 'error',
+				message: error.message,
+			} );
+		}
+
 		setIsUploading( false );
 	};
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
index 2e7f413a6fa45..a75fc6cbe78ff 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/resolvers.js
@@ -1,45 +1,78 @@
-/**
- * WordPress dependencies
- *
- */
 /**
  * WordPress dependencies
  */
 import apiFetch from '@wordpress/api-fetch';
 
-export async function fetchInstallFont( data ) {
+const FONT_FAMILIES_URL = '/wp/v2/font-families';
+const FONT_COLLECTIONS_URL = '/wp/v2/font-collections';
+
+export async function fetchInstallFontFamily( data ) {
 	const config = {
-		path: '/wp/v2/font-families',
+		path: FONT_FAMILIES_URL,
 		method: 'POST',
 		body: data,
 	};
-	return apiFetch( config );
+	const response = await apiFetch( config );
+	return {
+		id: response.id,
+		...response.font_family_settings,
+		fontFace: [],
+	};
 }
 
-export async function fetchUninstallFonts( fonts ) {
-	const data = {
-		font_families: fonts,
+export async function fetchInstallFontFace( fontFamilyId, data ) {
+	const config = {
+		path: `${ FONT_FAMILIES_URL }/${ fontFamilyId }/font-faces`,
+		method: 'POST',
+		body: data,
+	};
+	const response = await apiFetch( config );
+	return {
+		id: response.id,
+		...response.font_face_settings,
 	};
+}
+
+export async function fetchGetFontFamilyBySlug( slug ) {
+	const config = {
+		path: `${ FONT_FAMILIES_URL }?slug=${ slug }&_embed=true`,
+		method: 'GET',
+	};
+	const response = await apiFetch( config );
+	if ( ! response || response.length === 0 ) {
+		return null;
+	}
+	const fontFamilyPost = response[ 0 ];
+	return {
+		id: fontFamilyPost.id,
+		...fontFamilyPost.font_family_settings,
+		fontFace:
+			fontFamilyPost?._embedded?.font_faces.map(
+				( face ) => face.font_face_settings
+			) || [],
+	};
+}
+
+export async function fetchUninstallFontFamily( fontFamilyId ) {
 	const config = {
-		path: '/wp/v2/font-families',
+		path: `${ FONT_FAMILIES_URL }/${ fontFamilyId }?force=true`,
 		method: 'DELETE',
-		data,
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
 
 export async function fetchFontCollections() {
 	const config = {
-		path: '/wp/v2/font-collections',
+		path: FONT_COLLECTIONS_URL,
 		method: 'GET',
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
 
 export async function fetchFontCollection( id ) {
 	const config = {
-		path: `/wp/v2/font-collections/${ id }`,
+		path: `${ FONT_COLLECTIONS_URL }/${ id }`,
 		method: 'GET',
 	};
-	return apiFetch( config );
+	return await apiFetch( config );
 }
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/style.scss b/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
index d026563d3b73e..99599d179f019 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/style.scss
@@ -51,6 +51,7 @@
 
 .font-library-modal__font-card {
 	border: 1px solid #e5e5e5;
+	width: 100%;
 	height: auto;
 	padding: 1rem;
 	margin-top: -1px; /* To collapse the margin with the previous element */
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
index 7348eb6b05497..e493a70197ace 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/filter-fonts.js
@@ -1,16 +1,33 @@
+/**
+ * Filters a list of fonts based on the specified filters.
+ *
+ * This function filters a given array of fonts based on the criteria provided in the filters object.
+ * It supports filtering by category and a search term. If the category is provided and not equal to 'all',
+ * the function filters the fonts array to include only those fonts that belong to the specified category.
+ * Additionally, if a search term is provided, it filters the fonts array to include only those fonts
+ * whose name includes the search term, case-insensitively.
+ *
+ * @param {Array}  fonts   Array of font objects in font-collection schema fashion to be filtered. Each font object should have a 'categories' property and a 'font_family_settings' property with a 'name' key.
+ * @param {Object} filters Object containing the filter criteria. It should have a 'category' key and/or a 'search' key.
+ *                         The 'category' key is a string representing the category to filter by.
+ *                         The 'search' key is a string representing the search term to filter by.
+ * @return {Array} Array of filtered font objects based on the provided criteria.
+ */
 export default function filterFonts( fonts, filters ) {
 	const { category, search } = filters;
 	let filteredFonts = fonts || [];
 
 	if ( category && category !== 'all' ) {
 		filteredFonts = filteredFonts.filter(
-			( font ) => font.category === category
+			( font ) => font.categories.indexOf( category ) !== -1
 		);
 	}
 
 	if ( search ) {
 		filteredFonts = filteredFonts.filter( ( font ) =>
-			font.name.toLowerCase().includes( search.toLowerCase() )
+			font.font_family_settings.name
+				.toLowerCase()
+				.includes( search.toLowerCase() )
 		);
 	}
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js
deleted file mode 100644
index e21e72c58ed53..0000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-intersecting-font-faces.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Retrieves intersecting font faces between two sets of fonts.
- *
- * For each font in the `incoming` list, the function checks for a corresponding match
- * in the `existing` list based on the `slug` property. If a match is found and both
- * have `fontFace` properties, it further narrows down to matching font faces based on
- * the `fontWeight` and `fontStyle`. The result includes the properties of the matched
- * existing font but only with intersecting font faces.
- *
- * @param {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} incoming - The list of fonts to compare.
- * @param {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} existing - The reference list of fonts.
- *
- * @return {Array.<{ slug: string, fontFace?: Array.<{ fontWeight: string, fontStyle: string }> }>} An array of fonts from the `existing` list with intersecting font faces.
- *
- * @example
- * const incomingFonts = [
- *   { slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] },
- *   { slug: 'times-new', fontFace: [{ fontWeight: '700', fontStyle: 'italic' }] }
- * ];
- *
- * const existingFonts = [
- *   { slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }, { fontWeight: '700', fontStyle: 'italic' }] },
- *   { slug: 'helvetica', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] }
- * ];
- *
- * getIntersectingFontFaces(incomingFonts, existingFonts);
- * // Returns:
- * // [{ slug: 'arial', fontFace: [{ fontWeight: '400', fontStyle: 'normal' }] }]
- */
-export default function getIntersectingFontFaces( incoming, existing ) {
-	const matches = [];
-
-	for ( const incomingFont of incoming ) {
-		const existingFont = existing.find(
-			( f ) => f.slug === incomingFont.slug
-		);
-
-		if ( existingFont ) {
-			if ( incomingFont?.fontFace ) {
-				const matchingFaces = incomingFont.fontFace.filter(
-					( face ) => {
-						return ( existingFont?.fontFace || [] ).find( ( f ) => {
-							return (
-								f.fontWeight === face.fontWeight &&
-								f.fontStyle === face.fontStyle
-							);
-						} );
-					}
-				);
-				matches.push( { ...incomingFont, fontFace: matchingFaces } );
-			} else {
-				matches.push( incomingFont );
-			}
-		}
-	}
-
-	return matches;
-}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js
deleted file mode 100644
index b22bd0afe2324..0000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/get-notice-from-response.js
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { __ } from '@wordpress/i18n';
-
-export function getNoticeFromInstallResponse( response ) {
-	const { errors = [], successes = [] } = response;
-	// Everything failed.
-	if ( errors.length && ! successes.length ) {
-		return {
-			type: 'error',
-			message: __( 'Error installing the fonts.' ),
-		};
-	}
-
-	// Eveerything succeeded.
-	if ( ! errors.length && successes.length ) {
-		return {
-			type: 'success',
-			message: __( 'Fonts were installed successfully.' ),
-		};
-	}
-
-	// Some succeeded, some failed.
-	if ( errors.length && successes.length ) {
-		return {
-			type: 'warning',
-			message: __(
-				'Some fonts were installed successfully and some failed.'
-			),
-		};
-	}
-}
-
-export function getNoticeFromUninstallResponse( response ) {
-	const { errors = [], successes = [] } = response;
-	// Everything failed.
-	if ( errors.length && ! successes.length ) {
-		return {
-			type: 'error',
-			message: __( 'Error uninstalling the fonts.' ),
-		};
-	}
-
-	// Everything succeeded.
-	if ( ! errors.length && successes.length ) {
-		return {
-			type: 'success',
-			message: __( 'Fonts were uninstalled successfully.' ),
-		};
-	}
-
-	// Some succeeded, some failed.
-	if ( errors.length && successes.length ) {
-		return {
-			type: 'warning',
-			message: __(
-				'Some fonts were uninstalled successfully and some failed.'
-			),
-		};
-	}
-}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
index 0aa0f7edb4aec..677b04f7e83d4 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/index.js
@@ -8,6 +8,8 @@ import { privateApis as componentsPrivateApis } from '@wordpress/components';
  */
 import { FONT_WEIGHTS, FONT_STYLES } from './constants';
 import { unlock } from '../../../../lock-unlock';
+import { fetchInstallFontFace } from '../resolvers';
+import { formatFontFamily } from './preview-styles';
 
 /**
  * Browser dependencies
@@ -92,13 +94,18 @@ export async function loadFontFaceInBrowser( fontFace, source, addTo = 'all' ) {
 		// eslint-disable-next-line no-undef
 	} else if ( source instanceof File ) {
 		dataSource = await source.arrayBuffer();
+	} else {
+		return;
 	}
 
-	// eslint-disable-next-line no-undef
-	const newFont = new FontFace( fontFace.fontFamily, dataSource, {
-		style: fontFace.fontStyle,
-		weight: fontFace.fontWeight,
-	} );
+	const newFont = new window.FontFace(
+		formatFontFamily( fontFace.fontFamily ),
+		dataSource,
+		{
+			style: fontFace.fontStyle,
+			weight: fontFace.fontWeight,
+		}
+	);
 
 	const loadedFace = await newFont.load();
 
@@ -135,39 +142,84 @@ export function getDisplaySrcFromFontFace( input, urlPrefix ) {
 	return src;
 }
 
-export function makeFormDataFromFontFamily( fontFamily ) {
+export function makeFontFamilyFormData( fontFamily ) {
 	const formData = new FormData();
 	const { kebabCase } = unlock( componentsPrivateApis );
 
-	const newFontFamily = {
-		...fontFamily,
+	const { fontFace, category, ...familyWithValidParameters } = fontFamily;
+	const fontFamilySettings = {
+		...familyWithValidParameters,
 		slug: kebabCase( fontFamily.slug ),
 	};
 
-	if ( newFontFamily?.fontFace ) {
-		const newFontFaces = newFontFamily.fontFace.map(
-			( face, faceIndex ) => {
-				if ( face.file ) {
-					// Slugified file name because the it might contain spaces or characters treated differently on the server.
-					const fileId = `file-${ faceIndex }`;
-					// Add the files to the formData
-					formData.append( fileId, face.file, face.file.name );
-					// remove the file object from the face object the file is referenced by the uploadedFile key
-					const { file, ...faceWithoutFileProperty } = face;
-					const newFace = {
-						...faceWithoutFileProperty,
-						uploadedFile: fileId,
-					};
-					return newFace;
-				}
-				return face;
+	formData.append(
+		'font_family_settings',
+		JSON.stringify( fontFamilySettings )
+	);
+	return formData;
+}
+
+export function makeFontFacesFormData( font ) {
+	if ( font?.fontFace ) {
+		const fontFacesFormData = font.fontFace.map( ( face, faceIndex ) => {
+			const formData = new FormData();
+			if ( face.file ) {
+				// Slugified file name because the it might contain spaces or characters treated differently on the server.
+				const fileId = `file-${ faceIndex }`;
+				// Add the files to the formData
+				formData.append( fileId, face.file, face.file.name );
+				// remove the file object from the face object the file is referenced in src
+				const { file, ...faceWithoutFileProperty } = face;
+				const fontFaceSettings = {
+					...faceWithoutFileProperty,
+					src: fileId,
+				};
+				formData.append(
+					'font_face_settings',
+					JSON.stringify( fontFaceSettings )
+				);
+			} else {
+				formData.append( 'font_face_settings', JSON.stringify( face ) );
 			}
-		);
-		newFontFamily.fontFace = newFontFaces;
+			return formData;
+		} );
+
+		return fontFacesFormData;
 	}
+}
 
-	formData.append( 'font_family_settings', JSON.stringify( newFontFamily ) );
-	return formData;
+export async function batchInstallFontFaces( fontFamilyId, fontFacesData ) {
+	const promises = fontFacesData.map( ( faceData ) =>
+		fetchInstallFontFace( fontFamilyId, faceData )
+	);
+	const responses = await Promise.allSettled( promises );
+
+	const results = {
+		errors: [],
+		successes: [],
+	};
+
+	responses.forEach( ( result, index ) => {
+		if ( result.status === 'fulfilled' ) {
+			const response = result.value;
+			if ( response.id ) {
+				results.successes.push( response );
+			} else {
+				results.errors.push( {
+					data: fontFacesData[ index ],
+					message: `Error: ${ response.message }`,
+				} );
+			}
+		} else {
+			// Handle network errors or other fetch-related errors
+			results.errors.push( {
+				data: fontFacesData[ index ],
+				message: `Fetch error: ${ result.reason.message }`,
+			} );
+		}
+	} );
+
+	return results;
 }
 
 /*
@@ -199,3 +251,23 @@ export async function downloadFontFaceAsset( url ) {
 			throw error;
 		} );
 }
+
+/*
+ * Determine if a given Font Face is present in a given collection.
+ * We determine that a font face has been installed by comparing the fontWeight and fontStyle
+ *
+ * @param {Object} fontFace The Font Face to seek
+ * @param {Array} collection The Collection to seek in
+ * @returns True if the font face is found in the collection.  Otherwise False.
+ */
+export function checkFontFaceInstalled( fontFace, collection ) {
+	return (
+		-1 !==
+		collection.findIndex( ( collectionFontFace ) => {
+			return (
+				collectionFontFace.fontWeight === fontFace.fontWeight &&
+				collectionFontFace.fontStyle === fontFace.fontStyle
+			);
+		} )
+	);
+}
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
index b47ffb781f048..389cebde9249a 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/preview-styles.js
@@ -35,9 +35,13 @@ export function formatFontFamily( input ) {
 		.split( ',' )
 		.map( ( font ) => {
 			font = font.trim(); // Remove any leading or trailing white spaces
-			// If the font doesn't have single quotes and contains a space, then add single quotes around it
-			if ( ! font.startsWith( "'" ) && font.indexOf( ' ' ) !== -1 ) {
-				return `'${ font }'`;
+			// If the font doesn't start with quotes and contains a space, then wrap in quotes.
+			// Check that string starts with a single or double quote and not a space
+			if (
+				! ( font.startsWith( '"' ) || font.startsWith( "'" ) ) &&
+				font.indexOf( ' ' ) !== -1
+			) {
+				return `"${ font }"`;
 			}
 			return font; // Return font as is if no transformation is needed
 		} )
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
index 4b171691d49d8..cd32e2b68f9cd 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/filter-fonts.spec.js
@@ -5,11 +5,26 @@ import filterFonts from '../filter-fonts';
 
 describe( 'filterFonts', () => {
 	const mockFonts = [
-		{ name: 'Arial', category: 'sans-serif' },
-		{ name: 'Arial Condensed', category: 'sans-serif' },
-		{ name: 'Times New Roman', category: 'serif' },
-		{ name: 'Courier New', category: 'monospace' },
-		{ name: 'Romantic', category: 'cursive' },
+		{
+			font_family_settings: { name: 'Arial' },
+			categories: [ 'sans-serif' ],
+		},
+		{
+			font_family_settings: { name: 'Arial Condensed' },
+			categories: [ 'sans-serif' ],
+		},
+		{
+			font_family_settings: { name: 'Times New Roman' },
+			categories: [ 'serif' ],
+		},
+		{
+			font_family_settings: { name: 'Courier New' },
+			categories: [ 'monospace' ],
+		},
+		{
+			font_family_settings: { name: 'Romantic' },
+			categories: [ 'cursive' ],
+		},
 	];
 
 	it( 'should return all fonts if no filters are provided', () => {
@@ -20,7 +35,10 @@ describe( 'filterFonts', () => {
 	it( 'should filter by category', () => {
 		const result = filterFonts( mockFonts, { category: 'serif' } );
 		expect( result ).toEqual( [
-			{ name: 'Times New Roman', category: 'serif' },
+			{
+				font_family_settings: { name: 'Times New Roman' },
+				categories: [ 'serif' ],
+			},
 		] );
 	} );
 
@@ -32,15 +50,24 @@ describe( 'filterFonts', () => {
 	it( 'should filter by search', () => {
 		const result = filterFonts( mockFonts, { search: 'ari' } );
 		expect( result ).toEqual( [
-			{ name: 'Arial', category: 'sans-serif' },
-			{ name: 'Arial Condensed', category: 'sans-serif' },
+			{
+				font_family_settings: { name: 'Arial' },
+				categories: [ 'sans-serif' ],
+			},
+			{
+				font_family_settings: { name: 'Arial Condensed' },
+				categories: [ 'sans-serif' ],
+			},
 		] );
 	} );
 
 	it( 'should be case insensitive when filtering by search', () => {
 		const result = filterFonts( mockFonts, { search: 'RoMANtic' } );
 		expect( result ).toEqual( [
-			{ name: 'Romantic', category: 'cursive' },
+			{
+				font_family_settings: { name: 'Romantic' },
+				categories: [ 'cursive' ],
+			},
 		] );
 	} );
 
@@ -50,7 +77,10 @@ describe( 'filterFonts', () => {
 			search: 'Times',
 		} );
 		expect( result ).toEqual( [
-			{ name: 'Times New Roman', category: 'serif' },
+			{
+				font_family_settings: { name: 'Times New Roman' },
+				categories: [ 'serif' ],
+			},
 		] );
 	} );
 
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js
deleted file mode 100644
index 9899005ad65b8..0000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/getIntersectingFontFaces.spec.js
+++ /dev/null
@@ -1,271 +0,0 @@
-/**
- * Internal dependencies
- */
-import getIntersectingFontFaces from '../get-intersecting-font-faces';
-
-describe( 'getIntersectingFontFaces', () => {
-	it( 'returns matching font faces for matching font family', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( incomingFontFamilies );
-	} );
-
-	it( 'returns empty array when there is no match', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'montserrat',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns matching font faces', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-					{
-						fontWeight: '700',
-						fontStyle: 'italic',
-					},
-				],
-			},
-			{
-				slug: 'times',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-					{
-						fontWeight: '800',
-						fontStyle: 'italic',
-					},
-					{
-						fontWeight: '900',
-						fontStyle: 'italic',
-					},
-				],
-			},
-		];
-
-		const expectedOutput = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( expectedOutput );
-	} );
-
-	it( 'returns empty array when the first list is empty', () => {
-		const incomingFontFamilies = [];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns empty array when the second list is empty', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'lobster',
-				fontFace: [
-					{
-						fontWeight: '400',
-						fontStyle: 'normal',
-					},
-				],
-			},
-		];
-
-		const existingFontFamilies = [];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( [] );
-	} );
-
-	it( 'returns intersecting font family when there are no fonfaces', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'piazzolla',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-
-		expect( result ).toEqual( existingFontFamilies );
-	} );
-
-	it( 'returns intersecting if there is an intended font face and is not present in the returning it should not be returned', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'piazzolla',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-			{
-				slug: 'lobster',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'lobster',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-		const expected = [
-			{
-				slug: 'lobster',
-				fontFace: [],
-			},
-		];
-		expect( result ).toEqual( expected );
-	} );
-
-	it( 'updates font family definition using the incoming data', () => {
-		const incomingFontFamilies = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: "'Gothic A1', serif",
-			},
-		];
-
-		const existingFontFamilies = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: 'Gothic A1, serif',
-			},
-		];
-
-		const result = getIntersectingFontFaces(
-			incomingFontFamilies,
-			existingFontFamilies
-		);
-		const expected = [
-			{
-				slug: 'gothic-a1',
-				fontFace: [ { fontStyle: 'normal', fontWeight: '400' } ],
-				fontFamily: "'Gothic A1', serif",
-			},
-		];
-		expect( result ).toEqual( expected );
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js
deleted file mode 100644
index 9f38903c89759..0000000000000
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/makeFormDataFromFontFamily.spec.js
+++ /dev/null
@@ -1,58 +0,0 @@
-/**
- * Internal dependencies
- */
-import { makeFormDataFromFontFamily } from '../index';
-
-/* global File */
-
-describe( 'makeFormDataFromFontFamily', () => {
-	it( 'should process fontFamilies and return FormData', () => {
-		const mockFontFamily = {
-			slug: 'bebas',
-			name: 'Bebas',
-			fontFamily: 'Bebas',
-			fontFace: [
-				{
-					file: new File( [ 'content' ], 'test-font1.woff2' ),
-					fontWeight: '500',
-					fontStyle: 'normal',
-				},
-				{
-					file: new File( [ 'content' ], 'test-font2.woff2' ),
-					fontWeight: '400',
-					fontStyle: 'normal',
-				},
-			],
-		};
-
-		const formData = makeFormDataFromFontFamily( mockFontFamily );
-
-		expect( formData instanceof FormData ).toBeTruthy();
-
-		// Check if files are added correctly
-		expect( formData.get( 'file-0' ).name ).toBe( 'test-font1.woff2' );
-		expect( formData.get( 'file-1' ).name ).toBe( 'test-font2.woff2' );
-
-		// Check if 'fontFamilies' key in FormData is correct
-		const expectedFontFamily = {
-			fontFace: [
-				{
-					fontWeight: '500',
-					fontStyle: 'normal',
-					uploadedFile: 'file-0',
-				},
-				{
-					fontWeight: '400',
-					fontStyle: 'normal',
-					uploadedFile: 'file-1',
-				},
-			],
-			slug: 'bebas',
-			name: 'Bebas',
-			fontFamily: 'Bebas',
-		};
-		expect( JSON.parse( formData.get( 'font_family_settings' ) ) ).toEqual(
-			expectedFontFamily
-		);
-	} );
-} );
diff --git a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
index f9f789a61fd6c..0273709502a43 100644
--- a/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
+++ b/packages/edit-site/src/components/global-styles/font-library-modal/utils/test/preview-styles.spec.js
@@ -123,13 +123,13 @@ describe( 'getFamilyPreviewStyle', () => {
 describe( 'formatFontFamily', () => {
 	it( 'should transform "Baloo 2, system-ui" correctly', () => {
 		expect( formatFontFamily( 'Baloo 2, system-ui' ) ).toBe(
-			"'Baloo 2', system-ui"
+			'"Baloo 2", system-ui'
 		);
 	} );
 
 	it( 'should ignore extra spaces', () => {
 		expect( formatFontFamily( '  Baloo 2   , system-ui' ) ).toBe(
-			"'Baloo 2', system-ui"
+			'"Baloo 2", system-ui'
 		);
 	} );
 
@@ -144,18 +144,18 @@ describe( 'formatFontFamily', () => {
 	} );
 
 	it( 'should wrap single font name with spaces in quotes', () => {
-		expect( formatFontFamily( 'Baloo 2' ) ).toBe( "'Baloo 2'" );
+		expect( formatFontFamily( 'Baloo 2' ) ).toBe( '"Baloo 2"' );
 	} );
 
 	it( 'should wrap multiple font names with spaces in quotes', () => {
 		expect( formatFontFamily( 'Baloo Bhai 2, Baloo 2' ) ).toBe(
-			"'Baloo Bhai 2', 'Baloo 2'"
+			'"Baloo Bhai 2", "Baloo 2"'
 		);
 	} );
 
 	it( 'should wrap only those font names with spaces which are not already quoted', () => {
 		expect( formatFontFamily( 'Baloo Bhai 2, Arial' ) ).toBe(
-			"'Baloo Bhai 2', Arial"
+			'"Baloo Bhai 2", Arial'
 		);
 	} );
 } );
diff --git a/phpunit/data/fonts/OpenSans-Regular.otf b/phpunit/data/fonts/OpenSans-Regular.otf
new file mode 100644
index 0000000000000000000000000000000000000000..8db0f64c67ddd51c0ca97a37b4b791bcd9c2ae19
GIT binary patch
literal 254960
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
U^hA4c4+48UrJKN+YPnMX2M(7>rvLx|

literal 0
HcmV?d00001

diff --git a/phpunit/data/fonts/OpenSans-Regular.ttf b/phpunit/data/fonts/OpenSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..ae716936e9e4c1d23bd12f7d7e44fdc695627a5d
GIT binary patch
literal 130976
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

literal 0
HcmV?d00001

diff --git a/phpunit/data/fonts/OpenSans-Regular.woff b/phpunit/data/fonts/OpenSans-Regular.woff
new file mode 100644
index 0000000000000000000000000000000000000000..bd0f824b207d6007f2164390dc9df31271c42119
GIT binary patch
literal 63712
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
Op2f|bD7mmB;r|73w5qNE

literal 0
HcmV?d00001

diff --git a/phpunit/data/fonts/OpenSans-Regular.woff2 b/phpunit/data/fonts/OpenSans-Regular.woff2
new file mode 100644
index 0000000000000000000000000000000000000000..f778f9c8455f265d05e653f5de4f4979fac4b4f3
GIT binary patch
literal 47016
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

literal 0
HcmV?d00001

diff --git a/phpunit/tests/fonts/font-library/fontFamilyBackwardsCompatibility.php b/phpunit/tests/fonts/font-library/fontFamilyBackwardsCompatibility.php
new file mode 100644
index 0000000000000..a971bd5123430
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/fontFamilyBackwardsCompatibility.php
@@ -0,0 +1,164 @@
+<?php
+// @core-merge: Do not include these tests, they are for Gutenberg only.
+
+/**
+ * Test deleting converting legacy font family posts into font family and font faces.
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ */
+class Tests_Font_Family_Backwards_Compatibility extends WP_UnitTestCase {
+	public function set_up() {
+		parent::set_up();
+
+		delete_option( 'gutenberg_font_family_format_converted' );
+	}
+
+	public function tear_down() {
+		parent::tear_down();
+
+		delete_option( 'gutenberg_font_family_format_converted' );
+	}
+
+	public function test_font_faces_with_remote_src() {
+		$legacy_content = '{"fontFace":[{"fontFamily":"Open Sans","fontStyle":"normal","fontWeight":"400","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4nY1M2xLER.ttf"},{"fontFamily":"Open Sans","fontStyle":"italic","fontWeight":"400","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-italic.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVcUwaERZjA.ttf"},{"fontFamily":"Open Sans","fontStyle":"normal","fontWeight":"700","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-700-normal.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4nY1M2xLER.ttf"}],"fontFamily":"\'Open Sans\', sans-serif","name":"Open Sans","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans.svg","slug":"open-sans"}';
+
+		$font_family_id = $this->create_font_family( $legacy_content );
+
+		gutenberg_convert_legacy_font_family_format();
+
+		$font_family = get_post( $font_family_id );
+		$font_faces  = $this->get_font_faces( $font_family_id );
+
+		list( $font_face1, $font_face2, $font_face3 ) = $font_faces;
+
+		// Updated font family post.
+		$this->assertSame( 'wp_font_family', $font_family->post_type );
+		$this->assertSame( 'publish', $font_family->post_status );
+
+		$font_family_title = 'Open Sans';
+		$this->assertSame( $font_family_title, $font_family->post_title );
+
+		$font_family_slug = 'open-sans';
+		$this->assertSame( $font_family_slug, $font_family->post_name );
+
+		$font_family_content = wp_json_encode( json_decode( '{"fontFamily":"\'Open Sans\', sans-serif","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans.svg"}', true ) );
+		$this->assertSame( $font_family_content, $font_family->post_content );
+
+		$meta = get_post_meta( $font_family_id, '_gutenberg_legacy_font_family', true );
+		$this->assertSame( $legacy_content, $meta );
+
+		// First font face post.
+		$this->assertSame( 'wp_font_face', $font_face1->post_type );
+		$this->assertSame( $font_family_id, $font_face1->post_parent );
+		$this->assertSame( 'publish', $font_face1->post_status );
+
+		$font_face1_title = 'open sans;normal;400;100%;U+0-10FFFF';
+		$this->assertSame( $font_face1_title, $font_face1->post_title );
+		$this->assertSame( sanitize_title( $font_face1_title ), $font_face1->post_name );
+
+		$font_face1_content = wp_json_encode( json_decode( '{"fontFamily":"Open Sans","fontStyle":"normal","fontWeight":"400","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsjZ0C4nY1M2xLER.ttf"}' ) );
+		$this->assertSame( $font_face1_content, $font_face1->post_content );
+
+		// With a remote url, file post meta should not be set.
+		$meta = get_post_meta( $font_face1->ID, '_wp_font_face_file', true );
+		$this->assertSame( '', $meta );
+
+		// Second font face post.
+		$this->assertSame( 'wp_font_face', $font_face2->post_type );
+		$this->assertSame( $font_family_id, $font_face2->post_parent );
+		$this->assertSame( 'publish', $font_face2->post_status );
+
+		$font_face2_title = 'open sans;italic;400;100%;U+0-10FFFF';
+		$this->assertSame( $font_face2_title, $font_face2->post_title );
+		$this->assertSame( sanitize_title( $font_face2_title ), $font_face2->post_name );
+
+		$font_face2_content = wp_json_encode( json_decode( '{"fontFamily":"Open Sans","fontStyle":"italic","fontWeight":"400","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-italic.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memQYaGs126MiZpBA-UFUIcVXSCEkx2cmqvXlWq8tWZ0Pw86hd0Rk8ZkaVcUwaERZjA.ttf"}' ) );
+		$this->assertSame( $font_face2_content, $font_face2->post_content );
+
+		// With a remote url, file post meta should not be set.
+		$meta = get_post_meta( $font_face2->ID, '_wp_font_face_file', true );
+		$this->assertSame( '', $meta );
+
+		// Third font face post.
+		$this->assertSame( 'wp_font_face', $font_face3->post_type );
+		$this->assertSame( $font_family_id, $font_face3->post_parent );
+		$this->assertSame( 'publish', $font_face3->post_status );
+
+		$font_face3_title = 'open sans;normal;700;100%;U+0-10FFFF';
+		$this->assertSame( $font_face3_title, $font_face3->post_title );
+		$this->assertSame( sanitize_title( $font_face3_title ), $font_face3->post_name );
+
+		$font_face3_content = wp_json_encode( json_decode( '{"fontFamily":"Open Sans","fontStyle":"normal","fontWeight":"700","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-700-normal.svg","src":"https://fonts.gstatic.com/s/opensans/v35/memSYaGs126MiZpBA-UvWbX2vVnXBbObj2OVZyOOSr4dVJWUgsg-1y4nY1M2xLER.ttf"}' ) );
+		$this->assertSame( $font_face3_content, $font_face3->post_content );
+
+		// With a remote url, file post meta should not be set.
+		$meta = get_post_meta( $font_face3->ID, '_wp_font_face_file', true );
+		$this->assertSame( '', $meta );
+
+		wp_delete_post( $font_family_id, true );
+		wp_delete_post( $font_face1->ID, true );
+		wp_delete_post( $font_face2->ID, true );
+		wp_delete_post( $font_face3->ID, true );
+	}
+
+	public function test_font_faces_with_local_src() {
+		$legacy_content = '{"fontFace":[{"fontFamily":"Open Sans","fontStyle":"normal","fontWeight":"400","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg","src":"' . site_url() . '/wp-content/fonts/open-sans_normal_400.ttf"}],"fontFamily":"\'Open Sans\', sans-serif","name":"Open Sans","preview":"https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans.svg","slug":"open-sans"}';
+
+		$font_family_id = $this->create_font_family( $legacy_content );
+
+		gutenberg_convert_legacy_font_family_format();
+
+		$font_faces = $this->get_font_faces( $font_family_id );
+		$this->assertCount( 1, $font_faces );
+		$font_face = reset( $font_faces );
+
+		// Check that file meta is present.
+		$file_path = 'open-sans_normal_400.ttf';
+		$meta      = get_post_meta( $font_face->ID, '_wp_font_face_file', true );
+		$this->assertSame( $file_path, $meta );
+
+		wp_delete_post( $font_family_id, true );
+		wp_delete_post( $font_face->ID, true );
+	}
+
+	public function test_migration_only_runs_once() {
+		$legacy_content = '{"fontFace":[],"fontFamily":"\'Open Sans\', sans-serif","name":"Open Sans","preview":"","slug":"open-sans"}';
+
+		// Simulate that the migration has already run.
+		update_option( 'gutenberg_font_family_format_converted', true );
+
+		$font_family_id = $this->create_font_family( $legacy_content );
+
+		gutenberg_convert_legacy_font_family_format();
+
+		// Meta with backup content will not be present if migration isn't triggered.
+		$meta = get_post_meta( $font_family_id, '_gutenberg_legacy_font_family', true );
+		$this->assertSame( '', $meta );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	protected function create_font_family( $content ) {
+		return wp_insert_post(
+			array(
+				'post_type'    => 'wp_font_family',
+				'post_status'  => 'publish',
+				'post_title'   => 'Open Sans',
+				'post_name'    => 'open-sans',
+				'post_content' => $content,
+			)
+		);
+	}
+
+	protected function get_font_faces( $font_family_id ) {
+		return get_posts(
+			array(
+				'post_parent' => $font_family_id,
+				'post_type'   => 'wp_font_face',
+				'order'       => 'ASC',
+				'orderby'     => 'id',
+			)
+		);
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/fontLibraryHooks.php b/phpunit/tests/fonts/font-library/fontLibraryHooks.php
new file mode 100644
index 0000000000000..2c471e2a9759c
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/fontLibraryHooks.php
@@ -0,0 +1,85 @@
+<?php
+/**
+ * Test deleting wp_font_family and wp_font_face post types.
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ */
+
+class Tests_Font_Library_Hooks extends WP_UnitTestCase {
+	public function test_deleting_font_family_deletes_child_font_faces() {
+		$font_family_id       = self::factory()->post->create(
+			array(
+				'post_type' => 'wp_font_family',
+			)
+		);
+		$font_face_id         = self::factory()->post->create(
+			array(
+				'post_type'   => 'wp_font_face',
+				'post_parent' => $font_family_id,
+			)
+		);
+		$other_font_family_id = self::factory()->post->create(
+			array(
+				'post_type' => 'wp_font_family',
+			)
+		);
+		$other_font_face_id   = self::factory()->post->create(
+			array(
+				'post_type'   => 'wp_font_face',
+				'post_parent' => $other_font_family_id,
+			)
+		);
+
+		wp_delete_post( $font_family_id, true );
+
+		$this->assertNull( get_post( $font_face_id ) );
+		$this->assertNotNull( get_post( $other_font_face_id ) );
+	}
+
+	public function test_deleting_font_faces_deletes_associated_font_files() {
+		list( $font_face_id, $font_path ) = $this->create_font_face_with_file( 'OpenSans-Regular.woff2' );
+		list( , $other_font_path )        = $this->create_font_face_with_file( 'OpenSans-Regular.ttf' );
+
+		wp_delete_post( $font_face_id, true );
+
+		$this->assertFalse( file_exists( $font_path ) );
+		$this->assertTrue( file_exists( $other_font_path ) );
+	}
+
+	protected function create_font_face_with_file( $filename ) {
+		$font_face_id = self::factory()->post->create(
+			array(
+				'post_type' => 'wp_font_face',
+			)
+		);
+
+		$font_file = $this->upload_font_file( $filename );
+
+		// Make sure the font file uploaded successfully.
+		$this->assertFalse( $font_file['error'] );
+
+		$font_path     = $font_file['file'];
+		$font_filename = basename( $font_path );
+		add_post_meta( $font_face_id, '_wp_font_face_file', $font_filename );
+
+		return array( $font_face_id, $font_path );
+	}
+
+	protected function upload_font_file( $font_filename ) {
+		// @core-merge Use `DIR_TESTDATA` instead of `GUTENBERG_DIR_TESTDATA`.
+		$font_file_path = GUTENBERG_DIR_TESTDATA . 'fonts/' . $font_filename;
+
+		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
+		add_filter( 'upload_dir', 'wp_get_font_dir' );
+		$font_file = wp_upload_bits(
+			$font_filename,
+			null,
+			file_get_contents( $font_file_path )
+		);
+		remove_filter( 'upload_dir', 'wp_get_font_dir' );
+		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
+
+		return $font_file;
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
index 380226ee8af8a..8e9cf7bca08e5 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/__construct.php
@@ -13,32 +13,50 @@
 class Tests_Fonts_WpFontCollection_Construct extends WP_UnitTestCase {
 
 	public function test_should_initialize_data() {
-		$property = new ReflectionProperty( WP_Font_Collection::class, 'config' );
-		$property->setAccessible( true );
+		$slug = new ReflectionProperty( WP_Font_Collection::class, 'slug' );
+		$slug->setAccessible( true );
 
-		$config          = array(
+		$name = new ReflectionProperty( WP_Font_Collection::class, 'name' );
+		$name->setAccessible( true );
+
+		$description = new ReflectionProperty( WP_Font_Collection::class, 'description' );
+		$description->setAccessible( true );
+
+		$src = new ReflectionProperty( WP_Font_Collection::class, 'src' );
+		$src->setAccessible( true );
+
+		$config     = array(
 			'slug'        => 'my-collection',
 			'name'        => 'My Collection',
 			'description' => 'My collection description',
 			'src'         => 'my-collection-data.json',
 		);
-		$font_collection = new WP_Font_Collection( $config );
+		$collection = new WP_Font_Collection( $config );
 
-		$actual = $property->getValue( $font_collection );
-		$property->setAccessible( false );
+		$actual_slug = $slug->getValue( $collection );
+		$this->assertSame( 'my-collection', $actual_slug, 'Provided slug and initialized slug should match.' );
+		$slug->setAccessible( false );
 
-		$this->assertSame( $config, $actual );
+		$actual_name = $name->getValue( $collection );
+		$this->assertSame( 'My Collection', $actual_name, 'Provided name and initialized name should match.' );
+		$name->setAccessible( false );
+
+		$actual_description = $description->getValue( $collection );
+		$this->assertSame( 'My collection description', $actual_description, 'Provided description and initialized description should match.' );
+		$description->setAccessible( false );
+
+		$actual_src = $src->getValue( $collection );
+		$this->assertSame( 'my-collection-data.json', $actual_src, 'Provided src and initialized src should match.' );
+		$src->setAccessible( false );
 	}
 
 	/**
-	 * @dataProvider data_should_throw_exception
+	 * @dataProvider data_should_do_ti_wrong
 	 *
 	 * @param mixed  $config Config of the font collection.
-	 * @param string $expected_exception_message Expected exception message.
 	 */
-	public function test_should_throw_exception( $config, $expected_exception_message ) {
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( $expected_exception_message );
+	public function test_should_do_ti_wrong( $config ) {
+		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::is_config_valid' );
 		new WP_Font_Collection( $config );
 	}
 
@@ -47,7 +65,7 @@ public function test_should_throw_exception( $config, $expected_exception_messag
 	 *
 	 * @return array
 	 */
-	public function data_should_throw_exception() {
+	public function data_should_do_ti_wrong() {
 		return array(
 			'no id'                           => array(
 				array(
@@ -55,27 +73,22 @@ public function data_should_throw_exception() {
 					'description' => 'My collection description',
 					'src'         => 'my-collection-data.json',
 				),
-				'Font Collection config slug is required as a non-empty string.',
 			),
 
 			'no config'                       => array(
 				'',
-				'Font Collection config options is required as a non-empty array.',
 			),
 
 			'empty array'                     => array(
 				array(),
-				'Font Collection config options is required as a non-empty array.',
 			),
 
 			'boolean instead of config array' => array(
 				false,
-				'Font Collection config options is required as a non-empty array.',
 			),
 
 			'null instead of config array'    => array(
 				null,
-				'Font Collection config options is required as a non-empty array.',
 			),
 
 			'missing src'                     => array(
@@ -84,9 +97,7 @@ public function data_should_throw_exception() {
 					'name'        => 'My Collection',
 					'description' => 'My collection description',
 				),
-				'Font Collection config "src" option OR "data" option is required.',
 			),
-
 		);
 	}
 }
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
index 5f1f082297d41..393de7d22614d 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getConfig.php
@@ -32,7 +32,7 @@ public function data_should_get_config() {
 		file_put_contents( $mock_file, '{"this is mock data":true}' );
 
 		return array(
-			'with a file' => array(
+			'with a file'        => array(
 				'config'        => array(
 					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
@@ -45,7 +45,7 @@ public function data_should_get_config() {
 					'description' => 'My collection description',
 				),
 			),
-			'with a url'  => array(
+			'with a url'         => array(
 				'config'        => array(
 					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
@@ -58,12 +58,12 @@ public function data_should_get_config() {
 					'description' => 'My collection description',
 				),
 			),
-			'with data'   => array(
+			'with font_families' => array(
 				'config'        => array(
-					'slug'        => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'data'        => array( 'this is mock data' => true ),
+					'slug'          => 'my-collection',
+					'name'          => 'My Collection',
+					'description'   => 'My collection description',
+					'font_families' => array( array() ),
 				),
 				'expected_data' => array(
 					'slug'        => 'my-collection',
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php b/phpunit/tests/fonts/font-library/wpFontCollection/getContent.php
similarity index 52%
rename from phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
rename to phpunit/tests/fonts/font-library/wpFontCollection/getContent.php
index 885b0a0b9036c..ab0e87cde000e 100644
--- a/phpunit/tests/fonts/font-library/wpFontCollection/getConfigAndData.php
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/getContent.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * Test WP_Font_Collection::get_config_and_data().
+ * Test WP_Font_Collection::get_content().
  *
  * @package WordPress
  * @subpackage Font Library
@@ -8,9 +8,9 @@
  * @group fonts
  * @group font-library
  *
- * @covers WP_Font_Collection::get_config_and_data
+ * @covers WP_Font_Collection::get_content
  */
-class Tests_Fonts_WpFontCollection_GetConfigAndData extends WP_UnitTestCase {
+class Tests_Fonts_WpFontCollection_GetContent extends WP_UnitTestCase {
 
 	public function set_up() {
 		parent::set_up();
@@ -34,8 +34,8 @@ public function mock_request( $preempt, $args, $url ) {
 
 		// Mock the response body.
 		$mock_collection_data = array(
-			'fontFamilies' => 'mock',
-			'categories'   => 'mock',
+			'font_families' => array( 'mock' ),
+			'categories'    => array( 'mock' ),
 		);
 
 		return array(
@@ -47,14 +47,14 @@ public function mock_request( $preempt, $args, $url ) {
 	}
 
 	/**
-	 * @dataProvider data_should_get_config_and_data
+	 * @dataProvider data_should_get_content
 	 *
 	 * @param array $config Font collection config options.
-	 * @param array $expected_data Expected data.
+	 * @param array $expected_data Expected output data.
 	 */
-	public function test_should_get_config_and_data( $config, $expected_data ) {
+	public function test_should_get_content( $config, $expected_data ) {
 		$collection = new WP_Font_Collection( $config );
-		$this->assertSame( $expected_data, $collection->get_config_and_data() );
+		$this->assertSame( $expected_data, $collection->get_content() );
 	}
 
 	/**
@@ -62,12 +62,12 @@ public function test_should_get_config_and_data( $config, $expected_data ) {
 	 *
 	 * @return array[]
 	 */
-	public function data_should_get_config_and_data() {
+	public function data_should_get_content() {
 		$mock_file = wp_tempnam( 'my-collection-data-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
+		file_put_contents( $mock_file, '{"font_families":[ "mock" ], "categories":[ "mock" ] }' );
 
 		return array(
-			'with a file' => array(
+			'with a file'                           => array(
 				'config'        => array(
 					'slug'        => 'my-collection',
 					'name'        => 'My Collection',
@@ -75,13 +75,11 @@ public function data_should_get_config_and_data() {
 					'src'         => $mock_file,
 				),
 				'expected_data' => array(
-					'slug'        => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'data'        => array( 'this is mock data' => true ),
+					'font_families' => array( 'mock' ),
+					'categories'    => array( 'mock' ),
 				),
 			),
-			'with a url'  => array(
+			'with a url'                            => array(
 				'config'        => array(
 					'slug'        => 'my-collection-with-url',
 					'name'        => 'My Collection with URL',
@@ -89,27 +87,33 @@ public function data_should_get_config_and_data() {
 					'src'         => 'https://localhost/fonts/mock-font-collection.json',
 				),
 				'expected_data' => array(
-					'slug'        => 'my-collection-with-url',
-					'name'        => 'My Collection with URL',
-					'description' => 'My collection description',
-					'data'        => array(
-						'fontFamilies' => 'mock',
-						'categories'   => 'mock',
-					),
+					'font_families' => array( 'mock' ),
+					'categories'    => array( 'mock' ),
 				),
 			),
-			'with data'   => array(
+			'with font_families and categories'     => array(
 				'config'        => array(
-					'slug'        => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'data'        => array( 'this is mock data' => true ),
+					'slug'          => 'my-collection',
+					'name'          => 'My Collection',
+					'description'   => 'My collection description',
+					'font_families' => array( 'mock' ),
+					'categories'    => array( 'mock' ),
 				),
 				'expected_data' => array(
-					'slug'        => 'my-collection',
-					'name'        => 'My Collection',
-					'description' => 'My collection description',
-					'data'        => array( 'this is mock data' => true ),
+					'font_families' => array( 'mock' ),
+					'categories'    => array( 'mock' ),
+				),
+			),
+			'with font_families without categories' => array(
+				'config'        => array(
+					'slug'          => 'my-collection',
+					'name'          => 'My Collection',
+					'description'   => 'My collection description',
+					'font_families' => array( 'mock' ),
+				),
+				'expected_data' => array(
+					'font_families' => array( 'mock' ),
+					'categories'    => array(),
 				),
 			),
 		);
diff --git a/phpunit/tests/fonts/font-library/wpFontCollection/isConfigValid.php b/phpunit/tests/fonts/font-library/wpFontCollection/isConfigValid.php
new file mode 100644
index 0000000000000..7cfdfc829ab86
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontCollection/isConfigValid.php
@@ -0,0 +1,103 @@
+<?php
+/**
+ * Test WP_Font_Collection::is_config_valid().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ *
+ * @group fonts
+ * @group font-library
+ *
+ * @covers WP_Font_Collection::is_config_valid
+ */
+class Tests_Fonts_WpFontCollection_IsConfigValid extends WP_UnitTestCase {
+
+	/**
+	 * @dataProvider data_is_config_valid
+	 *
+	 * @param array $config Font collection config options.
+	 */
+	public function test_is_config_valid( $config ) {
+		$this->assertTrue( WP_Font_Collection::is_config_valid( $config ) );
+	}
+
+	public function data_is_config_valid() {
+		return array(
+			'with src'           => array(
+				'config' => array(
+					'slug'        => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'src'         => 'my-collection-data.json',
+				),
+			),
+			'with font families' => array(
+				'config' => array(
+					'slug'          => 'my-collection',
+					'name'          => 'My Collection',
+					'description'   => 'My collection description',
+					'font_families' => array( 'mock' ),
+				),
+			),
+
+		);
+	}
+
+	/**
+	 * @dataProvider data_is_config_valid_should_call_doing_ti_wrong
+	 *
+	 * @param mixed  $config Config of the font collection.
+	 */
+	public function test_is_config_valid_should_call_doing_ti_wrong( $config ) {
+		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::is_config_valid', 'Should call _doing_it_wrong if the config is not valid.' );
+		$this->assertFalse( WP_Font_Collection::is_config_valid( $config ), 'Should return false if the config is not valid.' );
+	}
+
+	public function data_is_config_valid_should_call_doing_ti_wrong() {
+		return array(
+			'with missing slug'               => array(
+				'config' => array(
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+					'src'         => 'my-collection-data.json',
+				),
+			),
+			'with missing name'               => array(
+				'config' => array(
+					'slug'        => 'my-collection',
+					'description' => 'My collection description',
+					'src'         => 'my-collection-data.json',
+				),
+			),
+			'with missing src'                => array(
+				'config' => array(
+					'slug'        => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+				),
+			),
+			'with both src and font_families' => array(
+				'config' => array(
+					'slug'          => 'my-collection',
+					'name'          => 'My Collection',
+					'description'   => 'My collection description',
+					'src'           => 'my-collection-data.json',
+					'font_families' => array( 'mock' ),
+				),
+			),
+			'without src or font_families'    => array(
+				'config' => array(
+					'slug'        => 'my-collection',
+					'name'        => 'My Collection',
+					'description' => 'My collection description',
+				),
+			),
+			'with empty config'               => array(
+				'config' => array(),
+			),
+			'without an array'                => array(
+				'config' => 'not an array',
+			),
+		);
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php b/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
index 3a1e387c3651b..cee0628dad310 100644
--- a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
+++ b/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
@@ -30,11 +30,11 @@ public function test_should_initialize_data() {
 	}
 
 	/**
-	 * @dataProvider data_should_throw_exception
+	 * @dataProvider data_should_do_it_wrong
 	 *
 	 * @param mixed $font_data Data to test.
 	 */
-	public function test_should_throw_exception( $font_data ) {
+	public function test_should_do_it_wrong( $font_data ) {
 		$this->expectException( 'Exception' );
 		$this->expectExceptionMessage( 'Font family data is missing the slug.' );
 
@@ -46,7 +46,7 @@ public function test_should_throw_exception( $font_data ) {
 	 *
 	 * @return array
 	 */
-	public function data_should_throw_exception() {
+	public function data_should_do_it_wrong() {
 		return array(
 			'no slug'                  => array(
 				array(
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php
index 4f247c5219feb..19987010d80a7 100644
--- a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php
+++ b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/formatFontFamily.php
@@ -36,11 +36,11 @@ public function data_should_format_font_family() {
 		return array(
 			'data_families_with_spaces_and_numbers' => array(
 				'font_family' => 'Rock 3D , Open Sans,serif',
-				'expected'    => "'Rock 3D', 'Open Sans', serif",
+				'expected'    => '"Rock 3D", "Open Sans", serif',
 			),
 			'data_single_font_family'               => array(
 				'font_family' => 'Rock 3D',
-				'expected'    => "'Rock 3D'",
+				'expected'    => '"Rock 3D"',
 			),
 			'data_no_spaces'                        => array(
 				'font_family' => 'Rock3D',
@@ -48,7 +48,7 @@ public function data_should_format_font_family() {
 			),
 			'data_many_spaces_and_existing_quotes'  => array(
 				'font_family' => 'Rock 3D serif, serif,sans-serif, "Open Sans"',
-				'expected'    => "'Rock 3D serif', serif, sans-serif, \"Open Sans\"",
+				'expected'    => '"Rock 3D serif", serif, sans-serif, "Open Sans"',
 			),
 			'data_empty_family'                     => array(
 				'font_family' => ' ',
diff --git a/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFontFaceSlug.php b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFontFaceSlug.php
new file mode 100644
index 0000000000000..1f87d0d2fd5a1
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpFontFamilyUtils/getFontFaceSlug.php
@@ -0,0 +1,81 @@
+<?php
+/**
+ * Test WP_Font_Family_Utils::get_font_face_slug().
+ *
+ * @package WordPress
+ * @subpackage Font Library
+ * *
+ * @covers WP_Font_Family_Utils::get_font_face_slug
+ */
+class Tests_Fonts_WpFontsFamilyUtils_GetFontFamilySlug extends WP_UnitTestCase {
+	/**
+	 * @dataProvider data_get_font_face_slug_normalizes_values
+	 */
+	public function test_get_font_face_slug_normalizes_values( $settings, $expected_slug ) {
+		$slug = WP_Font_Family_Utils::get_font_face_slug( $settings );
+
+		$this->assertSame( $expected_slug, $slug );
+	}
+
+	public function data_get_font_face_slug_normalizes_values() {
+		return array(
+			'Sets defaults'                           => array(
+				'settings'      => array(
+					'fontFamily' => 'Open Sans',
+				),
+				'expected_slug' => 'open sans;normal;400;100%;U+0-10FFFF',
+			),
+			'Converts normal weight to 400'           => array(
+				'settings'      => array(
+					'fontFamily' => 'Open Sans',
+					'fontWeight' => 'normal',
+				),
+				'expected_slug' => 'open sans;normal;400;100%;U+0-10FFFF',
+			),
+			'Converts bold weight to 700'             => array(
+				'settings'      => array(
+					'fontFamily' => 'Open Sans',
+					'fontWeight' => 'bold',
+				),
+				'expected_slug' => 'open sans;normal;700;100%;U+0-10FFFF',
+			),
+			'Converts normal font-stretch to 100%'    => array(
+				'settings'      => array(
+					'fontFamily'  => 'Open Sans',
+					'fontStretch' => 'normal',
+				),
+				'expected_slug' => 'open sans;normal;400;100%;U+0-10FFFF',
+			),
+			'Removes double quotes from fontFamilies' => array(
+				'settings'      => array(
+					'fontFamily' => '"Open Sans"',
+				),
+				'expected_slug' => 'open sans;normal;400;100%;U+0-10FFFF',
+			),
+			'Removes single quotes from fontFamilies' => array(
+				'settings'      => array(
+					'fontFamily' => "'Open Sans'",
+				),
+				'expected_slug' => 'open sans;normal;400;100%;U+0-10FFFF',
+			),
+			'Removes spaces between comma separated font families' => array(
+				'settings'      => array(
+					'fontFamily' => 'Open Sans, serif',
+				),
+				'expected_slug' => 'open sans,serif;normal;400;100%;U+0-10FFFF',
+			),
+			'Removes tabs between comma separated font families' => array(
+				'settings'      => array(
+					'fontFamily' => "Open Sans,\tserif",
+				),
+				'expected_slug' => 'open sans,serif;normal;400;100%;U+0-10FFFF',
+			),
+			'Removes new lines between comma separated font families' => array(
+				'settings'      => array(
+					'fontFamily' => "Open Sans,\nserif",
+				),
+				'expected_slug' => 'open sans,serif;normal;400;100%;U+0-10FFFF',
+			),
+		);
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
index a7ea2870957e9..b06ae3c8d5354 100644
--- a/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
+++ b/phpunit/tests/fonts/font-library/wpFontLibrary/registerFontCollection.php
@@ -29,9 +29,9 @@ public function test_should_return_error_if_slug_is_missing() {
 			'description' => 'My Collection Description',
 			'src'         => 'my-collection-data.json',
 		);
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config slug is required as a non-empty string.' );
-		WP_Font_Library::register_font_collection( $config );
+		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::is_config_valid' );
+		$collection = WP_Font_Library::register_font_collection( $config );
+		$this->assertWPError( $collection, 'A WP_Error should be returned.' );
 	}
 
 	public function test_should_return_error_if_name_is_missing() {
@@ -40,16 +40,16 @@ public function test_should_return_error_if_name_is_missing() {
 			'description' => 'My Collection Description',
 			'src'         => 'my-collection-data.json',
 		);
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config name is required as a non-empty string.' );
-		WP_Font_Library::register_font_collection( $config );
+		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::is_config_valid' );
+		$collection = WP_Font_Library::register_font_collection( $config );
+		$this->assertWPError( $collection, 'A WP_Error should be returned.' );
 	}
 
 	public function test_should_return_error_if_config_is_empty() {
 		$config = array();
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font Collection config options is required as a non-empty array.' );
-		WP_Font_Library::register_font_collection( $config );
+		$this->setExpectedIncorrectUsage( 'WP_Font_Collection::is_config_valid' );
+		$collection = WP_Font_Library::register_font_collection( $config );
+		$this->assertWPError( $collection, 'A WP_Error should be returned.' );
 	}
 
 	public function test_should_return_error_if_slug_is_repeated() {
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController.php
new file mode 100644
index 0000000000000..164f88f3f7b4b
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController.php
@@ -0,0 +1,163 @@
+<?php
+/**
+ * Unit tests covering WP_REST_Font_Collections_Controller functionality.
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.5.0
+ *
+ * @group restapi
+ *
+ * @coversDefaultClass WP_REST_Font_Collections_Controller
+ */
+class WP_REST_Font_Collections_Controller_Test extends WP_Test_REST_Controller_Testcase {
+	protected static $admin_id;
+	protected static $editor_id;
+	protected static $mock_file;
+
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$admin_id  = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		self::$editor_id = $factory->user->create(
+			array(
+				'role' => 'editor',
+			)
+		);
+		$mock_file       = wp_tempnam( 'my-collection-data-' );
+		file_put_contents( $mock_file, '{"font_families": [ "mock" ], "categories": [ "mock" ] }' );
+
+		wp_register_font_collection(
+			array(
+				'name' => 'My Collection',
+				'slug' => 'mock-col-slug',
+				'src'  => $mock_file,
+			)
+		);
+	}
+
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$editor_id );
+		wp_unregister_font_collection( 'mock-col-slug' );
+	}
+
+
+	/**
+	 * @covers WP_REST_Font_Collections_Controller::register_routes
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+		$this->assertCount( 1, $routes['/wp/v2/font-collections'], 'Rest server has not the collections path initialized.' );
+		$this->assertCount( 1, $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'], 'Rest server has not the collection path initialized.' );
+
+		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections'][0]['methods'], 'Rest server has not the GET method for collections intialized.' );
+		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'][0]['methods'], 'Rest server has not the GET method for collection intialized.' );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Collections_Controller::get_items
+	 */
+	public function test_get_items() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections' );
+		$response = rest_get_server()->dispatch( $request );
+		$content  = $response->get_data();
+		$this->assertIsArray( $content );
+		$this->assertEquals( 200, $response->get_status() );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Collections_Controller::get_item
+	 */
+	public function test_get_item() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/mock-col-slug' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 200, $response->get_status(), 'Response code is not 200' );
+
+		$response_data = $response->get_data();
+		$this->assertArrayHasKey( 'name', $response_data, 'Response data does not have the name key.' );
+		$this->assertArrayHasKey( 'slug', $response_data, 'Response data does not have the slug key.' );
+		$this->assertArrayHasKey( 'description', $response_data, 'Response data does not have the description key.' );
+		$this->assertArrayHasKey( 'font_families', $response_data, 'Response data does not have the font_families key.' );
+		$this->assertArrayHasKey( 'categories', $response_data, 'Response data does not have the categories key.' );
+
+		$this->assertIsString( $response_data['name'], 'name is not a string.' );
+		$this->assertIsString( $response_data['slug'], 'slug is not a string.' );
+		$this->assertIsString( $response_data['description'], 'description is not a string.' );
+
+		$this->assertIsArray( $response_data['font_families'], 'font_families is not an array.' );
+		$this->assertIsArray( $response_data['categories'], 'categories is not an array.' );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Collections_Controller::get_item
+	 */
+	public function test_get_item_invalid_slug() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/non-existing-collection' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'font_collection_not_found', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Collections_Controller::get_item
+	 */
+	public function test_get_item_invalid_id_permission() {
+		$request = new WP_REST_Request( 'GET', '/wp/v2/font-collections/mock-col-slug' );
+
+		wp_set_current_user( 0 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 401, 'Response code should be 401 for non-authenticated users.' );
+
+		wp_set_current_user( self::$editor_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 403, 'Response code should be 403 for users without the right permissions.' );
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_context_param() {
+		// Controller does not use get_context_param().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_create_item() {
+		// Controller does not use test_create_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_update_item() {
+		// Controller does not use test_update_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_delete_item() {
+		// Controller does not use test_delete_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_prepare_item() {
+		// Controller does not use test_prepare_item().
+	}
+
+	/**
+	 * @doesNotPerformAssertions
+	 */
+	public function test_get_item_schema() {
+		// Controller does not use test_get_item_schema().
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/base.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/base.php
deleted file mode 100644
index 2469d71dc79ce..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/base.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Test Case for WP_REST_Font_Collections_Controller tests.
- *
- * @package WordPress
- * @subpackage Font Library
- */
-abstract class WP_REST_Font_Collections_Controller_UnitTestCase extends WP_UnitTestCase {
-
-	/**
-	 * Fonts directory.
-	 *
-	 * @var string
-	 */
-	protected static $fonts_dir;
-
-
-	public function set_up() {
-		parent::set_up();
-
-		// Create a user with administrator role.
-		$admin_id = $this->factory->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-		wp_set_current_user( $admin_id );
-	}
-
-	/**
-	 * Tear down each test method.
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		// Reset $collections static property of WP_Font_Library class.
-		$reflection = new ReflectionClass( 'WP_Font_Library' );
-		$property   = $reflection->getProperty( 'collections' );
-		$property->setAccessible( true );
-		$property->setValue( null, array() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
deleted file mode 100644
index c9d003389997b..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollection.php
+++ /dev/null
@@ -1,126 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Collections_Controller::get_font_collection().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Collections_Controller::get_font_collection
- */
-
-class Tests_Fonts_WPRESTFontCollectionsController_GetFontCollection extends WP_REST_Font_Collections_Controller_UnitTestCase {
-
-	/**
-	 * Register mock collections.
-	 */
-	public function set_up() {
-		parent::set_up();
-		// Mock font collection data file.
-		$mock_file = wp_tempnam( 'one-collection-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
-		// Mock the wp_remote_request() function.
-		add_filter( 'pre_http_request', array( $this, 'mock_request' ), 10, 3 );
-
-		$config_with_file = array(
-			'slug'        => 'one-collection',
-			'name'        => 'One Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => $mock_file,
-		);
-		wp_register_font_collection( $config_with_file );
-
-		$config_with_url = array(
-			'slug'        => 'collection-with-url',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => 'https://wordpress.org/fonts/mock-font-collection.json',
-		);
-
-		wp_register_font_collection( $config_with_url );
-
-		$config_with_non_existing_file = array(
-			'slug'        => 'collection-with-non-existing-file',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => '/home/non-existing-file.json',
-		);
-
-		wp_register_font_collection( $config_with_non_existing_file );
-
-		$config_with_non_existing_url = array(
-			'slug'        => 'collection-with-non-existing-url',
-			'name'        => 'Another Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => 'https://non-existing-url-1234x.com.ar/fake-path/missing-file.json',
-		);
-
-		wp_register_font_collection( $config_with_non_existing_url );
-	}
-
-	public function mock_request( $preempt, $args, $url ) {
-		// Check if it's the URL you want to mock.
-		if ( 'https://wordpress.org/fonts/mock-font-collection.json' === $url ) {
-
-			// Mock the response body.
-			$mock_collection_data = array(
-				'fontFamilies' => 'mock',
-				'categories'   => 'mock',
-			);
-
-			return array(
-				'body'     => json_encode( $mock_collection_data ),
-				'response' => array(
-					'code' => 200,
-				),
-			);
-		}
-
-		// For any other URL, return false which ensures the request is made as usual (or you can return other mock data).
-		return false;
-	}
-
-	public function tear_down() {
-		// Remove the mock to not affect other tests.
-		remove_filter( 'pre_http_request', array( $this, 'mock_request' ) );
-
-		parent::tear_down();
-	}
-
-	public function test_get_font_collection_from_file() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/one-collection' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertArrayHasKey( 'data', $data, 'The response data does not have the key with the file data.' );
-		$this->assertSame( array( 'this is mock data' => true ), $data['data'], 'The response data does not have the expected file data.' );
-	}
-
-	public function test_get_font_collection_from_url() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/collection-with-url' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertArrayHasKey( 'data', $data, 'The response data does not have the key with the file data.' );
-	}
-
-	public function test_get_non_existing_collection_should_return_404() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/non-existing-collection-id' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 404, $response->get_status() );
-	}
-
-	public function test_get_non_existing_file_should_return_500() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/collection-with-non-existing-file' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 500, $response->get_status() );
-	}
-
-	public function test_get_non_existing_url_should_return_500() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections/collection-with-non-existing-url' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 500, $response->get_status() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
deleted file mode 100644
index 0a8d24e8f392b..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/getFontCollections.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Collections_Controller::get_font_collections().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Collections_Controller::get_font_collections
- */
-
-class Tests_Fonts_WPRESTFontCollectionsController_GetFontCollections extends WP_REST_Font_Collections_Controller_UnitTestCase {
-
-	public function test_get_font_collections_with_no_collection_registered() {
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections' );
-		$response = rest_get_server()->dispatch( $request );
-		$this->assertSame( 200, $response->get_status() );
-		$this->assertSame( array(), $response->get_data() );
-	}
-
-	public function test_get_font_collections() {
-		// Mock font collection data file.
-		$mock_file = wp_tempnam( 'my-collection-data-' );
-		file_put_contents( $mock_file, '{"this is mock data":true}' );
-
-		// Add a font collection.
-		$config = array(
-			'slug'        => 'my-font-collection',
-			'name'        => 'My Font Collection',
-			'description' => 'Demo about how to a font collection to your WordPress Font Library.',
-			'src'         => $mock_file,
-		);
-		wp_register_font_collection( $config );
-
-		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-collections' );
-		$response = rest_get_server()->dispatch( $request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertCount( 1, $data, 'The response data is not an array with one element.' );
-		$this->assertArrayHasKey( 'slug', $data[0], 'The response data does not have the key with the collection slug.' );
-		$this->assertArrayHasKey( 'name', $data[0], 'The response data does not have the key with the collection name.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php b/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
deleted file mode 100644
index fb100a400fb4c..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontCollectionsController/registerRoutes.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Collections_Controller::register_routes().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Collections_Controller::register_routes
- */
-
-class Tests_Fonts_WPRESTFontCollectionsController_RegisterRoutes extends WP_UnitTestCase {
-
-	public function test_register_routes() {
-		$routes = rest_get_server()->get_routes();
-		$this->assertCount( 1, $routes['/wp/v2/font-collections'], 'Rest server has not the collections path initialized.' );
-		$this->assertCount( 1, $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'], 'Rest server has not the collection path initialized.' );
-
-		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections'][0]['methods'], 'Rest server has not the GET method for collections intialized.' );
-		$this->assertArrayHasKey( 'GET', $routes['/wp/v2/font-collections/(?P<slug>[\/\w-]+)'][0]['methods'], 'Rest server has not the GET method for collection intialized.' );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFacesController.php b/phpunit/tests/fonts/font-library/wpRestFontFacesController.php
new file mode 100644
index 0000000000000..1904a17228bdc
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpRestFontFacesController.php
@@ -0,0 +1,887 @@
+<?php
+/**
+ * Unit tests covering WP_REST_Font_Faces_Controller_Test functionality.
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.5.0
+ *
+ * @group restapi
+ *
+ * @coversDefaultClass WP_REST_Font_Faces_Controller_Test
+ */
+class WP_REST_Font_Faces_Controller_Test extends WP_Test_REST_Controller_Testcase {
+	protected static $admin_id;
+	protected static $editor_id;
+
+	protected static $font_family_id;
+	protected static $other_font_family_id;
+
+	protected static $font_face_id1;
+	protected static $font_face_id2;
+
+	protected static $default_settings = array(
+		'fontFamily' => '"Open Sans"',
+		'fontWeight' => '400',
+		'fontStyle'  => 'normal',
+		'src'        => 'https://fonts.gstatic.com/s/open-sans/v30/KFOkCnqEu92Fr1MmgWxPKTM1K9nz.ttf',
+	);
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$font_family_id       = WP_REST_Font_Families_Controller_Test::create_font_family_post();
+		self::$other_font_family_id = WP_REST_Font_Families_Controller_Test::create_font_family_post();
+
+		self::$font_face_id1 = self::create_font_face_post(
+			self::$font_family_id,
+			array(
+				'fontFamily' => '"Open Sans"',
+				'fontWeight' => '400',
+				'fontStyle'  => 'normal',
+				'src'        => home_url( '/wp-content/fonts/open-sans-medium.ttf' ),
+			)
+		);
+		self::$font_face_id2 = self::create_font_face_post(
+			self::$font_family_id,
+			array(
+				'fontFamily' => '"Open Sans"',
+				'fontWeight' => '900',
+				'fontStyle'  => 'normal',
+				'src'        => home_url( '/wp-content/fonts/open-sans-bold.ttf' ),
+			)
+		);
+
+		self::$admin_id  = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		self::$editor_id = $factory->user->create(
+			array(
+				'role' => 'editor',
+			)
+		);
+	}
+
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$editor_id );
+	}
+
+	public static function create_font_face_post( $parent_id, $settings = array() ) {
+		$settings = array_merge( self::$default_settings, $settings );
+		$title    = WP_Font_Family_Utils::get_font_face_slug( $settings );
+		return self::factory()->post->create(
+			wp_slash(
+				array(
+					'post_type'    => 'wp_font_face',
+					'post_status'  => 'publish',
+					'post_title'   => $title,
+					'post_name'    => sanitize_title( $title ),
+					'post_content' => wp_json_encode( $settings ),
+					'post_parent'  => $parent_id,
+				)
+			)
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::register_routes
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayHasKey(
+			'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces',
+			$routes,
+			'Font faces collection for the given font family does not exist'
+		);
+		$this->assertCount(
+			2,
+			$routes['/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces'],
+			'Font faces collection for the given font family does not have exactly two elements'
+		);
+		$this->assertArrayHasKey(
+			'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)',
+			$routes,
+			'Single font face route for the given font family does not exist'
+		);
+		$this->assertCount(
+			2,
+			$routes['/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)'],
+			'Font faces collection for the given font family does not have exactly two elements'
+		);
+	}
+
+	public function test_font_faces_no_autosave_routes() {
+		// @core-merge: Enable this test.
+		$this->markTestSkipped( 'This test only works with WP 6.4 and above. Enable it once 6.5 is released.' );
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayNotHasKey(
+			'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<id>[\d]+)/autosaves',
+			$routes,
+			'Font faces autosaves route exists.'
+		);
+		$this->assertArrayNotHasKey(
+			'/wp/v2/font-families/(?P<font_family_id>[\d]+)/font-faces/(?P<parent>[\d]+)/autosaves/(?P<id>[\d]+)',
+			$routes,
+			'Font faces autosaves by id route exists.'
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_context_param
+	 */
+	public function test_context_param() {
+		// Collection.
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] );
+		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
+		$this->assertSame( array( 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
+
+		// Single.
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] );
+		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
+		$this->assertSame( array( 'embed', 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 2, $data );
+		$this->assertArrayHasKey( '_links', $data[0] );
+		$this->check_font_face_data( $data[0], self::$font_face_id2, $data[0]['_links'] );
+		$this->assertArrayHasKey( '_links', $data[1] );
+		$this->check_font_face_data( $data[1], self::$font_face_id1, $data[1]['_links'] );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items_no_permission() {
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items_missing_parent() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/font-faces' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->check_font_face_data( $data, self::$font_face_id1, $response->get_links() );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::prepare_item_for_response
+	 */
+	public function test_get_item_removes_extra_settings() {
+		$font_face_id = self::create_font_face_post( self::$font_family_id, array( 'extra' => array() ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertArrayNotHasKey( 'extra', $data['font_face_settings'] );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::prepare_item_for_response
+	 */
+	public function test_get_item_malformed_post_content_returns_empty_settings() {
+		$font_face_id = wp_insert_post(
+			array(
+				'post_type'    => 'wp_font_face',
+				'post_parent'  => self::$font_family_id,
+				'post_status'  => 'publish',
+				'post_content' => 'invalid',
+			)
+		);
+
+		$empty_settings = array(
+			'fontFamily' => '',
+			'src'        => array(),
+		);
+
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( $empty_settings, $data['font_face_settings'] );
+
+		wp_delete_post( $font_face_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_invalid_font_face_id() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_no_permission() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id1 );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_missing_parent() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_valid_parent_id() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( self::$font_family_id, $data['parent'], 'The returned parent id should match the font family id.' );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_invalid_parent_id() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$other_font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_font_face_parent_id_mismatch', $response, 404 );
+
+		$expected_message = 'The font face does not belong to the specified font family with id of "' . self::$other_font_family_id . '"';
+		$this->assertSame( $expected_message, $response->as_error()->get_error_messages()[0], 'The message must contain the correct parent ID.' );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item() {
+		wp_set_current_user( self::$admin_id );
+		$files = $this->setup_font_file_upload( array( 'woff2' ) );
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array(
+					'fontFamily' => '"Open Sans"',
+					'fontWeight' => '200',
+					'fontStyle'  => 'normal',
+					'src'        => array_keys( $files )[0],
+				)
+			)
+		);
+		$request->set_file_params( $files );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->check_font_face_data( $data, $data['id'], $response->get_links() );
+		$this->check_file_meta( $data['id'], array( $data['font_face_settings']['src'] ) );
+
+		$settings = $data['font_face_settings'];
+		unset( $settings['src'] );
+		$this->assertSame(
+			$settings,
+			array(
+				'fontFamily' => '"Open Sans"',
+				'fontWeight' => '200',
+				'fontStyle'  => 'normal',
+			)
+		);
+
+		$this->assertSame( self::$font_family_id, $data['parent'], 'The returned parent id should match the font family id.' );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_with_multiple_font_files() {
+		wp_set_current_user( self::$admin_id );
+		$files = $this->setup_font_file_upload( array( 'ttf', 'otf', 'woff', 'woff2' ) );
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array(
+					'fontFamily' => '"Open Sans"',
+					'fontWeight' => '200',
+					'fontStyle'  => 'normal',
+					'src'        => array_keys( $files ),
+				)
+			)
+		);
+		$request->set_file_params( $files );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->check_font_face_data( $data, $data['id'], $response->get_links() );
+		$this->check_file_meta( $data['id'], $data['font_face_settings']['src'] );
+
+		$settings = $data['font_face_settings'];
+		$this->assertCount( 4, $settings['src'] );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_invalid_file_type() {
+		$image_file = DIR_TESTDATA . '/images/canola.jpg';
+		$image_path = wp_tempnam( 'canola.jpg' );
+		copy( $image_file, $image_path );
+
+		$files = array(
+			'file-0' => array(
+				'name'      => 'canola.jpg',
+				'full_path' => 'canola.jpg',
+				'type'      => 'font/woff2',
+				'tmp_name'  => $image_path,
+				'error'     => 0,
+				'size'      => filesize( $image_path ),
+			),
+		);
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array_merge(
+					self::$default_settings,
+					array(
+						'fontWeight' => '200',
+						'src'        => array_keys( $files )[0],
+					)
+				)
+			)
+		);
+		$request->set_file_params( $files );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_font_upload_invalid_file_type', $response, 400 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_with_url_src() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array(
+					'fontFamily' => '"Open Sans"',
+					'fontWeight' => '200',
+					'fontStyle'  => 'normal',
+					'src'        => 'https://fonts.gstatic.com/s/open-sans/v30/KFOkCnqEu92Fr1MmgWxPKTM1K9nz.ttf',
+				)
+			)
+		);
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->check_font_face_data( $data, $data['id'], $response->get_links() );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_with_all_properties() {
+		wp_set_current_user( self::$admin_id );
+
+		$properties = array(
+			'fontFamily'            => '"Open Sans"',
+			'fontWeight'            => '300 500',
+			'fontStyle'             => 'oblique 30deg 50deg',
+			'fontDisplay'           => 'swap',
+			'fontStretch'           => 'expanded',
+			'ascentOverride'        => '70%',
+			'descentOverride'       => '30%',
+			'fontVariant'           => 'normal',
+			'fontFeatureSettings'   => '"swsh" 2',
+			'fontVariationSettings' => '"xhgt" 0.7',
+			'lineGapOverride'       => '10%',
+			'sizeAdjust'            => '90%',
+			'unicodeRange'          => 'U+0025-00FF, U+4??',
+			'preview'               => 'https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg',
+			'src'                   => 'https://fonts.gstatic.com/s/open-sans/v30/KFOkCnqEu92Fr1MmgWxPKTM1K9nz.ttf',
+		);
+
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_face_settings', wp_json_encode( $properties ) );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->assertArrayHasKey( 'font_face_settings', $data );
+		$this->assertSame( $properties, $data['font_face_settings'] );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_missing_parent() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/font-faces' );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode( array_merge( self::$default_settings, array( 'fontWeight' => '100' ) ) )
+		);
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_with_duplicate_properties() {
+		$settings     = array(
+			'fontFamily' => '"Open Sans"',
+			'fontWeight' => '200',
+			'fontStyle'  => 'italic',
+			'src'        => home_url( '/wp-content/fonts/open-sans-italic-light.ttf' ),
+		);
+		$font_face_id = self::create_font_face_post( self::$font_family_id, $settings );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'font_face_settings', wp_json_encode( $settings ) );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_duplicate_font_face', $response, 400 );
+		$expected_message = 'A font face matching those settings already exists.';
+		$message          = $response->as_error()->get_error_messages()[0];
+		$this->assertSame( $expected_message, $message );
+
+		wp_delete_post( $font_face_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_request
+	 */
+	public function test_create_item_default_theme_json_version() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array(
+					'fontFamily' => '"Open Sans"',
+					'fontWeight' => '200',
+					'src'        => 'https://fonts.gstatic.com/s/open-sans/v30/KFOkCnqEu92Fr1MmgWxPKTM1K9nz.ttf',
+				)
+			)
+		);
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->assertArrayHasKey( 'theme_json_version', $data );
+		$this->assertSame( 2, $data['theme_json_version'], 'The default theme.json version should be 2.' );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @dataProvider data_create_item_invalid_theme_json_version
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_invalid_theme_json_version( $theme_json_version ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', $theme_json_version );
+		$request->set_param( 'font_face_settings', '' );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+	}
+
+	public function data_create_item_invalid_theme_json_version() {
+		return array(
+			array( 1 ),
+			array( 3 ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_create_item_invalid_settings
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_settings
+	 */
+	public function test_create_item_invalid_settings( $settings ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_face_settings', wp_json_encode( $settings ) );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+	}
+
+	public function data_create_item_invalid_settings() {
+		return array(
+			'Missing fontFamily'     => array(
+				'settings' => array_diff_key( self::$default_settings, array( 'fontFamily' => '' ) ),
+			),
+			'Empty fontFamily'       => array(
+				'settings' => array_merge( self::$default_settings, array( 'fontFamily' => '' ) ),
+			),
+			'Wrong fontFamily type'  => array(
+				'settings' => array_merge( self::$default_settings, array( 'fontFamily' => 1234 ) ),
+			),
+			'Invalid fontDisplay'    => array(
+				'settings' => array_merge( self::$default_settings, array( 'fontDisplay' => 'invalid' ) ),
+			),
+			'Missing src'            => array(
+				'settings' => array_diff_key( self::$default_settings, array( 'src' => '' ) ),
+			),
+			'Empty src string'       => array(
+				'settings' => array_merge( self::$default_settings, array( 'src' => '' ) ),
+			),
+			'Empty src array'        => array(
+				'settings' => array_merge( self::$default_settings, array( 'src' => array() ) ),
+			),
+			'Empty src array values' => array(
+				'settings' => array_merge( self::$default_settings, array( '', '' ) ),
+			),
+			'Wrong src type'         => array(
+				'settings' => array_merge( self::$default_settings, array( 'src' => 1234 ) ),
+			),
+			'Wrong src array types'  => array(
+				'settings' => array_merge( self::$default_settings, array( 'src' => array( 1234, 5678 ) ) ),
+			),
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_settings
+	 */
+	public function test_create_item_invalid_settings_json() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_face_settings', 'invalid' );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$expected_message = 'font_face_settings parameter must be a valid JSON string.';
+		$message          = $response->as_error()->get_all_error_data()[0]['params']['font_face_settings'];
+		$this->assertSame( $expected_message, $message );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_settings
+	 */
+	public function test_create_item_invalid_file_src() {
+		$files = $this->setup_font_file_upload( array( 'woff2' ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param(
+			'font_face_settings',
+			wp_json_encode(
+				array_merge( self::$default_settings, array( 'src' => 'invalid' ) )
+			)
+		);
+		$request->set_file_params( $files );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$expected_message = 'File ' . array_keys( $files )[0] . ' must be used in font_face_settings[src].';
+		$message          = $response->as_error()->get_all_error_data()[0]['params']['font_face_settings'];
+		$this->assertSame( $expected_message, $message );
+	}
+
+	/**
+	 * @dataProvider data_create_item_santize_font_family
+	 *
+	 * @covers WP_REST_Font_Face_Controller::sanitize_font_face_settings
+	 */
+	public function test_create_item_santize_font_family( $font_family_setting, $expected ) {
+		$settings = array_merge( self::$default_settings, array( 'fontFamily' => $font_family_setting ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$request->set_param( 'font_face_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->assertSame( $expected, $data['font_face_settings']['fontFamily'] );
+	}
+
+	public function data_create_item_santize_font_family() {
+		return array(
+			array( 'Libre Barcode 128 Text', '"Libre Barcode 128 Text"' ),
+			array( 'B612 Mono', '"B612 Mono"' ),
+			array( 'Open Sans, Noto Sans, sans-serif', '"Open Sans", "Noto Sans", sans-serif' ),
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	// public function test_create_item_no_permission() {}
+
+	public function test_update_item() {
+		$request  = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_no_route', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item() {
+		wp_set_current_user( self::$admin_id );
+		$font_face_id = self::create_font_face_post( self::$font_family_id );
+		$request      = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$request->set_param( 'force', true );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertNull( get_post( $font_face_id ) );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_no_trash() {
+		wp_set_current_user( self::$admin_id );
+		$font_face_id = self::create_font_face_post( self::$font_family_id );
+
+		// Attempt trashing.
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
+
+		$request->set_param( 'force', 'false' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
+
+		// Ensure the post still exists.
+		$post = get_post( $font_face_id );
+		$this->assertNotEmpty( $post );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_invalid_font_face_id() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+		$request->set_param( 'force', true );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete
+	 */
+	public function test_delete_item_missing_parent() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER . '/font-faces/' . self::$font_face_id1 );
+		$request->set_param( 'force', true );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_post_invalid_parent', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_delete_item_invalid_parent_id() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$other_font_family_id . '/font-faces/' . self::$font_face_id1 );
+		$request->set_param( 'force', true );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_font_face_parent_id_mismatch', $response, 404 );
+
+		$expected_message = 'The font face does not belong to the specified font family with id of "' . self::$other_font_family_id . '"';
+		$this->assertSame( $expected_message, $response->as_error()->get_error_messages()[0], 'The message must contain the correct parent ID.' );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_no_permissions() {
+		$font_face_id = $this->create_font_face_post( self::$font_family_id );
+
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_delete', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . $font_face_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_delete', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::prepare_item_for_response
+	 */
+	public function test_prepare_item() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces/' . self::$font_face_id2 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->check_font_face_data( $data, self::$font_face_id2, $response->get_links() );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item_schema
+	 */
+	public function test_get_item_schema() {
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families/' . self::$font_family_id . '/font-faces' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$properties = $data['schema']['properties'];
+		$this->assertCount( 4, $properties );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'theme_json_version', $properties );
+		$this->assertArrayHasKey( 'parent', $properties );
+		$this->assertArrayHasKey( 'font_face_settings', $properties );
+	}
+
+	protected function check_font_face_data( $data, $post_id, $links ) {
+		$post = get_post( $post_id );
+
+		$this->assertArrayHasKey( 'id', $data );
+		$this->assertSame( $post->ID, $data['id'] );
+
+		$this->assertArrayHasKey( 'parent', $data );
+		$this->assertSame( $post->post_parent, $data['parent'] );
+
+		$this->assertArrayHasKey( 'theme_json_version', $data );
+		$this->assertSame( WP_Theme_JSON::LATEST_SCHEMA, $data['theme_json_version'] );
+
+		$this->assertArrayHasKey( 'font_face_settings', $data );
+		$this->assertSame( $post->post_content, wp_json_encode( $data['font_face_settings'] ) );
+
+		$this->assertNotEmpty( $links );
+		$this->assertSame( rest_url( 'wp/v2/font-families/' . $post->post_parent . '/font-faces/' . $post->ID ), $links['self'][0]['href'] );
+		$this->assertSame( rest_url( 'wp/v2/font-families/' . $post->post_parent . '/font-faces' ), $links['collection'][0]['href'] );
+		$this->assertSame( rest_url( 'wp/v2/font-families/' . $post->post_parent ), $links['parent'][0]['href'] );
+	}
+
+	protected function check_file_meta( $font_face_id, $srcs ) {
+		$file_meta = get_post_meta( $font_face_id, '_wp_font_face_file' );
+
+		foreach ( $srcs as $src ) {
+			$file_name = basename( $src );
+			$this->assertContains( $file_name, $file_meta, 'The uploaded font file path should be saved in the post meta.' );
+		}
+	}
+
+	protected function setup_font_file_upload( $formats ) {
+		$files = array();
+		foreach ( $formats as $format ) {
+			// @core-merge Use `DIR_TESTDATA` instead of `GUTENBERG_DIR_TESTDATA`.
+			$font_file = GUTENBERG_DIR_TESTDATA . 'fonts/OpenSans-Regular.' . $format;
+			$font_path = wp_tempnam( 'OpenSans-Regular.' . $format );
+			copy( $font_file, $font_path );
+
+			$files[ 'file-' . count( $files ) ] = array(
+				'name'      => 'OpenSans-Regular.' . $format,
+				'full_path' => 'OpenSans-Regular.' . $format,
+				'type'      => 'font/' . $format,
+				'tmp_name'  => $font_path,
+				'error'     => 0,
+				'size'      => filesize( $font_path ),
+			);
+		}
+
+		return $files;
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php
new file mode 100644
index 0000000000000..6e6a822a9881f
--- /dev/null
+++ b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController.php
@@ -0,0 +1,866 @@
+<?php
+/**
+ * Unit tests covering WP_REST_Font_Families_Controller_Test functionality.
+ *
+ * @package WordPress
+ * @subpackage REST_API
+ * @since 6.5.0
+ *
+ * @group restapi
+ *
+ * @coversDefaultClass WP_REST_Font_Families_Controller_Test
+ */
+class WP_REST_Font_Families_Controller_Test extends WP_Test_REST_Controller_Testcase {
+	protected static $admin_id;
+	protected static $editor_id;
+
+	protected static $font_family_id1;
+	protected static $font_family_id2;
+
+	protected static $font_face_id1;
+	protected static $font_face_id2;
+
+	protected static $default_settings = array(
+		'name'       => 'Open Sans',
+		'slug'       => 'open-sans',
+		'fontFamily' => '"Open Sans", sans-serif',
+		'preview'    => 'https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg',
+	);
+
+	public static function wpSetUpBeforeClass( WP_UnitTest_Factory $factory ) {
+		self::$admin_id  = $factory->user->create(
+			array(
+				'role' => 'administrator',
+			)
+		);
+		self::$editor_id = $factory->user->create(
+			array(
+				'role' => 'editor',
+			)
+		);
+
+		self::$font_family_id1 = self::create_font_family_post(
+			array(
+				'name'       => 'Open Sans',
+				'slug'       => 'open-sans',
+				'fontFamily' => '"Open Sans", sans-serif',
+				'preview'    => 'https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg',
+			)
+		);
+		self::$font_family_id2 = self::create_font_family_post(
+			array(
+				'name'       => 'Helvetica',
+				'slug'       => 'helvetica',
+				'fontFamily' => 'Helvetica, Arial, sans-serif',
+			)
+		);
+		self::$font_face_id1   = WP_REST_Font_Faces_Controller_Test::create_font_face_post(
+			self::$font_family_id1,
+			array(
+				'fontFamily' => '"Open Sans"',
+				'fontWeight' => '400',
+				'fontStyle'  => 'normal',
+				'src'        => home_url( '/wp-content/fonts/open-sans-medium.ttf' ),
+			)
+		);
+		self::$font_face_id2   = WP_REST_Font_Faces_Controller_Test::create_font_face_post(
+			self::$font_family_id1,
+			array(
+				'fontFamily' => '"Open Sans"',
+				'fontWeight' => '900',
+				'fontStyle'  => 'normal',
+				'src'        => home_url( '/wp-content/fonts/open-sans-bold.ttf' ),
+			)
+		);
+	}
+
+	public static function wpTearDownAfterClass() {
+		self::delete_user( self::$admin_id );
+		self::delete_user( self::$editor_id );
+	}
+
+	public static function create_font_family_post( $settings = array() ) {
+		$settings = array_merge( self::$default_settings, $settings );
+		return self::factory()->post->create(
+			wp_slash(
+				array(
+					'post_type'    => 'wp_font_family',
+					'post_status'  => 'publish',
+					'post_title'   => $settings['name'],
+					'post_name'    => $settings['slug'],
+					'post_content' => wp_json_encode(
+						array(
+							'fontFamily' => $settings['fontFamily'],
+							'preview'    => $settings['preview'],
+						)
+					),
+				)
+			)
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::register_routes
+	 */
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayHasKey(
+			'/wp/v2/font-families',
+			$routes,
+			'Font faces collection for the given font family does not exist'
+		);
+		$this->assertCount(
+			2,
+			$routes['/wp/v2/font-families'],
+			'Font faces collection for the given font family does not have exactly two elements'
+		);
+		$this->assertArrayHasKey(
+			'/wp/v2/font-families/(?P<id>[\d]+)',
+			$routes,
+			'Single font face route for the given font family does not exist'
+		);
+		$this->assertCount(
+			3,
+			$routes['/wp/v2/font-families/(?P<id>[\d]+)'],
+			'Font faces collection for the given font family does not have exactly two elements'
+		);
+	}
+
+	public function test_font_families_no_autosave_routes() {
+		// @core-merge: Enable this test.
+		$this->markTestSkipped( 'This test only works with WP 6.4 and above. Enable it once 6.5 is released.' );
+		$routes = rest_get_server()->get_routes();
+		$this->assertArrayNotHasKey(
+			'/wp/v2/font-families/(?P<id>[\d]+)/autosaves',
+			$routes,
+			'Font families autosaves route exists.'
+		);
+		$this->assertArrayNotHasKey(
+			'/wp/v2/font-families/(?P<parent>[\d]+)/autosaves/(?P<id>[\d]+)',
+			$routes,
+			'Font families autosaves by id route exists.'
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Families_Controller::get_context_param
+	 */
+	public function test_context_param() {
+		// Collection.
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] );
+		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
+		$this->assertSame( array( 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
+
+		// Single.
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+		$this->assertArrayNotHasKey( 'allow_batch', $data['endpoints'][0] );
+		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
+		$this->assertSame( array( 'edit' ), $data['endpoints'][0]['args']['context']['enum'] );
+	}
+
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 2, $data );
+		$this->assertArrayHasKey( '_links', $data[0] );
+		$this->check_font_family_data( $data[0], self::$font_family_id2, $data[0]['_links'] );
+		$this->assertArrayHasKey( '_links', $data[1] );
+		$this->check_font_family_data( $data[1], self::$font_family_id1, $data[1]['_links'] );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items_by_slug() {
+		$font_family = get_post( self::$font_family_id2 );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/font-families' );
+		$request->set_param( 'slug', $font_family->post_name );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 1, $data );
+		$this->assertSame( $font_family->ID, $data[0]['id'] );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_items
+	 */
+	public function test_get_items_no_permission() {
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->check_font_family_data( $data, self::$font_family_id1, $response->get_links() );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::prepare_item_for_response
+	 */
+	public function test_get_item_embedded_font_faces() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$request->set_param( '_embed', true );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = rest_get_server()->response_to_data( $response, true );
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertArrayHasKey( '_embedded', $data );
+		$this->assertArrayHasKey( 'font_faces', $data['_embedded'] );
+		$this->assertCount( 2, $data['_embedded']['font_faces'] );
+
+		foreach ( $data['_embedded']['font_faces'] as $font_face ) {
+			$this->assertArrayHasKey( 'id', $font_face );
+
+			$font_face_request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id1 . '/font-faces/' . $font_face['id'] );
+			$font_face_response = rest_get_server()->dispatch( $font_face_request );
+			$font_face_data     = rest_get_server()->response_to_data( $font_face_response, true );
+
+			$this->assertSame( $font_face_data, $font_face );
+		}
+	}
+
+	/**
+	 * @covers WP_REST_Font_Families_Controller::get_item
+	 */
+	public function test_get_item_removes_extra_settings() {
+		$font_family_id = self::create_font_family_post( array( 'fontFace' => array() ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . $font_family_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertArrayNotHasKey( 'fontFace', $data['font_family_settings'] );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Families_Controller::prepare_item_for_response
+	 */
+	public function test_get_item_malformed_post_content_returns_empty_settings() {
+		$font_family_id = wp_insert_post(
+			array(
+				'post_type'    => 'wp_font_family',
+				'post_status'  => 'publish',
+				'post_content' => 'invalid',
+			)
+		);
+
+		$empty_settings = array(
+			'name'       => '',
+			// Slug will default to the post id.
+			'slug'       => (string) $font_family_id,
+			'fontFamily' => '',
+			'preview'    => '',
+		);
+
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . $font_family_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( $empty_settings, $data['font_family_settings'] );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_invalid_font_family_id() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item
+	 */
+	public function test_get_item_no_permission() {
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id1 );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_read', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item() {
+		$settings = array_merge( self::$default_settings, array( 'slug' => 'open-sans-2' ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->check_font_family_data( $data, $data['id'], $response->get_links() );
+
+		$reponse_settings = $data['font_family_settings'];
+		$this->assertSame( $settings, $reponse_settings );
+		$this->assertEmpty( $data['font_faces'] );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_request
+	 */
+	public function test_create_item_default_theme_json_version() {
+		$settings = array_merge( self::$default_settings, array( 'slug' => 'open-sans-2' ) );
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$this->assertArrayHasKey( 'theme_json_version', $data );
+		$this->assertSame( 2, $data['theme_json_version'], 'The default theme.json version should be 2.' );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	/**
+	 * @dataProvider data_create_item_invalid_theme_json_version
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_invalid_theme_json_version( $theme_json_version ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', $theme_json_version );
+		$request->set_param( 'font_family_settings', wp_json_encode( self::$default_settings ) );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+	}
+
+	public function data_create_item_invalid_theme_json_version() {
+		return array(
+			array( 1 ),
+			array( 3 ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_create_item_with_default_preview
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::sanitize_font_family_settings
+	 */
+	public function test_create_item_with_default_preview( $settings ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 201, $response->get_status() );
+		$response_settings = $data['font_family_settings'];
+		$this->assertArrayHasKey( 'preview', $response_settings );
+		$this->assertSame( '', $response_settings['preview'] );
+
+		wp_delete_post( $data['id'], true );
+	}
+
+	public function data_create_item_with_default_preview() {
+		$default_settings = array(
+			'name'       => 'Open Sans',
+			'slug'       => 'open-sans-2',
+			'fontFamily' => '"Open Sans", sans-serif',
+		);
+		return array(
+			'No preview param' => array(
+				'settings' => $default_settings,
+			),
+			'Empty preview'    => array(
+				'settings' => array_merge( $default_settings, array( 'preview' => '' ) ),
+			),
+		);
+	}
+
+	/**
+	 * @dataProvider data_create_item_invalid_settings
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::validate_create_font_face_settings
+	 */
+	public function test_create_item_invalid_settings( $settings ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+	}
+
+	public function data_create_item_invalid_settings() {
+		return array(
+			'Missing name'          => array(
+				'settings' => array_diff_key( self::$default_settings, array( 'name' => '' ) ),
+			),
+			'Empty name'            => array(
+				'settings' => array_merge( self::$default_settings, array( 'name' => '' ) ),
+			),
+			'Wrong name type'       => array(
+				'settings' => array_merge( self::$default_settings, array( 'name' => 1234 ) ),
+			),
+			'Missing slug'          => array(
+				'settings' => array_diff_key( self::$default_settings, array( 'slug' => '' ) ),
+			),
+			'Empty slug'            => array(
+				'settings' => array_merge( self::$default_settings, array( 'slug' => '' ) ),
+			),
+			'Wrong slug type'       => array(
+				'settings' => array_merge( self::$default_settings, array( 'slug' => 1234 ) ),
+			),
+			'Missing fontFamily'    => array(
+				'settings' => array_diff_key( self::$default_settings, array( 'fontFamily' => '' ) ),
+			),
+			'Empty fontFamily'      => array(
+				'settings' => array_merge( self::$default_settings, array( 'fontFamily' => '' ) ),
+			),
+			'Wrong fontFamily type' => array(
+				'settings' => array_merge( self::$default_settings, array( 'fontFamily' => 1234 ) ),
+			),
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Family_Controller::validate_font_family_settings
+	 */
+	public function test_create_item_invalid_settings_json() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_family_settings', 'invalid' );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$expected_message = 'font_family_settings parameter must be a valid JSON string.';
+		$message          = $response->as_error()->get_all_error_data()[0]['params']['font_family_settings'];
+		$this->assertSame( $expected_message, $message );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Family_Controller::create_item
+	 */
+	public function test_create_item_with_duplicate_slug() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'theme_json_version', 2 );
+		$request->set_param( 'font_family_settings', wp_json_encode( array_merge( self::$default_settings, array( 'slug' => 'helvetica' ) ) ) );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_duplicate_font_family', $response, 400 );
+		$expected_message = 'A font family with slug "helvetica" already exists.';
+		$message          = $response->as_error()->get_error_messages()[0];
+		$this->assertSame( $expected_message, $message );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::create_item
+	 */
+	public function test_create_item_no_permission() {
+		$settings = array_merge( self::$default_settings, array( 'slug' => 'open-sans-2' ) );
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_create', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
+		$request->set_param(
+			'font_family_settings',
+			wp_json_encode(
+				array(
+					'name'       => 'Open Sans',
+					'slug'       => 'open-sans',
+					'fontFamily' => '"Open Sans", sans-serif',
+					'preview'    => 'https://s.w.org/images/fonts/16.7/previews/open-sans/open-sans-400-normal.svg',
+				)
+			)
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_create', $response, 403 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Families_Controller::update_item
+	 */
+	public function test_update_item() {
+		wp_set_current_user( self::$admin_id );
+
+		$settings = array(
+			'name'       => 'Open Sans',
+			'fontFamily' => '"Open Sans, "Noto Sans", sans-serif',
+			'preview'    => 'https://s.w.org/images/fonts/16.9/previews/open-sans/open-sans-400-normal.svg',
+		);
+
+		$font_family_id = self::create_font_family_post( array( 'slug' => 'open-sans-2' ) );
+		$request        = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . $font_family_id );
+		$request->set_param(
+			'font_family_settings',
+			wp_json_encode( $settings )
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->check_font_family_data( $data, $font_family_id, $response->get_links() );
+
+		$expected_settings = array(
+			'name'       => $settings['name'],
+			'slug'       => 'open-sans-2',
+			'fontFamily' => $settings['fontFamily'],
+			'preview'    => $settings['preview'],
+		);
+		$this->assertSame( $expected_settings, $data['font_family_settings'] );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	/**
+	 * @dataProvider data_update_item_individual_settings
+	 * @covers WP_REST_Font_Families_Controller::update_item
+	 */
+	public function test_update_item_individual_settings( $settings ) {
+		wp_set_current_user( self::$admin_id );
+
+		$font_family_id = self::create_font_family_post();
+		$request        = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . $font_family_id );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$key   = key( $settings );
+		$value = current( $settings );
+		$this->assertArrayHasKey( $key, $data['font_family_settings'] );
+		$this->assertSame( $value, $data['font_family_settings'][ $key ] );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	public function data_update_item_individual_settings() {
+		return array(
+			array( array( 'name' => 'Opened Sans' ) ),
+			array( array( 'fontFamily' => '"Opened Sans", sans-serif' ) ),
+			array( array( 'preview' => 'https://s.w.org/images/fonts/16.7/previews/opened-sans/opened-sans-400-normal.svg' ) ),
+			// Empty preview is allowed.
+			array( array( 'preview' => '' ) ),
+		);
+	}
+
+		/**
+	 * @dataProvider data_update_item_santize_font_family
+	 *
+	 * @covers WP_REST_Font_Families_Controller::sanitize_font_face_settings
+	 */
+	public function test_update_item_santize_font_family( $font_family_setting, $expected ) {
+		wp_set_current_user( self::$admin_id );
+
+		$font_family_id = self::create_font_family_post();
+		$request        = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . $font_family_id );
+		$request->set_param( 'font_family_settings', wp_json_encode( array( 'fontFamily' => $font_family_setting ) ) );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertSame( $expected, $data['font_family_settings']['fontFamily'] );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	public function data_update_item_santize_font_family() {
+		return array(
+			array( 'Libre Barcode 128 Text', '"Libre Barcode 128 Text"' ),
+			array( 'B612 Mono', '"B612 Mono"' ),
+			array( 'Open Sans, Noto Sans, sans-serif', '"Open Sans", "Noto Sans", sans-serif' ),
+		);
+	}
+
+	/**
+	 * @dataProvider data_update_item_invalid_settings
+	 *
+	 * @covers WP_REST_Font_Faces_Controller::update_item
+	 */
+	public function test_update_item_empty_settings( $settings ) {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$request->set_param(
+			'font_family_settings',
+			wp_json_encode( $settings )
+		);
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+	}
+
+	public function data_update_item_invalid_settings() {
+		return array(
+			'Empty name'            => array(
+				array( 'name' => '' ),
+			),
+			'Wrong name type'       => array(
+				array( 'name' => 1234 ),
+			),
+			'Empty fontFamily'      => array(
+				array( 'fontFamily' => '' ),
+			),
+			'Wrong fontFamily type' => array(
+				array( 'fontFamily' => 1234 ),
+			),
+		);
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::update_item
+	 */
+	public function test_update_item_update_slug_not_allowed() {
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$request->set_param(
+			'font_family_settings',
+			wp_json_encode( array( 'slug' => 'new-slug' ) )
+		);
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertErrorResponse( 'rest_invalid_param', $response, 400 );
+		$expected_message = 'font_family_settings[slug] cannot be updated.';
+		$message          = $response->as_error()->get_all_error_data()[0]['params']['font_family_settings'];
+		$this->assertSame( $expected_message, $message );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::update_item
+	 */
+	public function test_update_item_invalid_font_family_id() {
+		$settings = array_diff_key( self::$default_settings, array( 'slug' => '' ) );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::update_item
+	 */
+	public function test_update_item_no_permission() {
+		$settings = array_diff_key( self::$default_settings, array( 'slug' => '' ) );
+
+		wp_set_current_user( 0 );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_edit', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$request = new WP_REST_Request( 'POST', '/wp/v2/font-families/' . self::$font_family_id1 );
+		$request->set_param( 'font_family_settings', wp_json_encode( $settings ) );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_edit', $response, 403 );
+	}
+
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item() {
+		wp_set_current_user( self::$admin_id );
+		$font_family_id   = self::create_font_family_post();
+		$request          = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . $font_family_id );
+		$request['force'] = true;
+		$response         = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertNull( get_post( $font_family_id ) );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_no_trash() {
+		wp_set_current_user( self::$admin_id );
+		$font_family_id = self::create_font_family_post();
+
+		// Attempt trashing.
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . $font_family_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
+
+		$request->set_param( 'force', 'false' );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_trash_not_supported', $response, 501 );
+
+		// Ensure the post still exists.
+		$post = get_post( $font_family_id );
+		$this->assertNotEmpty( $post );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_invalid_font_family_id() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . REST_TESTS_IMPOSSIBLY_HIGH_NUMBER );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_post_invalid_id', $response, 404 );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::delete_item
+	 */
+	public function test_delete_item_no_permissions() {
+		$font_family_id = self::create_font_family_post();
+
+		wp_set_current_user( 0 );
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . $font_family_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_delete', $response, 401 );
+
+		wp_set_current_user( self::$editor_id );
+		$request  = new WP_REST_Request( 'DELETE', '/wp/v2/font-families/' . $font_family_id );
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertErrorResponse( 'rest_cannot_delete', $response, 403 );
+
+		wp_delete_post( $font_family_id, true );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::prepare_item_for_response
+	 */
+	public function test_prepare_item() {
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/wp/v2/font-families/' . self::$font_family_id2 );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->check_font_family_data( $data, self::$font_family_id2, $response->get_links() );
+	}
+
+	/**
+	 * @covers WP_REST_Font_Faces_Controller::get_item_schema
+	 */
+	public function test_get_item_schema() {
+		$request  = new WP_REST_Request( 'OPTIONS', '/wp/v2/font-families' );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$properties = $data['schema']['properties'];
+		$this->assertCount( 4, $properties );
+		$this->assertArrayHasKey( 'id', $properties );
+		$this->assertArrayHasKey( 'theme_json_version', $properties );
+		$this->assertArrayHasKey( 'font_faces', $properties );
+		$this->assertArrayHasKey( 'font_family_settings', $properties );
+	}
+
+	protected function check_font_family_data( $data, $post_id, $links ) {
+		$post = get_post( $post_id );
+
+		$this->assertArrayHasKey( 'id', $data );
+		$this->assertSame( $post->ID, $data['id'] );
+
+		$this->assertArrayHasKey( 'theme_json_version', $data );
+		$this->assertSame( WP_Theme_JSON::LATEST_SCHEMA, $data['theme_json_version'] );
+
+		$font_face_ids = get_children(
+			array(
+				'fields'      => 'ids',
+				'post_parent' => $post_id,
+				'post_type'   => 'wp_font_face',
+				'order'       => 'ASC',
+				'orderby'     => 'ID',
+			)
+		);
+		$this->assertArrayHasKey( 'font_faces', $data );
+
+		foreach ( $font_face_ids as $font_face_id ) {
+			$this->assertContains( $font_face_id, $data['font_faces'] );
+		}
+
+		$this->assertArrayHasKey( 'font_family_settings', $data );
+		$settings          = $data['font_family_settings'];
+		$expected_settings = array(
+			'name'       => $post->post_title,
+			'slug'       => $post->post_name,
+			'fontFamily' => $settings['fontFamily'],
+			'preview'    => $settings['preview'],
+		);
+		$this->assertSame( $expected_settings, $settings );
+
+		$this->assertNotEmpty( $links );
+		$this->assertSame( rest_url( 'wp/v2/font-families/' . $post->ID ), $links['self'][0]['href'] );
+		$this->assertSame( rest_url( 'wp/v2/font-families' ), $links['collection'][0]['href'] );
+
+		if ( ! $font_face_ids ) {
+			return;
+		}
+
+		// Check font_face links, if present.
+		$this->assertArrayHasKey( 'font_faces', $links );
+		foreach ( $links['font_faces'] as $index => $link ) {
+			$this->assertSame( rest_url( 'wp/v2/font-families/' . $post->ID . '/font-faces/' . $font_face_ids[ $index ] ), $link['href'] );
+
+			$embeddable = isset( $link['attributes']['embeddable'] )
+				? $link['attributes']['embeddable']
+				: $link['embeddable'];
+			$this->assertTrue( $embeddable );
+		}
+	}
+}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
deleted file mode 100644
index e2d190cd76af1..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/base.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?php
-/**
- * Test Case for WP_REST_Font_Families_Controller tests.
- *
- * @package WordPress
- * @subpackage Font Library
- */
-abstract class WP_REST_Font_Families_Controller_UnitTestCase extends WP_UnitTestCase {
-
-	/**
-	 * Fonts directory.
-	 *
-	 * @var string
-	 */
-	protected static $fonts_dir;
-
-
-	public function set_up() {
-		parent::set_up();
-
-		static::$fonts_dir = wp_get_font_dir()['path'];
-
-		// Create a user with administrator role.
-		$admin_id = $this->factory->user->create(
-			array(
-				'role' => 'administrator',
-			)
-		);
-		wp_set_current_user( $admin_id );
-	}
-
-	/**
-	 * Tear down each test method.
-	 */
-	public function tear_down() {
-		parent::tear_down();
-
-		// Clean up the /fonts directory.
-		foreach ( $this->files_in_dir( static::$fonts_dir ) as $file ) {
-			@unlink( $file );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
deleted file mode 100644
index 98c1cb6e13fe5..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/installFonts.php
+++ /dev/null
@@ -1,334 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Families_Controller::install_fonts().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Families_Controller::install_fonts
- */
-
-class Tests_Fonts_WPRESTFontFamiliesController_InstallFonts extends WP_REST_Font_Families_Controller_UnitTestCase {
-
-	/**
-	 *
-	 * @dataProvider data_install_fonts
-	 *
-	 * @param array $font_families     Font families to install in theme.json format.
-	 * @param array $files             Font files to install.
-	 * @param array $expected_response Expected response data.
-	 */
-	public function test_install_fonts( $font_family_settings, $files, $expected_response ) {
-		$install_request  = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
-		$font_family_json = json_encode( $font_family_settings );
-		$install_request->set_param( 'font_family_settings', $font_family_json );
-		$install_request->set_file_params( $files );
-		$response = rest_get_server()->dispatch( $install_request );
-		$data     = $response->get_data();
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-		$this->assertCount( count( $expected_response['successes'] ), $data['successes'], 'Not all the font families were installed correctly.' );
-
-		// Checks that the font families were installed correctly.
-		for ( $family_index = 0; $family_index < count( $data['successes'] ); $family_index++ ) {
-			$installed_font = $data['successes'][ $family_index ];
-			$expected_font  = $expected_response['successes'][ $family_index ];
-
-			if ( isset( $installed_font['fontFace'] ) || isset( $expected_font['fontFace'] ) ) {
-				for ( $face_index = 0; $face_index < count( $installed_font['fontFace'] ); $face_index++ ) {
-					// Checks that the font asset were created correctly.
-					if ( isset( $installed_font['fontFace'][ $face_index ]['src'] ) ) {
-						$this->assertStringEndsWith( $expected_font['fontFace'][ $face_index ]['src'], $installed_font['fontFace'][ $face_index ]['src'], 'The src of the fonts were not updated as expected.' );
-					}
-					// Removes the src from the response to compare the rest of the data.
-					unset( $installed_font['fontFace'][ $face_index ]['src'] );
-					unset( $expected_font['fontFace'][ $face_index ]['src'] );
-					unset( $installed_font['fontFace'][ $face_index ]['uploadedFile'] );
-				}
-			}
-
-			// Compares if the rest of the data is the same.
-			$this->assertEquals( $expected_font, $installed_font, 'The endpoint answer is not as expected.' );
-		}
-	}
-
-	/**
-	 * Data provider for test_install_fonts
-	 */
-	public function data_install_fonts() {
-
-		$temp_file_path1 = wp_tempnam( 'Piazzola1-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $temp_file_path1 );
-
-		$temp_file_path2 = wp_tempnam( 'Monteserrat-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $temp_file_path2 );
-
-		return array(
-
-			'google_fonts_to_download'      => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'normal',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-				'files'                => array(),
-				'expected_response'    => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => '/wp-content/fonts/piazzolla_normal_400.ttf',
-								),
-							),
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'google_fonts_to_use_as_is'     => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'normal',
-							'fontWeight' => '400',
-							'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-				'files'                => array(),
-				'expected_response'    => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-								),
-							),
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'fonts_without_font_faces'      => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Arial',
-					'slug'       => 'arial',
-					'name'       => 'Arial',
-				),
-				'files'                => array(),
-				'expected_response'    => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Arial',
-							'slug'       => 'arial',
-							'name'       => 'Arial',
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-
-			'fonts_with_local_fonts_assets' => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Piazzolla',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files'                => array(
-					'files0' => array(
-						'name'     => 'piazzola1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path1,
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'montserrat1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path2,
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected_response'    => array(
-					'successes' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'slug'       => 'piazzolla',
-							'name'       => 'Piazzolla',
-							'fontFace'   => array(
-								array(
-									'fontFamily' => 'Piazzolla',
-									'fontStyle'  => 'normal',
-									'fontWeight' => '400',
-									'src'        => '/wp-content/fonts/piazzolla_normal_400.ttf',
-								),
-							),
-						),
-					),
-					'errors'    => array(),
-				),
-			),
-		);
-	}
-
-	/**
-	 * Tests failure when fonfaces has improper inputs
-	 *
-	 * @dataProvider data_install_with_improper_inputs
-	 *
-	 * @param array $font_families Font families to install in theme.json format.
-	 * @param array $files         Font files to install.
-	 */
-	public function test_install_with_improper_inputs( $font_families, $files = array() ) {
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
-		$font_families_json = json_encode( $font_families );
-		$install_request->set_param( 'font_families', $font_families_json );
-		$install_request->set_file_params( $files );
-
-		$response = rest_get_server()->dispatch( $install_request );
-		$this->assertSame( 400, $response->get_status() );
-	}
-
-	/**
-	 * Data provider for test_install_with_improper_inputs
-	 */
-	public function data_install_with_improper_inputs() {
-		$temp_file_path1 = wp_tempnam( 'Piazzola1-' );
-		file_put_contents( $temp_file_path1, 'Mocking file content' );
-
-		return array(
-			'not a font families array'        => array(
-				'font_family_settings' => 'This is not an array',
-			),
-
-			'empty array'                      => array(
-				'font_family_settings' => array(),
-			),
-
-			'without slug'                     => array(
-				'font_family_settings' => array(
-					array(
-						'fontFamily' => 'Piazzolla',
-						'name'       => 'Piazzolla',
-					),
-				),
-			),
-
-			'with improper font face property' => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFace'   => 'This is not an array',
-				),
-			),
-
-			'with empty font face property'    => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFace'   => array(),
-				),
-			),
-
-			'fontface referencing uploaded file without uploaded files' => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Piazzolla',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files'                => array(),
-			),
-
-			'fontface referencing uploaded file without uploaded files' => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Piazzolla',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files666',
-						),
-					),
-				),
-				'files'                => array(
-					'files0' => array(
-						'name'     => 'piazzola1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => $temp_file_path1,
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-			),
-
-			'fontface with incompatible properties (downloadFromUrl and uploadedFile together)' => array(
-				'font_family_settings' => array(
-					'fontFamily' => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'normal',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'uploadedFile'    => 'files0',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/uninstallFonts.php b/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/uninstallFonts.php
deleted file mode 100644
index 241f26284fe5d..0000000000000
--- a/phpunit/tests/fonts/font-library/wpRestFontFamiliesController/uninstallFonts.php
+++ /dev/null
@@ -1,96 +0,0 @@
-<?php
-/**
- * Test WP_REST_Font_Families_Controller::install_fonts().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_REST_Font_Families_Controller::install_fonts
- */
-
-class Tests_Fonts_WPRESTFontFamiliesController_UninstallFonts extends WP_REST_Font_Families_Controller_UnitTestCase {
-
-	/**
-	 * Install fonts to test uninstall.
-	 */
-	public function set_up() {
-		parent::set_up();
-
-		// Installs mock fonts to test uninstall.
-		$mock_families = array(
-			array(
-				'fontFamily' => 'Piazzolla',
-				'slug'       => 'piazzolla',
-				'name'       => 'Piazzolla',
-				'fontFace'   => array(
-					array(
-						'fontFamily'      => 'Piazzolla',
-						'fontStyle'       => 'normal',
-						'fontWeight'      => '400',
-						'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-					),
-				),
-			),
-			array(
-				'fontFamily' => 'Montserrat',
-				'slug'       => 'montserrat',
-				'name'       => 'Montserrat',
-				'fontFace'   => array(
-					array(
-						'fontFamily'      => 'Montserrat',
-						'fontStyle'       => 'normal',
-						'fontWeight'      => '100',
-						'src'             => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-						'downloadFromUrl' => 'http://fonts.gstatic.com/s/montserrat/v25/JTUHjIg1_i6t8kCHKm4532VJOt5-QNFgpCtr6Uw-Y3tcoqK5.ttf',
-					),
-				),
-			),
-		);
-
-		$install_request    = new WP_REST_Request( 'POST', '/wp/v2/font-families' );
-		$font_families_json = json_encode( $mock_families );
-		$install_request->set_param( 'font_families', $font_families_json );
-		rest_get_server()->dispatch( $install_request );
-	}
-
-	public function test_uninstall() {
-		$font_families_to_uninstall = array(
-			array(
-				'slug' => 'piazzolla',
-			),
-			array(
-				'slug' => 'montserrat',
-			),
-		);
-
-		$uninstall_request = new WP_REST_Request( 'DELETE', '/wp/v2/font-families' );
-		$uninstall_request->set_param( 'font_families', $font_families_to_uninstall );
-		$response = rest_get_server()->dispatch( $uninstall_request );
-		$this->assertSame( 200, $response->get_status(), 'The response status is not 200.' );
-	}
-
-
-	public function test_uninstall_non_existing_fonts() {
-		$uninstall_request = new WP_REST_Request( 'DELETE', '/wp/v2/font-families' );
-
-		$non_existing_font_data = array(
-			array(
-				'slug' => 'non-existing-font',
-				'name' => 'Non existing font',
-			),
-			array(
-				'slug' => 'another-not-installed-font',
-				'name' => 'Another not installed font',
-			),
-		);
-
-		$uninstall_request->set_param( 'font_families', $non_existing_font_data );
-		$response = rest_get_server()->dispatch( $uninstall_request );
-		$data     = $response->get_data();
-		$this->assertCount( 2, $data['errors'], 'The response should have 2 errors, one for each font family uninstall failure.' );
-	}
-}

From 291ffb9ce0a0418e6ab8cbf8a9882e72de739fef Mon Sep 17 00:00:00 2001
From: annezazu <annezazu@gmail.com>
Date: Tue, 23 Jan 2024 15:15:58 -0800
Subject: [PATCH 243/296] Iterate on warning text for block removal for
 query/post template/post content (#58138)

* Iterate on warning text for block removal for query/post template/post content

Addresses continued feedback on https://github.com/WordPress/gutenberg/issues/52392

* Adjust string

* Update block-removal.spec.js

* Update e2e test

* Give the modal a max-width to be consistent with block lock modal

* Use modal size prop

---------

Co-authored-by: Rich Tabor <hi@richtabor.com>
Co-authored-by: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
---
 .../src/components/block-removal-warning-modal/index.js      | 5 +++--
 test/e2e/specs/site-editor/block-removal.spec.js             | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/packages/block-editor/src/components/block-removal-warning-modal/index.js b/packages/block-editor/src/components/block-removal-warning-modal/index.js
index a6de602bcdda8..846883e48e9cd 100644
--- a/packages/block-editor/src/components/block-removal-warning-modal/index.js
+++ b/packages/block-editor/src/components/block-removal-warning-modal/index.js
@@ -50,11 +50,12 @@ export function BlockRemovalWarningModal( { rules } ) {
 		<Modal
 			title={ __( 'Be careful!' ) }
 			onRequestClose={ clearBlockRemovalPrompt }
+			size="medium"
 		>
 			<p>
 				{ _n(
-					'Post or page content will not be displayed if you delete this block.',
-					'Post or page content will not be displayed if you delete these blocks.',
+					'Deleting this block will stop your post or page content from displaying on this template. It is not recommended.',
+					'Deleting these blocks will stop your post or page content from displaying on this template. It is not recommended.',
 					blockNamesForPrompt.length
 				) }
 			</p>
diff --git a/test/e2e/specs/site-editor/block-removal.spec.js b/test/e2e/specs/site-editor/block-removal.spec.js
index 27d3762364b44..bf63e089c8a0b 100644
--- a/test/e2e/specs/site-editor/block-removal.spec.js
+++ b/test/e2e/specs/site-editor/block-removal.spec.js
@@ -35,7 +35,7 @@ test.describe( 'Site editor block removal prompt', () => {
 		// Expect the block removal prompt to have appeared
 		await expect(
 			page.getByText(
-				'Post or page content will not be displayed if you delete these blocks.'
+				'Deleting these blocks will stop your post or page content from displaying on this template. It is not recommended.'
 			)
 		).toBeVisible();
 	} );
@@ -59,7 +59,7 @@ test.describe( 'Site editor block removal prompt', () => {
 		// Expect the block removal prompt to have appeared
 		await expect(
 			page.getByText(
-				'Post or page content will not be displayed if you delete this block.'
+				'Deleting this block will stop your post or page content from displaying on this template. It is not recommended.'
 			)
 		).toBeVisible();
 	} );

From d9ed5d3309a0fa5f4e6895e81b45ec0f05cf5925 Mon Sep 17 00:00:00 2001
From: Daniel Richards <daniel.richards@automattic.com>
Date: Wed, 24 Jan 2024 09:26:29 +0800
Subject: [PATCH 244/296] Remove pattern override experiment (#58105)

* Completely remove the pattern overrides experiment flag

* Update test to use correct name of block bindings experiment

* Restore react native file

* Fix paths in native files

* Update pattern block test to reflect changes to inner blocks (the reusable block no longer uses controlled inner blocks)

* Fix e2e tests

---------

Co-authored-by: Kai Hao <kai@kaihao.dev>
---
 lib/experimental/block-bindings/index.php     |   4 +-
 lib/experimental/blocks.php                   |   6 +-
 lib/experimental/editor-settings.php          |   4 -
 lib/experiments-page.php                      |  12 --
 .../src/components/block-inspector/index.js   |   3 +-
 .../block-list/use-in-between-inserter.js     |   3 +-
 packages/block-editor/src/store/selectors.js  |   3 +-
 .../src/block/{v1 => }/edit.native.js         |   4 +-
 packages/block-library/src/block/index.js     |   5 +-
 packages/block-library/src/block/v1/edit.js   | 163 ------------------
 .../__snapshots__/pattern-blocks.test.js.snap |   2 +-
 .../editor/various/pattern-blocks.test.js     | 103 ++---------
 .../src/hooks/pattern-partial-syncing.js      |  48 +++---
 .../editor/various/pattern-overrides.spec.js  |   2 +-
 .../e2e/specs/editor/various/patterns.spec.js |  87 +++++++++-
 15 files changed, 134 insertions(+), 315 deletions(-)
 rename packages/block-library/src/block/{v1 => }/edit.native.js (98%)
 delete mode 100644 packages/block-library/src/block/v1/edit.js

diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
index dc9a6c9b96957..cf9cc318b1c92 100644
--- a/lib/experimental/block-bindings/index.php
+++ b/lib/experimental/block-bindings/index.php
@@ -10,10 +10,8 @@
 // Register the sources.
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments ) {
-	if ( array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-		require_once __DIR__ . '/sources/pattern.php';
-	}
 	if ( array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
+		require_once __DIR__ . '/sources/pattern.php';
 		require_once __DIR__ . '/sources/post-meta.php';
 	}
 }
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 93b65f95fc61a..4c22601fa9102 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -78,13 +78,9 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 	}
 }
 
-
-
-
 $gutenberg_experiments = get_option( 'gutenberg-experiments' );
 if ( $gutenberg_experiments && (
-	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ||
-	array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments )
+	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments )
 ) ) {
 
 	require_once __DIR__ . '/block-bindings/index.php';
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 729376cf030dd..24590c5cf3eb0 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -33,10 +33,6 @@ function gutenberg_enable_experiments() {
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 		wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' );
 	}
-
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-pattern-partial-syncing', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalPatternPartialSyncing = true', 'before' );
-	}
 }
 
 add_action( 'admin_init', 'gutenberg_enable_experiments' );
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
index 8af1eb82c6bed..a38b5c4f11fad 100644
--- a/lib/experiments-page.php
+++ b/lib/experiments-page.php
@@ -138,18 +138,6 @@ function gutenberg_initialize_experiments_settings() {
 		)
 	);
 
-	add_settings_field(
-		'gutenberg-pattern-partial-syncing',
-		__( 'Pattern overrides', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Test overrides in synced patterns', 'gutenberg' ),
-			'id'    => 'gutenberg-pattern-partial-syncing',
-		)
-	);
-
 	register_setting(
 		'gutenberg-experiments',
 		'gutenberg-experiments'
diff --git a/packages/block-editor/src/components/block-inspector/index.js b/packages/block-editor/src/components/block-inspector/index.js
index afdda89b6739a..a52b8b9a01507 100644
--- a/packages/block-editor/src/components/block-inspector/index.js
+++ b/packages/block-editor/src/components/block-inspector/index.js
@@ -93,8 +93,7 @@ const BlockInspector = ( { showNoBlockSelectedMessage = true } ) => {
 			topLevelLockedBlock:
 				__unstableGetContentLockingParent( _selectedBlockClientId ) ||
 				( getTemplateLock( _selectedBlockClientId ) === 'contentOnly' ||
-				( _selectedBlockName === 'core/block' &&
-					window.__experimentalPatternPartialSyncing )
+				_selectedBlockName === 'core/block'
 					? _selectedBlockClientId
 					: undefined ),
 		};
diff --git a/packages/block-editor/src/components/block-list/use-in-between-inserter.js b/packages/block-editor/src/components/block-list/use-in-between-inserter.js
index bd323ed057d73..044e5b185a224 100644
--- a/packages/block-editor/src/components/block-list/use-in-between-inserter.js
+++ b/packages/block-editor/src/components/block-list/use-in-between-inserter.js
@@ -77,8 +77,7 @@ export function useInBetweenInserter() {
 				if (
 					getTemplateLock( rootClientId ) ||
 					getBlockEditingMode( rootClientId ) === 'disabled' ||
-					( getBlockName( rootClientId ) === 'core/block' &&
-						window.__experimentalPatternPartialSyncing )
+					getBlockName( rootClientId ) === 'core/block'
 				) {
 					return;
 				}
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 5e47e966ef334..8be04950f052a 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -2721,8 +2721,7 @@ export const __unstableGetContentLockingParent = createSelector(
 			current = state.blocks.parents.get( current );
 			if (
 				( current &&
-					getBlockName( state, current ) === 'core/block' &&
-					window.__experimentalPatternPartialSyncing ) ||
+					getBlockName( state, current ) === 'core/block' ) ||
 				( current &&
 					getTemplateLock( state, current ) === 'contentOnly' )
 			) {
diff --git a/packages/block-library/src/block/v1/edit.native.js b/packages/block-library/src/block/edit.native.js
similarity index 98%
rename from packages/block-library/src/block/v1/edit.native.js
rename to packages/block-library/src/block/edit.native.js
index 9077988456b70..ae8c8315aa2e8 100644
--- a/packages/block-library/src/block/v1/edit.native.js
+++ b/packages/block-library/src/block/edit.native.js
@@ -42,8 +42,8 @@ import { store as noticesStore } from '@wordpress/notices';
 /**
  * Internal dependencies
  */
-import styles from '../editor.scss';
-import EditTitle from '../edit-title';
+import styles from './editor.scss';
+import EditTitle from './edit-title';
 
 export default function ReusableBlockEdit( {
 	attributes: { ref },
diff --git a/packages/block-library/src/block/index.js b/packages/block-library/src/block/index.js
index 0d117e6f3938a..95e090f0afd6a 100644
--- a/packages/block-library/src/block/index.js
+++ b/packages/block-library/src/block/index.js
@@ -8,15 +8,14 @@ import { symbol as icon } from '@wordpress/icons';
  */
 import initBlock from '../utils/init-block';
 import metadata from './block.json';
-import editV1 from './v1/edit';
-import editV2 from './edit';
+import edit from './edit';
 
 const { name } = metadata;
 
 export { metadata, name };
 
 export const settings = {
-	edit: window.__experimentalPatternPartialSyncing ? editV2 : editV1,
+	edit,
 	icon,
 };
 
diff --git a/packages/block-library/src/block/v1/edit.js b/packages/block-library/src/block/v1/edit.js
deleted file mode 100644
index aa8f680c83792..0000000000000
--- a/packages/block-library/src/block/v1/edit.js
+++ /dev/null
@@ -1,163 +0,0 @@
-/**
- * External dependencies
- */
-import classnames from 'classnames';
-
-/**
- * WordPress dependencies
- */
-import {
-	useEntityBlockEditor,
-	useEntityProp,
-	useEntityRecord,
-} from '@wordpress/core-data';
-import {
-	Placeholder,
-	Spinner,
-	TextControl,
-	PanelBody,
-} from '@wordpress/components';
-import { __ } from '@wordpress/i18n';
-import {
-	useInnerBlocksProps,
-	RecursionProvider,
-	useHasRecursion,
-	InnerBlocks,
-	InspectorControls,
-	useBlockProps,
-	Warning,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import { useRef, useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import { unlock } from '../../lock-unlock';
-
-const { useLayoutClasses } = unlock( blockEditorPrivateApis );
-const fullAlignments = [ 'full', 'wide', 'left', 'right' ];
-
-const useInferredLayout = ( blocks, parentLayout ) => {
-	const initialInferredAlignmentRef = useRef();
-
-	return useMemo( () => {
-		// Exit early if the pattern's blocks haven't loaded yet.
-		if ( ! blocks?.length ) {
-			return {};
-		}
-
-		let alignment = initialInferredAlignmentRef.current;
-
-		// Only track the initial alignment so that temporarily removed
-		// alignments can be reapplied.
-		if ( alignment === undefined ) {
-			const isConstrained = parentLayout?.type === 'constrained';
-			const hasFullAlignment = blocks.some( ( block ) =>
-				fullAlignments.includes( block.attributes.align )
-			);
-
-			alignment = isConstrained && hasFullAlignment ? 'full' : null;
-			initialInferredAlignmentRef.current = alignment;
-		}
-
-		const layout = alignment ? parentLayout : undefined;
-
-		return { alignment, layout };
-	}, [ blocks, parentLayout ] );
-};
-
-export default function ReusableBlockEdit( {
-	name,
-	attributes: { ref },
-	__unstableParentLayout: parentLayout,
-} ) {
-	const hasAlreadyRendered = useHasRecursion( ref );
-	const { record, hasResolved } = useEntityRecord(
-		'postType',
-		'wp_block',
-		ref
-	);
-	const isMissing = hasResolved && ! record;
-
-	const [ blocks, onInput, onChange ] = useEntityBlockEditor(
-		'postType',
-		'wp_block',
-		{ id: ref }
-	);
-
-	const [ title, setTitle ] = useEntityProp(
-		'postType',
-		'wp_block',
-		'title',
-		ref
-	);
-
-	const { alignment, layout } = useInferredLayout( blocks, parentLayout );
-	const layoutClasses = useLayoutClasses( { layout }, name );
-
-	const blockProps = useBlockProps( {
-		className: classnames(
-			'block-library-block__reusable-block-container',
-			layout && layoutClasses,
-			{ [ `align${ alignment }` ]: alignment }
-		),
-	} );
-
-	const innerBlocksProps = useInnerBlocksProps( blockProps, {
-		value: blocks,
-		layout,
-		onInput,
-		onChange,
-		renderAppender: blocks?.length
-			? undefined
-			: InnerBlocks.ButtonBlockAppender,
-	} );
-
-	let children = null;
-
-	if ( hasAlreadyRendered ) {
-		children = (
-			<Warning>
-				{ __( 'Block cannot be rendered inside itself.' ) }
-			</Warning>
-		);
-	}
-
-	if ( isMissing ) {
-		children = (
-			<Warning>
-				{ __( 'Block has been deleted or is unavailable.' ) }
-			</Warning>
-		);
-	}
-
-	if ( ! hasResolved ) {
-		children = (
-			<Placeholder>
-				<Spinner />
-			</Placeholder>
-		);
-	}
-
-	return (
-		<RecursionProvider uniqueId={ ref }>
-			<InspectorControls>
-				<PanelBody>
-					<TextControl
-						label={ __( 'Name' ) }
-						value={ title }
-						onChange={ setTitle }
-						__nextHasNoMarginBottom
-						__next40pxDefaultSize
-					/>
-				</PanelBody>
-			</InspectorControls>
-			{ children === null ? (
-				<div { ...innerBlocksProps } />
-			) : (
-				<div { ...blockProps }>{ children }</div>
-			) }
-		</RecursionProvider>
-	);
-}
diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
index db3efc512a0a7..ffa6af8c2b733 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`Pattern blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
 "<!-- wp:paragraph -->
-<p>12</p>
+<p>1</p>
 <!-- /wp:paragraph -->"
 `;
 
diff --git a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js b/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
index 0d00e3d9a545b..b8021143259a8 100644
--- a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
@@ -15,42 +15,16 @@ import {
 	openDocumentSettingsSidebar,
 	saveDraft,
 	createReusableBlock,
-	publishPost,
 	canvas,
 } from '@wordpress/e2e-test-utils';
 
 const patternBlockNameInputSelector =
 	'.patterns-menu-items__convert-modal .components-text-control__input';
-const patternBlockInspectorNameInputSelector =
-	'.block-editor-block-inspector .components-text-control__input';
+const patternBlockInspectorNameSelector =
+	'.block-editor-block-inspector h2.block-editor-block-card__title';
 const syncToggleSelectorChecked =
 	'.patterns-menu-items__convert-modal .components-form-toggle.is-checked';
 
-const saveAll = async () => {
-	const publishButtonSelector =
-		'.editor-post-publish-button__button.has-changes-dot';
-	// Wait for the Publish button to become enabled in case the editor is autosaving ATM:.
-	const publishButton = await page.waitForSelector(
-		publishButtonSelector + '[aria-disabled="false"]'
-	);
-	await publishButton.click();
-
-	const saveButtonSelector =
-		'button.editor-entities-saved-states__save-button';
-	const saveButton = await page.waitForSelector( saveButtonSelector );
-	await saveButton.click();
-};
-
-const saveAllButDontPublish = async () => {
-	await saveAll();
-
-	// No need to publish the post.
-	const cancelPublish = await page.waitForSelector(
-		'.editor-post-publish-panel__header-cancel-button button'
-	);
-	await cancelPublish.click();
-};
-
 const clearAllBlocks = async () => {
 	// Remove all blocks from the post so that we're working with a clean slate.
 	await page.evaluate( () => {
@@ -69,46 +43,24 @@ describe( 'Pattern blocks', () => {
 		await createNewPost();
 	} );
 
-	it( 'can be created, inserted, edited and converted to a regular block.', async () => {
+	it( 'can be created, inserted, and converted to a regular block.', async () => {
 		await createReusableBlock( 'Hello there!', 'Greeting block' );
 		await clearAllBlocks();
 
 		// Insert the reusable block we created above.
 		await insertPattern( 'Greeting block' );
 
-		// Change the block's title.
-		await openDocumentSettingsSidebar();
-		const nameInput = await page.waitForSelector(
-			patternBlockInspectorNameInputSelector
-		);
-		await nameInput.click();
-		await pressKeyWithModifier( 'primary', 'a' );
-		await page.keyboard.type( 'Surprised greeting block' );
-
-		// Quickly focus the paragraph block.
-		await canvas().click(
-			'.block-editor-block-list__block[data-type="core/block"] p'
-		);
-		await page.keyboard.press( 'Escape' ); // Enter navigation mode.
-		await page.keyboard.press( 'Enter' ); // Enter edit mode.
-
-		// Change the block's content.
-		await page.keyboard.type( 'Oh! ' );
-
-		// Save the reusable block.
-		await saveAllButDontPublish();
-
 		// Check that its content is up to date.
 		const text = await canvas().$eval(
 			'.block-editor-block-list__block[data-type="core/block"] p',
 			( element ) => element.innerText
 		);
-		expect( text ).toMatch( 'Oh! Hello there!' );
+		expect( text ).toMatch( 'Hello there!' );
 
 		await clearAllBlocks();
 
 		// Insert the reusable block we edited above.
-		await insertPattern( 'Surprised greeting block' );
+		await insertPattern( 'Greeting block' );
 
 		// Convert block to a regular block.
 		await clickBlockToolbarButton( 'Options' );
@@ -125,42 +77,7 @@ describe( 'Pattern blocks', () => {
 			'.block-editor-block-list__block[data-type="core/paragraph"]',
 			( element ) => element.innerText
 		);
-		expect( paragraphContent ).toMatch( 'Oh! Hello there!' );
-	} );
-
-	// Check for regressions of https://github.com/WordPress/gutenberg/issues/33072.
-	it( 'can be saved when modified inside of a published post', async () => {
-		await createReusableBlock(
-			'Guten Berg!',
-			'Alternative greeting block'
-		);
-
-		// Make sure the reusable block has loaded properly before attempting to publish the post.
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-
-		await publishPost();
-
-		// Close publish panel.
-		const closePublishPanelSelector =
-			'.editor-post-publish-panel__header button[aria-label="Close panel"]';
-		await page.waitForSelector( closePublishPanelSelector );
-		await page.click( closePublishPanelSelector );
-
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-		await canvas().focus( 'p[aria-label="Block: Paragraph"]' );
-
-		// Change the block's content.
-		await page.keyboard.type( 'Einen ' );
-
-		// Save the reusable block and update the post.
-		await saveAll();
-
-		// Check that its content is up to date.
-		const paragraphContent = await canvas().$eval(
-			'p[aria-label="Block: Paragraph"]',
-			( element ) => element.innerText
-		);
-		expect( paragraphContent ).toMatch( 'Einen Guten Berg!' );
+		expect( paragraphContent ).toMatch( 'Hello there!' );
 	} );
 
 	it( 'can be inserted after refresh', async () => {
@@ -175,8 +92,8 @@ describe( 'Pattern blocks', () => {
 		// Check the title.
 		await openDocumentSettingsSidebar();
 		const title = await page.$eval(
-			patternBlockInspectorNameInputSelector,
-			( element ) => element.value
+			patternBlockInspectorNameSelector,
+			( element ) => element.textContent
 		);
 		expect( title ).toBe( 'Awesome block' );
 	} );
@@ -336,7 +253,9 @@ describe( 'Pattern blocks', () => {
 	} );
 
 	// Check for regressions of https://github.com/WordPress/gutenberg/issues/26421.
-	it( 'allows conversion back to blocks when the reusable block has unsaved edits', async () => {
+	// Skip reason: This is broken at the time with Pattern Overrides.
+	// See https://github.com/WordPress/gutenberg/issues/58122
+	it.skip( 'allows conversion back to blocks when the reusable block has unsaved edits', async () => {
 		await createReusableBlock( '1', 'Edited block' );
 
 		// Make an edit to the reusable block and assert that there's only a
diff --git a/packages/editor/src/hooks/pattern-partial-syncing.js b/packages/editor/src/hooks/pattern-partial-syncing.js
index a940890dfa693..0ddfea8d9d8e3 100644
--- a/packages/editor/src/hooks/pattern-partial-syncing.js
+++ b/packages/editor/src/hooks/pattern-partial-syncing.js
@@ -30,37 +30,41 @@ const {
  */
 const withPartialSyncingControls = createHigherOrderComponent(
 	( BlockEdit ) => ( props ) => {
-		const blockEditingMode = useBlockEditingMode();
-		const isEditingPattern = useSelect(
-			( select ) =>
-				select( editorStore ).getCurrentPostType() ===
-				PATTERN_TYPES.user,
-			[]
-		);
-
-		const shouldShowPartialSyncingControls =
-			props.isSelected &&
-			isEditingPattern &&
-			blockEditingMode === 'default' &&
-			Object.keys( PARTIAL_SYNCING_SUPPORTED_BLOCKS ).includes(
-				props.name
-			);
+		const isSupportedBlock = Object.keys(
+			PARTIAL_SYNCING_SUPPORTED_BLOCKS
+		).includes( props.name );
 
 		return (
 			<>
 				<BlockEdit { ...props } />
-				{ shouldShowPartialSyncingControls && (
-					<PartialSyncingControls { ...props } />
+				{ props.isSelected && isSupportedBlock && (
+					<ControlsWithStoreSubscription { ...props } />
 				) }
 			</>
 		);
 	}
 );
 
-if ( window.__experimentalPatternPartialSyncing ) {
-	addFilter(
-		'editor.BlockEdit',
-		'core/editor/with-partial-syncing-controls',
-		withPartialSyncingControls
+// Split into a separate component to avoid a store subscription
+// on every block.
+function ControlsWithStoreSubscription( props ) {
+	const blockEditingMode = useBlockEditingMode();
+	const isEditingPattern = useSelect(
+		( select ) =>
+			select( editorStore ).getCurrentPostType() === PATTERN_TYPES.user,
+		[]
+	);
+
+	return (
+		isEditingPattern &&
+		blockEditingMode === 'default' && (
+			<PartialSyncingControls { ...props } />
+		)
 	);
 }
+
+addFilter(
+	'editor.BlockEdit',
+	'core/editor/with-partial-syncing-controls',
+	withPartialSyncingControls
+);
diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
index 818a05881f53e..62a993c5d9cf2 100644
--- a/test/e2e/specs/editor/various/pattern-overrides.spec.js
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -8,7 +8,7 @@ test.describe( 'Pattern Overrides', () => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
 			requestUtils.setGutenbergExperiments( [
-				'gutenberg-pattern-partial-syncing',
+				'gutenberg-block-bindings',
 			] ),
 			requestUtils.deleteAllBlocks(),
 		] );
diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index 4b47b2dd70a35..c53c6fef31928 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -141,7 +141,16 @@ test.describe( 'Synced pattern', () => {
 				{
 					name: 'core/block',
 					attributes: { ref: expect.any( Number ) },
-					innerBlocks: [],
+					innerBlocks: [
+						{
+							attributes: {
+								content: 'A useful paragraph to reuse',
+								dropCap: false,
+							},
+							innerBlocks: [],
+							name: 'core/paragraph',
+						},
+					],
 				},
 			] );
 		const after = await editor.getBlocks();
@@ -167,4 +176,80 @@ test.describe( 'Synced pattern', () => {
 
 		await expect.poll( editor.getBlocks ).toEqual( [ ...after, ...after ] );
 	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/33072.
+	test( 'can be saved when modified inside of a published post', async ( {
+		page,
+		requestUtils,
+		editor,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Alternative greeting block',
+			content:
+				'<!-- wp:paragraph -->\n<p>Guten Tag!</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await editor.publishPost();
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.showBlockToolbar();
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'link', { name: 'Edit original' } )
+			.click();
+
+		const editorTopBar = page.getByRole( 'region', {
+			name: 'Editor top bar',
+		} );
+
+		// Navigate to the pattern focus mode.
+		await expect(
+			editorTopBar.getByRole( 'heading', {
+				name: 'Alternative greeting block',
+				level: 1,
+			} )
+		).toBeVisible();
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Paragraph' } )
+		);
+
+		// Change the block's content.
+		await page.keyboard.type( 'Einen ' );
+
+		// Save the reusable block and update the post.
+		await editorTopBar.getByRole( 'button', { name: 'Update' } ).click();
+		await page
+			.getByRole( 'button', { name: 'Dismiss this notice' } )
+			.filter( { hasText: 'Pattern updated.' } )
+			.click();
+
+		// Go back to the post.
+		await editorTopBar.getByRole( 'button', { name: 'Back' } ).click();
+
+		await expect.poll( editor.getBlocks ).toEqual( [
+			{
+				name: 'core/block',
+				attributes: { ref: id },
+				innerBlocks: [
+					{
+						name: 'core/paragraph',
+						attributes: {
+							content: 'Einen Guten Tag!',
+							dropCap: false,
+						},
+						innerBlocks: [],
+					},
+				],
+			},
+		] );
+	} );
 } );

From a80d1c4e1398a916207ae2368f500dee00839b7b Mon Sep 17 00:00:00 2001
From: Aaron Robertshaw <60436221+aaronrobertshaw@users.noreply.github.com>
Date: Wed, 24 Jan 2024 11:48:05 +1000
Subject: [PATCH 245/296] Shadows: Prevent empty style object when removing
 shadow (#58155)

---
 packages/block-editor/src/hooks/effects.js | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/packages/block-editor/src/hooks/effects.js b/packages/block-editor/src/hooks/effects.js
index 92d9a2310f1c4..74d2aa46019d7 100644
--- a/packages/block-editor/src/hooks/effects.js
+++ b/packages/block-editor/src/hooks/effects.js
@@ -11,6 +11,7 @@ import StylesEffectsPanel, {
 } from '../components/global-styles/effects-panel';
 import { InspectorControls } from '../components';
 import { store as blockEditorStore } from '../store';
+import { cleanEmptyObject } from './utils';
 
 export const SHADOW_SUPPORT_KEY = 'shadow';
 export const EFFECTS_SUPPORT_KEYS = [ SHADOW_SUPPORT_KEY ];
@@ -30,17 +31,14 @@ function EffectsInspectorControl( { children, resetAllFilter } ) {
 }
 export function EffectsPanel( { clientId, setAttributes, settings } ) {
 	const isEnabled = useHasEffectsPanel( settings );
-	const blockAttributes = useSelect(
-		( select ) => select( blockEditorStore ).getBlockAttributes( clientId ),
+	const value = useSelect(
+		( select ) =>
+			select( blockEditorStore ).getBlockAttributes( clientId )?.style,
 		[ clientId ]
 	);
-	const shadow = blockAttributes?.style?.shadow;
-	const value = { shadow };
 
-	const onChange = ( newValue ) => {
-		setAttributes( {
-			style: { ...blockAttributes.style, shadow: newValue.shadow },
-		} );
+	const onChange = ( newStyle ) => {
+		setAttributes( { style: cleanEmptyObject( newStyle ) } );
 	};
 
 	if ( ! isEnabled ) {

From 21710673dec45eb36f29cdcdc93ca3080282f506 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A9o=20Muniz?= <leomuniz.primos@gmail.com>
Date: Tue, 23 Jan 2024 23:56:40 -0300
Subject: [PATCH 246/296] Fix removeAllNotices dispatch on the removeAllNotices
 doc section of @wordpress/notices (#57436)

* Fix removeAllNotices dispatch on the removeAllNotices section

The Usage example of the `removeAllNotices` section has a bug that prevents the code from working properly.

The method dispatched from `noticesStore` is `removeNotices` instead of the `removeAllNotices` used to remove all the notices at once below in the code when clicking on the buttons.

This PR simply replaces the `removeNotices` with the correct version `removeAllNotices`.

* Changes the source of docs for notices/removeAllNotices example
---
 docs/reference-guides/data/data-core-notices.md | 2 +-
 packages/notices/src/store/actions.js           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/reference-guides/data/data-core-notices.md b/docs/reference-guides/data/data-core-notices.md
index e11e6f226169f..d36098429811d 100644
--- a/docs/reference-guides/data/data-core-notices.md
+++ b/docs/reference-guides/data/data-core-notices.md
@@ -277,7 +277,7 @@ export const ExampleComponent = () => {
 	const notices = useSelect( ( select ) =>
 		select( noticesStore ).getNotices()
 	);
-	const { removeNotices } = useDispatch( noticesStore );
+	const { removeAllNotices } = useDispatch( noticesStore );
 	return (
 		<>
 			<ul>
diff --git a/packages/notices/src/store/actions.js b/packages/notices/src/store/actions.js
index 445eed10650b6..fb1c424307351 100644
--- a/packages/notices/src/store/actions.js
+++ b/packages/notices/src/store/actions.js
@@ -330,7 +330,7 @@ export function removeNotice( id, context = DEFAULT_CONTEXT ) {
  * 	const notices = useSelect( ( select ) =>
  * 		select( noticesStore ).getNotices()
  * 	);
- * 	const { removeNotices } = useDispatch( noticesStore );
+ * 	const { removeAllNotices } = useDispatch( noticesStore );
  * 	return (
  * 		<>
  * 			<ul>

From 177c45beb59280d98cf98959d0863061149ce8c5 Mon Sep 17 00:00:00 2001
From: Robert Anderson <robert@noisysocks.com>
Date: Wed, 24 Jan 2024 16:27:04 +1100
Subject: [PATCH 247/296] Rename __experimentalGetGlobalBlocksByName to
 getBlocksByName (#58156)

---
 .../data/data-core-block-editor.md            | 13 +++++++
 packages/block-editor/src/store/selectors.js  | 25 ++++++++++++--
 .../block-editor/src/store/test/selectors.js  | 34 ++++++++-----------
 .../src/table-of-contents/hooks.js            |  4 +--
 packages/edit-site/src/store/selectors.js     |  4 +--
 .../disable-non-page-content-blocks.js        |  6 ++--
 .../editor/src/store/private-selectors.js     |  2 +-
 7 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/docs/reference-guides/data/data-core-block-editor.md b/docs/reference-guides/data/data-core-block-editor.md
index 7b0bd386daaf4..b03e905d166bc 100644
--- a/docs/reference-guides/data/data-core-block-editor.md
+++ b/docs/reference-guides/data/data-core-block-editor.md
@@ -409,6 +409,19 @@ _Returns_
 
 -   `WPBlock[]`: Block objects.
 
+### getBlocksByName
+
+Returns all blocks that match a blockName. Results include nested blocks.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+-   _blockName_ `?string`: Optional block name, if not specified, returns an empty array.
+
+_Returns_
+
+-   `Array`: Array of clientIds of blocks with name equal to blockName.
+
 ### getBlockSelectionEnd
 
 Returns the current block selection end. This value may be null, and it may represent either a singular block selection or multi-selection end. A selection is singular if its start and end match.
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 8be04950f052a..120b85a04af0e 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -318,14 +318,14 @@ export const getGlobalBlockCount = createSelector(
 );
 
 /**
- * Returns all global blocks that match a blockName. Results include nested blocks.
+ * Returns all blocks that match a blockName. Results include nested blocks.
  *
  * @param {Object}  state     Global application state.
  * @param {?string} blockName Optional block name, if not specified, returns an empty array.
  *
  * @return {Array} Array of clientIds of blocks with name equal to blockName.
  */
-export const __experimentalGetGlobalBlocksByName = createSelector(
+export const getBlocksByName = createSelector(
 	( state, blockName ) => {
 		if ( ! blockName ) {
 			return EMPTY_ARRAY;
@@ -343,6 +343,27 @@ export const __experimentalGetGlobalBlocksByName = createSelector(
 	( state ) => [ state.blocks.order, state.blocks.byClientId ]
 );
 
+/**
+ * Returns all global blocks that match a blockName. Results include nested blocks.
+ *
+ * @deprecated
+ *
+ * @param {Object}  state     Global application state.
+ * @param {?string} blockName Optional block name, if not specified, returns an empty array.
+ *
+ * @return {Array} Array of clientIds of blocks with name equal to blockName.
+ */
+export function __experimentalGetGlobalBlocksByName( state, blockName ) {
+	deprecated(
+		"wp.data.select( 'core/block-editor' ).__experimentalGetGlobalBlocksByName",
+		{
+			since: '6.5',
+			alternative: `wp.data.select( 'core/block-editor' ).getBlocksByName`,
+		}
+	);
+	return getBlocksByName( state, blockName );
+}
+
 /**
  * Given an array of block client IDs, returns the corresponding array of block
  * objects.
diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
index 5046b6e5b83d6..b9cc5a9c30698 100644
--- a/packages/block-editor/src/store/test/selectors.js
+++ b/packages/block-editor/src/store/test/selectors.js
@@ -72,7 +72,7 @@ const {
 	__unstableGetClientIdsTree,
 	__experimentalGetPatternTransformItems,
 	wasBlockJustInserted,
-	__experimentalGetGlobalBlocksByName,
+	getBlocksByName,
 	getBlockEditingMode,
 } = selectors;
 
@@ -975,7 +975,7 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( '__experimentalGetGlobalBlocksByName', () => {
+	describe( 'getBlocksByName', () => {
 		const state = {
 			blocks: {
 				byClientId: new Map(
@@ -1017,31 +1017,25 @@ describe( 'selectors', () => {
 		};
 
 		it( 'should return the clientIds of blocks of a given type', () => {
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'core/heading' )
-			).toStrictEqual( [ '123' ] );
+			expect( getBlocksByName( state, 'core/heading' ) ).toStrictEqual( [
+				'123',
+			] );
 		} );
 
 		it( 'should return the clientIds of blocks of a given type even if blocks are nested', () => {
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'core/paragraph' )
-			).toStrictEqual( [ '456', '1415', '1213' ] );
+			expect( getBlocksByName( state, 'core/paragraph' ) ).toStrictEqual(
+				[ '456', '1415', '1213' ]
+			);
 		} );
 
 		it( 'Should return empty array if no blocks match. The empty array should be the same reference', () => {
-			const result = __experimentalGetGlobalBlocksByName(
-				state,
-				'test/missing'
+			const result = getBlocksByName( state, 'test/missing' );
+			expect( getBlocksByName( state, 'test/missing' ) ).toStrictEqual(
+				[]
+			);
+			expect( getBlocksByName( state, 'test/missing2' ) === result ).toBe(
+				true
 			);
-			expect(
-				__experimentalGetGlobalBlocksByName( state, 'test/missing' )
-			).toStrictEqual( [] );
-			expect(
-				__experimentalGetGlobalBlocksByName(
-					state,
-					'test/missing2'
-				) === result
-			).toBe( true );
 		} );
 	} );
 
diff --git a/packages/block-library/src/table-of-contents/hooks.js b/packages/block-library/src/table-of-contents/hooks.js
index af7b66568123f..ef24d8167381a 100644
--- a/packages/block-library/src/table-of-contents/hooks.js
+++ b/packages/block-library/src/table-of-contents/hooks.js
@@ -17,7 +17,7 @@ function getLatestHeadings( select, clientId ) {
 		getBlockAttributes,
 		getBlockName,
 		getClientIdsWithDescendants,
-		__experimentalGetGlobalBlocksByName: getGlobalBlocksByName,
+		getBlocksByName,
 	} = select( blockEditorStore );
 
 	// FIXME: @wordpress/block-library should not depend on @wordpress/editor.
@@ -28,7 +28,7 @@ function getLatestHeadings( select, clientId ) {
 	// eslint-disable-next-line @wordpress/data-no-store-string-literals
 	const permalink = select( 'core/editor' ).getPermalink() ?? null;
 
-	const isPaginated = getGlobalBlocksByName( 'core/nextpage' ).length !== 0;
+	const isPaginated = getBlocksByName( 'core/nextpage' ).length !== 0;
 	const { onlyIncludeCurrentPage } = getBlockAttributes( clientId ) ?? {};
 
 	// Get the client ids of all blocks in the editor.
diff --git a/packages/edit-site/src/store/selectors.js b/packages/edit-site/src/store/selectors.js
index becc066a45d24..2bc26386827cc 100644
--- a/packages/edit-site/src/store/selectors.js
+++ b/packages/edit-site/src/store/selectors.js
@@ -250,9 +250,7 @@ export const getCurrentTemplateTemplateParts = createRegistrySelector(
 		);
 
 		const clientIds =
-			select( blockEditorStore ).__experimentalGetGlobalBlocksByName(
-				'core/template-part'
-			);
+			select( blockEditorStore ).getBlocksByName( 'core/template-part' );
 		const blocks =
 			select( blockEditorStore ).getBlocksByClientId( clientIds );
 
diff --git a/packages/editor/src/components/provider/disable-non-page-content-blocks.js b/packages/editor/src/components/provider/disable-non-page-content-blocks.js
index 048b01d026c24..48a8119350d78 100644
--- a/packages/editor/src/components/provider/disable-non-page-content-blocks.js
+++ b/packages/editor/src/components/provider/disable-non-page-content-blocks.js
@@ -44,9 +44,9 @@ function DisableBlock( { clientId } ) {
 export default function DisableNonPageContentBlocks() {
 	useBlockEditingMode( 'disabled' );
 	const clientIds = useSelect( ( select ) => {
-		const { __experimentalGetGlobalBlocksByName } =
-			select( blockEditorStore );
-		return __experimentalGetGlobalBlocksByName( PAGE_CONTENT_BLOCK_TYPES );
+		return select( blockEditorStore ).getBlocksByName(
+			PAGE_CONTENT_BLOCK_TYPES
+		);
 	}, [] );
 
 	return clientIds.map( ( clientId ) => {
diff --git a/packages/editor/src/store/private-selectors.js b/packages/editor/src/store/private-selectors.js
index e276859f88403..e8e7bcfd18353 100644
--- a/packages/editor/src/store/private-selectors.js
+++ b/packages/editor/src/store/private-selectors.js
@@ -30,7 +30,7 @@ export const getInsertionPoint = createRegistrySelector(
 
 		if ( getRenderingMode( state ) === 'template-locked' ) {
 			const [ postContentClientId ] =
-				select( blockEditorStore ).__experimentalGetGlobalBlocksByName(
+				select( blockEditorStore ).getBlocksByName(
 					'core/post-content'
 				);
 			if ( postContentClientId ) {

From 973d87b3c4487f833b6a0905b702d74b8376c022 Mon Sep 17 00:00:00 2001
From: tellthemachines <tellthemachines@users.noreply.github.com>
Date: Wed, 24 Jan 2024 16:39:19 +1100
Subject: [PATCH 248/296] Allow drag and drop to create Rows and Galleries
 (#56186)

* Try dragging blocks onto other blocks to create Rows

* Make blocks draggable onto other blocks

* Change logic to use inbetween inserter

* make it less broken

* Drop to either side of target block

* Improve distances for drop indicator to show and wrap images in gallery

* Use THRESHOLD_DISTANCE

* Fix scrollbar weirdness

* Check blocks actually exist

* Make sure block to group with isn't already a Row.

* Make sure drop indicator doesn't appear outside Rows.

* Check block groupability

* Update tests to take new behaviour into account

* Fix Paragraph e2e tests

* Fix drag and drop e2e tests
---
 .../src/components/block-popover/inbetween.js |  24 +++-
 .../components/block-tools/insertion-point.js |  17 ++-
 .../components/use-block-drop-zone/index.js   |  79 ++++++++++----
 .../use-block-drop-zone/test/index.js         |  93 ++++++----------
 .../src/components/use-on-block-drop/index.js | 103 ++++++++++++++++--
 packages/block-editor/src/store/actions.js    |   4 +-
 packages/block-editor/src/store/reducer.js    |  10 +-
 packages/block-editor/src/utils/math.js       |  12 ++
 .../e2e/specs/editor/blocks/paragraph.spec.js |  27 ++++-
 .../editor/various/draggable-blocks.spec.js   |   3 +-
 .../editor/various/inserting-blocks.spec.js   |   3 +-
 11 files changed, 272 insertions(+), 103 deletions(-)

diff --git a/packages/block-editor/src/components/block-popover/inbetween.js b/packages/block-editor/src/components/block-popover/inbetween.js
index a0175c4d4ae58..afc983b1a4196 100644
--- a/packages/block-editor/src/components/block-popover/inbetween.js
+++ b/packages/block-editor/src/components/block-popover/inbetween.js
@@ -33,6 +33,8 @@ function BlockPopoverInbetween( {
 	children,
 	__unstablePopoverSlot,
 	__unstableContentRef,
+	operation = 'insert',
+	nearestSide = 'right',
 	...props
 } ) {
 	// This is a temporary hack to get the inbetween inserter to recompute properly.
@@ -81,7 +83,10 @@ function BlockPopoverInbetween( {
 			return undefined;
 		}
 
-		const contextElement = previousElement || nextElement;
+		const contextElement =
+			operation === 'group'
+				? nextElement || previousElement
+				: previousElement || nextElement;
 
 		return {
 			contextElement,
@@ -98,7 +103,20 @@ function BlockPopoverInbetween( {
 				let width = 0;
 				let height = 0;
 
-				if ( isVertical ) {
+				if ( operation === 'group' ) {
+					const targetRect = nextRect || previousRect;
+					top = targetRect.top;
+					// No spacing is likely around blocks in this operation.
+					// So width of the inserter containing rect is set to 0.
+					width = 0;
+					height = targetRect.bottom - targetRect.top;
+					// Popover calculates its distance from mid-block so some
+					// adjustments are needed to make it appear in the right place.
+					left =
+						nearestSide === 'left'
+							? targetRect.left - 2
+							: targetRect.right - 2;
+				} else if ( isVertical ) {
 					// vertical
 					top = previousRect ? previousRect.bottom : nextRect.top;
 					width = previousRect ? previousRect.width : nextRect.width;
@@ -141,6 +159,8 @@ function BlockPopoverInbetween( {
 		popoverRecomputeCounter,
 		isVertical,
 		isVisible,
+		operation,
+		nearestSide,
 	] );
 
 	const popoverScrollRef = usePopoverScroll( __unstableContentRef );
diff --git a/packages/block-editor/src/components/block-tools/insertion-point.js b/packages/block-editor/src/components/block-tools/insertion-point.js
index 1caec5f3aee8e..19ad39caca336 100644
--- a/packages/block-editor/src/components/block-tools/insertion-point.js
+++ b/packages/block-editor/src/components/block-tools/insertion-point.js
@@ -24,6 +24,8 @@ export const InsertionPointOpenRef = createContext();
 function InbetweenInsertionPointPopover( {
 	__unstablePopoverSlot,
 	__unstableContentRef,
+	operation = 'insert',
+	nearestSide = 'right',
 } ) {
 	const { selectBlock, hideInsertionPoint } = useDispatch( blockEditorStore );
 	const openRef = useContext( InsertionPointOpenRef );
@@ -138,9 +140,14 @@ function InbetweenInsertionPointPopover( {
 		return null;
 	}
 
+	const orientationClassname =
+		orientation === 'horizontal' || operation === 'group'
+			? 'is-horizontal'
+			: 'is-vertical';
+
 	const className = classnames(
 		'block-editor-block-list__insertion-point',
-		'is-' + orientation
+		orientationClassname
 	);
 
 	return (
@@ -149,6 +156,8 @@ function InbetweenInsertionPointPopover( {
 			nextClientId={ nextClientId }
 			__unstablePopoverSlot={ __unstablePopoverSlot }
 			__unstableContentRef={ __unstableContentRef }
+			operation={ operation }
+			nearestSide={ nearestSide }
 		>
 			<motion.div
 				layout={ ! disableMotion }
@@ -236,6 +245,10 @@ export default function InsertionPoint( props ) {
 			{ ...props }
 		/>
 	) : (
-		<InbetweenInsertionPointPopover { ...props } />
+		<InbetweenInsertionPointPopover
+			operation={ insertionPoint.operation }
+			nearestSide={ insertionPoint.nearestSide }
+			{ ...props }
+		/>
 	);
 }
diff --git a/packages/block-editor/src/components/use-block-drop-zone/index.js b/packages/block-editor/src/components/use-block-drop-zone/index.js
index 20bec8af76dff..b1573133dcd05 100644
--- a/packages/block-editor/src/components/use-block-drop-zone/index.js
+++ b/packages/block-editor/src/components/use-block-drop-zone/index.js
@@ -20,6 +20,7 @@ import useOnBlockDrop from '../use-on-block-drop';
 import {
 	getDistanceToNearestEdge,
 	isPointContainedByRect,
+	isPointWithinTopAndBottomBoundariesOfRect,
 } from '../../utils/math';
 import { store as blockEditorStore } from '../../store';
 
@@ -72,6 +73,8 @@ export function getDropTargetPosition(
 	let nearestIndex = 0;
 	let insertPosition = 'before';
 	let minDistance = Infinity;
+	let targetBlockIndex = null;
+	let nearestSide = 'right';
 
 	const {
 		dropZoneElement,
@@ -136,7 +139,12 @@ export function getDropTargetPosition(
 	}
 
 	blocksData.forEach(
-		( { isUnmodifiedDefaultBlock, getBoundingClientRect, blockIndex } ) => {
+		( {
+			isUnmodifiedDefaultBlock,
+			getBoundingClientRect,
+			blockIndex,
+			blockOrientation,
+		} ) => {
 			const rect = getBoundingClientRect();
 
 			let [ distance, edge ] = getDistanceToNearestEdge(
@@ -144,12 +152,35 @@ export function getDropTargetPosition(
 				rect,
 				allowedEdges
 			);
+			// If the the point is close to a side, prioritize that side.
+			const [ sideDistance, sideEdge ] = getDistanceToNearestEdge(
+				position,
+				rect,
+				[ 'left', 'right' ]
+			);
+
+			const isPointInsideRect = isPointContainedByRect( position, rect );
+
 			// Prioritize the element if the point is inside of an unmodified default block.
-			if (
-				isUnmodifiedDefaultBlock &&
-				isPointContainedByRect( position, rect )
-			) {
+			if ( isUnmodifiedDefaultBlock && isPointInsideRect ) {
 				distance = 0;
+			} else if (
+				orientation === 'vertical' &&
+				blockOrientation !== 'horizontal' &&
+				( ( isPointInsideRect && sideDistance < THRESHOLD_DISTANCE ) ||
+					( ! isPointInsideRect &&
+						isPointWithinTopAndBottomBoundariesOfRect(
+							position,
+							rect
+						) ) )
+			) {
+				/**
+				 * This condition should only apply when the layout is vertical (otherwise there's
+				 * no need to create a Row) and dropzones should only activate when the block is
+				 * either within and close to the sides of the target block or on its outer sides.
+				 */
+				targetBlockIndex = blockIndex;
+				nearestSide = sideEdge;
 			}
 
 			if ( distance < minDistance ) {
@@ -175,6 +206,10 @@ export function getDropTargetPosition(
 	const isAdjacentBlockUnmodifiedDefaultBlock =
 		!! blocksData[ adjacentIndex ]?.isUnmodifiedDefaultBlock;
 
+	// If the target index is set then group with the block at that index.
+	if ( targetBlockIndex !== null ) {
+		return [ targetBlockIndex, 'group', nearestSide ];
+	}
 	// If both blocks are not unmodified default blocks then just insert between them.
 	if (
 		! isNearestBlockUnmodifiedDefaultBlock &&
@@ -284,6 +319,7 @@ export default function useBlockDropZone( {
 		dropTarget.index,
 		{
 			operation: dropTarget.operation,
+			nearestSide: dropTarget.nearestSide,
 		}
 	);
 	const throttled = useThrottle(
@@ -333,28 +369,32 @@ export default function useBlockDropZone( {
 								.getElementById( `block-${ clientId }` )
 								.getBoundingClientRect(),
 						blockIndex: getBlockIndex( clientId ),
+						blockOrientation:
+							getBlockListSettings( clientId )?.orientation,
 					};
 				} );
 
-				const [ targetIndex, operation ] = getDropTargetPosition(
-					blocksData,
-					{ x: event.clientX, y: event.clientY },
-					getBlockListSettings( targetRootClientId )?.orientation,
-					{
-						dropZoneElement,
-						parentBlockClientId,
-						parentBlockOrientation: parentBlockClientId
-							? getBlockListSettings( parentBlockClientId )
-									?.orientation
-							: undefined,
-						rootBlockIndex: getBlockIndex( targetRootClientId ),
-					}
-				);
+				const [ targetIndex, operation, nearestSide ] =
+					getDropTargetPosition(
+						blocksData,
+						{ x: event.clientX, y: event.clientY },
+						getBlockListSettings( targetRootClientId )?.orientation,
+						{
+							dropZoneElement,
+							parentBlockClientId,
+							parentBlockOrientation: parentBlockClientId
+								? getBlockListSettings( parentBlockClientId )
+										?.orientation
+								: undefined,
+							rootBlockIndex: getBlockIndex( targetRootClientId ),
+						}
+					);
 
 				registry.batch( () => {
 					setDropTarget( {
 						index: targetIndex,
 						operation,
+						nearestSide,
 					} );
 
 					const insertionPointClientId = [
@@ -366,6 +406,7 @@ export default function useBlockDropZone( {
 
 					showInsertionPoint( insertionPointClientId, targetIndex, {
 						operation,
+						nearestSide,
 					} );
 				} );
 			},
diff --git a/packages/block-editor/src/components/use-block-drop-zone/test/index.js b/packages/block-editor/src/components/use-block-drop-zone/test/index.js
index f5560c1cfdf13..e6614b3fafc13 100644
--- a/packages/block-editor/src/components/use-block-drop-zone/test/index.js
+++ b/packages/block-editor/src/components/use-block-drop-zone/test/index.js
@@ -22,13 +22,6 @@ const elementData = [
 		bottom: 900,
 		right: 400,
 	},
-	// Fourth block wraps to the next row/column.
-	{
-		top: 0,
-		left: 400,
-		bottom: 300,
-		right: 800,
-	},
 ];
 
 const mapElements =
@@ -73,7 +66,7 @@ describe( 'getDropTargetPosition', () => {
 		const orientation = 'vertical';
 
 		it( 'returns `0` when the position is nearest to the start of the first block', () => {
-			const position = { x: 0, y: 0 };
+			const position = { x: 32, y: 0 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -85,7 +78,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `1` when the position is nearest to the end of the first block', () => {
-			const position = { x: 0, y: 190 };
+			const position = { x: 32, y: 190 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -97,7 +90,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `1` when the position is nearest to the start of the second block', () => {
-			const position = { x: 0, y: 210 };
+			const position = { x: 32, y: 210 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -109,7 +102,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `2` when the position is nearest to the end of the second block', () => {
-			const position = { x: 0, y: 450 };
+			const position = { x: 32, y: 450 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -121,7 +114,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `2` when the position is nearest to the start of the third block', () => {
-			const position = { x: 0, y: 510 };
+			const position = { x: 32, y: 510 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -133,7 +126,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `3` when the position is nearest to the end of the third block', () => {
-			const position = { x: 0, y: 880 };
+			const position = { x: 32, y: 880 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -145,7 +138,7 @@ describe( 'getDropTargetPosition', () => {
 		} );
 
 		it( 'returns `3` when the position is past the end of the third block', () => {
-			const position = { x: 0, y: 920 };
+			const position = { x: 32, y: 920 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -155,9 +148,8 @@ describe( 'getDropTargetPosition', () => {
 
 			expect( result ).toEqual( [ 3, 'insert' ] );
 		} );
-
-		it( 'returns `4` when the position is nearest to the start of the fourth block', () => {
-			const position = { x: 401, y: 0 };
+		it( 'returns group with index 0 when position is close to the right of the first block', () => {
+			const position = { x: 372, y: 0 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -165,11 +157,10 @@ describe( 'getDropTargetPosition', () => {
 				orientation
 			);
 
-			expect( result ).toEqual( [ 3, 'insert' ] );
+			expect( result ).toEqual( [ 0, 'group', 'right' ] );
 		} );
-
-		it( 'returns `5` when the position is nearest to the end of the fourth block', () => {
-			const position = { x: 401, y: 300 };
+		it( 'returns group with index 1 when position is close to the left of the second block', () => {
+			const position = { x: 12, y: 212 };
 
 			const result = getDropTargetPosition(
 				verticalBlocksData,
@@ -177,7 +168,7 @@ describe( 'getDropTargetPosition', () => {
 				orientation
 			);
 
-			expect( result ).toEqual( [ 4, 'insert' ] );
+			expect( result ).toEqual( [ 1, 'group', 'left' ] );
 		} );
 	} );
 
@@ -267,30 +258,6 @@ describe( 'getDropTargetPosition', () => {
 
 			expect( result ).toEqual( [ 3, 'insert' ] );
 		} );
-
-		it( 'returns `3` when the position is nearest to the start of the last block', () => {
-			const position = { x: 0, y: 401 };
-
-			const result = getDropTargetPosition(
-				horizontalBlocksData,
-				position,
-				orientation
-			);
-
-			expect( result ).toEqual( [ 3, 'insert' ] );
-		} );
-
-		it( 'returns `4` when the position is nearest to the end of the last block', () => {
-			const position = { x: 300, y: 401 };
-
-			const result = getDropTargetPosition(
-				horizontalBlocksData,
-				position,
-				orientation
-			);
-
-			expect( result ).toEqual( [ 4, 'insert' ] );
-		} );
 	} );
 
 	describe( 'Unmodified default blocks', () => {
@@ -316,14 +283,18 @@ describe( 'getDropTargetPosition', () => {
 
 			// Dropping above the first block.
 			expect(
-				getDropTargetPosition( blocksData, { x: 0, y: 0 }, orientation )
+				getDropTargetPosition(
+					blocksData,
+					{ x: 32, y: 0 },
+					orientation
+				)
 			).toEqual( [ 0, 'replace' ] );
 
 			// Dropping on the top half of the first block.
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 20 },
+					{ x: 32, y: 20 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -332,7 +303,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 200 },
+					{ x: 32, y: 200 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -341,7 +312,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 211 },
+					{ x: 32, y: 211 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -350,7 +321,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 219 },
+					{ x: 32, y: 219 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -359,7 +330,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 230 },
+					{ x: 32, y: 230 },
 					orientation
 				)
 			).toEqual( [ 0, 'replace' ] );
@@ -368,7 +339,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 410 },
+					{ x: 32, y: 410 },
 					orientation
 				)
 			).toEqual( [ 2, 'insert' ] );
@@ -377,7 +348,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 421 },
+					{ x: 32, y: 421 },
 					orientation
 				)
 			).toEqual( [ 2, 'insert' ] );
@@ -410,7 +381,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 20 },
+					{ x: 32, y: 20 },
 					orientation
 				)
 			).toEqual( [ 0, 'insert' ] );
@@ -419,7 +390,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 200 },
+					{ x: 32, y: 200 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -428,7 +399,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 211 },
+					{ x: 32, y: 211 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -437,7 +408,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 219 },
+					{ x: 32, y: 219 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -446,7 +417,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 230 },
+					{ x: 32, y: 230 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -455,7 +426,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 410 },
+					{ x: 32, y: 410 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
@@ -464,7 +435,7 @@ describe( 'getDropTargetPosition', () => {
 			expect(
 				getDropTargetPosition(
 					blocksData,
-					{ x: 0, y: 421 },
+					{ x: 32, y: 421 },
 					orientation
 				)
 			).toEqual( [ 1, 'replace' ] );
diff --git a/packages/block-editor/src/components/use-on-block-drop/index.js b/packages/block-editor/src/components/use-on-block-drop/index.js
index 701cc9f4f8451..80e83c01b4b9a 100644
--- a/packages/block-editor/src/components/use-on-block-drop/index.js
+++ b/packages/block-editor/src/components/use-on-block-drop/index.js
@@ -4,9 +4,11 @@
 import { useCallback } from '@wordpress/element';
 import {
 	cloneBlock,
+	createBlock,
 	findTransform,
 	getBlockTransforms,
 	pasteHandler,
+	store as blocksStore,
 } from '@wordpress/blocks';
 import { useDispatch, useSelect, useRegistry } from '@wordpress/data';
 import { getFilesFromDataTransfer } from '@wordpress/dom';
@@ -61,6 +63,8 @@ export function parseDropEvent( event ) {
  * @param {Function} moveBlocks                A function that moves blocks.
  * @param {Function} insertOrReplaceBlocks     A function that inserts or replaces blocks.
  * @param {Function} clearSelectedBlock        A function that clears block selection.
+ * @param {string}   operation                 The type of operation to perform on drop. Could be `insert` or `replace` or `group`.
+ * @param {Function} getBlock                  A function that returns a block given its client id.
  * @return {Function} The event handler for a block drop event.
  */
 export function onBlockDrop(
@@ -70,7 +74,9 @@ export function onBlockDrop(
 	getClientIdsOfDescendants,
 	moveBlocks,
 	insertOrReplaceBlocks,
-	clearSelectedBlock
+	clearSelectedBlock,
+	operation,
+	getBlock
 ) {
 	return ( event ) => {
 		const {
@@ -113,6 +119,21 @@ export function onBlockDrop(
 				return;
 			}
 
+			// If the user is dropping a block over another block, replace both blocks
+			// with a group block containing them
+			if ( operation === 'group' ) {
+				const blocksToInsert = sourceClientIds.map( ( clientId ) =>
+					getBlock( clientId )
+				);
+				insertOrReplaceBlocks(
+					blocksToInsert,
+					true,
+					null,
+					sourceClientIds
+				);
+				return;
+			}
+
 			const isAtSameLevel = sourceRootClientId === targetRootClientId;
 			const draggedBlockCount = sourceClientIds.length;
 
@@ -202,7 +223,7 @@ export default function useOnBlockDrop(
 	targetBlockIndex,
 	options = {}
 ) {
-	const { operation = 'insert' } = options;
+	const { operation = 'insert', nearestSide = 'right' } = options;
 	const {
 		canInsertBlockType,
 		getBlockIndex,
@@ -210,7 +231,10 @@ export default function useOnBlockDrop(
 		getBlockOrder,
 		getBlocksByClientId,
 		getSettings,
+		getBlock,
+		isGroupable,
 	} = useSelect( blockEditorStore );
+	const { getBlockType, getGroupingBlockName } = useSelect( blocksStore );
 	const {
 		insertBlocks,
 		moveBlocksToPosition,
@@ -222,12 +246,63 @@ export default function useOnBlockDrop(
 	const registry = useRegistry();
 
 	const insertOrReplaceBlocks = useCallback(
-		( blocks, updateSelection = true, initialPosition = 0 ) => {
+		(
+			blocks,
+			updateSelection = true,
+			initialPosition = 0,
+			clientIdsToReplace = []
+		) => {
+			const clientIds = getBlockOrder( targetRootClientId );
+			const clientId = clientIds[ targetBlockIndex ];
+			const blocksClientIds = blocks.map( ( block ) => block.clientId );
+			const areGroupableBlocks = isGroupable( [
+				...blocksClientIds,
+				clientId,
+			] );
 			if ( operation === 'replace' ) {
-				const clientIds = getBlockOrder( targetRootClientId );
-				const clientId = clientIds[ targetBlockIndex ];
-
 				replaceBlocks( clientId, blocks, undefined, initialPosition );
+			} else if ( operation === 'group' && areGroupableBlocks ) {
+				const targetBlock = getBlock( clientId );
+				if ( nearestSide === 'left' ) {
+					blocks.push( targetBlock );
+				} else {
+					blocks.unshift( targetBlock );
+				}
+
+				const groupInnerBlocks = blocks.map( ( block ) => {
+					return createBlock(
+						block.name,
+						block.attributes,
+						block.innerBlocks
+					);
+				} );
+
+				const areAllImages = blocks.every( ( block ) => {
+					return block.name === 'core/image';
+				} );
+
+				const galleryBlock = !! getBlockType( 'core/gallery' );
+
+				const wrappedBlocks = createBlock(
+					areAllImages && galleryBlock
+						? 'core/gallery'
+						: getGroupingBlockName(),
+					{
+						layout: {
+							type: 'flex',
+							flexWrap: areAllImages ? null : 'nowrap',
+						},
+					},
+					groupInnerBlocks
+				);
+				// Need to make sure both the target block and the block being dragged are replaced
+				// otherwise the dragged block will be duplicated.
+				replaceBlocks(
+					[ clientId, ...clientIdsToReplace ],
+					wrappedBlocks,
+					undefined,
+					initialPosition
+				);
 			} else {
 				insertBlocks(
 					blocks,
@@ -239,12 +314,16 @@ export default function useOnBlockDrop(
 			}
 		},
 		[
-			operation,
 			getBlockOrder,
-			insertBlocks,
-			replaceBlocks,
-			targetBlockIndex,
 			targetRootClientId,
+			targetBlockIndex,
+			operation,
+			replaceBlocks,
+			getBlock,
+			nearestSide,
+			getBlockType,
+			getGroupingBlockName,
+			insertBlocks,
 		]
 	);
 
@@ -297,7 +376,9 @@ export default function useOnBlockDrop(
 		getClientIdsOfDescendants,
 		moveBlocks,
 		insertOrReplaceBlocks,
-		clearSelectedBlock
+		clearSelectedBlock,
+		operation,
+		getBlock
 	);
 	const _onFilesDrop = onFilesDrop(
 		targetRootClientId,
diff --git a/packages/block-editor/src/store/actions.js b/packages/block-editor/src/store/actions.js
index 47d530c8319a2..6adbafe28341c 100644
--- a/packages/block-editor/src/store/actions.js
+++ b/packages/block-editor/src/store/actions.js
@@ -640,13 +640,15 @@ export function showInsertionPoint(
 	index,
 	__unstableOptions = {}
 ) {
-	const { __unstableWithInserter, operation } = __unstableOptions;
+	const { __unstableWithInserter, operation, nearestSide } =
+		__unstableOptions;
 	return {
 		type: 'SHOW_INSERTION_POINT',
 		rootClientId,
 		index,
 		__unstableWithInserter,
 		operation,
+		nearestSide,
 	};
 }
 /**
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
index fa6c8942e66ad..1091d5b5e7aff 100644
--- a/packages/block-editor/src/store/reducer.js
+++ b/packages/block-editor/src/store/reducer.js
@@ -1599,13 +1599,19 @@ export function blocksMode( state = {}, action ) {
 export function insertionPoint( state = null, action ) {
 	switch ( action.type ) {
 		case 'SHOW_INSERTION_POINT': {
-			const { rootClientId, index, __unstableWithInserter, operation } =
-				action;
+			const {
+				rootClientId,
+				index,
+				__unstableWithInserter,
+				operation,
+				nearestSide,
+			} = action;
 			const nextState = {
 				rootClientId,
 				index,
 				__unstableWithInserter,
 				operation,
+				nearestSide,
 			};
 
 			// Bail out updates if the states are the same.
diff --git a/packages/block-editor/src/utils/math.js b/packages/block-editor/src/utils/math.js
index 128972e8a400e..5d8ed97ffefb2 100644
--- a/packages/block-editor/src/utils/math.js
+++ b/packages/block-editor/src/utils/math.js
@@ -106,3 +106,15 @@ export function isPointContainedByRect( point, rect ) {
 		rect.bottom >= point.y
 	);
 }
+
+/**
+ * Is the point within the top and bottom boundaries of the rectangle.
+ *
+ * @param {WPPoint} point The point.
+ * @param {DOMRect} rect  The rectangle.
+ *
+ * @return {boolean} True if the point is within top and bottom of rectangle, false otherwise.
+ */
+export function isPointWithinTopAndBottomBoundariesOfRect( point, rect ) {
+	return rect.top <= point.y && rect.bottom >= point.y;
+}
diff --git a/test/e2e/specs/editor/blocks/paragraph.spec.js b/test/e2e/specs/editor/blocks/paragraph.spec.js
index 142b01be282d4..dd3cd9196efb2 100644
--- a/test/e2e/specs/editor/blocks/paragraph.spec.js
+++ b/test/e2e/specs/editor/blocks/paragraph.spec.js
@@ -252,8 +252,9 @@ test.describe( 'Paragraph', () => {
 
 				{
 					// Dragging on the bottom half of the heading block.
+					// Make sure to target the bottom dropzone by dragging > 30px inside the block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + headingBox.height - 1
 					);
 					await expect( draggingUtils.dropZone ).toBeHidden();
@@ -268,6 +269,26 @@ test.describe( 'Paragraph', () => {
 						)
 						.toBeGreaterThan( headingBox.y + headingBox.height );
 				}
+
+				{
+					// Dragging on the right edge of the heading block.
+					// Targets the right hand dropzone.
+					await draggingUtils.dragOver(
+						headingBox.x + headingBox.width - 1,
+						headingBox.y + headingBox.height - 1
+					);
+					await expect( draggingUtils.dropZone ).toBeHidden();
+					await expect(
+						draggingUtils.insertionIndicator
+					).toBeVisible();
+					await expect
+						.poll( () =>
+							draggingUtils.insertionIndicator
+								.boundingBox()
+								.then( ( { x, width } ) => x + width )
+						)
+						.toBe( headingBox.x + headingBox.width );
+				}
 			} );
 
 			test( 'Only the second block is an empty paragraph block', async ( {
@@ -299,7 +320,7 @@ test.describe( 'Paragraph', () => {
 				{
 					// Dragging on the top half of the heading block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + 1
 					);
 					await expect( draggingUtils.dropZone ).toBeHidden();
@@ -318,7 +339,7 @@ test.describe( 'Paragraph', () => {
 				{
 					// Dragging on the bottom half of the heading block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + headingBox.height - 1
 					);
 					await expect( draggingUtils.dropZone ).toBeVisible();
diff --git a/test/e2e/specs/editor/various/draggable-blocks.spec.js b/test/e2e/specs/editor/various/draggable-blocks.spec.js
index 29a81f57540e0..e08030191dd60 100644
--- a/test/e2e/specs/editor/various/draggable-blocks.spec.js
+++ b/test/e2e/specs/editor/various/draggable-blocks.spec.js
@@ -134,9 +134,10 @@ test.describe( 'Draggable block', () => {
 		const secondParagraphBound = await secondParagraph.boundingBox();
 		// Call the move function twice to make sure the `dragOver` event is sent.
 		// @see https://github.com/microsoft/playwright/issues/17153
+		// Make sure mouse is > 30px within the block for bottom drop indicator to appear.
 		for ( let i = 0; i < 2; i += 1 ) {
 			await page.mouse.move(
-				secondParagraphBound.x,
+				secondParagraphBound.x + 32,
 				secondParagraphBound.y + secondParagraphBound.height * 0.75
 			);
 		}
diff --git a/test/e2e/specs/editor/various/inserting-blocks.spec.js b/test/e2e/specs/editor/various/inserting-blocks.spec.js
index 4d26a198fc345..a000f02eaca8c 100644
--- a/test/e2e/specs/editor/various/inserting-blocks.spec.js
+++ b/test/e2e/specs/editor/various/inserting-blocks.spec.js
@@ -451,7 +451,8 @@ class InsertingBlocksUtils {
 		for ( let i = 0; i < 2; i += 1 ) {
 			await this.page.mouse.move(
 				// Hover on the right side of the block to avoid collapsing with the preview.
-				boundingBox.x + boundingBox.width - 1,
+				// But not too far to avoid triggering the grouping block inserter.
+				boundingBox.x + boundingBox.width - 32,
 				// Hover on the bottom of the paragraph block.
 				boundingBox.y + boundingBox.height - 1
 			);

From 0d31be1a3c78bd735c989b0135b5ca4b4dc4d993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Wed, 24 Jan 2024 09:16:18 +0100
Subject: [PATCH 249/296] DataViews: make dataviews powered page patterns
 stable (#58139)

---
 .../edit-site/src/components/layout/router.js |   7 +-
 .../page-patterns/dataviews-patterns.js       | 422 ------------------
 .../src/components/page-patterns/index.js     | 406 ++++++++++++++++-
 test/e2e/specs/site-editor/patterns.spec.js   |   4 +-
 4 files changed, 396 insertions(+), 443 deletions(-)
 delete mode 100644 packages/edit-site/src/components/page-patterns/dataviews-patterns.js

diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
index a59b18a7f9ffd..08f036f68a321 100644
--- a/packages/edit-site/src/components/layout/router.js
+++ b/packages/edit-site/src/components/layout/router.js
@@ -9,7 +9,6 @@ import { privateApis as routerPrivateApis } from '@wordpress/router';
 import { unlock } from '../../lock-unlock';
 import { useIsSiteEditorLoading } from './hooks';
 import Editor from '../editor';
-import DataviewsPatterns from '../page-patterns/dataviews-patterns';
 import PagePages from '../page-pages';
 import PagePatterns from '../page-patterns';
 import PageTemplatesTemplateParts from '../page-templates-template-parts';
@@ -112,11 +111,7 @@ export default function useLayoutAreas() {
 	if ( path === '/patterns' ) {
 		return {
 			areas: {
-				content: window?.__experimentalAdminViews ? (
-					<DataviewsPatterns />
-				) : (
-					<PagePatterns />
-				),
+				content: <PagePatterns />,
 			},
 		};
 	}
diff --git a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js b/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
deleted file mode 100644
index 9bf37a8fabbba..0000000000000
--- a/packages/edit-site/src/components/page-patterns/dataviews-patterns.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/**
- * WordPress dependencies
- */
-import {
-	__experimentalHStack as HStack,
-	Button,
-	Tooltip,
-	Flex,
-} from '@wordpress/components';
-import { getQueryArgs } from '@wordpress/url';
-import { __, _x } from '@wordpress/i18n';
-import {
-	useState,
-	useMemo,
-	useCallback,
-	useId,
-	useEffect,
-} from '@wordpress/element';
-import {
-	BlockPreview,
-	privateApis as blockEditorPrivateApis,
-} from '@wordpress/block-editor';
-import {
-	DataViews,
-	sortByTextFields,
-	getPaginationResults,
-} from '@wordpress/dataviews';
-import {
-	Icon,
-	header,
-	footer,
-	symbolFilled as uncategorized,
-	symbol,
-	lockSmall,
-} from '@wordpress/icons';
-import { usePrevious } from '@wordpress/compose';
-
-/**
- * Internal dependencies
- */
-import Page from '../page';
-import {
-	LAYOUT_GRID,
-	PATTERN_TYPES,
-	TEMPLATE_PART_POST_TYPE,
-	PATTERN_SYNC_TYPES,
-	PATTERN_DEFAULT_CATEGORY,
-	ENUMERATION_TYPE,
-	OPERATOR_IN,
-} from '../../utils/constants';
-import {
-	exportJSONaction,
-	renameAction,
-	resetAction,
-	deleteAction,
-	duplicatePatternAction,
-	duplicateTemplatePartAction,
-} from './dataviews-pattern-actions';
-import usePatternSettings from './use-pattern-settings';
-import { unlock } from '../../lock-unlock';
-import usePatterns from './use-patterns';
-import PatternsHeader from './header';
-import { useLink } from '../routes/link';
-
-const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
-	blockEditorPrivateApis
-);
-
-const templatePartIcons = { header, footer, uncategorized };
-const EMPTY_ARRAY = [];
-const defaultConfigPerViewType = {
-	[ LAYOUT_GRID ]: {
-		mediaField: 'preview',
-		primaryField: 'title',
-	},
-};
-const DEFAULT_VIEW = {
-	type: LAYOUT_GRID,
-	search: '',
-	page: 1,
-	perPage: 20,
-	hiddenFields: [ 'sync-status' ],
-	layout: {
-		...defaultConfigPerViewType[ LAYOUT_GRID ],
-	},
-	filters: [],
-};
-
-const SYNC_FILTERS = [
-	{
-		value: PATTERN_SYNC_TYPES.full,
-		label: _x( 'Synced', 'Option that shows all synchronized patterns' ),
-		description: __( 'Patterns that are kept in sync across the site.' ),
-	},
-	{
-		value: PATTERN_SYNC_TYPES.unsynced,
-		label: _x(
-			'Not synced',
-			'Option that shows all patterns that are not synchronized'
-		),
-		description: __(
-			'Patterns that can be changed freely without affecting the site.'
-		),
-	},
-];
-
-function PreviewWrapper( { item, onClick, ariaDescribedBy, children } ) {
-	if ( item.type === PATTERN_TYPES.theme ) {
-		return children;
-	}
-	return (
-		<button
-			className="page-patterns-preview-field__button"
-			type="button"
-			onClick={ onClick }
-			aria-label={ item.title }
-			aria-describedby={ ariaDescribedBy }
-		>
-			{ children }
-		</button>
-	);
-}
-
-function Preview( { item, categoryId, viewType } ) {
-	const descriptionId = useId();
-	const isUserPattern = item.type === PATTERN_TYPES.user;
-	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
-	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
-	const isEmpty = ! item.blocks?.length;
-	// Only custom patterns or custom template parts can be renamed or deleted.
-	const isCustomPattern =
-		isUserPattern || ( isTemplatePart && item.isCustom );
-	const ariaDescriptions = [];
-	if ( isCustomPattern ) {
-		// User patterns don't have descriptions, but can be edited and deleted, so include some help text.
-		ariaDescriptions.push(
-			__( 'Press Enter to edit, or Delete to delete the pattern.' )
-		);
-	} else if ( item.description ) {
-		ariaDescriptions.push( item.description );
-	}
-
-	if ( isNonUserPattern ) {
-		ariaDescriptions.push(
-			__( 'Theme & plugin patterns cannot be edited.' )
-		);
-	}
-	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
-	const { onClick } = useLink( {
-		postType: item.type,
-		postId: isUserPattern ? item.id : item.name,
-		categoryId,
-		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
-	} );
-
-	return (
-		<>
-			<div
-				className={ `page-patterns-preview-field is-viewtype-${ viewType }` }
-				style={ { backgroundColor } }
-			>
-				<PreviewWrapper
-					item={ item }
-					onClick={ onClick }
-					ariaDescribedBy={
-						ariaDescriptions.length
-							? ariaDescriptions
-									.map(
-										( _, index ) =>
-											`${ descriptionId }-${ index }`
-									)
-									.join( ' ' )
-							: undefined
-					}
-				>
-					{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
-					{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
-					{ ! isEmpty && <BlockPreview blocks={ item.blocks } /> }
-				</PreviewWrapper>
-			</div>
-			{ ariaDescriptions.map( ( ariaDescription, index ) => (
-				<div
-					key={ index }
-					hidden
-					id={ `${ descriptionId }-${ index }` }
-				>
-					{ ariaDescription }
-				</div>
-			) ) }
-		</>
-	);
-}
-
-function Title( { item, categoryId } ) {
-	const isUserPattern = item.type === PATTERN_TYPES.user;
-	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
-	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
-	let itemIcon;
-	const { onClick } = useLink( {
-		postType: item.type,
-		postId: isUserPattern ? item.id : item.name,
-		categoryId,
-		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
-	} );
-	if ( ! isUserPattern && templatePartIcons[ categoryId ] ) {
-		itemIcon = templatePartIcons[ categoryId ];
-	} else {
-		itemIcon =
-			item.syncStatus === PATTERN_SYNC_TYPES.full ? symbol : undefined;
-	}
-	return (
-		<HStack alignment="center" justify="flex-start" spacing={ 2 }>
-			{ itemIcon && ! isNonUserPattern && (
-				<Tooltip
-					placement="top"
-					text={ __(
-						'Editing this pattern will also update anywhere it is used'
-					) }
-				>
-					<Icon
-						className="edit-site-patterns__pattern-icon"
-						icon={ itemIcon }
-					/>
-				</Tooltip>
-			) }
-			{ item.type === PATTERN_TYPES.theme && (
-				<Tooltip
-					placement="top"
-					text={ __( 'This pattern cannot be edited.' ) }
-				>
-					<Icon
-						className="edit-site-patterns__pattern-lock-icon"
-						icon={ lockSmall }
-						size={ 24 }
-					/>
-				</Tooltip>
-			) }
-			<Flex
-				as="div"
-				gap={ 0 }
-				justify="left"
-				className="edit-site-patterns__pattern-title"
-			>
-				{ item.type === PATTERN_TYPES.theme ? (
-					item.title
-				) : (
-					<Button
-						variant="link"
-						onClick={ onClick }
-						// Required for the grid's roving tab index system.
-						// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
-						tabIndex="-1"
-					>
-						{ item.title || item.name }
-					</Button>
-				) }
-			</Flex>
-		</HStack>
-	);
-}
-
-export default function DataviewsPatterns() {
-	const { categoryType, categoryId = PATTERN_DEFAULT_CATEGORY } =
-		getQueryArgs( window.location.href );
-	const type = categoryType || PATTERN_TYPES.theme;
-	const [ view, setView ] = useState( DEFAULT_VIEW );
-	const isUncategorizedThemePatterns =
-		type === PATTERN_TYPES.theme && categoryId === 'uncategorized';
-	const previousCategoryId = usePrevious( categoryId );
-	const viewSyncStatus = view.filters?.find(
-		( { field } ) => field === 'sync-status'
-	)?.value;
-	const { patterns, isResolving } = usePatterns(
-		type,
-		isUncategorizedThemePatterns ? '' : categoryId,
-		{
-			search: view.search,
-			syncStatus: viewSyncStatus,
-		}
-	);
-	const fields = useMemo( () => {
-		const _fields = [
-			{
-				header: __( 'Preview' ),
-				id: 'preview',
-				render: ( { item } ) => (
-					<Preview
-						item={ item }
-						categoryId={ categoryId }
-						viewType={ view.type }
-					/>
-				),
-				enableSorting: false,
-				enableHiding: false,
-			},
-			{
-				header: __( 'Title' ),
-				id: 'title',
-				getValue: ( { item } ) => item.title,
-				render: ( { item } ) => (
-					<Title item={ item } categoryId={ categoryId } />
-				),
-				enableHiding: false,
-			},
-		];
-		if ( type === PATTERN_TYPES.theme ) {
-			_fields.push( {
-				header: __( 'Sync Status' ),
-				id: 'sync-status',
-				render: ( { item } ) => {
-					// User patterns can have their sync statuses checked directly.
-					// Non-user patterns are all unsynced for the time being.
-					return (
-						SYNC_FILTERS.find(
-							( { value } ) => value === item.syncStatus
-						)?.label ||
-						SYNC_FILTERS.find(
-							( { value } ) =>
-								value === PATTERN_SYNC_TYPES.unsynced
-						).label
-					);
-				},
-				type: ENUMERATION_TYPE,
-				elements: SYNC_FILTERS,
-				filterBy: {
-					operators: [ OPERATOR_IN ],
-				},
-				enableSorting: false,
-			} );
-		}
-		return _fields;
-	}, [ view.type, categoryId, type ] );
-	// Reset the page number when the category changes.
-	useEffect( () => {
-		if ( previousCategoryId !== categoryId ) {
-			setView( DEFAULT_VIEW );
-		}
-	}, [ categoryId, previousCategoryId ] );
-	const { data, paginationInfo } = useMemo( () => {
-		if ( ! patterns ) {
-			return {
-				data: EMPTY_ARRAY,
-				paginationInfo: { totalItems: 0, totalPages: 0 },
-			};
-		}
-		let filteredData = [ ...patterns ];
-		// Handle sorting.
-		if ( view.sort ) {
-			filteredData = sortByTextFields( {
-				data: filteredData,
-				view,
-				fields,
-				textFields: [ 'title', 'author' ],
-			} );
-		}
-		// Handle pagination.
-		return getPaginationResults( {
-			data: filteredData,
-			view,
-		} );
-	}, [ patterns, view, fields ] );
-
-	const actions = useMemo(
-		() => [
-			renameAction,
-			duplicatePatternAction,
-			duplicateTemplatePartAction,
-			exportJSONaction,
-			resetAction,
-			deleteAction,
-		],
-		[]
-	);
-	const onChangeView = useCallback(
-		( newView ) => {
-			if ( newView.type !== view.type ) {
-				newView = {
-					...newView,
-					layout: {
-						...defaultConfigPerViewType[ newView.type ],
-					},
-				};
-			}
-			setView( newView );
-		},
-		[ view.type, setView ]
-	);
-	const id = useId();
-	const settings = usePatternSettings();
-	// Wrap everything in a block editor provider.
-	// This ensures 'styles' that are needed for the previews are synced
-	// from the site editor store to the block editor store.
-	// TODO: check if I add the provider in every preview like in templates...
-	return (
-		<ExperimentalBlockEditorProvider settings={ settings }>
-			<Page
-				title={ __( 'Patterns content' ) }
-				className="edit-site-page-patterns-dataviews"
-				hideTitleFromUI
-			>
-				<PatternsHeader
-					categoryId={ categoryId }
-					type={ type }
-					titleId={ `${ id }-title` }
-					descriptionId={ `${ id }-description` }
-				/>
-				<DataViews
-					paginationInfo={ paginationInfo }
-					fields={ fields }
-					actions={ actions }
-					data={ data || EMPTY_ARRAY }
-					getItemId={ ( item ) => item.name }
-					isLoading={ isResolving }
-					view={ view }
-					onChangeView={ onChangeView }
-					deferredRendering={ true }
-					supportedLayouts={ [ LAYOUT_GRID ] }
-				/>
-			</Page>
-		</ExperimentalBlockEditorProvider>
-	);
-}
diff --git a/packages/edit-site/src/components/page-patterns/index.js b/packages/edit-site/src/components/page-patterns/index.js
index 713fa21c8fe92..9bf37a8fabbba 100644
--- a/packages/edit-site/src/components/page-patterns/index.js
+++ b/packages/edit-site/src/components/page-patterns/index.js
@@ -1,42 +1,420 @@
 /**
  * WordPress dependencies
  */
-import { __ } from '@wordpress/i18n';
-import { privateApis as blockEditorPrivateApis } from '@wordpress/block-editor';
+import {
+	__experimentalHStack as HStack,
+	Button,
+	Tooltip,
+	Flex,
+} from '@wordpress/components';
 import { getQueryArgs } from '@wordpress/url';
+import { __, _x } from '@wordpress/i18n';
+import {
+	useState,
+	useMemo,
+	useCallback,
+	useId,
+	useEffect,
+} from '@wordpress/element';
+import {
+	BlockPreview,
+	privateApis as blockEditorPrivateApis,
+} from '@wordpress/block-editor';
+import {
+	DataViews,
+	sortByTextFields,
+	getPaginationResults,
+} from '@wordpress/dataviews';
+import {
+	Icon,
+	header,
+	footer,
+	symbolFilled as uncategorized,
+	symbol,
+	lockSmall,
+} from '@wordpress/icons';
+import { usePrevious } from '@wordpress/compose';
 
 /**
  * Internal dependencies
  */
-import { PATTERN_DEFAULT_CATEGORY, PATTERN_TYPES } from '../../utils/constants';
 import Page from '../page';
-import PatternsList from './patterns-list';
+import {
+	LAYOUT_GRID,
+	PATTERN_TYPES,
+	TEMPLATE_PART_POST_TYPE,
+	PATTERN_SYNC_TYPES,
+	PATTERN_DEFAULT_CATEGORY,
+	ENUMERATION_TYPE,
+	OPERATOR_IN,
+} from '../../utils/constants';
+import {
+	exportJSONaction,
+	renameAction,
+	resetAction,
+	deleteAction,
+	duplicatePatternAction,
+	duplicateTemplatePartAction,
+} from './dataviews-pattern-actions';
 import usePatternSettings from './use-pattern-settings';
 import { unlock } from '../../lock-unlock';
+import usePatterns from './use-patterns';
+import PatternsHeader from './header';
+import { useLink } from '../routes/link';
 
-const { ExperimentalBlockEditorProvider } = unlock( blockEditorPrivateApis );
+const { ExperimentalBlockEditorProvider, useGlobalStyle } = unlock(
+	blockEditorPrivateApis
+);
 
-export default function PagePatterns() {
-	const { categoryType, categoryId } = getQueryArgs( window.location.href );
+const templatePartIcons = { header, footer, uncategorized };
+const EMPTY_ARRAY = [];
+const defaultConfigPerViewType = {
+	[ LAYOUT_GRID ]: {
+		mediaField: 'preview',
+		primaryField: 'title',
+	},
+};
+const DEFAULT_VIEW = {
+	type: LAYOUT_GRID,
+	search: '',
+	page: 1,
+	perPage: 20,
+	hiddenFields: [ 'sync-status' ],
+	layout: {
+		...defaultConfigPerViewType[ LAYOUT_GRID ],
+	},
+	filters: [],
+};
+
+const SYNC_FILTERS = [
+	{
+		value: PATTERN_SYNC_TYPES.full,
+		label: _x( 'Synced', 'Option that shows all synchronized patterns' ),
+		description: __( 'Patterns that are kept in sync across the site.' ),
+	},
+	{
+		value: PATTERN_SYNC_TYPES.unsynced,
+		label: _x(
+			'Not synced',
+			'Option that shows all patterns that are not synchronized'
+		),
+		description: __(
+			'Patterns that can be changed freely without affecting the site.'
+		),
+	},
+];
+
+function PreviewWrapper( { item, onClick, ariaDescribedBy, children } ) {
+	if ( item.type === PATTERN_TYPES.theme ) {
+		return children;
+	}
+	return (
+		<button
+			className="page-patterns-preview-field__button"
+			type="button"
+			onClick={ onClick }
+			aria-label={ item.title }
+			aria-describedby={ ariaDescribedBy }
+		>
+			{ children }
+		</button>
+	);
+}
+
+function Preview( { item, categoryId, viewType } ) {
+	const descriptionId = useId();
+	const isUserPattern = item.type === PATTERN_TYPES.user;
+	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
+	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
+	const isEmpty = ! item.blocks?.length;
+	// Only custom patterns or custom template parts can be renamed or deleted.
+	const isCustomPattern =
+		isUserPattern || ( isTemplatePart && item.isCustom );
+	const ariaDescriptions = [];
+	if ( isCustomPattern ) {
+		// User patterns don't have descriptions, but can be edited and deleted, so include some help text.
+		ariaDescriptions.push(
+			__( 'Press Enter to edit, or Delete to delete the pattern.' )
+		);
+	} else if ( item.description ) {
+		ariaDescriptions.push( item.description );
+	}
+
+	if ( isNonUserPattern ) {
+		ariaDescriptions.push(
+			__( 'Theme & plugin patterns cannot be edited.' )
+		);
+	}
+	const [ backgroundColor ] = useGlobalStyle( 'color.background' );
+	const { onClick } = useLink( {
+		postType: item.type,
+		postId: isUserPattern ? item.id : item.name,
+		categoryId,
+		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
+	} );
+
+	return (
+		<>
+			<div
+				className={ `page-patterns-preview-field is-viewtype-${ viewType }` }
+				style={ { backgroundColor } }
+			>
+				<PreviewWrapper
+					item={ item }
+					onClick={ onClick }
+					ariaDescribedBy={
+						ariaDescriptions.length
+							? ariaDescriptions
+									.map(
+										( _, index ) =>
+											`${ descriptionId }-${ index }`
+									)
+									.join( ' ' )
+							: undefined
+					}
+				>
+					{ isEmpty && isTemplatePart && __( 'Empty template part' ) }
+					{ isEmpty && ! isTemplatePart && __( 'Empty pattern' ) }
+					{ ! isEmpty && <BlockPreview blocks={ item.blocks } /> }
+				</PreviewWrapper>
+			</div>
+			{ ariaDescriptions.map( ( ariaDescription, index ) => (
+				<div
+					key={ index }
+					hidden
+					id={ `${ descriptionId }-${ index }` }
+				>
+					{ ariaDescription }
+				</div>
+			) ) }
+		</>
+	);
+}
+
+function Title( { item, categoryId } ) {
+	const isUserPattern = item.type === PATTERN_TYPES.user;
+	const isNonUserPattern = item.type === PATTERN_TYPES.theme;
+	const isTemplatePart = item.type === TEMPLATE_PART_POST_TYPE;
+	let itemIcon;
+	const { onClick } = useLink( {
+		postType: item.type,
+		postId: isUserPattern ? item.id : item.name,
+		categoryId,
+		categoryType: isTemplatePart ? item.type : PATTERN_TYPES.theme,
+	} );
+	if ( ! isUserPattern && templatePartIcons[ categoryId ] ) {
+		itemIcon = templatePartIcons[ categoryId ];
+	} else {
+		itemIcon =
+			item.syncStatus === PATTERN_SYNC_TYPES.full ? symbol : undefined;
+	}
+	return (
+		<HStack alignment="center" justify="flex-start" spacing={ 2 }>
+			{ itemIcon && ! isNonUserPattern && (
+				<Tooltip
+					placement="top"
+					text={ __(
+						'Editing this pattern will also update anywhere it is used'
+					) }
+				>
+					<Icon
+						className="edit-site-patterns__pattern-icon"
+						icon={ itemIcon }
+					/>
+				</Tooltip>
+			) }
+			{ item.type === PATTERN_TYPES.theme && (
+				<Tooltip
+					placement="top"
+					text={ __( 'This pattern cannot be edited.' ) }
+				>
+					<Icon
+						className="edit-site-patterns__pattern-lock-icon"
+						icon={ lockSmall }
+						size={ 24 }
+					/>
+				</Tooltip>
+			) }
+			<Flex
+				as="div"
+				gap={ 0 }
+				justify="left"
+				className="edit-site-patterns__pattern-title"
+			>
+				{ item.type === PATTERN_TYPES.theme ? (
+					item.title
+				) : (
+					<Button
+						variant="link"
+						onClick={ onClick }
+						// Required for the grid's roving tab index system.
+						// See https://github.com/WordPress/gutenberg/pull/51898#discussion_r1243399243.
+						tabIndex="-1"
+					>
+						{ item.title || item.name }
+					</Button>
+				) }
+			</Flex>
+		</HStack>
+	);
+}
+
+export default function DataviewsPatterns() {
+	const { categoryType, categoryId = PATTERN_DEFAULT_CATEGORY } =
+		getQueryArgs( window.location.href );
 	const type = categoryType || PATTERN_TYPES.theme;
-	const category = categoryId || PATTERN_DEFAULT_CATEGORY;
-	const settings = usePatternSettings();
+	const [ view, setView ] = useState( DEFAULT_VIEW );
+	const isUncategorizedThemePatterns =
+		type === PATTERN_TYPES.theme && categoryId === 'uncategorized';
+	const previousCategoryId = usePrevious( categoryId );
+	const viewSyncStatus = view.filters?.find(
+		( { field } ) => field === 'sync-status'
+	)?.value;
+	const { patterns, isResolving } = usePatterns(
+		type,
+		isUncategorizedThemePatterns ? '' : categoryId,
+		{
+			search: view.search,
+			syncStatus: viewSyncStatus,
+		}
+	);
+	const fields = useMemo( () => {
+		const _fields = [
+			{
+				header: __( 'Preview' ),
+				id: 'preview',
+				render: ( { item } ) => (
+					<Preview
+						item={ item }
+						categoryId={ categoryId }
+						viewType={ view.type }
+					/>
+				),
+				enableSorting: false,
+				enableHiding: false,
+			},
+			{
+				header: __( 'Title' ),
+				id: 'title',
+				getValue: ( { item } ) => item.title,
+				render: ( { item } ) => (
+					<Title item={ item } categoryId={ categoryId } />
+				),
+				enableHiding: false,
+			},
+		];
+		if ( type === PATTERN_TYPES.theme ) {
+			_fields.push( {
+				header: __( 'Sync Status' ),
+				id: 'sync-status',
+				render: ( { item } ) => {
+					// User patterns can have their sync statuses checked directly.
+					// Non-user patterns are all unsynced for the time being.
+					return (
+						SYNC_FILTERS.find(
+							( { value } ) => value === item.syncStatus
+						)?.label ||
+						SYNC_FILTERS.find(
+							( { value } ) =>
+								value === PATTERN_SYNC_TYPES.unsynced
+						).label
+					);
+				},
+				type: ENUMERATION_TYPE,
+				elements: SYNC_FILTERS,
+				filterBy: {
+					operators: [ OPERATOR_IN ],
+				},
+				enableSorting: false,
+			} );
+		}
+		return _fields;
+	}, [ view.type, categoryId, type ] );
+	// Reset the page number when the category changes.
+	useEffect( () => {
+		if ( previousCategoryId !== categoryId ) {
+			setView( DEFAULT_VIEW );
+		}
+	}, [ categoryId, previousCategoryId ] );
+	const { data, paginationInfo } = useMemo( () => {
+		if ( ! patterns ) {
+			return {
+				data: EMPTY_ARRAY,
+				paginationInfo: { totalItems: 0, totalPages: 0 },
+			};
+		}
+		let filteredData = [ ...patterns ];
+		// Handle sorting.
+		if ( view.sort ) {
+			filteredData = sortByTextFields( {
+				data: filteredData,
+				view,
+				fields,
+				textFields: [ 'title', 'author' ],
+			} );
+		}
+		// Handle pagination.
+		return getPaginationResults( {
+			data: filteredData,
+			view,
+		} );
+	}, [ patterns, view, fields ] );
 
+	const actions = useMemo(
+		() => [
+			renameAction,
+			duplicatePatternAction,
+			duplicateTemplatePartAction,
+			exportJSONaction,
+			resetAction,
+			deleteAction,
+		],
+		[]
+	);
+	const onChangeView = useCallback(
+		( newView ) => {
+			if ( newView.type !== view.type ) {
+				newView = {
+					...newView,
+					layout: {
+						...defaultConfigPerViewType[ newView.type ],
+					},
+				};
+			}
+			setView( newView );
+		},
+		[ view.type, setView ]
+	);
+	const id = useId();
+	const settings = usePatternSettings();
 	// Wrap everything in a block editor provider.
 	// This ensures 'styles' that are needed for the previews are synced
 	// from the site editor store to the block editor store.
+	// TODO: check if I add the provider in every preview like in templates...
 	return (
 		<ExperimentalBlockEditorProvider settings={ settings }>
 			<Page
-				className="edit-site-patterns"
 				title={ __( 'Patterns content' ) }
+				className="edit-site-page-patterns-dataviews"
 				hideTitleFromUI
 			>
-				<PatternsList
-					// Reset the states when switching between categories and types.
-					key={ `${ type }-${ category }` }
+				<PatternsHeader
+					categoryId={ categoryId }
 					type={ type }
-					categoryId={ category }
+					titleId={ `${ id }-title` }
+					descriptionId={ `${ id }-description` }
+				/>
+				<DataViews
+					paginationInfo={ paginationInfo }
+					fields={ fields }
+					actions={ actions }
+					data={ data || EMPTY_ARRAY }
+					getItemId={ ( item ) => item.name }
+					isLoading={ isResolving }
+					view={ view }
+					onChangeView={ onChangeView }
+					deferredRendering={ true }
+					supportedLayouts={ [ LAYOUT_GRID ] }
 				/>
 			</Page>
 		</ExperimentalBlockEditorProvider>
diff --git a/test/e2e/specs/site-editor/patterns.spec.js b/test/e2e/specs/site-editor/patterns.spec.js
index e4fffe14fcc9a..6b2561d1f5bd9 100644
--- a/test/e2e/specs/site-editor/patterns.spec.js
+++ b/test/e2e/specs/site-editor/patterns.spec.js
@@ -13,7 +13,9 @@ const test = base.extend( {
 	},
 } );
 
-test.describe( 'Patterns', () => {
+// Skip these tests for now as we plan to adapt them to
+// the new patterns UI.
+test.describe.skip( 'Patterns', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await requestUtils.activateTheme( 'emptytheme' );
 		await requestUtils.deleteAllBlocks();

From b395e43ff6de78dcb058ff5ff5c6fd757077752f Mon Sep 17 00:00:00 2001
From: Aki Hamano <54422211+t-hamano@users.noreply.github.com>
Date: Wed, 24 Jan 2024 17:21:10 +0900
Subject: [PATCH 250/296] More Block: Make block name affect list view (#58160)

---
 packages/block-library/src/more/index.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/packages/block-library/src/more/index.js b/packages/block-library/src/more/index.js
index 4c1fad3cb67f4..b40bb2123bc72 100644
--- a/packages/block-library/src/more/index.js
+++ b/packages/block-library/src/more/index.js
@@ -20,6 +20,12 @@ export const settings = {
 	icon,
 	example: {},
 	__experimentalLabel( attributes, { context } ) {
+		const customName = attributes?.metadata?.name;
+
+		if ( context === 'list-view' && customName ) {
+			return customName;
+		}
+
 		if ( context === 'accessibility' ) {
 			return attributes.customText;
 		}

From 49919aacde2e10a1364683081d6bf817497a6f7f Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Wed, 24 Jan 2024 16:39:58 +0800
Subject: [PATCH 251/296] Fix losing overrides after detaching patterns
 (#58164)

* Fix detaching pattern with overrides

* Migrate tests to playwright

* Fix and restore original tests

* Remove obsolete snapshots
---
 .../__snapshots__/pattern-blocks.test.js.snap |  6 --
 .../editor/various/pattern-blocks.test.js     | 28 --------
 packages/patterns/src/store/actions.js        | 42 +++++++----
 .../editor/various/pattern-overrides.spec.js  | 47 +++++++++++++
 .../e2e/specs/editor/various/patterns.spec.js | 69 +++++++++++++++++++
 5 files changed, 143 insertions(+), 49 deletions(-)

diff --git a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
index ffa6af8c2b733..325deae67bbfa 100644
--- a/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
+++ b/packages/e2e-tests/specs/editor/various/__snapshots__/pattern-blocks.test.js.snap
@@ -1,11 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`Pattern blocks allows conversion back to blocks when the reusable block has unsaved edits 1`] = `
-"<!-- wp:paragraph -->
-<p>1</p>
-<!-- /wp:paragraph -->"
-`;
-
 exports[`Pattern blocks can be created from multiselection and converted back to regular blocks 1`] = `
 "<!-- wp:paragraph -->
 <p>Hello there!</p>
diff --git a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js b/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
index b8021143259a8..32d5952f57259 100644
--- a/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
+++ b/packages/e2e-tests/specs/editor/various/pattern-blocks.test.js
@@ -252,34 +252,6 @@ describe( 'Pattern blocks', () => {
 		);
 	} );
 
-	// Check for regressions of https://github.com/WordPress/gutenberg/issues/26421.
-	// Skip reason: This is broken at the time with Pattern Overrides.
-	// See https://github.com/WordPress/gutenberg/issues/58122
-	it.skip( 'allows conversion back to blocks when the reusable block has unsaved edits', async () => {
-		await createReusableBlock( '1', 'Edited block' );
-
-		// Make an edit to the reusable block and assert that there's only a
-		// paragraph in a reusable block.
-		await canvas().waitForSelector( 'p[aria-label="Block: Paragraph"]' );
-		await canvas().click( 'p[aria-label="Block: Paragraph"]' );
-		await page.keyboard.type( '2' );
-		const selector =
-			'//div[@aria-label="Block: Pattern"]//p[@aria-label="Block: Paragraph"][.="12"]';
-		const reusableBlockWithParagraph = await page.$x( selector );
-		expect( reusableBlockWithParagraph ).toBeTruthy();
-
-		// Convert back to regular blocks.
-		await clickBlockToolbarButton( 'Select parent block: Edited block' );
-		await clickBlockToolbarButton( 'Options' );
-		await clickMenuItem( 'Detach' );
-		await page.waitForXPath( selector, {
-			hidden: true,
-		} );
-
-		// Check that there's only a paragraph.
-		expect( await getEditedPostContent() ).toMatchSnapshot();
-	} );
-
 	// Test for regressions of https://github.com/WordPress/gutenberg/issues/27243.
 	it( 'should allow a block with styles to be converted to a reusable block', async () => {
 		// Insert a quote and reload the page.
diff --git a/packages/patterns/src/store/actions.js b/packages/patterns/src/store/actions.js
index dfa0326a70941..7b9090ae4de66 100644
--- a/packages/patterns/src/store/actions.js
+++ b/packages/patterns/src/store/actions.js
@@ -2,7 +2,7 @@
  * WordPress dependencies
  */
 
-import { parse } from '@wordpress/blocks';
+import { cloneBlock } from '@wordpress/blocks';
 import { store as coreStore } from '@wordpress/core-data';
 import { store as blockEditorStore } from '@wordpress/block-editor';
 
@@ -90,25 +90,37 @@ export const createPatternFromFile =
 export const convertSyncedPatternToStatic =
 	( clientId ) =>
 	( { registry } ) => {
-		const oldBlock = registry
+		const patternBlock = registry
 			.select( blockEditorStore )
 			.getBlock( clientId );
-		const pattern = registry
-			.select( 'core' )
-			.getEditedEntityRecord(
-				'postType',
-				'wp_block',
-				oldBlock.attributes.ref
-			);
 
-		const newBlocks = parse(
-			typeof pattern.content === 'function'
-				? pattern.content( pattern )
-				: pattern.content
-		);
+		function cloneBlocksAndRemoveBindings( blocks ) {
+			return blocks.map( ( block ) => {
+				let metadata = block.attributes.metadata;
+				if ( metadata ) {
+					metadata = { ...metadata };
+					delete metadata.id;
+					delete metadata.bindings;
+				}
+				return cloneBlock(
+					block,
+					{
+						metadata:
+							metadata && Object.keys( metadata ).length > 0
+								? metadata
+								: undefined,
+					},
+					cloneBlocksAndRemoveBindings( block.innerBlocks )
+				);
+			} );
+		}
+
 		registry
 			.dispatch( blockEditorStore )
-			.replaceBlocks( oldBlock.clientId, newBlocks );
+			.replaceBlocks(
+				patternBlock.clientId,
+				cloneBlocksAndRemoveBindings( patternBlock.innerBlocks )
+			);
 	};
 
 /**
diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
index 62a993c5d9cf2..4e7bc80fdff5d 100644
--- a/test/e2e/specs/editor/various/pattern-overrides.spec.js
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -216,4 +216,51 @@ test.describe( 'Pattern Overrides', () => {
 			] );
 		} );
 	} );
+
+	test( 'retains override values when converting a pattern block to regular blocks', async ( {
+		page,
+		admin,
+		requestUtils,
+		editor,
+	} ) => {
+		const paragraphId = 'paragraph-id';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern',
+			content: `<!-- wp:paragraph {"metadata":{"id":"${ paragraphId }","bindings":{"content":{"source":{"name":"pattern_attributes"}}}}} -->
+<p>Editable</p>
+<!-- /wp:paragraph -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		// Make an edit to the pattern.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.focus();
+		await page.keyboard.type( 'edited ' );
+
+		// Convert back to regular blocks.
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.showBlockToolbar();
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		// Check that the overrides remain.
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/paragraph',
+				attributes: {
+					content: 'edited Editable',
+					metadata: undefined,
+				},
+			},
+		] );
+	} );
 } );
diff --git a/test/e2e/specs/editor/various/patterns.spec.js b/test/e2e/specs/editor/various/patterns.spec.js
index c53c6fef31928..745f5a5aa417b 100644
--- a/test/e2e/specs/editor/various/patterns.spec.js
+++ b/test/e2e/specs/editor/various/patterns.spec.js
@@ -252,4 +252,73 @@ test.describe( 'Synced pattern', () => {
 			},
 		] );
 	} );
+
+	// Check for regressions of https://github.com/WordPress/gutenberg/issues/26421.
+	test( 'allows conversion back to blocks when the reusable block has unsaved edits', async ( {
+		page,
+		requestUtils,
+		editor,
+	} ) => {
+		const { id } = await requestUtils.createBlock( {
+			title: 'Synced pattern',
+			content:
+				'<!-- wp:paragraph -->\n<p>Before Edit</p>\n<!-- /wp:paragraph -->',
+			status: 'publish',
+		} );
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await page
+			.getByRole( 'toolbar', { name: 'Block tools' } )
+			.getByRole( 'link', { name: 'Edit original' } )
+			.click();
+
+		const editorTopBar = page.getByRole( 'region', {
+			name: 'Editor top bar',
+		} );
+
+		// Navigate to the pattern focus mode.
+		await expect(
+			editorTopBar.getByRole( 'heading', {
+				name: 'Synced pattern',
+				level: 1,
+			} )
+		).toBeVisible();
+
+		// Make an edit to the source pattern.
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Paragraph' } )
+			.fill( 'After Edit' );
+
+		// Go back to the post.
+		await editorTopBar.getByRole( 'button', { name: 'Back' } ).click();
+
+		const expectedParagraphBlock = {
+			name: 'core/paragraph',
+			attributes: { content: 'After Edit' },
+		};
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/block',
+				attributes: { ref: id },
+				innerBlocks: [ expectedParagraphBlock ],
+			},
+		] );
+
+		await editor.selectBlocks(
+			editor.canvas.getByRole( 'document', { name: 'Block: Pattern' } )
+		);
+		await editor.clickBlockOptionsMenuItem( 'Detach' );
+
+		await expect
+			.poll( editor.getBlocks )
+			.toMatchObject( [ expectedParagraphBlock ] );
+	} );
 } );

From 80b25d3adce2f8ac1d8327001a015c5bfcec4667 Mon Sep 17 00:00:00 2001
From: Maggie <maggie.cabrera@automattic.com>
Date: Wed, 24 Jan 2024 09:51:47 +0100
Subject: [PATCH 252/296] remove extra div from edit (#58114)

---
 packages/block-library/src/avatar/edit.js | 34 +++++++++++------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/packages/block-library/src/avatar/edit.js b/packages/block-library/src/avatar/edit.js
index 8b326f4e72d88..8726d0cf2c0df 100644
--- a/packages/block-library/src/avatar/edit.js
+++ b/packages/block-library/src/avatar/edit.js
@@ -192,22 +192,12 @@ const UserEdit = ( { attributes, context, setAttributes, isSelected } ) => {
 				avatar={ avatar }
 				setAttributes={ setAttributes }
 			/>
-			<div>
-				{ attributes.isLink ? (
-					<a
-						href="#avatar-pseudo-link"
-						className="wp-block-avatar__link"
-						onClick={ ( event ) => event.preventDefault() }
-					>
-						<ResizableAvatar
-							attributes={ attributes }
-							avatar={ avatar }
-							blockProps={ blockProps }
-							isSelected={ isSelected }
-							setAttributes={ setAttributes }
-						/>
-					</a>
-				) : (
+			{ attributes.isLink ? (
+				<a
+					href="#avatar-pseudo-link"
+					className="wp-block-avatar__link"
+					onClick={ ( event ) => event.preventDefault() }
+				>
 					<ResizableAvatar
 						attributes={ attributes }
 						avatar={ avatar }
@@ -215,8 +205,16 @@ const UserEdit = ( { attributes, context, setAttributes, isSelected } ) => {
 						isSelected={ isSelected }
 						setAttributes={ setAttributes }
 					/>
-				) }
-			</div>
+				</a>
+			) : (
+				<ResizableAvatar
+					attributes={ attributes }
+					avatar={ avatar }
+					blockProps={ blockProps }
+					isSelected={ isSelected }
+					setAttributes={ setAttributes }
+				/>
+			) }
 		</>
 	);
 };

From 3318717c80fd62cfa7a1fd7cf9c5ec33470b45b0 Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 24 Jan 2024 09:40:26 +0000
Subject: [PATCH 253/296] Keep Link UI open upon initial link creation when
 used in RichText (#57726)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Don’t clear activeFormats on submit

* Expose API to allow triggering the anchor to be recomputed

* Correctly position Popover on link creation and avoid focus shifts due to forced remounts.

* Add privateApis to RichText package and export useAnchorWithUpdate hook

* Consume new private API in Link UI

* Fix docs

* Revert "Add privateApis to RichText package and export useAnchorWithUpdate hook"

This reverts commit cbcbf41da512b93dc4271d4428faab34aafd389b.

# Conflicts:
#	packages/rich-text/README.md
#	packages/rich-text/src/private-apis.js

* Fix anchor position using standardised method

* Revert all changes to useAnchor hook

* Remove changing selection when commiting new links

* Add more detail to comment

* Fix e2e test: can be created and modified using only the keyboard

* Test e2e fix: can update the url of an existing link

* Fix e2e test: toggle state of advanced link settings is preserved across editing links

* Test e2e fix createAndReselectLink util

* Fix e2e test: should not show the Link UI when selection extends beyond link boundary

* e2e test fix: should not show the Link UI when selection extends into another link

---------

Co-authored-by: Jerry Jones <jones.jeremydavid@gmail.com>
---
 packages/format-library/src/link/inline.js | 42 ++++++++++-----------
 test/e2e/specs/editor/blocks/links.spec.js | 44 ++++++++++++++--------
 2 files changed, 48 insertions(+), 38 deletions(-)

diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
index 39fcc0f3b0734..79933be6a6ac5 100644
--- a/packages/format-library/src/link/inline.js
+++ b/packages/format-library/src/link/inline.js
@@ -11,16 +11,17 @@ import {
 	insert,
 	isCollapsed,
 	applyFormat,
-	useAnchor,
 	removeFormat,
 	slice,
 	replace,
 	split,
 	concat,
+	useAnchor,
 } from '@wordpress/rich-text';
 import {
 	__experimentalLinkControl as LinkControl,
 	store as blockEditorStore,
+	useCachedTruthy,
 } from '@wordpress/block-editor';
 import { useSelect } from '@wordpress/data';
 
@@ -29,7 +30,6 @@ import { useSelect } from '@wordpress/data';
  */
 import { createLinkFormat, isValidHref, getFormatBoundary } from './utils';
 import { link as settings } from './index';
-import useLinkInstanceKey from './use-link-instance-key';
 
 const LINK_SETTINGS = [
 	...LinkControl.DEFAULT_LINK_SETTINGS,
@@ -90,12 +90,9 @@ function InlineLinkUI( {
 	}
 
 	function onChangeLink( nextValue ) {
-		// LinkControl calls `onChange` immediately upon the toggling a setting.
-		// Before merging the next value with the current link value, check if
-		// the setting was toggled.
-		const didToggleSetting =
-			linkValue.opensInNewTab !== nextValue.opensInNewTab &&
-			nextValue.url === undefined;
+		const hasLink = linkValue?.url;
+		const isNewLink = ! hasLink;
+
 		// Merge the next value with the current link value.
 		nextValue = {
 			...linkValue,
@@ -178,17 +175,16 @@ function InlineLinkUI( {
 				newValue = concat( valBefore, newValAfter );
 			}
 
-			newValue.start = newValue.end;
-
-			// Hides the Link UI.
-			newValue.activeFormats = [];
 			onChange( newValue );
 		}
 
-		// Focus should only be shifted back to the formatted segment when the
-		// URL is submitted.
-		if ( ! didToggleSetting ) {
-			stopAddingLink();
+		// Focus should only be returned to the rich text on submit if this link is not
+		// being created for the first time. If it is then focus should remain within the
+		// Link UI because it should remain open for the user to modify the link they have
+		// just created.
+		if ( ! isNewLink ) {
+			const returnFocusToRichText = true;
+			stopAddingLink( returnFocusToRichText );
 		}
 
 		if ( ! isValidHref( newUrl ) ) {
@@ -210,11 +206,14 @@ function InlineLinkUI( {
 		settings,
 	} );
 
-	// Generate a string based key that is unique to this anchor reference.
-	// This is used to force re-mount the LinkControl component to avoid
-	// potential stale state bugs caused by the component not being remounted
-	// See https://github.com/WordPress/gutenberg/pull/34742.
-	const forceRemountKey = useLinkInstanceKey( popoverAnchor );
+	//  As you change the link by interacting with the Link UI
+	//  the return value of document.getSelection jumps to the field you're editing,
+	//  not the highlighted text. Given that useAnchor uses document.getSelection,
+	//  it will return null, since it can't find the <mark> element within the Link UI.
+	//  This caches the last truthy value of the selection anchor reference.
+	// This ensures the Popover is positioned correctly on initial submission of the link.
+	const cachedRect = useCachedTruthy( popoverAnchor.getBoundingClientRect() );
+	popoverAnchor.getBoundingClientRect = () => cachedRect;
 
 	// Focus should only be moved into the Popover when the Link is being created or edited.
 	// When the Link is in "preview" mode focus should remain on the rich text because at
@@ -261,7 +260,6 @@ function InlineLinkUI( {
 			shift
 		>
 			<LinkControl
-				key={ forceRemountKey }
 				value={ linkValue }
 				onChange={ onChangeLink }
 				onRemove={ removeLink }
diff --git a/test/e2e/specs/editor/blocks/links.spec.js b/test/e2e/specs/editor/blocks/links.spec.js
index 9620b45fed9da..d1de2df1da7ff 100644
--- a/test/e2e/specs/editor/blocks/links.spec.js
+++ b/test/e2e/specs/editor/blocks/links.spec.js
@@ -445,6 +445,9 @@ test.describe( 'Links', () => {
 		await pageUtils.pressKeys( 'Enter' );
 
 		const linkPopover = LinkUtils.getLinkPopover();
+		await expect( linkPopover ).toBeVisible();
+		// Close the link control to return the caret to the canvas
+		await pageUtils.pressKeys( 'Escape' );
 
 		// Deselect the link text by moving the caret to the end of the line
 		// and the link popover should not be displayed.
@@ -612,6 +615,13 @@ test.describe( 'Links', () => {
 		await page.keyboard.type( 'w.org' );
 
 		await page.keyboard.press( 'Enter' );
+		// Close the link control to return the caret to the canvas
+		const linkPopover = LinkUtils.getLinkPopover();
+		await pageUtils.pressKeys( 'Escape' );
+		// Deselect the link text by moving the caret to the end of the line
+		// and the link popover should not be displayed.
+		await pageUtils.pressKeys( 'End' );
+		await expect( linkPopover ).toBeHidden();
 
 		await expect.poll( editor.getBlocks ).toMatchObject( [
 			{
@@ -634,17 +644,12 @@ test.describe( 'Links', () => {
 		await page.getByPlaceholder( 'Search or type url' ).fill( '' );
 		await page.keyboard.type( 'wordpress.org' );
 
-		const linkPopover = LinkUtils.getLinkPopover();
-
 		// Update the link.
 		await linkPopover.getByRole( 'button', { name: 'Save' } ).click();
 
-		// Navigate back to the popover.
-		await page.keyboard.press( 'ArrowLeft' );
-		await page.keyboard.press( 'ArrowLeft' );
-
-		// Navigate back to inputs to verify appears as changed.
-		await pageUtils.pressKeys( 'primary+k' );
+		// Navigate back to the link editing state inputs to verify appears as changed.
+		await page.keyboard.press( 'Tab' );
+		await page.keyboard.press( 'Enter' );
 
 		expect(
 			await page
@@ -683,20 +688,21 @@ test.describe( 'Links', () => {
 		await pageUtils.pressKeys( 'primary+k' );
 		await page.keyboard.type( 'w.org' );
 		await page.keyboard.press( 'Enter' );
+		await page.keyboard.press( 'Escape' );
 
 		// Move to edge of text "Gutenberg".
 		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' ); // If you just use Alt here it won't work on windows.
 		await pageUtils.pressKeys( 'ArrowLeft' );
-		await pageUtils.pressKeys( 'ArrowLeft' );
 
 		// Select "Gutenberg".
-		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
+		await pageUtils.pressKeys( 'shiftAlt+ArrowRight' );
 
 		// Create a link.
 		await pageUtils.pressKeys( 'primary+k' );
 		await page.keyboard.type( 'https://wordpress.org/plugins/gutenberg/' );
 		await page.keyboard.press( 'Enter' );
-
+		await page.keyboard.press( 'Escape' );
+		await pageUtils.pressKeys( 'End' );
 		// Move back into the link.
 		await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
 		await pageUtils.pressKeys( 'primary+k' );
@@ -1054,6 +1060,9 @@ test.describe( 'Links', () => {
 
 			// Update the link.
 			await pageUtils.pressKeys( 'Enter' );
+			await pageUtils.pressKeys( 'Escape' );
+			await pageUtils.pressKeys( 'ArrowRight' );
+
 			// Reactivate the link.
 			await pageUtils.pressKeys( 'ArrowLeft' );
 			await pageUtils.pressKeys( 'ArrowLeft' );
@@ -1117,11 +1126,10 @@ test.describe( 'Links', () => {
 
 			// Update the link.
 			await pageUtils.pressKeys( 'Enter' );
+			await pageUtils.pressKeys( 'Escape' );
 
 			// Move cursor next to the **end** of `linkTextOne`
-			await pageUtils.pressKeys( 'ArrowLeft', {
-				times: linkedTextTwo.length,
-			} );
+			await pageUtils.pressKeys( 'ArrowLeft' );
 
 			// Select `linkTextOne`
 			await pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );
@@ -1134,6 +1142,8 @@ test.describe( 'Links', () => {
 
 			// Update the link.
 			await pageUtils.pressKeys( 'Enter' );
+			await pageUtils.pressKeys( 'Escape' );
+			await pageUtils.pressKeys( 'ArrowRight' );
 
 			// Move cursor within `linkTextOne`
 			await pageUtils.pressKeys( 'ArrowLeft', {
@@ -1146,8 +1156,8 @@ test.describe( 'Links', () => {
 			await expect( linkPopover ).toBeVisible();
 
 			// Expand selection so that it overlaps with `linkTextTwo`
-			await pageUtils.pressKeys( 'ArrowRight', {
-				times: 3,
+			await pageUtils.pressKeys( 'Shift+ArrowRight', {
+				times: 6,
 			} );
 
 			// Link UI should be inactive.
@@ -1254,6 +1264,8 @@ class LinkUtils {
 
 		// Click on the Submit button.
 		await this.pageUtils.pressKeys( 'Enter' );
+		await this.pageUtils.pressKeys( 'Escape' );
+		await this.pageUtils.pressKeys( 'End' );
 
 		// Reselect the link.
 		await this.pageUtils.pressKeys( 'shiftAlt+ArrowLeft' );

From 72436e1f365a5c099285c92e750bcb3adbbb3a4c Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 24 Jan 2024 19:01:03 +0900
Subject: [PATCH 254/296] BorderControl: Replace style picker with
 ToggleGroupControl (#57562)

* BorderControl: Replace style picker with ToggleGroupControl

* Add changelog

* Fix changelog placement
---
 packages/components/CHANGELOG.md              |  1 +
 .../border-control-dropdown/component.tsx     |  3 +-
 .../border-control-style-picker/component.tsx | 97 ++++++-------------
 .../border-control-style-picker/hook.ts       | 35 -------
 .../border-control/component.tsx              |  2 +
 .../src/border-control/border-control/hook.ts | 27 +++---
 .../components/src/border-control/styles.ts   | 15 ---
 .../components/src/border-control/types.ts    | 10 +-
 8 files changed, 59 insertions(+), 131 deletions(-)
 delete mode 100644 packages/components/src/border-control/border-control-style-picker/hook.ts

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index e732cbda994af..3674084f38e9e 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -10,6 +10,7 @@
 -   `PaletteEdit` and `CircularOptionPicker`: improve unit tests ([#57809](https://github.com/WordPress/gutenberg/pull/57809)).
 -   `Tooltip`: no-op when nested inside other `Tooltip` components ([#57202](https://github.com/WordPress/gutenberg/pull/57202)).
 -   `Tooltip` and `Button`: tidy up unit tests ([#57975](https://github.com/WordPress/gutenberg/pull/57975)).
+-   `BorderControl`, `BorderBoxControl`: Replace style picker with ToggleGroupControl ([#57562](https://github.com/WordPress/gutenberg/pull/57562)).
 -	`SlotFill`: fix typo in use-slot-fills return docs ([#57654](https://github.com/WordPress/gutenberg/pull/57654))
 
 ### Bug Fix
diff --git a/packages/components/src/border-control/border-control-dropdown/component.tsx b/packages/components/src/border-control/border-control-dropdown/component.tsx
index 3ee01bcda8f3b..0a56edd946308 100644
--- a/packages/components/src/border-control/border-control-dropdown/component.tsx
+++ b/packages/components/src/border-control/border-control-dropdown/component.tsx
@@ -142,6 +142,7 @@ const BorderControlDropdown = (
 		enableStyle,
 		indicatorClassName,
 		indicatorWrapperClassName,
+		isStyleSettable,
 		onReset,
 		onColorChange,
 		onStyleChange,
@@ -218,7 +219,7 @@ const BorderControlDropdown = (
 						clearable={ false }
 						enableAlpha={ enableAlpha }
 					/>
-					{ enableStyle && (
+					{ enableStyle && isStyleSettable && (
 						<BorderControlStylePicker
 							label={ __( 'Style' ) }
 							value={ style }
diff --git a/packages/components/src/border-control/border-control-style-picker/component.tsx b/packages/components/src/border-control/border-control-style-picker/component.tsx
index d0621dd8a7c4d..c0a0fe82111ce 100644
--- a/packages/components/src/border-control/border-control-style-picker/component.tsx
+++ b/packages/components/src/border-control/border-control-style-picker/component.tsx
@@ -7,16 +7,12 @@ import { __ } from '@wordpress/i18n';
 /**
  * Internal dependencies
  */
-import Button from '../../button';
-import { StyledLabel } from '../../base-control/styles/base-control-styles';
-import { View } from '../../view';
-import { Flex } from '../../flex';
-import { VisuallyHidden } from '../../visually-hidden';
-import type { WordPressComponentProps } from '../../context';
 import { contextConnect } from '../../context';
-import { useBorderControlStylePicker } from './hook';
-
-import type { LabelProps, StylePickerProps } from '../types';
+import type { StylePickerProps } from '../types';
+import {
+	ToggleGroupControl,
+	ToggleGroupControlOptionIcon,
+} from '../../toggle-group-control';
 
 const BORDER_STYLES = [
 	{ label: __( 'Solid' ), icon: lineSolid, value: 'solid' },
@@ -24,67 +20,36 @@ const BORDER_STYLES = [
 	{ label: __( 'Dotted' ), icon: lineDotted, value: 'dotted' },
 ];
 
-const Label = ( props: LabelProps ) => {
-	const { label, hideLabelFromVision } = props;
-
-	if ( ! label ) {
-		return null;
-	}
-
-	return hideLabelFromVision ? (
-		<VisuallyHidden as="label">{ label }</VisuallyHidden>
-	) : (
-		<StyledLabel>{ label }</StyledLabel>
-	);
-};
-
-const BorderControlStylePicker = (
-	props: WordPressComponentProps< StylePickerProps, 'div' >,
+function UnconnectedBorderControlStylePicker(
+	{ onChange, ...restProps }: StylePickerProps,
 	forwardedRef: React.ForwardedRef< any >
-) => {
-	const {
-		buttonClassName,
-		hideLabelFromVision,
-		label,
-		onChange,
-		value,
-		...otherProps
-	} = useBorderControlStylePicker( props );
-
+) {
 	return (
-		<View { ...otherProps } ref={ forwardedRef }>
-			<Label
-				label={ label }
-				hideLabelFromVision={ hideLabelFromVision }
-			/>
-			<Flex justify="flex-start" gap={ 1 }>
-				{ BORDER_STYLES.map( ( borderStyle ) => (
-					<Button
-						key={ borderStyle.value }
-						className={ buttonClassName }
-						icon={ borderStyle.icon }
-						size="small"
-						isPressed={ borderStyle.value === value }
-						onClick={ () =>
-							onChange(
-								borderStyle.value === value
-									? undefined
-									: borderStyle.value
-							)
-						}
-						aria-label={ borderStyle.label }
-						label={ borderStyle.label }
-						showTooltip={ true }
-					/>
-				) ) }
-			</Flex>
-		</View>
+		<ToggleGroupControl
+			__nextHasNoMarginBottom
+			__next40pxDefaultSize
+			ref={ forwardedRef }
+			isDeselectable
+			onChange={ ( value ) => {
+				onChange?.( value as string | undefined );
+			} }
+			{ ...restProps }
+		>
+			{ BORDER_STYLES.map( ( borderStyle ) => (
+				<ToggleGroupControlOptionIcon
+					key={ borderStyle.value }
+					value={ borderStyle.value }
+					icon={ borderStyle.icon }
+					label={ borderStyle.label }
+				/>
+			) ) }
+		</ToggleGroupControl>
 	);
-};
+}
 
-const ConnectedBorderControlStylePicker = contextConnect(
-	BorderControlStylePicker,
+const BorderControlStylePicker = contextConnect(
+	UnconnectedBorderControlStylePicker,
 	'BorderControlStylePicker'
 );
 
-export default ConnectedBorderControlStylePicker;
+export default BorderControlStylePicker;
diff --git a/packages/components/src/border-control/border-control-style-picker/hook.ts b/packages/components/src/border-control/border-control-style-picker/hook.ts
deleted file mode 100644
index 27233c40309a3..0000000000000
--- a/packages/components/src/border-control/border-control-style-picker/hook.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-/**
- * WordPress dependencies
- */
-import { useMemo } from '@wordpress/element';
-
-/**
- * Internal dependencies
- */
-import * as styles from '../styles';
-import type { WordPressComponentProps } from '../../context';
-import { useContextSystem } from '../../context';
-import { useCx } from '../../utils/hooks/use-cx';
-
-import type { StylePickerProps } from '../types';
-
-export function useBorderControlStylePicker(
-	props: WordPressComponentProps< StylePickerProps, 'div' >
-) {
-	const { className, ...otherProps } = useContextSystem(
-		props,
-		'BorderControlStylePicker'
-	);
-
-	// Generate class names.
-	const cx = useCx();
-	const classes = useMemo( () => {
-		return cx( styles.borderControlStylePicker, className );
-	}, [ className, cx ] );
-
-	const buttonClassName = useMemo( () => {
-		return cx( styles.borderStyleButton );
-	}, [ cx ] );
-
-	return { ...otherProps, className: classes, buttonClassName };
-}
diff --git a/packages/components/src/border-control/border-control/component.tsx b/packages/components/src/border-control/border-control/component.tsx
index 197067c684373..5fe2abce1b411 100644
--- a/packages/components/src/border-control/border-control/component.tsx
+++ b/packages/components/src/border-control/border-control/component.tsx
@@ -47,6 +47,7 @@ const UnconnectedBorderControl = (
 		hideLabelFromVision,
 		innerWrapperClassName,
 		inputWidth,
+		isStyleSettable,
 		label,
 		onBorderChange,
 		onSliderChange,
@@ -81,6 +82,7 @@ const UnconnectedBorderControl = (
 							disableCustomColors={ disableCustomColors }
 							enableAlpha={ enableAlpha }
 							enableStyle={ enableStyle }
+							isStyleSettable={ isStyleSettable }
 							onChange={ onBorderChange }
 							previousStyleSelection={ previousStyleSelection }
 							showDropdownHeader={ showDropdownHeader }
diff --git a/packages/components/src/border-control/border-control/hook.ts b/packages/components/src/border-control/border-control/hook.ts
index 8a291c4112d91..676ff9ea2cc6e 100644
--- a/packages/components/src/border-control/border-control/hook.ts
+++ b/packages/components/src/border-control/border-control/hook.ts
@@ -14,16 +14,12 @@ import { useCx } from '../../utils/hooks/use-cx';
 
 import type { Border, BorderControlProps } from '../types';
 
-const sanitizeBorder = ( border?: Border ) => {
-	const hasNoWidth = border?.width === undefined || border.width === '';
-	const hasNoColor = border?.color === undefined;
-
-	// If width and color are undefined, unset any style selection as well.
-	if ( hasNoWidth && hasNoColor ) {
-		return undefined;
-	}
-
-	return border;
+// If either width or color are defined, the border is considered valid
+// and a border style can be set as well.
+const isValidBorder = ( border?: Border ) => {
+	const hasWidth = border?.width !== undefined && border.width !== '';
+	const hasColor = border?.color !== undefined;
+	return hasWidth || hasColor;
 };
 
 export function useBorderControl(
@@ -57,12 +53,16 @@ export function useBorderControl(
 	const [ colorSelection, setColorSelection ] = useState< string >();
 	const [ styleSelection, setStyleSelection ] = useState< string >();
 
+	const isStyleSettable = shouldSanitizeBorder
+		? isValidBorder( border )
+		: true;
+
 	const onBorderChange = useCallback(
 		( newBorder?: Border ) => {
-			if ( shouldSanitizeBorder ) {
-				return onChange( sanitizeBorder( newBorder ) );
+			if ( shouldSanitizeBorder && ! isValidBorder( newBorder ) ) {
+				onChange( undefined );
+				return;
 			}
-
 			onChange( newBorder );
 		},
 		[ onChange, shouldSanitizeBorder ]
@@ -151,6 +151,7 @@ export function useBorderControl(
 		enableStyle,
 		innerWrapperClassName,
 		inputWidth: wrapperWidth,
+		isStyleSettable,
 		onBorderChange,
 		onSliderChange,
 		onWidthChange,
diff --git a/packages/components/src/border-control/styles.ts b/packages/components/src/border-control/styles.ts
index 1a2263b9fb6ff..6a8892e78ef55 100644
--- a/packages/components/src/border-control/styles.ts
+++ b/packages/components/src/border-control/styles.ts
@@ -165,21 +165,6 @@ export const resetButton = css`
 	}
 `;
 
-export const borderControlStylePicker = css`
-	${ StyledLabel } {
-		${ labelStyles }
-	}
-`;
-
-export const borderStyleButton = css`
-	&&&&& {
-		min-width: 32px;
-		width: 32px;
-		height: 32px;
-		padding: 4px;
-	}
-`;
-
 export const borderSlider = () => css`
 	flex: 1 1 60%;
 	${ rtl( { marginRight: space( 3 ) } )() }
diff --git a/packages/components/src/border-control/types.ts b/packages/components/src/border-control/types.ts
index 7752d9760ffe5..b1ff87aaf5da3 100644
--- a/packages/components/src/border-control/types.ts
+++ b/packages/components/src/border-control/types.ts
@@ -8,6 +8,7 @@ import type { CSSProperties } from 'react';
  */
 import type { ColorPaletteProps } from '../color-palette/types';
 import type { PopoverProps } from '../popover/types';
+import type { ToggleGroupControlProps } from '../toggle-group-control/types';
 
 export type Border = {
 	color?: CSSProperties[ 'borderColor' ];
@@ -115,6 +116,10 @@ export type DropdownProps = ColorProps &
 		 * values for its popover controls.
 		 */
 		border?: Border;
+		/**
+		 * Whether a border style can be set, based on the border sanitization settings.
+		 */
+		isStyleSettable: boolean;
 		/**
 		 * An internal prop used to control the visibility of the dropdown.
 		 */
@@ -137,7 +142,10 @@ export type DropdownProps = ColorProps &
 		showDropdownHeader?: boolean;
 	};
 
-export type StylePickerProps = LabelProps & {
+export type StylePickerProps = Omit<
+	ToggleGroupControlProps,
+	'value' | 'onChange' | 'children'
+> & {
 	/**
 	 * A callback function invoked when a border style is selected or cleared.
 	 */

From e035f718d60642b1c8aad87d3d18a8f52a15dd7d Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Wed, 24 Jan 2024 12:03:17 +0200
Subject: [PATCH 255/296] DataViews: Fix author sorting in templates and
 template parts (#58167)

---
 .../src/components/page-templates-template-parts/index.js       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index 36e4ec084e6b8..da7c64a2b6349 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -374,7 +374,7 @@ export default function PageTemplatesTemplateParts( { postType } ) {
 				data: filteredData,
 				view,
 				fields,
-				textFields: [ 'title' ],
+				textFields: [ 'title', 'author' ],
 			} );
 		}
 		// Handle pagination.

From 6c9fde47bc1acfbb08f9baca78eee7acaa0bd4d6 Mon Sep 17 00:00:00 2001
From: Jon Surrell <sirreal@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:06:55 +0100
Subject: [PATCH 256/296] Update caniuse-lite package (#58087)

* Update caniuse-lite package.
* Update snapshots
  "ReadableJsAssetsWebpackPlugin" snapshots webpack output
  which changes with the updated caniuse-lite data.

  `function() {}` becomes `()=>{}` in some places where webpack
  uses functions internally.
---
 package-lock.json                                  | 14 +++++++-------
 package.json                                       |  2 +-
 .../test/__snapshots__/build.js.snap               |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d1f251092f3a5..a0de5396efd60 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -166,7 +166,7 @@
 				"babel-plugin-transform-remove-console": "6.9.4",
 				"benchmark": "2.1.4",
 				"browserslist": "4.21.10",
-				"caniuse-lite": "1.0.30001538",
+				"caniuse-lite": "1.0.30001579",
 				"chalk": "4.1.1",
 				"change-case": "4.1.2",
 				"commander": "9.2.0",
@@ -21350,9 +21350,9 @@
 			}
 		},
 		"node_modules/caniuse-lite": {
-			"version": "1.0.30001538",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-			"integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw==",
+			"version": "1.0.30001579",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
+			"integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -73290,9 +73290,9 @@
 			}
 		},
 		"caniuse-lite": {
-			"version": "1.0.30001538",
-			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001538.tgz",
-			"integrity": "sha512-HWJnhnID+0YMtGlzcp3T9drmBJUVDchPJ08tpUGFLs9CYlwWPH2uLgpHn8fND5pCgXVtnGS3H4QR9XLMHVNkHw=="
+			"version": "1.0.30001579",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001579.tgz",
+			"integrity": "sha512-u5AUVkixruKHJjw/pj9wISlcMpgFWzSrczLZbrqBSxukQixmg0SJ5sZTpvaFvxU0HoQKd4yoyAogyrAz9pzJnA=="
 		},
 		"capital-case": {
 			"version": "1.0.4",
diff --git a/package.json b/package.json
index 035c8d69cc56f..7d44eda369d68 100644
--- a/package.json
+++ b/package.json
@@ -178,7 +178,7 @@
 		"babel-plugin-transform-remove-console": "6.9.4",
 		"benchmark": "2.1.4",
 		"browserslist": "4.21.10",
-		"caniuse-lite": "1.0.30001538",
+		"caniuse-lite": "1.0.30001579",
 		"chalk": "4.1.1",
 		"change-case": "4.1.2",
 		"commander": "9.2.0",
diff --git a/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap b/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
index e5a7d6f6accc8..c033e572e8e5e 100644
--- a/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
+++ b/packages/readable-js-assets-webpack-plugin/test/__snapshots__/build.js.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file index.js should match snapshot 1`] = `
-"/******/ (function() { // webpackBootstrap
+"/******/ (() => { // webpackBootstrap
 var __webpack_exports__ = {};
 function notMinified() {
 	// eslint-disable-next-line no-console
@@ -16,7 +16,7 @@ notMinified();
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file index.min.js should match snapshot 1`] = `"console.log("hello");"`;
 
 exports[`ReadableJsAssetsWebpackPlugin should produce the expected output: Asset file view.js should match snapshot 1`] = `
-"/******/ (function() { // webpackBootstrap
+"/******/ (() => { // webpackBootstrap
 var __webpack_exports__ = {};
 function notMinified() {
 	// eslint-disable-next-line no-console

From 37ec4b6c1172468fd00ab10dfc434cb71b10c8fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <583546+oandregal@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:27:07 +0100
Subject: [PATCH 257/296] DataViews: make the "Manage Pages" stable (#58166)

---
 .../edit-site/src/components/layout/router.js  | 18 ++++++++----------
 .../src/components/page-pages/index.js         |  4 ++++
 .../src/components/sidebar-dataviews/index.js  | 12 +++++++-----
 .../sidebar-navigation-screen-pages/index.js   | 10 +---------
 .../edit-site/src/components/sidebar/index.js  |  8 +++-----
 .../edit-site/src/utils/get-is-list-page.js    |  5 +++--
 6 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/packages/edit-site/src/components/layout/router.js b/packages/edit-site/src/components/layout/router.js
index 08f036f68a321..aeb124bf76fe5 100644
--- a/packages/edit-site/src/components/layout/router.js
+++ b/packages/edit-site/src/components/layout/router.js
@@ -37,8 +37,14 @@ export default function useLayoutAreas() {
 		};
 	}
 
-	if ( path === '/pages' && window?.__experimentalAdminViews ) {
-		const isListLayout = isCustom !== 'true' && layout === 'list';
+	// List layout is still experimental.
+	// Extracted it here out of the conditionals so it doesn't unintentionally becomes stable.
+	const isListLayout =
+		isCustom !== 'true' &&
+		layout === 'list' &&
+		window?.__experimentalAdminViews;
+
+	if ( path === '/pages' ) {
 		return {
 			areas: {
 				content: <PagePages />,
@@ -63,10 +69,6 @@ export default function useLayoutAreas() {
 
 	// Templates
 	if ( path === '/wp_template/all' ) {
-		const isListLayout =
-			isCustom !== 'true' &&
-			layout === 'list' &&
-			window?.__experimentalAdminViews;
 		return {
 			areas: {
 				content: (
@@ -86,10 +88,6 @@ export default function useLayoutAreas() {
 
 	// Template parts
 	if ( path === '/wp_template_part/all' ) {
-		const isListLayout =
-			isCustom !== 'true' &&
-			layout === 'list' &&
-			window?.__experimentalAdminViews;
 		return {
 			areas: {
 				content: (
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index ebad4e05aa024..ea59eab333c42 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -44,6 +44,9 @@ import { unlock } from '../../lock-unlock';
 const { useLocation, useHistory } = unlock( routerPrivateApis );
 
 const EMPTY_ARRAY = [];
+const SUPPORTED_LAYOUTS = window?.__experimentalAdminViews
+	? [ LAYOUT_GRID, LAYOUT_TABLE, LAYOUT_LIST ]
+	: [ LAYOUT_GRID, LAYOUT_TABLE ];
 
 function useView( postType ) {
 	const { params } = useLocation();
@@ -418,6 +421,7 @@ export default function PagePages() {
 				view={ view }
 				onChangeView={ onChangeView }
 				onSelectionChange={ onSelectionChange }
+				supportedLayouts={ SUPPORTED_LAYOUTS }
 			/>
 		</Page>
 	);
diff --git a/packages/edit-site/src/components/sidebar-dataviews/index.js b/packages/edit-site/src/components/sidebar-dataviews/index.js
index 991a4a30e9973..caf838b085786 100644
--- a/packages/edit-site/src/components/sidebar-dataviews/index.js
+++ b/packages/edit-site/src/components/sidebar-dataviews/index.js
@@ -47,11 +47,13 @@ export default function DataViewsSidebarContent() {
 					);
 				} ) }
 			</ItemGroup>
-			<CustomDataViewsList
-				activeView={ activeView }
-				type={ type }
-				isCustom="true"
-			/>
+			{ window?.__experimentalAdminViews && (
+				<CustomDataViewsList
+					activeView={ activeView }
+					type={ type }
+					isCustom="true"
+				/>
+			) }
 		</>
 	);
 }
diff --git a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
index 85eaeea14a536..82fc6d0fa2412 100644
--- a/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
+++ b/packages/edit-site/src/components/sidebar-navigation-screen-pages/index.js
@@ -137,14 +137,6 @@ export default function SidebarNavigationScreenPages() {
 	};
 
 	const pagesLink = useLink( { path: '/pages' } );
-	const manageAllPagesProps = window?.__experimentalAdminViews
-		? { ...pagesLink }
-		: {
-				href: 'edit.php?post_type=page',
-				onClick: () => {
-					document.location = 'edit.php?post_type=page';
-				},
-		  };
 
 	return (
 		<>
@@ -230,7 +222,7 @@ export default function SidebarNavigationScreenPages() {
 						) ) }
 						<SidebarNavigationItem
 							className="edit-site-sidebar-navigation-screen-pages__see-all"
-							{ ...manageAllPagesProps }
+							{ ...pagesLink }
 						>
 							{ __( 'Manage all pages' ) }
 						</SidebarNavigationItem>
diff --git a/packages/edit-site/src/components/sidebar/index.js b/packages/edit-site/src/components/sidebar/index.js
index fd2cfa67ce004..19cd55ae6fac2 100644
--- a/packages/edit-site/src/components/sidebar/index.js
+++ b/packages/edit-site/src/components/sidebar/index.js
@@ -68,11 +68,9 @@ function SidebarScreens() {
 			<SidebarScreenWrapper path="/page">
 				<SidebarNavigationScreenPages />
 			</SidebarScreenWrapper>
-			{ window?.__experimentalAdminViews && (
-				<SidebarScreenWrapper path="/pages">
-					<SidebarNavigationScreenPagesDataViews />
-				</SidebarScreenWrapper>
-			) }
+			<SidebarScreenWrapper path="/pages">
+				<SidebarNavigationScreenPagesDataViews />
+			</SidebarScreenWrapper>
 			<SidebarScreenWrapper path="/page/:postId">
 				<SidebarNavigationScreenPage />
 			</SidebarScreenWrapper>
diff --git a/packages/edit-site/src/utils/get-is-list-page.js b/packages/edit-site/src/utils/get-is-list-page.js
index d89c0e321679f..2ee661253cf06 100644
--- a/packages/edit-site/src/utils/get-is-list-page.js
+++ b/packages/edit-site/src/utils/get-is-list-page.js
@@ -14,8 +14,9 @@ export default function getIsListPage(
 	isMobileViewport
 ) {
 	return (
-		[ '/wp_template/all', '/wp_template_part/all' ].includes( path ) ||
-		( path === '/pages' && window?.__experimentalAdminViews ) ||
+		[ '/wp_template/all', '/wp_template_part/all', '/pages' ].includes(
+			path
+		) ||
 		( path === '/patterns' &&
 			// Don't treat "/patterns" without categoryType and categoryId as a
 			// list page in mobile because the sidebar covers the whole page.

From ed46eac27241b5fb5a4853cb1cbb7f00f788790b Mon Sep 17 00:00:00 2001
From: Dave Smith <getdavemail@gmail.com>
Date: Wed, 24 Jan 2024 11:34:06 +0000
Subject: [PATCH 258/296] Show initial suggestions in rich text Link UI
 (#57743)

* Show suggestions for rich text links

* Set default search query for initial suggestions to be for pages

* Revert "Set default search query for initial suggestions to be for pages"

This reverts commit b7cb1fe7c1a4e9670c3d3bd22ed321d3cd145481.

* Limit change to RichText only

* Colocate related props
---
 packages/format-library/src/link/inline.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/packages/format-library/src/link/inline.js b/packages/format-library/src/link/inline.js
index 79933be6a6ac5..e477765009d1c 100644
--- a/packages/format-library/src/link/inline.js
+++ b/packages/format-library/src/link/inline.js
@@ -270,6 +270,15 @@ function InlineLinkUI( {
 				createSuggestionButtonText={ createButtonText }
 				hasTextControl
 				settings={ LINK_SETTINGS }
+				showInitialSuggestions={ true }
+				suggestionsQuery={ {
+					// always show Pages as initial suggestions
+					initialSuggestionsSearchOptions: {
+						type: 'post',
+						subtype: 'page',
+						perPage: 20,
+					},
+				} }
 			/>
 		</Popover>
 	);

From 8db42b14e1152aa52071ffa62da1bb1bb0b4ac80 Mon Sep 17 00:00:00 2001
From: Ella <4710635+ellatrix@users.noreply.github.com>
Date: Wed, 24 Jan 2024 13:42:17 +0200
Subject: [PATCH 259/296] Patterns: avoid fetching on load (#57999)

---
 packages/block-editor/src/store/index.js      |   2 +
 .../src/store/private-selectors.js            | 105 ++++-
 packages/block-editor/src/store/reducer.js    |  10 +
 packages/block-editor/src/store/resolvers.js  |  17 +
 packages/block-editor/src/store/selectors.js  | 249 +++++-----
 .../src/store/test/registry-selectors.js      | 431 ++++++++++++++++++
 .../block-editor/src/store/test/selectors.js  | 380 ---------------
 packages/block-editor/src/store/utils.js      |  60 +--
 packages/core-data/src/fetch/index.js         |  27 ++
 packages/core-data/src/resolvers.js           |  13 +-
 .../provider/use-block-editor-settings.js     |  33 +-
 11 files changed, 721 insertions(+), 606 deletions(-)
 create mode 100644 packages/block-editor/src/store/resolvers.js
 create mode 100644 packages/block-editor/src/store/test/registry-selectors.js

diff --git a/packages/block-editor/src/store/index.js b/packages/block-editor/src/store/index.js
index 0bcc00cb5f6ae..10e16a0779cd6 100644
--- a/packages/block-editor/src/store/index.js
+++ b/packages/block-editor/src/store/index.js
@@ -10,6 +10,7 @@ import reducer from './reducer';
 import * as selectors from './selectors';
 import * as privateActions from './private-actions';
 import * as privateSelectors from './private-selectors';
+import * as resolvers from './resolvers';
 import * as actions from './actions';
 import { STORE_NAME } from './constants';
 import { unlock } from '../lock-unlock';
@@ -22,6 +23,7 @@ import { unlock } from '../lock-unlock';
 export const storeConfig = {
 	reducer,
 	selectors,
+	resolvers,
 	actions,
 };
 
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index e8230eea89daa..adad08c7b98dc 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -3,6 +3,11 @@
  */
 import createSelector from 'rememo';
 
+/**
+ * WordPress dependencies
+ */
+import { createRegistrySelector } from '@wordpress/data';
+
 /**
  * Internal dependencies
  */
@@ -11,11 +16,12 @@ import {
 	getBlockParents,
 	getBlockEditingMode,
 	getSettings,
-	__experimentalGetParsedPattern,
 	canInsertBlockType,
-	__experimentalGetAllowedPatterns,
 } from './selectors';
-import { getAllPatterns, checkAllowListRecursive } from './utils';
+import { checkAllowListRecursive, getAllPatternsDependants } from './utils';
+import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
+import { store } from './';
+import { unlock } from '../lock-unlock';
 
 /**
  * Returns true if the block interface is hidden, or false otherwise.
@@ -242,6 +248,10 @@ export const getInserterMediaCategories = createSelector(
 	]
 );
 
+export function getFetchedPatterns( state ) {
+	return state.blockPatterns;
+}
+
 /**
  * Returns whether there is at least one allowed pattern for inner blocks children.
  * This is useful for deferring the parsing of all patterns until needed.
@@ -251,29 +261,74 @@ export const getInserterMediaCategories = createSelector(
  *
  * @return {boolean} If there is at least one allowed pattern.
  */
-export const hasAllowedPatterns = createSelector(
-	( state, rootClientId = null ) => {
-		const patterns = getAllPatterns( state );
-		const { allowedBlockTypes } = getSettings( state );
-		return patterns.some( ( { name, inserter = true } ) => {
-			if ( ! inserter ) {
-				return false;
-			}
-			const { blocks } = __experimentalGetParsedPattern( state, name );
-			return (
-				checkAllowListRecursive( blocks, allowedBlockTypes ) &&
-				blocks.every( ( { name: blockName } ) =>
-					canInsertBlockType( state, blockName, rootClientId )
-				)
+export const hasAllowedPatterns = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, rootClientId = null ) => {
+			const { getAllPatterns, __experimentalGetParsedPattern } = unlock(
+				select( store )
 			);
-		} );
-	},
-	( state, rootClientId ) => [
-		...__experimentalGetAllowedPatterns.getDependants(
-			state,
-			rootClientId
-		),
-	]
+			const patterns = getAllPatterns();
+			const { allowedBlockTypes } = getSettings( state );
+			return patterns.some( ( { name, inserter = true } ) => {
+				if ( ! inserter ) {
+					return false;
+				}
+				const { blocks } = __experimentalGetParsedPattern( name );
+				return (
+					checkAllowListRecursive( blocks, allowedBlockTypes ) &&
+					blocks.every( ( { name: blockName } ) =>
+						canInsertBlockType( state, blockName, rootClientId )
+					)
+				);
+			} );
+		},
+		( state, rootClientId ) => [
+			getAllPatternsDependants( state ),
+			state.settings.allowedBlockTypes,
+			state.settings.templateLock,
+			state.blockListSettings[ rootClientId ],
+			state.blocks.byClientId.get( rootClientId ),
+		]
+	)
+);
+
+export const getAllPatterns = createRegistrySelector( ( select ) =>
+	createSelector( ( state ) => {
+		// This setting is left for back compat.
+		const {
+			__experimentalBlockPatterns = [],
+			__experimentalUserPatternCategories = [],
+			__experimentalReusableBlocks = [],
+		} = state.settings;
+		const userPatterns = ( __experimentalReusableBlocks ?? [] ).map(
+			( userPattern ) => {
+				return {
+					name: `core/block/${ userPattern.id }`,
+					id: userPattern.id,
+					type: INSERTER_PATTERN_TYPES.user,
+					title: userPattern.title.raw,
+					categories: userPattern.wp_pattern_category.map(
+						( catId ) => {
+							const category = (
+								__experimentalUserPatternCategories ?? []
+							).find( ( { id } ) => id === catId );
+							return category ? category.slug : catId;
+						}
+					),
+					content: userPattern.content.raw,
+					syncStatus: userPattern.wp_pattern_sync_status,
+				};
+			}
+		);
+		return [
+			...userPatterns,
+			...__experimentalBlockPatterns,
+			...unlock( select( store ) ).getFetchedPatterns(),
+		].filter(
+			( x, index, arr ) =>
+				index === arr.findIndex( ( y ) => x.name === y.name )
+		);
+	}, getAllPatternsDependants )
 );
 
 /**
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
index 1091d5b5e7aff..70e2dc3488772 100644
--- a/packages/block-editor/src/store/reducer.js
+++ b/packages/block-editor/src/store/reducer.js
@@ -2023,6 +2023,15 @@ export function lastFocus( state = false, action ) {
 	return state;
 }
 
+function blockPatterns( state = [], action ) {
+	switch ( action.type ) {
+		case 'RECEIVE_BLOCK_PATTERNS':
+			return action.patterns;
+	}
+
+	return state;
+}
+
 const combinedReducers = combineReducers( {
 	blocks,
 	isTyping,
@@ -2053,6 +2062,7 @@ const combinedReducers = combineReducers( {
 	blockRemovalRules,
 	openedBlockSettingsMenu,
 	registeredInserterMediaCategories,
+	blockPatterns,
 } );
 
 function withAutomaticChangeReset( reducer ) {
diff --git a/packages/block-editor/src/store/resolvers.js b/packages/block-editor/src/store/resolvers.js
new file mode 100644
index 0000000000000..40c51d241ac67
--- /dev/null
+++ b/packages/block-editor/src/store/resolvers.js
@@ -0,0 +1,17 @@
+export const getFetchedPatterns =
+	() =>
+	async ( { dispatch, select } ) => {
+		const { __experimentalFetchBlockPatterns } = select.getSettings();
+		if ( ! __experimentalFetchBlockPatterns ) {
+			return [];
+		}
+		const patterns = await __experimentalFetchBlockPatterns();
+		dispatch( { type: 'RECEIVE_BLOCK_PATTERNS', patterns } );
+	};
+
+getFetchedPatterns.shouldInvalidate = ( action ) => {
+	return (
+		action.type === 'UPDATE_SETTINGS' &&
+		!! action.settings.__experimentalFetchBlockPatterns
+	);
+};
diff --git a/packages/block-editor/src/store/selectors.js b/packages/block-editor/src/store/selectors.js
index 120b85a04af0e..099c6b30222ef 100644
--- a/packages/block-editor/src/store/selectors.js
+++ b/packages/block-editor/src/store/selectors.js
@@ -27,11 +27,13 @@ import { createRegistrySelector } from '@wordpress/data';
  * Internal dependencies
  */
 import {
-	getAllPatterns,
 	checkAllowListRecursive,
 	checkAllowList,
+	getAllPatternsDependants,
 } from './utils';
 import { orderBy } from '../utils/sorting';
+import { STORE_NAME } from './constants';
+import { unlock } from '../lock-unlock';
 
 /**
  * A block selection object.
@@ -2260,41 +2262,36 @@ export const __experimentalGetDirectInsertBlock = createSelector(
 	]
 );
 
-export const __experimentalGetParsedPattern = createSelector(
-	( state, patternName ) => {
-		const patterns = getAllPatterns( state );
-		const pattern = patterns.find( ( { name } ) => name === patternName );
-		if ( ! pattern ) {
-			return null;
-		}
-		return {
-			...pattern,
-			blocks: parse( pattern.content, {
-				__unstableSkipMigrationLogs: true,
-			} ),
-		};
-	},
-	( state ) => [ getAllPatterns( state ) ]
-);
-
-const getAllAllowedPatterns = createSelector(
-	( state ) => {
-		const patterns = getAllPatterns( state );
-		const { allowedBlockTypes } = getSettings( state );
-
-		const parsedPatterns = patterns
-			.filter( ( { inserter = true } ) => !! inserter )
-			.map( ( { name } ) =>
-				__experimentalGetParsedPattern( state, name )
+export const __experimentalGetParsedPattern = createRegistrySelector(
+	( select ) =>
+		createSelector( ( state, patternName ) => {
+			const { getAllPatterns } = unlock( select( STORE_NAME ) );
+			const patterns = getAllPatterns();
+			const pattern = patterns.find(
+				( { name } ) => name === patternName
 			);
-		const allowedPatterns = parsedPatterns.filter( ( { blocks } ) =>
-			checkAllowListRecursive( blocks, allowedBlockTypes )
-		);
-		return allowedPatterns;
-	},
-	( state ) => [ getAllPatterns( state ), state.settings.allowedBlockTypes ]
+			if ( ! pattern ) {
+				return null;
+			}
+			return {
+				...pattern,
+				blocks: parse( pattern.content, {
+					__unstableSkipMigrationLogs: true,
+				} ),
+			};
+		}, getAllPatternsDependants )
 );
 
+const getAllowedPatternsDependants = ( state, rootClientId ) => {
+	return [
+		...getAllPatternsDependants( state ),
+		state.settings.allowedBlockTypes,
+		state.settings.templateLock,
+		state.blockListSettings[ rootClientId ],
+		state.blocks.byClientId.get( rootClientId ),
+	];
+};
+
 /**
  * Returns the list of allowed patterns for inner blocks children.
  *
@@ -2303,24 +2300,33 @@ const getAllAllowedPatterns = createSelector(
  *
  * @return {Array?} The list of allowed patterns.
  */
-export const __experimentalGetAllowedPatterns = createSelector(
-	( state, rootClientId = null ) => {
-		const availableParsedPatterns = getAllAllowedPatterns( state );
-		const patternsAllowed = availableParsedPatterns.filter(
-			( { blocks } ) =>
-				blocks.every( ( { name } ) =>
-					canInsertBlockType( state, name, rootClientId )
-				)
-		);
+export const __experimentalGetAllowedPatterns = createRegistrySelector(
+	( select ) => {
+		return createSelector( ( state, rootClientId = null ) => {
+			const {
+				getAllPatterns,
+				__experimentalGetParsedPattern: getParsedPattern,
+			} = unlock( select( STORE_NAME ) );
+			const patterns = getAllPatterns();
+			const { allowedBlockTypes } = getSettings( state );
+
+			const parsedPatterns = patterns
+				.filter( ( { inserter = true } ) => !! inserter )
+				.map( ( { name } ) => getParsedPattern( name ) );
+			const availableParsedPatterns = parsedPatterns.filter(
+				( { blocks } ) =>
+					checkAllowListRecursive( blocks, allowedBlockTypes )
+			);
+			const patternsAllowed = availableParsedPatterns.filter(
+				( { blocks } ) =>
+					blocks.every( ( { name } ) =>
+						canInsertBlockType( state, name, rootClientId )
+					)
+			);
 
-		return patternsAllowed;
-	},
-	( state, rootClientId ) => [
-		getAllAllowedPatterns( state ),
-		state.settings.templateLock,
-		state.blockListSettings[ rootClientId ],
-		state.blocks.byClientId.get( rootClientId ),
-	]
+			return patternsAllowed;
+		}, getAllowedPatternsDependants );
+	}
 );
 
 /**
@@ -2336,36 +2342,34 @@ export const __experimentalGetAllowedPatterns = createSelector(
  *
  * @return {Array} The list of matched block patterns based on declared `blockTypes` and block name.
  */
-export const getPatternsByBlockTypes = createSelector(
-	( state, blockNames, rootClientId = null ) => {
-		if ( ! blockNames ) return EMPTY_ARRAY;
-		const patterns = __experimentalGetAllowedPatterns(
-			state,
-			rootClientId
-		);
-		const normalizedBlockNames = Array.isArray( blockNames )
-			? blockNames
-			: [ blockNames ];
-		const filteredPatterns = patterns.filter( ( pattern ) =>
-			pattern?.blockTypes?.some?.( ( blockName ) =>
-				normalizedBlockNames.includes( blockName )
-			)
-		);
-		if ( filteredPatterns.length === 0 ) {
-			return EMPTY_ARRAY;
-		}
-		return filteredPatterns;
-	},
-	( state, blockNames, rootClientId ) => [
-		...__experimentalGetAllowedPatterns.getDependants(
-			state,
-			rootClientId
-		),
-	]
+export const getPatternsByBlockTypes = createRegistrySelector( ( select ) =>
+	createSelector(
+		( state, blockNames, rootClientId = null ) => {
+			if ( ! blockNames ) return EMPTY_ARRAY;
+			const patterns =
+				select( STORE_NAME ).__experimentalGetAllowedPatterns(
+					rootClientId
+				);
+			const normalizedBlockNames = Array.isArray( blockNames )
+				? blockNames
+				: [ blockNames ];
+			const filteredPatterns = patterns.filter( ( pattern ) =>
+				pattern?.blockTypes?.some?.( ( blockName ) =>
+					normalizedBlockNames.includes( blockName )
+				)
+			);
+			if ( filteredPatterns.length === 0 ) {
+				return EMPTY_ARRAY;
+			}
+			return filteredPatterns;
+		},
+		( state, blockNames, rootClientId ) =>
+			getAllowedPatternsDependants( state, rootClientId )
+	)
 );
 
-export const __experimentalGetPatternsByBlockTypes = createSelector(
-	( state, blockNames, rootClientId = null ) => {
+export const __experimentalGetPatternsByBlockTypes = createRegistrySelector(
+	( select ) => {
 		deprecated(
 			'wp.data.select( "core/block-editor" ).__experimentalGetPatternsByBlockTypes',
 			{
@@ -2375,14 +2379,8 @@ export const __experimentalGetPatternsByBlockTypes = createSelector(
 				version: '6.4',
 			}
 		);
-		return getPatternsByBlockTypes( state, blockNames, rootClientId );
-	},
-	( state, blockNames, rootClientId ) => [
-		...__experimentalGetAllowedPatterns.getDependants(
-			state,
-			rootClientId
-		),
-	]
+		return select( STORE_NAME ).getPatternsByBlockTypes;
+	}
 );
 
 /**
@@ -2402,45 +2400,46 @@ export const __experimentalGetPatternsByBlockTypes = createSelector(
  *
  * @return {WPBlockPattern[]} Items that are eligible for a pattern transformation.
  */
-export const __experimentalGetPatternTransformItems = createSelector(
-	( state, blocks, rootClientId = null ) => {
-		if ( ! blocks ) return EMPTY_ARRAY;
-		/**
-		 * For now we only handle blocks without InnerBlocks and take into account
-		 * the `__experimentalRole` property of blocks' attributes for the transformation.
-		 * Note that the blocks have been retrieved through `getBlock`, which doesn't
-		 * return the inner blocks of an inner block controller, so we still need
-		 * to check for this case too.
-		 */
-		if (
-			blocks.some(
-				( { clientId, innerBlocks } ) =>
-					innerBlocks.length ||
-					areInnerBlocksControlled( state, clientId )
-			)
-		) {
-			return EMPTY_ARRAY;
-		}
-
-		// Create a Set of the selected block names that is used in patterns filtering.
-		const selectedBlockNames = Array.from(
-			new Set( blocks.map( ( { name } ) => name ) )
-		);
-		/**
-		 * Here we will return first set of possible eligible block patterns,
-		 * by checking the `blockTypes` property. We still have to recurse through
-		 * block pattern's blocks and try to find matches from the selected blocks.
-		 * Now this happens in the consumer to avoid heavy operations in the selector.
-		 */
-		return getPatternsByBlockTypes(
-			state,
-			selectedBlockNames,
-			rootClientId
-		);
-	},
-	( state, blocks, rootClientId ) => [
-		...getPatternsByBlockTypes.getDependants( state, rootClientId ),
-	]
+export const __experimentalGetPatternTransformItems = createRegistrySelector(
+	( select ) =>
+		createSelector(
+			( state, blocks, rootClientId = null ) => {
+				if ( ! blocks ) return EMPTY_ARRAY;
+				/**
+				 * For now we only handle blocks without InnerBlocks and take into account
+				 * the `__experimentalRole` property of blocks' attributes for the transformation.
+				 * Note that the blocks have been retrieved through `getBlock`, which doesn't
+				 * return the inner blocks of an inner block controller, so we still need
+				 * to check for this case too.
+				 */
+				if (
+					blocks.some(
+						( { clientId, innerBlocks } ) =>
+							innerBlocks.length ||
+							areInnerBlocksControlled( state, clientId )
+					)
+				) {
+					return EMPTY_ARRAY;
+				}
+
+				// Create a Set of the selected block names that is used in patterns filtering.
+				const selectedBlockNames = Array.from(
+					new Set( blocks.map( ( { name } ) => name ) )
+				);
+				/**
+				 * Here we will return first set of possible eligible block patterns,
+				 * by checking the `blockTypes` property. We still have to recurse through
+				 * block pattern's blocks and try to find matches from the selected blocks.
+				 * Now this happens in the consumer to avoid heavy operations in the selector.
+				 */
+				return select( STORE_NAME ).getPatternsByBlockTypes(
+					selectedBlockNames,
+					rootClientId
+				);
+			},
+			( state, blocks, rootClientId ) =>
+				getAllowedPatternsDependants( state, rootClientId )
+		)
 );
 
 /**
diff --git a/packages/block-editor/src/store/test/registry-selectors.js b/packages/block-editor/src/store/test/registry-selectors.js
new file mode 100644
index 0000000000000..89115c75f0514
--- /dev/null
+++ b/packages/block-editor/src/store/test/registry-selectors.js
@@ -0,0 +1,431 @@
+/**
+ * WordPress dependencies
+ */
+import { registerBlockType, unregisterBlockType } from '@wordpress/blocks';
+import { select, dispatch } from '@wordpress/data';
+
+/**
+ * Internal dependencies
+ */
+import { store } from '../';
+
+describe( 'selectors', () => {
+	beforeEach( () => {
+		registerBlockType( 'core/test-block-a', {
+			save: ( props ) => props.attributes.text,
+			category: 'design',
+			title: 'Test Block A',
+			icon: 'test',
+			keywords: [ 'testing' ],
+		} );
+
+		registerBlockType( 'core/test-block-b', {
+			save: ( props ) => props.attributes.text,
+			category: 'text',
+			title: 'Test Block B',
+			icon: 'test',
+			keywords: [ 'testing' ],
+			supports: {
+				multiple: false,
+			},
+		} );
+	} );
+
+	afterEach( async () => {
+		unregisterBlockType( 'core/test-block-a' );
+		unregisterBlockType( 'core/test-block-b' );
+	} );
+
+	describe( '__experimentalGetAllowedPatterns', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'block2',
+					name: 'core/test-block-b',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						title: 'pattern with a',
+						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
+					},
+					{
+						name: 'pattern-b',
+						title: 'pattern with b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-c',
+						title: 'pattern hidden from UI',
+						inserter: false,
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+				],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		it( 'should return all patterns for root level', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( null )
+			).toHaveLength( 2 );
+		} );
+		it( 'should return patterns that consists of blocks allowed for the specified client ID', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( 'block1' )
+			).toHaveLength( 1 );
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( 'block2' )
+			).toHaveLength( 0 );
+		} );
+		it( 'should return empty array if only patterns hidden from UI exist', () => {
+			expect(
+				select( store ).__experimentalGetAllowedPatterns( {
+					blocks: { byClientId: new Map() },
+					blockListSettings: {},
+					settings: {
+						__experimentalBlockPatterns: [
+							{
+								name: 'pattern-c',
+								title: 'pattern hidden from UI',
+								inserter: false,
+								content:
+									'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+							},
+						],
+					},
+				} )
+			).toHaveLength( 0 );
+		} );
+	} );
+
+	describe( '__experimentalGetParsedPattern', () => {
+		beforeAll( async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						title: 'pattern with a',
+						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
+					},
+					{
+						name: 'pattern-hidden-from-ui',
+						title: 'pattern hidden from UI',
+						inserter: false,
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a --><!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+		} );
+
+		it( 'should return proper results when pattern does not exist', () => {
+			expect(
+				select( store ).__experimentalGetParsedPattern( 'not there' )
+			).toBeNull();
+		} );
+		it( 'should return existing pattern properly parsed', () => {
+			const { name, blocks } =
+				select( store ).__experimentalGetParsedPattern( 'pattern-a' );
+			expect( name ).toEqual( 'pattern-a' );
+			expect( blocks ).toHaveLength( 1 );
+			expect( blocks[ 0 ] ).toEqual(
+				expect.objectContaining( {
+					name: 'core/test-block-a',
+				} )
+			);
+		} );
+		it( 'should return hidden from UI pattern when requested', () => {
+			const { name, blocks, inserter } = select(
+				store
+			).__experimentalGetParsedPattern( 'pattern-hidden-from-ui' );
+			expect( name ).toEqual( 'pattern-hidden-from-ui' );
+			expect( inserter ).toBeFalsy();
+			expect( blocks ).toHaveLength( 2 );
+			expect( blocks[ 0 ] ).toEqual(
+				expect.objectContaining( {
+					name: 'core/test-block-a',
+				} )
+			);
+		} );
+	} );
+
+	describe( 'getPatternsByBlockTypes', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						blockTypes: [ 'test/block-a' ],
+						title: 'pattern a',
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+					{
+						name: 'pattern-b',
+						blockTypes: [ 'test/block-b' ],
+						title: 'pattern b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						title: 'pattern c',
+						blockTypes: [ 'test/block-a' ],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {
+				allowedBlocks: [ 'core/test-block-b' ],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		it( 'should return empty array if no block name is provided', () => {
+			expect( select( store ).getPatternsByBlockTypes() ).toEqual( [] );
+		} );
+		it( 'should return empty array if no match is found', () => {
+			const patterns = select( store ).getPatternsByBlockTypes(
+				'test/block-not-exists'
+			);
+			expect( patterns ).toEqual( [] );
+		} );
+		it( 'should return the same empty array in both empty array cases', () => {
+			const patterns1 = select( store ).getPatternsByBlockTypes();
+			const patterns2 = select( store ).getPatternsByBlockTypes(
+				'test/block-not-exists'
+			);
+			expect( patterns1 ).toBe( patterns2 );
+		} );
+		it( 'should return proper results when there are matched block patterns', () => {
+			const patterns =
+				select( store ).getPatternsByBlockTypes( 'test/block-a' );
+			expect( patterns ).toHaveLength( 2 );
+			expect( patterns ).toEqual(
+				expect.arrayContaining( [
+					expect.objectContaining( { title: 'pattern a' } ),
+					expect.objectContaining( { title: 'pattern c' } ),
+				] )
+			);
+		} );
+		it( 'should return proper result with matched patterns and allowed blocks from rootClientId', () => {
+			const patterns = select( store ).getPatternsByBlockTypes(
+				'test/block-a',
+				'block1'
+			);
+			expect( patterns ).toHaveLength( 1 );
+			expect( patterns[ 0 ] ).toEqual(
+				expect.objectContaining( { title: 'pattern c' } )
+			);
+		} );
+	} );
+
+	describe( '__experimentalGetPatternTransformItems', () => {
+		beforeAll( async () => {
+			await dispatch( store ).resetBlocks( [
+				{
+					clientId: 'block1',
+					name: 'core/test-block-a',
+					innerBlocks: [],
+				},
+				{
+					clientId: 'block2',
+					name: 'core/test-block-b',
+					innerBlocks: [],
+				},
+			] );
+			await dispatch( store ).setHasControlledInnerBlocks(
+				'block2-clientId',
+				true
+			);
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [
+					{
+						name: 'pattern-a',
+						blockTypes: [ 'test/block-a' ],
+						title: 'pattern a',
+						content:
+							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
+					},
+					{
+						name: 'pattern-b',
+						blockTypes: [ 'test/block-b' ],
+						title: 'pattern b',
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-c',
+						title: 'pattern c',
+						blockTypes: [ 'test/block-a' ],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+					{
+						name: 'pattern-mix',
+						title: 'pattern mix',
+						blockTypes: [
+							'core/test-block-a',
+							'core/test-block-b',
+						],
+						content:
+							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
+					},
+				],
+			} );
+		} );
+
+		afterAll( async () => {
+			await dispatch( store ).resetBlocks( [] );
+			await dispatch( store ).updateSettings( {
+				__experimentalBlockPatterns: [],
+			} );
+			await dispatch( store ).updateBlockListSettings( 'block1', {} );
+		} );
+
+		describe( 'should return empty array', () => {
+			it( 'when no blocks are selected', () => {
+				expect(
+					select( store ).__experimentalGetPatternTransformItems()
+				).toEqual( [] );
+			} );
+			it( 'when a selected block has inner blocks', () => {
+				const blocks = [
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{
+						name: 'core/test-block-b',
+						innerBlocks: [ { name: 'some inner block' } ],
+					},
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+			it( 'when a selected block has controlled inner blocks', () => {
+				const blocks = [
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{
+						name: 'core/test-block-b',
+						clientId: 'block2-clientId',
+						innerBlocks: [],
+					},
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+			it( 'when no patterns are available based on the selected blocks', () => {
+				const blocks = [
+					{ name: 'block-with-no-patterns', innerBlocks: [] },
+				];
+				expect(
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					)
+				).toEqual( [] );
+			} );
+		} );
+		describe( 'should return proper results', () => {
+			it( 'when a single block is selected', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 1 );
+				expect( patterns[ 0 ] ).toEqual(
+					expect.objectContaining( {
+						name: 'pattern-mix',
+					} )
+				);
+			} );
+			it( 'when different multiple blocks are selected', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+					{ name: 'test/block-b', innerBlocks: [] },
+					{ name: 'some other block', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 2 );
+				expect( patterns ).toEqual(
+					expect.arrayContaining( [
+						expect.objectContaining( {
+							name: 'pattern-mix',
+						} ),
+						expect.objectContaining( {
+							name: 'pattern-b',
+						} ),
+					] )
+				);
+			} );
+			it( 'when multiple blocks are selected containing multiple times the same block', () => {
+				const blocks = [
+					{ name: 'core/test-block-b', innerBlocks: [] },
+					{ name: 'some other block', innerBlocks: [] },
+					{ name: 'core/test-block-a', innerBlocks: [] },
+					{ name: 'core/test-block-b', innerBlocks: [] },
+				];
+				const patterns =
+					select( store ).__experimentalGetPatternTransformItems(
+						blocks
+					);
+				expect( patterns ).toHaveLength( 1 );
+				expect( patterns[ 0 ] ).toEqual(
+					expect.objectContaining( {
+						name: 'pattern-mix',
+					} )
+				);
+			} );
+		} );
+	} );
+} );
diff --git a/packages/block-editor/src/store/test/selectors.js b/packages/block-editor/src/store/test/selectors.js
index b9cc5a9c30698..29833611b17f4 100644
--- a/packages/block-editor/src/store/test/selectors.js
+++ b/packages/block-editor/src/store/test/selectors.js
@@ -65,12 +65,8 @@ const {
 	__experimentalGetLastBlockAttributeChanges,
 	getLowestCommonAncestorWithSelectedBlock,
 	__experimentalGetActiveBlockIdByBlockNames: getActiveBlockIdByBlockNames,
-	__experimentalGetAllowedPatterns,
-	__experimentalGetParsedPattern,
-	getPatternsByBlockTypes,
 	__unstableGetClientIdWithClientIdsTree,
 	__unstableGetClientIdsTree,
-	__experimentalGetPatternTransformItems,
 	wasBlockJustInserted,
 	getBlocksByName,
 	getBlockEditingMode,
@@ -4199,382 +4195,6 @@ describe( 'selectors', () => {
 		} );
 	} );
 
-	describe( '__experimentalGetAllowedPatterns', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-						block2: { name: 'core/test-block-b' },
-					} )
-				),
-				attributes: new Map(
-					Object.entries( {
-						block1: {},
-						block2: {},
-					} )
-				),
-				parents: new Map(
-					Object.entries( {
-						block1: '',
-						block2: '',
-					} )
-				),
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-				block2: {
-					allowedBlocks: [],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						title: 'pattern with a',
-						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
-					},
-					{
-						name: 'pattern-b',
-						title: 'pattern with b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-c',
-						title: 'pattern hidden from UI',
-						inserter: false,
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-
-		it( 'should return all patterns for root level', () => {
-			expect(
-				__experimentalGetAllowedPatterns( state, null )
-			).toHaveLength( 2 );
-		} );
-
-		it( 'should return patterns that consists of blocks allowed for the specified client ID', () => {
-			expect(
-				__experimentalGetAllowedPatterns( state, 'block1' )
-			).toHaveLength( 1 );
-
-			expect(
-				__experimentalGetAllowedPatterns( state, 'block2' )
-			).toHaveLength( 0 );
-		} );
-		it( 'should return empty array if only patterns hidden from UI exist', () => {
-			expect(
-				__experimentalGetAllowedPatterns( {
-					blocks: { byClientId: new Map() },
-					blockListSettings: {},
-					settings: {
-						__experimentalBlockPatterns: [
-							{
-								name: 'pattern-c',
-								title: 'pattern hidden from UI',
-								inserter: false,
-								content:
-									'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-							},
-						],
-					},
-				} )
-			).toHaveLength( 0 );
-		} );
-	} );
-	describe( '__experimentalGetParsedPattern', () => {
-		const state = {
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						title: 'pattern with a',
-						content: `<!-- wp:test-block-a --><!-- /wp:test-block-a -->`,
-					},
-					{
-						name: 'pattern-hidden-from-ui',
-						title: 'pattern hidden from UI',
-						inserter: false,
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a --><!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-		};
-		it( 'should return proper results when pattern does not exist', () => {
-			expect(
-				__experimentalGetParsedPattern( state, 'not there' )
-			).toBeNull();
-		} );
-		it( 'should return existing pattern properly parsed', () => {
-			const { name, blocks } = __experimentalGetParsedPattern(
-				state,
-				'pattern-a'
-			);
-			expect( name ).toEqual( 'pattern-a' );
-			expect( blocks ).toHaveLength( 1 );
-			expect( blocks[ 0 ] ).toEqual(
-				expect.objectContaining( {
-					name: 'core/test-block-a',
-				} )
-			);
-		} );
-		it( 'should return hidden from UI pattern when requested', () => {
-			const { name, blocks, inserter } = __experimentalGetParsedPattern(
-				state,
-				'pattern-hidden-from-ui'
-			);
-			expect( name ).toEqual( 'pattern-hidden-from-ui' );
-			expect( inserter ).toBeFalsy();
-			expect( blocks ).toHaveLength( 2 );
-			expect( blocks[ 0 ] ).toEqual(
-				expect.objectContaining( {
-					name: 'core/test-block-a',
-				} )
-			);
-		} );
-	} );
-	describe( 'getPatternsByBlockTypes', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-					} )
-				),
-				parents: new Map(),
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						blockTypes: [ 'test/block-a' ],
-						title: 'pattern a',
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-					{
-						name: 'pattern-b',
-						blockTypes: [ 'test/block-b' ],
-						title: 'pattern b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						title: 'pattern c',
-						blockTypes: [ 'test/block-a' ],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-		it( 'should return empty array if no block name is provided', () => {
-			expect( getPatternsByBlockTypes( state ) ).toEqual( [] );
-		} );
-		it( 'should return empty array if no match is found', () => {
-			const patterns = getPatternsByBlockTypes(
-				state,
-				'test/block-not-exists'
-			);
-			expect( patterns ).toEqual( [] );
-		} );
-		it( 'should return the same empty array in both empty array cases', () => {
-			const patterns1 = getPatternsByBlockTypes( state );
-			const patterns2 = getPatternsByBlockTypes(
-				state,
-				'test/block-not-exists'
-			);
-			expect( patterns1 ).toBe( patterns2 );
-		} );
-		it( 'should return proper results when there are matched block patterns', () => {
-			const patterns = getPatternsByBlockTypes( state, 'test/block-a' );
-			expect( patterns ).toHaveLength( 2 );
-			expect( patterns ).toEqual(
-				expect.arrayContaining( [
-					expect.objectContaining( { title: 'pattern a' } ),
-					expect.objectContaining( { title: 'pattern c' } ),
-				] )
-			);
-		} );
-		it( 'should return proper result with matched patterns and allowed blocks from rootClientId', () => {
-			const patterns = getPatternsByBlockTypes(
-				state,
-				'test/block-a',
-				'block1'
-			);
-			expect( patterns ).toHaveLength( 1 );
-			expect( patterns[ 0 ] ).toEqual(
-				expect.objectContaining( { title: 'pattern c' } )
-			);
-		} );
-	} );
-	describe( '__experimentalGetPatternTransformItems', () => {
-		const state = {
-			blocks: {
-				byClientId: new Map(
-					Object.entries( {
-						block1: { name: 'core/test-block-a' },
-						block2: { name: 'core/test-block-b' },
-					} )
-				),
-				parents: new Map(),
-				controlledInnerBlocks: { 'block2-clientId': true },
-			},
-			blockListSettings: {
-				block1: {
-					allowedBlocks: [ 'core/test-block-b' ],
-				},
-			},
-			settings: {
-				__experimentalBlockPatterns: [
-					{
-						name: 'pattern-a',
-						blockTypes: [ 'test/block-a' ],
-						title: 'pattern a',
-						content:
-							'<!-- wp:test-block-a --><!-- /wp:test-block-a -->',
-					},
-					{
-						name: 'pattern-b',
-						blockTypes: [ 'test/block-b' ],
-						title: 'pattern b',
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-c',
-						title: 'pattern c',
-						blockTypes: [ 'test/block-a' ],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-					{
-						name: 'pattern-mix',
-						title: 'pattern mix',
-						blockTypes: [
-							'core/test-block-a',
-							'core/test-block-b',
-						],
-						content:
-							'<!-- wp:test-block-b --><!-- /wp:test-block-b -->',
-					},
-				],
-			},
-			blockEditingModes: new Map(),
-		};
-		describe( 'should return empty array', () => {
-			it( 'when no blocks are selected', () => {
-				expect(
-					__experimentalGetPatternTransformItems( state )
-				).toEqual( [] );
-			} );
-			it( 'when a selected block has inner blocks', () => {
-				const blocks = [
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{
-						name: 'core/test-block-b',
-						innerBlocks: [ { name: 'some inner block' } ],
-					},
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-			it( 'when a selected block has controlled inner blocks', () => {
-				const blocks = [
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{
-						name: 'core/test-block-b',
-						clientId: 'block2-clientId',
-						innerBlocks: [],
-					},
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-			it( 'when no patterns are available based on the selected blocks', () => {
-				const blocks = [
-					{ name: 'block-with-no-patterns', innerBlocks: [] },
-				];
-				expect(
-					__experimentalGetPatternTransformItems( state, blocks )
-				).toEqual( [] );
-			} );
-		} );
-		describe( 'should return proper results', () => {
-			it( 'when a single block is selected', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 1 );
-				expect( patterns[ 0 ] ).toEqual(
-					expect.objectContaining( {
-						name: 'pattern-mix',
-					} )
-				);
-			} );
-			it( 'when different multiple blocks are selected', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-					{ name: 'test/block-b', innerBlocks: [] },
-					{ name: 'some other block', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 2 );
-				expect( patterns ).toEqual(
-					expect.arrayContaining( [
-						expect.objectContaining( {
-							name: 'pattern-mix',
-						} ),
-						expect.objectContaining( {
-							name: 'pattern-b',
-						} ),
-					] )
-				);
-			} );
-			it( 'when multiple blocks are selected containing multiple times the same block', () => {
-				const blocks = [
-					{ name: 'core/test-block-b', innerBlocks: [] },
-					{ name: 'some other block', innerBlocks: [] },
-					{ name: 'core/test-block-a', innerBlocks: [] },
-					{ name: 'core/test-block-b', innerBlocks: [] },
-				];
-				const patterns = __experimentalGetPatternTransformItems(
-					state,
-					blocks
-				);
-				expect( patterns ).toHaveLength( 1 );
-				expect( patterns[ 0 ] ).toEqual(
-					expect.objectContaining( {
-						name: 'pattern-mix',
-					} )
-				);
-			} );
-		} );
-	} );
-
 	describe( 'wasBlockJustInserted', () => {
 		it( 'should return true if the client id passed to wasBlockJustInserted is found within the state', () => {
 			const expectedClientId = '62bfef6e-d5e9-43ba-b7f9-c77cf354141f';
diff --git a/packages/block-editor/src/store/utils.js b/packages/block-editor/src/store/utils.js
index 7587dcdf56fd7..6cde56da1b55a 100644
--- a/packages/block-editor/src/store/utils.js
+++ b/packages/block-editor/src/store/utils.js
@@ -1,53 +1,3 @@
-/**
- * External dependencies
- */
-import createSelector from 'rememo';
-
-/**
- * Internal dependencies
- */
-import { INSERTER_PATTERN_TYPES } from '../components/inserter/block-patterns-tab/utils';
-
-export const getUserPatterns = createSelector(
-	( state ) => {
-		const userPatterns = state.settings.__experimentalReusableBlocks ?? [];
-		const userPatternCategories =
-			state.settings.__experimentalUserPatternCategories ?? [];
-		return userPatterns.map( ( userPattern ) => {
-			return {
-				name: `core/block/${ userPattern.id }`,
-				id: userPattern.id,
-				type: INSERTER_PATTERN_TYPES.user,
-				title: userPattern.title.raw,
-				categories: userPattern.wp_pattern_category.map( ( catId ) => {
-					const category = userPatternCategories.find(
-						( { id } ) => id === catId
-					);
-					return category ? category.slug : catId;
-				} ),
-				content: userPattern.content.raw,
-				syncStatus: userPattern.wp_pattern_sync_status,
-			};
-		} );
-	},
-	( state ) => [
-		state.settings.__experimentalReusableBlocks,
-		state.settings.__experimentalUserPatternCategories,
-	]
-);
-
-export const getAllPatterns = createSelector(
-	( state ) => {
-		const patterns = state.settings.__experimentalBlockPatterns;
-		const userPatterns = getUserPatterns( state );
-		return [ ...userPatterns, ...patterns ];
-	},
-	( state ) => [
-		state.settings.__experimentalBlockPatterns,
-		getUserPatterns( state ),
-	]
-);
-
 export const checkAllowList = ( list, item, defaultResult = null ) => {
 	if ( typeof list === 'boolean' ) {
 		return list;
@@ -89,3 +39,13 @@ export const checkAllowListRecursive = ( blocks, allowedBlockTypes ) => {
 
 	return true;
 };
+
+export const getAllPatternsDependants = ( state ) => {
+	return [
+		state.settings.__experimentalBlockPatterns,
+		state.settings.__experimentalUserPatternCategories,
+		state.settings.__experimentalReusableBlocks,
+		state.settings.__experimentalFetchBlockPatterns,
+		state.blockPatterns,
+	];
+};
diff --git a/packages/core-data/src/fetch/index.js b/packages/core-data/src/fetch/index.js
index 8d4d28e3b0db8..de45f3399dac8 100644
--- a/packages/core-data/src/fetch/index.js
+++ b/packages/core-data/src/fetch/index.js
@@ -1,2 +1,29 @@
+/**
+ * External dependencies
+ */
+import { camelCase } from 'change-case';
+
+/**
+ * WordPress dependencies
+ */
+import apiFetch from '@wordpress/api-fetch';
+
 export { default as __experimentalFetchLinkSuggestions } from './__experimental-fetch-link-suggestions';
 export { default as __experimentalFetchUrlData } from './__experimental-fetch-url-data';
+
+export async function fetchBlockPatterns() {
+	const restPatterns = await apiFetch( {
+		path: '/wp/v2/block-patterns/patterns',
+	} );
+	if ( ! restPatterns ) {
+		return [];
+	}
+	return restPatterns.map( ( pattern ) =>
+		Object.fromEntries(
+			Object.entries( pattern ).map( ( [ key, value ] ) => [
+				camelCase( key ),
+				value,
+			] )
+		)
+	);
+}
diff --git a/packages/core-data/src/resolvers.js b/packages/core-data/src/resolvers.js
index 807005ec4a6e8..7f4d3f54776d4 100644
--- a/packages/core-data/src/resolvers.js
+++ b/packages/core-data/src/resolvers.js
@@ -17,6 +17,7 @@ import { STORE_NAME } from './name';
 import { getOrLoadEntitiesConfig, DEFAULT_ENTITY_KEY } from './entities';
 import { forwardResolver, getNormalizedCommaSeparable } from './utils';
 import { getSyncProvider } from './sync';
+import { fetchBlockPatterns } from './fetch';
 
 /**
  * Requests authors from the REST API.
@@ -619,17 +620,7 @@ getCurrentThemeGlobalStylesRevisions.shouldInvalidate = ( action ) => {
 export const getBlockPatterns =
 	() =>
 	async ( { dispatch } ) => {
-		const restPatterns = await apiFetch( {
-			path: '/wp/v2/block-patterns/patterns',
-		} );
-		const patterns = restPatterns?.map( ( pattern ) =>
-			Object.fromEntries(
-				Object.entries( pattern ).map( ( [ key, value ] ) => [
-					camelCase( key ),
-					value,
-				] )
-			)
-		);
+		const patterns = await fetchBlockPatterns();
 		dispatch( { type: 'RECEIVE_BLOCK_PATTERNS', patterns } );
 	};
 
diff --git a/packages/editor/src/components/provider/use-block-editor-settings.js b/packages/editor/src/components/provider/use-block-editor-settings.js
index 5a9b3a82b1bdb..78c9b1a56e83a 100644
--- a/packages/editor/src/components/provider/use-block-editor-settings.js
+++ b/packages/editor/src/components/provider/use-block-editor-settings.js
@@ -7,6 +7,7 @@ import {
 	store as coreStore,
 	__experimentalFetchLinkSuggestions as fetchLinkSuggestions,
 	__experimentalFetchUrlData as fetchUrlData,
+	fetchBlockPatterns,
 } from '@wordpress/core-data';
 import { __ } from '@wordpress/i18n';
 import { store as preferencesStore } from '@wordpress/preferences';
@@ -101,7 +102,6 @@ function useBlockEditorSettings( settings, postType, postId ) {
 		pageOnFront,
 		pageForPosts,
 		userPatternCategories,
-		restBlockPatterns,
 		restBlockPatternCategories,
 	} = useSelect(
 		( select ) => {
@@ -112,7 +112,6 @@ function useBlockEditorSettings( settings, postType, postId ) {
 				getEntityRecord,
 				getUserPatternCategories,
 				getEntityRecords,
-				getBlockPatterns,
 				getBlockPatternCategories,
 			} = select( coreStore );
 			const { get } = select( preferencesStore );
@@ -148,7 +147,6 @@ function useBlockEditorSettings( settings, postType, postId ) {
 				pageOnFront: siteSettings?.page_on_front,
 				pageForPosts: siteSettings?.page_for_posts,
 				userPatternCategories: getUserPatternCategories(),
-				restBlockPatterns: getBlockPatterns(),
 				restBlockPatternCategories: getBlockPatternCategories(),
 			};
 		},
@@ -164,22 +162,16 @@ function useBlockEditorSettings( settings, postType, postId ) {
 
 	const blockPatterns = useMemo(
 		() =>
-			[
-				...( settingsBlockPatterns || [] ),
-				...( restBlockPatterns || [] ),
-			]
-				.filter(
-					( x, index, arr ) =>
-						index === arr.findIndex( ( y ) => x.name === y.name )
-				)
-				.filter( ( { postTypes } ) => {
+			[ ...( settingsBlockPatterns || [] ) ].filter(
+				( { postTypes } ) => {
 					return (
 						! postTypes ||
 						( Array.isArray( postTypes ) &&
 							postTypes.includes( postType ) )
 					);
-				} ),
-		[ settingsBlockPatterns, restBlockPatterns, postType ]
+				}
+			),
+		[ settingsBlockPatterns, postType ]
 	);
 
 	const blockPatternCategories = useMemo(
@@ -254,8 +246,19 @@ function useBlockEditorSettings( settings, postType, postId ) {
 			isDistractionFree,
 			keepCaretInsideBlock,
 			mediaUpload: hasUploadPermissions ? mediaUpload : undefined,
-			__experimentalReusableBlocks: reusableBlocks,
 			__experimentalBlockPatterns: blockPatterns,
+			__experimentalFetchBlockPatterns: async () => {
+				return ( await fetchBlockPatterns() ).filter(
+					( { postTypes } ) => {
+						return (
+							! postTypes ||
+							( Array.isArray( postTypes ) &&
+								postTypes.includes( postType ) )
+						);
+					}
+				);
+			},
+			__experimentalReusableBlocks: reusableBlocks,
 			__experimentalBlockPatternCategories: blockPatternCategories,
 			__experimentalUserPatternCategories: userPatternCategories,
 			__experimentalFetchLinkSuggestions: ( search, searchOptions ) =>

From 93cc5d6fddf4283a8c463dc92523df5b5222b87d Mon Sep 17 00:00:00 2001
From: Andrei Draganescu <me@andreidraganescu.info>
Date: Wed, 24 Jan 2024 14:05:47 +0200
Subject: [PATCH 260/296] add copy button to link UI (#58170)

---
 .../components/link-control/link-preview.js   | 21 ++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/packages/block-editor/src/components/link-control/link-preview.js b/packages/block-editor/src/components/link-control/link-preview.js
index 5a5a30969d013..17cc851c503a1 100644
--- a/packages/block-editor/src/components/link-control/link-preview.js
+++ b/packages/block-editor/src/components/link-control/link-preview.js
@@ -13,9 +13,12 @@ import {
 	__experimentalTruncate as Truncate,
 	Tooltip,
 } from '@wordpress/components';
+import { useCopyToClipboard } from '@wordpress/compose';
 import { filterURLForDisplay, safeDecodeURI } from '@wordpress/url';
-import { Icon, globe, info, linkOff, edit } from '@wordpress/icons';
+import { Icon, globe, info, linkOff, edit, copy } from '@wordpress/icons';
 import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import { useDispatch } from '@wordpress/data';
+import { store as noticesStore } from '@wordpress/notices';
 
 /**
  * Internal dependencies
@@ -61,6 +64,14 @@ export default function LinkPreview( {
 		icon = <Icon icon={ globe } />;
 	}
 
+	const { createNotice } = useDispatch( noticesStore );
+	const ref = useCopyToClipboard( value.url, () => {
+		createNotice( 'info', __( 'Copied URL to clipboard.' ), {
+			isDismissible: true,
+			type: 'snackbar',
+		} );
+	} );
+
 	return (
 		<div
 			aria-label={ __( 'Currently selected' ) }
@@ -130,6 +141,14 @@ export default function LinkPreview( {
 						size="compact"
 					/>
 				) }
+				<Button
+					icon={ copy }
+					label={ __( 'Copy URL' ) }
+					className="block-editor-link-control__search-item-action block-editor-link-control__copy"
+					ref={ ref }
+					disabled={ isEmptyURL }
+					size="compact"
+				/>
 				<ViewerSlot fillProps={ value } />
 			</div>
 			{ additionalControls && additionalControls() }

From 61629a7ee1b63526d8030a6ed518a4326e64ac79 Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Wed, 24 Jan 2024 14:36:48 +0200
Subject: [PATCH 261/296] DataViews: Default sort order in templates by title
 (#58175)

---
 .../src/components/page-templates-template-parts/index.js     | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/edit-site/src/components/page-templates-template-parts/index.js b/packages/edit-site/src/components/page-templates-template-parts/index.js
index da7c64a2b6349..a1b87d3b38d88 100644
--- a/packages/edit-site/src/components/page-templates-template-parts/index.js
+++ b/packages/edit-site/src/components/page-templates-template-parts/index.js
@@ -85,6 +85,10 @@ const DEFAULT_VIEW = {
 	search: '',
 	page: 1,
 	perPage: 20,
+	sort: {
+		field: 'title',
+		direction: 'asc',
+	},
 	// All fields are visible by default, so it's
 	// better to keep track of the hidden ones.
 	hiddenFields: [ 'preview' ],

From 7f3b8c56e12738ff40d32c627319f5ef54d672db Mon Sep 17 00:00:00 2001
From: Rich Tabor <hi@richtabor.com>
Date: Wed, 24 Jan 2024 07:51:47 -0500
Subject: [PATCH 262/296] Improve common commands with more context and
 feedback (#58148)

* Tweak List View

* Tweak post commands

* Tweak site commands

* Add undo action to distraction free notices
---
 .../src/hooks/commands/use-common-commands.js | 84 +++++++++++++++++--
 packages/edit-post/src/store/actions.js       | 10 +++
 .../hooks/commands/use-edit-mode-commands.js  | 53 +++++++++++-
 packages/edit-site/src/store/actions.js       | 10 +++
 4 files changed, 147 insertions(+), 10 deletions(-)

diff --git a/packages/edit-post/src/hooks/commands/use-common-commands.js b/packages/edit-post/src/hooks/commands/use-common-commands.js
index 003f84349dfa9..c12a5e1d5c611 100644
--- a/packages/edit-post/src/hooks/commands/use-common-commands.js
+++ b/packages/edit-post/src/hooks/commands/use-common-commands.js
@@ -9,7 +9,7 @@ import {
 	drawerRight,
 	blockDefault,
 	keyboard,
-	desktop,
+	fullscreen,
 	listView,
 	external,
 	formatListBullets,
@@ -39,13 +39,17 @@ export default function useCommonCommands() {
 		editorMode,
 		activeSidebar,
 		isListViewOpen,
+		isFullscreen,
 		isPublishSidebarEnabled,
 		showBlockBreadcrumbs,
 		isDistractionFree,
+		isTopToolbar,
+		isFocusMode,
 	} = useSelect( ( select ) => {
 		const { get } = select( preferencesStore );
 		const { getEditorMode } = select( editPostStore );
 		const { isListViewOpened } = select( editorStore );
+
 		return {
 			activeSidebar: select( interfaceStore ).getActiveComplementaryArea(
 				editPostStore.name
@@ -56,6 +60,9 @@ export default function useCommonCommands() {
 				select( editorStore ).isPublishSidebarEnabled(),
 			showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
 			isDistractionFree: get( 'core', 'distractionFree' ),
+			isFocusMode: get( 'core', 'focusMode' ),
+			isTopToolbar: get( 'core', 'fixedToolbar' ),
+			isFullscreen: get( 'core/edit-post', 'fullscreenMode' ),
 		};
 	}, [] );
 	const { toggle } = useDispatch( preferencesStore );
@@ -94,7 +101,9 @@ export default function useCommonCommands() {
 
 	useCommand( {
 		name: 'core/toggle-distraction-free',
-		label: __( 'Toggle distraction free' ),
+		label: isDistractionFree
+			? __( 'Exit Distraction Free' )
+			: __( 'Enter Distraction Free ' ),
 		callback: ( { close } ) => {
 			toggleDistractionFree();
 			close();
@@ -103,30 +112,71 @@ export default function useCommonCommands() {
 
 	useCommand( {
 		name: 'core/toggle-spotlight-mode',
-		label: __( 'Toggle spotlight mode' ),
+		label: __( 'Toggle spotlight' ),
 		callback: ( { close } ) => {
 			toggle( 'core', 'focusMode' );
 			close();
+			createInfoNotice(
+				isFocusMode ? __( 'Spotlight off.' ) : __( 'Spotlight on.' ),
+				{
+					id: 'core/edit-post/toggle-spotlight-mode/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'focusMode' );
+							},
+						},
+					],
+				}
+			);
 		},
 	} );
 
 	useCommand( {
 		name: 'core/toggle-fullscreen-mode',
-		label: __( 'Toggle fullscreen mode' ),
-		icon: desktop,
+		label: isFullscreen
+			? __( 'Exit fullscreen' )
+			: __( 'Enter fullscreen' ),
+		icon: fullscreen,
 		callback: ( { close } ) => {
 			toggle( 'core/edit-post', 'fullscreenMode' );
 			close();
+			createInfoNotice(
+				isFullscreen ? __( 'Fullscreen off.' ) : __( 'Fullscreen on.' ),
+				{
+					id: 'core/edit-post/toggle-fullscreen-mode/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core/edit-post', 'fullscreenMode' );
+							},
+						},
+					],
+				}
+			);
 		},
 	} );
 
 	useCommand( {
 		name: 'core/toggle-list-view',
-		label: __( 'Toggle list view' ),
+		label: isListViewOpen
+			? __( 'Close List View' )
+			: __( 'Open List View' ),
 		icon: listView,
 		callback: ( { close } ) => {
 			setIsListViewOpened( ! isListViewOpen );
 			close();
+			createInfoNotice(
+				isListViewOpen ? __( 'List View off.' ) : __( 'List View on.' ),
+				{
+					id: 'core/edit-post/toggle-list-view/notice',
+					type: 'snackbar',
+				}
+			);
 		},
 	} );
 
@@ -139,12 +189,32 @@ export default function useCommonCommands() {
 				toggleDistractionFree();
 			}
 			close();
+			createInfoNotice(
+				isTopToolbar
+					? __( 'Top toolbar off.' )
+					: __( 'Top toolbar on.' ),
+				{
+					id: 'core/edit-post/toggle-top-toolbar/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'fixedToolbar' );
+							},
+						},
+					],
+				}
+			);
 		},
 	} );
 
 	useCommand( {
 		name: 'core/toggle-code-editor',
-		label: __( 'Toggle code editor' ),
+		label:
+			editorMode === 'visual'
+				? __( 'Open code editor' )
+				: __( 'Exit code editor' ),
 		icon: code,
 		callback: ( { close } ) => {
 			switchEditorMode( editorMode === 'visual' ? 'text' : 'visual' );
diff --git a/packages/edit-post/src/store/actions.js b/packages/edit-post/src/store/actions.js
index b6d8e437ccabf..96a545a25323a 100644
--- a/packages/edit-post/src/store/actions.js
+++ b/packages/edit-post/src/store/actions.js
@@ -573,6 +573,16 @@ export const toggleDistractionFree =
 					{
 						id: 'core/edit-post/distraction-free-mode/notice',
 						type: 'snackbar',
+						actions: [
+							{
+								label: __( 'Undo' ),
+								onClick: () => {
+									registry
+										.dispatch( preferencesStore )
+										.toggle( 'core', 'distractionFree' );
+								},
+							},
+						],
 					}
 				);
 		} );
diff --git a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
index 0265329f40b09..0febc2379a8b4 100644
--- a/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
+++ b/packages/edit-site/src/hooks/commands/use-edit-mode-commands.js
@@ -216,6 +216,8 @@ function useEditUICommands() {
 		showBlockBreadcrumbs,
 		isListViewOpen,
 		isDistractionFree,
+		isTopToolbar,
+		isFocusMode,
 	} = useSelect( ( select ) => {
 		const { get } = select( preferencesStore );
 		const { getEditorMode } = select( editSiteStore );
@@ -229,6 +231,8 @@ function useEditUICommands() {
 			showBlockBreadcrumbs: get( 'core', 'showBlockBreadcrumbs' ),
 			isListViewOpen: isListViewOpened(),
 			isDistractionFree: get( 'core', 'distractionFree' ),
+			isFocusMode: get( 'core', 'focusMode' ),
+			isTopToolbar: get( 'core', 'fixedToolbar' ),
 		};
 	}, [] );
 	const { openModal } = useDispatch( interfaceStore );
@@ -271,16 +275,33 @@ function useEditUICommands() {
 
 	commands.push( {
 		name: 'core/toggle-spotlight-mode',
-		label: __( 'Toggle spotlight mode' ),
+		label: __( 'Toggle spotlight' ),
 		callback: ( { close } ) => {
 			toggle( 'core', 'focusMode' );
 			close();
+			createInfoNotice(
+				isFocusMode ? __( 'Spotlight off.' ) : __( 'Spotlight on.' ),
+				{
+					id: 'core/edit-site/toggle-spotlight-mode/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'focusMode' );
+							},
+						},
+					],
+				}
+			);
 		},
 	} );
 
 	commands.push( {
 		name: 'core/toggle-distraction-free',
-		label: __( 'Toggle distraction free' ),
+		label: isDistractionFree
+			? __( 'Exit Distraction Free' )
+			: __( 'Enter Distraction Free ' ),
 		callback: ( { close } ) => {
 			toggleDistractionFree();
 			close();
@@ -296,6 +317,23 @@ function useEditUICommands() {
 				toggleDistractionFree();
 			}
 			close();
+			createInfoNotice(
+				isTopToolbar
+					? __( 'Top toolbar off.' )
+					: __( 'Top toolbar on.' ),
+				{
+					id: 'core/edit-site/toggle-top-toolbar/notice',
+					type: 'snackbar',
+					actions: [
+						{
+							label: __( 'Undo' ),
+							onClick: () => {
+								toggle( 'core', 'fixedToolbar' );
+							},
+						},
+					],
+				}
+			);
 		},
 	} );
 
@@ -350,11 +388,20 @@ function useEditUICommands() {
 
 	commands.push( {
 		name: 'core/toggle-list-view',
-		label: __( 'Toggle list view' ),
+		label: isListViewOpen
+			? __( 'Close List View' )
+			: __( 'Open List View' ),
 		icon: listView,
 		callback: ( { close } ) => {
 			setIsListViewOpened( ! isListViewOpen );
 			close();
+			createInfoNotice(
+				isListViewOpen ? __( 'List View off.' ) : __( 'List View on.' ),
+				{
+					id: 'core/edit-site/toggle-list-view/notice',
+					type: 'snackbar',
+				}
+			);
 		},
 	} );
 
diff --git a/packages/edit-site/src/store/actions.js b/packages/edit-site/src/store/actions.js
index f5f4ae7ba3fae..728081bf2fc0f 100644
--- a/packages/edit-site/src/store/actions.js
+++ b/packages/edit-site/src/store/actions.js
@@ -582,6 +582,16 @@ export const toggleDistractionFree =
 					{
 						id: 'core/edit-site/distraction-free-mode/notice',
 						type: 'snackbar',
+						actions: [
+							{
+								label: __( 'Undo' ),
+								onClick: () => {
+									registry
+										.dispatch( preferencesStore )
+										.toggle( 'core', 'distractionFree' );
+								},
+							},
+						],
 					}
 				);
 		} );

From b3fdade90958c28a39b0ee02fd7bd3432de3c63f Mon Sep 17 00:00:00 2001
From: Andrea Fercia <a.fercia@gmail.com>
Date: Wed, 24 Jan 2024 14:05:00 +0100
Subject: [PATCH 263/296] Fix font variants count color contrast and l10n.
 (#58117)

---
 .../src/components/global-styles/font-family-item.js  | 11 +++++++----
 .../edit-site/src/components/global-styles/style.scss |  4 ++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/edit-site/src/components/global-styles/font-family-item.js b/packages/edit-site/src/components/global-styles/font-family-item.js
index a0044e156c9fb..fc5418d5c7eb1 100644
--- a/packages/edit-site/src/components/global-styles/font-family-item.js
+++ b/packages/edit-site/src/components/global-styles/font-family-item.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { _n } from '@wordpress/i18n';
+import { _n, sprintf } from '@wordpress/i18n';
 import {
 	__experimentalHStack as HStack,
 	__experimentalItem as Item,
@@ -32,9 +32,12 @@ function FontFamilyItem( { font } ) {
 		<Item onClick={ handleClick }>
 			<HStack justify="space-between">
 				<FlexItem style={ previewStyle }>{ font.name }</FlexItem>
-				<FlexItem style={ { color: '#9e9e9e' } }>
-					{ variantsCount }{ ' ' }
-					{ _n( 'variant', 'variants', variantsCount ) }
+				<FlexItem className="edit-site-global-styles-screen-typography__font-variants-count">
+					{ sprintf(
+						/* translators: %d: Number of font variants. */
+						_n( '%d variant', '%d variants', variantsCount ),
+						variantsCount
+					) }
 				</FlexItem>
 			</HStack>
 		</Item>
diff --git a/packages/edit-site/src/components/global-styles/style.scss b/packages/edit-site/src/components/global-styles/style.scss
index a899495cc332b..bae6982640391 100644
--- a/packages/edit-site/src/components/global-styles/style.scss
+++ b/packages/edit-site/src/components/global-styles/style.scss
@@ -42,6 +42,10 @@
 	border-radius: $radius-block-ui;
 }
 
+.edit-site-global-styles-screen-typography__font-variants-count {
+	color: $gray-700;
+}
+
 .edit-site-global-styles-screen-colors {
 	margin: $grid-unit-20;
 

From 01fb5051b9dde05f63ba04e5b89bfdfb0e396d86 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:17:26 +0100
Subject: [PATCH 264/296] Script Modules API: update the code and move it to
 the compat/wordpress-6.5 folder (#57778)

* Move modules api to 6.5 folder

* Update functions to use wp_modules instead of gutenberg_modules

* Prevent class redeclaration

* Add classic themes conditional

* Yet another script position movement

* Add gutenberg_*_module deprecations

* Add correct version deprecations

* Add correct version deprecations

* Use correct order for module hooks

* Rename module functions to script_module

* Rename module functions to script_module

* Update files from WP Core

Includes this PR https://github.com/WordPress/wordpress-develop/pull/5931

* Fix deprecated version and rename experimental file

* Add warning to upcoming deleted file

* Refactor file to use only modules

* Refactor search block to use only modules

* Refactor query block to use only modules

* Refactor image block to use only modules

* Refactor navigation block to use only modules

* Fix some params and add missing DocBlock

* Update DEWP readme

* Remove tests

This code is now tested in WordPress Core.

* Update enqueue in new e2e tests

* Fix wrong print function names

* Remove unnecessary extra argument

* Add missing function

* Fix redeclared class problem

Fixes an issue in PHP 7.0 where we'd see a redeclared class fatal error.

* Remove we from docs

---------

Co-authored-by: Luis Herranz <luisherranz@gmail.com>
Co-authored-by: Jon Surrell <sirreal@users.noreply.github.com>
---
 .../class-wp-navigation-block-renderer.php    |  79 ++-
 .../wordpress-6.5/class-wp-script-modules.php | 323 ++++++++++++
 lib/compat/wordpress-6.5/scripts-modules.php  | 119 +++++
 .../interactivity-api/modules.php             |   5 +-
 .../modules/class-gutenberg-modules.php       | 470 ------------------
 lib/experimental/script-modules.php           | 234 +++++++++
 lib/load.php                                  |   5 +-
 packages/block-library/src/file/block.json    |   1 -
 packages/block-library/src/file/index.php     |  68 +--
 packages/block-library/src/image/block.json   |   3 +-
 packages/block-library/src/image/index.php    |  65 +--
 .../block-library/src/navigation/block.json   |   1 -
 .../block-library/src/navigation/index.php    |  33 +-
 packages/block-library/src/query/block.json   |   3 +-
 packages/block-library/src/query/index.php    |  92 +---
 packages/block-library/src/search/block.json  |   1 -
 packages/block-library/src/search/index.php   |  54 +-
 .../README.md                                 |  40 +-
 .../e2e-tests/plugins/interactive-blocks.php  |   5 +-
 .../directive-bind/render.php                 |   2 +-
 .../directive-body/render.php                 |   2 +-
 .../directive-class/render.php                |   2 +-
 .../directive-context/render.php              |   2 +-
 .../directive-each/render.php                 |   2 +-
 .../directive-init/render.php                 |   2 +-
 .../directive-key/render.php                  |   2 +-
 .../directive-on-document/render.php          |   2 +-
 .../directive-on-window/render.php            |   2 +-
 .../directive-on/render.php                   |   2 +-
 .../directive-priorities/render.php           |   2 +-
 .../directive-run/render.php                  |   2 +-
 .../directive-style/render.php                |   2 +-
 .../directive-text/render.php                 |   2 +-
 .../directive-watch/render.php                |   2 +-
 .../negation-operator/render.php              |   2 +-
 .../router-navigate/render.php                |   2 +-
 .../router-regions/render.php                 |   2 +-
 .../interactive-blocks/store-tag/render.php   |   2 +-
 .../tovdom-islands/render.php                 |   2 +-
 .../interactive-blocks/tovdom/render.php      |   2 +-
 .../interactive-blocks/with-scope/render.php  |   2 +-
 .../modules/class-gutenberg-modules-test.php  | 285 -----------
 42 files changed, 830 insertions(+), 1100 deletions(-)
 create mode 100644 lib/compat/wordpress-6.5/class-wp-script-modules.php
 create mode 100644 lib/compat/wordpress-6.5/scripts-modules.php
 delete mode 100644 lib/experimental/modules/class-gutenberg-modules.php
 create mode 100644 lib/experimental/script-modules.php
 delete mode 100644 phpunit/experimental/modules/class-gutenberg-modules-test.php

diff --git a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php b/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
index 9c270f59fa220..4a00578d3f273 100644
--- a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
+++ b/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
@@ -82,13 +82,13 @@ private static function has_submenus( $inner_blocks ) {
 	}
 
 	/**
-	 * Determine whether to load the view script.
+	 * Determine whether the navigation blocks is interactive.
 	 *
 	 * @param array         $attributes   The block attributes.
 	 * @param WP_Block_List $inner_blocks The list of inner blocks.
 	 * @return bool Returns whether or not to load the view script.
 	 */
-	private static function should_load_view_script( $attributes, $inner_blocks ) {
+	private static function is_interactive( $attributes, $inner_blocks ) {
 		$has_submenus       = static::has_submenus( $inner_blocks );
 		$is_responsive_menu = static::is_responsive( $attributes );
 		return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu;
@@ -129,8 +129,8 @@ private static function get_markup_for_inner_block( $inner_block ) {
 	 * @return string Returns the html for the inner blocks of the navigation block.
 	 */
 	private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
-		$has_submenus            = static::has_submenus( $inner_blocks );
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
+		$has_submenus   = static::has_submenus( $inner_blocks );
+		$is_interactive = static::is_interactive( $attributes, $inner_blocks );
 
 		$style                = static::get_styles( $attributes );
 		$class                = static::get_classes( $attributes );
@@ -168,7 +168,7 @@ private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
 		}
 
 		// Add directives to the submenu if needed.
-		if ( $has_submenus && $should_load_view_script ) {
+		if ( $has_submenus && $is_interactive ) {
 			$tags              = new WP_HTML_Tag_Processor( $inner_blocks_html );
 			$inner_blocks_html = gutenberg_block_core_navigation_add_directives_to_submenu( $tags, $attributes );
 		}
@@ -402,9 +402,9 @@ private static function get_styles( $attributes ) {
 	 * @return string Returns the container markup.
 	 */
 	private static function get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html ) {
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$colors                  = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$modal_unique_id         = wp_unique_id( 'modal-' );
+		$is_interactive  = static::is_interactive( $attributes, $inner_blocks );
+		$colors          = gutenberg_block_core_navigation_build_css_colors( $attributes );
+		$modal_unique_id = wp_unique_id( 'modal-' );
 
 		$responsive_container_classes = array(
 			'wp-block-navigation__responsive-container',
@@ -432,7 +432,7 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 		$responsive_container_directives = '';
 		$responsive_dialog_directives    = '';
 		$close_button_directives         = '';
-		if ( $should_load_view_script ) {
+		if ( $is_interactive ) {
 			$open_button_directives                  = '
 				data-wp-on--click="actions.openMenuOnClick"
 				data-wp-on--keydown="actions.handleMenuKeydown"
@@ -495,12 +495,12 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
 	 * @return string Returns the navigation block markup.
 	 */
 	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
-		$nav_menu_name           = static::get_unique_navigation_name( $attributes );
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$is_responsive_menu      = static::is_responsive( $attributes );
-		$style                   = static::get_styles( $attributes );
-		$class                   = static::get_classes( $attributes );
-		$wrapper_attributes      = get_block_wrapper_attributes(
+		$nav_menu_name      = static::get_unique_navigation_name( $attributes );
+		$is_interactive     = static::is_interactive( $attributes, $inner_blocks );
+		$is_responsive_menu = static::is_responsive( $attributes );
+		$style              = static::get_styles( $attributes );
+		$class              = static::get_classes( $attributes );
+		$wrapper_attributes = get_block_wrapper_attributes(
 			array(
 				'class'      => $class,
 				'style'      => $style,
@@ -509,7 +509,7 @@ private static function get_nav_wrapper_attributes( $attributes, $inner_blocks )
 		);
 
 		if ( $is_responsive_menu ) {
-			$nav_element_directives = static::get_nav_element_directives( $should_load_view_script, $attributes );
+			$nav_element_directives = static::get_nav_element_directives( $is_interactive, $attributes );
 			$wrapper_attributes    .= ' ' . $nav_element_directives;
 		}
 
@@ -517,13 +517,14 @@ private static function get_nav_wrapper_attributes( $attributes, $inner_blocks )
 	}
 
 	/**
-	 * Get the nav element directives
+	 * Gets the nav element directives.
 	 *
-	 * @param bool $should_load_view_script Whether or not the view script should be loaded.
+	 * @param bool  $is_interactive Whether the block is interactive.
+	 * @param array $attributes     The block attributes.
 	 * @return string the directives for the navigation element.
 	 */
-	private static function get_nav_element_directives( $should_load_view_script, $attributes ) {
-		if ( ! $should_load_view_script ) {
+	private static function get_nav_element_directives( $is_interactive, $attributes ) {
+		if ( ! $is_interactive ) {
 			return '';
 		}
 		// When adding to this array be mindful of security concerns.
@@ -541,8 +542,10 @@ private static function get_nav_element_directives( $should_load_view_script, $a
 			data-wp-context=\'' . $nav_element_context . '\'
 		';
 
-		// When the navigation overlayMenu attribute is set to "always"
-		// we don't need to use JavaScript to collapse the menu as we set the class manually.
+		/*
+		* When the navigation's 'overlayMenu' attribute is set to 'always', JavaScript
+		* is not needed for collapsing the menu because the class is set manually.
+		*/
 		if ( ! static::is_always_overlay( $attributes ) ) {
 			$nav_element_directives .= 'data-wp-init="callbacks.initNav"';
 			$nav_element_directives .= ' '; // space separator
@@ -553,37 +556,15 @@ private static function get_nav_element_directives( $should_load_view_script, $a
 	}
 
 	/**
-	 * Handle view script loading.
+	 * Handle view script module loading.
 	 *
 	 * @param array         $attributes   The block attributes.
 	 * @param WP_Block      $block        The parsed block.
 	 * @param WP_Block_List $inner_blocks The list of inner blocks.
 	 */
-	private static function handle_view_script_loading( $attributes, $block, $inner_blocks ) {
-		$should_load_view_script = static::should_load_view_script( $attributes, $inner_blocks );
-		$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-		$view_js_file            = 'wp-block-navigation-view';
-		$script_handles          = $block->block_type->view_script_handles;
-
-		if ( $is_gutenberg_plugin ) {
-			if ( $should_load_view_script ) {
-				gutenberg_enqueue_module( '@wordpress/block-library/navigation-block' );
-			}
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-		} else {
-			// If the script already exists, there is no point in removing it from viewScript.
-			if ( ! wp_script_is( $view_js_file ) ) {
-
-				// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-				if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-				}
-				// If the script is needed, but it was previously removed, add it again.
-				if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-				}
-			}
+	private static function handle_view_script_module_loading( $attributes, $block, $inner_blocks ) {
+		if ( static::is_interactive( $attributes, $inner_blocks ) ) {
+			wp_enqueue_script_module( '@wordpress/block-library/navigation-block' );
 		}
 	}
 
@@ -653,7 +634,7 @@ public static function render( $attributes, $content, $block ) {
 			return '';
 		}
 
-		static::handle_view_script_loading( $attributes, $block, $inner_blocks );
+		static::handle_view_script_module_loading( $attributes, $block, $inner_blocks );
 
 		return sprintf(
 			'<nav %1$s>%2$s</nav>',
diff --git a/lib/compat/wordpress-6.5/class-wp-script-modules.php b/lib/compat/wordpress-6.5/class-wp-script-modules.php
new file mode 100644
index 0000000000000..f6a2a348f92ef
--- /dev/null
+++ b/lib/compat/wordpress-6.5/class-wp-script-modules.php
@@ -0,0 +1,323 @@
+<?php
+/**
+ * Script Modules API: WP_Script_Modules class.
+ *
+ * Native support for ES Modules and Import Maps.
+ *
+ * @package WordPress
+ * @subpackage Script Modules
+ */
+
+if ( ! class_exists( 'WP_Script_Modules' ) ) {
+	/**
+	 * Core class used to register script modules.
+	 *
+	 * @since 6.5.0
+	 */
+	class WP_Script_Modules {
+		/**
+		 * Holds the registered script modules, keyed by script module identifier.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private $registered = array();
+
+		/**
+		 * Holds the script module identifiers that were enqueued before registered.
+		 *
+		 * @since 6.5.0
+		 * @var array<string, true>
+		 */
+		private $enqueued_before_registered = array();
+
+		/**
+		 * Registers the script module if no script module with that script module
+		 * identifier has already been registered.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string            $id       The identifier of the script module. Should be unique. It will be used in the
+		 *                                    final import map.
+		 * @param string            $src      Optional. Full URL of the script module, or path of the script module relative
+		 *                                    to the WordPress root directory. If it is provided and the script module has
+		 *                                    not been registered yet, it will be registered.
+		 * @param array             $deps     {
+		 *                                        Optional. List of dependencies.
+		 *
+		 *                                        @type string|array $0... {
+		 *                                            An array of script module identifiers of the dependencies of this script
+		 *                                            module. The dependencies can be strings or arrays. If they are arrays,
+		 *                                            they need an `id` key with the script module identifier, and can contain
+		 *                                            an `import` key with either `static` or `dynamic`. By default,
+		 *                                            dependencies that don't contain an `import` key are considered static.
+		 *
+		 *                                            @type string $id     The script module identifier.
+		 *                                            @type string $import Optional. Import type. May be either `static` or
+		 *                                                                 `dynamic`. Defaults to `static`.
+		 *                                        }
+		 *                                    }
+		 * @param string|false|null $version  Optional. String specifying the script module version number. Defaults to false.
+		 *                                    It is added to the URL as a query string for cache busting purposes. If $version
+		 *                                    is set to false, the version number is the currently installed WordPress version.
+		 *                                    If $version is set to null, no version is added.
+		 */
+		public function register( string $id, string $src, array $deps = array(), $version = false ) {
+			if ( ! isset( $this->registered[ $id ] ) ) {
+				$dependencies = array();
+				foreach ( $deps as $dependency ) {
+					if ( is_array( $dependency ) ) {
+						if ( ! isset( $dependency['id'] ) ) {
+							_doing_it_wrong( __METHOD__, __( 'Missing required id key in entry among dependencies array.' ), '6.5.0' );
+							continue;
+						}
+						$dependencies[] = array(
+							'id'     => $dependency['id'],
+							'import' => isset( $dependency['import'] ) && 'dynamic' === $dependency['import'] ? 'dynamic' : 'static',
+						);
+					} elseif ( is_string( $dependency ) ) {
+						$dependencies[] = array(
+							'id'     => $dependency,
+							'import' => 'static',
+						);
+					} else {
+						_doing_it_wrong( __METHOD__, __( 'Entries in dependencies array must be either strings or arrays with an id key.' ), '6.5.0' );
+					}
+				}
+
+				$this->registered[ $id ] = array(
+					'src'          => $src,
+					'version'      => $version,
+					'enqueue'      => isset( $this->enqueued_before_registered[ $id ] ),
+					'dependencies' => $dependencies,
+				);
+			}
+		}
+
+		/**
+		 * Marks the script module to be enqueued in the page.
+		 *
+		 * If a src is provided and the script module has not been registered yet, it
+		 * will be registered.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string            $id       The identifier of the script module. Should be unique. It will be used in the
+		 *                                    final import map.
+		 * @param string            $src      Optional. Full URL of the script module, or path of the script module relative
+		 *                                    to the WordPress root directory. If it is provided and the script module has
+		 *                                    not been registered yet, it will be registered.
+		 * @param array             $deps     {
+		 *                                        Optional. List of dependencies.
+		 *
+		 *                                        @type string|array $0... {
+		 *                                            An array of script module identifiers of the dependencies of this script
+		 *                                            module. The dependencies can be strings or arrays. If they are arrays,
+		 *                                            they need an `id` key with the script module identifier, and can contain
+		 *                                            an `import` key with either `static` or `dynamic`. By default,
+		 *                                            dependencies that don't contain an `import` key are considered static.
+		 *
+		 *                                            @type string $id     The script module identifier.
+		 *                                            @type string $import Optional. Import type. May be either `static` or
+		 *                                                                 `dynamic`. Defaults to `static`.
+		 *                                        }
+		 *                                    }
+		 * @param string|false|null $version  Optional. String specifying the script module version number. Defaults to false.
+		 *                                    It is added to the URL as a query string for cache busting purposes. If $version
+		 *                                    is set to false, the version number is the currently installed WordPress version.
+		 *                                    If $version is set to null, no version is added.
+		 */
+		public function enqueue( string $id, string $src = '', array $deps = array(), $version = false ) {
+			if ( isset( $this->registered[ $id ] ) ) {
+				$this->registered[ $id ]['enqueue'] = true;
+			} elseif ( $src ) {
+				$this->register( $id, $src, $deps, $version );
+				$this->registered[ $id ]['enqueue'] = true;
+			} else {
+				$this->enqueued_before_registered[ $id ] = true;
+			}
+		}
+
+		/**
+		 * Unmarks the script module so it will no longer be enqueued in the page.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $id The identifier of the script module.
+		 */
+		public function dequeue( string $id ) {
+			if ( isset( $this->registered[ $id ] ) ) {
+				$this->registered[ $id ]['enqueue'] = false;
+			}
+			unset( $this->enqueued_before_registered[ $id ] );
+		}
+
+		/**
+		 * Adds the hooks to print the import map, enqueued script modules and script
+		 * module preloads.
+		 *
+		 * In classic themes, the script modules used by the blocks are not yet known
+		 * when the `wp_head` actions is fired, so it needs to print everything in the
+		 * footer.
+		 *
+		 * @since 6.5.0
+		 */
+		public function add_hooks() {
+			$position = wp_is_block_theme() ? 'wp_head' : 'wp_footer';
+			add_action( $position, array( $this, 'print_import_map' ) );
+			add_action( $position, array( $this, 'print_enqueued_script_modules' ) );
+			add_action( $position, array( $this, 'print_script_module_preloads' ) );
+		}
+
+		/**
+		 * Prints the enqueued script modules using script tags with type="module"
+		 * attributes.
+		 *
+		 * @since 6.5.0
+		 */
+		public function print_enqueued_script_modules() {
+			foreach ( $this->get_marked_for_enqueue() as $id => $script_module ) {
+				wp_print_script_tag(
+					array(
+						'type' => 'module',
+						'src'  => $this->get_versioned_src( $script_module ),
+						'id'   => $id . '-js-module',
+					)
+				);
+			}
+		}
+
+		/**
+		 * Prints the the static dependencies of the enqueued script modules using
+		 * link tags with rel="modulepreload" attributes.
+		 *
+		 * If a script module is marked for enqueue, it will not be preloaded.
+		 *
+		 * @since 6.5.0
+		 */
+		public function print_script_module_preloads() {
+			foreach ( $this->get_dependencies( array_keys( $this->get_marked_for_enqueue() ), array( 'static' ) ) as $id => $script_module ) {
+				// Don't preload if it's marked for enqueue.
+				if ( true !== $script_module['enqueue'] ) {
+					echo sprintf(
+						'<link rel="modulepreload" href="%s" id="%s">',
+						esc_url( $this->get_versioned_src( $script_module ) ),
+						esc_attr( $id . '-js-modulepreload' )
+					);
+				}
+			}
+		}
+
+		/**
+		 * Prints the import map using a script tag with a type="importmap" attribute.
+		 *
+		 * @since 6.5.0
+		 */
+		public function print_import_map() {
+			$import_map = $this->get_import_map();
+			if ( ! empty( $import_map['imports'] ) ) {
+				wp_print_inline_script_tag(
+					wp_json_encode( $import_map, JSON_HEX_TAG | JSON_HEX_AMP ),
+					array(
+						'type' => 'importmap',
+						'id'   => 'wp-importmap',
+					)
+				);
+			}
+		}
+
+		/**
+		 * Returns the import map array.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @return array Array with an `imports` key mapping to an array of script module identifiers and their respective
+		 *               URLs, including the version query.
+		 */
+		private function get_import_map(): array {
+			$imports = array();
+			foreach ( $this->get_dependencies( array_keys( $this->get_marked_for_enqueue() ) ) as $id => $script_module ) {
+				$imports[ $id ] = $this->get_versioned_src( $script_module );
+			}
+			return array( 'imports' => $imports );
+		}
+
+		/**
+		 * Retrieves the list of script modules marked for enqueue.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @return array Script modules marked for enqueue, keyed by script module identifier.
+		 */
+		private function get_marked_for_enqueue(): array {
+			$enqueued = array();
+			foreach ( $this->registered as $id => $script_module ) {
+				if ( true === $script_module['enqueue'] ) {
+					$enqueued[ $id ] = $script_module;
+				}
+			}
+			return $enqueued;
+		}
+
+		/**
+		 * Retrieves all the dependencies for the given script module identifiers,
+		 * filtered by import types.
+		 *
+		 * It will consolidate an array containing a set of unique dependencies based
+		 * on the requested import types: 'static', 'dynamic', or both. This method is
+		 * recursive and also retrieves dependencies of the dependencies.
+		 *
+		 * @since 6.5.0
+		 *
+
+		 * @param string[] $ids          The identifiers of the script modules for which to gather dependencies.
+		 * @param array    $import_types Optional. Import types of dependencies to retrieve: 'static', 'dynamic', or both.
+		 *                               Default is both.
+		 * @return array List of dependencies, keyed by script module identifier.
+		 */
+		private function get_dependencies( array $ids, array $import_types = array( 'static', 'dynamic' ) ) {
+			return array_reduce(
+				$ids,
+				function ( $dependency_script_modules, $id ) use ( $import_types ) {
+					$dependencies = array();
+					foreach ( $this->registered[ $id ]['dependencies'] as $dependency ) {
+						if (
+						in_array( $dependency['import'], $import_types, true ) &&
+						isset( $this->registered[ $dependency['id'] ] ) &&
+						! isset( $dependency_script_modules[ $dependency['id'] ] )
+						) {
+							$dependencies[ $dependency['id'] ] = $this->registered[ $dependency['id'] ];
+						}
+					}
+					return array_merge( $dependency_script_modules, $dependencies, $this->get_dependencies( array_keys( $dependencies ), $import_types ) );
+				},
+				array()
+			);
+		}
+
+		/**
+		 * Gets the versioned URL for a script module src.
+		 *
+		 * If $version is set to false, the version number is the currently installed
+		 * WordPress version. If $version is set to null, no version is added.
+		 * Otherwise, the string passed in $version is used.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param array $script_module The script module.
+		 * @return string The script module src with a version if relevant.
+		 */
+		private function get_versioned_src( array $script_module ): string {
+			$args = array();
+			if ( false === $script_module['version'] ) {
+				$args['ver'] = get_bloginfo( 'version' );
+			} elseif ( null !== $script_module['version'] ) {
+				$args['ver'] = $script_module['version'];
+			}
+			if ( $args ) {
+				return add_query_arg( $args, $script_module['src'] );
+			}
+			return $script_module['src'];
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.5/scripts-modules.php b/lib/compat/wordpress-6.5/scripts-modules.php
new file mode 100644
index 0000000000000..ba329b255b196
--- /dev/null
+++ b/lib/compat/wordpress-6.5/scripts-modules.php
@@ -0,0 +1,119 @@
+<?php
+/**
+ * Script Modules API: Script Module functions
+ *
+ * @since 6.5.0
+ *
+ * @package WordPress
+ * @subpackage Script Modules
+ */
+
+if ( ! function_exists( 'wp_script_modules' ) ) {
+	/**
+	 * Retrieves the main WP_Script_Modules instance.
+	 *
+	 * This function provides access to the WP_Script_Modules instance, creating one
+	 * if it doesn't exist yet.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return WP_Script_Modules The main WP_Script_Modules instance.
+	 */
+	function wp_script_modules(): WP_Script_Modules {
+		static $instance = null;
+		if ( is_null( $instance ) ) {
+			$instance = new WP_Script_Modules();
+			$instance->add_hooks();
+		}
+		return $instance;
+	}
+}
+
+if ( ! function_exists( 'wp_register_script_module' ) ) {
+	/**
+	 * Registers the script module if no script module with that script module
+	 * identifier has already been registered.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string            $id       The identifier of the script module. Should be unique. It will be used in the
+	 *                                    final import map.
+	 * @param string            $src      Optional. Full URL of the script module, or path of the script module relative
+	 *                                    to the WordPress root directory. If it is provided and the script module has
+	 *                                    not been registered yet, it will be registered.
+	 * @param array             $deps     {
+	 *                                        Optional. List of dependencies.
+	 *
+	 *                                        @type string|array $0... {
+	 *                                            An array of script module identifiers of the dependencies of this script
+	 *                                            module. The dependencies can be strings or arrays. If they are arrays,
+	 *                                            they need an `id` key with the script module identifier, and can contain
+	 *                                            an `import` key with either `static` or `dynamic`. By default,
+	 *                                            dependencies that don't contain an `import` key are considered static.
+	 *
+	 *                                            @type string $id     The script module identifier.
+	 *                                            @type string $import Optional. Import type. May be either `static` or
+	 *                                                                 `dynamic`. Defaults to `static`.
+	 *                                        }
+	 *                                    }
+	 * @param string|false|null $version  Optional. String specifying the script module version number. Defaults to false.
+	 *                                    It is added to the URL as a query string for cache busting purposes. If $version
+	 *                                    is set to false, the version number is the currently installed WordPress version.
+	 *                                    If $version is set to null, no version is added.
+	 */
+	function wp_register_script_module( string $id, string $src, array $deps = array(), $version = false ) {
+		wp_script_modules()->register( $id, $src, $deps, $version );
+	}
+}
+
+if ( ! function_exists( 'wp_enqueue_script_module' ) ) {
+	/**
+	 * Marks the script module to be enqueued in the page.
+	 *
+	 * If a src is provided and the script module has not been registered yet, it
+	 * will be registered.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string            $id       The identifier of the script module. Should be unique. It will be used in the
+	 *                                    final import map.
+	 * @param string            $src      Optional. Full URL of the script module, or path of the script module relative
+	 *                                    to the WordPress root directory. If it is provided and the script module has
+	 *                                    not been registered yet, it will be registered.
+	 * @param array             $deps     {
+	 *                                        Optional. List of dependencies.
+	 *
+	 *                                        @type string|array $0... {
+	 *                                            An array of script module identifiers of the dependencies of this script
+	 *                                            module. The dependencies can be strings or arrays. If they are arrays,
+	 *                                            they need an `id` key with the script module identifier, and can contain
+	 *                                            an `import` key with either `static` or `dynamic`. By default,
+	 *                                            dependencies that don't contain an `import` key are considered static.
+	 *
+	 *                                            @type string $id     The script module identifier.
+	 *                                            @type string $import Optional. Import type. May be either `static` or
+	 *                                                                 `dynamic`. Defaults to `static`.
+	 *                                        }
+	 *                                    }
+	 * @param string|false|null $version  Optional. String specifying the script module version number. Defaults to false.
+	 *                                    It is added to the URL as a query string for cache busting purposes. If $version
+	 *                                    is set to false, the version number is the currently installed WordPress version.
+	 *                                    If $version is set to null, no version is added.
+	 */
+	function wp_enqueue_script_module( string $id, string $src = '', array $deps = array(), $version = false ) {
+		wp_script_modules()->enqueue( $id, $src, $deps, $version );
+	}
+}
+
+if ( ! function_exists( 'wp_dequeue_script_module' ) ) {
+	/**
+	 * Unmarks the script module so it is no longer enqueued in the page.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $id The identifier of the script module.
+	 */
+	function wp_dequeue_script_module( string $id ) {
+		wp_script_modules()->dequeue( $id );
+	}
+}
diff --git a/lib/experimental/interactivity-api/modules.php b/lib/experimental/interactivity-api/modules.php
index 0695da26f4b1b..f40a81bc334e6 100644
--- a/lib/experimental/interactivity-api/modules.php
+++ b/lib/experimental/interactivity-api/modules.php
@@ -8,9 +8,12 @@
 
 /**
  * Register the `@wordpress/interactivity` module.
+ *
+ * !! This will be removed once https://github.com/WordPress/gutenberg/pull/58066
+ * is merged.
  */
 function gutenberg_register_interactivity_module() {
-	gutenberg_register_module(
+	wp_register_script_module(
 		'@wordpress/interactivity',
 		gutenberg_url( '/build/interactivity/index.min.js' ),
 		array(),
diff --git a/lib/experimental/modules/class-gutenberg-modules.php b/lib/experimental/modules/class-gutenberg-modules.php
deleted file mode 100644
index f773e2c998c23..0000000000000
--- a/lib/experimental/modules/class-gutenberg-modules.php
+++ /dev/null
@@ -1,470 +0,0 @@
-<?php
-/**
- * Modules API: Gutenberg_Modules class.
- *
- * Native support for ES Modules and Import Maps.
- *
- * @package Gutenberg
- * @subpackage Modules
- */
-
-/**
- * Gutenberg_Modules class
- */
-class Gutenberg_Modules {
-	/**
-	 * An array of registered modules, keyed by module identifier.
-	 *
-	 * @var array
-	 */
-	private static $registered = array();
-
-	/**
-	 * An array of module identifiers that were enqueued before registered.
-	 *
-	 * @var array
-	 */
-	private static $enqueued_modules_before_register = array();
-
-	/**
-	 * Registers the module if no module with that module identifier has already
-	 * been registered.
-	 *
-	 * @param string            $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
-	 * @param string            $src               Full URL of the module, or path of the script relative to the WordPress root directory.
-	 * @param array             $dependencies      Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain a `type` key with either `static` or `dynamic`. By default, dependencies that don't contain a type are considered static.
-	 * @param string|false|null $version           Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If SCRIPT_DEBUG is true, the version is the current timestamp. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added.
-	 */
-	public static function register( $module_identifier, $src, $dependencies = array(), $version = false ) {
-		if ( ! isset( self::$registered[ $module_identifier ] ) ) {
-			$deps = array();
-			foreach ( $dependencies as $dependency ) {
-				if ( isset( $dependency['id'] ) ) {
-					$deps[] = array(
-						'id'   => $dependency['id'],
-						'type' => isset( $dependency['type'] ) && 'dynamic' === $dependency['type'] ? 'dynamic' : 'static',
-					);
-				} elseif ( is_string( $dependency ) ) {
-					$deps[] = array(
-						'id'   => $dependency,
-						'type' => 'static',
-					);
-				}
-			}
-
-			self::$registered[ $module_identifier ] = array(
-				'src'          => $src,
-				'version'      => $version,
-				'enqueued'     => in_array( $module_identifier, self::$enqueued_modules_before_register, true ),
-				'dependencies' => $deps,
-			);
-		}
-	}
-
-	/**
-	 * Marks the module to be enqueued in the page.
-	 *
-	 * @param string $module_identifier The identifier of the module.
-	 */
-	public static function enqueue( $module_identifier ) {
-		if ( isset( self::$registered[ $module_identifier ] ) ) {
-			self::$registered[ $module_identifier ]['enqueued'] = true;
-		} elseif ( ! in_array( $module_identifier, self::$enqueued_modules_before_register, true ) ) {
-			self::$enqueued_modules_before_register[] = $module_identifier;
-		}
-	}
-
-	/**
-	 * Unmarks the module so it is no longer enqueued in the page.
-	 *
-	 * @param string $module_identifier The identifier of the module.
-	 */
-	public static function dequeue( $module_identifier ) {
-		if ( isset( self::$registered[ $module_identifier ] ) ) {
-			self::$registered[ $module_identifier ]['enqueued'] = false;
-		}
-		$key = array_search( $module_identifier, self::$enqueued_modules_before_register, true );
-		if ( false !== $key ) {
-			array_splice( self::$enqueued_modules_before_register, $key, 1 );
-		}
-	}
-
-	/**
-	 * Returns the import map array.
-	 *
-	 * @return array Array with an 'imports' key mapping to an array of module identifiers and their respective source URLs, including the version query.
-	 */
-	public static function get_import_map() {
-		$imports = array();
-		foreach ( self::get_dependencies( array_keys( self::get_enqueued() ) ) as $module_identifier => $module ) {
-			$imports[ $module_identifier ] = $module['src'] . self::get_version_query_string( $module['version'] );
-		}
-		return array( 'imports' => $imports );
-	}
-
-	/**
-	 * Prints the import map using a script tag with an type="importmap" attribute.
-	 */
-	public static function print_import_map() {
-		$import_map = self::get_import_map();
-		if ( ! empty( $import_map['imports'] ) ) {
-			echo '<script type="importmap">' . wp_json_encode( self::get_import_map(), JSON_HEX_TAG | JSON_HEX_AMP ) . '</script>';
-		}
-	}
-
-	/**
-	 * Prints all the enqueued modules using <script type="module">.
-	 */
-	public static function print_enqueued_modules() {
-		foreach ( self::get_enqueued() as $module_identifier => $module ) {
-			wp_print_script_tag(
-				array(
-					'type' => 'module',
-					'src'  => $module['src'] . self::get_version_query_string( $module['version'] ),
-					'id'   => $module_identifier,
-				)
-			);
-		}
-	}
-
-	/**
-	 * Prints the the static dependencies of the enqueued modules using link tags
-	 * with rel="modulepreload" attributes.
-	 */
-	public static function print_module_preloads() {
-		foreach ( self::get_dependencies( array_keys( self::get_enqueued() ), array( 'static' ) ) as $module_identifier => $module ) {
-			if ( true !== $module['enqueued'] ) {
-				echo sprintf(
-					'<link rel="modulepreload" href="%s" id="%s">',
-					esc_attr( $module['src'] . self::get_version_query_string( $module['version'] ) ),
-					esc_attr( $module_identifier )
-				);
-			}
-		}
-	}
-
-	/**
-	 * Prints the necessary script to load import map polyfill for browsers that
-	 * do not support import maps.
-	 *
-	 * TODO: Replace the polyfill with a simpler version that only provides
-	 * support for import maps and load it only when the browser doesn't support
-	 * import maps (https://github.com/guybedford/es-module-shims/issues/406).
-	 */
-	public static function print_import_map_polyfill() {
-		$test = 'HTMLScriptElement.supports && HTMLScriptElement.supports("importmap")';
-		$src  = gutenberg_url( '/build/modules/importmap-polyfill.min.js' );
-
-		echo (
-			// Test presence of feature...
-			'<script>( ' . $test . ' ) || ' .
-			/*
-			 * ...appending polyfill on any failures. Cautious viewers may balk
-			 * at the `document.write`. Its caveat of synchronous mid-stream
-			 * blocking write is exactly the behavior we need though.
-			 */
-			'document.write( \'<script src="' .
-			$src .
-			'"></scr\' + \'ipt>\' );</script>'
-		);
-	}
-
-	/**
-	 * Gets the version of a module.
-	 *
-	 * If SCRIPT_DEBUG is true, the version is the current timestamp. If $version
-	 * is set to false, the version number is the currently installed WordPress
-	 * version. If $version is set to null, no version is added.
-	 *
-	 * @param array $version The version of the module.
-	 * @return string A string presenting the version.
-	 */
-	private static function get_version_query_string( $version ) {
-		if ( defined( 'SCRIPT_DEBUG ' ) && SCRIPT_DEBUG ) {
-			return '?ver=' . time();
-		} elseif ( false === $version ) {
-			return '?ver=' . get_bloginfo( 'version' );
-		} elseif ( null !== $version ) {
-			return '?ver=' . $version;
-		}
-		return '';
-	}
-
-	/**
-	 * Retrieves an array of enqueued modules.
-	 *
-	 * @return array Array of modules keyed by module identifier.
-	 */
-	private static function get_enqueued() {
-		$enqueued = array();
-		foreach ( self::$registered as $module_identifier => $module ) {
-			if ( true === $module['enqueued'] ) {
-				$enqueued[ $module_identifier ] = $module;
-			}
-		}
-		return $enqueued;
-	}
-
-	/**
-	 * Retrieves all the dependencies for given modules depending on type.
-	 *
-	 * This method is recursive to also retrieve dependencies of the dependencies.
-	 * It will consolidate an array containing unique dependencies based on the
-	 * requested types ('static' or 'dynamic').
-	 *
-	 * @param array $module_identifiers The identifiers of the modules for which to gather dependencies.
-	 * @param array $types              Optional. Types of dependencies to retrieve: 'static', 'dynamic', or both. Default is both.
-	 * @return array Array of modules keyed by module identifier.
-	 */
-	private static function get_dependencies( $module_identifiers, $types = array( 'static', 'dynamic' ) ) {
-		return array_reduce(
-			$module_identifiers,
-			function ( $dependency_modules, $module_identifier ) use ( $types ) {
-				$dependencies = array();
-				foreach ( self::$registered[ $module_identifier ]['dependencies'] as $dependency ) {
-					if (
-						in_array( $dependency['type'], $types, true ) &&
-						isset( self::$registered[ $dependency['id'] ] ) &&
-						! isset( $dependency_modules[ $dependency['id'] ] )
-					) {
-						$dependencies[ $dependency['id'] ] = self::$registered[ $dependency['id'] ];
-					}
-				}
-				return array_merge( $dependency_modules, $dependencies, self::get_dependencies( array_keys( $dependencies ), $types ) );
-			},
-			array()
-		);
-	}
-}
-
-/**
- * Registers the module if no module with that module identifier has already
- * been registered.
- *
- * @param string            $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
- * @param string            $src               Full URL of the module, or path of the script relative to the WordPress root directory.
- * @param array             $dependencies      Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain a `type` key with either `static` or `dynamic`. By default, dependencies that don't contain a type are considered static.
- * @param string|false|null $version           Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If SCRIPT_DEBUG is true, the version is the current timestamp. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added.
- */
-function gutenberg_register_module( $module_identifier, $src, $dependencies = array(), $version = false ) {
-	Gutenberg_Modules::register( $module_identifier, $src, $dependencies, $version );
-}
-
-/**
- * Marks the module to be enqueued in the page.
- *
- * @param string $module_identifier The identifier of the module.
- */
-function gutenberg_enqueue_module( $module_identifier ) {
-	Gutenberg_Modules::enqueue( $module_identifier );
-}
-
-/**
- * Unmarks the module so it is not longer enqueued in the page.
- *
- * @param string $module_identifier The identifier of the module.
- */
-function gutenberg_dequeue_module( $module_identifier ) {
-	Gutenberg_Modules::dequeue( $module_identifier );
-}
-
-$modules_position = wp_is_block_theme() ? 'wp_head' : 'wp_footer';
-// Prints the import map in the head tag in block themes. Otherwise in the footer.
-add_action( $modules_position, array( 'Gutenberg_Modules', 'print_import_map' ) );
-
-// Prints the enqueued modules in the head tag in block themes. Otherwise in the footer.
-add_action( $modules_position, array( 'Gutenberg_Modules', 'print_enqueued_modules' ) );
-
-// Prints the preloaded modules in the head tag in block themes. Otherwise in the footer.
-add_action( $modules_position, array( 'Gutenberg_Modules', 'print_module_preloads' ) );
-
-// Prints the script that loads the import map polyfill in the footer.
-add_action( 'wp_head', array( 'Gutenberg_Modules', 'print_import_map_polyfill' ), 11 );
-
-/**
- * Add module fields from block metadata to WP_Block_Type settings.
- *
- * This filter allows us to register modules from block metadata and attach additional fields to
- * WP_Block_Type instances.
- *
- * @param array $settings Array of determined settings for registering a block type.
- * @param array $metadata Metadata provided for registering a block type.
- */
-function gutenberg_filter_block_type_metadata_settings_register_modules( $settings, $metadata = null ) {
-	$module_fields = array(
-		'viewModule' => 'view_module_ids',
-	);
-	foreach ( $module_fields as $metadata_field_name => $settings_field_name ) {
-		if ( ! empty( $settings[ $metadata_field_name ] ) ) {
-			$metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ];
-		}
-		if ( ! empty( $metadata[ $metadata_field_name ] ) ) {
-			$modules           = $metadata[ $metadata_field_name ];
-			$processed_modules = array();
-			if ( is_array( $modules ) ) {
-				for ( $index = 0; $index < count( $modules ); $index++ ) {
-					$processed_modules[] = gutenberg_register_block_module_id(
-						$metadata,
-						$metadata_field_name,
-						$index
-					);
-				}
-			} else {
-				$processed_modules[] = gutenberg_register_block_module_id(
-					$metadata,
-					$metadata_field_name
-				);
-			}
-			$settings[ $settings_field_name ] = $processed_modules;
-		}
-	}
-
-	return $settings;
-}
-
-add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_modules', 10, 2 );
-
-/**
- * Enqueue modules associated with the block.
- *
- * @param string   $block_content The block content.
- * @param array    $block         The full block, including name and attributes.
- * @param WP_Block $instance      The block instance.
- */
-function gutenberg_filter_render_block_enqueue_view_modules( $block_content, $parsed_block, $block_instance ) {
-	$block_type = $block_instance->block_type;
-
-	if ( ! empty( $block_type->view_module_ids ) ) {
-		foreach ( $block_type->view_module_ids as $module_id ) {
-			gutenberg_enqueue_module( $module_id );
-		}
-	}
-
-	return $block_content;
-}
-
-add_filter( 'render_block', 'gutenberg_filter_render_block_enqueue_view_modules', 10, 3 );
-
-/**
- * Finds a module ID for the selected block metadata field. It detects
- * when a path to file was provided and finds a corresponding asset file
- * with details necessary to register the module under an automatically
- * generated module ID.
- *
- * This is analogous to the `register_block_script_handle` in WordPress Core.
- *
- * @param array  $metadata   Block metadata.
- * @param string $field_name Field name to pick from metadata.
- * @param int    $index      Optional. Index of the script to register when multiple items passed.
- *                           Default 0.
- * @return string Module ID.
- */
-function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) {
-	if ( empty( $metadata[ $field_name ] ) ) {
-		return false;
-	}
-
-	$module_id = $metadata[ $field_name ];
-	if ( is_array( $module_id ) ) {
-		if ( empty( $module_id[ $index ] ) ) {
-			return false;
-		}
-		$module_id = $module_id[ $index ];
-	}
-
-	$module_path = remove_block_asset_path_prefix( $module_id );
-	if ( $module_id === $module_path ) {
-		return $module_id;
-	}
-
-	$path                  = dirname( $metadata['file'] );
-	$module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) );
-	$module_id             = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index );
-	$module_asset_path     = wp_normalize_path( realpath( $module_asset_raw_path ) );
-
-	if ( empty( $module_asset_path ) ) {
-		_doing_it_wrong(
-			__FUNCTION__,
-			sprintf(
-				// This string is from WordPress Core. See `register_block_script_handle`.
-				// Translators: This is a translation from WordPress Core (default). No need to translate.
-				__( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.', 'default' ),
-				$module_asset_raw_path,
-				$field_name,
-				$metadata['name']
-			),
-			'6.5.0'
-		);
-		return false;
-	}
-
-	$module_path_norm    = wp_normalize_path( realpath( $path . '/' . $module_path ) );
-	$module_uri          = get_block_asset_url( $module_path_norm );
-	$module_asset        = require $module_asset_path;
-	$module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array();
-
-	gutenberg_register_module(
-		$module_id,
-		$module_uri,
-		$module_dependencies,
-		isset( $module_asset['version'] ) ? $module_asset['version'] : false
-	);
-
-	return $module_id;
-}
-
-/**
- * Generates the module ID for an asset based on the name of the block
- * and the field name provided.
- *
- * This is analogous to the `generate_block_asset_handle` in WordPress Core.
- *
- * @param string $block_name Name of the block.
- * @param string $field_name Name of the metadata field.
- * @param int    $index      Optional. Index of the asset when multiple items passed.
- *                           Default 0.
- * @return string Generated module ID for the block's field.
- */
-function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) {
-	if ( str_starts_with( $block_name, 'core/' ) ) {
-		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
-		if ( str_starts_with( $field_name, 'editor' ) ) {
-			$asset_handle .= '-editor';
-		}
-		if ( str_starts_with( $field_name, 'view' ) ) {
-			$asset_handle .= '-view';
-		}
-		if ( $index > 0 ) {
-			$asset_handle .= '-' . ( $index + 1 );
-		}
-		return $asset_handle;
-	}
-
-	$field_mappings = array(
-		'viewModule' => 'view-module',
-	);
-	$asset_handle   = str_replace( '/', '-', $block_name ) .
-		'-' . $field_mappings[ $field_name ];
-	if ( $index > 0 ) {
-		$asset_handle .= '-' . ( $index + 1 );
-	}
-	return $asset_handle;
-}
-
-function gutenberg_register_view_module_ids_rest_field() {
-	register_rest_field(
-		'block-type',
-		'view_module_ids',
-		array(
-			'get_callback' => function ( $item ) {
-				$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] );
-				if ( isset( $block_type->view_module_ids ) ) {
-					return $block_type->view_module_ids;
-				}
-				return array();
-			},
-		)
-	);
-}
-
-add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' );
diff --git a/lib/experimental/script-modules.php b/lib/experimental/script-modules.php
new file mode 100644
index 0000000000000..1f481a8098b20
--- /dev/null
+++ b/lib/experimental/script-modules.php
@@ -0,0 +1,234 @@
+<?php
+/**
+ * Add module fields from block metadata to WP_Block_Type settings.
+ *
+ * This filter allows us to register modules from block metadata and attach additional fields to
+ * WP_Block_Type instances.
+ *
+ * @param array $settings Array of determined settings for registering a block type.
+ * @param array $metadata Metadata provided for registering a block type.
+ */
+function gutenberg_filter_block_type_metadata_settings_register_modules( $settings, $metadata = null ) {
+	$module_fields = array(
+		'viewModule' => 'view_module_ids',
+	);
+	foreach ( $module_fields as $metadata_field_name => $settings_field_name ) {
+		if ( ! empty( $settings[ $metadata_field_name ] ) ) {
+			$metadata[ $metadata_field_name ] = $settings[ $metadata_field_name ];
+		}
+		if ( ! empty( $metadata[ $metadata_field_name ] ) ) {
+			$modules           = $metadata[ $metadata_field_name ];
+			$processed_modules = array();
+			if ( is_array( $modules ) ) {
+				for ( $index = 0; $index < count( $modules ); $index++ ) {
+					$processed_modules[] = gutenberg_register_block_module_id(
+						$metadata,
+						$metadata_field_name,
+						$index
+					);
+				}
+			} else {
+				$processed_modules[] = gutenberg_register_block_module_id(
+					$metadata,
+					$metadata_field_name
+				);
+			}
+			$settings[ $settings_field_name ] = $processed_modules;
+		}
+	}
+
+	return $settings;
+}
+
+add_filter( 'block_type_metadata_settings', 'gutenberg_filter_block_type_metadata_settings_register_modules', 10, 2 );
+
+/**
+ * Enqueue modules associated with the block.
+ *
+ * @param string   $block_content  The block content.
+ * @param array    $parsed_block   The full block, including name and attributes.
+ * @param WP_Block $block_instance The block instance.
+ */
+function gutenberg_filter_render_block_enqueue_view_modules( $block_content, $parsed_block, $block_instance ) {
+	$block_type = $block_instance->block_type;
+
+	if ( ! empty( $block_type->view_module_ids ) ) {
+		foreach ( $block_type->view_module_ids as $module_id ) {
+			wp_enqueue_script_module( $module_id );
+		}
+	}
+
+	return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_filter_render_block_enqueue_view_modules', 10, 3 );
+
+/**
+ * Finds a module ID for the selected block metadata field. It detects
+ * when a path to file was provided and finds a corresponding asset file
+ * with details necessary to register the module under an automatically
+ * generated module ID.
+ *
+ * This is analogous to the `register_block_script_handle` in WordPress Core.
+ *
+ * @param array  $metadata   Block metadata.
+ * @param string $field_name Field name to pick from metadata.
+ * @param int    $index      Optional. Index of the script to register when multiple items passed.
+ *                           Default 0.
+ * @return string Module ID.
+ */
+function gutenberg_register_block_module_id( $metadata, $field_name, $index = 0 ) {
+	if ( empty( $metadata[ $field_name ] ) ) {
+		return false;
+	}
+
+	$module_id = $metadata[ $field_name ];
+	if ( is_array( $module_id ) ) {
+		if ( empty( $module_id[ $index ] ) ) {
+			return false;
+		}
+		$module_id = $module_id[ $index ];
+	}
+
+	$module_path = remove_block_asset_path_prefix( $module_id );
+	if ( $module_id === $module_path ) {
+		return $module_id;
+	}
+
+	$path                  = dirname( $metadata['file'] );
+	$module_asset_raw_path = $path . '/' . substr_replace( $module_path, '.asset.php', - strlen( '.js' ) );
+	$module_id             = gutenberg_generate_block_asset_module_id( $metadata['name'], $field_name, $index );
+	$module_asset_path     = wp_normalize_path( realpath( $module_asset_raw_path ) );
+
+	if ( empty( $module_asset_path ) ) {
+		_doing_it_wrong(
+			__FUNCTION__,
+			sprintf(
+				// This string is from WordPress Core. See `register_block_script_handle`.
+				// Translators: This is a translation from WordPress Core (default). No need to translate.
+				__( 'The asset file (%1$s) for the "%2$s" defined in "%3$s" block definition is missing.', 'default' ),
+				$module_asset_raw_path,
+				$field_name,
+				$metadata['name']
+			),
+			'6.5.0'
+		);
+		return false;
+	}
+
+	$module_path_norm    = wp_normalize_path( realpath( $path . '/' . $module_path ) );
+	$module_uri          = get_block_asset_url( $module_path_norm );
+	$module_asset        = require $module_asset_path;
+	$module_dependencies = isset( $module_asset['dependencies'] ) ? $module_asset['dependencies'] : array();
+
+	wp_register_script_module(
+		$module_id,
+		$module_uri,
+		$module_dependencies,
+		isset( $module_asset['version'] ) ? $module_asset['version'] : false
+	);
+
+	return $module_id;
+}
+
+/**
+ * Generates the module ID for an asset based on the name of the block
+ * and the field name provided.
+ *
+ * This is analogous to the `generate_block_asset_handle` in WordPress Core.
+ *
+ * @param string $block_name Name of the block.
+ * @param string $field_name Name of the metadata field.
+ * @param int    $index      Optional. Index of the asset when multiple items passed.
+ *                           Default 0.
+ * @return string Generated module ID for the block's field.
+ */
+function gutenberg_generate_block_asset_module_id( $block_name, $field_name, $index = 0 ) {
+	if ( str_starts_with( $block_name, 'core/' ) ) {
+		$asset_handle = str_replace( 'core/', 'wp-block-', $block_name );
+		if ( str_starts_with( $field_name, 'editor' ) ) {
+			$asset_handle .= '-editor';
+		}
+		if ( str_starts_with( $field_name, 'view' ) ) {
+			$asset_handle .= '-view';
+		}
+		if ( $index > 0 ) {
+			$asset_handle .= '-' . ( $index + 1 );
+		}
+		return $asset_handle;
+	}
+
+	$field_mappings = array(
+		'viewModule' => 'view-module',
+	);
+	$asset_handle   = str_replace( '/', '-', $block_name ) .
+		'-' . $field_mappings[ $field_name ];
+	if ( $index > 0 ) {
+		$asset_handle .= '-' . ( $index + 1 );
+	}
+	return $asset_handle;
+}
+
+/**
+ * Registers a REST field for block types to provide view module IDs.
+ *
+ * Adds the `view_module_ids` field to block type objects in the REST API, which
+ * lists the script module IDs for any script modules associated with the
+ * block's viewModule(s) key.
+ *
+ * @since 6.5.0
+ */
+function gutenberg_register_view_module_ids_rest_field() {
+	register_rest_field(
+		'block-type',
+		'view_module_ids',
+		array(
+			'get_callback' => function ( $item ) {
+				$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $item['name'] );
+				if ( isset( $block_type->view_module_ids ) ) {
+					return $block_type->view_module_ids;
+				}
+				return array();
+			},
+		)
+	);
+}
+
+add_action( 'rest_api_init', 'gutenberg_register_view_module_ids_rest_field' );
+
+/**
+ * Registers the module if no module with that module identifier has already
+ * been registered.
+ *
+ * @param string            $module_identifier The identifier of the module. Should be unique. It will be used in the final import map.
+ * @param string            $src               Full URL of the module, or path of the script relative to the WordPress root directory.
+ * @param array             $dependencies      Optional. An array of module identifiers of the dependencies of this module. The dependencies can be strings or arrays. If they are arrays, they need an `id` key with the module identifier, and can contain an `import` key with either `static` or `dynamic`. By default, dependencies that don't contain an import are considered static.
+ * @param string|false|null $version           Optional. String specifying module version number. Defaults to false. It is added to the URL as a query string for cache busting purposes. If $version is set to false, the version number is the currently installed WordPress version. If $version is set to null, no version is added.
+ * @deprecated 17.6.0 gutenberg_register_module is deprecated. Please use wp_register_script_module instead.
+ */
+function gutenberg_register_module( $module_identifier, $src = '', $dependencies = array(), $version = false ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_register_script_module' );
+	wp_script_modules()->register( $module_identifier, $src, $dependencies, $version );
+}
+
+/**
+ * Marks the module to be enqueued in the page.
+ *
+ * @param string $module_identifier The identifier of the module.
+ * @deprecated 17.6.0 gutenberg_enqueue_module is deprecated. Please use wp_enqueue_script_module instead.
+ */
+function gutenberg_enqueue_module( $module_identifier ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_enqueue_script_module' );
+	wp_script_modules()->enqueue( $module_identifier );
+}
+
+/**
+ * Unmarks the module so it is not longer enqueued in the page.
+ *
+ * @param string $module_identifier The identifier of the module.
+ * @deprecated 17.6.0 gutenberg_dequeue_module is deprecated. Please use wp_dequeue_script_module instead.
+ */
+function gutenberg_dequeue_module( $module_identifier ) {
+	_deprecated_function( __FUNCTION__, 'Gutenberg 17.6.0', 'wp_dequeue_script_module' );
+	wp_script_modules()->dequeue( $module_identifier );
+}
diff --git a/lib/load.php b/lib/load.php
index 2dd33962e355b..73e6824ab0c9e 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -108,6 +108,8 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
+require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php';
+require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php';
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
@@ -116,6 +118,7 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/kses.php';
 require __DIR__ . '/experimental/l10n.php';
 require __DIR__ . '/experimental/synchronization.php';
+require __DIR__ . '/experimental/script-modules.php';
 
 if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 	require __DIR__ . '/experimental/disable-tinymce.php';
@@ -134,8 +137,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 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';
-
 // Fonts API / Font Face.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
 
diff --git a/packages/block-library/src/file/block.json b/packages/block-library/src/file/block.json
index 9dc6677e4adce..fd5da67d284f4 100644
--- a/packages/block-library/src/file/block.json
+++ b/packages/block-library/src/file/block.json
@@ -72,7 +72,6 @@
 		},
 		"interactivity": true
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-file-editor",
 	"style": "wp-block-file"
 }
diff --git a/packages/block-library/src/file/index.php b/packages/block-library/src/file/index.php
index 5910a63e6cf18..24eaff8bac622 100644
--- a/packages/block-library/src/file/index.php
+++ b/packages/block-library/src/file/index.php
@@ -14,35 +14,8 @@
  *
  * @return string Returns the block content.
  */
-function render_block_core_file( $attributes, $content, $block ) {
-	$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$should_load_view_script = ! empty( $attributes['displayPreview'] );
-	$view_js_file            = 'wp-block-file-view';
-	$script_handles          = $block->block_type->view_script_handles;
-
-	if ( $is_gutenberg_plugin ) {
-		if ( $should_load_view_script ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/file-block' );
-		}
-		// Remove the view script because we are using the module.
-		$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-	} else {
-		// If the script already exists, there is no point in removing it from viewScript.
-		if ( ! wp_script_is( $view_js_file ) ) {
-
-			// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-			if ( ! $should_load_view_script && in_array( $view_js_file, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-			}
-			// If the script is needed, but it was previously removed, add it again.
-			if ( $should_load_view_script && ! in_array( $view_js_file, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-			}
-		}
-	}
-
+function render_block_core_file( $attributes, $content ) {
 	// Update object's aria-label attribute if present in block HTML.
-
 	// Match an aria-label attribute from an object tag.
 	$pattern = '@<object.+(?<attribute>aria-label="(?<filename>[^"]+)?")@i';
 	$content = preg_replace_callback(
@@ -63,8 +36,10 @@ static function ( $matches ) {
 		$content
 	);
 
-	// If it uses the Interactivity API, add the directives.
-	if ( $should_load_view_script ) {
+	// If it's interactive, enqueue the script module and add the directives.
+	if ( ! empty( $attributes['displayPreview'] ) ) {
+		wp_enqueue_script_module( '@wordpress/block-library/file-block' );
+
 		$processor = new WP_HTML_Tag_Processor( $content );
 		$processor->next_tag();
 		$processor->set_attribute( 'data-wp-interactive', '{"namespace":"core/file"}' );
@@ -77,25 +52,6 @@ static function ( $matches ) {
 	return $content;
 }
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_file_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-file-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-file-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-file-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_file_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/file` block on server.
  */
@@ -107,13 +63,11 @@ function register_block_core_file() {
 		)
 	);
 
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/file-block',
-			gutenberg_url( '/build/interactivity/file.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
+	wp_register_script_module(
+		'@wordpress/block-library/file-block',
+		gutenberg_url( '/build/interactivity/file.min.js' ),
+		array( '@wordpress/interactivity' ),
+		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+	);
 }
 add_action( 'init', 'register_block_core_file' );
diff --git a/packages/block-library/src/image/block.json b/packages/block-library/src/image/block.json
index a9357d28815b6..d60bcadf0eec7 100644
--- a/packages/block-library/src/image/block.json
+++ b/packages/block-library/src/image/block.json
@@ -134,6 +134,5 @@
 		{ "name": "rounded", "label": "Rounded" }
 	],
 	"editorStyle": "wp-block-image-editor",
-	"style": "wp-block-image",
-	"viewScript": "file:./view.min.js"
+	"style": "wp-block-image"
 }
diff --git a/packages/block-library/src/image/index.php b/packages/block-library/src/image/index.php
index add8e5989ab7d..3297c57d9eab3 100644
--- a/packages/block-library/src/image/index.php
+++ b/packages/block-library/src/image/index.php
@@ -37,10 +37,6 @@ function render_block_core_image( $attributes, $content, $block ) {
 	$link_destination  = isset( $attributes['linkDestination'] ) ? $attributes['linkDestination'] : 'none';
 	$lightbox_settings = block_core_image_get_lightbox_settings( $block->parsed_block );
 
-	$is_gutenberg_plugin = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$view_js_file_handle = 'wp-block-image-view';
-	$script_handles      = $block->block_type->view_script_handles;
-
 	/*
 	 * If the lightbox is enabled and the image is not linked, add the filter
 	 * and the JavaScript view file.
@@ -51,34 +47,22 @@ function render_block_core_image( $attributes, $content, $block ) {
 		isset( $lightbox_settings['enabled'] ) &&
 		true === $lightbox_settings['enabled']
 	) {
-		if ( $is_gutenberg_plugin ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/image' );
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file_handle ) );
-		} elseif ( ! in_array( $view_js_file_handle, $script_handles, true ) ) {
-			$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file_handle ) );
-		}
+		wp_enqueue_script_module( '@wordpress/block-library/image' );
 
 		/*
-		 * This render needs to happen in a filter with priority 15 to ensure
-		 * that it runs after the duotone filter and that duotone styles are
-		 * applied to the image in the lightbox. We also need to ensure that the
-		 * lightbox works with any plugins that might use filters as well. We
-		 * can consider removing this in the future if the way the blocks are
-		 * rendered changes, or if a new kind of filter is introduced.
+		 * This render needs to happen in a filter with priority 15 to ensure that
+		 * it runs after the duotone filter and that duotone styles are applied to
+		 * the image in the lightbox. Lightbox has to work with any plugins that
+		 * might use filters as well. Removing this can be considered in the
+		 * future if the way the blocks are rendered changes, or if a
+		 * new kind of filter is introduced.
 		 */
 		add_filter( 'render_block_core/image', 'block_core_image_render_lightbox', 15, 2 );
 	} else {
 		/*
-		 * Remove the filter and the JavaScript view file if previously added by
-		 * other Image blocks.
+		 * Remove the filter if previously added by other Image blocks.
 		 */
 		remove_filter( 'render_block_core/image', 'block_core_image_render_lightbox', 15 );
-
-		// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-		if ( in_array( $view_js_file_handle, $script_handles, true ) ) {
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file_handle ) );
-		}
 	}
 
 	return $processor->get_updated_html();
@@ -328,25 +312,6 @@ class="lightbox-trigger"
 	return str_replace( '</figure>', $lightbox_html . '</figure>', $body_content );
 }
 
-/**
- * Ensures that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_image_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-image-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-image-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-image-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_image_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/image` block on server.
  */
@@ -358,13 +323,11 @@ function register_block_core_image() {
 		)
 	);
 
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/image',
-			gutenberg_url( '/build/interactivity/image.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
+	wp_register_script_module(
+		'@wordpress/block-library/image',
+		gutenberg_url( '/build/interactivity/image.min.js' ),
+		array( '@wordpress/interactivity' ),
+		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+	);
 }
 add_action( 'init', 'register_block_core_image' );
diff --git a/packages/block-library/src/navigation/block.json b/packages/block-library/src/navigation/block.json
index 9ec919ae38d1f..36817a5e1c35b 100644
--- a/packages/block-library/src/navigation/block.json
+++ b/packages/block-library/src/navigation/block.json
@@ -136,7 +136,6 @@
 		"interactivity": true,
 		"renaming": false
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-navigation-editor",
 	"style": "wp-block-navigation"
 }
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 3af85afd92522..29546f22c69e3 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -427,14 +427,12 @@ function register_block_core_navigation() {
 		)
 	);
 
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/navigation-block',
-			gutenberg_url( '/build/interactivity/navigation.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
+	wp_register_script_module(
+		'@wordpress/block-library/navigation-block',
+		gutenberg_url( '/build/interactivity/navigation.min.js' ),
+		array( '@wordpress/interactivity' ),
+		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+	);
 }
 
 add_action( 'init', 'register_block_core_navigation' );
@@ -473,25 +471,6 @@ function block_core_navigation_typographic_presets_backcompatibility( $parsed_bl
 
 add_filter( 'render_block_data', 'block_core_navigation_typographic_presets_backcompatibility' );
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_navigation_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-navigation-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-navigation-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-navigation-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_navigation_ensure_interactivity_dependency' );
-
 /**
  * Turns menu item data into a nested array of parsed blocks
  *
diff --git a/packages/block-library/src/query/block.json b/packages/block-library/src/query/block.json
index d30eccf376579..6189f6f0189b7 100644
--- a/packages/block-library/src/query/block.json
+++ b/packages/block-library/src/query/block.json
@@ -52,6 +52,5 @@
 		"layout": true
 	},
 	"editorStyle": "wp-block-query-editor",
-	"style": "wp-block-query",
-	"viewScript": "file:./view.min.js"
+	"style": "wp-block-query"
 }
diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
index 75b5218364d7b..f40d9df2fb06b 100644
--- a/packages/block-library/src/query/index.php
+++ b/packages/block-library/src/query/index.php
@@ -17,7 +17,13 @@
  * @return string Returns the modified output of the query block.
  */
 function render_block_core_query( $attributes, $content, $block ) {
-	if ( $attributes['enhancedPagination'] && isset( $attributes['queryId'] ) ) {
+	$is_interactive = isset( $attributes['enhancedPagination'] ) && true === $attributes['enhancedPagination'] && isset( $attributes['queryId'] );
+
+	// Enqueue the script module and add the necessary directives if the block is
+	// interactive.
+	if ( $is_interactive ) {
+		wp_enqueue_script_module( '@wordpress/block-library/query' );
+
 		$p = new WP_HTML_Tag_Processor( $content );
 		if ( $p->next_tag() ) {
 			// Add the necessary directives.
@@ -63,43 +69,17 @@ class="wp-block-query__enhanced-pagination-animation"
 		}
 	}
 
-	$is_gutenberg_plugin     = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-	$should_load_view_script = $attributes['enhancedPagination'] && isset( $attributes['queryId'] );
-	$view_asset              = 'wp-block-query-view';
-	$script_handles          = $block->block_type->view_script_handles;
-
-	if ( $is_gutenberg_plugin ) {
-		if ( $should_load_view_script ) {
-			gutenberg_enqueue_module( '@wordpress/block-library/query' );
-		}
-		// Remove the view script because we are using the module.
-		$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_asset ) );
-	} else {
-		if ( ! wp_script_is( $view_asset ) ) {
-			// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-			if ( ! $should_load_view_script && in_array( $view_asset, $script_handles, true )
-			) {
-				$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_asset ) );
-			}
-			// If the script is needed, but it was previously removed, add it again.
-			if ( $should_load_view_script && ! in_array( $view_asset, $script_handles, true ) ) {
-				$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_asset ) );
-			}
-		}
-	}
-
+	// Add the styles to the block type if the block is interactive and remove
+	// them if it's not.
 	$style_asset = 'wp-block-query';
 	if ( ! wp_style_is( $style_asset ) ) {
 		$style_handles = $block->block_type->style_handles;
 		// If the styles are not needed, and they are still in the `style_handles`, remove them.
-		if (
-			( ! $attributes['enhancedPagination'] || ! isset( $attributes['queryId'] ) )
-			&& in_array( $style_asset, $style_handles, true )
-		) {
+		if ( ! $is_interactive && in_array( $style_asset, $style_handles, true ) ) {
 			$block->block_type->style_handles = array_diff( $style_handles, array( $style_asset ) );
 		}
 		// If the styles are needed, but they were previously removed, add them again.
-		if ( $attributes['enhancedPagination'] && isset( $attributes['queryId'] ) && ! in_array( $style_asset, $style_handles, true ) ) {
+		if ( $is_interactive && ! in_array( $style_asset, $style_handles, true ) ) {
 			$block->block_type->style_handles = array_merge( $style_handles, array( $style_asset ) );
 		}
 	}
@@ -107,25 +87,6 @@ class="wp-block-query__enhanced-pagination-animation"
 	return $content;
 }
 
-/**
- * Ensure that the view script has the `wp-interactivity` dependency.
- *
- * @since 6.4.0
- *
- * @global WP_Scripts $wp_scripts
- */
-function block_core_query_ensure_interactivity_dependency() {
-	global $wp_scripts;
-	if (
-		isset( $wp_scripts->registered['wp-block-query-view'] ) &&
-		! in_array( 'wp-interactivity', $wp_scripts->registered['wp-block-query-view']->deps, true )
-	) {
-		$wp_scripts->registered['wp-block-query-view']->deps[] = 'wp-interactivity';
-	}
-}
-
-add_action( 'wp_print_scripts', 'block_core_query_ensure_interactivity_dependency' );
-
 /**
  * Registers the `core/query` block on the server.
  */
@@ -137,14 +98,12 @@ function register_block_core_query() {
 		)
 	);
 
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/query',
-			'/wp-content/plugins/gutenberg/build/interactivity/query.min.js',
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
+	wp_register_script_module(
+		'@wordpress/block-library/query',
+		'/wp-content/plugins/gutenberg/build/interactivity/query.min.js',
+		array( '@wordpress/interactivity' ),
+		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+	);
 }
 add_action( 'init', 'register_block_core_query' );
 
@@ -164,14 +123,10 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 	static $dirty_enhanced_queries = array();
 	static $render_query_callback  = null;
 
-	$block_name = $parsed_block['blockName'];
+	$is_interactive = isset( $parsed_block['attrs']['enhancedPagination'] ) && true === $parsed_block['attrs']['enhancedPagination'] && isset( $parsed_block['attrs']['queryId'] );
+	$block_name     = $parsed_block['blockName'];
 
-	if (
-		'core/query' === $block_name &&
-		isset( $parsed_block['attrs']['enhancedPagination'] ) &&
-		true === $parsed_block['attrs']['enhancedPagination'] &&
-		isset( $parsed_block['attrs']['queryId'] )
-	) {
+	if ( 'core/query' === $block_name && $is_interactive ) {
 		$enhanced_query_stack[] = $parsed_block['attrs']['queryId'];
 
 		if ( ! isset( $render_query_callback ) ) {
@@ -186,12 +141,9 @@ function block_core_query_disable_enhanced_pagination( $parsed_block ) {
 			 * @return string Returns the modified output of the query block.
 			 */
 			$render_query_callback = static function ( $content, $block ) use ( &$enhanced_query_stack, &$dirty_enhanced_queries, &$render_query_callback ) {
-				$has_enhanced_pagination =
-					isset( $block['attrs']['enhancedPagination'] ) &&
-					true === $block['attrs']['enhancedPagination'] &&
-					isset( $block['attrs']['queryId'] );
+				$is_interactive = isset( $block['attrs']['enhancedPagination'] ) && true === $block['attrs']['enhancedPagination'] && isset( $block['attrs']['queryId'] );
 
-				if ( ! $has_enhanced_pagination ) {
+				if ( ! $is_interactive ) {
 					return $content;
 				}
 
diff --git a/packages/block-library/src/search/block.json b/packages/block-library/src/search/block.json
index 15531475adc9a..8d5e208045068 100644
--- a/packages/block-library/src/search/block.json
+++ b/packages/block-library/src/search/block.json
@@ -87,7 +87,6 @@
 		},
 		"html": false
 	},
-	"viewScript": "file:./view.min.js",
 	"editorStyle": "wp-block-search-editor",
 	"style": "wp-block-search"
 }
diff --git a/packages/block-library/src/search/index.php b/packages/block-library/src/search/index.php
index ae6ddb1c4fb37..266eb93ca82a4 100644
--- a/packages/block-library/src/search/index.php
+++ b/packages/block-library/src/search/index.php
@@ -16,7 +16,7 @@
  *
  * @return string The search block markup.
  */
-function render_block_core_search( $attributes, $content, $block ) {
+function render_block_core_search( $attributes ) {
 	// Older versions of the Search block defaulted the label and buttonText
 	// attributes to `__( 'Search' )` meaning that many posts contain `<!--
 	// wp:search /-->`. Support these by defaulting an undefined label and
@@ -77,39 +77,19 @@ function render_block_core_search( $attributes, $content, $block ) {
 		$input->set_attribute( 'value', get_search_query() );
 		$input->set_attribute( 'placeholder', $attributes['placeholder'] );
 
+		// If it's interactive, enqueue the script module and add the directives.
 		$is_expandable_searchfield = 'button-only' === $button_position;
 		if ( $is_expandable_searchfield ) {
+			wp_enqueue_script_module( '@wordpress/block-library/search-block' );
+
 			$input->set_attribute( 'data-wp-bind--aria-hidden', '!context.isSearchInputVisible' );
 			$input->set_attribute( 'data-wp-bind--tabindex', 'state.tabindex' );
-			// Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+
+			// Adding these attributes manually is needed until the Interactivity API
+			// SSR logic is added to core.
 			$input->set_attribute( 'aria-hidden', 'true' );
 			$input->set_attribute( 'tabindex', '-1' );
 		}
-
-		$is_gutenberg_plugin = defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN;
-		$script_handles      = $block->block_type->view_script_handles;
-		$view_js_file        = 'wp-block-search-view';
-
-		if ( $is_gutenberg_plugin ) {
-			if ( $is_expandable_searchfield ) {
-				gutenberg_enqueue_module( '@wordpress/block-library/search-block' );
-			}
-			// Remove the view script because we are using the module.
-			$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-		} else {
-			// If the script already exists, there is no point in removing it from viewScript.
-			if ( ! wp_script_is( $view_js_file ) ) {
-
-				// If the script is not needed, and it is still in the `view_script_handles`, remove it.
-				if ( ! $is_expandable_searchfield && in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_diff( $script_handles, array( $view_js_file ) );
-				}
-				// If the script is needed, but it was previously removed, add it again.
-				if ( $is_expandable_searchfield && ! in_array( $view_js_file, $script_handles, true ) ) {
-					$block->block_type->view_script_handles = array_merge( $script_handles, array( $view_js_file ) );
-				}
-			}
-		}
 	}
 
 	if ( count( $query_params ) > 0 ) {
@@ -159,7 +139,9 @@ function render_block_core_search( $attributes, $content, $block ) {
 				$button->set_attribute( 'data-wp-bind--aria-expanded', 'context.isSearchInputVisible' );
 				$button->set_attribute( 'data-wp-bind--type', 'state.type' );
 				$button->set_attribute( 'data-wp-on--click', 'actions.openSearchInput' );
-				// Adding these attributes manually is needed until the Interactivity API SSR logic is added to core.
+
+				// Adding these attributes manually is needed until the Interactivity
+				// API SSR logic is added to core.
 				$button->set_attribute( 'aria-label', __( 'Expand search field' ) );
 				$button->set_attribute( 'aria-controls', 'wp-block-search__input-' . $input_id );
 				$button->set_attribute( 'aria-expanded', 'false' );
@@ -181,6 +163,8 @@ function render_block_core_search( $attributes, $content, $block ) {
 		array( 'class' => $classnames )
 	);
 	$form_directives      = '';
+
+	// If it's interactive, add the directives.
 	if ( $is_expandable_searchfield ) {
 		$aria_label_expanded  = __( 'Submit Search' );
 		$aria_label_collapsed = __( 'Expand search field' );
@@ -213,14 +197,12 @@ function register_block_core_search() {
 		)
 	);
 
-	if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
-		gutenberg_register_module(
-			'@wordpress/block-library/search-block',
-			gutenberg_url( '/build/interactivity/search.min.js' ),
-			array( '@wordpress/interactivity' ),
-			defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-		);
-	}
+	wp_register_script_module(
+		'@wordpress/block-library/search-block',
+		gutenberg_url( '/build/interactivity/search.min.js' ),
+		array( '@wordpress/interactivity' ),
+		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+	);
 }
 add_action( 'init', 'register_block_core_search' );
 
diff --git a/packages/dependency-extraction-webpack-plugin/README.md b/packages/dependency-extraction-webpack-plugin/README.md
index 6031a1d5f2568..817b3673351e5 100644
--- a/packages/dependency-extraction-webpack-plugin/README.md
+++ b/packages/dependency-extraction-webpack-plugin/README.md
@@ -94,14 +94,14 @@ By default, the following module requests are handled:
 
 This plugin is compatible with `externals`, but they may conflict. For example, adding `{ externals: { '@wordpress/blob': 'wp.blob' } }` to webpack configuration will effectively hide the `@wordpress/blob` module from the plugin and it will not be included in dependency lists.
 
-### Behavior with modules
+### Behavior with script modules
 
-**Warning:** Modules support is considered experimental at this time.
+**Warning:** Script modules support is considered experimental at this time.
 
 This section describes the behavior of this package to bundle ECMAScript modules and generate asset
-files suitable for use with the WordPress Modules API.
+files suitable for use with the WordPress Script Modules API.
 
-Some of this plugin's options change, and webpack requires configuration to output modules. Refer to
+Some of this plugin's options change, and webpack requires configuration to output script modules. Refer to
 [webpack's documentation](https://webpack.js.org/configuration/output/#outputmodule) for up-to-date details.
 
 ```js
@@ -118,7 +118,7 @@ const webpackConfig = {
 				plugin.constructor.name !== 'DependencyExtractionWebpackPlugin'
 		),
 		new DependencyExtractionWebpackPlugin( {
-			// With modules, we use `requestToExternalModule`:
+			// With modules, use `requestToExternalModule`:
 			requestToExternalModule( request ) {
 				if ( request === 'my-registered-module' ) {
 					return request;
@@ -129,7 +129,7 @@ const webpackConfig = {
 };
 ```
 
-Each entry point in the webpack bundle will include an asset file that declares the WordPress module dependencies that should be enqueued. This file also contains the unique version hash calculated based on the file content.
+Each entry point in the webpack bundle will include an asset file that declares the WordPress script module dependencies that should be enqueued. This file also contains the unique version hash calculated based on the file content.
 
 For example:
 
@@ -144,15 +144,15 @@ import { store, getContext } from '@wordpress/interactivity';
 <?php return array('dependencies' => array('@wordpress/interactivity'), 'version' => 'dd4c2dc50d046ed9d4c063a7ca95702f');
 ```
 
-By default, the following module requests are handled:
+By default, the following script module requests are handled:
 
 | Request                      |
 | ---------------------------- |
 | `@wordpress/interactivity  ` |
 
-(`@wordpress/interactivity` is currently the only available WordPress module.)
+(`@wordpress/interactivity` is currently the only available WordPress script module.)
 
-**Note:** This plugin overlaps with the functionality provided by [webpack `externals`](https://webpack.js.org/configuration/externals). This plugin is intended to extract module handles from bundle compilation so that a list of module dependencies does not need to be manually maintained. If you don't need to extract a list of module dependencies, use the `externals` option directly.
+**Note:** This plugin overlaps with the functionality provided by [webpack `externals`](https://webpack.js.org/configuration/externals). This plugin is intended to extract script module identifiers from bundle compilation so that a list of script module dependencies does not need to be manually maintained. If you don't need to extract a list of script module dependencies, use the `externals` option directly.
 
 This plugin is compatible with `externals`, but they may conflict. For example, adding `{ externals: { '@wordpress/blob': 'wp.blob' } }` to webpack configuration will effectively hide the `@wordpress/blob` module from the plugin and it will not be included in dependency lists.
 
@@ -210,7 +210,7 @@ Pass `useDefaults: false` to disable the default request handling.
 
 Force `wp-polyfill` to be included in each entry point's dependency list. This would be the same as adding `import '@wordpress/polyfill';` to each entry point.
 
-**Note**: This option is not available with modules.
+**Note**: This option is not available with script modules.
 
 ##### `externalizedReport`
 
@@ -222,7 +222,7 @@ You can provide a filename, or set it to `true` to report to a default `external
 
 ##### `requestToExternal`
 
-**Note**: This option is not available with modules. See [`requestToExternalModule`](#requestToExternalModule) for module usage.
+**Note**: This option is not available with script modules. See [`requestToExternalModule`](#requestToExternalModule) for module usage.
 
 -   Type: function
 
@@ -253,11 +253,11 @@ module.exports = {
 
 ##### `requestToExternalModule`
 
-**Note**: This option is only available with modules. See [`requestToExternal`](#requestToExternal) for script usage.
+**Note**: This option is only available with script modules. See [`requestToExternal`](#requestToExternal) for script usage.
 
 -   Type: function
 
-`requestToExternalModule` allows the module handling to be customized. The function should accept a module request string and may return a string representing the module to use. Often, the module will have the same name.
+`requestToExternalModule` allows the script module handling to be customized. The function should accept a script module request string and may return a string representing the script module to use. Often, the script module will have the same name.
 
 `requestToExternalModule` provided via configuration has precedence over default external handling. Unhandled requests will be handled by the default unless `useDefaults` is set to `false`.
 
@@ -265,9 +265,9 @@ module.exports = {
 /**
  * Externalize 'my-module'
  *
- * @param {string} request Requested module
+ * @param {string} request Requested script module
  *
- * @return {(string|boolean|undefined)} Module ID
+ * @return {(string|boolean|undefined)} Script module ID
  */
 function requestToExternalModule( request ) {
 	// Handle imports like `import myModule from 'my-module'`
@@ -276,7 +276,7 @@ function requestToExternalModule( request ) {
 		return 'myModule';
 	}
 
-	// If the Module ID in source is the same as the external module, we can return `true`.
+    // If the script module ID in source is the same as the external script module, `true` can be returned.
 	return request === 'external-module-id-no-change-required';
 }
 
@@ -289,7 +289,7 @@ module.exports = {
 
 ##### `requestToHandle`
 
-**Note**: This option is not available with modules. It has no corresponding module configuration.
+**Note**: This option is not available with script modules. It has no corresponding module configuration.
 
 -   Type: function
 
@@ -343,7 +343,7 @@ $script_url = plugins_url( $script_path, __FILE__ );
 wp_enqueue_script( 'script', $script_url, $script_asset['dependencies'], $script_asset['version'] );
 ```
 
-Or with modules (the Module API is not yet stable):
+Or with modules (the Script Module API is only available in WordPress > 6.5):
 
 ```php
 $module_path       = 'path/to/module.js';
@@ -352,8 +352,8 @@ $module_asset      = file_exists( $module_asset_path )
 	? require( $module_asset_path )
 	: array( 'dependencies' => array(), 'version' => filemtime( $module_path ) );
 $module_url = plugins_url( $module_path, __FILE__ );
-wp_register_module( 'my-module', $module_url, $module_asset['dependencies'], $module_asset['version'] );
-wp_enqueue_module( 'my-module' );
+wp_register_script_module( 'my-module', $module_url, $module_asset['dependencies'], $module_asset['version'] );
+wp_enqueue_script_module( 'my-module' );
 ```
 
 ## Contributing to this package
diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
index 05b591ecce378..fa93a64fe210e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks.php
+++ b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -21,12 +21,11 @@ function () {
 
 				$view_file = plugin_dir_url( $block_folder ) . $name . '/' . 'view.js';
 
-				gutenberg_register_module(
+				wp_register_script_module(
 					$name . '-view',
 					$view_file,
 					array( '@wordpress/interactivity' ),
-					filemtime( $view_file ),
-					true
+					filemtime( $view_file )
 				);
 
 				register_block_type_from_metadata( $block_folder );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
index efa62c3a18b7e..24e3c9343c115 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-bind/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-bind-view' );
+wp_enqueue_script_module( 'directive-bind-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-bind" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php
index 16178815c2486..31d5deb57eb11 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-body/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-body-view' );
+wp_enqueue_script_module( 'directive-body-view' );
 ?>
 
 <div
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
index 96b3b086abdbf..52cbefd006012 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-class/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-class-view' );
+wp_enqueue_script_module( 'directive-class-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-class"}'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
index fe9a6c4f85a16..b60be101a42d1 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-context-view' );
+wp_enqueue_script_module( 'directive-context-view' );
 ?>
 
 <div data-wp-interactive='{"namespace": "directive-context"}'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
index b9deee18abe57..1a48611d51ea5 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-each-view' );
+wp_enqueue_script_module( 'directive-each-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-each" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
index 6ee0115ff05ba..e94c3032d9b70 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-init/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-init-view' );
+wp_enqueue_script_module( 'directive-init-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-init" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
index 1a5f57b526fbf..d28002c137792 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-key-view' );
+wp_enqueue_script_module( 'directive-key-view' );
 ?>
 
 <div
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
index b6f8a2b1b5497..cf5261a461e2e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-document/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-on-document-view' );
+wp_enqueue_script_module( 'directive-on-document-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-on-document" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
index 9c067d33cb34a..6676012600019 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on-window/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-on-window-view' );
+wp_enqueue_script_module( 'directive-on-window-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-on-window" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
index ebf144660fd2a..edb081922fc0e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-on/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-on-view' );
+wp_enqueue_script_module( 'directive-on-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-on" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
index f082d44dd8fdf..2f98eb62aa5c6 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-priorities/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-priorities-view' );
+wp_enqueue_script_module( 'directive-priorities-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-priorities" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
index a7eaaa984035e..237a3634b7452 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-run-view' );
+wp_enqueue_script_module( 'directive-run-view' );
 ?>
 
 <div
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
index b31f13cf1335c..b101b44ee6b40 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-style/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-style-view' );
+wp_enqueue_script_module( 'directive-style-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-style" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
index 91d03b6fb8e19..428c1bfe24da2 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-text/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-text-view' );
+wp_enqueue_script_module( 'directive-text-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-context" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
index 4fc7dd96ee883..74fb650b15388 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-watch/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'directive-watch-view' );
+wp_enqueue_script_module( 'directive-watch-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "directive-watch" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
index 8d686e6c3ff46..b94b639c07985 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/negation-operator/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'negation-operator-view' );
+wp_enqueue_script_module( 'negation-operator-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "negation-operator" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
index 3fbddf623db60..560958e8a0d6b 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
@@ -7,7 +7,7 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-gutenberg_enqueue_module( 'router-navigate-view' );
+wp_enqueue_script_module( 'router-navigate-view' );
 ?>
 
 <div
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
index 33c319e130fe2..ebffbab0636c6 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
@@ -7,7 +7,7 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-gutenberg_enqueue_module( 'router-regions-view' );
+wp_enqueue_script_module( 'router-regions-view' );
 ?>
 
 <section>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
index 06deea9e1169d..874b358c93612 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
@@ -7,7 +7,7 @@
  * @phpcs:disable VariableAnalysis.CodeAnalysis.VariableAnalysis.UndefinedVariable
  */
 
-gutenberg_enqueue_module( 'store-tag-view' );
+wp_enqueue_script_module( 'store-tag-view' );
 
 // These variables simulates SSR.
 $test_store_tag_counter = 'ok' === $attributes['condition'] ? 3 : 0;
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
index 1f53ca1331a37..cc16d30613e43 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom-islands/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'tovdom-islands-view' );
+wp_enqueue_script_module( 'tovdom-islands-view' );
 ?>
 
 <div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php b/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
index 309b42a582935..07a50745c7242 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/tovdom/render.php
@@ -9,7 +9,7 @@
 $src_proc_ins = $plugin_url . 'tovdom/processing-instructions.js';
 $src_cdata    = $plugin_url . 'tovdom/cdata.js';
 
-gutenberg_enqueue_module( 'tovdom-view' );
+wp_enqueue_script_module( 'tovdom-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "tovdom" }'>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
index e1a844e33246a..699c29aabe28c 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/with-scope/render.php
@@ -5,7 +5,7 @@
  * @package gutenberg-test-interactive-blocks
  */
 
-gutenberg_enqueue_module( 'with-scope-view' );
+wp_enqueue_script_module( 'with-scope-view' );
 ?>
 
 <div data-wp-interactive='{ "namespace": "with-scope" }' data-wp-context='{"asyncCounter": 0, "syncCounter": 0}' data-wp-init--a='callbacks.asyncInit' data-wp-init--b='callbacks.syncInit'>
diff --git a/phpunit/experimental/modules/class-gutenberg-modules-test.php b/phpunit/experimental/modules/class-gutenberg-modules-test.php
deleted file mode 100644
index a7f6c3b491a53..0000000000000
--- a/phpunit/experimental/modules/class-gutenberg-modules-test.php
+++ /dev/null
@@ -1,285 +0,0 @@
-<?php
-/**
- * Tests Gutenberg_Modules_Test
- *
- * @package WordPress
- */
-
-/**
- * Tests for the Gutenberg_Modules_Test class.
- */
-class Gutenberg_Modules_Test extends WP_UnitTestCase {
-	protected $registered;
-	protected $old_registered;
-
-	public function set_up() {
-		parent::set_up();
-		$this->registered = new ReflectionProperty( 'Gutenberg_Modules', 'registered' );
-		$this->registered->setAccessible( true );
-		$this->old_registered = $this->registered->getValue();
-		$this->registered->setValue( array() );
-	}
-
-	public function tear_down() {
-		$this->registered->setValue( $this->old_registered );
-		parent::tear_down();
-	}
-
-	public function get_enqueued_modules() {
-		$modules_markup   = get_echo( array( 'Gutenberg_Modules', 'print_enqueued_modules' ) );
-		$p                = new WP_HTML_Tag_Processor( $modules_markup );
-		$enqueued_modules = array();
-
-		while ( $p->next_tag(
-			array(
-				'tag'  => 'SCRIPT',
-				'type' => 'module',
-			)
-		) ) {
-			$enqueued_modules[ $p->get_attribute( 'id' ) ] = $p->get_attribute( 'src' );
-		}
-
-		return $enqueued_modules;
-	}
-
-	public function get_import_map() {
-		$import_map_markup = get_echo( array( 'Gutenberg_Modules', 'print_import_map' ) );
-		preg_match( '/<script type="importmap">([^<]+)<\/script>/s', $import_map_markup, $import_map_string );
-		return json_decode( $import_map_string[1], true )['imports'];
-	}
-
-	public function get_preloaded_modules() {
-		$preloaded_markup  = get_echo( array( 'Gutenberg_Modules', 'print_module_preloads' ) );
-		$p                 = new WP_HTML_Tag_Processor( $preloaded_markup );
-		$preloaded_modules = array();
-
-		while ( $p->next_tag(
-			array(
-				'tag' => 'LINK',
-				'rel' => 'modulepreload',
-			)
-		) ) {
-			$preloaded_modules[ $p->get_attribute( 'id' ) ] = $p->get_attribute( 'href' );
-		}
-
-		return $preloaded_modules;
-	}
-
-	public function test_gutenberg_enqueue_module() {
-		gutenberg_register_module( 'foo', '/foo.js' );
-		gutenberg_register_module( 'bar', '/bar.js' );
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'bar' );
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertEquals( 2, count( $enqueued_modules ) );
-		$this->assertEquals( true, str_starts_with( $enqueued_modules['foo'], '/foo.js' ) );
-		$this->assertEquals( true, str_starts_with( $enqueued_modules['bar'], '/bar.js' ) );
-	}
-
-	public function test_gutenberg_dequeue_module() {
-		gutenberg_register_module( 'foo', '/foo.js' );
-		gutenberg_register_module( 'bar', '/bar.js' );
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'bar' );
-		gutenberg_dequeue_module( 'foo' ); // Dequeued.
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertEquals( 1, count( $enqueued_modules ) );
-		$this->assertEquals( false, isset( $enqueued_modules['foo'] ) );
-		$this->assertEquals( true, isset( $enqueued_modules['bar'] ) );
-	}
-
-	public function test_gutenberg_enqueue_module_works_before_register() {
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_register_module( 'foo', '/foo.js' );
-		gutenberg_enqueue_module( 'bar' ); // Not registered.
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertEquals( 1, count( $enqueued_modules ) );
-		$this->assertEquals( true, str_starts_with( $enqueued_modules['foo'], '/foo.js' ) );
-		$this->assertEquals( false, isset( $enqueued_modules['bar'] ) );
-	}
-
-	public function test_gutenberg_dequeue_module_works_before_register() {
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'bar' );
-		gutenberg_dequeue_module( 'foo' );
-		gutenberg_register_module( 'foo', '/foo.js' );
-		gutenberg_register_module( 'bar', '/bar.js' );
-
-		$enqueued_modules = $this->get_enqueued_modules();
-
-		$this->assertEquals( 1, count( $enqueued_modules ) );
-		$this->assertEquals( false, isset( $enqueued_modules['foo'] ) );
-		$this->assertEquals( true, isset( $enqueued_modules['bar'] ) );
-	}
-
-	public function test_gutenberg_import_map_dependencies() {
-		gutenberg_register_module( 'foo', '/foo.js', array( 'dep' ) );
-		gutenberg_register_module( 'dep', '/dep.js' );
-		gutenberg_register_module( 'no-dep', '/no-dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-
-		$import_map = $this->get_import_map();
-
-		$this->assertEquals( 1, count( $import_map ) );
-		$this->assertEquals( true, str_starts_with( $import_map['dep'], '/dep.js' ) );
-		$this->assertEquals( false, isset( $import_map['no-dep'] ) );
-	}
-
-	public function test_gutenberg_import_map_no_duplicate_dependencies() {
-		gutenberg_register_module( 'foo', '/foo.js', array( 'dep' ) );
-		gutenberg_register_module( 'bar', '/bar.js', array( 'dep' ) );
-		gutenberg_register_module( 'dep', '/dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'bar' );
-
-		$import_map = $this->get_import_map();
-
-		$this->assertEquals( 1, count( $import_map ) );
-		$this->assertEquals( true, str_starts_with( $import_map['dep'], '/dep.js' ) );
-	}
-
-	public function test_gutenberg_import_map_recursive_dependencies() {
-		gutenberg_register_module(
-			'foo',
-			'/foo.js',
-			array(
-				'static-dep',
-				array(
-					'id'   => 'dynamic-dep',
-					'type' => 'dynamic',
-				),
-			)
-		);
-		gutenberg_register_module(
-			'static-dep',
-			'/static-dep.js',
-			array(
-				array(
-					'id'   => 'nested-static-dep',
-					'type' => 'static',
-				),
-				array(
-					'id'   => 'nested-dynamic-dep',
-					'type' => 'dynamic',
-				),
-			)
-		);
-		gutenberg_register_module( 'dynamic-dep', '/dynamic-dep.js' );
-		gutenberg_register_module( 'nested-static-dep', '/nested-static-dep.js' );
-		gutenberg_register_module( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
-		gutenberg_register_module( 'no-dep', '/no-dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-
-		$import_map = $this->get_import_map();
-
-		$this->assertEquals( true, str_starts_with( $import_map['static-dep'], '/static-dep.js' ) );
-		$this->assertEquals( true, str_starts_with( $import_map['dynamic-dep'], '/dynamic-dep.js' ) );
-		$this->assertEquals( true, str_starts_with( $import_map['nested-static-dep'], '/nested-static-dep.js' ) );
-		$this->assertEquals( true, str_starts_with( $import_map['nested-dynamic-dep'], '/nested-dynamic-dep.js' ) );
-		$this->assertEquals( false, isset( $import_map['no-dep'] ) );
-	}
-
-	public function test_gutenberg_enqueue_preloaded_static_dependencies() {
-		gutenberg_register_module(
-			'foo',
-			'/foo.js',
-			array(
-				'static-dep',
-				array(
-					'id'   => 'dynamic-dep',
-					'type' => 'dynamic',
-				),
-			)
-		);
-		gutenberg_register_module(
-			'static-dep',
-			'/static-dep.js',
-			array(
-				array(
-					'id'   => 'nested-static-dep',
-					'type' => 'static',
-				),
-				array(
-					'id'   => 'nested-dynamic-dep',
-					'type' => 'dynamic',
-				),
-			)
-		);
-		gutenberg_register_module( 'dynamic-dep', '/dynamic-dep.js' );
-		gutenberg_register_module( 'nested-static-dep', '/nested-static-dep.js' );
-		gutenberg_register_module( 'nested-dynamic-dep', '/nested-dynamic-dep.js' );
-		gutenberg_register_module( 'no-dep', '/no-dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-
-		$preloaded_modules = $this->get_preloaded_modules();
-
-		$this->assertEquals( 2, count( $preloaded_modules ) );
-		$this->assertEquals( true, str_starts_with( $preloaded_modules['static-dep'], '/static-dep.js' ) );
-		$this->assertEquals( true, str_starts_with( $preloaded_modules['nested-static-dep'], '/nested-static-dep.js' ) );
-		$this->assertEquals( false, isset( $import_map['no-dep'] ) );
-		$this->assertEquals( false, isset( $import_map['dynamic-dep'] ) );
-		$this->assertEquals( false, isset( $import_map['nested-dynamic-dep'] ) );
-	}
-
-	public function test_gutenberg_preloaded_dependencies_filter_enqueued_modules() {
-		gutenberg_register_module(
-			'foo',
-			'/foo.js',
-			array(
-				'dep',
-				'enqueued-dep',
-			)
-		);
-		gutenberg_register_module( 'dep', '/dep.js' );
-		gutenberg_register_module( 'enqueued-dep', '/enqueued-dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'enqueued-dep' ); // Not preloaded.
-
-		$preloaded_modules = $this->get_preloaded_modules();
-
-		$this->assertEquals( 1, count( $preloaded_modules ) );
-		$this->assertEquals( true, isset( $preloaded_modules['dep'] ) );
-		$this->assertEquals( false, isset( $preloaded_modules['enqueued-dep'] ) );
-	}
-
-	public function test_gutenberg_enqueued_modules_with_dependants_add_import_map() {
-		gutenberg_register_module(
-			'foo',
-			'/foo.js',
-			array(
-				'dep',
-				'enqueued-dep',
-			)
-		);
-		gutenberg_register_module( 'dep', '/dep.js' );
-		gutenberg_register_module( 'enqueued-dep', '/enqueued-dep.js' );
-		gutenberg_enqueue_module( 'foo' );
-		gutenberg_enqueue_module( 'enqueued-dep' ); // Also in the import map.
-
-		$import_map = $this->get_import_map();
-
-		$this->assertEquals( 2, count( $import_map ) );
-		$this->assertEquals( true, isset( $import_map['dep'] ) );
-		$this->assertEquals( true, isset( $import_map['enqueued-dep'] ) );
-	}
-
-	public function test_get_version_query_string() {
-		$get_version_query_string = new ReflectionMethod( 'Gutenberg_Modules', 'get_version_query_string' );
-		$get_version_query_string->setAccessible( true );
-
-		$result = $get_version_query_string->invoke( null, '1.0' );
-		$this->assertEquals( '?ver=1.0', $result );
-
-		$result = $get_version_query_string->invoke( null, false );
-		$this->assertEquals( '?ver=' . get_bloginfo( 'version' ), $result );
-
-		$result = $get_version_query_string->invoke( null, null );
-		$this->assertEquals( '', $result );
-	}
-}

From 6e71cc2ac352e78e4a1f9c8f6031a8a23794e314 Mon Sep 17 00:00:00 2001
From: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
Date: Wed, 24 Jan 2024 14:43:26 +0100
Subject: [PATCH 265/296] Fix flaky test on-window, remove duplicate expect
 on-document (#58181)

---
 .../specs/interactivity/directive-on-document.spec.ts |  1 -
 .../specs/interactivity/directive-on-window.spec.ts   | 11 +++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/test/e2e/specs/interactivity/directive-on-document.spec.ts b/test/e2e/specs/interactivity/directive-on-document.spec.ts
index 56ac7e91d3121..02a6ac99d45c4 100644
--- a/test/e2e/specs/interactivity/directive-on-document.spec.ts
+++ b/test/e2e/specs/interactivity/directive-on-document.spec.ts
@@ -46,7 +46,6 @@ test.describe( 'data-wp-on-document', () => {
 		// Add the element back.
 		await visibilityButton.click();
 		await expect( counter ).toHaveText( '1' );
-		await expect( counter ).toHaveText( '1' );
 
 		// Wait until the effects run again.
 		await expect( isEventAttached ).toHaveText( 'yes' );
diff --git a/test/e2e/specs/interactivity/directive-on-window.spec.ts b/test/e2e/specs/interactivity/directive-on-window.spec.ts
index e1d59e09cd35f..dd3a02e0bb400 100644
--- a/test/e2e/specs/interactivity/directive-on-window.spec.ts
+++ b/test/e2e/specs/interactivity/directive-on-window.spec.ts
@@ -29,16 +29,27 @@ test.describe( 'data-wp-on-window', () => {
 		page,
 	} ) => {
 		const counter = page.getByTestId( 'counter' );
+		const isEventAttached = page.getByTestId( 'isEventAttached' );
 		const visibilityButton = page.getByTestId( 'visibility' );
+
+		await expect( counter ).toHaveText( '0' );
+		await expect( isEventAttached ).toHaveText( 'yes' );
 		await page.setViewportSize( { width: 600, height: 600 } );
 		await expect( counter ).toHaveText( '1' );
+
 		// Remove the element.
 		await visibilityButton.click();
+
 		// This resize should not increase the counter.
 		await page.setViewportSize( { width: 300, height: 600 } );
+
 		// Add the element back.
 		await visibilityButton.click();
 		await expect( counter ).toHaveText( '1' );
+
+		// Wait until the effects run again.
+		await expect( isEventAttached ).toHaveText( 'yes' );
+
 		await page.setViewportSize( { width: 200, height: 600 } );
 		await expect( counter ).toHaveText( '2' );
 	} );

From e4647921b361f8fbfec9bd2667d2d542f3b6df9e Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Wed, 24 Jan 2024 10:49:24 -0300
Subject: [PATCH 266/296] Remove WP_Font_Family class that is no longer used.
 (#58184)

---
 .../font-library/class-wp-font-family.php     | 621 ------------------
 lib/load.php                                  |   1 -
 .../font-library/wpFontFamily/__construct.php |  62 --
 .../fonts/font-library/wpFontFamily/base.php  |  75 ---
 .../font-library/wpFontFamily/getData.php     |  94 ---
 .../wpFontFamily/getDataAsJson.php            |  67 --
 .../font-library/wpFontFamily/getFontPost.php |  42 --
 .../wpFontFamily/hasFontFaces.php             |  78 ---
 .../font-library/wpFontFamily/install.php     | 562 ----------------
 .../font-library/wpFontFamily/uninstall.php   | 194 ------
 10 files changed, 1796 deletions(-)
 delete mode 100644 lib/experimental/fonts/font-library/class-wp-font-family.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/base.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/getData.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/install.php
 delete mode 100644 phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php

diff --git a/lib/experimental/fonts/font-library/class-wp-font-family.php b/lib/experimental/fonts/font-library/class-wp-font-family.php
deleted file mode 100644
index f64aebc0c8efa..0000000000000
--- a/lib/experimental/fonts/font-library/class-wp-font-family.php
+++ /dev/null
@@ -1,621 +0,0 @@
-<?php
-/**
- * Font Family class.
- *
- * This file contains the Font Family class definition.
- *
- * @package    WordPress
- * @subpackage Font Library
- * @since      6.5.0
- */
-
-if ( class_exists( 'WP_Font_Family' ) ) {
-	return;
-}
-
-/**
- * Font Library class.
- *
- * @since 6.5.0
- */
-class WP_Font_Family {
-
-	/**
-	 * Font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @var array
-	 */
-	private $data;
-
-	/**
-	 * WP_Font_Family constructor.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_data Font family data.
-	 * @throws Exception If the font family data is missing the slug.
-	 */
-	public function __construct( $font_data = array() ) {
-		if ( empty( $font_data['slug'] ) ) {
-			throw new Exception( 'Font family data is missing the slug.' );
-		}
-		$this->data = $font_data;
-	}
-
-	/**
-	 * Gets the font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array An array in fontFamily theme.json format.
-	 */
-	public function get_data() {
-		return $this->data;
-	}
-
-	/**
-	 * Gets the font family data.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return string fontFamily in theme.json format as stringified JSON.
-	 */
-	public function get_data_as_json() {
-		return wp_json_encode( $this->get_data() );
-	}
-
-	/**
-	 * Checks whether the font family has font faces defined.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool True if the font family has font faces defined, false otherwise.
-	 */
-	public function has_font_faces() {
-		return ! empty( $this->data['fontFace'] ) && is_array( $this->data['fontFace'] );
-	}
-
-	/**
-	 * Removes font family assets.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool True if assets were removed, false otherwise.
-	 */
-	private function remove_font_family_assets() {
-		if ( $this->has_font_faces() ) {
-			foreach ( $this->data['fontFace'] as $font_face ) {
-				$were_assets_removed = $this->delete_font_face_assets( $font_face );
-				if ( false === $were_assets_removed ) {
-					return false;
-				}
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Removes a font family from the database and deletes its assets.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return bool|WP_Error True if the font family was uninstalled, WP_Error otherwise.
-	 */
-	public function uninstall() {
-		$post = $this->get_data_from_post();
-		if ( null === $post ) {
-			return new WP_Error(
-				'font_family_not_found',
-				__( 'The font family could not be found.', 'gutenberg' )
-			);
-		}
-
-		if (
-			! $this->remove_font_family_assets() ||
-			! wp_delete_post( $post->ID, true )
-		) {
-			return new WP_Error(
-				'font_family_not_deleted',
-				__( 'The font family could not be deleted.', 'gutenberg' )
-			);
-		}
-
-		return true;
-	}
-
-	/**
-	 * Deletes a specified font asset file from the fonts directory.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $src The path of the font asset file to delete.
-	 * @return bool Whether the file was deleted.
-	 */
-	private static function delete_asset( $src ) {
-		$filename  = basename( $src );
-		$file_path = path_join( wp_get_font_dir()['path'], $filename );
-
-		wp_delete_file( $file_path );
-
-		return ! file_exists( $file_path );
-	}
-
-	/**
-	 * Deletes all font face asset files associated with a given font face.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face The font face array containing the 'src' attribute
-	 *                         with the file path(s) to be deleted.
-	 * @return bool True if delete was successful, otherwise false.
-	 */
-	private static function delete_font_face_assets( $font_face ) {
-		$sources = (array) $font_face['src'];
-		foreach ( $sources as $src ) {
-			$was_asset_removed = self::delete_asset( $src );
-			if ( ! $was_asset_removed ) {
-				// Bail if any of the assets could not be removed.
-				return false;
-			}
-		}
-		return true;
-	}
-
-	/**
-	 * Gets the overrides for the 'wp_handle_upload' function.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $filename The filename to be used for the uploaded file.
-	 * @return array The overrides for the 'wp_handle_upload' function.
-	 */
-	private function get_upload_overrides( $filename ) {
-		return array(
-			// Arbitrary string to avoid the is_uploaded_file() check applied
-			// when using 'wp_handle_upload'.
-			'action'                   => 'wp_handle_font_upload',
-			// Not testing a form submission.
-			'test_form'                => false,
-			// Seems mime type for files that are not images cannot be tested.
-			// See wp_check_filetype_and_ext().
-			'test_type'                => true,
-			'mimes'                    => WP_Font_Library::get_expected_font_mime_types_per_php_version(),
-			'unique_filename_callback' => static function () use ( $filename ) {
-				// Keep the original filename.
-				return $filename;
-			},
-		);
-	}
-
-	/**
-	 * Downloads a font asset from a specified source URL and saves it to
-	 * the font directory.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param string $url      The source URL of the font asset to be downloaded.
-	 * @param string $filename The filename to save the downloaded font asset as.
-	 * @return string|bool The relative path to the downloaded font asset.
-	 *                     False if the download failed.
-	 */
-	private function download_asset( $url, $filename ) {
-		// Include file with download_url() if function doesn't exist.
-		if ( ! function_exists( 'download_url' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
-		}
-
-		// Downloads the font asset or returns false.
-		$temp_file = download_url( $url );
-		if ( is_wp_error( $temp_file ) ) {
-			return false;
-		}
-
-		$overrides = $this->get_upload_overrides( $filename );
-
-		$file = array(
-			'tmp_name' => $temp_file,
-			'name'     => $filename,
-		);
-
-		$handled_file = wp_handle_upload( $file, $overrides );
-
-		// Cleans the temp file.
-		@unlink( $temp_file );
-
-		if ( ! isset( $handled_file['url'] ) ) {
-			return false;
-		}
-
-		// Returns the relative path to the downloaded font asset to be used as
-		// font face src.
-		return $handled_file['url'];
-	}
-
-	/**
-	 * Moves an uploaded font face asset from temp folder to the fonts directory.
-	 *
-	 * This is used when uploading local fonts.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face Font face to download.
-	 * @param array $file      Uploaded file.
-	 * @return array New font face with all assets downloaded and referenced in
-	 *               the font face definition.
-	 */
-	private function move_font_face_asset( $font_face, $file ) {
-		$new_font_face = $font_face;
-		$filename      = WP_Font_Family_Utils::get_filename_from_font_face(
-			$this->data['slug'],
-			$font_face,
-			$file['name']
-		);
-
-		// Remove the uploaded font asset reference from the font face definition
-		// because it is no longer needed.
-		unset( $new_font_face['uploadedFile'] );
-
-		// Move the uploaded font asset from the temp folder to the fonts directory.
-		if ( ! function_exists( 'wp_handle_upload' ) ) {
-			require_once ABSPATH . 'wp-admin/includes/file.php';
-		}
-
-		$overrides = $this->get_upload_overrides( $filename );
-
-		$handled_file = wp_handle_upload( $file, $overrides );
-
-		if ( isset( $handled_file['url'] ) ) {
-			// If the file was successfully moved, update the font face definition
-			// to reference the new file location.
-			$new_font_face['src'] = $handled_file['url'];
-		}
-
-		return $new_font_face;
-	}
-
-	/**
-	 * Sanitizes the font family data using WP_Theme_JSON.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return array A sanitized font family definition.
-	 */
-	private function sanitize() {
-		// Creates the structure of theme.json array with the new fonts.
-		$fonts_json = array(
-			'version'  => '2',
-			'settings' => array(
-				'typography' => array(
-					'fontFamilies' => array(
-						'custom' => array(
-							$this->data,
-						),
-					),
-				),
-			),
-		);
-
-		// Creates a new WP_Theme_JSON object with the new fonts to
-		// leverage sanitization and validation.
-		$fonts_json     = WP_Theme_JSON_Gutenberg::remove_insecure_properties( $fonts_json );
-		$theme_json     = new WP_Theme_JSON_Gutenberg( $fonts_json );
-		$theme_data     = $theme_json->get_data();
-		$sanitized_font = ! empty( $theme_data['settings']['typography']['fontFamilies'] )
-			? $theme_data['settings']['typography']['fontFamilies'][0]
-			: array();
-
-		$sanitized_font['slug']       = _wp_to_kebab_case( $sanitized_font['slug'] );
-		$sanitized_font['fontFamily'] = WP_Font_Family_Utils::format_font_family( $sanitized_font['fontFamily'] );
-		$this->data                   = $sanitized_font;
-		return $this->data;
-	}
-
-	/**
-	 * Downloads font face assets.
-	 *
-	 * Downloads the font face asset(s) associated with a font face. It works with
-	 * both single source URLs and arrays of multiple source URLs.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $font_face The font face array containing the 'src' attribute
-	 *                         with the source URL(s) of the assets.
-	 * @return array The modified font face array with the new source URL(s) to
-	 *               the downloaded assets.
-	 */
-	private function download_font_face_assets( $font_face ) {
-		$new_font_face        = $font_face;
-		$sources              = (array) $font_face['downloadFromUrl'];
-		$new_font_face['src'] = array();
-		$index                = 0;
-
-		foreach ( $sources as $src ) {
-			$suffix   = $index++ > 0 ? $index : '';
-			$filename = WP_Font_Family_Utils::get_filename_from_font_face(
-				$this->data['slug'],
-				$font_face,
-				$src,
-				$suffix
-			);
-			$new_src  = $this->download_asset( $src, $filename );
-			if ( $new_src ) {
-				$new_font_face['src'][] = $new_src;
-			}
-		}
-
-		if ( count( $new_font_face['src'] ) === 1 ) {
-			$new_font_face['src'] = $new_font_face['src'][0];
-		}
-
-		// Remove the download url reference from the font face definition
-		// because it is no longer needed.
-		unset( $new_font_face['downloadFromUrl'] );
-
-		return $new_font_face;
-	}
-
-
-	/**
-	 * Downloads font face assets if the font family is a Google font,
-	 * or moves them if it is a local font.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $files An array of files to be installed.
-	 * @return bool True if the font faces were downloaded or moved successfully, false otherwise.
-	 */
-	private function download_or_move_font_faces( $files ) {
-		if ( ! $this->has_font_faces() ) {
-			return true;
-		}
-
-		$new_font_faces = array();
-		foreach ( $this->data['fontFace'] as $font_face ) {
-			// If the fonts are not meant to be downloaded or uploaded
-			// (for example to install fonts that use a remote url).
-			$new_font_face = $font_face;
-
-			$font_face_is_repeated = false;
-
-			// If the font face has the same fontStyle and fontWeight as an existing, continue.
-			foreach ( $new_font_faces as $font_to_compare ) {
-				if ( $new_font_face['fontStyle'] === $font_to_compare['fontStyle'] &&
-					$new_font_face['fontWeight'] === $font_to_compare['fontWeight'] ) {
-					$font_face_is_repeated = true;
-				}
-			}
-
-			if ( $font_face_is_repeated ) {
-				continue;
-			}
-
-			// If the font face requires the use of the filesystem, create the fonts dir if it doesn't exist.
-			if ( ! empty( $font_face['downloadFromUrl'] ) && ! empty( $font_face['uploadedFile'] ) ) {
-				wp_mkdir_p( wp_get_font_dir()['path'] );
-			}
-
-			// If installing google fonts, download the font face assets.
-			if ( ! empty( $font_face['downloadFromUrl'] ) ) {
-				$new_font_face = $this->download_font_face_assets( $new_font_face );
-			}
-
-			// If installing local fonts, move the font face assets from
-			// the temp folder to the wp fonts directory.
-			if ( ! empty( $font_face['uploadedFile'] ) && ! empty( $files ) ) {
-				$new_font_face = $this->move_font_face_asset(
-					$new_font_face,
-					$files[ $new_font_face['uploadedFile'] ]
-				);
-			}
-
-			/*
-			 * If the font face assets were successfully downloaded, add the font face
-			 * to the new font. Font faces with failed downloads are not added to the
-			 * new font.
-			 */
-			if ( ! empty( $new_font_face['src'] ) ) {
-				$new_font_faces[] = $new_font_face;
-			}
-		}
-
-		if ( ! empty( $new_font_faces ) ) {
-			$this->data['fontFace'] = $new_font_faces;
-			return true;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Gets the post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_Post|null The post for this font family object or
-	 *                      null if the post does not exist.
-	 */
-	public function get_font_post() {
-		$args = array(
-			'post_type'      => 'wp_font_family',
-			'post_name'      => $this->data['slug'],
-			'name'           => $this->data['slug'],
-			'posts_per_page' => 1,
-		);
-
-		$posts_query = new WP_Query( $args );
-
-		if ( $posts_query->have_posts() ) {
-			return $posts_query->posts[0];
-		}
-
-		return null;
-	}
-
-	/**
-	 * Gets the data for this object from the database and
-	 * sets it to the data property.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return WP_Post|null The post for this font family object or
-	 *                      null if the post does not exist.
-	 */
-	private function get_data_from_post() {
-		$post = $this->get_font_post();
-		if ( $post ) {
-			$this->data = json_decode( $post->post_content, true );
-			return $post;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Creates a post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return int|WP_Error Post ID if the post was created, WP_Error otherwise.
-	 */
-	private function create_font_post() {
-		$post = array(
-			'post_title'   => $this->data['name'],
-			'post_name'    => $this->data['slug'],
-			'post_type'    => 'wp_font_family',
-			'post_content' => $this->get_data_as_json(),
-			'post_status'  => 'publish',
-		);
-
-		$post_id = wp_insert_post( $post );
-		if ( 0 === $post_id || is_wp_error( $post_id ) ) {
-			return new WP_Error(
-				'font_post_creation_failed',
-				__( 'Font post creation failed', 'gutenberg' )
-			);
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Gets the font faces that are in both the existing and incoming font families.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $existing The existing font faces.
-	 * @param array $incoming The incoming font faces.
-	 * @return array The font faces that are in both the existing and incoming font families.
-	 */
-	private function get_intersecting_font_faces( $existing, $incoming ) {
-		$intersecting = array();
-		foreach ( $existing as $existing_face ) {
-			foreach ( $incoming as $incoming_face ) {
-				if ( $incoming_face['fontStyle'] === $existing_face['fontStyle'] &&
-					$incoming_face['fontWeight'] === $existing_face['fontWeight'] &&
-					$incoming_face['src'] !== $existing_face['src'] ) {
-					$intersecting[] = $existing_face;
-				}
-			}
-		}
-		return $intersecting;
-	}
-
-	/**
-	 * Updates a post for a font family.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param WP_Post $post The post to update.
-	 * @return int|WP_Error Post ID if the update was successful, WP_Error otherwise.
-	 */
-	private function update_font_post( $post ) {
-		$post_font_data = json_decode( $post->post_content, true );
-		$new_data       = WP_Font_Family_Utils::merge_fonts_data( $post_font_data, $this->data );
-		if ( isset( $post_font_data['fontFace'] ) && ! empty( $post_font_data['fontFace'] ) ) {
-			$intersecting = $this->get_intersecting_font_faces( $post_font_data['fontFace'], $new_data['fontFace'] );
-		}
-
-		if ( isset( $intersecting ) && ! empty( $intersecting ) ) {
-			$serialized_font_faces   = array_map( 'serialize', $new_data['fontFace'] );
-			$serialized_intersecting = array_map( 'serialize', $intersecting );
-
-			$diff = array_diff( $serialized_font_faces, $serialized_intersecting );
-
-			$new_data['fontFace'] = array_values( array_map( 'unserialize', $diff ) );
-
-			foreach ( $intersecting as $intersect ) {
-				$this->delete_font_face_assets( $intersect );
-			}
-		}
-		$this->data = $new_data;
-
-		$post = array(
-			'ID'           => $post->ID,
-			'post_content' => $this->get_data_as_json(),
-		);
-
-		$post_id = wp_update_post( $post );
-
-		if ( 0 === $post_id || is_wp_error( $post_id ) ) {
-			return new WP_Error(
-				'font_post_update_failed',
-				__( 'Font post update failed', 'gutenberg' )
-			);
-		}
-
-		return $post_id;
-	}
-
-	/**
-	 * Creates a post for a font in the Font Library if it doesn't exist,
-	 * or updates it if it does.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @return int|WP_Error Post id if the post was created or updated successfully,
-	 *                      WP_Error otherwise.
-	 */
-	private function create_or_update_font_post() {
-		$this->sanitize();
-
-		$post = $this->get_font_post();
-		if ( $post ) {
-			return $this->update_font_post( $post );
-		}
-
-		return $this->create_font_post();
-	}
-
-	/**
-	 * Installs the font family into the library.
-	 *
-	 * @since 6.5.0
-	 *
-	 * @param array $files Optional. An array of files to be installed. Default null.
-	 * @return array|WP_Error An array of font family data on success, WP_Error otherwise.
-	 */
-	public function install( $files = null ) {
-		add_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-		add_filter( 'upload_dir', 'wp_get_font_dir' );
-		$were_assets_written = $this->download_or_move_font_faces( $files );
-		remove_filter( 'upload_dir', 'wp_get_font_dir' );
-		remove_filter( 'upload_mimes', array( 'WP_Font_Library', 'set_allowed_mime_types' ) );
-
-		if ( ! $were_assets_written ) {
-			return new WP_Error(
-				'font_face_download_failed',
-				__( 'The font face assets could not be written.', 'gutenberg' )
-			);
-		}
-
-		$post_id = $this->create_or_update_font_post();
-
-		if ( is_wp_error( $post_id ) ) {
-			return $post_id;
-		}
-
-		return $this->get_data();
-	}
-}
diff --git a/lib/load.php b/lib/load.php
index 73e6824ab0c9e..37cea9bb46556 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -144,7 +144,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-collection.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-library.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family-utils.php';
-require __DIR__ . '/experimental/fonts/font-library/class-wp-font-family.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-families-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-faces-controller.php';
 require __DIR__ . '/experimental/fonts/font-library/class-wp-rest-font-collections-controller.php';
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php b/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
deleted file mode 100644
index cee0628dad310..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/__construct.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::__construct().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::__construct
- */
-class Tests_Fonts_WpFontFamily_Construct extends WP_UnitTestCase {
-
-	public function test_should_initialize_data() {
-		$property = new ReflectionProperty( WP_Font_Family::class, 'data' );
-		$property->setAccessible( true );
-
-		$font_data   = array(
-			'fontFamily' => 'Piazzolla',
-			'name'       => 'Piazzolla',
-			'slug'       => 'piazzolla',
-		);
-		$font_family = new WP_Font_Family( $font_data );
-
-		$actual = $property->getValue( $font_family );
-		$property->setAccessible( false );
-
-		$this->assertSame( $font_data, $actual );
-	}
-
-	/**
-	 * @dataProvider data_should_do_it_wrong
-	 *
-	 * @param mixed $font_data Data to test.
-	 */
-	public function test_should_do_it_wrong( $font_data ) {
-		$this->expectException( 'Exception' );
-		$this->expectExceptionMessage( 'Font family data is missing the slug.' );
-
-		new WP_Font_Family( $font_data );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array
-	 */
-	public function data_should_do_it_wrong() {
-		return array(
-			'no slug'                  => array(
-				array(
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-				),
-			),
-			'empty array'              => array( array() ),
-			'boolean instead of array' => array( false ),
-			'null instead of array'    => array( null ),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/base.php b/phpunit/tests/fonts/font-library/wpFontFamily/base.php
deleted file mode 100644
index 3f6ff153fa12f..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/base.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-/**
- * Test Case for WP_Font_Family tests.
- *
- * @package WordPress
- * @subpackage Font Library
- */
-abstract class WP_Font_Family_UnitTestCase extends WP_UnitTestCase {
-
-	/**
-	 * Fonts directory (in uploads).
-	 *
-	 * @var string
-	 */
-	protected static $fonts_dir;
-
-	/**
-	 * Merriweather test data shared by tests.
-	 *
-	 * @var array
-	 */
-	protected $merriweather = array(
-		'font_data'     => array(),
-		'files_data'    => array(),
-		'font_filename' => '',
-	);
-
-	public static function set_up_before_class() {
-		parent::set_up_before_class();
-
-		static::$fonts_dir = wp_get_font_dir()['path'];
-		wp_mkdir_p( static::$fonts_dir );
-	}
-
-	public function set_up() {
-		parent::set_up();
-
-		$merriweather_tmp_name = wp_tempnam( 'Merriweather-' );
-		copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $merriweather_tmp_name );
-		$this->merriweather = array(
-			'font_data'     => array(
-				'name'       => 'Merriweather',
-				'slug'       => 'merriweather',
-				'fontFamily' => 'Merriweather',
-				'fontFace'   => array(
-					array(
-						'fontFamily'   => 'Merriweather',
-						'fontStyle'    => 'normal',
-						'fontWeight'   => '400',
-						'uploadedFile' => 'files0',
-					),
-				),
-			),
-			'files_data'    => array(
-				'files0' => array(
-					'name'     => 'merriweather.ttf',
-					'type'     => 'font/ttf',
-					'tmp_name' => $merriweather_tmp_name,
-					'error'    => 0,
-					'size'     => 123,
-				),
-			),
-			'font_filename' => path_join( static::$fonts_dir, 'merriweather_normal_400.ttf' ),
-		);
-	}
-
-	public function tear_down() {
-		// Clean up the /fonts directory.
-		foreach ( $this->files_in_dir( static::$fonts_dir ) as $file ) {
-			@unlink( $file );
-		}
-
-		parent::tear_down();
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getData.php b/phpunit/tests/fonts/font-library/wpFontFamily/getData.php
deleted file mode 100644
index 2de88ad3aae37..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getData.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_data().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_data
- */
-class Tests_Fonts_WpFontLibrary_GetData extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_get_data
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_get_data( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertSame( $font_data, $font->get_data() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_data() {
-		return array(
-			'with one google font face to be downloaded' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-			),
-			'with one google font face to not be downloaded' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-							'src'        => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-			),
-			'without font faces'                         => array(
-				array(
-					'name'       => 'Arial',
-					'slug'       => 'arial',
-					'fontFamily' => 'Arial',
-					'fontFace'   => array(),
-				),
-			),
-			'with local files'                           => array(
-				array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files1',
-						),
-					),
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php b/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php
deleted file mode 100644
index b18b2d0b4f4b3..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getDataAsJson.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_data_as_json().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_data_as_json
- */
-class Tests_Fonts_WpFontFamily_GetDataAsJson extends WP_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_get_data_as_json
-	 *
-	 * @param array  $font_data Font family data in theme.json format.
-	 * @param string $expected  Expected result.
-	 */
-	public function test_should_get_data_as_json( $font_data, $expected ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertSame( $expected, $font->get_data_as_json() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_get_data_as_json() {
-		return array(
-			'piazzolla'  => array(
-				'font_data' => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'src'        => 'https://example.com/fonts/piazzolla_italic_400.ttf',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-				'expected'  => '{"slug":"piazzolla","fontFamily":"Piazzolla","name":"Piazzolla","fontFace":[{"fontFamily":"Piazzolla","src":"https:\/\/example.com\/fonts\/piazzolla_italic_400.ttf","fontStyle":"italic","fontWeight":"400"}]}',
-			),
-			'piazzolla2' => array(
-				'font_data' => array(
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'name'       => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'src'        => 'https://example.com/fonts/piazzolla_italic_400.ttf',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-				'expected'  => '{"slug":"piazzolla","fontFamily":"Piazzolla","name":"Piazzolla","fontFace":[{"fontFamily":"Piazzolla","src":"https:\/\/example.com\/fonts\/piazzolla_italic_400.ttf","fontStyle":"italic","fontWeight":"400"}]}',
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php b/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php
deleted file mode 100644
index eb42cc3ee0898..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/getFontPost.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::get_font_post().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::get_font_post
- */
-class Tests_Fonts_WpFontFamily_GetFontPost extends WP_Font_Family_UnitTestCase {
-
-	public function test_should_return_post() {
-		// Set up the post.
-		$post    = array(
-			'post_title'   => $this->merriweather['font_data']['name'],
-			'post_name'    => $this->merriweather['font_data']['slug'],
-			'post_type'    => 'wp_font_family',
-			'post_content' => '',
-			'post_status'  => 'publish',
-		);
-		$post_id = wp_insert_post( $post );
-		$font    = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		// Test.
-		$actual = $font->get_font_post();
-		$this->assertInstanceOf( WP_Post::class, $actual, 'Font post should exist' );
-		$this->assertSame( $post_id, $actual->ID, 'Font post ID should match' );
-	}
-
-	public function test_should_return_null_when_post_does_not_exist() {
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		$this->assertNull( $font->get_font_post() );
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php b/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php
deleted file mode 100644
index 0c153d62aa79d..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/hasFontFaces.php
+++ /dev/null
@@ -1,78 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::has_font_faces().
- *
- * @package WordPress
- * @subpackage Font Library
- *
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::has_font_faces
- */
-class Tests_Fonts_WpFontFamily_HasFontFaces extends WP_UnitTestCase {
-
-	public function test_should_return_true_when_check_succeeds() {
-		$font_data = array(
-			'slug'     => 'piazzolla',
-			'fontFace' => array(
-				array(
-					'fontFamily' => 'Piazzolla',
-					'fontStyle'  => 'italic',
-					'fontWeight' => '400',
-				),
-			),
-		);
-		$font      = new WP_Font_Family( $font_data );
-		$this->assertTrue( $font->has_font_faces() );
-	}
-
-	/**
-	 * @dataProvider data_should_return_false_when_check_fails
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_return_false_when_check_fails( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-		$this->assertFalse( $font->has_font_faces() );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_return_false_when_check_fails() {
-		return array(
-			'wrong fontFace key' => array(
-				array(
-					'slug'      => 'piazzolla',
-					'fontFaces' => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-			),
-			'without font faces' => array(
-				array(
-					'slug' => 'piazzolla',
-				),
-			),
-			'empty array'        => array(
-				array(
-					'slug'     => 'piazzolla',
-					'fontFace' => array(),
-				),
-			),
-			'null'               => array(
-				array(
-					'slug'     => 'piazzolla',
-					'fontFace' => null,
-				),
-			),
-		);
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/install.php b/phpunit/tests/fonts/font-library/wpFontFamily/install.php
deleted file mode 100644
index 79cb6ac3ba2ba..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/install.php
+++ /dev/null
@@ -1,562 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::install().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::install
- */
-class Tests_Fonts_WpFontFamily_Install extends WP_Font_Family_UnitTestCase {
-
-	/**
-	 * @dataProvider data_should_not_download_when_no_fontface
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 */
-	public function test_should_not_download_when_no_fontface( $font_data ) {
-		$font = new WP_Font_Family( $font_data );
-
-		// Test.
-		$font->install();
-		$this->assertEmpty( $this->files_in_dir( static::$fonts_dir ), 'Font directory should be empty' );
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist after install' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_not_download_when_no_fontface() {
-		return array(
-			'wrong fontFace key' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFaces'  => array(
-						array(
-							'fontFamily' => 'Piazzolla',
-							'fontStyle'  => 'italic',
-							'fontWeight' => '400',
-						),
-					),
-				),
-			),
-			'without font faces' => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-				),
-			),
-			'empty array'        => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(),
-				),
-			),
-			'null'               => array(
-				array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => null,
-				),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_download_fontfaces
-	 *
-	 * @param array $font_data Font family data in theme.json format.
-	 * @param array $expected  Expected font filename(s).
-	 */
-	public function test_should_download_fontfaces_and_create_post( $font_data, array $expected ) {
-		// Pre-checks to ensure starting conditions.
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileDoesNotExist( $font_file, "Font file [{$font_file}] should not exist in the fonts/ directory after installing" );
-		}
-		$font = new WP_Font_Family( $font_data );
-
-		// Test.
-		$font->install();
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist after install' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_download_fontfaces() {
-		return array(
-			'1 font face to download'  => array(
-				'font_data' => array(
-					'name'       => 'Piazzolla',
-					'slug'       => 'piazzolla',
-					'fontFamily' => 'Piazzolla',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Piazzolla',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/piazzolla/v33/N0b72SlTPu5rIkWIZjVgI-TckS03oGpPETyEJ88Rbvi0_TzOzKcQhZqx3gX9BRy5m5M.ttf',
-						),
-					),
-				),
-				'expected'  => array( 'piazzolla_italic_400.ttf' ),
-			),
-			'2 font faces to download' => array(
-				'font_data' => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'      => 'Lato',
-							'fontStyle'       => 'normal',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHvxk6XweuBCY.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/lato/v24/S6uyw4BMUTPHvxk6XweuBCY.ttf',
-						),
-						array(
-							'fontFamily'      => 'Lato',
-							'fontStyle'       => 'italic',
-							'fontWeight'      => '400',
-							'src'             => 'http://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxswWyWrFCbw7A.ttf',
-							'downloadFromUrl' => 'http://fonts.gstatic.com/s/lato/v24/S6u8w4BMUTPHjxswWyWrFCbw7A.ttf',
-						),
-					),
-				),
-				'expected'  => array( 'lato_normal_400.ttf', 'lato_italic_400.ttf' ),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_move_local_fontfaces
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 * @param array $expected   Expected font filename(s).
-	 */
-	public function test_should_move_local_fontfaces( $font_data, array $files_data, array $expected ) {
-		// Set up the temporary files.
-		foreach ( $files_data as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			} elseif ( 'font/woff2' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/DMSans.woff2', $file['tmp_name'] );
-			} elseif ( 'application/vnd.ms-opentype' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/gilbert-color.otf', $file['tmp_name'] );
-			}
-		}
-
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_move_local_fontfaces() {
-		return array(
-			// ttf font type.
-			'1 local font'     => array(
-				'font_data'  => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'inter_italic_900.ttf' ),
-			),
-			'2 local fonts'    => array(
-				'font_data'  => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data' => array(
-					'files1' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-			// woff font type.
-			'woff local font'  => array(
-				'font_data'  => array(
-					'name'       => 'Cooper Hewitt',
-					'slug'       => 'cooper-hewitt',
-					'fontFamily' => 'Cooper Hewitt',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Cooper Hewitt',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'cooper-hewitt.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Cooper-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'cooper-hewitt_italic_900.woff' ),
-			),
-			// woff2 font type.
-			'woff2 local font' => array(
-				'font_data'  => array(
-					'name'       => 'DM Sans',
-					'slug'       => 'dm-sans',
-					'fontFamily' => 'DM Sans',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'DM Sans',
-							'fontStyle'    => 'regular',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'DMSans.woff2',
-						'type'     => 'font/woff2',
-						'tmp_name' => wp_tempnam( 'DMSans-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'dm-sans_regular_500.woff2' ),
-			),
-			// otf font type.
-			'otf local font'   => array(
-				'font_data'  => array(
-					'name'       => 'Gilbert Color',
-					'slug'       => 'gilbert-color',
-					'fontFamily' => 'Gilbert Color',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Gilbert Color',
-							'fontStyle'    => 'regular',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'gilbert-color.otf',
-						'type'     => 'application/vnd.ms-opentype',
-						'tmp_name' => wp_tempnam( 'Gilbert-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'gilbert-color_regular_500.otf' ),
-			),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_not_install_duplicate_fontfaces
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 * @param array $expected   Expected font filename(s).
-	 */
-	public function test_should_not_install_duplicate_fontfaces( $font_data, array $files_data, array $expected ) {
-		// Set up the temporary files.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		$this->assertCount( count( $expected ), $this->files_in_dir( static::$fonts_dir ), 'Font directory should contain the same number of files as expected' );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_not_install_duplicate_fontfaces() {
-		return array(
-			'single unique font face'    => array(
-				'font_data'  => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files1',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'inter1.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'inter_italic_900.ttf' ),
-			),
-			'multiple unique font faces' => array(
-				'font_data'  => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files0',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data' => array(
-					'files0' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files1' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.woff',
-						'type'     => 'font/woff',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'expected'   => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-		);
-	}
-
-	public function test_should_overwrite_fontface_with_different_extension() {
-		$font_data_initial    = array(
-			'name'       => 'Inter',
-			'slug'       => 'inter',
-			'fontFamily' => 'Inter',
-			'fontFace'   => array(
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '500',
-					'uploadedFile' => 'files0',
-				),
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '900',
-					'uploadedFile' => 'files1',
-				),
-			),
-		);
-		$files_data_initial   = array(
-			'files0' => array(
-				'name'     => 'inter1.ttf',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-			'files1' => array(
-				'name'     => 'inter1.woff',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-		);
-		$font_data_overwrite  = array(
-			'name'       => 'Inter',
-			'slug'       => 'inter',
-			'fontFamily' => 'Inter',
-			'fontFace'   => array(
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '500',
-					'uploadedFile' => 'files0',
-				),
-				array(
-					'fontFamily'   => 'Inter',
-					'fontStyle'    => 'italic',
-					'fontWeight'   => '900',
-					'uploadedFile' => 'files1',
-				),
-			),
-		);
-		$files_data_overwrite = array(
-			'files0' => array(
-				'name'     => 'inter1.woff',
-				'type'     => 'font/woff',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-			'files1' => array(
-				'name'     => 'inter1.ttf',
-				'type'     => 'font/ttf',
-				'tmp_name' => wp_tempnam( 'Inter-' ),
-				'error'    => 0,
-				'size'     => 123,
-			),
-		);
-
-		$expected = array( 'inter_italic_500.woff', 'inter_italic_900.ttf' );
-
-		// Set up the temporary files.
-		foreach ( $files_data_initial as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			}
-		}
-		foreach ( $files_data_overwrite as $file ) {
-			if ( 'font/ttf' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-			} elseif ( 'font/woff' === $file['type'] ) {
-				copy( __DIR__ . '/../../../data/fonts/cooper-hewitt.woff', $file['tmp_name'] );
-			}
-		}
-
-		$font = new WP_Font_Family( $font_data_initial );
-		$font->install( $files_data_initial );
-
-		$font = new WP_Font_Family( $font_data_overwrite );
-		$font->install( $files_data_overwrite );
-
-		$this->assertCount( count( $expected ), $this->files_in_dir( static::$fonts_dir ), 'Font directory should contain the same number of files as expected' );
-
-		foreach ( $expected as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileExists( $font_file, "Font file [{$font_file}] should exists in the fonts/ directory after installing" );
-		}
-	}
-}
diff --git a/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php b/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php
deleted file mode 100644
index c878dd00fdb5c..0000000000000
--- a/phpunit/tests/fonts/font-library/wpFontFamily/uninstall.php
+++ /dev/null
@@ -1,194 +0,0 @@
-<?php
-/**
- * Test WP_Font_Family::uninstall().
- *
- * @package WordPress
- * @subpackage Font Library
- */
-
-require_once __DIR__ . '/base.php';
-
-/**
- * @group fonts
- * @group font-library
- *
- * @covers WP_Font_Family::uninstall
- */
-class Tests_Fonts_WpFontFamily_Uninstall extends WP_Font_Family_UnitTestCase {
-
-	public function test_should_return_error_when_font_not_found() {
-		// Set up.
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-
-		// Test.
-		$actual = $font->uninstall();
-		$this->assertWPError( $actual, 'WP_Error should have been returned' );
-		$this->assertSame(
-			array( 'font_family_not_found' => array( 'The font family could not be found.' ) ),
-			$actual->errors,
-			'WP_Error should have "fonts_must_have_same_slug" error'
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_return_error_when_not_able_to_uninstall
-	 *
-	 * @param string $failure_to_mock The filter name to mock the failure.
-	 */
-	public function test_should_return_error_when_not_able_to_uninstall( $failure_to_mock ) {
-		// Set up the font.
-		add_filter( $failure_to_mock, '__return_empty_string' );
-		$font = new WP_Font_Family( $this->merriweather['font_data'] );
-		$font->install( $this->merriweather['files_data'] );
-
-		// Test.
-		$actual = $font->uninstall();
-		$this->assertWPError( $actual, 'WP_Error should be returned' );
-		$this->assertSame(
-			array( 'font_family_not_deleted' => array( 'The font family could not be deleted.' ) ),
-			$actual->errors,
-			'WP_Error should have "font_family_not_deleted" error'
-		);
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return string[][]
-	 */
-	public function data_should_return_error_when_not_able_to_uninstall() {
-		return array(
-			'When delete file fails' => array( 'wp_delete_file' ),
-			'when delete post fails' => array( 'pre_delete_post' ),
-		);
-	}
-
-	/**
-	 * @dataProvider data_should_uninstall
-	 *
-	 * @param array $font_data  Font family data in theme.json format.
-	 * @param array $files_data Files data in $_FILES format.
-	 */
-	public function test_should_uninstall( $font_data, array $files_data ) {
-		// Set up.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		// Pre-checks to ensure the starting point is as expected.
-		$this->assertInstanceOf( WP_Post::class, $font->get_font_post(), 'Font post should exist' );
-		$this->assertNotEmpty( $this->files_in_dir( static::$fonts_dir ), 'Fonts should be installed' );
-
-		// Uninstall.
-		$this->assertTrue( $font->uninstall() );
-
-		// Test the post and font file(s) were uninstalled.
-		$this->assertNull( $font->get_font_post(), 'Font post should be deleted after uninstall' );
-		$this->assertEmpty( $this->files_in_dir( static::$fonts_dir ), 'Fonts should be uninstalled' );
-	}
-
-	/**
-	 * @dataProvider data_should_uninstall
-	 *
-	 * @param array $font_data          Font family data in theme.json format.
-	 * @param array $files_data         Files data in $_FILES format.
-	 * @param array $files_to_uninstall Files to uninstall.
-	 */
-	public function test_should_uninstall_only_its_font_family( $font_data, array $files_data, array $files_to_uninstall ) {
-		// Set up a different font family instance. This font family should not be uninstalled.
-		$merriweather = new WP_Font_Family( $this->merriweather['font_data'] );
-		$merriweather->install( $this->merriweather['files_data'] );
-
-		// Set up the font family to be uninstalled.
-		foreach ( $files_data as $file ) {
-			copy( __DIR__ . '/../../../data/fonts/Merriweather.ttf', $file['tmp_name'] );
-		}
-		$font = new WP_Font_Family( $font_data );
-		$font->install( $files_data );
-
-		$this->assertTrue( $font->uninstall() );
-
-		// Check that the files were uninstalled.
-		foreach ( $files_to_uninstall as $font_file ) {
-			$font_file = path_join( static::$fonts_dir, $font_file );
-			$this->assertFileDoesNotExist( $font_file, "Font file [{$font_file}] should not exists in the uploads/fonts/ directory after uninstalling" );
-		}
-		// Check that the Merriweather file was not uninstalled.
-		$this->assertFileExists( $this->merriweather['font_filename'], 'The other font family [Merriweather] should not have been uninstalled.' );
-	}
-
-	/**
-	 * Data provider.
-	 *
-	 * @return array[]
-	 */
-	public function data_should_uninstall() {
-		return array(
-			'1 local font'  => array(
-				'font_data'          => array(
-					'name'       => 'Inter',
-					'slug'       => 'inter',
-					'fontFamily' => 'Inter',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Inter',
-							'fontStyle'    => 'italic',
-							'fontWeight'   => '900',
-							'uploadedFile' => 'files0',
-						),
-					),
-				),
-				'files_data'         => array(
-					'files0' => array(
-						'name'     => 'inter1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Inter-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'files_to_uninstall' => array( 'inter_italic_900.ttf' ),
-			),
-			'2 local fonts' => array(
-				'font_data'          => array(
-					'name'       => 'Lato',
-					'slug'       => 'lato',
-					'fontFamily' => 'Lato',
-					'fontFace'   => array(
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '400',
-							'uploadedFile' => 'files1',
-						),
-						array(
-							'fontFamily'   => 'Lato',
-							'fontStyle'    => 'normal',
-							'fontWeight'   => '500',
-							'uploadedFile' => 'files2',
-						),
-					),
-				),
-				'files_data'         => array(
-					'files1' => array(
-						'name'     => 'lato1.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-					'files2' => array(
-						'name'     => 'lato2.ttf',
-						'type'     => 'font/ttf',
-						'tmp_name' => wp_tempnam( 'Lato-' ),
-						'error'    => 0,
-						'size'     => 123,
-					),
-				),
-				'files_to_uninstall' => array( 'lato_normal_400.ttf', 'lato_normal_500.ttf' ),
-			),
-		);
-	}
-}

From f1f7afc6bee6a9cc30712a4ac6ad8e2766b62b26 Mon Sep 17 00:00:00 2001
From: Pascal Birchler <pascalb@google.com>
Date: Wed, 24 Jan 2024 14:56:11 +0100
Subject: [PATCH 267/296] core-js: only polyfill stable features (#57674)

---
 package-lock.json                          | 346 ++++++++++-----------
 package.json                               |   4 +-
 packages/babel-preset-default/bin/index.js |   8 +-
 3 files changed, 176 insertions(+), 182 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a0de5396efd60..48abf7ff587d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -165,14 +165,14 @@
 				"babel-plugin-react-native-platform-specific-extensions": "1.1.1",
 				"babel-plugin-transform-remove-console": "6.9.4",
 				"benchmark": "2.1.4",
-				"browserslist": "4.21.10",
+				"browserslist": "4.22.2",
 				"caniuse-lite": "1.0.30001579",
 				"chalk": "4.1.1",
 				"change-case": "4.1.2",
 				"commander": "9.2.0",
 				"concurrently": "3.5.0",
 				"copy-webpack-plugin": "10.2.0",
-				"core-js-builder": "3.31.0",
+				"core-js-builder": "3.35.1",
 				"cross-env": "3.2.4",
 				"css-loader": "6.2.0",
 				"cssnano": "6.0.1",
@@ -19623,28 +19623,22 @@
 			"dev": true
 		},
 		"node_modules/assert": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-			"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+			"integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
 			"dev": true,
 			"dependencies": {
-				"object-assign": "^4.1.1",
-				"util": "0.10.3"
+				"object.assign": "^4.1.4",
+				"util": "^0.10.4"
 			}
 		},
-		"node_modules/assert/node_modules/inherits": {
-			"version": "2.0.1",
-			"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-			"integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-			"dev": true
-		},
 		"node_modules/assert/node_modules/util": {
-			"version": "0.10.3",
-			"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-			"integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+			"version": "0.10.4",
+			"resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+			"integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
 			"dev": true,
 			"dependencies": {
-				"inherits": "2.0.1"
+				"inherits": "2.0.3"
 			}
 		},
 		"node_modules/assign-symbols": {
@@ -19686,10 +19680,16 @@
 			"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
 		},
 		"node_modules/async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+			"integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
 			"dev": true,
+			"funding": [
+				{
+					"type": "individual",
+					"url": "https://paulmillr.com/funding/"
+				}
+			],
 			"optional": true
 		},
 		"node_modules/async-limiter": {
@@ -20801,20 +20801,23 @@
 			}
 		},
 		"node_modules/browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+			"integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
 			"dev": true,
 			"dependencies": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
+				"elliptic": "^6.5.4",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"parse-asn1": "^5.1.6",
+				"readable-stream": "^3.6.2",
+				"safe-buffer": "^5.2.1"
+			},
+			"engines": {
+				"node": ">= 4"
 			}
 		},
 		"node_modules/browserify-sign/node_modules/inherits": {
@@ -20867,9 +20870,9 @@
 			}
 		},
 		"node_modules/browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+			"version": "4.22.2",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+			"integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -20885,10 +20888,10 @@
 				}
 			],
 			"dependencies": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
+				"caniuse-lite": "^1.0.30001565",
+				"electron-to-chromium": "^1.4.601",
+				"node-releases": "^2.0.14",
+				"update-browserslist-db": "^1.0.13"
 			},
 			"bin": {
 				"browserslist": "cli.js"
@@ -23114,9 +23117,9 @@
 			}
 		},
 		"node_modules/core-js": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-			"integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ==",
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz",
+			"integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw==",
 			"hasInstallScript": true,
 			"funding": {
 				"type": "opencollective",
@@ -23124,15 +23127,15 @@
 			}
 		},
 		"node_modules/core-js-builder": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz",
-			"integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==",
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.35.1.tgz",
+			"integrity": "sha512-CfIvg+khWyS7ElbRXhuQH9QVUQxRDFl8AUwP08BxubJmYtRZuqwjwvc/DVnwRXQ6sqg8ghfNRgnUDWzwNhU/Rw==",
 			"dev": true,
 			"dependencies": {
-				"core-js": "3.31.0",
-				"core-js-compat": "3.31.0",
+				"core-js": "3.35.1",
+				"core-js-compat": "3.35.1",
 				"mkdirp": ">=0.5.5 <1",
-				"webpack": ">=4.46.0 <5"
+				"webpack": ">=4.47.0 <5"
 			},
 			"engines": {
 				"node": ">=8.9.0"
@@ -23327,9 +23330,9 @@
 			}
 		},
 		"node_modules/core-js-builder/node_modules/webpack": {
-			"version": "4.46.0",
-			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-			"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+			"version": "4.47.0",
+			"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
+			"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
 			"dev": true,
 			"dependencies": {
 				"@webassemblyjs/ast": "1.9.0",
@@ -23386,11 +23389,11 @@
 			}
 		},
 		"node_modules/core-js-compat": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-			"integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz",
+			"integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==",
 			"dependencies": {
-				"browserslist": "^4.21.5"
+				"browserslist": "^4.22.2"
 			},
 			"funding": {
 				"type": "opencollective",
@@ -23983,9 +23986,9 @@
 			}
 		},
 		"node_modules/cyclist": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
+			"integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
 			"dev": true
 		},
 		"node_modules/damerau-levenshtein": {
@@ -24891,9 +24894,9 @@
 			}
 		},
 		"node_modules/des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
 			"dependencies": {
 				"inherits": "^2.0.1",
@@ -25559,9 +25562,9 @@
 			}
 		},
 		"node_modules/electron-to-chromium": {
-			"version": "1.4.525",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz",
-			"integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA=="
+			"version": "1.4.643",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.643.tgz",
+			"integrity": "sha512-QHscvvS7gt155PtoRC0dR2ilhL8E9LHhfTQEq1uD5AL0524rBLAwpAREFH06f87/e45B9XkR6Ki5dbhbCsVEIg=="
 		},
 		"node_modules/elegant-spinner": {
 			"version": "1.0.1",
@@ -27691,9 +27694,10 @@
 			"dev": true
 		},
 		"node_modules/figgy-pudding": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-			"integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+			"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
+			"deprecated": "This module is no longer supported.",
 			"dev": true
 		},
 		"node_modules/figures": {
@@ -28116,13 +28120,13 @@
 			}
 		},
 		"node_modules/flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"dependencies": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"node_modules/fn.name": {
@@ -39413,9 +39417,9 @@
 			"dev": true
 		},
 		"node_modules/nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+			"integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
 			"dev": true,
 			"optional": true
 		},
@@ -39736,9 +39740,9 @@
 			"dev": true
 		},
 		"node_modules/node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
 		},
 		"node_modules/node-stream-zip": {
 			"version": "1.15.0",
@@ -42114,12 +42118,12 @@
 			"dev": true
 		},
 		"node_modules/parallel-transform": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-			"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
 			"dev": true,
 			"dependencies": {
-				"cyclist": "~0.2.2",
+				"cyclist": "^1.0.1",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
 			}
@@ -48096,9 +48100,9 @@
 			}
 		},
 		"node_modules/source-list-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+			"integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
 			"dev": true
 		},
 		"node_modules/source-map": {
@@ -48527,9 +48531,9 @@
 			}
 		},
 		"node_modules/stream-each": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
-			"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
 			"dev": true,
 			"dependencies": {
 				"end-of-stream": "^1.1.0",
@@ -50950,9 +50954,9 @@
 			}
 		},
 		"node_modules/update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
 			"funding": [
 				{
 					"type": "opencollective",
@@ -71933,28 +71937,22 @@
 			}
 		},
 		"assert": {
-			"version": "1.5.0",
-			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.0.tgz",
-			"integrity": "sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==",
+			"version": "1.5.1",
+			"resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+			"integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
 			"dev": true,
 			"requires": {
-				"object-assign": "^4.1.1",
-				"util": "0.10.3"
+				"object.assign": "^4.1.4",
+				"util": "^0.10.4"
 			},
 			"dependencies": {
-				"inherits": {
-					"version": "2.0.1",
-					"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz",
-					"integrity": "sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==",
-					"dev": true
-				},
 				"util": {
-					"version": "0.10.3",
-					"resolved": "https://registry.npmjs.org/util/-/util-0.10.3.tgz",
-					"integrity": "sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==",
+					"version": "0.10.4",
+					"resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+					"integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
 					"dev": true,
 					"requires": {
-						"inherits": "2.0.1"
+						"inherits": "2.0.3"
 					}
 				}
 			}
@@ -71989,9 +71987,9 @@
 			"integrity": "sha512-iAB+JbDEGXhyIUavoDl9WP/Jj106Kz9DEn1DPgYw5ruDn0e3Wgi3sKFm55sASdGBNOQB8F59d9qQ7deqrHA8wQ=="
 		},
 		"async-each": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.3.tgz",
-			"integrity": "sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==",
+			"version": "1.0.6",
+			"resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.6.tgz",
+			"integrity": "sha512-c646jH1avxr+aVpndVMeAfYw7wAa6idufrlN3LPA4PmKS0QEGp6PIC9nwz0WQkkvBGAMEki3pFdtxaF39J9vvg==",
 			"dev": true,
 			"optional": true
 		},
@@ -72876,20 +72874,20 @@
 			}
 		},
 		"browserify-sign": {
-			"version": "4.2.1",
-			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.1.tgz",
-			"integrity": "sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==",
+			"version": "4.2.2",
+			"resolved": "https://registry.npmjs.org/browserify-sign/-/browserify-sign-4.2.2.tgz",
+			"integrity": "sha512-1rudGyeYY42Dk6texmv7c4VcQ0EsvVbLwZkA+AQB7SxvXxmcD93jcHie8bzecJ+ChDlmAm2Qyu0+Ccg5uhZXCg==",
 			"dev": true,
 			"requires": {
-				"bn.js": "^5.1.1",
-				"browserify-rsa": "^4.0.1",
+				"bn.js": "^5.2.1",
+				"browserify-rsa": "^4.1.0",
 				"create-hash": "^1.2.0",
 				"create-hmac": "^1.1.7",
-				"elliptic": "^6.5.3",
+				"elliptic": "^6.5.4",
 				"inherits": "^2.0.4",
-				"parse-asn1": "^5.1.5",
-				"readable-stream": "^3.6.0",
-				"safe-buffer": "^5.2.0"
+				"parse-asn1": "^5.1.6",
+				"readable-stream": "^3.6.2",
+				"safe-buffer": "^5.2.1"
 			},
 			"dependencies": {
 				"inherits": {
@@ -72927,14 +72925,14 @@
 			}
 		},
 		"browserslist": {
-			"version": "4.21.10",
-			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.21.10.tgz",
-			"integrity": "sha512-bipEBdZfVH5/pwrvqc+Ub0kUPVfGUhlKxbvfD+z1BDnPEO/X98ruXGA1WP5ASpAFKan7Qr6j736IacbZQuAlKQ==",
+			"version": "4.22.2",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.22.2.tgz",
+			"integrity": "sha512-0UgcrvQmBDvZHFGdYUehrCNIazki7/lUP3kkoi/r3YB2amZbFM9J43ZRkJTXBUZK4gmx56+Sqk9+Vs9mwZx9+A==",
 			"requires": {
-				"caniuse-lite": "^1.0.30001517",
-				"electron-to-chromium": "^1.4.477",
-				"node-releases": "^2.0.13",
-				"update-browserslist-db": "^1.0.11"
+				"caniuse-lite": "^1.0.30001565",
+				"electron-to-chromium": "^1.4.601",
+				"node-releases": "^2.0.14",
+				"update-browserslist-db": "^1.0.13"
 			}
 		},
 		"bser": {
@@ -74672,20 +74670,20 @@
 			}
 		},
 		"core-js": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.31.0.tgz",
-			"integrity": "sha512-NIp2TQSGfR6ba5aalZD+ZQ1fSxGhDo/s1w0nx3RYzf2pnJxt7YynxFlFScP6eV7+GZsKO95NSjGxyJsU3DZgeQ=="
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js/-/core-js-3.35.1.tgz",
+			"integrity": "sha512-IgdsbxNyMskrTFxa9lWHyMwAJU5gXOPP+1yO+K59d50VLVAIDAbs7gIv705KzALModfK3ZrSZTPNpC0PQgIZuw=="
 		},
 		"core-js-builder": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.31.0.tgz",
-			"integrity": "sha512-qx8vgRM3U4+IjlMqNQl7Vj53ectTm1FpzJ+nJSQuT865StCXvusxCO+HuASWIKlkoc+96AfnFa2MEdqvGep9nA==",
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js-builder/-/core-js-builder-3.35.1.tgz",
+			"integrity": "sha512-CfIvg+khWyS7ElbRXhuQH9QVUQxRDFl8AUwP08BxubJmYtRZuqwjwvc/DVnwRXQ6sqg8ghfNRgnUDWzwNhU/Rw==",
 			"dev": true,
 			"requires": {
-				"core-js": "3.31.0",
-				"core-js-compat": "3.31.0",
+				"core-js": "3.35.1",
+				"core-js-compat": "3.35.1",
 				"mkdirp": ">=0.5.5 <1",
-				"webpack": ">=4.46.0 <5"
+				"webpack": ">=4.47.0 <5"
 			},
 			"dependencies": {
 				"ajv": {
@@ -74837,9 +74835,9 @@
 					}
 				},
 				"webpack": {
-					"version": "4.46.0",
-					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.46.0.tgz",
-					"integrity": "sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==",
+					"version": "4.47.0",
+					"resolved": "https://registry.npmjs.org/webpack/-/webpack-4.47.0.tgz",
+					"integrity": "sha512-td7fYwgLSrky3fI1EuU5cneU4+pbH6GgOfuKNS1tNPcfdGinGELAqsb/BP4nnvZyKSG2i/xFGU7+n2PvZA8HJQ==",
 					"dev": true,
 					"requires": {
 						"@webassemblyjs/ast": "1.9.0",
@@ -74880,11 +74878,11 @@
 			}
 		},
 		"core-js-compat": {
-			"version": "3.31.0",
-			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.31.0.tgz",
-			"integrity": "sha512-hM7YCu1cU6Opx7MXNu0NuumM0ezNeAeRKadixyiQELWY3vT3De9S4J5ZBMraWV2vZnrE1Cirl0GtFtDtMUXzPw==",
+			"version": "3.35.1",
+			"resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.35.1.tgz",
+			"integrity": "sha512-sftHa5qUJY3rs9Zht1WEnmkvXputCyDBczPnr7QDgL8n3qrF3CMXY4VPSYtOLLiOUJcah2WNXREd48iOl6mQIw==",
 			"requires": {
-				"browserslist": "^4.21.5"
+				"browserslist": "^4.22.2"
 			}
 		},
 		"core-js-pure": {
@@ -75341,9 +75339,9 @@
 			}
 		},
 		"cyclist": {
-			"version": "0.2.2",
-			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-0.2.2.tgz",
-			"integrity": "sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=",
+			"version": "1.0.2",
+			"resolved": "https://registry.npmjs.org/cyclist/-/cyclist-1.0.2.tgz",
+			"integrity": "sha512-0sVXIohTfLqVIW3kb/0n6IiWF3Ifj5nm2XaSrLq2DI6fKIGa2fYAZdk917rUneaeLVpYfFcyXE2ft0fe3remsA==",
 			"dev": true
 		},
 		"damerau-levenshtein": {
@@ -76002,9 +76000,9 @@
 			"dev": true
 		},
 		"des.js": {
-			"version": "1.0.1",
-			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.0.1.tgz",
-			"integrity": "sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/des.js/-/des.js-1.1.0.tgz",
+			"integrity": "sha512-r17GxjhUCjSRy8aiJpr8/UadFIzMzJGexI3Nmz4ADi9LYSFx4gTBp80+NaX/YsXWWLhpZ7v/v/ubEc/bCNfKwg==",
 			"dev": true,
 			"requires": {
 				"inherits": "^2.0.1",
@@ -76515,9 +76513,9 @@
 			}
 		},
 		"electron-to-chromium": {
-			"version": "1.4.525",
-			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.525.tgz",
-			"integrity": "sha512-GIZ620hDK4YmIqAWkscG4W6RwY6gOx1y5J6f4JUQwctiJrqH2oxZYU4mXHi35oV32tr630UcepBzSBGJ/WYcZA=="
+			"version": "1.4.643",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.643.tgz",
+			"integrity": "sha512-QHscvvS7gt155PtoRC0dR2ilhL8E9LHhfTQEq1uD5AL0524rBLAwpAREFH06f87/e45B9XkR6Ki5dbhbCsVEIg=="
 		},
 		"elegant-spinner": {
 			"version": "1.0.1",
@@ -78157,9 +78155,9 @@
 			"dev": true
 		},
 		"figgy-pudding": {
-			"version": "3.5.1",
-			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-			"integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+			"version": "3.5.2",
+			"resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+			"integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
 			"dev": true
 		},
 		"figures": {
@@ -78496,13 +78494,13 @@
 			"integrity": "sha512-2hJ5ACYeJCzNtiVULov6pljKOLygy0zddoqSI1fFetM+XRPpRshFdGEijtqlamA1XwyZ+7rhryI6FQFzvtLWUQ=="
 		},
 		"flush-write-stream": {
-			"version": "1.0.3",
-			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.0.3.tgz",
-			"integrity": "sha512-calZMC10u0FMUqoiunI2AiGIIUtUIvifNwkHhNupZH4cbNnW1Itkoh/Nf5HFYmDrwWPjrUxpkZT0KhuCq0jmGw==",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/flush-write-stream/-/flush-write-stream-1.1.1.tgz",
+			"integrity": "sha512-3Z4XhFZ3992uIq0XOqb9AreonueSYphE6oYbpt5+3u06JWklbsPkNv3ZKkP9Bz/r+1MWCaMoSQ28P85+1Yc77w==",
 			"dev": true,
 			"requires": {
-				"inherits": "^2.0.1",
-				"readable-stream": "^2.0.4"
+				"inherits": "^2.0.3",
+				"readable-stream": "^2.3.6"
 			}
 		},
 		"fn.name": {
@@ -87175,9 +87173,9 @@
 			"dev": true
 		},
 		"nan": {
-			"version": "2.14.2",
-			"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
-			"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==",
+			"version": "2.18.0",
+			"resolved": "https://registry.npmjs.org/nan/-/nan-2.18.0.tgz",
+			"integrity": "sha512-W7tfG7vMOGtD30sHoZSSc/JVYiyDPEyQVso/Zz+/uQd0B0L46gtC+pHha5FFMRpil6fm/AoEcRWyOVi4+E/f8w==",
 			"dev": true,
 			"optional": true
 		},
@@ -87424,9 +87422,9 @@
 			"dev": true
 		},
 		"node-releases": {
-			"version": "2.0.13",
-			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.13.tgz",
-			"integrity": "sha512-uYr7J37ae/ORWdZeQ1xxMJe3NtdmqMC/JZK+geofDrkLUApKRHPd18/TxtBOJ4A0/+uUIliorNrfYV6s1b02eQ=="
+			"version": "2.0.14",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.14.tgz",
+			"integrity": "sha512-y10wOWt8yZpqXmOgRo77WaHEmhYQYGNA6y421PKsKYWEK8aW+cqAphborZDhqfyKrbZEN92CN1X2KbafY2s7Yw=="
 		},
 		"node-stream-zip": {
 			"version": "1.15.0",
@@ -89220,12 +89218,12 @@
 			"dev": true
 		},
 		"parallel-transform": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.1.0.tgz",
-			"integrity": "sha1-1BDwZbBdojCB/NEPKIVMKb2jOwY=",
+			"version": "1.2.0",
+			"resolved": "https://registry.npmjs.org/parallel-transform/-/parallel-transform-1.2.0.tgz",
+			"integrity": "sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==",
 			"dev": true,
 			"requires": {
-				"cyclist": "~0.2.2",
+				"cyclist": "^1.0.1",
 				"inherits": "^2.0.3",
 				"readable-stream": "^2.1.5"
 			}
@@ -93765,9 +93763,9 @@
 			}
 		},
 		"source-list-map": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.0.tgz",
-			"integrity": "sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==",
+			"version": "2.0.1",
+			"resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+			"integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==",
 			"dev": true
 		},
 		"source-map": {
@@ -94105,9 +94103,9 @@
 			}
 		},
 		"stream-each": {
-			"version": "1.2.2",
-			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.2.tgz",
-			"integrity": "sha512-mc1dbFhGBxvTM3bIWmAAINbqiuAk9TATcfIQC8P+/+HJefgaiTlMn2dHvkX8qlI12KeYKSQ1Ua9RrIqrn1VPoA==",
+			"version": "1.2.3",
+			"resolved": "https://registry.npmjs.org/stream-each/-/stream-each-1.2.3.tgz",
+			"integrity": "sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==",
 			"dev": true,
 			"requires": {
 				"end-of-stream": "^1.1.0",
@@ -95969,9 +95967,9 @@
 			"optional": true
 		},
 		"update-browserslist-db": {
-			"version": "1.0.11",
-			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.11.tgz",
-			"integrity": "sha512-dCwEFf0/oT85M1fHBg4F0jtLwJrutGoHSQXCh7u4o2t1drG+c0a9Flnqww6XUKSfQMPpJBRjU8d4RXB09qtvaA==",
+			"version": "1.0.13",
+			"resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.13.tgz",
+			"integrity": "sha512-xebP81SNcPuNpPP3uzeW1NYXxI3rxyJzF3pD6sH4jE7o/IX+WtSpwnVU+qIsDPyk0d3hmFQ7mjqc6AtV604hbg==",
 			"requires": {
 				"escalade": "^3.1.1",
 				"picocolors": "^1.0.0"
diff --git a/package.json b/package.json
index 7d44eda369d68..8550c6ff3f960 100644
--- a/package.json
+++ b/package.json
@@ -177,14 +177,14 @@
 		"babel-plugin-react-native-platform-specific-extensions": "1.1.1",
 		"babel-plugin-transform-remove-console": "6.9.4",
 		"benchmark": "2.1.4",
-		"browserslist": "4.21.10",
+		"browserslist": "4.22.2",
 		"caniuse-lite": "1.0.30001579",
 		"chalk": "4.1.1",
 		"change-case": "4.1.2",
 		"commander": "9.2.0",
 		"concurrently": "3.5.0",
 		"copy-webpack-plugin": "10.2.0",
-		"core-js-builder": "3.31.0",
+		"core-js-builder": "3.35.1",
 		"cross-env": "3.2.4",
 		"css-loader": "6.2.0",
 		"cssnano": "6.0.1",
diff --git a/packages/babel-preset-default/bin/index.js b/packages/babel-preset-default/bin/index.js
index a2d8623356513..54c35564d43d7 100755
--- a/packages/babel-preset-default/bin/index.js
+++ b/packages/babel-preset-default/bin/index.js
@@ -8,17 +8,13 @@ const { minify } = require( 'uglify-js' );
 const { writeFile } = require( 'fs' ).promises;
 
 builder( {
-	modules: [ 'es', 'web' ],
+	modules: [ 'es.', 'web.' ],
 	exclude: [
-		// core-js is extremely conservative in which polyfills to include.
-		// Since we don't care about the tiny browser implementation bugs behind its decision
-		// to polyfill these features, we forcefully prevent them from being included.
-		// @see https://github.com/WordPress/gutenberg/pull/31279
-		'es.promise',
 		// This is an IE-only feature which we don't use, and don't want to polyfill.
 		// @see https://github.com/WordPress/gutenberg/pull/49234
 		'web.immediate',
 	],
+	summary: { console: { size: true, modules: true } },
 	targets: require( '@wordpress/browserslist-config' ),
 	filename: './build/polyfill.js',
 } )

From c87e338382c8cf0ff9de1eb6397d71e0e9cd8065 Mon Sep 17 00:00:00 2001
From: Marco Ciampini <marco.ciampo@gmail.com>
Date: Wed, 24 Jan 2024 14:59:25 +0100
Subject: [PATCH 268/296] Button: always render the Tooltip component even when
 a tooltip should not be shown (#56490)

* Force `shouldShowTooltip` to always be a boolean

* Button: always render the `Tooltip` component even when a tooltip should not be shown

* Restore Button in post save button

* Remove unnecessary useMemo

* Remove unused import

* CHANGELOG

* Add unit test

* Remove unncessary assertions
---
 packages/components/CHANGELOG.md              |  1 +
 packages/components/src/button/index.tsx      | 54 +++++--------
 packages/components/src/button/test/index.tsx | 37 +++++++++
 .../src/components/post-saved-state/index.js  | 77 ++++++++-----------
 4 files changed, 89 insertions(+), 80 deletions(-)

diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 3674084f38e9e..7ad6becdb8aef 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -18,6 +18,7 @@
 -   `ToggleGroupControl`: Improve controlled value detection ([#57770](https://github.com/WordPress/gutenberg/pull/57770)).
 -   `Tooltip`: Improve props forwarding to children of nested `Tooltip` components ([#57878](https://github.com/WordPress/gutenberg/pull/57878)).
 -   `Tooltip`: revert prop types to only accept component-specific props ([#58125](https://github.com/WordPress/gutenberg/pull/58125)).
+-   `Button`: prevent the component from trashing and re-creating the HTML element ([#56490](https://github.com/WordPress/gutenberg/pull/56490)).
 
 ### Experimental
 
diff --git a/packages/components/src/button/index.tsx b/packages/components/src/button/index.tsx
index bd91de2ec2e83..966075dd6e2b9 100644
--- a/packages/components/src/button/index.tsx
+++ b/packages/components/src/button/index.tsx
@@ -195,9 +195,9 @@ export function UnforwardedButton(
 	const shouldShowTooltip =
 		! trulyDisabled &&
 		// An explicit tooltip is passed or...
-		( ( showTooltip && label ) ||
+		( ( showTooltip && !! label ) ||
 			// There's a shortcut or...
-			shortcut ||
+			!! shortcut ||
 			// There's a label and...
 			( !! label &&
 				// The children are empty and...
@@ -249,40 +249,28 @@ export function UnforwardedButton(
 			</button>
 		);
 
-	// Convert legacy `position` values to be used with the new `placement` prop
-	let computedPlacement;
-	// if `tooltipPosition` is defined, compute value to `placement`
-	if ( tooltipPosition !== undefined ) {
-		computedPlacement = positionToPlacement( tooltipPosition );
-	}
-
-	if ( ! shouldShowTooltip ) {
-		return (
-			<>
-				{ element }
-				{ describedBy && (
-					<VisuallyHidden>
-						<span id={ descriptionId }>{ describedBy }</span>
-					</VisuallyHidden>
-				) }
-			</>
-		);
-	}
-
-	return (
-		<>
-			<Tooltip
-				text={
+	// In order to avoid some React reconciliation issues, we are always rendering
+	// the `Tooltip` component even when `shouldShowTooltip` is `false`.
+	// In order to make sure that the tooltip doesn't show when it shouldn't,
+	// we don't pass the props to the `Tooltip` component.
+	const tooltipProps = shouldShowTooltip
+		? {
+				text:
 					( children as string | ReactElement[] )?.length &&
 					describedBy
 						? describedBy
-						: label
-				}
-				shortcut={ shortcut }
-				placement={ computedPlacement }
-			>
-				{ element }
-			</Tooltip>
+						: label,
+				shortcut,
+				placement:
+					tooltipPosition &&
+					// Convert legacy `position` values to be used with the new `placement` prop
+					positionToPlacement( tooltipPosition ),
+		  }
+		: {};
+
+	return (
+		<>
+			<Tooltip { ...tooltipProps }>{ element }</Tooltip>
 			{ describedBy && (
 				<VisuallyHidden>
 					<span id={ descriptionId }>{ describedBy }</span>
diff --git a/packages/components/src/button/test/index.tsx b/packages/components/src/button/test/index.tsx
index 345ae3813fe06..9b719f23a923f 100644
--- a/packages/components/src/button/test/index.tsx
+++ b/packages/components/src/button/test/index.tsx
@@ -197,6 +197,43 @@ describe( 'Button', () => {
 			).not.toBeInTheDocument();
 		} );
 
+		it( 'should not trash the rendered HTML elements when toggling between showing and not showing a tooltip', async () => {
+			const user = userEvent.setup();
+
+			const { rerender } = render(
+				<Button label="Button label">Test button</Button>
+			);
+
+			const button = screen.getByRole( 'button', {
+				name: 'Button label',
+			} );
+
+			expect( button ).toBeVisible();
+
+			await user.tab();
+
+			expect( button ).toHaveFocus();
+
+			// Re-render the button, but this time change the settings so that it
+			// shows a tooltip.
+			rerender(
+				<Button label="Button label" showTooltip>
+					Test button
+				</Button>
+			);
+
+			// The same button element that we referenced before should still be
+			// in the document and have focus.
+			expect( button ).toHaveFocus();
+
+			// Re-render the button, but stop showing a tooltip.
+			rerender( <Button label="Button label">Test button</Button> );
+
+			// The same button element that we referenced before should still be
+			// in the document and have focus.
+			expect( button ).toHaveFocus();
+		} );
+
 		it( 'should add a disabled prop to the button', () => {
 			render( <Button disabled /> );
 
diff --git a/packages/editor/src/components/post-saved-state/index.js b/packages/editor/src/components/post-saved-state/index.js
index c3089057757d9..ae9e03b5c300e 100644
--- a/packages/editor/src/components/post-saved-state/index.js
+++ b/packages/editor/src/components/post-saved-state/index.js
@@ -9,7 +9,6 @@ import classnames from 'classnames';
 import {
 	__unstableGetAnimateClassName as getAnimateClassName,
 	Button,
-	Tooltip,
 } from '@wordpress/components';
 import { usePrevious, useViewportMatch } from '@wordpress/compose';
 import { useDispatch, useSelect } from '@wordpress/data';
@@ -129,54 +128,38 @@ export default function PostSavedState( { forceIsDirty } ) {
 		text = shortLabel;
 	}
 
-	const buttonAccessibleLabel = text || label;
-
-	/**
-	 * The tooltip needs to be enabled only if the button is not disabled. When
-	 * relying on the internal Button tooltip functionality, this causes the
-	 * resulting `button` element to be always removed and re-added to the DOM,
-	 * causing focus loss. An alternative approach to circumvent the issue
-	 * is not to use the `label` and `shortcut` props on `Button` (which would
-	 * trigger the tooltip), and instead manually wrap the `Button` in a separate
-	 * `Tooltip` component.
-	 */
-	const tooltipProps = isDisabled
-		? undefined
-		: {
-				text: buttonAccessibleLabel,
-				shortcut: displayShortcut.primary( 's' ),
-		  };
-
 	// Use common Button instance for all saved states so that focus is not
 	// lost.
 	return (
-		<Tooltip { ...tooltipProps }>
-			<Button
-				className={
-					isSaveable || isSaving
-						? classnames( {
-								'editor-post-save-draft': ! isSavedState,
-								'editor-post-saved-state': isSavedState,
-								'is-saving': isSaving,
-								'is-autosaving': isAutosaving,
-								'is-saved': isSaved,
-								[ getAnimateClassName( {
-									type: 'loading',
-								} ) ]: isSaving,
-						  } )
-						: undefined
-				}
-				onClick={ isDisabled ? undefined : () => savePost() }
-				variant="tertiary"
-				size="compact"
-				icon={ isLargeViewport ? undefined : cloudUpload }
-				// Make sure the aria-label has always a value, as the default `text` is undefined on small screens.
-				aria-label={ buttonAccessibleLabel }
-				aria-disabled={ isDisabled }
-			>
-				{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
-				{ text }
-			</Button>
-		</Tooltip>
+		<Button
+			className={
+				isSaveable || isSaving
+					? classnames( {
+							'editor-post-save-draft': ! isSavedState,
+							'editor-post-saved-state': isSavedState,
+							'is-saving': isSaving,
+							'is-autosaving': isAutosaving,
+							'is-saved': isSaved,
+							[ getAnimateClassName( {
+								type: 'loading',
+							} ) ]: isSaving,
+					  } )
+					: undefined
+			}
+			onClick={ isDisabled ? undefined : () => savePost() }
+			/*
+			 * We want the tooltip to show the keyboard shortcut only when the
+			 * button does something, i.e. when it's not disabled.
+			 */
+			shortcut={ isDisabled ? undefined : displayShortcut.primary( 's' ) }
+			variant="tertiary"
+			size="compact"
+			icon={ isLargeViewport ? undefined : cloudUpload }
+			label={ text || label }
+			aria-disabled={ isDisabled }
+		>
+			{ isSavedState && <Icon icon={ isSaved ? check : cloud } /> }
+			{ text }
+		</Button>
 	);
 }

From 81549baff637e5b8e66231e5b5b107ccd05fff32 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Wed, 24 Jan 2024 11:00:54 -0300
Subject: [PATCH 269/296] Update the default collection data url to the
 wordpress.org cdn (#58186)

---
 lib/experimental/fonts/font-library/font-library.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/experimental/fonts/font-library/font-library.php b/lib/experimental/fonts/font-library/font-library.php
index a6a324b17731c..e9744da5958f4 100644
--- a/lib/experimental/fonts/font-library/font-library.php
+++ b/lib/experimental/fonts/font-library/font-library.php
@@ -136,8 +136,7 @@ function wp_unregister_font_collection( $collection_id ) {
 	'slug'        => 'default-font-collection',
 	'name'        => 'Google Fonts',
 	'description' => __( 'Add from Google Fonts. Fonts are copied to and served from your site.', 'gutenberg' ),
-	// TODO: This URL needs to be updated to the wporg hosted one prior to the Gutenberg 17.6 release.
-	'src'         => 'https://raw.githubusercontent.com/WordPress/google-fonts-to-wordpress-collection/main/releases/gutenberg-17.6/collections/google-fonts.json',
+	'src'         => 'https://s.w.org/images/fonts/17.6/collections/google-fonts-with-preview.json',
 );
 
 wp_register_font_collection( $default_font_collection );

From a0fccd15db464ee7f1769f63fe4135c19dba4890 Mon Sep 17 00:00:00 2001
From: Kai Hao <kevin830726@gmail.com>
Date: Wed, 24 Jan 2024 22:10:27 +0800
Subject: [PATCH 270/296] Use a patch format and support `linkTarget` of
 `core/button` for Pattern Overrides (#58165)

* Change the overrides format to patch

* Add linkTarget and set it to an empty string for the remove op
---
 .../block-bindings/sources/pattern.php        | 19 +++++-
 lib/experimental/blocks.php                   |  2 +-
 packages/block-library/src/block/edit.js      | 56 +++++++++++++---
 packages/patterns/src/constants.js            |  1 +
 .../editor/various/pattern-overrides.spec.js  | 66 ++++++++++++++++++-
 5 files changed, 131 insertions(+), 13 deletions(-)

diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/experimental/block-bindings/sources/pattern.php
index 16bf46f4f06ab..740d1983d6fe8 100644
--- a/lib/experimental/block-bindings/sources/pattern.php
+++ b/lib/experimental/block-bindings/sources/pattern.php
@@ -9,8 +9,23 @@
 		if ( ! _wp_array_get( $block_instance->attributes, array( 'metadata', 'id' ), false ) ) {
 			return null;
 		}
-		$block_id = $block_instance->attributes['metadata']['id'];
-		return _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
+		$block_id           = $block_instance->attributes['metadata']['id'];
+		$attribute_override = _wp_array_get( $block_instance->context, array( 'pattern/overrides', $block_id, $attribute_name ), null );
+		if ( null === $attribute_override ) {
+			return null;
+		}
+		switch ( $attribute_override[0] ) {
+			case 0: // remove
+				/**
+				 * TODO: This currently doesn't remove the attribute, but only set it to an empty string.
+				 * It's a temporary solution until the block binding API supports different operations.
+				 */
+				return '';
+			case 1: // replace
+				return $attribute_override[1];
+			default:
+				return null;
+		}
 	};
 	wp_block_bindings_register_source(
 		'pattern_attributes',
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 4c22601fa9102..39ac86970367c 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -101,7 +101,7 @@ function gutenberg_process_block_bindings( $block_content, $block, $block_instan
 				'core/paragraph' => array( 'content' ),
 				'core/heading'   => array( 'content' ),
 				'core/image'     => array( 'url', 'title', 'alt' ),
-				'core/button'    => array( 'url', 'text' ),
+				'core/button'    => array( 'url', 'text', 'linkTarget' ),
 			);
 
 			// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
diff --git a/packages/block-library/src/block/edit.js b/packages/block-library/src/block/edit.js
index cd04e09605ff4..2d517983c3fe1 100644
--- a/packages/block-library/src/block/edit.js
+++ b/packages/block-library/src/block/edit.js
@@ -88,6 +88,26 @@ const useInferredLayout = ( blocks, parentLayout ) => {
 	}, [ blocks, parentLayout ] );
 };
 
+/**
+ * Enum for patch operations.
+ * We use integers here to minimize the size of the serialized data.
+ * This has to be deserialized accordingly on the server side.
+ * See block-bindings/sources/pattern.php
+ */
+const PATCH_OPERATIONS = {
+	/** @type {0} */
+	Remove: 0,
+	/** @type {1} */
+	Replace: 1,
+	// Other operations are reserved for future use. (e.g. Add)
+};
+
+/**
+ * @typedef {[typeof PATCH_OPERATIONS.Remove]} RemovePatch
+ * @typedef {[typeof PATCH_OPERATIONS.Replace, unknown]} ReplacePatch
+ * @typedef {RemovePatch | ReplacePatch} OverridePatch
+ */
+
 function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 	return blocks.map( ( block ) => {
 		const innerBlocks = applyInitialOverrides(
@@ -104,9 +124,15 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 			defaultValues[ blockId ] ??= {};
 			defaultValues[ blockId ][ attributeKey ] =
 				block.attributes[ attributeKey ];
-			if ( overrides[ blockId ]?.[ attributeKey ] !== undefined ) {
-				newAttributes[ attributeKey ] =
-					overrides[ blockId ][ attributeKey ];
+			/** @type {OverridePatch} */
+			const overrideAttribute = overrides[ blockId ]?.[ attributeKey ];
+			if ( ! overrideAttribute ) {
+				continue;
+			}
+			if ( overrideAttribute[ 0 ] === PATCH_OPERATIONS.Remove ) {
+				delete newAttributes[ attributeKey ];
+			} else if ( overrideAttribute[ 0 ] === PATCH_OPERATIONS.Replace ) {
+				newAttributes[ attributeKey ] = overrideAttribute[ 1 ];
 			}
 		}
 		return {
@@ -118,13 +144,14 @@ function applyInitialOverrides( blocks, overrides = {}, defaultValues ) {
 }
 
 function getOverridesFromBlocks( blocks, defaultValues ) {
-	/** @type {Record<string, Record<string, unknown>>} */
+	/** @type {Record<string, Record<string, OverridePatch>>} */
 	const overrides = {};
 	for ( const block of blocks ) {
 		Object.assign(
 			overrides,
 			getOverridesFromBlocks( block.innerBlocks, defaultValues )
 		);
+		/** @type {string} */
 		const blockId = block.attributes.metadata?.id;
 		if ( ! isPartiallySynced( block ) || ! blockId ) continue;
 		const attributes = getPartiallySyncedAttributes( block );
@@ -134,10 +161,23 @@ function getOverridesFromBlocks( blocks, defaultValues ) {
 				defaultValues[ blockId ][ attributeKey ]
 			) {
 				overrides[ blockId ] ??= {};
-				// TODO: We need a way to represent `undefined` in the serialized overrides.
-				// Also see: https://github.com/WordPress/gutenberg/pull/57249#discussion_r1452987871
-				overrides[ blockId ][ attributeKey ] =
-					block.attributes[ attributeKey ];
+				/**
+				 * Create a patch operation for the binding attribute.
+				 * We use a tuple here to minimize the size of the serialized data.
+				 * The first item is the operation type, the second item is the value if any.
+				 */
+				if ( block.attributes[ attributeKey ] === undefined ) {
+					/** @type {RemovePatch} */
+					overrides[ blockId ][ attributeKey ] = [
+						PATCH_OPERATIONS.Remove,
+					];
+				} else {
+					/** @type {ReplacePatch} */
+					overrides[ blockId ][ attributeKey ] = [
+						PATCH_OPERATIONS.Replace,
+						block.attributes[ attributeKey ],
+					];
+				}
 			}
 		}
 	}
diff --git a/packages/patterns/src/constants.js b/packages/patterns/src/constants.js
index 5fa9ec44f4e3a..9ce2aff2fc46d 100644
--- a/packages/patterns/src/constants.js
+++ b/packages/patterns/src/constants.js
@@ -27,6 +27,7 @@ export const PARTIAL_SYNCING_SUPPORTED_BLOCKS = {
 	'core/button': {
 		text: __( 'Text' ),
 		url: __( 'URL' ),
+		linkTarget: __( 'Link Target' ),
 	},
 	'core/image': {
 		url: __( 'URL' ),
diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
index 4e7bc80fdff5d..56c6b2a7c15f4 100644
--- a/test/e2e/specs/editor/various/pattern-overrides.spec.js
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -176,7 +176,7 @@ test.describe( 'Pattern Overrides', () => {
 						ref: patternId,
 						overrides: {
 							[ editableParagraphId ]: {
-								content: 'I would word it this way',
+								content: [ 1, 'I would word it this way' ],
 							},
 						},
 					},
@@ -187,7 +187,7 @@ test.describe( 'Pattern Overrides', () => {
 						ref: patternId,
 						overrides: {
 							[ editableParagraphId ]: {
-								content: 'This one is different',
+								content: [ 1, 'This one is different' ],
 							},
 						},
 					},
@@ -263,4 +263,66 @@ test.describe( 'Pattern Overrides', () => {
 			},
 		] );
 	} );
+
+	test( 'Supports `undefined` attribute values in patterns', async ( {
+		page,
+		admin,
+		editor,
+		requestUtils,
+	} ) => {
+		const buttonId = 'button-id';
+		const { id } = await requestUtils.createBlock( {
+			title: 'Pattern with overrides',
+			content: `<!-- wp:buttons -->
+<div class="wp-block-buttons"><!-- wp:button {"metadata":{"id":"${ buttonId }","bindings":{"text":{"source":{"name":"pattern_attributes"}},"url":{"source":{"name":"pattern_attributes"}},"linkTarget":{"source":{"name":"pattern_attributes"}}}}} -->
+<div class="wp-block-button"><a class="wp-block-button__link wp-element-button" href="http://wp.org" target="_blank" rel="noreferrer noopener">wp.org</a></div>
+<!-- /wp:button --></div>
+<!-- /wp:buttons -->`,
+			status: 'publish',
+		} );
+
+		await admin.createNewPost();
+
+		await editor.insertBlock( {
+			name: 'core/block',
+			attributes: { ref: id },
+		} );
+
+		await editor.canvas
+			.getByRole( 'document', { name: 'Block: Button' } )
+			.getByRole( 'textbox', { name: 'Button text' } )
+			.focus();
+
+		await expect(
+			page.getByRole( 'link', { name: 'wp.org' } )
+		).toContainText( 'opens in a new tab' );
+
+		const openInNewTabCheckbox = page.getByRole( 'checkbox', {
+			name: 'Open in new tab',
+		} );
+		await expect( openInNewTabCheckbox ).toBeChecked();
+
+		await openInNewTabCheckbox.setChecked( false );
+
+		await expect.poll( editor.getBlocks ).toMatchObject( [
+			{
+				name: 'core/block',
+				attributes: {
+					ref: id,
+					overrides: {
+						[ buttonId ]: {
+							linkTarget: [ 0 ],
+						},
+					},
+				},
+			},
+		] );
+
+		const postId = await editor.publishPost();
+		await page.goto( `/?p=${ postId }` );
+
+		const link = page.getByRole( 'link', { name: 'wp.org' } );
+		await expect( link ).toHaveAttribute( 'href', 'http://wp.org' );
+		await expect( link ).toHaveAttribute( 'target', '' );
+	} );
 } );

From 6f269a853de7f535f2be0d6e1b3965b5ec78c371 Mon Sep 17 00:00:00 2001
From: Lena Morita <lena@jaguchi.com>
Date: Wed, 24 Jan 2024 23:18:36 +0900
Subject: [PATCH 271/296] Tooltip: Add test for classname leakage (#58182)

---
 packages/components/src/tooltip/test/index.tsx | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/packages/components/src/tooltip/test/index.tsx b/packages/components/src/tooltip/test/index.tsx
index cbe09dc321412..85e29f5f3809b 100644
--- a/packages/components/src/tooltip/test/index.tsx
+++ b/packages/components/src/tooltip/test/index.tsx
@@ -487,5 +487,18 @@ describe( 'Tooltip', () => {
 				).not.toBeInTheDocument()
 			);
 		} );
+
+		it( 'should not leak Tooltip component classname to the anchor element', () => {
+			render(
+				<Tooltip>
+					<Tooltip>
+						<button>Anchor</button>
+					</Tooltip>
+				</Tooltip>
+			);
+			expect(
+				screen.getByRole( 'button', { name: 'Anchor' } )
+			).not.toHaveClass( 'components-tooltip' );
+		} );
 	} );
 } );

From f0bf6ab15c5efc1e18a7e115cfbf4409e6a725d7 Mon Sep 17 00:00:00 2001
From: Matias Benedetto <matias.benedetto@gmail.com>
Date: Wed, 24 Jan 2024 11:41:30 -0300
Subject: [PATCH 272/296] fix typo (#58193)

---
 .../fonts/font-library/class-wp-font-family-utils.php           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
index 71a3bb262e600..b291a8f1ee348 100644
--- a/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
+++ b/lib/experimental/fonts/font-library/class-wp-font-family-utils.php
@@ -165,7 +165,7 @@ public static function get_font_face_slug( $settings ) {
 			'semi-expanded'   => '112.5%',
 			'expanded'        => '125%',
 			'extra-expanded'  => '150%',
-			'untra-expanded'  => '200%',
+			'ultra-expanded'  => '200%',
 		);
 		$font_stretch     = str_replace( array_keys( $font_stretch_map ), array_values( $font_stretch_map ), $font_stretch );
 

From 50fa46b51f34e956851ed00413e41d263006e208 Mon Sep 17 00:00:00 2001
From: Ben Dwyer <ben@scruffian.com>
Date: Wed, 24 Jan 2024 14:56:49 +0000
Subject: [PATCH 273/296] Navigation: Move the renderer class to the main
 navigation file (#57979)

* Navigation: Move the renderer class to the main navigation file to take advantage of the automatic backporting

* Update the build script to also copy over class files

* prefix with gutenberg

* Add a Gutenberg suffix to class files when they are built

* add gutenberg prefix to functions

* move the built block files to their own dir

* Putting back the render class into the same file as the navigation block

* Update the rendered post rebase

* Fix php unit tests

---------

Co-authored-by: Riad Benguella <benguella@gmail.com>
---
 .../class-wp-navigation-block-renderer.php    | 645 ------------------
 lib/load.php                                  |   1 -
 .../block-library/src/navigation/index.php    | 634 +++++++++++++++++
 phpcs.xml.dist                                |   1 +
 .../blocks/render-block-navigation-test.php   |  14 +-
 ...lass-wp-navigation-block-renderer-test.php |   6 +-
 tools/webpack/blocks.js                       |  18 +-
 7 files changed, 662 insertions(+), 657 deletions(-)
 delete mode 100644 lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php

diff --git a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php b/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
deleted file mode 100644
index 4a00578d3f273..0000000000000
--- a/lib/compat/wordpress-6.5/class-wp-navigation-block-renderer.php
+++ /dev/null
@@ -1,645 +0,0 @@
-<?php
-/**
- * WP_Navigation_Block_Renderer class
- *
- * @package gutenberg
- * @since 6.5.0
- */
-
-if ( class_exists( 'WP_Navigation_Block_Renderer' ) ) {
-	return;
-}
-
-/**
- * Helper functions used to render the navigation block.
- */
-class WP_Navigation_Block_Renderer {
-	/**
-	 * Used to determine which blocks are wrapped in an <li>.
-	 *
-	 * @var array
-	 */
-	private static $nav_blocks_wrapped_in_list_item = array(
-		'core/navigation-link',
-		'core/home-link',
-		'core/site-title',
-		'core/site-logo',
-		'core/navigation-submenu',
-	);
-
-	/**
-	 * Used to determine which blocks need an <li> wrapper.
-	 *
-	 * @var array
-	 */
-	private static $needs_list_item_wrapper = array(
-		'core/site-title',
-		'core/site-logo',
-	);
-
-	/**
-	 * Keeps track of all the navigation names that have been seen.
-	 *
-	 * @var array
-	 */
-	private static $seen_menu_names = array();
-
-	/**
-	 * Returns whether or not this is responsive navigation.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return bool Returns whether or not this is responsive navigation.
-	 */
-	private static function is_responsive( $attributes ) {
-		/**
-		 * This is for backwards compatibility after the `isResponsive` attribute was been removed.
-		 */
-
-		$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
-		return isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
-	}
-
-	/**
-	 * Returns whether or not a navigation has a submenu.
-	 *
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return bool Returns whether or not a navigation has a submenu.
-	 */
-	private static function has_submenus( $inner_blocks ) {
-		foreach ( $inner_blocks as $inner_block ) {
-			$inner_block_content = $inner_block->render();
-			$p                   = new WP_HTML_Tag_Processor( $inner_block_content );
-			if ( $p->next_tag(
-				array(
-					'name'       => 'LI',
-					'class_name' => 'has-child',
-				)
-			) ) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	 * Determine whether the navigation blocks is interactive.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return bool Returns whether or not to load the view script.
-	 */
-	private static function is_interactive( $attributes, $inner_blocks ) {
-		$has_submenus       = static::has_submenus( $inner_blocks );
-		$is_responsive_menu = static::is_responsive( $attributes );
-		return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu;
-	}
-
-	/**
-	 * Returns whether or not a block needs a list item wrapper.
-	 *
-	 * @param WP_Block $block The block.
-	 * @return bool Returns whether or not a block needs a list item wrapper.
-	 */
-	private static function does_block_need_a_list_item_wrapper( $block ) {
-		return in_array( $block->name, static::$needs_list_item_wrapper, true );
-	}
-
-	/**
-	 * Returns the markup for a single inner block.
-	 *
-	 * @param WP_Block $inner_block The inner block.
-	 * @return string Returns the markup for a single inner block.
-	 */
-	private static function get_markup_for_inner_block( $inner_block ) {
-		$inner_block_content = $inner_block->render();
-		if ( ! empty( $inner_block_content ) ) {
-			if ( static::does_block_need_a_list_item_wrapper( $inner_block ) ) {
-				return '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
-			}
-
-			return $inner_block_content;
-		}
-	}
-
-	/**
-	 * Returns the html for the inner blocks of the navigation block.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return string Returns the html for the inner blocks of the navigation block.
-	 */
-	private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
-		$has_submenus   = static::has_submenus( $inner_blocks );
-		$is_interactive = static::is_interactive( $attributes, $inner_blocks );
-
-		$style                = static::get_styles( $attributes );
-		$class                = static::get_classes( $attributes );
-		$container_attributes = get_block_wrapper_attributes(
-			array(
-				'class' => 'wp-block-navigation__container ' . $class,
-				'style' => $style,
-			)
-		);
-
-		$inner_blocks_html = '';
-		$is_list_open      = false;
-
-		foreach ( $inner_blocks as $inner_block ) {
-			$is_list_item = in_array( $inner_block->name, static::$nav_blocks_wrapped_in_list_item, true );
-
-			if ( $is_list_item && ! $is_list_open ) {
-				$is_list_open       = true;
-				$inner_blocks_html .= sprintf(
-					'<ul %1$s>',
-					$container_attributes
-				);
-			}
-
-			if ( ! $is_list_item && $is_list_open ) {
-				$is_list_open       = false;
-				$inner_blocks_html .= '</ul>';
-			}
-
-			$inner_blocks_html .= static::get_markup_for_inner_block( $inner_block );
-		}
-
-		if ( $is_list_open ) {
-			$inner_blocks_html .= '</ul>';
-		}
-
-		// Add directives to the submenu if needed.
-		if ( $has_submenus && $is_interactive ) {
-			$tags              = new WP_HTML_Tag_Processor( $inner_blocks_html );
-			$inner_blocks_html = gutenberg_block_core_navigation_add_directives_to_submenu( $tags, $attributes );
-		}
-
-		return $inner_blocks_html;
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block from the navigation post.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks_from_navigation_post( $attributes ) {
-		$navigation_post = get_post( $attributes['ref'] );
-		if ( ! isset( $navigation_post ) ) {
-			return new WP_Block_List( array(), $attributes );
-		}
-
-		// Only published posts are valid. If this is changed then a corresponding change
-		// must also be implemented in `use-navigation-menu.js`.
-		if ( 'publish' === $navigation_post->post_status ) {
-			$parsed_blocks = parse_blocks( $navigation_post->post_content );
-
-			// 'parse_blocks' includes a null block with '\n\n' as the content when
-			// it encounters whitespace. This code strips it.
-			$compacted_blocks = gutenberg_block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
-
-			// TODO - this uses the full navigation block attributes for the
-			// context which could be refined.
-			return new WP_Block_List( $compacted_blocks, $attributes );
-		}
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block from the fallback.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks_from_fallback( $attributes ) {
-		$fallback_blocks = gutenberg_block_core_navigation_get_fallback_blocks();
-
-		// Fallback my have been filtered so do basic test for validity.
-		if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
-			return new WP_Block_List( array(), $attributes );
-		}
-
-		return new WP_Block_List( $fallback_blocks, $attributes );
-	}
-
-	/**
-	 * Gets the inner blocks for the navigation block.
-	 *
-	 * @param array    $attributes The block attributes.
-	 * @param WP_Block $block The parsed block.
-	 * @return WP_Block_List Returns the inner blocks for the navigation block.
-	 */
-	private static function get_inner_blocks( $attributes, $block ) {
-		$inner_blocks = $block->inner_blocks;
-
-		// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
-		if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
-			$attributes['ref'] = $attributes['navigationMenuId'];
-		}
-
-		// If:
-		// - the gutenberg plugin is active
-		// - `__unstableLocation` is defined
-		// - we have menu items at the defined location
-		// - we don't have a relationship to a `wp_navigation` Post (via `ref`).
-		// ...then create inner blocks from the classic menu assigned to that location.
-		if (
-			defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN &&
-			array_key_exists( '__unstableLocation', $attributes ) &&
-			! array_key_exists( 'ref', $attributes ) &&
-			! empty( gutenberg_block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] ) )
-		) {
-			$inner_blocks = gutenberg_block_core_navigation_get_inner_blocks_from_unstable_location( $attributes );
-		}
-
-		// Load inner blocks from the navigation post.
-		if ( array_key_exists( 'ref', $attributes ) ) {
-			$inner_blocks = static::get_inner_blocks_from_navigation_post( $attributes );
-		}
-
-		// If there are no inner blocks then fallback to rendering an appropriate fallback.
-		if ( empty( $inner_blocks ) ) {
-			$inner_blocks = static::get_inner_blocks_from_fallback( $attributes );
-		}
-
-		/**
-		 * Filter navigation block $inner_blocks.
-		 * Allows modification of a navigation block menu items.
-		 *
-		 * @since 6.1.0
-		 *
-		 * @param \WP_Block_List $inner_blocks
-		 */
-		$inner_blocks = apply_filters( 'block_core_navigation_render_inner_blocks', $inner_blocks );
-
-		$post_ids = gutenberg_block_core_navigation_get_post_ids( $inner_blocks );
-		if ( $post_ids ) {
-			_prime_post_caches( $post_ids, false, false );
-		}
-
-		return $inner_blocks;
-	}
-
-	/**
-	 * Gets the name of the current navigation, if it has one.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the name of the navigation.
-	 */
-	private static function get_navigation_name( $attributes ) {
-
-		$navigation_name = $attributes['ariaLabel'] ?? '';
-
-		// Load the navigation post.
-		if ( array_key_exists( 'ref', $attributes ) ) {
-			$navigation_post = get_post( $attributes['ref'] );
-			if ( ! isset( $navigation_post ) ) {
-				return $navigation_name;
-			}
-
-			// Only published posts are valid. If this is changed then a corresponding change
-			// must also be implemented in `use-navigation-menu.js`.
-			if ( 'publish' === $navigation_post->post_status ) {
-				$navigation_name = $navigation_post->post_title;
-
-				// This is used to count the number of times a navigation name has been seen,
-				// so that we can ensure every navigation has a unique id.
-				if ( isset( static::$seen_menu_names[ $navigation_name ] ) ) {
-					++static::$seen_menu_names[ $navigation_name ];
-				} else {
-					static::$seen_menu_names[ $navigation_name ] = 1;
-				}
-			}
-		}
-
-		return $navigation_name;
-	}
-
-	/**
-	 * Returns the layout class for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the layout class for the navigation block.
-	 */
-	private static function get_layout_class( $attributes ) {
-		$layout_justification = array(
-			'left'          => 'items-justified-left',
-			'right'         => 'items-justified-right',
-			'center'        => 'items-justified-center',
-			'space-between' => 'items-justified-space-between',
-		);
-
-		$layout_class = '';
-		if (
-			isset( $attributes['layout']['justifyContent'] ) &&
-			isset( $layout_justification[ $attributes['layout']['justifyContent'] ] )
-		) {
-			$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
-		}
-		if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
-			$layout_class .= ' is-vertical';
-		}
-
-		if ( isset( $attributes['layout']['flexWrap'] ) && 'nowrap' === $attributes['layout']['flexWrap'] ) {
-			$layout_class .= ' no-wrap';
-		}
-		return $layout_class;
-	}
-
-	/**
-	 * Return classes for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the classes for the navigation block.
-	 */
-	private static function get_classes( $attributes ) {
-		// Restore legacy classnames for submenu positioning.
-		$layout_class       = static::get_layout_class( $attributes );
-		$colors             = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$font_sizes         = gutenberg_block_core_navigation_build_css_font_sizes( $attributes );
-		$is_responsive_menu = static::is_responsive( $attributes );
-
-		// Manually add block support text decoration as CSS class.
-		$text_decoration       = $attributes['style']['typography']['textDecoration'] ?? null;
-		$text_decoration_class = sprintf( 'has-text-decoration-%s', $text_decoration );
-
-		// Sets the is-collapsed class when the navigation is set to always use the overlay.
-		// This saves us from needing to do this check in the view.js file (see the collapseNav function).
-		$is_collapsed_class = static::is_always_overlay( $attributes ) ? array( 'is-collapsed' ) : array();
-
-		$classes = array_merge(
-			$colors['css_classes'],
-			$font_sizes['css_classes'],
-			$is_responsive_menu ? array( 'is-responsive' ) : array(),
-			$layout_class ? array( $layout_class ) : array(),
-			$text_decoration ? array( $text_decoration_class ) : array(),
-			$is_collapsed_class
-		);
-		return implode( ' ', $classes );
-	}
-
-	private static function is_always_overlay( $attributes ) {
-		return isset( $attributes['overlayMenu'] ) && 'always' === $attributes['overlayMenu'];
-	}
-
-	/**
-	 * Get styles for the navigation block.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns the styles for the navigation block.
-	 */
-	private static function get_styles( $attributes ) {
-		$colors       = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$font_sizes   = gutenberg_block_core_navigation_build_css_font_sizes( $attributes );
-		$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
-		return $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'];
-	}
-
-	/**
-	 * Get the responsive container markup
-	 *
-	 * @param array         $attributes The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @param string        $inner_blocks_html The markup for the inner blocks.
-	 * @return string Returns the container markup.
-	 */
-	private static function get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html ) {
-		$is_interactive  = static::is_interactive( $attributes, $inner_blocks );
-		$colors          = gutenberg_block_core_navigation_build_css_colors( $attributes );
-		$modal_unique_id = wp_unique_id( 'modal-' );
-
-		$responsive_container_classes = array(
-			'wp-block-navigation__responsive-container',
-			implode( ' ', $colors['overlay_css_classes'] ),
-		);
-		$open_button_classes          = array(
-			'wp-block-navigation__responsive-container-open',
-		);
-
-		$should_display_icon_label = isset( $attributes['hasIcon'] ) && true === $attributes['hasIcon'];
-		$toggle_button_icon        = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg>';
-		if ( isset( $attributes['icon'] ) ) {
-			if ( 'menu' === $attributes['icon'] ) {
-				$toggle_button_icon = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 5v1.5h14V5H5zm0 7.8h14v-1.5H5v1.5zM5 19h14v-1.5H5V19z" /></svg>';
-			}
-		}
-		$toggle_button_content       = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
-		$toggle_close_button_icon    = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg>';
-		$toggle_close_button_content = $should_display_icon_label ? $toggle_close_button_icon : __( 'Close' );
-		$toggle_aria_label_open      = $should_display_icon_label ? 'aria-label="' . __( 'Open menu' ) . '"' : ''; // Open button label.
-		$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
-
-		// Add Interactivity API directives to the markup if needed.
-		$open_button_directives          = '';
-		$responsive_container_directives = '';
-		$responsive_dialog_directives    = '';
-		$close_button_directives         = '';
-		if ( $is_interactive ) {
-			$open_button_directives                  = '
-				data-wp-on--click="actions.openMenuOnClick"
-				data-wp-on--keydown="actions.handleMenuKeydown"
-			';
-			$responsive_container_directives         = '
-				data-wp-class--has-modal-open="state.isMenuOpen"
-				data-wp-class--is-menu-open="state.isMenuOpen"
-				data-wp-watch="callbacks.initMenu"
-				data-wp-on--keydown="actions.handleMenuKeydown"
-				data-wp-on--focusout="actions.handleMenuFocusout"
-				tabindex="-1"
-			';
-			$responsive_dialog_directives            = '
-				data-wp-bind--aria-modal="state.ariaModal"
-				data-wp-bind--aria-label="state.ariaLabel"
-				data-wp-bind--role="state.roleAttribute"
-			';
-			$close_button_directives                 = '
-				data-wp-on--click="actions.closeMenuOnClick"
-			';
-			$responsive_container_content_directives = '
-				data-wp-watch="callbacks.focusFirstElement"
-			';
-		}
-
-		return sprintf(
-			'<button aria-haspopup="dialog" %3$s class="%6$s" %10$s>%8$s</button>
-				<div class="%5$s" style="%7$s" id="%1$s" %11$s>
-					<div class="wp-block-navigation__responsive-close" tabindex="-1">
-						<div class="wp-block-navigation__responsive-dialog" %12$s>
-							<button %4$s class="wp-block-navigation__responsive-container-close" %13$s>%9$s</button>
-							<div class="wp-block-navigation__responsive-container-content" %14$s id="%1$s-content">
-								%2$s
-							</div>
-						</div>
-					</div>
-				</div>',
-			esc_attr( $modal_unique_id ),
-			$inner_blocks_html,
-			$toggle_aria_label_open,
-			$toggle_aria_label_close,
-			esc_attr( implode( ' ', $responsive_container_classes ) ),
-			esc_attr( implode( ' ', $open_button_classes ) ),
-			esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
-			$toggle_button_content,
-			$toggle_close_button_content,
-			$open_button_directives,
-			$responsive_container_directives,
-			$responsive_dialog_directives,
-			$close_button_directives,
-			$responsive_container_content_directives
-		);
-	}
-
-	/**
-	 * Get the wrapper attributes
-	 *
-	 * @param array         $attributes    The block attributes.
-	 * @param WP_Block_List $inner_blocks  A list of inner blocks.
-	 * @return string Returns the navigation block markup.
-	 */
-	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
-		$nav_menu_name      = static::get_unique_navigation_name( $attributes );
-		$is_interactive     = static::is_interactive( $attributes, $inner_blocks );
-		$is_responsive_menu = static::is_responsive( $attributes );
-		$style              = static::get_styles( $attributes );
-		$class              = static::get_classes( $attributes );
-		$wrapper_attributes = get_block_wrapper_attributes(
-			array(
-				'class'      => $class,
-				'style'      => $style,
-				'aria-label' => $nav_menu_name,
-			)
-		);
-
-		if ( $is_responsive_menu ) {
-			$nav_element_directives = static::get_nav_element_directives( $is_interactive, $attributes );
-			$wrapper_attributes    .= ' ' . $nav_element_directives;
-		}
-
-		return $wrapper_attributes;
-	}
-
-	/**
-	 * Gets the nav element directives.
-	 *
-	 * @param bool  $is_interactive Whether the block is interactive.
-	 * @param array $attributes     The block attributes.
-	 * @return string the directives for the navigation element.
-	 */
-	private static function get_nav_element_directives( $is_interactive, $attributes ) {
-		if ( ! $is_interactive ) {
-			return '';
-		}
-		// When adding to this array be mindful of security concerns.
-		$nav_element_context    = wp_json_encode(
-			array(
-				'overlayOpenedBy' => array(),
-				'type'            => 'overlay',
-				'roleAttribute'   => '',
-				'ariaLabel'       => __( 'Menu' ),
-			),
-			JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
-		);
-		$nav_element_directives = '
-			data-wp-interactive=\'{"namespace":"core/navigation"}\'
-			data-wp-context=\'' . $nav_element_context . '\'
-		';
-
-		/*
-		* When the navigation's 'overlayMenu' attribute is set to 'always', JavaScript
-		* is not needed for collapsing the menu because the class is set manually.
-		*/
-		if ( ! static::is_always_overlay( $attributes ) ) {
-			$nav_element_directives .= 'data-wp-init="callbacks.initNav"';
-			$nav_element_directives .= ' '; // space separator
-			$nav_element_directives .= 'data-wp-class--is-collapsed="context.isCollapsed"';
-		}
-
-		return $nav_element_directives;
-	}
-
-	/**
-	 * Handle view script module loading.
-	 *
-	 * @param array         $attributes   The block attributes.
-	 * @param WP_Block      $block        The parsed block.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 */
-	private static function handle_view_script_module_loading( $attributes, $block, $inner_blocks ) {
-		if ( static::is_interactive( $attributes, $inner_blocks ) ) {
-			wp_enqueue_script_module( '@wordpress/block-library/navigation-block' );
-		}
-	}
-
-	/**
-	 * Returns the markup for the navigation block.
-	 *
-	 * @param array         $attributes The block attributes.
-	 * @param WP_Block_List $inner_blocks The list of inner blocks.
-	 * @return string Returns the navigation wrapper markup.
-	 */
-	private static function get_wrapper_markup( $attributes, $inner_blocks ) {
-		$inner_blocks_html = static::get_inner_blocks_html( $attributes, $inner_blocks );
-		if ( static::is_responsive( $attributes ) ) {
-			return static::get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html );
-		}
-		return $inner_blocks_html;
-	}
-
-	/**
-	 * Returns a unique name for the navigation.
-	 *
-	 * @param array $attributes The block attributes.
-	 * @return string Returns a unique name for the navigation.
-	 */
-	private static function get_unique_navigation_name( $attributes ) {
-		$nav_menu_name = static::get_navigation_name( $attributes );
-
-		// If the menu name has been used previously then append an ID
-		// to the name to ensure uniqueness across a given post.
-		if ( isset( static::$seen_menu_names[ $nav_menu_name ] ) && static::$seen_menu_names[ $nav_menu_name ] > 1 ) {
-			$count         = static::$seen_menu_names[ $nav_menu_name ];
-			$nav_menu_name = $nav_menu_name . ' ' . ( $count );
-		}
-
-		return $nav_menu_name;
-	}
-
-	/**
-	 * Renders the navigation block.
-	 *
-	 * @param array    $attributes The block attributes.
-	 * @param string   $content    The saved content.
-	 * @param WP_Block $block      The parsed block.
-	 * @return string Returns the navigation block markup.
-	 */
-	public static function render( $attributes, $content, $block ) {
-		/**
-		 * Deprecated:
-		 * The rgbTextColor and rgbBackgroundColor attributes
-		 * have been deprecated in favor of
-		 * customTextColor and customBackgroundColor ones.
-		 * Move the values from old attrs to the new ones.
-		 */
-		if ( isset( $attributes['rgbTextColor'] ) && empty( $attributes['textColor'] ) ) {
-			$attributes['customTextColor'] = $attributes['rgbTextColor'];
-		}
-
-		if ( isset( $attributes['rgbBackgroundColor'] ) && empty( $attributes['backgroundColor'] ) ) {
-			$attributes['customBackgroundColor'] = $attributes['rgbBackgroundColor'];
-		}
-
-		unset( $attributes['rgbTextColor'], $attributes['rgbBackgroundColor'] );
-
-		$inner_blocks = static::get_inner_blocks( $attributes, $block );
-		// Prevent navigation blocks referencing themselves from rendering.
-		if ( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
-			return '';
-		}
-
-		static::handle_view_script_module_loading( $attributes, $block, $inner_blocks );
-
-		return sprintf(
-			'<nav %1$s>%2$s</nav>',
-			static::get_nav_wrapper_attributes( $attributes, $inner_blocks ),
-			static::get_wrapper_markup( $attributes, $inner_blocks )
-		);
-	}
-}
diff --git a/lib/load.php b/lib/load.php
index 37cea9bb46556..ea443544d5be4 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -106,7 +106,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 // WordPress 6.5 compat.
 require __DIR__ . '/compat/wordpress-6.5/blocks.php';
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
-require __DIR__ . '/compat/wordpress-6.5/class-wp-navigation-block-renderer.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php';
 require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php';
diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 29546f22c69e3..8b39a89022f8b 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -5,6 +5,640 @@
  * @package WordPress
  */
 
+/**
+ * Helper functions used to render the navigation block.
+ */
+class WP_Navigation_Block_Renderer {
+	/**
+	 * Used to determine which blocks are wrapped in an <li>.
+	 *
+	 * @var array
+	 */
+	private static $nav_blocks_wrapped_in_list_item = array(
+		'core/navigation-link',
+		'core/home-link',
+		'core/site-title',
+		'core/site-logo',
+		'core/navigation-submenu',
+	);
+
+	/**
+	 * Used to determine which blocks need an <li> wrapper.
+	 *
+	 * @var array
+	 */
+	private static $needs_list_item_wrapper = array(
+		'core/site-title',
+		'core/site-logo',
+	);
+
+	/**
+	 * Keeps track of all the navigation names that have been seen.
+	 *
+	 * @var array
+	 */
+	private static $seen_menu_names = array();
+
+	/**
+	 * Returns whether or not this is responsive navigation.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return bool Returns whether or not this is responsive navigation.
+	 */
+	private static function is_responsive( $attributes ) {
+		/**
+		 * This is for backwards compatibility after the `isResponsive` attribute was been removed.
+		 */
+
+		$has_old_responsive_attribute = ! empty( $attributes['isResponsive'] ) && $attributes['isResponsive'];
+		return isset( $attributes['overlayMenu'] ) && 'never' !== $attributes['overlayMenu'] || $has_old_responsive_attribute;
+	}
+
+	/**
+	 * Returns whether or not a navigation has a submenu.
+	 *
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return bool Returns whether or not a navigation has a submenu.
+	 */
+	private static function has_submenus( $inner_blocks ) {
+		foreach ( $inner_blocks as $inner_block ) {
+			$inner_block_content = $inner_block->render();
+			$p                   = new WP_HTML_Tag_Processor( $inner_block_content );
+			if ( $p->next_tag(
+				array(
+					'name'       => 'LI',
+					'class_name' => 'has-child',
+				)
+			) ) {
+				return true;
+			}
+		}
+		return false;
+	}
+
+	/**
+	 * Determine whether the navigation blocks is interactive.
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return bool Returns whether or not to load the view script.
+	 */
+	private static function is_interactive( $attributes, $inner_blocks ) {
+		$has_submenus       = static::has_submenus( $inner_blocks );
+		$is_responsive_menu = static::is_responsive( $attributes );
+		return ( $has_submenus && ( $attributes['openSubmenusOnClick'] || $attributes['showSubmenuIcon'] ) ) || $is_responsive_menu;
+	}
+
+	/**
+	 * Returns whether or not a block needs a list item wrapper.
+	 *
+	 * @param WP_Block $block The block.
+	 * @return bool Returns whether or not a block needs a list item wrapper.
+	 */
+	private static function does_block_need_a_list_item_wrapper( $block ) {
+		return in_array( $block->name, static::$needs_list_item_wrapper, true );
+	}
+
+	/**
+	 * Returns the markup for a single inner block.
+	 *
+	 * @param WP_Block $inner_block The inner block.
+	 * @return string Returns the markup for a single inner block.
+	 */
+	private static function get_markup_for_inner_block( $inner_block ) {
+		$inner_block_content = $inner_block->render();
+		if ( ! empty( $inner_block_content ) ) {
+			if ( static::does_block_need_a_list_item_wrapper( $inner_block ) ) {
+				return '<li class="wp-block-navigation-item">' . $inner_block_content . '</li>';
+			}
+
+			return $inner_block_content;
+		}
+	}
+
+	/**
+	 * Returns the html for the inner blocks of the navigation block.
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return string Returns the html for the inner blocks of the navigation block.
+	 */
+	private static function get_inner_blocks_html( $attributes, $inner_blocks ) {
+		$has_submenus   = static::has_submenus( $inner_blocks );
+		$is_interactive = static::is_interactive( $attributes, $inner_blocks );
+
+		$style                = static::get_styles( $attributes );
+		$class                = static::get_classes( $attributes );
+		$container_attributes = get_block_wrapper_attributes(
+			array(
+				'class' => 'wp-block-navigation__container ' . $class,
+				'style' => $style,
+			)
+		);
+
+		$inner_blocks_html = '';
+		$is_list_open      = false;
+
+		foreach ( $inner_blocks as $inner_block ) {
+			$is_list_item = in_array( $inner_block->name, static::$nav_blocks_wrapped_in_list_item, true );
+
+			if ( $is_list_item && ! $is_list_open ) {
+				$is_list_open       = true;
+				$inner_blocks_html .= sprintf(
+					'<ul %1$s>',
+					$container_attributes
+				);
+			}
+
+			if ( ! $is_list_item && $is_list_open ) {
+				$is_list_open       = false;
+				$inner_blocks_html .= '</ul>';
+			}
+
+			$inner_blocks_html .= static::get_markup_for_inner_block( $inner_block );
+		}
+
+		if ( $is_list_open ) {
+			$inner_blocks_html .= '</ul>';
+		}
+
+		// Add directives to the submenu if needed.
+		if ( $has_submenus && $is_interactive ) {
+			$tags              = new WP_HTML_Tag_Processor( $inner_blocks_html );
+			$inner_blocks_html = block_core_navigation_add_directives_to_submenu( $tags, $attributes );
+		}
+
+		return $inner_blocks_html;
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block from the navigation post.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks_from_navigation_post( $attributes ) {
+		$navigation_post = get_post( $attributes['ref'] );
+		if ( ! isset( $navigation_post ) ) {
+			return new WP_Block_List( array(), $attributes );
+		}
+
+		// Only published posts are valid. If this is changed then a corresponding change
+		// must also be implemented in `use-navigation-menu.js`.
+		if ( 'publish' === $navigation_post->post_status ) {
+			$parsed_blocks = parse_blocks( $navigation_post->post_content );
+
+			// 'parse_blocks' includes a null block with '\n\n' as the content when
+			// it encounters whitespace. This code strips it.
+			$compacted_blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
+
+			// TODO - this uses the full navigation block attributes for the
+			// context which could be refined.
+			return new WP_Block_List( $compacted_blocks, $attributes );
+		}
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block from the fallback.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks_from_fallback( $attributes ) {
+		$fallback_blocks = block_core_navigation_get_fallback_blocks();
+
+		// Fallback my have been filtered so do basic test for validity.
+		if ( empty( $fallback_blocks ) || ! is_array( $fallback_blocks ) ) {
+			return new WP_Block_List( array(), $attributes );
+		}
+
+		return new WP_Block_List( $fallback_blocks, $attributes );
+	}
+
+	/**
+	 * Gets the inner blocks for the navigation block.
+	 *
+	 * @param array    $attributes The block attributes.
+	 * @param WP_Block $block The parsed block.
+	 * @return WP_Block_List Returns the inner blocks for the navigation block.
+	 */
+	private static function get_inner_blocks( $attributes, $block ) {
+		$inner_blocks = $block->inner_blocks;
+
+		// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
+		if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
+			$attributes['ref'] = $attributes['navigationMenuId'];
+		}
+
+		// If:
+		// - the gutenberg plugin is active
+		// - `__unstableLocation` is defined
+		// - we have menu items at the defined location
+		// - we don't have a relationship to a `wp_navigation` Post (via `ref`).
+		// ...then create inner blocks from the classic menu assigned to that location.
+		if (
+			defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN &&
+			array_key_exists( '__unstableLocation', $attributes ) &&
+			! array_key_exists( 'ref', $attributes ) &&
+			! empty( block_core_navigation_get_menu_items_at_location( $attributes['__unstableLocation'] ) )
+		) {
+			$inner_blocks = block_core_navigation_get_inner_blocks_from_unstable_location( $attributes );
+		}
+
+		// Load inner blocks from the navigation post.
+		if ( array_key_exists( 'ref', $attributes ) ) {
+			$inner_blocks = static::get_inner_blocks_from_navigation_post( $attributes );
+		}
+
+		// If there are no inner blocks then fallback to rendering an appropriate fallback.
+		if ( empty( $inner_blocks ) ) {
+			$inner_blocks = static::get_inner_blocks_from_fallback( $attributes );
+		}
+
+		/**
+		 * Filter navigation block $inner_blocks.
+		 * Allows modification of a navigation block menu items.
+		 *
+		 * @since 6.1.0
+		 *
+		 * @param \WP_Block_List $inner_blocks
+		 */
+		$inner_blocks = apply_filters( 'block_core_navigation_render_inner_blocks', $inner_blocks );
+
+		$post_ids = block_core_navigation_get_post_ids( $inner_blocks );
+		if ( $post_ids ) {
+			_prime_post_caches( $post_ids, false, false );
+		}
+
+		return $inner_blocks;
+	}
+
+	/**
+	 * Gets the name of the current navigation, if it has one.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the name of the navigation.
+	 */
+	private static function get_navigation_name( $attributes ) {
+
+		$navigation_name = $attributes['ariaLabel'] ?? '';
+
+		// Load the navigation post.
+		if ( array_key_exists( 'ref', $attributes ) ) {
+			$navigation_post = get_post( $attributes['ref'] );
+			if ( ! isset( $navigation_post ) ) {
+				return $navigation_name;
+			}
+
+			// Only published posts are valid. If this is changed then a corresponding change
+			// must also be implemented in `use-navigation-menu.js`.
+			if ( 'publish' === $navigation_post->post_status ) {
+				$navigation_name = $navigation_post->post_title;
+
+				// This is used to count the number of times a navigation name has been seen,
+				// so that we can ensure every navigation has a unique id.
+				if ( isset( static::$seen_menu_names[ $navigation_name ] ) ) {
+					++static::$seen_menu_names[ $navigation_name ];
+				} else {
+					static::$seen_menu_names[ $navigation_name ] = 1;
+				}
+			}
+		}
+
+		return $navigation_name;
+	}
+
+	/**
+	 * Returns the layout class for the navigation block.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the layout class for the navigation block.
+	 */
+	private static function get_layout_class( $attributes ) {
+		$layout_justification = array(
+			'left'          => 'items-justified-left',
+			'right'         => 'items-justified-right',
+			'center'        => 'items-justified-center',
+			'space-between' => 'items-justified-space-between',
+		);
+
+		$layout_class = '';
+		if (
+			isset( $attributes['layout']['justifyContent'] ) &&
+			isset( $layout_justification[ $attributes['layout']['justifyContent'] ] )
+		) {
+			$layout_class .= $layout_justification[ $attributes['layout']['justifyContent'] ];
+		}
+		if ( isset( $attributes['layout']['orientation'] ) && 'vertical' === $attributes['layout']['orientation'] ) {
+			$layout_class .= ' is-vertical';
+		}
+
+		if ( isset( $attributes['layout']['flexWrap'] ) && 'nowrap' === $attributes['layout']['flexWrap'] ) {
+			$layout_class .= ' no-wrap';
+		}
+		return $layout_class;
+	}
+
+	/**
+	 * Return classes for the navigation block.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the classes for the navigation block.
+	 */
+	private static function get_classes( $attributes ) {
+		// Restore legacy classnames for submenu positioning.
+		$layout_class       = static::get_layout_class( $attributes );
+		$colors             = block_core_navigation_build_css_colors( $attributes );
+		$font_sizes         = block_core_navigation_build_css_font_sizes( $attributes );
+		$is_responsive_menu = static::is_responsive( $attributes );
+
+		// Manually add block support text decoration as CSS class.
+		$text_decoration       = $attributes['style']['typography']['textDecoration'] ?? null;
+		$text_decoration_class = sprintf( 'has-text-decoration-%s', $text_decoration );
+
+		// Sets the is-collapsed class when the navigation is set to always use the overlay.
+		// This saves us from needing to do this check in the view.js file (see the collapseNav function).
+		$is_collapsed_class = static::is_always_overlay( $attributes ) ? array( 'is-collapsed' ) : array();
+
+		$classes = array_merge(
+			$colors['css_classes'],
+			$font_sizes['css_classes'],
+			$is_responsive_menu ? array( 'is-responsive' ) : array(),
+			$layout_class ? array( $layout_class ) : array(),
+			$text_decoration ? array( $text_decoration_class ) : array(),
+			$is_collapsed_class
+		);
+		return implode( ' ', $classes );
+	}
+
+	private static function is_always_overlay( $attributes ) {
+		return isset( $attributes['overlayMenu'] ) && 'always' === $attributes['overlayMenu'];
+	}
+
+	/**
+	 * Get styles for the navigation block.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns the styles for the navigation block.
+	 */
+	private static function get_styles( $attributes ) {
+		$colors       = block_core_navigation_build_css_colors( $attributes );
+		$font_sizes   = block_core_navigation_build_css_font_sizes( $attributes );
+		$block_styles = isset( $attributes['styles'] ) ? $attributes['styles'] : '';
+		return $block_styles . $colors['inline_styles'] . $font_sizes['inline_styles'];
+	}
+
+	/**
+	 * Get the responsive container markup
+	 *
+	 * @param array         $attributes The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @param string        $inner_blocks_html The markup for the inner blocks.
+	 * @return string Returns the container markup.
+	 */
+	private static function get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html ) {
+		$is_interactive  = static::is_interactive( $attributes, $inner_blocks );
+		$colors          = block_core_navigation_build_css_colors( $attributes );
+		$modal_unique_id = wp_unique_id( 'modal-' );
+
+		$responsive_container_classes = array(
+			'wp-block-navigation__responsive-container',
+			implode( ' ', $colors['overlay_css_classes'] ),
+		);
+		$open_button_classes          = array(
+			'wp-block-navigation__responsive-container-open',
+		);
+
+		$should_display_icon_label = isset( $attributes['hasIcon'] ) && true === $attributes['hasIcon'];
+		$toggle_button_icon        = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true" focusable="false"><rect x="4" y="7.5" width="16" height="1.5" /><rect x="4" y="15" width="16" height="1.5" /></svg>';
+		if ( isset( $attributes['icon'] ) ) {
+			if ( 'menu' === $attributes['icon'] ) {
+				$toggle_button_icon = '<svg width="24" height="24" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24"><path d="M5 5v1.5h14V5H5zm0 7.8h14v-1.5H5v1.5zM5 19h14v-1.5H5V19z" /></svg>';
+			}
+		}
+		$toggle_button_content       = $should_display_icon_label ? $toggle_button_icon : __( 'Menu' );
+		$toggle_close_button_icon    = '<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" width="24" height="24" aria-hidden="true" focusable="false"><path d="M13 11.8l6.1-6.3-1-1-6.1 6.2-6.1-6.2-1 1 6.1 6.3-6.5 6.7 1 1 6.5-6.6 6.5 6.6 1-1z"></path></svg>';
+		$toggle_close_button_content = $should_display_icon_label ? $toggle_close_button_icon : __( 'Close' );
+		$toggle_aria_label_open      = $should_display_icon_label ? 'aria-label="' . __( 'Open menu' ) . '"' : ''; // Open button label.
+		$toggle_aria_label_close     = $should_display_icon_label ? 'aria-label="' . __( 'Close menu' ) . '"' : ''; // Close button label.
+
+		// Add Interactivity API directives to the markup if needed.
+		$open_button_directives          = '';
+		$responsive_container_directives = '';
+		$responsive_dialog_directives    = '';
+		$close_button_directives         = '';
+		if ( $is_interactive ) {
+			$open_button_directives                  = '
+				data-wp-on--click="actions.openMenuOnClick"
+				data-wp-on--keydown="actions.handleMenuKeydown"
+			';
+			$responsive_container_directives         = '
+				data-wp-class--has-modal-open="state.isMenuOpen"
+				data-wp-class--is-menu-open="state.isMenuOpen"
+				data-wp-watch="callbacks.initMenu"
+				data-wp-on--keydown="actions.handleMenuKeydown"
+				data-wp-on--focusout="actions.handleMenuFocusout"
+				tabindex="-1"
+			';
+			$responsive_dialog_directives            = '
+				data-wp-bind--aria-modal="state.ariaModal"
+				data-wp-bind--aria-label="state.ariaLabel"
+				data-wp-bind--role="state.roleAttribute"
+			';
+			$close_button_directives                 = '
+				data-wp-on--click="actions.closeMenuOnClick"
+			';
+			$responsive_container_content_directives = '
+				data-wp-watch="callbacks.focusFirstElement"
+			';
+		}
+
+		return sprintf(
+			'<button aria-haspopup="dialog" %3$s class="%6$s" %10$s>%8$s</button>
+				<div class="%5$s" style="%7$s" id="%1$s" %11$s>
+					<div class="wp-block-navigation__responsive-close" tabindex="-1">
+						<div class="wp-block-navigation__responsive-dialog" %12$s>
+							<button %4$s class="wp-block-navigation__responsive-container-close" %13$s>%9$s</button>
+							<div class="wp-block-navigation__responsive-container-content" %14$s id="%1$s-content">
+								%2$s
+							</div>
+						</div>
+					</div>
+				</div>',
+			esc_attr( $modal_unique_id ),
+			$inner_blocks_html,
+			$toggle_aria_label_open,
+			$toggle_aria_label_close,
+			esc_attr( implode( ' ', $responsive_container_classes ) ),
+			esc_attr( implode( ' ', $open_button_classes ) ),
+			esc_attr( safecss_filter_attr( $colors['overlay_inline_styles'] ) ),
+			$toggle_button_content,
+			$toggle_close_button_content,
+			$open_button_directives,
+			$responsive_container_directives,
+			$responsive_dialog_directives,
+			$close_button_directives,
+			$responsive_container_content_directives
+		);
+	}
+
+	/**
+	 * Get the wrapper attributes
+	 *
+	 * @param array         $attributes    The block attributes.
+	 * @param WP_Block_List $inner_blocks  A list of inner blocks.
+	 * @return string Returns the navigation block markup.
+	 */
+	private static function get_nav_wrapper_attributes( $attributes, $inner_blocks ) {
+		$nav_menu_name      = static::get_unique_navigation_name( $attributes );
+		$is_interactive     = static::is_interactive( $attributes, $inner_blocks );
+		$is_responsive_menu = static::is_responsive( $attributes );
+		$style              = static::get_styles( $attributes );
+		$class              = static::get_classes( $attributes );
+		$wrapper_attributes = get_block_wrapper_attributes(
+			array(
+				'class'      => $class,
+				'style'      => $style,
+				'aria-label' => $nav_menu_name,
+			)
+		);
+
+		if ( $is_responsive_menu ) {
+			$nav_element_directives = static::get_nav_element_directives( $is_interactive, $attributes );
+			$wrapper_attributes    .= ' ' . $nav_element_directives;
+		}
+
+		return $wrapper_attributes;
+	}
+
+	/**
+	 * Gets the nav element directives.
+	 *
+	 * @param bool  $is_interactive Whether the block is interactive.
+	 * @param array $attributes     The block attributes.
+	 * @return string the directives for the navigation element.
+	 */
+	private static function get_nav_element_directives( $is_interactive, $attributes ) {
+		if ( ! $is_interactive ) {
+			return '';
+		}
+		// When adding to this array be mindful of security concerns.
+		$nav_element_context    = wp_json_encode(
+			array(
+				'overlayOpenedBy' => array(),
+				'type'            => 'overlay',
+				'roleAttribute'   => '',
+				'ariaLabel'       => __( 'Menu' ),
+			),
+			JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
+		);
+		$nav_element_directives = '
+			data-wp-interactive=\'{"namespace":"core/navigation"}\'
+			data-wp-context=\'' . $nav_element_context . '\'
+		';
+
+		/*
+		* When the navigation's 'overlayMenu' attribute is set to 'always', JavaScript
+		* is not needed for collapsing the menu because the class is set manually.
+		*/
+		if ( ! static::is_always_overlay( $attributes ) ) {
+			$nav_element_directives .= 'data-wp-init="callbacks.initNav"';
+			$nav_element_directives .= ' '; // space separator
+			$nav_element_directives .= 'data-wp-class--is-collapsed="context.isCollapsed"';
+		}
+
+		return $nav_element_directives;
+	}
+
+	/**
+	 * Handle view script module loading.
+	 *
+	 * @param array         $attributes   The block attributes.
+	 * @param WP_Block      $block        The parsed block.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 */
+	private static function handle_view_script_module_loading( $attributes, $block, $inner_blocks ) {
+		if ( static::is_interactive( $attributes, $inner_blocks ) ) {
+			wp_enqueue_script_module( '@wordpress/block-library/navigation-block' );
+		}
+	}
+
+	/**
+	 * Returns the markup for the navigation block.
+	 *
+	 * @param array         $attributes The block attributes.
+	 * @param WP_Block_List $inner_blocks The list of inner blocks.
+	 * @return string Returns the navigation wrapper markup.
+	 */
+	private static function get_wrapper_markup( $attributes, $inner_blocks ) {
+		$inner_blocks_html = static::get_inner_blocks_html( $attributes, $inner_blocks );
+		if ( static::is_responsive( $attributes ) ) {
+			return static::get_responsive_container_markup( $attributes, $inner_blocks, $inner_blocks_html );
+		}
+		return $inner_blocks_html;
+	}
+
+	/**
+	 * Returns a unique name for the navigation.
+	 *
+	 * @param array $attributes The block attributes.
+	 * @return string Returns a unique name for the navigation.
+	 */
+	private static function get_unique_navigation_name( $attributes ) {
+		$nav_menu_name = static::get_navigation_name( $attributes );
+
+		// If the menu name has been used previously then append an ID
+		// to the name to ensure uniqueness across a given post.
+		if ( isset( static::$seen_menu_names[ $nav_menu_name ] ) && static::$seen_menu_names[ $nav_menu_name ] > 1 ) {
+			$count         = static::$seen_menu_names[ $nav_menu_name ];
+			$nav_menu_name = $nav_menu_name . ' ' . ( $count );
+		}
+
+		return $nav_menu_name;
+	}
+
+	/**
+	 * Renders the navigation block.
+	 *
+	 * @param array    $attributes The block attributes.
+	 * @param string   $content    The saved content.
+	 * @param WP_Block $block      The parsed block.
+	 * @return string Returns the navigation block markup.
+	 */
+	public static function render( $attributes, $content, $block ) {
+		/**
+		 * Deprecated:
+		 * The rgbTextColor and rgbBackgroundColor attributes
+		 * have been deprecated in favor of
+		 * customTextColor and customBackgroundColor ones.
+		 * Move the values from old attrs to the new ones.
+		 */
+		if ( isset( $attributes['rgbTextColor'] ) && empty( $attributes['textColor'] ) ) {
+			$attributes['customTextColor'] = $attributes['rgbTextColor'];
+		}
+
+		if ( isset( $attributes['rgbBackgroundColor'] ) && empty( $attributes['backgroundColor'] ) ) {
+			$attributes['customBackgroundColor'] = $attributes['rgbBackgroundColor'];
+		}
+
+		unset( $attributes['rgbTextColor'], $attributes['rgbBackgroundColor'] );
+
+		$inner_blocks = static::get_inner_blocks( $attributes, $block );
+		// Prevent navigation blocks referencing themselves from rendering.
+		if ( block_core_navigation_block_contains_core_navigation( $inner_blocks ) ) {
+			return '';
+		}
+
+		static::handle_view_script_module_loading( $attributes, $block, $inner_blocks );
+
+		return sprintf(
+			'<nav %1$s>%2$s</nav>',
+			static::get_nav_wrapper_attributes( $attributes, $inner_blocks ),
+			static::get_wrapper_markup( $attributes, $inner_blocks )
+		);
+	}
+}
+
 // These functions are used for the __unstableLocation feature and only active
 // when the gutenberg plugin is active.
 if ( defined( 'IS_GUTENBERG_PLUGIN' ) && IS_GUTENBERG_PLUGIN ) {
diff --git a/phpcs.xml.dist b/phpcs.xml.dist
index a603ab142729c..ecc800f989241 100644
--- a/phpcs.xml.dist
+++ b/phpcs.xml.dist
@@ -66,6 +66,7 @@
 	<!-- Ignore filename error since it requires WP core build process change -->
 	<rule ref="WordPress.Files.FileName.InvalidClassFileName">
 		<exclude-pattern>/phpunit/*</exclude-pattern>
+		<exclude-pattern>packages/block-library/src/navigation/index.php</exclude-pattern>
 	</rule>
 
 	<!-- Ignore empty files in tests/gutenberg-test-themes -->
diff --git a/phpunit/blocks/render-block-navigation-test.php b/phpunit/blocks/render-block-navigation-test.php
index b8266d510ad6c..c9b552d17f4e4 100644
--- a/phpunit/blocks/render-block-navigation-test.php
+++ b/phpunit/blocks/render-block-navigation-test.php
@@ -66,23 +66,23 @@ public function test_block_core_navigation_get_post_ids_from_block_with_submenu(
 	}
 
 	/**
-	 * @covers :: gutengberg_block_core_navigation_block_contains_core_navigation
+	 * @covers :: block_core_navigation_block_contains_core_navigation
 	 */
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation() {
+	public function test_block_core_navigation_block_contains_core_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:navigation /-->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertTrue( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_deep() {
+	public function test_block_core_navigation_block_contains_core_navigation_deep() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- /wp:group --><!-- wp:group --><!-- wp:group --><!-- wp:navigation /--><!-- /wp:group --><!-- /wp:group -->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertTrue( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertTrue( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 
-	public function test_gutenberg_block_core_navigation_block_contains_core_navigation_no_navigation() {
+	public function test_block_core_navigation_block_contains_core_navigation_no_navigation() {
 		$parsed_blocks = parse_blocks( '<!-- wp:group --><!-- wp:group --><!-- /wp:group --><!-- /wp:group -->' );
 		$inner_blocks  = new WP_Block_List( $parsed_blocks );
-		$this->assertFalse( gutenberg_block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
+		$this->assertFalse( block_core_navigation_block_contains_core_navigation( $inner_blocks ) );
 	}
 }
diff --git a/phpunit/class-wp-navigation-block-renderer-test.php b/phpunit/class-wp-navigation-block-renderer-test.php
index 124e0fe91bd1e..6bcf08c179e90 100644
--- a/phpunit/class-wp-navigation-block-renderer-test.php
+++ b/phpunit/class-wp-navigation-block-renderer-test.php
@@ -25,7 +25,7 @@ public function test_gutenberg_default_block_is_enclosed_in_li_tags() {
 		$navigation_link_block = new WP_Block( $parsed_block, $context );
 
 		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
-		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer' );
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
 		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
 		$method->setAccessible( true );
 		// Invoke the private method.
@@ -53,7 +53,7 @@ public function test_gutenberg_get_markup_for_inner_block_site_title() {
 		$site_title_block = new WP_Block( $parsed_block, $context );
 
 		// Setup an empty testing instance of `WP_Navigation_Block_Renderer` and save the original.
-		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer' );
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
 		$method     = $reflection->getMethod( 'get_markup_for_inner_block' );
 		$method->setAccessible( true );
 		// Invoke the private method.
@@ -71,7 +71,7 @@ public function test_gutenberg_get_markup_for_inner_block_site_title() {
 	 * @covers WP_Navigation_Block_Renderer::get_inner_blocks_from_navigation_post
 	 */
 	public function test_gutenberg_get_inner_blocks_from_navigation_post_returns_empty_block_list() {
-		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer' );
+		$reflection = new ReflectionClass( 'WP_Navigation_Block_Renderer_Gutenberg' );
 		$method     = $reflection->getMethod( 'get_inner_blocks_from_navigation_post' );
 		$method->setAccessible( true );
 		$attributes = array( 'ref' => 0 );
diff --git a/tools/webpack/blocks.js b/tools/webpack/blocks.js
index d599980b951a9..080ee2e01242b 100644
--- a/tools/webpack/blocks.js
+++ b/tools/webpack/blocks.js
@@ -35,6 +35,8 @@ const prefixFunctions = [
 	'wp_get_global_settings',
 ];
 
+const classesToSuffix = [ 'WP_Navigation_Block_Renderer' ];
+
 /**
  * Escapes the RegExp special characters.
  *
@@ -139,9 +141,10 @@ module.exports = [
 							},
 							transform: ( content ) => {
 								const prefix = 'gutenberg_';
+								const classSuffix = 'Gutenberg';
 								content = content.toString();
 
-								// Within content, search and prefix any function calls from
+								// Within content, search and prefix any function calls from the
 								// `prefixFunctions` list. This is needed because some functions
 								// are called inside block files, but have been declared elsewhere.
 								// So with the rename we can call Gutenberg override functions, but the
@@ -158,6 +161,19 @@ module.exports = [
 										) }`
 								);
 
+								// Within content, search and prefix any classes calls from the
+								// `classesToSuffix` list. This is needed because some classes
+								// are called inside block files, but also exist in core.
+								// With the rename we can use the Gutenberg class in the plugin,
+								// without having to worry about duplicate class names with core.
+								content = content.replace(
+									new RegExp(
+										classesToSuffix.join( '|' ),
+										'g'
+									),
+									( match ) => `${ match }_${ classSuffix }`
+								);
+
 								// Within content, search for any function definitions. For
 								// each, replace every other reference to it in the file.
 								return (

From 49df0a87e264ad9fd188ef2195d5515b1288daca Mon Sep 17 00:00:00 2001
From: Nik Tsekouras <ntsekouras@outlook.com>
Date: Wed, 24 Jan 2024 17:16:33 +0200
Subject: [PATCH 274/296] Query Loop: Fix posts list variation detection
 (#58194)

---
 .../src/utils/block-variation-transforms.js   | 38 --------
 packages/block-editor/src/utils/index.js      |  1 -
 .../utils/test/block-variation-transforms.js  | 94 -------------------
 .../src/query/edit/query-placeholder.js       | 22 ++---
 .../block-library/src/query/variations.js     |  4 +
 5 files changed, 15 insertions(+), 144 deletions(-)
 delete mode 100644 packages/block-editor/src/utils/block-variation-transforms.js
 delete mode 100644 packages/block-editor/src/utils/test/block-variation-transforms.js

diff --git a/packages/block-editor/src/utils/block-variation-transforms.js b/packages/block-editor/src/utils/block-variation-transforms.js
deleted file mode 100644
index 15b644bd235ee..0000000000000
--- a/packages/block-editor/src/utils/block-variation-transforms.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/** @typedef {import('@wordpress/blocks').WPBlockVariation} WPBlockVariation */
-
-function matchesAttributes( blockAttributes, variation ) {
-	return Object.entries( variation ).every( ( [ key, value ] ) => {
-		if (
-			typeof value === 'object' &&
-			typeof blockAttributes[ key ] === 'object'
-		) {
-			return matchesAttributes( blockAttributes[ key ], value );
-		}
-		return blockAttributes[ key ] === value;
-	} );
-}
-
-/**
- * Matches the provided block variations with a block's attributes. If no match
- * or more than one matches are found it returns `undefined`. If a single match is
- * found it returns it.
- *
- * This is a simple implementation for now as it takes into account only the attributes
- * of a block variation and not `InnerBlocks`.
- *
- * @param {Object}             blockAttributes - The block attributes to try to find a match.
- * @param {WPBlockVariation[]} variations      - A list of block variations to test for a match.
- * @return {WPBlockVariation | undefined} - If a match is found returns it. If not or more than one matches are found returns `undefined`.
- */
-export const __experimentalGetMatchingVariation = (
-	blockAttributes,
-	variations
-) => {
-	if ( ! variations || ! blockAttributes ) return;
-	const matches = variations.filter( ( { attributes } ) => {
-		if ( ! attributes || ! Object.keys( attributes ).length ) return false;
-		return matchesAttributes( blockAttributes, attributes );
-	} );
-	if ( matches.length !== 1 ) return;
-	return matches[ 0 ];
-};
diff --git a/packages/block-editor/src/utils/index.js b/packages/block-editor/src/utils/index.js
index ee3b2692b369a..6f53ba585e5ec 100644
--- a/packages/block-editor/src/utils/index.js
+++ b/packages/block-editor/src/utils/index.js
@@ -1,3 +1,2 @@
 export { default as transformStyles } from './transform-styles';
-export * from './block-variation-transforms';
 export { default as getPxFromCssUnit } from './get-px-from-css-unit';
diff --git a/packages/block-editor/src/utils/test/block-variation-transforms.js b/packages/block-editor/src/utils/test/block-variation-transforms.js
deleted file mode 100644
index 47844ba030942..0000000000000
--- a/packages/block-editor/src/utils/test/block-variation-transforms.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Internal dependencies
- */
-import { __experimentalGetMatchingVariation as getMatchingVariation } from '../block-variation-transforms';
-
-describe( 'getMatchingVariation', () => {
-	describe( 'should not find a match', () => {
-		it( 'when no variations or attributes passed', () => {
-			expect(
-				getMatchingVariation( null, { content: 'hi' } )
-			).toBeUndefined();
-			expect( getMatchingVariation( {} ) ).toBeUndefined();
-		} );
-		it( 'when no variation matched', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation( { level: 4 }, variations )
-			).toBeUndefined();
-		} );
-		it( 'when more than one match found', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 1, content: 'hi' } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 1, content: 'hi', other: 'prop' },
-					variations
-				)
-			).toBeUndefined();
-		} );
-		it( 'when variation is a superset of attributes', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1, content: 'hi' } },
-			];
-			expect(
-				getMatchingVariation( { level: 1, other: 'prop' }, variations )
-			).toBeUndefined();
-		} );
-		it( 'when variation has a nested attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { query: { author: 'somebody' } } },
-				{ name: 'two', attributes: { query: { author: 'nobody' } } },
-			];
-			expect(
-				getMatchingVariation(
-					{ query: { author: 'foobar' }, other: 'prop' },
-					variations
-				)
-			).toBeUndefined();
-		} );
-	} );
-	describe( 'should find a match', () => {
-		it( 'when variation has one attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1 } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 2, content: 'hi', other: 'prop' },
-					variations
-				).name
-			).toEqual( 'two' );
-		} );
-		it( 'when variation has many attributes', () => {
-			const variations = [
-				{ name: 'one', attributes: { level: 1, content: 'hi' } },
-				{ name: 'two', attributes: { level: 2 } },
-			];
-			expect(
-				getMatchingVariation(
-					{ level: 1, content: 'hi', other: 'prop' },
-					variations
-				).name
-			).toEqual( 'one' );
-		} );
-		it( 'when variation has a nested attribute', () => {
-			const variations = [
-				{ name: 'one', attributes: { query: { author: 'somebody' } } },
-				{ name: 'two', attributes: { query: { author: 'nobody' } } },
-			];
-			expect(
-				getMatchingVariation(
-					{ query: { author: 'somebody' }, other: 'prop' },
-					variations
-				).name
-			).toEqual( 'one' );
-		} );
-	} );
-} );
diff --git a/packages/block-library/src/query/edit/query-placeholder.js b/packages/block-library/src/query/edit/query-placeholder.js
index ceb5cb065f75c..1b81a2893ec4f 100644
--- a/packages/block-library/src/query/edit/query-placeholder.js
+++ b/packages/block-library/src/query/edit/query-placeholder.js
@@ -11,7 +11,6 @@ import {
 	useBlockProps,
 	store as blockEditorStore,
 	__experimentalBlockVariationPicker,
-	__experimentalGetMatchingVariation as getMatchingVariation,
 } from '@wordpress/block-editor';
 import { Button, Placeholder } from '@wordpress/components';
 import { __ } from '@wordpress/i18n';
@@ -34,31 +33,32 @@ export default function QueryPlaceholder( {
 		clientId,
 		attributes
 	);
-
-	const { blockType, allVariations, hasPatterns } = useSelect(
+	const { blockType, activeBlockVariation, hasPatterns } = useSelect(
 		( select ) => {
-			const { getBlockVariations, getBlockType } = select( blocksStore );
+			const { getActiveBlockVariation, getBlockType } =
+				select( blocksStore );
 			const { getBlockRootClientId, getPatternsByBlockTypes } =
 				select( blockEditorStore );
 			const rootClientId = getBlockRootClientId( clientId );
 			return {
 				blockType: getBlockType( name ),
-				allVariations: getBlockVariations( name ),
+				activeBlockVariation: getActiveBlockVariation(
+					name,
+					attributes
+				),
 				hasPatterns: !! getPatternsByBlockTypes(
 					blockNameForPatterns,
 					rootClientId
 				).length,
 			};
 		},
-		[ name, blockNameForPatterns, clientId ]
+		[ name, blockNameForPatterns, clientId, attributes ]
 	);
-
-	const matchingVariation = getMatchingVariation( attributes, allVariations );
 	const icon =
-		matchingVariation?.icon?.src ||
-		matchingVariation?.icon ||
+		activeBlockVariation?.icon?.src ||
+		activeBlockVariation?.icon ||
 		blockType?.icon?.src;
-	const label = matchingVariation?.title || blockType?.title;
+	const label = activeBlockVariation?.title || blockType?.title;
 	if ( isStartingBlank ) {
 		return (
 			<QueryVariationPicker
diff --git a/packages/block-library/src/query/variations.js b/packages/block-library/src/query/variations.js
index fb15645760f29..65a73d134981f 100644
--- a/packages/block-library/src/query/variations.js
+++ b/packages/block-library/src/query/variations.js
@@ -39,6 +39,7 @@ const variations = [
 		),
 		icon: postList,
 		attributes: {
+			namespace: 'core/posts-list',
 			query: {
 				perPage: 4,
 				pages: 1,
@@ -53,6 +54,9 @@ const variations = [
 			},
 		},
 		scope: [ 'inserter' ],
+		isActive: ( { namespace, query } ) => {
+			return namespace === 'core/posts-list' && query.postType === 'post';
+		},
 	},
 	{
 		name: 'title-date',

From 0227f403c70d96fcb65f11394cc58d74e3cf44e6 Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Wed, 24 Jan 2024 19:17:13 +0400
Subject: [PATCH 275/296] Post Lock: Use the new modal size preset (#58197)

---
 packages/editor/src/components/post-locked-modal/index.js   | 2 +-
 packages/editor/src/components/post-locked-modal/style.scss | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/packages/editor/src/components/post-locked-modal/index.js b/packages/editor/src/components/post-locked-modal/index.js
index ea21c61de1e15..7597bd9b4f3f3 100644
--- a/packages/editor/src/components/post-locked-modal/index.js
+++ b/packages/editor/src/components/post-locked-modal/index.js
@@ -172,7 +172,7 @@ export default function PostLockedModal() {
 			shouldCloseOnClickOutside={ false }
 			shouldCloseOnEsc={ false }
 			isDismissible={ false }
-			className="editor-post-locked-modal"
+			size="medium"
 		>
 			<HStack alignment="top" spacing={ 6 }>
 				{ !! userAvatar && (
diff --git a/packages/editor/src/components/post-locked-modal/style.scss b/packages/editor/src/components/post-locked-modal/style.scss
index 9225032b6d228..03e86642493df 100644
--- a/packages/editor/src/components/post-locked-modal/style.scss
+++ b/packages/editor/src/components/post-locked-modal/style.scss
@@ -1,9 +1,3 @@
-.editor-post-locked-modal {
-	@include break-small() {
-		max-width: $break-mobile;
-	}
-}
-
 .editor-post-locked-modal__buttons {
 	margin-top: $grid-unit-30;
 }

From 015d8b5b6c344938ed2d89375388b3a64ff9a661 Mon Sep 17 00:00:00 2001
From: Michal <mmczaplinski@gmail.com>
Date: Wed, 24 Jan 2024 16:51:42 +0000
Subject: [PATCH 276/296] Block Bindings: Remove the experimental flag (#58089)

* Remove the experimental flag for Block Bindings

* Move block-bindings to `compat/wordpress-6.5` folder.

* Remove the need for the experiment flag in the pattern overrides e2e tests

* `require` the files in load.php instead

* Fix the order of the requires

* Update comment fromat in blocks.php

Co-authored-by: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>

* Remove changes that sneaked in during the rebase

* Remove other changes that sneaked in during rebase

* One more fix for the bad rebase

* Add 'linkTarget' property to core/button block in $allowed_blocks

---------

Co-authored-by: Daniel Richards <daniel.richards@automattic.com>
Co-authored-by: Carlos Bravo <37012961+c4rl0sbr4v0@users.noreply.github.com>
---
 .../block-bindings/block-bindings.php         |  0
 .../class-wp-block-bindings.php               |  0
 .../block-bindings/sources/pattern.php        |  0
 .../block-bindings/sources/post-meta.php      |  0
 lib/compat/wordpress-6.5/blocks.php           | 79 +++++++++++++++++
 lib/experimental/block-bindings/index.php     | 17 ----
 lib/experimental/blocks.php                   | 85 -------------------
 lib/experimental/editor-settings.php          |  5 --
 lib/experiments-page.php                      | 12 ---
 lib/load.php                                  |  5 ++
 .../editor/various/pattern-overrides.spec.js  |  4 -
 11 files changed, 84 insertions(+), 123 deletions(-)
 rename lib/{experimental => compat/wordpress-6.5}/block-bindings/block-bindings.php (100%)
 rename lib/{experimental => compat/wordpress-6.5}/block-bindings/class-wp-block-bindings.php (100%)
 rename lib/{experimental => compat/wordpress-6.5}/block-bindings/sources/pattern.php (100%)
 rename lib/{experimental => compat/wordpress-6.5}/block-bindings/sources/post-meta.php (100%)
 delete mode 100644 lib/experimental/block-bindings/index.php

diff --git a/lib/experimental/block-bindings/block-bindings.php b/lib/compat/wordpress-6.5/block-bindings/block-bindings.php
similarity index 100%
rename from lib/experimental/block-bindings/block-bindings.php
rename to lib/compat/wordpress-6.5/block-bindings/block-bindings.php
diff --git a/lib/experimental/block-bindings/class-wp-block-bindings.php b/lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php
similarity index 100%
rename from lib/experimental/block-bindings/class-wp-block-bindings.php
rename to lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php
diff --git a/lib/experimental/block-bindings/sources/pattern.php b/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
similarity index 100%
rename from lib/experimental/block-bindings/sources/pattern.php
rename to lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
diff --git a/lib/experimental/block-bindings/sources/post-meta.php b/lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php
similarity index 100%
rename from lib/experimental/block-bindings/sources/post-meta.php
rename to lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php
diff --git a/lib/compat/wordpress-6.5/blocks.php b/lib/compat/wordpress-6.5/blocks.php
index f5a9968f9210b..dccaeba5cc335 100644
--- a/lib/compat/wordpress-6.5/blocks.php
+++ b/lib/compat/wordpress-6.5/blocks.php
@@ -45,3 +45,82 @@ function gutenberg_register_metadata_attribute( $args ) {
 	return $args;
 }
 add_filter( 'register_block_type_args', 'gutenberg_register_metadata_attribute' );
+
+
+if ( ! function_exists( 'gutenberg_process_block_bindings' ) ) {
+	/**
+	 * Process the block bindings attribute.
+	 *
+	 * @param string   $block_content Block Content.
+	 * @param array    $block Block attributes.
+	 * @param WP_Block $block_instance The block instance.
+	 */
+	function gutenberg_process_block_bindings( $block_content, $block, $block_instance ) {
+
+		// Allowed blocks that support block bindings.
+		// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
+		$allowed_blocks = array(
+			'core/paragraph' => array( 'content' ),
+			'core/heading'   => array( 'content' ),
+			'core/image'     => array( 'url', 'title', 'alt' ),
+			'core/button'    => array( 'url', 'text', 'linkTarget' ),
+		);
+
+		// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
+		if ( ! isset( $block['attrs']['metadata']['bindings'] ) || ! isset( $allowed_blocks[ $block_instance->name ] ) ) {
+			return $block_content;
+		}
+
+		/*
+		 * Assuming the following format for the bindings property of the "metadata" attribute:
+		 *
+		 * "bindings": {
+		 *   "title": {
+		 *     "source": {
+		 *       "name": "post_meta",
+		 *       "attributes": { "value": "text_custom_field" }
+		 *     }
+		 *   },
+		 *   "url": {
+		 *     "source": {
+		 *       "name": "post_meta",
+		 *       "attributes": { "value": "text_custom_field" }
+		 *     }
+		 *   }
+		 * }
+		 */
+
+		$block_bindings_sources = wp_block_bindings_get_sources();
+		$modified_block_content = $block_content;
+		foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
+
+			// If the attribute is not in the list, process next attribute.
+			if ( ! in_array( $binding_attribute, $allowed_blocks[ $block_instance->name ], true ) ) {
+				continue;
+			}
+			// If no source is provided, or that source is not registered, process next attribute.
+			if ( ! isset( $binding_source['source'] ) || ! isset( $binding_source['source']['name'] ) || ! isset( $block_bindings_sources[ $binding_source['source']['name'] ] ) ) {
+				continue;
+			}
+
+			$source_callback = $block_bindings_sources[ $binding_source['source']['name'] ]['apply'];
+			// Get the value based on the source.
+			if ( ! isset( $binding_source['source']['attributes'] ) ) {
+				$source_args = array();
+			} else {
+				$source_args = $binding_source['source']['attributes'];
+			}
+			$source_value = $source_callback( $source_args, $block_instance, $binding_attribute );
+			// If the value is null, process next attribute.
+			if ( is_null( $source_value ) ) {
+				continue;
+			}
+
+			// Process the HTML based on the block and the attribute.
+			$modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
+		}
+		return $modified_block_content;
+	}
+}
+
+add_filter( 'render_block', 'gutenberg_process_block_bindings', 20, 3 );
diff --git a/lib/experimental/block-bindings/index.php b/lib/experimental/block-bindings/index.php
deleted file mode 100644
index cf9cc318b1c92..0000000000000
--- a/lib/experimental/block-bindings/index.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Require the necessary files.
- *
- * @package gutenberg
- */
-
-require_once __DIR__ . '/class-wp-block-bindings.php';
-require_once __DIR__ . '/block-bindings.php';
-// Register the sources.
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments ) {
-	if ( array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
-		require_once __DIR__ . '/sources/pattern.php';
-		require_once __DIR__ . '/sources/post-meta.php';
-	}
-}
diff --git a/lib/experimental/blocks.php b/lib/experimental/blocks.php
index 39ac86970367c..fc67f2c9d4377 100644
--- a/lib/experimental/blocks.php
+++ b/lib/experimental/blocks.php
@@ -77,88 +77,3 @@ function wp_enqueue_block_view_script( $block_name, $args ) {
 		add_filter( 'render_block', $callback, 10, 2 );
 	}
 }
-
-$gutenberg_experiments = get_option( 'gutenberg-experiments' );
-if ( $gutenberg_experiments && (
-	array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments )
-) ) {
-
-	require_once __DIR__ . '/block-bindings/index.php';
-
-	if ( ! function_exists( 'gutenberg_process_block_bindings' ) ) {
-		/**
-		 * Process the block bindings attribute.
-		 *
-		 * @param string   $block_content Block Content.
-		 * @param array    $block Block attributes.
-		 * @param WP_Block $block_instance The block instance.
-		 */
-		function gutenberg_process_block_bindings( $block_content, $block, $block_instance ) {
-
-			// Allowed blocks that support block bindings.
-			// TODO: Look for a mechanism to opt-in for this. Maybe adding a property to block attributes?
-			$allowed_blocks = array(
-				'core/paragraph' => array( 'content' ),
-				'core/heading'   => array( 'content' ),
-				'core/image'     => array( 'url', 'title', 'alt' ),
-				'core/button'    => array( 'url', 'text', 'linkTarget' ),
-			);
-
-			// If the block doesn't have the bindings property or isn't one of the allowed block types, return.
-			if ( ! isset( $block['attrs']['metadata']['bindings'] ) || ! isset( $allowed_blocks[ $block_instance->name ] ) ) {
-				return $block_content;
-			}
-
-			// Assuming the following format for the bindings property of the "metadata" attribute:
-			//
-			// "bindings": {
-			//   "title": {
-			//     "source": {
-			//       "name": "post_meta",
-			//       "attributes": { "value": "text_custom_field" }
-			//     }
-			//   },
-			//   "url": {
-			//     "source": {
-			//       "name": "post_meta",
-			//       "attributes": { "value": "text_custom_field" }
-			//     }
-			//   }
-			// }
-			//
-
-			$block_bindings_sources = wp_block_bindings_get_sources();
-			$modified_block_content = $block_content;
-			foreach ( $block['attrs']['metadata']['bindings'] as $binding_attribute => $binding_source ) {
-
-				// If the attribute is not in the list, process next attribute.
-				if ( ! in_array( $binding_attribute, $allowed_blocks[ $block_instance->name ], true ) ) {
-					continue;
-				}
-				// If no source is provided, or that source is not registered, process next attribute.
-				if ( ! isset( $binding_source['source'] ) || ! isset( $binding_source['source']['name'] ) || ! isset( $block_bindings_sources[ $binding_source['source']['name'] ] ) ) {
-					continue;
-				}
-
-				$source_callback = $block_bindings_sources[ $binding_source['source']['name'] ]['apply'];
-				// Get the value based on the source.
-				if ( ! isset( $binding_source['source']['attributes'] ) ) {
-					$source_args = array();
-				} else {
-					$source_args = $binding_source['source']['attributes'];
-				}
-				$source_value = $source_callback( $source_args, $block_instance, $binding_attribute );
-				// If the value is null, process next attribute.
-				if ( is_null( $source_value ) ) {
-					continue;
-				}
-
-				// Process the HTML based on the block and the attribute.
-				$modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
-			}
-			return $modified_block_content;
-		}
-	}
-
-	add_filter( 'render_block', 'gutenberg_process_block_bindings', 20, 3 );
-}
diff --git a/lib/experimental/editor-settings.php b/lib/experimental/editor-settings.php
index 24590c5cf3eb0..37774e07b2769 100644
--- a/lib/experimental/editor-settings.php
+++ b/lib/experimental/editor-settings.php
@@ -25,11 +25,6 @@ function gutenberg_enable_experiments() {
 	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-group-grid-variation', $gutenberg_experiments ) ) {
 		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalEnableGroupGridVariation = true', 'before' );
 	}
-
-	if ( $gutenberg_experiments && array_key_exists( 'gutenberg-block-bindings', $gutenberg_experiments ) ) {
-		wp_add_inline_script( 'wp-block-editor', 'window.__experimentalBlockBindings = true', 'before' );
-	}
-
 	if ( gutenberg_is_experiment_enabled( 'gutenberg-no-tinymce' ) ) {
 		wp_add_inline_script( 'wp-block-library', 'window.__experimentalDisableTinymce = true', 'before' );
 	}
diff --git a/lib/experiments-page.php b/lib/experiments-page.php
index a38b5c4f11fad..bccbed2195958 100644
--- a/lib/experiments-page.php
+++ b/lib/experiments-page.php
@@ -126,18 +126,6 @@ function gutenberg_initialize_experiments_settings() {
 		)
 	);
 
-	add_settings_field(
-		'gutenberg-custom-fields',
-		__( 'Block Bindings & Custom Fields', 'gutenberg' ),
-		'gutenberg_display_experiment_field',
-		'gutenberg-experiments',
-		'gutenberg_experiments_section',
-		array(
-			'label' => __( 'Test connecting block attributes to different sources like custom fields', 'gutenberg' ),
-			'id'    => 'gutenberg-block-bindings',
-		)
-	);
-
 	register_setting(
 		'gutenberg-experiments',
 		'gutenberg-experiments'
diff --git a/lib/load.php b/lib/load.php
index ea443544d5be4..223a817cc51d0 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -109,6 +109,11 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php';
 require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php';
+require __DIR__ . '/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php';
+require __DIR__ . '/compat/wordpress-6.5/block-bindings/block-bindings.php';
+require __DIR__ . '/compat/wordpress-6.5/block-bindings/sources/post-meta.php';
+require __DIR__ . '/compat/wordpress-6.5/block-bindings/sources/pattern.php';
+
 
 // Experimental features.
 require __DIR__ . '/experimental/block-editor-settings-mobile.php';
diff --git a/test/e2e/specs/editor/various/pattern-overrides.spec.js b/test/e2e/specs/editor/various/pattern-overrides.spec.js
index 56c6b2a7c15f4..ee60091e057c0 100644
--- a/test/e2e/specs/editor/various/pattern-overrides.spec.js
+++ b/test/e2e/specs/editor/various/pattern-overrides.spec.js
@@ -7,9 +7,6 @@ test.describe( 'Pattern Overrides', () => {
 	test.beforeAll( async ( { requestUtils } ) => {
 		await Promise.all( [
 			requestUtils.activateTheme( 'emptytheme' ),
-			requestUtils.setGutenbergExperiments( [
-				'gutenberg-block-bindings',
-			] ),
 			requestUtils.deleteAllBlocks(),
 		] );
 	} );
@@ -20,7 +17,6 @@ test.describe( 'Pattern Overrides', () => {
 
 	test.afterAll( async ( { requestUtils } ) => {
 		await Promise.all( [
-			requestUtils.setGutenbergExperiments( [] ),
 			requestUtils.activateTheme( 'twentytwentyone' ),
 		] );
 	} );

From 7272192d038d691f4bdd540f4ebfe3beeca3eaa0 Mon Sep 17 00:00:00 2001
From: Luis Herranz <luisherranz@gmail.com>
Date: Wed, 24 Jan 2024 18:43:48 +0100
Subject: [PATCH 277/296] Interactivity API: Server Directive Processing
 Refactor (#58066)

* Initial SDP version

* Rename `initialState` to `state`

* Fix incorrect package

* Properly remove the SDP during the e2e tests

* Update multiline comments to fit WP standards

* Add @access private to WP_Interactivity_API_Directives_Processor

* Remove array check and rename bookmarks in WP_Interactivity_API_Directives_Processor

* Dont print config/state if it's empty

* Add failing test for </ >

* Add missing `object` word

* Missing indentation on ternary conditionals

* Improve namespace extraction from directive value

* Move modified properties to the end in set_style_property

* Replace tabindex comment

* Remove filter after processing and bump priority

* Replace own is_void with HTML API one

* Missing ternary indentation

* Avoid early returns

Because they don't seem to work: https://github.com/WordPress/gutenberg/pull/57778#issuecomment-1907684335

* Update wp_register_script_module function

* Replaces some incorrect docblock comments with block comments

* Fix indent ternaries (again)

* Add more info about how extract_directive_value behaves

* Add more edge cases

* Improve wp_interactivity_process_directives_of_interactive_blocks comment

---------

Co-authored-by: Carlos Bravo <carlos.bravo@automattic.com>
---
 ...interactivity-api-directives-processor.php | 143 ++++
 .../class-wp-interactivity-api.php            | 671 ++++++++++++++++++
 .../interactivity-api/interactivity-api.php   | 144 ++++
 .../class-wp-directive-context.php            |  82 ---
 .../class-wp-directive-processor.php          | 283 --------
 .../class-wp-interactivity-initial-state.php  |  82 ---
 .../directive-processing.php                  | 214 ------
 .../interactivity-api/directives/wp-bind.php  |  33 -
 .../interactivity-api/directives/wp-class.php |  37 -
 .../directives/wp-context.php                 |  30 -
 .../directives/wp-interactive.php             |  44 --
 .../interactivity-api/directives/wp-style.php |  73 --
 .../interactivity-api/directives/wp-text.php  |  28 -
 .../interactivity-api/initial-state.php       |  29 -
 .../interactivity-api/modules.php             |  24 -
 lib/load.php                                  |  16 +-
 .../e2e-tests/plugins/interactive-blocks.php  |  16 +-
 .../interactive-blocks/store-tag/render.php   |   4 +-
 packages/interactivity/src/directives.js      |  56 +-
 packages/interactivity/src/store.ts           |   6 +-
 .../class-wp-directive-processor-test.php     | 132 ----
 ...ss-wp-interactivity-initial-state-test.php | 115 ---
 .../directive-processing-test.php             | 521 --------------
 .../directives/wp-bind-test.php               |  48 --
 .../directives/wp-class-test.php              | 103 ---
 .../directives/wp-context-test.php            | 230 ------
 .../directives/wp-style-test.php              |  63 --
 .../directives/wp-text-test.php               |  45 --
 ...activity-api-directives-processor-test.php | 369 ++++++++++
 .../class-wp-interactivity-api-test.php       | 570 +++++++++++++++
 ...lass-wp-interactivity-api-wp-bind-test.php | 338 +++++++++
 ...ass-wp-interactivity-api-wp-class-test.php | 291 ++++++++
 ...s-wp-interactivity-api-wp-context-test.php | 476 +++++++++++++
 ...-interactivity-api-wp-interactive-test.php | 206 ++++++
 ...ass-wp-interactivity-api-wp-style-test.php | 403 +++++++++++
 ...lass-wp-interactivity-api-wp-text-test.php | 123 ++++
 .../interactivity-api-test.php                | 217 ++++++
 .../fixtures/interactivity-utils.ts           |  13 +-
 38 files changed, 4015 insertions(+), 2263 deletions(-)
 create mode 100644 lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php
 create mode 100644 lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
 create mode 100644 lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php
 delete mode 100644 lib/experimental/interactivity-api/class-wp-directive-context.php
 delete mode 100644 lib/experimental/interactivity-api/class-wp-directive-processor.php
 delete mode 100644 lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
 delete mode 100644 lib/experimental/interactivity-api/directive-processing.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-bind.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-class.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-context.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-interactive.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-style.php
 delete mode 100644 lib/experimental/interactivity-api/directives/wp-text.php
 delete mode 100644 lib/experimental/interactivity-api/initial-state.php
 delete mode 100644 lib/experimental/interactivity-api/modules.php
 delete mode 100644 phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directive-processing-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directives/wp-bind-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directives/wp-class-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directives/wp-context-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directives/wp-style-test.php
 delete mode 100644 phpunit/experimental/interactivity-api/directives/wp-text-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-directives-processor-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-bind-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-class-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-context-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-interactive-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-style-test.php
 create mode 100644 phpunit/interactivity-api/class-wp-interactivity-api-wp-text-test.php
 create mode 100644 phpunit/interactivity-api/interactivity-api-test.php

diff --git a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php
new file mode 100644
index 0000000000000..b437bcefa6756
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php
@@ -0,0 +1,143 @@
+<?php
+/**
+ * Interactivity API: WP_Interactivity_API_Directives_Processor class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+if ( ! class_exists( 'WP_Interactivity_API_Directives_Processor' ) ) {
+	/**
+	 * Class used to iterate over the tags of an HTML string and help process the
+	 * directive attributes.
+	 *
+	 * @access private
+	 */
+	class WP_Interactivity_API_Directives_Processor extends Gutenberg_HTML_Tag_Processor_6_5 {
+		/**
+		 * Returns the content between two balanced tags.
+		 *
+		 * @access private
+		 *
+		 * @return string|null The content between the current opening and its matching closing tag or null if it doesn't
+		 *                     find the matching closing tag.
+		 */
+		public function get_content_between_balanced_tags() {
+			$bookmarks = $this->get_balanced_tag_bookmarks();
+			if ( ! $bookmarks ) {
+				return null;
+			}
+			list( $start_name, $end_name ) = $bookmarks;
+
+			$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+			$end   = $this->bookmarks[ $end_name ]->start;
+
+			$this->seek( $start_name );
+			$this->release_bookmark( $start_name );
+			$this->release_bookmark( $end_name );
+
+			return substr( $this->html, $start, $end - $start );
+		}
+
+		/**
+		 * Sets the content between two balanced tags.
+		 *
+		 * @access private
+		 *
+		 * @param string $new_content The string to replace the content between the matching tags.
+		 * @return bool Whether the content was successfully replaced.
+		 */
+		public function set_content_between_balanced_tags( string $new_content ): bool {
+			$this->get_updated_html();
+
+			$bookmarks = $this->get_balanced_tag_bookmarks();
+			if ( ! $bookmarks ) {
+				return false;
+			}
+			list( $start_name, $end_name ) = $bookmarks;
+
+			$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
+			$end   = $this->bookmarks[ $end_name ]->start;
+
+			$this->seek( $start_name );
+			$this->release_bookmark( $start_name );
+			$this->release_bookmark( $end_name );
+
+			$this->lexical_updates[] = new Gutenberg_HTML_Text_Replacement_6_5( $start, $end - $start, esc_html( $new_content ) );
+			return true;
+		}
+
+		/**
+		 * Returns a pair of bookmarks for the current opening tag and the matching
+		 * closing tag.
+		 *
+		 * @return array|null A pair of bookmarks, or null if there's no matching closing tag.
+		 */
+		private function get_balanced_tag_bookmarks() {
+			static $i   = 0;
+			$start_name = 'start_of_balanced_tag_' . ++$i;
+
+			$this->set_bookmark( $start_name );
+			if ( ! $this->next_balanced_closer() ) {
+				$this->release_bookmark( $start_name );
+				return null;
+			}
+
+			$end_name = 'end_of_balanced_tag_' . ++$i;
+			$this->set_bookmark( $end_name );
+
+			return array( $start_name, $end_name );
+		}
+
+		/**
+		 * Finds the matching closing tag for an opening tag.
+		 *
+		 * When called while the processor is on an open tag, it traverses the HTML
+		 * until it finds the matching closing tag, respecting any in-between content,
+		 * including nested tags of the same name. Returns false when called on a
+		 * closing or void tag, or if no matching closing tag was found.
+		 *
+		 * @return bool Whether a matching closing tag was found.
+		 */
+		private function next_balanced_closer(): bool {
+			$depth    = 0;
+			$tag_name = $this->get_tag();
+
+			if ( $this->is_void() ) {
+				return false;
+			}
+
+			while ( $this->next_tag(
+				array(
+					'tag_name'    => $tag_name,
+					'tag_closers' => 'visit',
+				)
+			) ) {
+				if ( ! $this->is_tag_closer() ) {
+					++$depth;
+					continue;
+				}
+
+				if ( 0 === $depth ) {
+					return true;
+				}
+
+				--$depth;
+			}
+
+			return false;
+		}
+
+		/**
+		 * Checks whether the current tag is void.
+		 *
+		 * @access private
+		 *
+		 * @return bool Whether the current tag is void or not.
+		 */
+		public function is_void(): bool {
+			$tag_name = $this->get_tag();
+			return Gutenberg_HTML_Processor_6_5::is_void( null !== $tag_name ? $tag_name : '' );
+		}
+	}
+}
diff --git a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
new file mode 100644
index 0000000000000..de1d8b2a9e789
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
@@ -0,0 +1,671 @@
+<?php
+/**
+ * Interactivity API: WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+if ( ! class_exists( 'WP_Interactivity_API' ) ) {
+	/**
+	 * Class used to process the Interactivity API in the server.
+	 */
+	class WP_Interactivity_API {
+		/**
+		 * Holds the mapping of directive attribute names to their processor methods.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private static $directive_processors = array(
+			'data-wp-interactive' => 'data_wp_interactive_processor',
+			'data-wp-context'     => 'data_wp_context_processor',
+			'data-wp-bind'        => 'data_wp_bind_processor',
+			'data-wp-class'       => 'data_wp_class_processor',
+			'data-wp-style'       => 'data_wp_style_processor',
+			'data-wp-text'        => 'data_wp_text_processor',
+		);
+
+		/**
+		 * Holds the initial state of the different Interactivity API stores.
+		 *
+		 * This state is used during the server directive processing. Then, it is
+		 * serialized and sent to the client as part of the interactivity data to be
+		 * recovered during the hydration of the client interactivity stores.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private $state_data = array();
+
+		/**
+		 * Holds the configuration required by the different Interactivity API stores.
+		 *
+		 * This configuration is serialized and sent to the client as part of the
+		 * interactivity data and can be accessed by the client interactivity stores.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private $config_data = array();
+
+		/**
+		 * Gets and/or sets the initial state of an Interactivity API store for a
+		 * given namespace.
+		 *
+		 * If state for that store namespace already exists, it merges the new
+		 * provided state with the existing one.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $store_namespace The unique store namespace identifier.
+		 * @param array  $state           Optional. The array that will be merged with the existing state for the specified
+		 *                                store namespace.
+		 * @return array The current state for the specified store namespace.
+		 */
+		public function state( string $store_namespace, array $state = null ): array {
+			if ( ! isset( $this->state_data[ $store_namespace ] ) ) {
+				$this->state_data[ $store_namespace ] = array();
+			}
+			if ( is_array( $state ) ) {
+				$this->state_data[ $store_namespace ] = array_replace_recursive(
+					$this->state_data[ $store_namespace ],
+					$state
+				);
+			}
+			return $this->state_data[ $store_namespace ];
+		}
+
+		/**
+		 * Gets and/or sets the configuration of the Interactivity API for a given
+		 * store namespace.
+		 *
+		 * If configuration for that store namespace exists, it merges the new
+		 * provided configuration with the existing one.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $store_namespace The unique store namespace identifier.
+		 * @param array  $config          Optional. The array that will be merged with the existing configuration for the
+		 *                                specified store namespace.
+		 * @return array The current configuration for the specified store namespace.
+		 */
+		public function config( string $store_namespace, array $config = null ): array {
+			if ( ! isset( $this->config_data[ $store_namespace ] ) ) {
+				$this->config_data[ $store_namespace ] = array();
+			}
+			if ( is_array( $config ) ) {
+				$this->config_data[ $store_namespace ] = array_replace_recursive(
+					$this->config_data[ $store_namespace ],
+					$config
+				);
+			}
+			return $this->config_data[ $store_namespace ];
+		}
+
+		/**
+		 * Prints the serialized client-side interactivity data.
+		 *
+		 * Encodes the config and initial state into JSON and prints them inside a
+		 * script tag of type "application/json". Once in the browser, the state will
+		 * be parsed and used to hydrate the client-side interactivity stores and the
+		 * configuration will be available using a `getConfig` utility.
+		 *
+		 * @since 6.5.0
+		 */
+		public function print_client_interactivity_data() {
+			$store      = array();
+			$has_state  = ! empty( $this->state_data );
+			$has_config = ! empty( $this->config_data );
+
+			if ( $has_state || $has_config ) {
+				if ( $has_config ) {
+					$store['config'] = $this->config_data;
+				}
+				if ( $has_state ) {
+					$store['state'] = $this->state_data;
+				}
+				wp_print_inline_script_tag(
+					wp_json_encode(
+						$store,
+						JSON_HEX_TAG | JSON_HEX_AMP
+					),
+					array(
+						'type' => 'application/json',
+						'id'   => 'wp-interactivity-data',
+					)
+				);
+			}
+		}
+
+		/**
+		 * Registers the `@wordpress/interactivity` script modules.
+		 *
+		 * @since 6.5.0
+		 */
+		public function register_script_modules() {
+			wp_register_script_module(
+				'@wordpress/interactivity',
+				gutenberg_url( '/build/interactivity/index.min.js' ),
+				array(),
+				defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+			);
+		}
+
+		/**
+		 * Adds the necessary hooks for the Interactivity API.
+		 *
+		 * @since 6.5.0
+		 */
+		public function add_hooks() {
+			add_action( 'wp_footer', array( $this, 'print_client_interactivity_data' ) );
+		}
+
+		/**
+		 * Processes the interactivity directives contained within the HTML content
+		 * and updates the markup accordingly.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $html The HTML content to process.
+		 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+		 */
+		public function process_directives( string $html ): string {
+			$p               = new WP_Interactivity_API_Directives_Processor( $html );
+			$tag_stack       = array();
+			$namespace_stack = array();
+			$context_stack   = array();
+			$unbalanced      = false;
+
+			$directive_processor_prefixes          = array_keys( self::$directive_processors );
+			$directive_processor_prefixes_reversed = array_reverse( $directive_processor_prefixes );
+
+			while ( $p->next_tag( array( 'tag_closers' => 'visit' ) ) && false === $unbalanced ) {
+				$tag_name = $p->get_tag();
+
+				if ( $p->is_tag_closer() ) {
+					list( $opening_tag_name, $directives_prefixes ) = end( $tag_stack );
+
+					if ( 0 === count( $tag_stack ) || $opening_tag_name !== $tag_name ) {
+
+						/*
+						 * If the tag stack is empty or the matching opening tag is not the
+						 * same than the closing tag, it means the HTML is unbalanced and it
+						 * stops processing it.
+						 */
+						$unbalanced = true;
+						continue;
+					} else {
+
+						/*
+						 * It removes the last tag from the stack.
+						 */
+						array_pop( $tag_stack );
+
+						/*
+						 * If the matching opening tag didn't have any directives, it can skip
+						 * the processing.
+						 */
+						if ( 0 === count( $directives_prefixes ) ) {
+							continue;
+						}
+					}
+				} else {
+					$directives_prefixes = array();
+
+					foreach ( $p->get_attribute_names_with_prefix( 'data-wp-' ) as $attribute_name ) {
+
+						/*
+						 * Extracts the directive prefix to see if there is a server directive
+						 * processor registered for that directive.
+						 */
+						list( $directive_prefix ) = $this->extract_prefix_and_suffix( $attribute_name );
+						if ( array_key_exists( $directive_prefix, self::$directive_processors ) ) {
+							$directives_prefixes[] = $directive_prefix;
+						}
+					}
+
+					/*
+					 * If this is not a void element, it adds it to the tag stack so it can
+					 * process its closing tag and check for unbalanced tags.
+					 */
+					if ( ! $p->is_void() ) {
+						$tag_stack[] = array( $tag_name, $directives_prefixes );
+					}
+				}
+
+				/*
+				 * Sorts the attributes by the order of the `directives_processor` array
+				 * and checks what directives are present in this element. The processing
+				 * order is reversed for tag closers.
+				 */
+				$directives_prefixes = array_intersect(
+					$p->is_tag_closer()
+						? $directive_processor_prefixes_reversed
+						: $directive_processor_prefixes,
+					$directives_prefixes
+				);
+
+				// Executes the directive processors present in this element.
+				foreach ( $directives_prefixes as $directive_prefix ) {
+					$func = is_array( self::$directive_processors[ $directive_prefix ] )
+						? self::$directive_processors[ $directive_prefix ]
+						: array( $this, self::$directive_processors[ $directive_prefix ] );
+					call_user_func_array(
+						$func,
+						array( $p, &$context_stack, &$namespace_stack )
+					);
+				}
+			}
+
+			/*
+			 * It returns the original content if the HTML is unbalanced because
+			 * unbalanced HTML is not safe to process. In that case, the Interactivity
+			 * API runtime will update the HTML on the client side during the hydration.
+			 */
+			return $unbalanced || 0 < count( $tag_stack ) ? $html : $p->get_updated_html();
+		}
+
+		/**
+		 * Evaluates the reference path passed to a directive based on the current
+		 * store namespace, state and context.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string|true $directive_value   The directive attribute value string or `true` when it's a boolean attribute.
+		 * @param string      $default_namespace The default namespace to use if none is explicitly defined in the directive
+		 *                                       value.
+		 * @param array|false $context           The current context for evaluating the directive or false if there is no
+		 *                                       context.
+		 * @return mixed|null The result of the evaluation. Null if the reference path doesn't exist.
+		 */
+		private function evaluate( $directive_value, string $default_namespace, $context = false ) {
+			list( $ns, $path ) = $this->extract_directive_value( $directive_value, $default_namespace );
+			if ( empty( $path ) ) {
+				return null;
+			}
+
+			$store = array(
+				'state'   => isset( $this->state_data[ $ns ] ) ? $this->state_data[ $ns ] : array(),
+				'context' => isset( $context[ $ns ] ) ? $context[ $ns ] : array(),
+			);
+
+			// Checks if the reference path is preceded by a negator operator (!).
+			$should_negate_value = '!' === $path[0];
+			$path                = $should_negate_value ? substr( $path, 1 ) : $path;
+
+			// Extracts the value from the store using the reference path.
+			$path_segments = explode( '.', $path );
+			$current       = $store;
+			foreach ( $path_segments as $path_segment ) {
+				if ( isset( $current[ $path_segment ] ) ) {
+					$current = $current[ $path_segment ];
+				} else {
+					return null;
+				}
+			}
+
+			// Returns the opposite if it contains a negator operator (!).
+			return $should_negate_value ? ! $current : $current;
+		}
+
+		/**
+		 * Extracts the directive attribute name to separate and return the directive
+		 * prefix and an optional suffix.
+		 *
+		 * The suffix is the string after the first double hyphen and the prefix is
+		 * everything that comes before the suffix.
+		 *
+		 * Example:
+		 *
+		 *     extract_prefix_and_suffix( 'data-wp-interactive' )   => array( 'data-wp-interactive', null )
+		 *     extract_prefix_and_suffix( 'data-wp-bind--src' )     => array( 'data-wp-bind', 'src' )
+		 *     extract_prefix_and_suffix( 'data-wp-foo--and--bar' ) => array( 'data-wp-foo', 'and--bar' )
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string $directive_name The directive attribute name.
+		 * @return array An array containing the directive prefix and optional suffix.
+		 */
+		private function extract_prefix_and_suffix( string $directive_name ): array {
+			return explode( '--', $directive_name, 2 );
+		}
+
+		/**
+		 * Parses and extracts the namespace and reference path from the given
+		 * directive attribute value.
+		 *
+		 * If the value doesn't contain an explicit namespace, it returns the
+		 * default one. If the value contains a JSON object instead of a reference
+		 * path, the function tries to parse it and return the resulting array. If
+		 * the value contains strings that reprenset booleans ("true" and "false"),
+		 * numbers ("1" and "1.2") or "null", the function also transform them to
+		 * regular booleans, numbers and `null`.
+		 *
+		 * Example:
+		 *
+		 *     extract_directive_value( 'actions.foo', 'myPlugin' )                      => array( 'myPlugin', 'actions.foo' )
+		 *     extract_directive_value( 'otherPlugin::actions.foo', 'myPlugin' )         => array( 'otherPlugin', 'actions.foo' )
+		 *     extract_directive_value( '{ "isOpen": false }', 'myPlugin' )              => array( 'myPlugin', array( 'isOpen' => false ) )
+		 *     extract_directive_value( 'otherPlugin::{ "isOpen": false }', 'myPlugin' ) => array( 'otherPlugin', array( 'isOpen' => false ) )
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param string|true $directive_value   The directive attribute value. It can be `true` when it's a boolean
+		 *                                       attribute.
+		 * @param string|null $default_namespace Optional. The default namespace if none is explicitly defined.
+		 * @return array An array containing the namespace in the first item and the JSON, the reference path, or null on the
+		 *               second item.
+		 */
+		private function extract_directive_value( $directive_value, $default_namespace = null ): array {
+			if ( empty( $directive_value ) || is_bool( $directive_value ) ) {
+				return array( $default_namespace, null );
+			}
+
+			// Replaces the value and namespace if there is a namespace in the value.
+			if ( 1 === preg_match( '/^([\w\-_\/]+)::./', $directive_value ) ) {
+				list($default_namespace, $directive_value) = explode( '::', $directive_value, 2 );
+			}
+
+			/*
+			 * Tries to decode the value as a JSON object. If it fails and the value
+			 * isn't `null`, it returns the value as it is. Otherwise, it returns the
+			 * decoded JSON or null for the string `null`.
+			 */
+			$decoded_json = json_decode( $directive_value, true );
+			if ( null !== $decoded_json || 'null' === $directive_value ) {
+				$directive_value = $decoded_json;
+			}
+
+			return array( $default_namespace, $directive_value );
+		}
+
+
+		/**
+		 * Processes the `data-wp-interactive` directive.
+		 *
+		 * It adds the default store namespace defined in the directive value to the
+		 * stack so it's available for the nested interactivity elements.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_interactive_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			// In closing tags, it removes the last namespace from the stack.
+			if ( $p->is_tag_closer() ) {
+				return array_pop( $namespace_stack );
+			}
+
+			// Tries to decode the `data-wp-interactive` attribute value.
+			$attribute_value = $p->get_attribute( 'data-wp-interactive' );
+			$decoded_json    = is_string( $attribute_value ) && ! empty( $attribute_value )
+				? json_decode( $attribute_value, true )
+				: null;
+
+			/*
+			 * Pushes the newly defined namespace or the current one if the
+			 * `data-wp-interactive` definition was invalid or does not contain a
+			 * namespace. It does so because the function pops out the current namespace
+			 * from the stack whenever it finds a `data-wp-interactive`'s closing tag,
+			 * independently of whether the previous `data-wp-interactive` definition
+			 * contained a valid namespace.
+			 */
+			$namespace_stack[] = isset( $decoded_json['namespace'] )
+				? $decoded_json['namespace']
+				: end( $namespace_stack );
+		}
+
+		/**
+		 * Processes the `data-wp-context` directive.
+		 *
+		 * It adds the context defined in the directive value to the stack so it's
+		 * available for the nested interactivity elements.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_context_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			// In closing tags, it removes the last context from the stack.
+			if ( $p->is_tag_closer() ) {
+				return array_pop( $context_stack );
+			}
+
+			$attribute_value = $p->get_attribute( 'data-wp-context' );
+			$namespace_value = end( $namespace_stack );
+
+			// Separates the namespace from the context JSON object.
+			list( $namespace_value, $decoded_json ) = is_string( $attribute_value ) && ! empty( $attribute_value )
+				? $this->extract_directive_value( $attribute_value, $namespace_value )
+				: array( $namespace_value, null );
+
+			/*
+			 * If there is a namespace, it adds a new context to the stack merging the
+			 * previous context with the new one.
+			 */
+			if ( is_string( $namespace_value ) ) {
+				array_push(
+					$context_stack,
+					array_replace_recursive(
+						end( $context_stack ) !== false ? end( $context_stack ) : array(),
+						array( $namespace_value => is_array( $decoded_json ) ? $decoded_json : array() )
+					)
+				);
+			} else {
+				/*
+				 * If there is no namespace, it pushes the current context to the stack.
+				 * It needs to do so because the function pops out the current context
+				 * from the stack whenever it finds a `data-wp-context`'s closing tag.
+				 */
+				array_push( $context_stack, end( $context_stack ) );
+			}
+		}
+
+		/**
+		 * Processes the `data-wp-bind` directive.
+		 *
+		 * It updates or removes the bound attributes based on the evaluation of its
+		 * associated reference.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_bind_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			if ( ! $p->is_tag_closer() ) {
+				$all_bind_directives = $p->get_attribute_names_with_prefix( 'data-wp-bind--' );
+
+				foreach ( $all_bind_directives as $attribute_name ) {
+					list( , $bound_attribute ) = $this->extract_prefix_and_suffix( $attribute_name );
+					if ( empty( $bound_attribute ) ) {
+						return;
+					}
+
+					$attribute_value = $p->get_attribute( $attribute_name );
+					$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+					if ( null !== $result && ( false !== $result || '-' === $bound_attribute[4] ) ) {
+						/*
+						 * If the result of the evaluation is a boolean and the attribute is
+						 * `aria-` or `data-, convert it to a string "true" or "false". It
+						 * follows the exact same logic as Preact because it needs to
+						 * replicate what Preact will later do in the client:
+						 * https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+						 */
+						if ( is_bool( $result ) && '-' === $bound_attribute[4] ) {
+							$result = $result ? 'true' : 'false';
+						}
+						$p->set_attribute( $bound_attribute, $result );
+					} else {
+						$p->remove_attribute( $bound_attribute );
+					}
+				}
+			}
+		}
+
+
+		/**
+		 * Processes the `data-wp-class` directive.
+		 *
+		 * It adds or removes CSS classes in the current HTML element based on the
+		 * evaluation of its associated references.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_class_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			if ( ! $p->is_tag_closer() ) {
+				$all_class_directives = $p->get_attribute_names_with_prefix( 'data-wp-class--' );
+
+				foreach ( $all_class_directives as $attribute_name ) {
+					list( , $class_name ) = $this->extract_prefix_and_suffix( $attribute_name );
+					if ( empty( $class_name ) ) {
+						return;
+					}
+
+					$attribute_value = $p->get_attribute( $attribute_name );
+					$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+					if ( $result ) {
+						$p->add_class( $class_name );
+					} else {
+						$p->remove_class( $class_name );
+					}
+				}
+			}
+		}
+
+		/**
+		 * Processes the `data-wp-style` directive.
+		 *
+		 * It updates the style attribute value of the current HTML element based on
+		 * the evaluation of its associated references.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_style_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			if ( ! $p->is_tag_closer() ) {
+				$all_style_attributes = $p->get_attribute_names_with_prefix( 'data-wp-style--' );
+
+				foreach ( $all_style_attributes as $attribute_name ) {
+					list( , $style_property ) = $this->extract_prefix_and_suffix( $attribute_name );
+					if ( empty( $style_property ) ) {
+						continue;
+					}
+
+					$directive_attribute_value = $p->get_attribute( $attribute_name );
+					$style_property_value      = $this->evaluate( $directive_attribute_value, end( $namespace_stack ), end( $context_stack ) );
+					$style_attribute_value     = $p->get_attribute( 'style' );
+					$style_attribute_value     = ( $style_attribute_value && ! is_bool( $style_attribute_value ) ) ? $style_attribute_value : '';
+
+					/*
+					 * Checks first if the style property is not falsy and the style
+					 * attribute value is not empty because if it is, it doesn't need to
+					 * update the attribute value.
+					 */
+					if ( $style_property_value || ( ! $style_property_value && $style_attribute_value ) ) {
+						$style_attribute_value = $this->set_style_property( $style_attribute_value, $style_property, $style_property_value );
+						/*
+						 * If the style attribute value is not empty, it sets it. Otherwise,
+						 * it removes it.
+						 */
+						if ( ! empty( $style_attribute_value ) ) {
+							$p->set_attribute( 'style', $style_attribute_value );
+						} else {
+							$p->remove_attribute( 'style' );
+						}
+					}
+				}
+			}
+		}
+
+		/**
+		 * Sets an individual style property in the `style` attribute of an HTML
+		 * element, updating or removing the property when necessary.
+		 *
+		 * If a property is modified, it is added at the end of the list to make sure
+		 * that it overrides the previous ones.
+		 *
+		 * @since 6.5.0
+		 *
+		 * Example:
+		 *
+		 *     set_style_property( 'color:green;', 'color', 'red' )      => 'color:red;'
+		 *     set_style_property( 'background:green;', 'color', 'red' ) => 'background:green;color:red;'
+		 *     set_style_property( 'color:green;', 'color', null )       => ''
+		 *
+		 * @param string            $style_attribute_value The current style attribute value.
+		 * @param string            $style_property_name   The style property name to set.
+		 * @param string|false|null $style_property_value  The value to set for the style property. With false, null or an
+		 *                                                 empty string, it removes the style property.
+		 * @return string The new style attribute value after the specified property has been added, updated or removed.
+		 */
+		private function set_style_property( string $style_attribute_value, string $style_property_name, $style_property_value ): string {
+			$style_assignments    = explode( ';', $style_attribute_value );
+			$result               = array();
+			$style_property_value = ! empty( $style_property_value ) ? rtrim( trim( $style_property_value ), ';' ) : null;
+			$new_style_property   = $style_property_value ? $style_property_name . ':' . $style_property_value . ';' : '';
+
+			// Generate an array with all the properties but the modified one.
+			foreach ( $style_assignments as $style_assignment ) {
+				if ( empty( trim( $style_assignment ) ) ) {
+					continue;
+				}
+				list( $name, $value ) = explode( ':', $style_assignment );
+				if ( trim( $name ) !== $style_property_name ) {
+					$result[] = trim( $name ) . ':' . trim( $value ) . ';';
+				}
+			}
+
+			// Add the new/modified property at the end of the list.
+			array_push( $result, $new_style_property );
+
+			return implode( '', $result );
+		}
+
+		/**
+		 * Processes the `data-wp-text` directive.
+		 *
+		 * It updates the inner content of the current HTML element based on the
+		 * evaluation of its associated reference.
+		 *
+		 * @since 6.5.0
+		 *
+		 * @param WP_Interactivity_API_Directives_Processor $p               The directives processor instance.
+		 * @param array                                     $context_stack   The reference to the context stack.
+		 * @param array                                     $namespace_stack The reference to the store namespace stack.
+		 */
+		private function data_wp_text_processor( WP_Interactivity_API_Directives_Processor $p, array &$context_stack, array &$namespace_stack ) {
+			if ( ! $p->is_tag_closer() ) {
+				$attribute_value = $p->get_attribute( 'data-wp-text' );
+				$result          = $this->evaluate( $attribute_value, end( $namespace_stack ), end( $context_stack ) );
+
+				/*
+				 * Follows the same logic as Preact in the client and only changes the
+				 * content if the value is a string or a number. Otherwise, it removes the
+				 * content.
+				 */
+				if ( is_string( $result ) || is_numeric( $result ) ) {
+					$p->set_content_between_balanced_tags( esc_html( $result ) );
+				} else {
+					$p->set_content_between_balanced_tags( '' );
+				}
+			}
+		}
+	}
+
+}
diff --git a/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php b/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php
new file mode 100644
index 0000000000000..cd7ca7fb90287
--- /dev/null
+++ b/lib/compat/wordpress-6.5/interactivity-api/interactivity-api.php
@@ -0,0 +1,144 @@
+<?php
+/**
+ * Interactivity API: Functions and hooks
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ */
+
+if ( ! function_exists( 'wp_interactivity_process_directives_of_interactive_blocks' ) ) {
+	/**
+	 * Processes the directives on the rendered HTML of the interactive blocks.
+	 *
+	 * This processes only one root interactive block at a time because the
+	 * rendered HTML of that block contains the rendered HTML of all its inner
+	 * blocks, including any interactive block. It does so by ignoring all the
+	 * interactive inner blocks until the root interactive block is processed.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param array $parsed_block The parsed block.
+	 * @return array The same parsed block.
+	 */
+	function wp_interactivity_process_directives_of_interactive_blocks( $parsed_block ) {
+		static $root_interactive_block = null;
+
+		/*
+		 * Checks whether a root interactive block is already annotated for
+		 * processing, and if it is, it ignores the subsequent ones.
+		 */
+		if ( null === $root_interactive_block ) {
+			$block_name = $parsed_block['blockName'];
+			$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+
+			if ( isset( $block_name ) && isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'] ) {
+				// Annotates the root interactive block for processing.
+				$root_interactive_block = array( $block_name, md5( serialize( $parsed_block ) ) );
+
+				/*
+				 * Adds a filter to process the root interactive block once it has
+				 * finished rendering.
+				 */
+				$process_interactive_blocks = static function ( $content, $parsed_block ) use ( &$root_interactive_block, &$process_interactive_blocks ) {
+					// Checks whether the current block is the root interactive block.
+					list($root_block_name, $root_block_md5) = $root_interactive_block;
+					if ( $root_block_name === $parsed_block['blockName'] && md5( serialize( $parsed_block ) ) === $root_block_md5 ) {
+						// The root interactive blocks has finished rendering, process it.
+						$content = wp_interactivity_process_directives( $content );
+						// Removes the filter and reset the root interactive block.
+						remove_filter( 'render_block', $process_interactive_blocks );
+						$root_interactive_block = null;
+					}
+					return $content;
+				};
+
+				/*
+				 * Uses a priority of 20 to ensure that other filters can add additional
+				 * directives before the processing starts.
+				 */
+				add_filter( 'render_block', $process_interactive_blocks, 20, 2 );
+			}
+		}
+
+		return $parsed_block;
+	}
+	add_filter( 'render_block_data', 'wp_interactivity_process_directives_of_interactive_blocks', 10, 1 );
+}
+
+if ( ! function_exists( 'wp_interactivity' ) ) {
+	/**
+	 * Retrieves the main WP_Interactivity_API instance.
+	 *
+	 * It provides access to the WP_Interactivity_API instance, creating one if it
+	 * doesn't exist yet. It also registers the hooks and necessary script
+	 * modules.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @return WP_Interactivity_API The main WP_Interactivity_API instance.
+	 */
+	function wp_interactivity() {
+		static $instance = null;
+		if ( is_null( $instance ) ) {
+			$instance = new WP_Interactivity_API();
+			$instance->add_hooks();
+			$instance->register_script_modules();
+		}
+		return $instance;
+	}
+}
+
+if ( ! function_exists( 'wp_interactivity_process_directives' ) ) {
+	/**
+	 * Processes the interactivity directives contained within the HTML content
+	 * and updates the markup accordingly.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $html The HTML content to process.
+	 * @return string The processed HTML content. It returns the original content when the HTML contains unbalanced tags.
+	 */
+	function wp_interactivity_process_directives( $html ) {
+		return wp_interactivity()->process_directives( $html );
+	}
+}
+
+if ( ! function_exists( 'wp_interactivity_state' ) ) {
+	/**
+	 * Gets and/or sets the initial state of an Interactivity API store for a
+	 * given namespace.
+	 *
+	 * If state for that store namespace already exists, it merges the new
+	 * provided state with the existing one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $store_namespace The unique store namespace identifier.
+	 * @param array  $state           Optional. The array that will be merged with the existing state for the specified
+	 *                                store namespace.
+	 * @return array The current state for the specified store namespace.
+	 */
+	function wp_interactivity_state( $store_namespace, $state = null ) {
+		return wp_interactivity()->state( $store_namespace, $state );
+	}
+}
+
+if ( ! function_exists( 'wp_interactivity_config' ) ) {
+	/**
+	 * Gets and/or sets the configuration of the Interactivity API for a given
+	 * store namespace.
+	 *
+	 * If configuration for that store namespace exists, it merges the new
+	 * provided configuration with the existing one.
+	 *
+	 * @since 6.5.0
+	 *
+	 * @param string $store_namespace The unique store namespace identifier.
+	 * @param array  $config          Optional. The array that will be merged with the existing configuration for the
+	 *                                specified store namespace.
+	 * @return array The current configuration for the specified store namespace.
+	 */
+	function wp_interactivity_config( $store_namespace, $initial_state = null ) {
+		return wp_interactivity()->config( $store_namespace, $initial_state );
+	}
+}
diff --git a/lib/experimental/interactivity-api/class-wp-directive-context.php b/lib/experimental/interactivity-api/class-wp-directive-context.php
deleted file mode 100644
index 4276eddca20ac..0000000000000
--- a/lib/experimental/interactivity-api/class-wp-directive-context.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?php
-/**
- * Context data implementation.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Directive_Context' ) ) {
-	return;
-}
-
-/**
- * This is a data structure to hold the current context.
- *
- * Whenever encountering a `data-wp-context` directive, we need to update
- * the context with the data found in that directive. Conversely,
- * when "leaving" that context (by encountering a closing tag), we
- * need to reset the context to its previous state. This means that
- * we actually need sort of a stack to keep track of all nested contexts.
- *
- * Example:
- *
- * <div data-wp-context='{ "foo": 123 }'>
- *     <!-- foo should be 123 here. -->
- *     <div data-wp-context='{ "foo": 456 }'>
- *         <!-- foo should be 456 here. -->
- *     </div>
- *     <!-- foo should be reset to 123 here. -->
- * </div>
- */
-class WP_Directive_Context {
-	/**
-	 * The stack used to store contexts internally.
-	 *
-	 * @var array An array of contexts.
-	 */
-	protected $stack = array( array() );
-
-	/**
-	 * Constructor.
-	 *
-	 * Accepts a context as an argument to initialize this with.
-	 *
-	 * @param array $context A context.
-	 */
-	public function __construct( $context = array() ) {
-		$this->set_context( $context );
-	}
-
-	/**
-	 * Return the current context.
-	 *
-	 * @return array The current context.
-	 */
-	public function get_context() {
-		return end( $this->stack );
-	}
-
-	/**
-	 * Set the current context.
-	 *
-	 * @param array $context The context to be set.
-	 *
-	 * @return void
-	 */
-	public function set_context( $context ) {
-		array_push(
-			$this->stack,
-			array_replace_recursive( $this->get_context(), $context )
-		);
-	}
-
-	/**
-	 * Reset the context to its previous state.
-	 *
-	 * @return void
-	 */
-	public function rewind_context() {
-		array_pop( $this->stack );
-	}
-}
diff --git a/lib/experimental/interactivity-api/class-wp-directive-processor.php b/lib/experimental/interactivity-api/class-wp-directive-processor.php
deleted file mode 100644
index 723b36026ce2a..0000000000000
--- a/lib/experimental/interactivity-api/class-wp-directive-processor.php
+++ /dev/null
@@ -1,283 +0,0 @@
-<?php
-/**
- * WP_Directive_Processor class
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-if ( class_exists( 'WP_Directive_Processor' ) ) {
-	return;
-}
-
-/**
- * This processor is built on top of the HTML Tag Processor and augments its
- * capabilities to process the Interactivity API directives.
- */
-class WP_Directive_Processor extends Gutenberg_HTML_Tag_Processor_6_5 {
-	/**
-	 * String containing the current root block.
-	 *
-	 * @var string
-	 */
-	public static $interactive_root_block = null;
-
-	/**
-	 * Sets the current root block.
-	 *
-	 * @param array $block The block to add.
-	 */
-	public static function mark_interactive_root_block( $block ) {
-		if ( null !== $block['blockName'] ) {
-			self::$interactive_root_block = $block['blockName'] . md5( serialize( $block ) );
-		} else {
-			self::$interactive_root_block = md5( serialize( $block ) );
-		}
-	}
-
-	/**
-	 * Resets the root block.
-	 */
-	public static function unmark_interactive_root_block() {
-		self::$interactive_root_block = null;
-	}
-
-	/**
-	 * Checks 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_interactive_root_block( $block ) {
-		// If self::$interactive_root_block is null, is impossible that any block has been marked as root.
-		if ( is_null( self::$interactive_root_block ) ) {
-			return false;
-		}
-		// Blocks whose blockName is null are specifically intended to convey - "this is a freeform HTML block."
-		if ( null !== $block['blockName'] ) {
-			return str_contains( self::$interactive_root_block, $block['blockName'] ) && $block['blockName'] . md5( serialize( $block ) ) === self::$interactive_root_block;
-		}
-		return md5( serialize( $block ) ) === self::$interactive_root_block;
-	}
-
-	/**
-	 * Checks if a root block has already been defined.
-	 *
-	 * @return bool True if there is a root block, false otherwise.
-	 */
-	public static function has_interactive_root_block() {
-		return isset( self::$interactive_root_block );
-	}
-
-	/**
-	 * Finds the matching closing tag for an opening tag.
-	 *
-	 * When called while on an open tag, traverse the HTML until we find the
-	 * matching closing tag, respecting any in-between content, including nested
-	 * tags of the same name. Return false when called on a closing or void tag,
-	 * or if no matching closing tag was found.
-	 *
-	 * @return bool Whether a matching closing tag was found.
-	 */
-	public function next_balanced_closer() {
-		$depth = 0;
-
-		$tag_name = $this->get_tag();
-
-		if ( self::is_html_void_element( $tag_name ) ) {
-			return false;
-		}
-
-		while ( $this->next_tag(
-			array(
-				'tag_name'    => $tag_name,
-				'tag_closers' => 'visit',
-			)
-		) ) {
-			if ( ! $this->is_tag_closer() ) {
-				++$depth;
-				continue;
-			}
-
-			if ( 0 === $depth ) {
-				return true;
-			}
-
-			--$depth;
-		}
-
-		return false;
-	}
-
-	/**
-	 * Returns the content between two balanced tags.
-	 *
-	 * When called on an opening tag, return the HTML content found between that
-	 * opening tag and its matching closing tag.
-	 *
-	 * @return string The content between the current opening and its matching
-	 * closing tag.
-	 */
-	public function get_inner_html() {
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
-			return false;
-		}
-		list( $start_name, $end_name ) = $bookmarks;
-
-		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
-
-		$this->seek( $start_name ); // Return to original position.
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
-
-		return substr( $this->html, $start, $end - $start );
-	}
-
-	/**
-	 * Sets the content between two balanced tags.
-	 *
-	 * When called on an opening tag, set the HTML content found between that
-	 * opening tag and its matching closing tag.
-	 *
-	 * @param string $new_html The string to replace the content between the
-	 * matching tags with.
-	 * @return bool            Whether the content was successfully replaced.
-	 */
-	public function set_inner_html( $new_html ) {
-		$this->get_updated_html(); // Apply potential previous updates.
-
-		$bookmarks = $this->get_balanced_tag_bookmarks();
-		if ( ! $bookmarks ) {
-			return false;
-		}
-		list( $start_name, $end_name ) = $bookmarks;
-
-		$start = $this->bookmarks[ $start_name ]->start + $this->bookmarks[ $start_name ]->length + 1;
-		$end   = $this->bookmarks[ $end_name ]->start;
-
-		$this->seek( $start_name ); // Return to original position.
-		$this->release_bookmark( $start_name );
-		$this->release_bookmark( $end_name );
-
-		$this->lexical_updates[] = new Gutenberg_HTML_Text_Replacement_6_5( $start, $end - $start, $new_html );
-		return true;
-	}
-
-	/**
-	 * Returns a pair of bookmarks for the current opening tag and the matching
-	 * closing tag.
-	 *
-	 * @return array|false A pair of bookmarks, or false if there's no matching
-	 * closing tag.
-	 */
-	public function get_balanced_tag_bookmarks() {
-		$i = 0;
-		while ( array_key_exists( 'start' . $i, $this->bookmarks ) ) {
-			++$i;
-		}
-		$start_name = 'start' . $i;
-
-		$this->set_bookmark( $start_name );
-		if ( ! $this->next_balanced_closer() ) {
-			$this->release_bookmark( $start_name );
-			return false;
-		}
-
-		$i = 0;
-		while ( array_key_exists( 'end' . $i, $this->bookmarks ) ) {
-			++$i;
-		}
-		$end_name = 'end' . $i;
-		$this->set_bookmark( $end_name );
-
-		return array( $start_name, $end_name );
-	}
-
-	/**
-	 * Checks whether a given HTML element is void (e.g. <br>).
-	 *
-	 * @see https://html.spec.whatwg.org/#elements-2
-	 *
-	 * @param string $tag_name The element in question.
-	 * @return bool True if the element is void.
-	 */
-	public static function is_html_void_element( $tag_name ) {
-		switch ( $tag_name ) {
-			case 'AREA':
-			case 'BASE':
-			case 'BR':
-			case 'COL':
-			case 'EMBED':
-			case 'HR':
-			case 'IMG':
-			case 'INPUT':
-			case 'LINK':
-			case 'META':
-			case 'SOURCE':
-			case 'TRACK':
-			case 'WBR':
-				return true;
-
-			default:
-				return false;
-		}
-	}
-
-	/**
-	 * Extracts and return the directive type and the the part after the double
-	 * hyphen from an attribute name (if present), in an array format.
-	 *
-	 * Examples:
-	 *
-	 *     'wp-island'            => array( 'wp-island', null )
-	 *     'wp-bind--src'         => array( 'wp-bind', 'src' )
-	 *     'wp-thing--and--thang' => array( 'wp-thing', 'and--thang' )
-	 *
-	 * @param string $name The attribute name.
-	 * @return array The resulting array.
-	 */
-	public static function parse_attribute_name( $name ) {
-		return explode( '--', $name, 2 );
-	}
-
-	/**
-	 * Parse and extract the namespace and path from the given value.
-	 *
-	 * If the value contains a JSON instead of a path, the function parses it
-	 * and returns the resulting array.
-	 *
-	 * @param string $value Passed value.
-	 * @param string $ns Namespace fallback.
-	 * @return array The resulting array
-	 */
-	public static function parse_attribute_value( $value, $ns = null ) {
-		$matches = array();
-		$has_ns  = preg_match( '/^([\w\-_\/]+)::(.+)$/', $value, $matches );
-
-		/*
-		 * Overwrite both `$ns` and `$value` variables if `$value` explicitly
-		 * contains a namespace.
-		 */
-		if ( $has_ns ) {
-			list( , $ns, $value ) = $matches;
-		}
-
-		/*
-		 * Try to decode `$value` as a JSON object. If it works, `$value` is
-		 * replaced with the resulting array. The original string is preserved
-		 * otherwise.
-		 *
-		 * Note that `json_decode` returns `null` both for an invalid JSON or
-		 * the `'null'` string (a valid JSON). In the latter case, `$value` is
-		 * replaced with `null`.
-		 */
-		$data = json_decode( $value, true );
-		if ( null !== $data || 'null' === trim( $value ) ) {
-			$value = $data;
-		}
-
-		return array( $ns, $value );
-	}
-}
diff --git a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php b/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
deleted file mode 100644
index 15e57edfa4a6a..0000000000000
--- a/lib/experimental/interactivity-api/class-wp-interactivity-initial-state.php
+++ /dev/null
@@ -1,82 +0,0 @@
-<?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 ) {
-		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/directive-processing.php b/lib/experimental/interactivity-api/directive-processing.php
deleted file mode 100644
index 5a97166d6d22b..0000000000000
--- a/lib/experimental/interactivity-api/directive-processing.php
+++ /dev/null
@@ -1,214 +0,0 @@
-<?php
-/**
- * Functions and hooks to process the Interactivity API directives in the
- * server.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Marks the block as 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 the
- * parent is null.
- *
- * @param array $parsed_block The parsed block.
- *
- * @return array The parsed block.
- */
-function gutenberg_interactivity_mark_root_interactive_blocks( $parsed_block ) {
-	if ( ! WP_Directive_Processor::has_interactive_root_block() ) {
-		$block_type     = WP_Block_Type_Registry::get_instance()->get_registered( $parsed_block['blockName'] );
-		$is_interactive = isset( $block_type->supports['interactivity'] ) && $block_type->supports['interactivity'];
-		if ( $is_interactive ) {
-			WP_Directive_Processor::mark_interactive_root_block( $parsed_block );
-		}
-	}
-
-	return $parsed_block;
-}
-add_filter( 'render_block_data', 'gutenberg_interactivity_mark_root_interactive_blocks', 10, 1 );
-
-/**
- * Processes the directives in the root blocks.
- *
- * @param string $block_content The block content.
- * @param array  $block         The full block.
- *
- * @return string Filtered block content.
- */
-function gutenberg_process_directives_in_root_blocks( $block_content, $block ) {
-	if ( WP_Directive_Processor::is_marked_as_interactive_root_block( $block ) ) {
-		WP_Directive_Processor::unmark_interactive_root_block();
-		$context         = new WP_Directive_Context();
-		$namespace_stack = array();
-		return gutenberg_process_interactive_html( $block_content, $context, $namespace_stack );
-	}
-
-	return $block_content;
-}
-add_filter( 'render_block', 'gutenberg_process_directives_in_root_blocks', 10, 2 );
-
-/**
- * Processes interactive HTML by applying directives to the HTML tags.
- *
- * It uses the WP_Directive_Processor class to parse the HTML and apply the
- * directives. If a tag contains a 'WP-INNER-BLOCKS' string and there are inner
- * blocks to process, the function processes these inner blocks and replaces the
- * 'WP-INNER-BLOCKS' tag in the HTML with those blocks.
- *
- * @param string $html The HTML to process.
- * @param mixed  $context The context to use when processing.
- * @param array  $inner_blocks The inner blocks to process.
- * @param array  $namespace_stack Stack of namespackes passed by reference.
- *
- * @return string The processed HTML.
- */
-function gutenberg_process_interactive_html( $html, $context, &$namespace_stack = array() ) {
-	static $directives = array(
-		'data-wp-interactive' => 'gutenberg_interactivity_process_wp_interactive',
-		'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',
-	);
-
-	$tags      = new WP_Directive_Processor( $html );
-	$prefix    = 'data-wp-';
-	$tag_stack = array();
-	while ( $tags->next_tag( array( 'tag_closers' => 'visit' ) ) ) {
-		$tag_name = $tags->get_tag();
-
-		if ( $tags->is_tag_closer() ) {
-			if ( 0 === count( $tag_stack ) ) {
-				continue;
-			}
-			list( $latest_opening_tag_name, $attributes ) = end( $tag_stack );
-			if ( $latest_opening_tag_name === $tag_name ) {
-				array_pop( $tag_stack );
-				// If the matching opening tag didn't have any directives, we move on.
-				if ( 0 === count( $attributes ) ) {
-					continue;
-				}
-			}
-		} else {
-			$attributes = array();
-			foreach ( $tags->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"
-				 * from "wp-bind--src" and "wp-context" from "wp-context" etc...
-				 */
-				list( $type ) = $tags::parse_attribute_name( $name );
-				if ( array_key_exists( $type, $directives ) ) {
-					$attributes[] = $type;
-				}
-			}
-
-			/*
-			 * If this is an open tag, and if it either has directives, or if
-			 * we're inside a tag that does, take note of this tag and its
-			 * directives so we can call its directive processor once we
-			 * encounter the matching closing tag.
-			 */
-			if (
-				! $tags::is_html_void_element( $tag_name ) &&
-				( 0 !== count( $attributes ) || 0 !== count( $tag_stack ) )
-			) {
-				$tag_stack[] = array( $tag_name, $attributes );
-			}
-		}
-
-		// Extract all directive names. They'll be used later on.
-		$directive_names     = array_keys( $directives );
-		$directive_names_rev = array_reverse( $directive_names );
-
-		/*
-		 * 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(
-			$tags->is_tag_closer()
-				? $directive_names_rev
-				: $directive_names,
-			$attributes
-		);
-
-		foreach ( $sorted_attrs as $attribute ) {
-			call_user_func_array(
-				$directives[ $attribute ],
-				array(
-					$tags,
-					$context,
-					end( $namespace_stack ),
-					&$namespace_stack,
-				)
-			);
-		}
-	}
-
-	return $tags->get_updated_html();
-}
-
-/**
- * Resolves the passed reference from the store and the context under the given
- * namespace.
- *
- * A reference could be either a single path or a namespace followed by a path,
- * separated by two colons, i.e, `namespace::path.to.prop`. If the reference
- * contains a namespace, that namespace overrides the one passed as argument.
- *
- * @param string $reference Reference value.
- * @param string $ns Inherited namespace.
- * @param array  $context Context data.
- * @return mixed Resolved value.
- */
-function gutenberg_interactivity_evaluate_reference( $reference, $ns, array $context = array() ) {
-	// Extract the namespace from the reference (if present).
-	list( $ns, $path ) = WP_Directive_Processor::parse_attribute_value( $reference, $ns );
-
-	$store = array(
-		'state'   => WP_Interactivity_Initial_State::get_state( $ns ),
-		'context' => $context[ $ns ] ?? array(),
-	);
-
-	/*
-	 * Checks first if the directive path is preceded by a negator operator (!),
-	 * indicating that the value obtained from the Interactivity Store (or the
-	 * 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;
-	foreach ( $path_segments as $p ) {
-		if ( isset( $current[ $p ] ) ) {
-			$current = $current[ $p ];
-		} else {
-			return null;
-		}
-	}
-
-	/*
-	 * Checks if $current is an anonymous function or an arrow function, and if
-	 * so, call it passing the store. Other types of callables are ignored on
-	 * purpose, as arbitrary strings or arrays could be wrongly evaluated as
-	 * "callables".
-	 *
-	 * E.g., "file" is an string and a "callable" (the "file" function exists).
-	 */
-	if ( $current instanceof Closure ) {
-		/*
-		 * TODO: Figure out a way to implement derived state without having to
-		 * pass the store as argument:
-		 *
-		 * $current = call_user_func( $current );
-		 */
-	}
-
-	// Returns the opposite if it has a negator operator (!).
-	return $should_negate_value ? ! $current : $current;
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-bind.php b/lib/experimental/interactivity-api/directives/wp-bind.php
deleted file mode 100644
index 57d2e5deb23ab..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-bind.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/**
- * Process the wp-bind directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-bind directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- */
-function gutenberg_interactivity_process_wp_bind( $tags, $context, $ns ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-bind--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $bound_attr ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $bound_attr ) ) {
-			continue;
-		}
-
-		$reference = $tags->get_attribute( $attr );
-		$value     = gutenberg_interactivity_evaluate_reference( $reference, $ns, $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
deleted file mode 100644
index ef91835be86fc..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-class.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * Process wp-class directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-class directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- */
-function gutenberg_interactivity_process_wp_class( $tags, $context, $ns ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-class--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $class_name ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $class_name ) ) {
-			continue;
-		}
-
-		$reference = $tags->get_attribute( $attr );
-		$add_class = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() );
-		if ( $add_class ) {
-			$tags->add_class( $class_name );
-		} else {
-			$tags->remove_class( $class_name );
-		}
-	}
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-context.php b/lib/experimental/interactivity-api/directives/wp-context.php
deleted file mode 100644
index b41b47c86c78c..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-context.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Process wp-context directive attribute.
- *
- * @package wp-directives
- */
-
-/**
- * Process wp-context directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- */
-function gutenberg_interactivity_process_wp_context( $tags, $context, $ns ) {
-	if ( $tags->is_tag_closer() ) {
-		$context->rewind_context();
-		return;
-	}
-
-	$attr_value = $tags->get_attribute( 'data-wp-context' );
-
-	//Separate namespace and value from the context directive attribute.
-	list( $ns, $data ) = is_string( $attr_value ) && ! empty( $attr_value )
-		? WP_Directive_Processor::parse_attribute_value( $attr_value, $ns )
-		: array( $ns, null );
-
-	// Add parsed data to the context under the corresponding namespace.
-	$context->set_context( array( $ns => is_array( $data ) ? $data : array() ) );
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-interactive.php b/lib/experimental/interactivity-api/directives/wp-interactive.php
deleted file mode 100644
index 9f3471a8b4e6a..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-interactive.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * Process the wp-interactive directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-interactive directive.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- * @param array                  $ns_stack Namespace stack.
- */
-function gutenberg_interactivity_process_wp_interactive( $tags, $context, $ns, &$ns_stack ) {
-	// Pop the current namespace if this is the closing tag of an island.
-	if ( $tags->is_tag_closer() ) {
-		array_pop( $ns_stack );
-		return;
-	}
-
-	/*
-	 * Decode the data-wp-interactive attribute. In the case it is not a valid
-	 * JSON string, NULL is stored in `$island_data`.
-	 */
-	$island      = $tags->get_attribute( 'data-wp-interactive' );
-	$island_data = is_string( $island ) && ! empty( $island )
-		? json_decode( $island, true )
-		: null;
-
-	/*
-	 * Push the newly defined namespace, or the current one if the island
-	 * definition was invalid or does not contain a namespace.
-	 *
-	 * This is done because the function pops out the current namespace from the
-	 * stack whenever it finds an island's closing tag, independently of whether
-	 * the island definition was correct or it contained a valid namespace.
-	 */
-	$ns_stack[] = isset( $island_data ) && $island_data['namespace']
-		? $island_data['namespace']
-		: $ns;
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-style.php b/lib/experimental/interactivity-api/directives/wp-style.php
deleted file mode 100644
index 16432e5728260..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-style.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-/**
- * Process wp-style directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-style directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- */
-function gutenberg_interactivity_process_wp_style( $tags, $context, $ns ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$prefixed_attributes = $tags->get_attribute_names_with_prefix( 'data-wp-style--' );
-
-	foreach ( $prefixed_attributes as $attr ) {
-		list( , $style_name ) = WP_Directive_Processor::parse_attribute_name( $attr );
-		if ( empty( $style_name ) ) {
-			continue;
-		}
-
-		$reference   = $tags->get_attribute( $attr );
-		$style_value = gutenberg_interactivity_evaluate_reference( $reference, $ns, $context->get_context() );
-		if ( $style_value ) {
-			$style_attr = $tags->get_attribute( 'style' ) ?? '';
-			$style_attr = gutenberg_interactivity_set_style( $style_attr, $style_name, $style_value );
-			$tags->set_attribute( 'style', $style_attr );
-		} else {
-			// TODO: Do we want to unset styles if they're null?
-		}
-	}
-}
-
-/**
- * Set style.
- *
- * @param string $style Existing style to amend.
- * @param string $name  Style property name.
- * @param string $value Style property value.
- * @return string Amended styles.
- */
-function gutenberg_interactivity_set_style( $style, $name, $value ) {
-	$style_assignments = explode( ';', $style );
-	$modified          = false;
-	foreach ( $style_assignments as $style_assignment ) {
-		list( $style_name ) = explode( ':', $style_assignment );
-		if ( trim( $style_name ) === $name ) {
-			// TODO: Retain surrounding whitespace from $style_value, if any.
-			$style_assignment = $style_name . ': ' . $value;
-			$modified         = true;
-			break;
-		}
-	}
-
-	if ( ! $modified ) {
-		$new_style_assignment = $name . ': ' . $value;
-		// If the last element is empty or whitespace-only, we insert
-		// the new "key: value" pair before it.
-		if ( empty( trim( end( $style_assignments ) ) ) ) {
-			array_splice( $style_assignments, - 1, 0, $new_style_assignment );
-		} else {
-			array_push( $style_assignments, $new_style_assignment );
-		}
-	}
-	return implode( ';', $style_assignments );
-}
diff --git a/lib/experimental/interactivity-api/directives/wp-text.php b/lib/experimental/interactivity-api/directives/wp-text.php
deleted file mode 100644
index c4c5bb27a31e1..0000000000000
--- a/lib/experimental/interactivity-api/directives/wp-text.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-/**
- * Process wp-text directive attribute.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Process wp-text directive attribute.
- *
- * @param WP_Directive_Processor $tags Tags.
- * @param WP_Directive_Context   $context Directive context.
- * @param string                 $ns Namespace.
- */
-function gutenberg_interactivity_process_wp_text( $tags, $context, $ns ) {
-	if ( $tags->is_tag_closer() ) {
-		return;
-	}
-
-	$value = $tags->get_attribute( 'data-wp-text' );
-	if ( null === $value ) {
-		return;
-	}
-
-	$text = gutenberg_interactivity_evaluate_reference( $value, $ns, $context->get_context() );
-	$tags->set_inner_html( esc_html( $text ) );
-}
diff --git a/lib/experimental/interactivity-api/initial-state.php b/lib/experimental/interactivity-api/initial-state.php
deleted file mode 100644
index a38d0da631f3c..0000000000000
--- a/lib/experimental/interactivity-api/initial-state.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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/modules.php b/lib/experimental/interactivity-api/modules.php
deleted file mode 100644
index f40a81bc334e6..0000000000000
--- a/lib/experimental/interactivity-api/modules.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-/**
- * Interactive modules.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Register the `@wordpress/interactivity` module.
- *
- * !! This will be removed once https://github.com/WordPress/gutenberg/pull/58066
- * is merged.
- */
-function gutenberg_register_interactivity_module() {
-	wp_register_script_module(
-		'@wordpress/interactivity',
-		gutenberg_url( '/build/interactivity/index.min.js' ),
-		array(),
-		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
-	);
-}
-
-add_action( 'wp_enqueue_scripts', 'gutenberg_register_interactivity_module' );
diff --git a/lib/load.php b/lib/load.php
index 223a817cc51d0..4b2b4d5d8b0db 100644
--- a/lib/load.php
+++ b/lib/load.php
@@ -107,6 +107,9 @@ function gutenberg_is_experiment_enabled( $name ) {
 require __DIR__ . '/compat/wordpress-6.5/blocks.php';
 require __DIR__ . '/compat/wordpress-6.5/block-patterns.php';
 require __DIR__ . '/compat/wordpress-6.5/kses.php';
+require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php';
+require __DIR__ . '/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api-directives-processor.php';
+require __DIR__ . '/compat/wordpress-6.5/interactivity-api/interactivity-api.php';
 require __DIR__ . '/compat/wordpress-6.5/class-wp-script-modules.php';
 require __DIR__ . '/compat/wordpress-6.5/scripts-modules.php';
 require __DIR__ . '/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php';
@@ -128,19 +131,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	require __DIR__ . '/experimental/disable-tinymce.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';
-require __DIR__ . '/experimental/interactivity-api/directive-processing.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-bind.php';
-require __DIR__ . '/experimental/interactivity-api/directives/wp-context.php';
-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';
-
 // Fonts API / Font Face.
 remove_action( 'plugins_loaded', '_wp_theme_json_webfonts_handler' ); // Turns off WordPress 6.0's stopgap handler.
 
diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
index fa93a64fe210e..66fa658d0da3c 100644
--- a/packages/e2e-tests/plugins/interactive-blocks.php
+++ b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -32,14 +32,18 @@ function () {
 			}
 		}
 
-		// Temporary fix to disable SSR of directives during E2E testing. This
-		// is required at this moment, as SSR for directives is not stabilized
-		// yet and we need to ensure hydration works, even when the rendered
-		// HTML is not correct or malformed.
-		if ( 'true' === $_GET['disable_directives_ssr'] ) {
+		/*
+		 * Disable the server directive processing during E2E testing. This is
+		 * required to ensure that client hydration works even when the rendered
+		 * HTML contains unbalanced tags and it couldn't be processed in the server.
+		 */
+		if ( 'true' === $_GET['disable_server_directive_processing'] ) {
+			// Ensure the interactivity API is loaded.
+			wp_interactivity();
+			// But remove the server directive processing.
 			remove_filter(
 				'render_block_data',
-				'gutenberg_interactivity_mark_root_interactive_blocks'
+				'wp_interactivity_process_directives_of_interactive_blocks'
 			);
 		}
 	}
diff --git a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
index 874b358c93612..f6a9a3bbf8650 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/store-tag/render.php
@@ -49,7 +49,7 @@
 if ( 'missing' !== $attributes['condition'] ) {
 
 	if ( 'ok' === $attributes['condition'] ) {
-		$test_store_tag_json = '{ "store-tag": { "counter": { "value": 3 } } }';
+		$test_store_tag_json = '{ "state": { "store-tag": { "counter": { "value": 3 } } } }';
 	}
 
 	if ( 'corrupted-json' === $attributes['condition'] ) {
@@ -61,7 +61,7 @@
 	}
 
 	echo <<<HTML
-	<script type="application/json" id="wp-interactivity-initial-state">
+	<script type="application/json" id="wp-interactivity-data">
 		$test_store_tag_json
 	</script>
 HTML;
diff --git a/packages/interactivity/src/directives.js b/packages/interactivity/src/directives.js
index c1879af1fe19a..250d3bde6084c 100644
--- a/packages/interactivity/src/directives.js
+++ b/packages/interactivity/src/directives.js
@@ -177,9 +177,11 @@ export default () => {
 							: name;
 
 					useInit( () => {
-						// This seems necessary because Preact doesn't change the class
-						// names on the hydration, so we have to do it manually. It doesn't
-						// need deps because it only needs to do it the first time.
+						/*
+						 * This seems necessary because Preact doesn't change the class
+						 * names on the hydration, so we have to do it manually. It doesn't
+						 * need deps because it only needs to do it the first time.
+						 */
 						if ( ! result ) {
 							element.ref.current.classList.remove( name );
 						} else {
@@ -206,9 +208,11 @@ export default () => {
 				else element.props.style[ key ] = result;
 
 				useInit( () => {
-					// This seems necessary because Preact doesn't change the styles on
-					// the hydration, so we have to do it manually. It doesn't need deps
-					// because it only needs to do it the first time.
+					/*
+					 * This seems necessary because Preact doesn't change the styles on
+					 * the hydration, so we have to do it manually. It doesn't need deps
+					 * because it only needs to do it the first time.
+					 */
 					if ( ! result ) {
 						element.ref.current.style.removeProperty( key );
 					} else {
@@ -226,24 +230,36 @@ export default () => {
 				const result = evaluate( entry );
 				element.props[ attribute ] = result;
 
-				// This seems necessary because Preact doesn't change the attributes
-				// on the hydration, so we have to do it manually. It doesn't need
-				// deps because it only needs to do it the first time.
+				/*
+				 * This is necessary because Preact doesn't change the attributes on the
+				 * hydration, so we have to do it manually. It only needs to do it the
+				 * first time. After that, Preact will handle the changes.
+				 */
 				useInit( () => {
 					const el = element.ref.current;
 
-					// We set the value directly to the corresponding
-					// HTMLElement instance property excluding the following
-					// special cases.
-					// We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L110-L129
+					/*
+					 * We set the value directly to the corresponding HTMLElement instance
+					 * property excluding the following special cases. We follow Preact's
+					 * logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L110-L129
+					 */
 					if (
 						attribute !== 'width' &&
 						attribute !== 'height' &&
 						attribute !== 'href' &&
 						attribute !== 'list' &&
 						attribute !== 'form' &&
-						// Default value in browsers is `-1` and an empty string is
-						// cast to `0` instead
+						/*
+						 * The value for `tabindex` follows the parsing rules for an
+						 * integer. If that fails, or if the attribute isn't present, then
+						 * the browsers should "follow platform conventions to determine if
+						 * the element should be considered as a focusable area",
+						 * practically meaning that most elements get a default of `-1` (not
+						 * focusable), but several also get a default of `0` (focusable in
+						 * order after all elements with a positive `tabindex` value).
+						 *
+						 * @see https://html.spec.whatwg.org/#tabindex-value
+						 */
 						attribute !== 'tabIndex' &&
 						attribute !== 'download' &&
 						attribute !== 'rowSpan' &&
@@ -259,10 +275,12 @@ export default () => {
 							return;
 						} catch ( err ) {}
 					}
-					// aria- and data- attributes have no boolean representation.
-					// A `false` value is different from the attribute not being
-					// present, so we can't remove it.
-					// We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+					/*
+					 * aria- and data- attributes have no boolean representation.
+					 * A `false` value is different from the attribute not being
+					 * present, so we can't remove it.
+					 * We follow Preact's logic: https://github.com/preactjs/preact/blob/ea49f7a0f9d1ff2c98c0bdd66aa0cbc583055246/src/diff/props.js#L131C24-L136
+					 */
 					if (
 						result !== null &&
 						result !== undefined &&
diff --git a/packages/interactivity/src/store.ts b/packages/interactivity/src/store.ts
index 8463d1a0a5132..5177c72cfda46 100644
--- a/packages/interactivity/src/store.ts
+++ b/packages/interactivity/src/store.ts
@@ -36,12 +36,12 @@ const deepMerge = ( target: any, source: any ) => {
 
 const parseInitialState = () => {
 	const storeTag = document.querySelector(
-		`script[type="application/json"]#wp-interactivity-initial-state`
+		`script[type="application/json"]#wp-interactivity-data`
 	);
 	if ( ! storeTag?.textContent ) return {};
 	try {
-		const initialState = JSON.parse( storeTag.textContent );
-		if ( isObject( initialState ) ) return initialState;
+		const { state } = JSON.parse( storeTag.textContent );
+		if ( isObject( state ) ) return state;
 		throw Error( 'Parsed state is not an object' );
 	} catch ( e ) {
 		// eslint-disable-next-line no-console
diff --git a/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php b/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php
deleted file mode 100644
index 2b01cb6251c21..0000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-directive-processor-test.php
+++ /dev/null
@@ -1,132 +0,0 @@
-<?php
-/**
- * `WP_Directive_Processor` class test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * @group interactivity-api
- * @covers WP_Directive_Processor
- */
-class WP_Directive_Processor_Test extends WP_UnitTestCase {
-	const HTML = '<div>outside</div><section><div><img>inside</div></section>';
-
-	public function test_next_balanced_closer_stays_on_void_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'img' );
-		$result = $tags->next_balanced_closer();
-		$this->assertSame( 'IMG', $tags->get_tag() );
-		$this->assertFalse( $result );
-	}
-
-	public function test_next_balanced_closer_proceeds_to_correct_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->next_balanced_closer();
-		$this->assertSame( 'SECTION', $tags->get_tag() );
-		$this->assertTrue( $tags->is_tag_closer() );
-	}
-
-	public function test_next_balanced_closer_proceeds_to_correct_tag_for_nested_tag() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'div' );
-		$tags->next_tag( 'div' );
-		$tags->next_balanced_closer();
-		$this->assertSame( 'DIV', $tags->get_tag() );
-		$this->assertTrue( $tags->is_tag_closer() );
-	}
-
-	public function test_get_inner_html_returns_correct_result() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$this->assertSame( '<div><img>inside</div>', $tags->get_inner_html() );
-	}
-
-	public function test_set_inner_html_on_void_element_has_no_effect() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'img' );
-		$content = $tags->set_inner_html( 'This is the new img content' );
-		$this->assertFalse( $content );
-		$this->assertSame( self::HTML, $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_sets_content_correctly() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_updates_bookmarks_correctly() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'div' );
-		$tags->set_bookmark( 'start' );
-		$tags->next_tag( 'img' );
-		$this->assertSame( 'IMG', $tags->get_tag() );
-		$tags->set_bookmark( 'after' );
-		$tags->seek( 'start' );
-
-		$tags->set_inner_html( 'This is the new div content.' );
-		$this->assertSame( '<div>This is the new div content.</div><section><div><img>inside</div></section>', $tags->get_updated_html() );
-		$tags->seek( 'after' );
-		$this->assertSame( 'IMG', $tags->get_tag() );
-	}
-
-	public function test_set_inner_html_subsequent_updates_on_the_same_tag_work() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$tags->set_inner_html( 'This is the even newer section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the even newer section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_followed_by_set_attribute_works() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$tags->set_attribute( 'id', 'thesection' );
-		$this->assertSame( '<div>outside</div><section id="thesection">This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	public function test_set_inner_html_preceded_by_set_attribute_works() {
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_attribute( 'id', 'thesection' );
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section id="thesection">This is the new section content.</section>', $tags->get_updated_html() );
-	}
-
-	/**
-	 * TODO: Review this, how that the code is in Gutenberg.
-	 */
-	public function test_set_inner_html_invalidates_bookmarks_that_point_to_replaced_content() {
-		$this->markTestSkipped( "This requires on bookmark invalidation, which is only in GB's WP 6.3 compat layer." );
-
-		$tags = new WP_Directive_Processor( self::HTML );
-
-		$tags->next_tag( 'section' );
-		$tags->set_bookmark( 'start' );
-		$tags->next_tag( 'img' );
-		$tags->set_bookmark( 'replaced' );
-		$tags->seek( 'start' );
-
-		$tags->set_inner_html( 'This is the new section content.' );
-		$this->assertSame( '<div>outside</div><section>This is the new section content.</section>', $tags->get_updated_html() );
-
-		$this->expectExceptionMessage( 'Invalid bookmark name' );
-		$successful_seek = $tags->seek( 'replaced' );
-		$this->assertFalse( $successful_seek );
-	}
-}
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
deleted file mode 100644
index a95c3482ec80d..0000000000000
--- a/phpunit/experimental/interactivity-api/class-wp-interactivity-initial-state-test.php
+++ /dev/null
@@ -1,115 +0,0 @@
-<?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() {
-		parent::set_up();
-		WP_Interactivity_Initial_State::reset();
-	}
-	public function tear_down() {
-		WP_Interactivity_Initial_State::reset();
-		parent::tear_down();
-	}
-
-	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/directive-processing-test.php b/phpunit/experimental/interactivity-api/directive-processing-test.php
deleted file mode 100644
index 337f826c22ecd..0000000000000
--- a/phpunit/experimental/interactivity-api/directive-processing-test.php
+++ /dev/null
@@ -1,521 +0,0 @@
-<?php
-/**
- * Directive processing test.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-class Tests_Process_Directives extends WP_UnitTestCase {
-	public function set_up() {
-		parent::set_up();
-
-		register_block_type(
-			'test/context-level-1',
-			array(
-				'render_callback' => function ( $attributes, $content ) {
-					return '<div data-wp-interactive=\'{ "namespace": "test" }\' data-wp-context=\'{ "myText": "level-1" }\'> <input class="level-1-input-1" data-wp-bind--value="context.myText">' . $content . '<input class="level-1-input-2" data-wp-bind--value="context.myText"></div>';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		register_block_type(
-			'test/context-level-2',
-			array(
-				'render_callback' => function ( $attributes, $content ) {
-					return '<div data-wp-interactive=\'{ "namespace": "test" }\' data-wp-context=\'{ "myText": "level-2" }\'><input class="level-2-input-1" data-wp-bind--value="context.myText">' . $content . '</div>';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		register_block_type(
-			'test/context-read-only',
-			array(
-				'render_callback' => function () {
-					return '<div data-wp-interactive=\'{ "namespace": "test" }\'><input class="read-only-input-1" data-wp-bind--value="context.myText"></div>';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		register_block_type(
-			'test/non-interactive-with-directive',
-			array(
-				'render_callback' => function () {
-					return '<input class="non-interactive-with-directive" data-wp-bind--value="context.myText">';
-				},
-			)
-		);
-
-		register_block_type(
-			'test/context-level-with-manual-inner-block-rendering',
-			array(
-				'render_callback' => function ( $attributes, $content, $block ) {
-					$inner_blocks_html = '';
-					foreach ( $block->inner_blocks as $inner_block ) {
-						$inner_blocks_html .= $inner_block->render();
-					}
-					return '<div data-wp-interactive=\'{ "namespace": "test" }\' data-wp-context=\'{ "myText": "some value" }\'>' . $inner_blocks_html . '</div>';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		register_block_type(
-			'test/directives-ordering',
-			array(
-				'render_callback' => function () {
-					return '<input data-wp-interactive=\'{ "namespace": "test" }\' data-wp-context=\'{ "isClass": true, "value": "some-value", "display": "none" }\' data-wp-bind--value="context.value" class="other-class" data-wp-class--some-class="context.isClass" data-wp-style--display="context.display">';
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		register_block_type(
-			'test/directives',
-			array(
-				'render_callback' => function ( $attributes, $content ) {
-					$parsed_attributes = array();
-					foreach ( $attributes as $key => $value ) {
-						$parsed_attributes[ $key ] = is_array( $value )
-							? wp_json_encode( $value, JSON_HEX_APOS )
-							: esc_attr( $value );
-					}
-
-					$wrapper_attributes = get_block_wrapper_attributes(
-						$parsed_attributes
-					);
-
-					return "<div $wrapper_attributes>$content</div>";
-				},
-				'supports'        => array(
-					'interactivity' => true,
-				),
-			)
-		);
-
-		WP_Interactivity_Initial_State::reset();
-	}
-
-	public function tear_down() {
-		WP_Interactivity_Initial_State::reset();
-		unregister_block_type( 'test/context-level-1' );
-		unregister_block_type( 'test/context-level-2' );
-		unregister_block_type( 'test/context-read-only' );
-		unregister_block_type( 'test/non-interactive-with-directive' );
-		unregister_block_type( 'test/context-level-with-manual-inner-block-rendering' );
-		unregister_block_type( 'test/directives-ordering' );
-		unregister_block_type( 'test/directives' );
-		parent::tear_down();
-	}
-
-	public function test_interactivity_process_directives_in_interactive_root_blocks() {
-		$block_content =
-		'<!-- wp:test/context-level-1 /-->' .
-		'<!-- wp:test/context-level-2 /-->' .
-		'<!-- wp:paragraph --><p>Welcome</p><!-- /wp:paragraph -->';
-
-		$interactive_parsed_block = parse_blocks( $block_content )[0];
-
-		$rendered_content           = render_block( $interactive_parsed_block );
-		$parsed_block_second        = parse_blocks( $block_content )[1];
-		$non_interactive_root_block = parse_blocks( $block_content )[2];
-
-		// Test that root block is intially empty.
-		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
-
-		// Test that root block is not added if it is non interactive.
-		gutenberg_interactivity_mark_root_interactive_blocks( $non_interactive_root_block );
-		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
-
-		// Test that a non root block is added if it is interactive.
-		gutenberg_interactivity_mark_root_interactive_blocks( $interactive_parsed_block );
-		$this->assertNotEmpty( WP_Directive_Processor::$interactive_root_block );
-
-		// Test that an interactive block is not added if it has in interactive ancestor.
-		$current_root_block = WP_Directive_Processor::$interactive_root_block;
-		gutenberg_interactivity_mark_root_interactive_blocks( $parsed_block_second );
-		$this->assertSame( $current_root_block, WP_Directive_Processor::$interactive_root_block );
-
-		// Test that root block is removed after processing.
-		gutenberg_process_directives_in_root_blocks( $rendered_content, $interactive_parsed_block );
-		$this->assertEmpty( WP_Directive_Processor::$interactive_root_block );
-	}
-
-	public function test_directive_processing_of_interactive_block() {
-		$post_content    = '<!-- wp:test/context-level-1 /-->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'level-1-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'level-1-input-2' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-	}
-
-	public function test_directive_processing_two_interactive_blocks_at_same_level() {
-		$post_content    = '<!-- wp:group --><div class="wp-block-group"><!-- wp:test/context-level-1 /--><!-- wp:test/context-level-2 /--></div><!-- /wp:group -->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'level-1-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'level-1-input-2' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'level-2-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-2', $value );
-	}
-
-	public function test_directives_are_processed_at_tag_end() {
-		$post_content    = '<!-- wp:test/context-level-1 --><!-- wp:test/context-level-2 /--><!-- wp:test/context-read-only /--><!-- /wp:test/context-level-1 -->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'level-1-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'level-2-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-2', $value );
-		$p->next_tag( array( 'class_name' => 'read-only-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'level-1-input-2' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-	}
-
-	public function test_non_interactive_children_of_interactive_is_rendered() {
-		$post_content    = '<!-- wp:test/context-level-1 --><!-- wp:test/context-read-only /--><!-- wp:paragraph --><p>Welcome</p><!-- /wp:paragraph --><!-- /wp:test/context-level-1 -->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'level-1-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag( array( 'class_name' => 'read-only-input-1' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-		$p->next_tag();
-		$this->assertSame( 'P', $p->get_tag() );
-		$p->next_tag( array( 'class_name' => 'level-1-input-2' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-	}
-
-	public function test_non_interactive_blocks_are_not_processed() {
-		$post_content    = '<!-- wp:test/non-interactive-with-directive /-->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'non-interactive-with-directive' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( null, $value );
-	}
-
-	public function test_non_interactive_blocks_with_interactive_ancestor_are_processed() {
-		$post_content    = '<!-- wp:test/context-level-1 --><!-- wp:test/non-interactive-with-directive /--><!-- /wp:test/context-level-1 -->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag( array( 'class_name' => 'non-interactive-with-directive' ) );
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'level-1', $value );
-	}
-
-	public function test_directives_ordering() {
-		$post_content    = '<!-- wp:test/directives-ordering -->';
-		$rendered_blocks = do_blocks( $post_content );
-		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
-		$p->next_tag();
-
-		$value = $p->get_attribute( 'class' );
-		$this->assertSame( 'other-class some-class', $value );
-
-		$value = $p->get_attribute( 'value' );
-		$this->assertSame( 'some-value', $value );
-
-		$value = $p->get_attribute( 'style' );
-		$this->assertSame( 'display: none;', $value );
-	}
-
-	public function test_evaluate_function_should_access_state() {
-		// Init a simple store.
-		wp_initial_state(
-			'test',
-			array(
-				'number' => 1,
-				'bool'   => true,
-				'nested' => array(
-					'string' => 'hi',
-				),
-			)
-		);
-
-		$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() {
-		wp_initial_state(
-			'test',
-			array(
-				'number' => 1,
-				'bool'   => true,
-				'nested' => array(
-					'string' => 'hi',
-				),
-			)
-		);
-
-		$context = array(
-			'test' => array(
-				'number' => 2,
-				'bool'   => false,
-				'nested' => array(
-					'string' => 'bye',
-				),
-			),
-		);
-
-		$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 ) );
-
-		// Defined state is also accessible.
-		$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' ) );
-	}
-
-	public function test_evaluate_function_should_return_null_for_unresolved_paths() {
-		$this->assertNull( gutenberg_interactivity_evaluate_reference( 'this.property.doesnt.exist', 'myblock' ) );
-	}
-
-	public function test_evaluate_function_should_execute_anonymous_functions() {
-		$this->markTestSkipped( 'Derived state was supported for `wp_store()` but not for `wp_initial_state()` yet.' );
-
-		$context = new WP_Directive_Context( array( 'myblock' => array( 'count' => 2 ) ) );
-
-		wp_initial_state(
-			'myblock',
-			array(
-				'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( $this, 'increment' ),
-				'class_static_method' => array( 'Tests_Process_Directives', 'static_increment' ),
-			)
-		);
-
-		$this->assertSame( 5, gutenberg_interactivity_evaluate_reference( 'state.anonymous_function', 'myblock', $context->get_context() ) );
-		$this->assertSame(
-			'gutenberg_test_process_directives_helper_increment',
-			gutenberg_interactivity_evaluate_reference( 'state.function_name', 'myblock', $context->get_context() )
-		);
-		$this->assertSame(
-			array( $this, 'increment' ),
-			gutenberg_interactivity_evaluate_reference( 'state.class_method', 'myblock', $context->get_context() )
-		);
-		$this->assertSame(
-			array( 'Tests_Process_Directives', 'static_increment' ),
-			gutenberg_interactivity_evaluate_reference( 'state.class_static_method', 'myblock', $context->get_context() )
-		);
-	}
-
-	public function test_namespace_should_be_inherited_from_ancestor() {
-		/*
-		 * This function call should be done inside block render functions. We
-		 * run it here instead just for conveninence.
-		 */
-		wp_initial_state( 'test-1', array( 'text' => 'state' ) );
-
-		$post_content = '
-			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
-				<!-- wp:test/directives { "data-wp-context": { "text": "context" } } -->
-					<!-- wp:test/directives {
-						"class": "bind-state",
-						"data-wp-bind--data-value": "state.text"
-					} /-->
-					<!-- wp:test/directives {
-						"class": "bind-context",
-						"data-wp-bind--data-value": "context.text"
-					} /-->
-				<!-- /wp:test/directives -->
-			<!-- /wp:test/directives -->
-		';
-
-		$html = do_blocks( $post_content );
-		$tags = new WP_HTML_Tag_Processor( $html );
-
-		$tags->next_tag( array( 'class_name' => 'bind-state' ) );
-		$this->assertSame( 'state', $tags->get_attribute( 'data-value' ) );
-
-		$tags->next_tag( array( 'class_name' => 'bind-context' ) );
-		$this->assertSame( 'context', $tags->get_attribute( 'data-value' ) );
-	}
-
-	public function test_namespace_should_be_inherited_from_same_element() {
-		/*
-		 * This function call should be done inside block render functions. We
-		 * run it here instead just for conveninence.
-		 */
-		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
-
-		$post_content = '
-			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
-				<!-- wp:test/directives { "data-wp-context": { "text": "context" } } -->
-					<!-- wp:test/directives {
-						"class": "bind-state",
-						"data-wp-interactive": { "namespace": "test-2" },
-						"data-wp-bind--data-value": "state.text"
-					} /-->
-					<!-- wp:test/directives {
-						"class": "bind-context",
-						"data-wp-interactive": { "namespace": "test-2" },
-						"data-wp-context": { "text": "context-2" },
-						"data-wp-bind--data-value": "context.text"
-					} /-->
-				<!-- /wp:test/directives -->
-			<!-- /wp:test/directives -->
-		';
-
-		$html = do_blocks( $post_content );
-		$tags = new WP_HTML_Tag_Processor( $html );
-
-		$tags->next_tag( array( 'class_name' => 'bind-state' ) );
-		$this->assertSame( 'state-2', $tags->get_attribute( 'data-value' ) );
-
-		$tags->next_tag( array( 'class_name' => 'bind-context' ) );
-		$this->assertSame( 'context-2', $tags->get_attribute( 'data-value' ) );
-	}
-
-	public function test_namespace_should_not_leak_from_descendant() {
-		/*
-		 * This function call should be done inside block render functions. We
-		 * run it here instead just for conveninence.
-		 */
-		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
-		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
-
-		$post_content = '
-			<!-- wp:test/directives {
-				"data-wp-interactive": { "namespace": "test-2" },
-				"data-wp-context": { "text": "context-2" }
-			} -->
-				<!-- wp:test/directives {
-					"class": "target",
-					"data-wp-interactive": { "namespace": "test-1" },
-					"data-wp-context": { "text": "context-1" },
-					"data-wp-bind--data-state": "state.text",
-					"data-wp-bind--data-context": "context.text"
-				} -->
-					<!-- wp:test/directives {
-						"data-wp-interactive": { "namespace": "test-2" }
-					} /-->
-				<!-- /wp:test/directives -->
-			<!-- /wp:test/directives -->
-		';
-
-		$html = do_blocks( $post_content );
-		$tags = new WP_HTML_Tag_Processor( $html );
-
-		$tags->next_tag( array( 'class_name' => 'target' ) );
-		$this->assertSame( 'state-1', $tags->get_attribute( 'data-state' ) );
-		$this->assertSame( 'context-1', $tags->get_attribute( 'data-context' ) );
-	}
-
-	public function test_namespace_should_not_leak_from_sibling() {
-		/*
-		 * This function call should be done inside block render functions. We
-		 * run it here instead just for conveninence.
-		 */
-		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
-		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
-
-		$post_content = '
-			<!-- wp:test/directives {
-				"data-wp-interactive": { "namespace": "test-2" },
-				"data-wp-context": { "text": "context-2" }
-			} -->
-				<!-- wp:test/directives {
-					"data-wp-interactive": { "namespace": "test-1" },
-					"data-wp-context": { "text": "context-1" }
-				} -->
-					<!-- wp:test/directives {
-						"data-wp-interactive": { "namespace": "test-2" }
-					} /-->
-					<!-- wp:test/directives {
-						"class": "target",
-						"data-wp-bind--data-from-state": "state.text",
-						"data-wp-bind--data-from-context": "context.text"
-					} /-->
-				<!-- /wp:test/directives -->
-			<!-- /wp:test/directives -->
-		';
-
-		$html = do_blocks( $post_content );
-		$tags = new WP_HTML_Tag_Processor( $html );
-
-		$tags->next_tag( array( 'class_name' => 'target' ) );
-		$this->assertSame( 'state-1', $tags->get_attribute( 'data-from-state' ) );
-		$this->assertSame( 'context-1', $tags->get_attribute( 'data-from-context' ) );
-	}
-
-	public function test_namespace_can_be_overwritten_in_directives() {
-		/*
-		 * This function call should be done inside block render functions. We
-		 * run it here instead just for conveninence.
-		 */
-		wp_initial_state( 'test-1', array( 'text' => 'state-1' ) );
-		wp_initial_state( 'test-2', array( 'text' => 'state-2' ) );
-
-		$post_content = '
-			<!-- wp:test/directives { "data-wp-interactive": { "namespace": "test-1" } } -->
-					<!-- wp:test/directives {
-						"class": "inherited-ns",
-						"data-wp-bind--data-value": "state.text"
-					} /-->
-					<!-- wp:test/directives {
-						"class": "custom-ns",
-						"data-wp-bind--data-value": "test-2::state.text"
-					} /-->
-					<!-- wp:test/directives {
-						"class": "mixed-ns",
-						"data-wp-bind--data-inherited-ns": "state.text",
-						"data-wp-bind--data-custom-ns": "test-2::state.text"
-					} /-->
-			<!-- /wp:test/directives -->
-		';
-
-		$html = do_blocks( $post_content );
-		$tags = new WP_HTML_Tag_Processor( $html );
-
-		$tags->next_tag( array( 'class_name' => 'inherited-ns' ) );
-		$this->assertSame( 'state-1', $tags->get_attribute( 'data-value' ) );
-
-		$tags->next_tag( array( 'class_name' => 'custom-ns' ) );
-		$this->assertSame( 'state-2', $tags->get_attribute( 'data-value' ) );
-
-		$tags->next_tag( array( 'class_name' => 'mixed-ns' ) );
-		$this->assertSame( 'state-1', $tags->get_attribute( 'data-inherited-ns' ) );
-		$this->assertSame( 'state-2', $tags->get_attribute( 'data-custom-ns' ) );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php b/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
deleted file mode 100644
index 8fe212bb8ed93..0000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-bind-test.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * Tests for the wp-bind directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-bind directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_bind
- */
-class Tests_Directives_WpBind extends WP_UnitTestCase {
-	public function test_directive_sets_attribute() {
-		$markup = '<img data-wp-bind--src="context.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_bind( $tags, $context, $directive_ns );
-
-		$this->assertSame(
-			'<img src="./wordpress.png" data-wp-bind--src="context.imageSource" />',
-			$tags->get_updated_html()
-		);
-		$this->assertSame( './wordpress.png', $tags->get_attribute( 'src' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-bind directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_bound_attribute() {
-		$markup = '<img data-wp-bind.="context.imageSource" />';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'imageSource' => './wordpress.png' ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_bind( $tags, $context, $directive_ns );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertNull( $tags->get_attribute( 'src' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-bind directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-class-test.php b/phpunit/experimental/interactivity-api/directives/wp-class-test.php
deleted file mode 100644
index f40486647ff8b..0000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-class-test.php
+++ /dev/null
@@ -1,103 +0,0 @@
-<?php
-/**
- * Tests for the wp-class directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-class directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_class
- */
-class Tests_Directives_WpClass extends WP_UnitTestCase {
-	public function test_directive_adds_class() {
-		$markup = '<div data-wp-class--red="context.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
-
-		$this->assertSame(
-			'<div data-wp-class--red="context.isRed" class="blue red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertStringContainsString( 'red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_removes_class() {
-		$markup = '<div data-wp-class--blue="context.isBlue" class="red blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
-
-		$this->assertSame(
-			'<div data-wp-class--blue="context.isBlue" class="red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertStringNotContainsString( 'blue', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_removes_empty_class_attribute() {
-		$markup = '<div data-wp-class--blue="context.isBlue" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
-
-		$this->assertSame(
-			// WP_HTML_Tag_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' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_does_not_remove_non_existant_class() {
-		$markup = '<div data-wp-class--blue="context.isBlue" class="green red">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isBlue' => false ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
-
-		$this->assertSame(
-			'<div data-wp-class--blue="context.isBlue" class="green red">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertSame( 'green red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_class_name() {
-		$markup = '<div data-wp-class.="context.isRed" class="blue">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'isRed' => true ) ) );
-		$context        = $context_before;
-		$directive_ns   = 'myblock';
-		gutenberg_interactivity_process_wp_class( $tags, $context, $directive_ns );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertStringNotContainsString( 'red', $tags->get_attribute( 'class' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-class directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-context-test.php b/phpunit/experimental/interactivity-api/directives/wp-context-test.php
deleted file mode 100644
index 788feec95fe7c..0000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-context-test.php
+++ /dev/null
@@ -1,230 +0,0 @@
-<?php
-/**
- * Tests for the wp-context directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-context directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_context
- */
-class Tests_Directives_Attributes_WpContext extends WP_UnitTestCase {
-	public function test_directive_merges_context_correctly_upon_wp_context_attribute_on_opening_tag() {
-		$context = new WP_Directive_Context(
-			array(
-				'myblock'    => array( 'open' => false ),
-				'otherblock' => array( 'somekey' => 'somevalue' ),
-			)
-		);
-
-		$ns     = 'myblock';
-		$markup = '<div data-wp-context=\'{ "open": true }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		gutenberg_interactivity_process_wp_context( $tags, $context, $ns );
-
-		$this->assertSame(
-			array(
-				'myblock'    => array( 'open' => true ),
-				'otherblock' => array( 'somekey' => 'somevalue' ),
-			),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_resets_context_correctly_upon_closing_tag() {
-		$context = new WP_Directive_Context(
-			array( 'myblock' => array( 'my-key' => 'original-value' ) )
-		);
-
-		$context->set_context(
-			array( 'myblock' => array( 'my-key' => 'new-value' ) )
-		);
-
-		$markup = '</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			array( 'my-key' => 'original-value' ),
-			$context->get_context()['myblock']
-		);
-	}
-
-	public function test_directive_doesnt_throw_on_malformed_context_objects() {
-		$context = new WP_Directive_Context(
-			array( 'myblock' => array( 'my-key' => 'some-value' ) )
-		);
-
-		$markup = '<div data-wp-context=\'{ "wrong_json_object: }\'>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-	}
-
-	public function test_directive_keeps_working_after_malformed_context_objects() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context=\'{ "wrong_json_object: }\'>
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_keeps_working_with_a_directive_without_value() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context>
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-
-	public function test_directive_keeps_working_with_an_empty_directive() {
-		$context = new WP_Directive_Context();
-
-		$markup = '
-			<div data-wp-context=\'{ "my-key": "some-value" }\'>
-				<div data-wp-context="">
-				</div>
-			</div>
-		';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-
-		// Parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing children div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Still the same context.
-		$this->assertSame(
-			array( 'my-key' => 'some-value' ),
-			$context->get_context()['myblock']
-		);
-
-		// Closing parent div.
-		$tags->next_tag( array( 'tag_closers' => 'visit' ) );
-		gutenberg_interactivity_process_wp_context( $tags, $context, 'myblock' );
-
-		// Now the context is empty.
-		$this->assertSame(
-			array(),
-			$context->get_context()
-		);
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-style-test.php b/phpunit/experimental/interactivity-api/directives/wp-style-test.php
deleted file mode 100644
index 9625803ebca78..0000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-style-test.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-/**
- * Tests for the wp-style directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-style directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_style
- */
-class Tests_Directives_WpStyle extends WP_UnitTestCase {
-	public function test_directive_adds_style() {
-		$markup = '<div data-wp-style--color="context.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			'<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' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-style directive changed context' );
-	}
-
-	public function test_directive_ignores_empty_style() {
-		$markup = '<div data-wp-style="context.color" style="background: blue;">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
-
-		$this->assertSame( $markup, $tags->get_updated_html() );
-		$this->assertStringNotContainsString( 'color: green;', $tags->get_attribute( 'style' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-style directive changed context' );
-	}
-
-	public function test_directive_works_without_style_attribute() {
-		$markup = '<div data-wp-style--color="context.color">Test</div>';
-		$tags   = new WP_HTML_Tag_Processor( $markup );
-		$tags->next_tag();
-
-		$context_before = new WP_Directive_Context( array( 'myblock' => array( 'color' => 'green' ) ) );
-		$context        = $context_before;
-		gutenberg_interactivity_process_wp_style( $tags, $context, 'myblock' );
-
-		$this->assertSame(
-			'<div style="color: green;" data-wp-style--color="context.color">Test</div>',
-			$tags->get_updated_html()
-		);
-		$this->assertSame( 'color: green;', $tags->get_attribute( 'style' ) );
-		$this->assertSame( $context_before->get_context(), $context->get_context(), 'data-wp-style directive changed context' );
-	}
-}
diff --git a/phpunit/experimental/interactivity-api/directives/wp-text-test.php b/phpunit/experimental/interactivity-api/directives/wp-text-test.php
deleted file mode 100644
index 9c889a3f0eb68..0000000000000
--- a/phpunit/experimental/interactivity-api/directives/wp-text-test.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Tests for the wp-text directive.
- *
- * @package Gutenberg
- * @subpackage Interactivity API
- */
-
-/**
- * Tests for the wp-text directive.
- *
- * @group  interactivity-api
- * @covers gutenberg_interactivity_process_wp_text
- */
-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.someText"></div>';
-
-		$tags = new WP_Directive_Processor( $markup );
-		$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, 'myblock' );
-
-		$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.someText">Lorem ipsum dolor sit.</div>';
-
-		$tags = new WP_Directive_Processor( $markup );
-		$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, 'myblock' );
-
-		$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' );
-	}
-}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-directives-processor-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-directives-processor-test.php
new file mode 100644
index 0000000000000..aa1ee999fd58f
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-directives-processor-test.php
@@ -0,0 +1,369 @@
+<?php
+/**
+ * Unit tests covering WP_Interactivity_API_Directives_Processor functionality.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ *
+ * @coversDefaultClass WP_Interactivity_API_Directives_Processor
+ */
+class Tests_WP_Interactivity_API_Directives_Processor extends WP_UnitTestCase {
+	/**
+	 * Tests the `get_content_between_balanced_tags` method on standard tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_standard_tags() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+
+		$content = '<div>Text</div><div>More text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Text', $p->get_content_between_balanced_tags() );
+		$p->next_tag();
+		$this->assertEquals( 'More text', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method on an empty tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_empty_tag() {
+		$content = '<div></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with a self-closing
+	 * tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_self_closing_tag() {
+		$content = '<img src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with nested tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_nested_tags() {
+		$content = '<div><span>Content</span><strong>More Content</strong></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '<span>Content</span><strong>More Content</strong>', $p->get_content_between_balanced_tags() );
+
+		$content = '<div><div>Content</div><img src="example.jpg"></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( '<div>Content</div><img src="example.jpg">', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method when no tags are
+	 * present.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_no_tags() {
+		$content = 'Just a string with no tags.';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method with unbalanced tags.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_with_unbalanced_tags() {
+		$content = '<div>Missing closing div';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		$content = '<div><div>Missing closing div</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		$content = '<div>Missing closing div</span>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+
+		// It supports unbalanced tags inside the content.
+		$content = '<div>Missing opening span</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertEquals( 'Missing opening span</span>', $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `get_content_between_balanced_tags` method when called on a
+	 * closing tag.
+	 *
+	 * @covers ::get_content_between_balanced_tags
+	 */
+	public function test_get_content_between_balanced_tags_on_closing_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$this->assertNull( $p->get_content_between_balanced_tags() );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on standard tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_standard_tags() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+
+		$content = '<div>Text</div><div>More text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div><div>More text</div>', $p );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'More new text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div><div>More new text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method when called on a
+	 * closing tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_on_closing_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$p->next_tag( array( 'tag_closers' => 'visit' ) );
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on multiple calls to
+	 * the same tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_multiple_calls_in_same_tag() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+		$result = $p->set_content_between_balanced_tags( 'More text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>More text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on combinations with
+	 * set_attribute calls.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_set_attribute() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$p->set_attribute( 'class', 'test' );
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div class="test">New text</div>', $p );
+
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$p->set_attribute( 'class', 'test' );
+		$this->assertEquals( '<div class="test">New text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method where the existing
+	 * content includes tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_existing_tags() {
+		$content = '<div><span>Text</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method where the new content
+	 * includes tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_new_tags() {
+		$content     = '<div>Text</div>';
+		$new_content = '<span>New text</span><a href="#">Link</a>';
+		$p           = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$p->set_content_between_balanced_tags( $new_content );
+		$this->assertEquals( '<div>&lt;span&gt;New text&lt;/span&gt;&lt;a href=&quot;#&quot;&gt;Link&lt;/a&gt;</div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method with an empty string.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_empty() {
+		$content = '<div>Text</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( '' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div></div>', $p );
+
+		$content = '<div><div>Text</div></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( '' );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div></div>', $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on self-closing tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_self_closing_tag() {
+		$content = '<img src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method on a non-existent tag.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_non_existent_tag() {
+		$content = 'Just a string with no tags.';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( 'New text' );
+		$this->assertFalse( $result );
+		$this->assertEquals( $content, $p );
+	}
+
+	/**
+	 * Tests the `set_content_between_balanced_tags` method with unbalanced tags.
+	 *
+	 * @covers ::set_content_between_balanced_tags
+	 */
+	public function test_set_content_between_balanced_tags_with_unbalanced_tags() {
+		$new_content = 'New text';
+
+		$content = '<div>Missing closing div';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Missing closing div', $p );
+
+		$content = '<div><div>Missing closing div</div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div><div>Missing closing div</div>', $p );
+
+		$content = '<div>Missing closing div</span>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertFalse( $result );
+		$this->assertEquals( '<div>Missing closing div</span>', $p );
+
+		// It supports unbalanced tags inside the content.
+		$content = '<div>Missing opening span</span></div>';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$result = $p->set_content_between_balanced_tags( $new_content );
+		$this->assertTrue( $result );
+		$this->assertEquals( '<div>New text</div>', $p );
+	}
+
+	/**
+	 * Tests the is_void method.
+	 *
+	 * @covers ::is_void
+	 */
+	public function test_is_void_element() {
+		$void_elements = array( 'area', 'base', 'br', 'col', 'embed', 'hr', 'img', 'input', 'link', 'meta', 'source', 'track', 'wbr' );
+		foreach ( $void_elements as $tag_name ) {
+			$content = "<{$tag_name} id={$tag_name}>";
+			$p       = new WP_Interactivity_API_Directives_Processor( $content );
+			$p->next_tag();
+			$this->assertTrue( $p->is_void() );
+		}
+
+		$non_void_elements = array( 'div', 'span', 'p', 'script', 'style' );
+		foreach ( $non_void_elements as $tag_name ) {
+			$content = "<{$tag_name} id={$tag_name}>Some content</{$tag_name}>";
+			$p       = new WP_Interactivity_API_Directives_Processor( $content );
+			$p->next_tag();
+			$this->assertFalse( $p->is_void() );
+		}
+
+		// Test an upercase tag.
+		$content = '<IMG src="example.jpg">';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertTrue( $p->is_void() );
+
+		// Test an empty string.
+		$content = '';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->is_void() );
+
+		// Test on text nodes.
+		$content = 'This is just some text';
+		$p       = new WP_Interactivity_API_Directives_Processor( $content );
+		$p->next_tag();
+		$this->assertFalse( $p->is_void() );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-test.php
new file mode 100644
index 0000000000000..719f9592563c3
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-test.php
@@ -0,0 +1,570 @@
+<?php
+/**
+ * Unit tests covering WP_Interactivity_API functionality.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ *
+ * @coversDefaultClass WP_Interactivity_API
+ */
+class Tests_WP_Interactivity_API extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+	}
+
+	/**
+	 * Tests that the state and config methods return an empty array at the
+	 * beginning.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_should_be_empty() {
+		$this->assertEquals( array(), $this->interactivity->state( 'myPlugin' ) );
+		$this->assertEquals( array(), $this->interactivity->config( 'myPlugin' ) );
+	}
+
+	/**
+	 * Tests that the state and config methods can change the state and
+	 * configuration.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_can_be_changed() {
+		$state  = array(
+			'a'      => 1,
+			'b'      => 2,
+			'nested' => array( 'c' => 3 ),
+		);
+		$result = $this->interactivity->state( 'myPlugin', $state );
+		$this->assertEquals( $state, $result );
+		$result = $this->interactivity->config( 'myPlugin', $state );
+		$this->assertEquals( $state, $result );
+	}
+
+	/**
+	 * Tests that different initial states and configurations can be merged.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_can_be_merged() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'myPlugin', array( 'b' => 2 ) );
+		$this->interactivity->state( 'otherPlugin', array( 'c' => 3 ) );
+		$this->assertEquals(
+			array(
+				'a' => 1,
+				'b' => 2,
+			),
+			$this->interactivity->state( 'myPlugin' )
+		);
+		$this->assertEquals(
+			array( 'c' => 3 ),
+			$this->interactivity->state( 'otherPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'myPlugin', array( 'b' => 2 ) );
+		$this->interactivity->config( 'otherPlugin', array( 'c' => 3 ) );
+		$this->assertEquals(
+			array(
+				'a' => 1,
+				'b' => 2,
+			),
+			$this->interactivity->config( 'myPlugin' )
+		);
+		$this->assertEquals(
+			array( 'c' => 3 ),
+			$this->interactivity->config( 'otherPlugin' )
+		);  }
+
+	/**
+	 * Tests that existing keys in the initial state and configuration can be
+	 * overwritten.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_existing_props_can_be_overwritten() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'myPlugin', array( 'a' => 2 ) );
+		$this->assertEquals(
+			array( 'a' => 2 ),
+			$this->interactivity->state( 'myPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => 2 ) );
+		$this->assertEquals(
+			array( 'a' => 2 ),
+			$this->interactivity->config( 'myPlugin' )
+		);
+	}
+
+	/**
+	 * Tests that existing indexed arrays in the initial state and configuration
+	 * are replaced, not merged.
+	 *
+	 * @covers ::state
+	 * @covers ::config
+	 */
+	public function test_state_and_config_existing_indexed_arrays_are_replaced() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => array( 1, 2 ) ) );
+		$this->interactivity->state( 'myPlugin', array( 'a' => array( 3, 4 ) ) );
+		$this->assertEquals(
+			array( 'a' => array( 3, 4 ) ),
+			$this->interactivity->state( 'myPlugin' )
+		);
+
+		$this->interactivity->config( 'myPlugin', array( 'a' => array( 1, 2 ) ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => array( 3, 4 ) ) );
+		$this->assertEquals(
+			array( 'a' => array( 3, 4 ) ),
+			$this->interactivity->config( 'myPlugin' )
+		);
+	}
+
+	/**
+	 * Invokes the private `print_client_interactivity` method of
+	 * WP_Interactivity_API class.
+	 *
+	 * @return array|null The content of the JSON object printed on the client-side or null if nothings was printed.
+	 */
+	private function print_client_interactivity_data() {
+		$interactivity_data_markup = get_echo( array( $this->interactivity, 'print_client_interactivity_data' ) );
+		preg_match( '/<script type="application\/json" id="wp-interactivity-data">.*?(\{.*\}).*?<\/script>/s', $interactivity_data_markup, $interactivity_data_string );
+		return isset( $interactivity_data_string[1] ) ? json_decode( $interactivity_data_string[1], true ) : null;
+	}
+
+	/**
+	 * Tests that the initial state and config are correctly printed on the
+	 * client-side.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_is_correctly_printed() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->state( 'otherPlugin', array( 'b' => 2 ) );
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$this->interactivity->config( 'otherPlugin', array( 'b' => 2 ) );
+
+		$result = $this->print_client_interactivity_data();
+
+		$data = array(
+			'myPlugin'    => array( 'a' => 1 ),
+			'otherPlugin' => array( 'b' => 2 ),
+		);
+
+		$this->assertEquals(
+			array(
+				'state'  => $data,
+				'config' => $data,
+			),
+			$result
+		);
+	}
+
+	/**
+	 * Tests that the wp-interactivity-data script is not printed if both state
+	 * and config are empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_dont_print_when_empty() {
+		$result = $this->print_client_interactivity_data();
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * Tests that the config is not printed if it's empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_config_not_printed_when_empty() {
+		$this->interactivity->state( 'myPlugin', array( 'a' => 1 ) );
+		$result = $this->print_client_interactivity_data();
+		$this->assertEquals( array( 'state' => array( 'myPlugin' => array( 'a' => 1 ) ) ), $result );
+	}
+
+	/**
+	 * Tests that the state is not printed if it's empty.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_not_printed_when_empty() {
+		$this->interactivity->config( 'myPlugin', array( 'a' => 1 ) );
+		$result = $this->print_client_interactivity_data();
+		$this->assertEquals( array( 'config' => array( 'myPlugin' => array( 'a' => 1 ) ) ), $result );
+	}
+
+
+
+	/**
+	 * Tests that special characters in the initial state and configuration are
+	 * properly escaped.
+	 *
+	 * @covers ::print_client_interactivity_data
+	 */
+	public function test_state_and_config_escape_special_characters() {
+		$this->interactivity->state( 'myPlugin', array( 'amps' => 'http://site.test/?foo=1&baz=2' ) );
+		$this->interactivity->config( 'myPlugin', array( 'tags' => 'Tags: <!-- <script>' ) );
+
+		$interactivity_data_markup = get_echo( array( $this->interactivity, 'print_client_interactivity_data' ) );
+		preg_match( '/<script type="application\/json" id="wp-interactivity-data">.*?(\{.*\}).*?<\/script>/s', $interactivity_data_markup, $interactivity_data_string );
+
+		$this->assertEquals(
+			'{"config":{"myPlugin":{"tags":"Tags: \u003C!-- \u003Cscript\u003E"}},"state":{"myPlugin":{"amps":"http:\/\/site.test\/?foo=1\u0026baz=2"}}}',
+			$interactivity_data_string[1]
+		);
+	}
+
+	/**
+	 * Tests extracting directive values from different string formats.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 'state.foo' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 'state.foo' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '{ "isOpen": false }', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', array( 'isOpen' => false ) ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::{ "isOpen": false }', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', array( 'isOpen' => false ) ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'true', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', true ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'false', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', false ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'null', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '100', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 100 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '1.2', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 1.2 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '1.2.3', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '1.2.3' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::true', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', true ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::false', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', false ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::null', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::100', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 100 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::1.2', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', 1.2 ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::1.2.3', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', '1.2.3' ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, 'otherPlugin::[{"o":4}, null, 3e6]', 'myPlugin' );
+		$this->assertEquals( array( 'otherPlugin', array( array( 'o' => 4 ), null, 3000000.0 ) ), $result );
+	}
+
+	/**
+	 * Tests extracting directive values with empty or invalid input.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value_empty_values() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, '', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		// This is a boolean attribute.
+		$result = $extract_directive_value->invoke( $this->interactivity, true, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, false, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		$result = $extract_directive_value->invoke( $this->interactivity, null, 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+
+		// A string ending in `::` without any extra characters is not considered a
+		// namespace.
+		$result = $extract_directive_value->invoke( $this->interactivity, 'myPlugin::', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', 'myPlugin::' ), $result );
+
+		// A namespace with invalid characters is not considered a valid namespace.
+		$result = $extract_directive_value->invoke( $this->interactivity, '$myPlugin::state.foo', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '$myPlugin::state.foo' ), $result );
+	}
+
+	/**
+	 * Tests extracting directive values from invalid JSON strings.
+	 *
+	 * @covers ::extract_directive_value
+	 */
+	public function test_extract_directive_value_invalid_json() {
+		$extract_directive_value = new ReflectionMethod( $this->interactivity, 'extract_directive_value' );
+		$extract_directive_value->setAccessible( true );
+
+		// Invalid JSON due to missing quotes. Returns the original value.
+		$result = $extract_directive_value->invoke( $this->interactivity, '{ isOpen: false }', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', '{ isOpen: false }' ), $result );
+
+		// Null string. Returns null.
+		$result = $extract_directive_value->invoke( $this->interactivity, 'null', 'myPlugin' );
+		$this->assertEquals( array( 'myPlugin', null ), $result );
+	}
+
+	/**
+	 * Tests the ability to extract prefix and suffix from a directive attribute
+	 * name.
+	 *
+	 * @covers ::extract_prefix_and_suffix
+	 */
+	public function test_extract_prefix_and_suffix() {
+		$extract_prefix_and_suffix = new ReflectionMethod( $this->interactivity, 'extract_prefix_and_suffix' );
+		$extract_prefix_and_suffix->setAccessible( true );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-interactive' );
+		$this->assertEquals( array( 'data-wp-interactive' ), $result );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-bind--src' );
+		$this->assertEquals( array( 'data-wp-bind', 'src' ), $result );
+
+		$result = $extract_prefix_and_suffix->invoke( $this->interactivity, 'data-wp-foo--and--bar' );
+		$this->assertEquals( array( 'data-wp-foo', 'and--bar' ), $result );
+	}
+
+	/**
+	 * Tests that the `process_directives` method doesn't change the HTML if it
+	 * doesn't contain directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_do_nothing_without_directives() {
+		$html           = '<div>Inner content here</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+
+		$html           = '<div><span>Content</span><strong>More Content</strong></div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+	}
+
+	/**
+	 * Tests that the `process_directives` method changes the HTML if it contains
+	 * directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_changes_html_with_balanced_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$html           = '<div data-wp-bind--id="myPlugin::state.id">Inner content</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests how `process_directives` handles HTML with unknown directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_fail_with_unknown_directives() {
+		$html           = '<div data-wp-uknown="">Text</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $processed_html );
+	}
+
+	/**
+	 * Tests that directives are processed in the correct order.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_process_the_directives_in_the_correct_order() {
+		$html           = '
+			<div
+				data-wp-interactive=\'{ "namespace": "test" }\'
+				data-wp-context=\'{ "isClass": true, "id": "some-id", "text": "Updated", "display": "none" }\'
+				data-wp-bind--id="context.id"
+				data-wp-class--some-class="context.isClass"
+				data-wp-style--display="context.display"
+				data-wp-text="context.text"
+			>Text</div>';
+		$processed_html = $this->interactivity->process_directives( $html );
+		$p              = new WP_HTML_Tag_Processor( $processed_html );
+		$p->next_tag();
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+		$this->assertEquals( 'display:none;', $p->get_attribute( 'style' ) );
+		$this->assertStringContainsString( 'Updated', $p->get_updated_html() );
+		$this->assertStringNotContainsString( 'Text', $p->get_updated_html() );
+	}
+
+	/**
+	 * Tests that the `process_directives` returns the same HTML if it contains
+	 * unbalanced tags.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_process_directives_doesnt_change_html_if_contains_unbalanced_tags() {
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+
+		$html_samples = array(
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div></div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div><div>',
+			'<div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
+			'</div><div data-wp-bind--id="myPlugin::state.id">Inner content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner<div>content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner</div>content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner content</div></span>',
+			'<div data-wp-bind--id="myPlugin::state.id"><span>Inner content</div></span>',
+			'<div data-wp-bind--id="myPlugin::state.id">Inner conntent</ ></div>',
+		);
+
+		foreach ( $html_samples as $html ) {
+			$processed_html = $this->interactivity->process_directives( $html );
+			$p              = new WP_HTML_Tag_Processor( $processed_html );
+			$p->next_tag();
+			$this->assertNull( $p->get_attribute( 'id' ) );
+		}
+	}
+
+	/**
+	 * Invokes the private `evaluate` method of WP_Interactivity_API class.
+	 *
+	 * @param string $directive_value The directive attribute value to evaluate.
+	 * @return mixed The result of the evaluate method.
+	 */
+	private function evaluate( $directive_value ) {
+		$generate_state = function ( $name ) {
+			return array(
+				'key'    => $name,
+				'nested' => array( 'key' => $name . '-nested' ),
+			);
+		};
+		$this->interactivity->state( 'myPlugin', $generate_state( 'myPlugin-state' ) );
+		$this->interactivity->state( 'otherPlugin', $generate_state( 'otherPlugin-state' ) );
+		$context  = array(
+			'myPlugin'    => $generate_state( 'myPlugin-context' ),
+			'otherPlugin' => $generate_state( 'otherPlugin-context' ),
+		);
+		$evaluate = new ReflectionMethod( $this->interactivity, 'evaluate' );
+		$evaluate->setAccessible( true );
+		return $evaluate->invokeArgs( $this->interactivity, array( $directive_value, 'myPlugin', $context ) );
+	}
+
+	/**
+	 * Tests that the `evaluate` method operates correctly for valid expressions.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_value() {
+		$result = $this->evaluate( 'state.key' );
+		$this->assertEquals( 'myPlugin-state', $result );
+
+		$result = $this->evaluate( 'context.key' );
+		$this->assertEquals( 'myPlugin-context', $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.key' );
+		$this->assertEquals( 'otherPlugin-state', $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.key' );
+		$this->assertEquals( 'otherPlugin-context', $result );
+	}
+
+	/**
+	 * Tests that the `evaluate` method operates correctly when used with negation
+	 * (!).
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_value_negation() {
+		$result = $this->evaluate( '!state.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( '!context.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( 'otherPlugin::!state.key' );
+		$this->assertFalse( $result );
+
+		$result = $this->evaluate( 'otherPlugin::!context.key' );
+		$this->assertFalse( $result );
+	}
+
+	/**
+	 * Tests the `evaluate` method with non-existent paths.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_non_existent_path() {
+		$result = $this->evaluate( 'state.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'context.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.nonExistentKey' );
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( ' state.key' ); // Extra space.
+		$this->assertNull( $result );
+
+		$result = $this->evaluate( 'otherPlugin:: state.key' ); // Extra space.
+		$this->assertNull( $result );
+	}
+
+	/**
+	 * Tests the `evaluate` method for retrieving nested values.
+	 *
+	 * @covers ::evaluate
+	 */
+	public function test_evaluate_nested_value() {
+		$result = $this->evaluate( 'state.nested.key' );
+		$this->assertEquals( 'myPlugin-state-nested', $result );
+
+		$result = $this->evaluate( 'context.nested.key' );
+		$this->assertEquals( 'myPlugin-context-nested', $result );
+
+		$result = $this->evaluate( 'otherPlugin::state.nested.key' );
+		$this->assertEquals( 'otherPlugin-state-nested', $result );
+
+		$result = $this->evaluate( 'otherPlugin::context.nested.key' );
+		$this->assertEquals( 'otherPlugin-context-nested', $result );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-bind-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-bind-test.php
new file mode 100644
index 0000000000000..7b82d728f0382
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-bind-test.php
@@ -0,0 +1,338 @@
+<?php
+/**
+ * Unit tests covering the data_wp_bind_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Bind extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'id'          => 'some-id',
+				'width'       => 100,
+				'isOpen'      => false,
+				'null'        => null,
+				'trueString'  => 'true',
+				'falseString' => 'false',
+			)
+		);
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests setting an attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_attribute() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests replacing an existing attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_attribute() {
+		$html    = '<div id="other-id" data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests setting a numerical value as an attribute via `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_number_value() {
+		$html    = '<img data-wp-bind--width="myPlugin::state.width">';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+
+	/**
+	 * Tests that true strings are set properly as attribute values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_true_string() {
+		$html               = '<div data-wp-bind--id="myPlugin::state.trueString">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '<div id="true" data-wp-bind--id="myPlugin::state.trueString">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that false strings are set properly as attribute values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_sets_false_string() {
+		$html               = '<div data-wp-bind--id="myPlugin::state.falseString">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '<div id="false" data-wp-bind--id="myPlugin::state.falseString">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives with no suffix.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_empty_bound_attribute() {
+		$html     = '<div data-wp-bind="myPlugin::state.id">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` does nothing when referencing non-existent
+	 * references.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_doesnt_do_anything_on_non_existent_references() {
+		$html     = '<div data-wp-bind--id="myPlugin::state.nonExistengKey">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives with empty values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_empty_value() {
+		$html     = '<div data-wp-bind--id="">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` ignores directives without values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_ignores_without_value() {
+		$html     = '<div data-wp-bind--id>Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` works with multiple instances of the same
+	 * directive on a tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_works_with_multiple_same_directives() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id" data-wp-bind--id="myPlugin::state.id">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-bind` works with multiple instances of different
+	 * directives on a tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_works_with_multiple_different_directives() {
+		$html    = '<img data-wp-bind--id="myPlugin::state.id" data-wp-bind--width="myPlugin::state.width">';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+
+	/**
+	 * Tests adding boolean attributes to a tag using `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_boolean_attribute_if_true() {
+		$html               = '<div data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( '<div hidden data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing a pre-existing boolean attribute on a tag using
+	 * `data-wp-bind`.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_existing_attribute_if_true() {
+		$html               = '<div hidden="true" data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( '<div hidden data-wp-bind--hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests that boolean attributes are not added when bound to false or null
+	 * values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_doesnt_add_boolean_attribute_if_false_or_null() {
+		$html               = '<div data-wp-bind--hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( $html, $new_html );
+
+		$html               = '<div data-wp-bind--hidden="myPlugin::state.null">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+		$this->assertEquals( $html, $new_html );
+	}
+
+	/**
+	 * Tests removing boolean attributes from a tag using `data-wp-bind` and a
+	 * false or null value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_removes_boolean_attribute_if_false_or_null() {
+		$html    = '<div hidden data-wp-bind--hidden="myPlugin::state.isOpen">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+
+		$html    = '<div hidden data-wp-bind--hidden="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'hidden' ) );
+	}
+
+	/**
+	 * Tests adding values to aria or data attributes when the condition evaluates
+	 * to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_value_if_true_in_aria_or_data_attributes() {
+		$html               = '<div data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing values in aria or data attributes when the condition
+	 * evaluates to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_value_if_true_in_aria_or_data_attributes() {
+		$html               = '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'true', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::!state.isOpen">Text</div>', $new_html );
+
+		$html     = '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		$this->assertEquals( 'true', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::!state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests adding the value 'false' to aria or data attributes when the
+	 * condition evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_adds_value_if_false_in_aria_or_data_attributes() {
+		$html               = '<div data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests replacing values in aria or data attributes when the condition
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_replaces_value_if_false_in_aria_or_data_attributes() {
+		$html               = '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'aria-hidden' ) );
+		$this->assertEquals( '<div aria-hidden="false" data-wp-bind--aria-hidden="myPlugin::state.isOpen">Text</div>', $new_html );
+
+		$html               = '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>';
+		list($p, $new_html) = $this->process_directives( $html );
+		$this->assertEquals( 'false', $p->get_attribute( 'data-is-closed' ) );
+		$this->assertEquals( '<div data-is-closed="false" data-wp-bind--data-is-closed="myPlugin::state.isOpen">Text</div>', $new_html );
+	}
+
+	/**
+	 * Tests removing values from aria or data attributes when the value is null.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_removes_value_if_null_in_aria_or_data_attributes() {
+		$html    = '<div aria-hidden="true" data-wp-bind--aria-hidden="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'aria-hidden' ) );
+
+		$html    = '<div data-is-closed="true" data-wp-bind--data-is-closed="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'data-is-closed' ) );
+	}
+
+	/**
+	 * Tests handling of bindings within nested tags.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_bind_handles_nested_bindings() {
+		$html    = '<div data-wp-bind--id="myPlugin::state.id"><img data-wp-bind--width="myPlugin::state.width"></div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag();
+		$this->assertEquals( '100', $p->get_attribute( 'width' ) );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-class-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-class-test.php
new file mode 100644
index 0000000000000..7484d7ea50ccc
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-class-test.php
@@ -0,0 +1,291 @@
+<?php
+/**
+ * Unit tests covering the data_wp_class_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Class extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'true'  => true,
+				'false' => false,
+			)
+		);
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that `data-wp-class` adds a class when the condition is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-class` can add multiple classes based on true
+	 * conditions.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_multiple_class_names() {
+		$html    = '
+			<div
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.true"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests handling of adding one and not adding another class based on
+	 * different boolean values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_handles_multiple_class_names_with_different_values() {
+		$html    = '
+			<div
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$html    = '
+			<div
+				class="other-class"
+				data-wp-class--some-class="myPlugin::state.true"
+				data-wp-class--other-class="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that `data-wp-class` adds new classes alongside existing ones.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_when_class_attribute_exists() {
+		$html    = '<div class="other-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that no class is added when the associated state is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_add_class_attribute_on_false() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that existing class names are preserved when the directive condition
+	 * is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_add_class_name_on_false() {
+		$html    = '<div class="other-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that existing class names remain intact when they should be re-added
+	 * as per their directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_keeps_class_name_when_class_name_exists() {
+		$html    = '<div class="some-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests preservation of existing class names, even when one is repeated in a
+	 * directive that evaluates to true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_keeps_class_name_when_class_name_exists_and_is_not_the_only_one() {
+		$html    = '<div class="other-class some-class" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that a class attribute with only one class name is removed when the
+	 * directive evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_removes_class_attribute_when_class_name_exists_and_is_the_only_one() {
+		$html    = '<div class="some-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that one of several class names is removed when its directive
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_removes_class_name_when_class_name_exists_and_is_not_the_only_one() {
+		$html    = '<div class="other-class some-class" data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that an empty class attribute is not removed even if a directive
+	 * evaluates to false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_remove_empty_class_attribute() {
+		$html    = '<div class data-wp-class--some-class="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that the class attribute remains unchanged if the data-wp-class
+	 * suffix is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_with_empty_directive_suffix() {
+		$html    = '<div class="other-class" data-wp-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that the class attribute is not altered if the value of the
+	 * `data-wp-class` directive is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_with_empty_value() {
+		$html    = '<div class="other-class" data-wp-class--some-class="">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that an existing class attribute is not affected by a `data-wp-class`
+	 * directive without a value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_doesnt_change_class_attribute_without_value() {
+		$html    = '<div class="other-class" data-wp-class--some-class>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that multiple directives for the same class yield the correct result
+	 * when the condition is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_works_with_multiple_directives() {
+		$html    = '<div data-wp-class--some-class="myPlugin::state.true" data-wp-class--some-class="myPlugin::state.true">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests setting class names based on truthy values other than just true
+	 * booleans.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_on_truthy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => 'some text' ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array( 1, 2 ) ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 1 ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-class', $p->get_attribute( 'class' ) );
+	}
+
+	/**
+	 * Tests that class attributes aren't set for falsy values other than just
+	 * false booleans.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_class_sets_class_name_on_falsy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '' ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array() ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 0 ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'null' => null ) );
+		$html    = '<div data-wp-class--some-class="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'class' ) );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-context-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-context-test.php
new file mode 100644
index 0000000000000..0e0ef3c35f016
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-context-test.php
@@ -0,0 +1,476 @@
+<?php
+/**
+ * Unit tests covering the data_wp_context_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Context extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive can set a context in a custom
+	 * namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_sets_a_context_in_a_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive can set a context in the same
+	 * tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_can_set_a_context_in_the_same_tag() {
+		$html    = '
+			<div
+				class="test"
+				data-wp-context=\'myPlugin::{ "id": "some-id" }\'
+				data-wp-bind--id="myPlugin::context.id"
+			>
+				Text
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges context in the same
+	 * custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id1": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id2": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id1">Text</div>
+					<div class="test" data-wp-bind--id="myPlugin::context.id2">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overwrites context in the same
+	 * custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overwrites_context_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive replaces the old context after a
+	 * closing tag in the same custom namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_custom_namespace() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges context in different
+	 * custom namespaces.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_different_custom_namespaces() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'otherPlugin::{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+					<div class="test" data-wp-bind--id="otherPlugin::context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on malformed
+	 * context objects.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_malformed_context_objects() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ id: "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite context on
+	 * malformed context objects.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_malformed_context_objects() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context=\'myPlugin::{ id: "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on an empty
+	 * context object.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_empty_context() {
+		$html    = '
+			<div data-wp-context="">
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite the context on
+	 * empty context directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_empty_context() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context="">
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't throw on context without
+	 * value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_throw_on_context_without_value() {
+		$html    = '
+			<div data-wp-context>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't overwrite context on
+	 * context without value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_overwrite_context_on_context_without_value() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id-1" }\'>
+				<div data-wp-context>
+					<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with multiple directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_works_with_multiple_directives() {
+		$html    = '
+			<div data-wp-context=\'myPlugin::{ "id": "some-id" }\' data-wp-context=\'myPlugin::{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive doesn't work without any
+	 * namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_doesnt_work_without_any_namespace() {
+		$html    = '
+			<div data-wp-context=\'{ "id": "some-id" }\'>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with a default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_default_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'{ "id": "some-id" }\'
+			>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overrides a default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overrides_default_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'otherPlugin::{ "id": "some-id" }\'
+			>
+				<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overrides the default namespace
+	 * with the same namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overrides_default_namespace_with_same_namespace() {
+		$html    = '
+			<div
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'myPlugin::{ "id": "some-id" }\'
+			>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with nested default
+	 * namespaces.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_nested_default_namespaces() {
+		$html    = '
+			<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+				<div data-wp-context=\'{ "id": "some-id" }\'>
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+						<div data-wp-context=\'{ "id": "other-id" }\'>
+							<div class="test" data-wp-bind--id="context.id">Text</div>
+							<div class="test" data-wp-bind--id="myPlugin::context.id">Text</div>
+						</div>
+					</div>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertNull( $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive works with a default namespace
+	 * in the same tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_works_with_default_namespace_in_the_same_tag() {
+		$html    = '
+			<div
+			 class="test"
+			 data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+			 data-wp-context=\'{ "id": "some-id" }\'
+			 data-wp-bind--id="context.id"
+			>
+				Text
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive merges the context in the same
+	 * default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_merges_context_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id1": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id2": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id1">Text</div>
+					<div class="test" data-wp-bind--id="context.id2">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive overwrites context in the same
+	 * default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_overwrites_context_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-context` directive replaces the old context after
+	 * the closing tag in the same default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_context_directive_replaces_old_context_after_closing_tag_in_the_same_default_namespace() {
+		$html    = '
+			<div
+				data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+				data-wp-context=\'{ "id": "some-id-1" }\'
+			>
+				<div data-wp-context=\'{ "id": "some-id-2" }\'>
+					<div class="test" data-wp-bind--id="context.id">Text</div>
+				</div>
+				<div class="test" data-wp-bind--id="context.id">Text</div>
+			</div>
+		';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id-2', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id-1', $p->get_attribute( 'id' ) );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-interactive-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-interactive-test.php
new file mode 100644
index 0000000000000..d821c4504a513
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-interactive-test.php
@@ -0,0 +1,206 @@
+<?php
+/**
+ * Unit tests covering the data_wp_interactive_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Interactive extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state( 'myPlugin', array( 'id' => 'some-id' ) );
+		$this->interactivity->state( 'otherPlugin', array( 'id' => 'other-id' ) );
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that a default namespace is applied when using the
+	 * `data-wp-interactive` directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_sets_a_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the most recent `data-wp-interactive` directive replaces the
+	 * previous default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_replaces_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+							<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a `data-wp-interactive` directive without a namespace does not
+	 * replace the previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_without_namespace_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive=\'{}\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that an empty value for `data-wp-interactive` does not replace the
+	 * previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_with_empty_value_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive="">
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a `data-wp-interactive` directive with no assigned value does
+	 * not replace the previously established default namespace.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_without_value_doesnt_replace_the_previous_default_namespace() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that multiple `data-wp-interactive` directives work correctly.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_works_with_multiple_directives() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\' data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that a custom namespace can override the default one provided by a
+	 * `data-wp-interactive` directive.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_namespace_can_be_override_by_custom_one() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="otherPlugin::state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-interactive` setting is reset appropriately after a
+	 * closing HTML tag.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_interactive_set_is_unset_on_closing_tag() {
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+					<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+
+		$html    = '
+					<div data-wp-interactive=\'{ "namespace": "myPlugin" }\'>
+							<div data-wp-interactive=\'{ "namespace": "otherPlugin" }\'>
+									<div class="test" data-wp-bind--id="state.id">Text</div>
+							</div>
+							<div class="test" data-wp-bind--id="state.id">Text</div>
+					</div>
+			';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'other-id', $p->get_attribute( 'id' ) );
+		$p->next_tag( array( 'class_name' => 'test' ) );
+		$this->assertEquals( 'some-id', $p->get_attribute( 'id' ) );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-style-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-style-test.php
new file mode 100644
index 0000000000000..ce224787d8753
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-style-test.php
@@ -0,0 +1,403 @@
+<?php
+/**
+ * Unit tests covering the data_wp_style_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Style extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'green' => 'green',
+				'false' => false,
+			)
+		);
+	}
+
+	/**
+	 * Invokes the private `set_style_property` method of WP_Interactivity_API
+	 * class.
+	 *
+	 * @param string            $style_attribute_value The current style attribute value.
+	 * @param string            $style_property_name   The style property name to set.
+	 * @param string|false|null $style_property_value  The value to set for the style property. With false, null or an
+	 *                                                 empty string, it removes the style property.
+	 * @return string The new style attribute value after the specified property has been added, updated or removed.
+	 */
+	private function set_style_property( $style_attribute_value, $style_property_name, $style_property_value ) {
+		$evaluate = new ReflectionMethod( $this->interactivity, 'set_style_property' );
+		$evaluate->setAccessible( true );
+		return $evaluate->invokeArgs( $this->interactivity, array( $style_attribute_value, $style_property_name, $style_property_value ) );
+	}
+
+	/**
+	 * Tests that `set_style_property` correctly sets style properties.
+	 *
+	 * @covers ::set_style_property
+	 */
+	public function test_set_style_property_sets_properties() {
+		// Adds property on empty style attribute.
+		$result = $this->set_style_property( '', 'color', 'green' );
+		$this->assertEquals( 'color:green;', $result );
+
+		// Changes style property when there is an existing property.
+		$result = $this->set_style_property( 'color:red;', 'color', 'green' );
+		$this->assertEquals( 'color:green;', $result );
+
+		// Adds a new property when the existing one does not match.
+		$result = $this->set_style_property( 'color:red;', 'background', 'blue' );
+		$this->assertEquals( 'color:red;background:blue;', $result );
+
+		// Handles multiple existing properties.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 'green' );
+		$this->assertEquals( 'margin:5px;color:green;', $result );
+
+		// Adds a new property when multiple existing properties do not match.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Removes whitespaces in all properties.
+		$result = $this->set_style_property( ' color : red; margin : 5px; ', 'padding', ' 10px ' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Updates a property when it's not the first one in the value.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'margin', '15px' );
+		$this->assertEquals( 'color:red;margin:15px;', $result );
+
+		// Adds missing trailing semicolon.
+		$result = $this->set_style_property( 'color:red;margin:5px', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Doesn't add double semicolons.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'padding', '10px;' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Handles empty properties in the input.
+		$result = $this->set_style_property( 'color:red;;margin:5px;;', 'padding', '10px' );
+		$this->assertEquals( 'color:red;margin:5px;padding:10px;', $result );
+
+		// Moves the modified property to the end.
+		$result = $this->set_style_property( 'border-style: dashed; border: 3px solid red;', 'border-style', 'inset' );
+		$this->assertEquals( 'border:3px solid red;border-style:inset;', $result );
+	}
+
+	/**
+	 * Tests that `set_style_property` works correctly with falsy values, removing
+	 * or ignoring them as appropriate.
+	 *
+	 * @covers ::set_style_property
+	 */
+	public function test_set_style_property_with_falsy_values() {
+		// Removes a property with an empty string.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', '' );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with null.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', null );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with false.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', false );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// Removes a property with 0.
+		$result = $this->set_style_property( 'color:red;margin:5px;', 'color', 0 );
+		$this->assertEquals( 'margin:5px;', $result );
+
+		// It doesn't add a new property with an empty string.
+		$result = $this->set_style_property( 'color:red;', 'padding', '' );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with null.
+		$result = $this->set_style_property( 'color:red;', 'padding', null );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with false.
+		$result = $this->set_style_property( 'color:red;', 'padding', false );
+		$this->assertEquals( 'color:red;', $result );
+
+		// It doesn't add a new property with 0.
+		$result = $this->set_style_property( 'color:red;', 'padding', 0 );
+		$this->assertEquals( 'color:red;', $result );
+	}
+
+	/**
+	 * Invokes the `process_directives` method of WP_Interactivity_API class.
+	 *
+	 * @param string $html The HTML that needs to be processed.
+	 * @return array An array containing an instance of the WP_HTML_Tag_Processor and the processed HTML.
+	 */
+	private function process_directives( $html ) {
+		$new_html = $this->interactivity->process_directives( $html );
+		$p        = new WP_HTML_Tag_Processor( $new_html );
+		$p->next_tag();
+		return array( $p, $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive sets a style attribute with
+	 * correct property and value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_style_attribute() {
+		$html    = '<div data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive applies multiple style properties
+	 * correctly.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_multiple_style_properties() {
+		$html    = '
+			<div
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.green"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;background:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive correctly handles different style
+	 * property values.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_multiple_style_properties_with_different_values() {
+		$html    = '
+			<div
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+
+		$html    = '
+			<div
+				style="background:red;"
+				data-wp-style--color="myPlugin::state.green"
+				data-wp-style--background="myPlugin::state.false"
+			>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive sets a new style property when
+	 * another already exists.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_sets_style_property_when_style_attribute_exists() {
+		$html    = '<div style="padding:10px;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive overwrites an existing style
+	 * property with a new value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_overwrites_style_property_when_style_property_exists() {
+		$html    = '<div style="color:red;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't add a style property when
+	 * the directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_attribute_on_false() {
+		$html    = '<div data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't modify existing style
+	 * properties when directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_property_on_false() {
+		$html    = '<div style="padding:10px;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive keeps an existing style property
+	 * with a matching value.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_keeps_style_property_when_style_property_exists() {
+		$html    = '<div style="color:green;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive maintains style properties even
+	 * when they aren't the only ones present.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_keeps_style_property_when_style_property_exists_and_is_not_the_only_one() {
+		$html    = '<div style="padding:10px;color:green;" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive removes the style attribute when
+	 * it contains only one property which is being removed.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_removes_style_attribute_when_style_property_exists_and_is_the_only_one() {
+		$html    = '<div style="color:green;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive removes a style property when it's
+	 * not the only one present and the directive value is false.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_removes_style_property_when_style_property_exists_and_is_not_the_only_one() {
+		$html    = '<div style="padding:10px;color:green;" data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not remove an empty style
+	 * attribute.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_remove_empty_style_attribute() {
+		$html    = '<div style data-wp-style--color="myPlugin::state.false">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertTrue( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not change the style
+	 * attribute when the directive suffix is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_with_empty_directive_suffix() {
+		$html    = '<div style="padding:10px;" data-wp-style="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive does not change the style
+	 * attribute when the value of the directive is empty.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_with_empty_value() {
+		$html    = '<div style="padding:10px" data-wp-style--color="">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't apply changes if no value
+	 * is provided for the style property.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_change_style_attribute_without_value() {
+		$html    = '<div style="padding: 10px;" data-wp-style--color>Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'padding:10px;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive functions correctly with multiple
+	 * identical directives.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_works_with_multiple_directives() {
+		$html    = '<div data-wp-style--color="myPlugin::state.green" data-wp-style--color="myPlugin::state.green">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertEquals( 'color:green;', $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't apply any changes when the
+	 * state value is true.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_do_anything_on_true_values() {
+		$this->interactivity->state( 'myPlugin', array( 'true' => true ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-style` directive doesn't add a style property for
+	 * various falsy values in the state.
+	 *
+	 * @covers ::process_directives
+	 */
+	public function test_wp_style_doesnt_add_style_property_on_falsy_values() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '' ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.text">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'array' => array() ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.array">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'number' => 0 ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.number">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+
+		$this->interactivity->state( 'myPlugin', array( 'null' => null ) );
+		$html    = '<div data-wp-style--color="myPlugin::state.null">Text</div>';
+		list($p) = $this->process_directives( $html );
+		$this->assertNull( $p->get_attribute( 'style' ) );
+	}
+}
diff --git a/phpunit/interactivity-api/class-wp-interactivity-api-wp-text-test.php b/phpunit/interactivity-api/class-wp-interactivity-api-wp-text-test.php
new file mode 100644
index 0000000000000..f5b570a197a29
--- /dev/null
+++ b/phpunit/interactivity-api/class-wp-interactivity-api-wp-text-test.php
@@ -0,0 +1,123 @@
+<?php
+/**
+ * Unit tests covering the data_wp_text_processor functionality of the
+ * WP_Interactivity_API class.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_WP_Interactivity_API_WP_Text extends WP_UnitTestCase {
+	/**
+	 * Instance of WP_Interactivity_API.
+	 *
+	 * @var WP_Interactivity_API
+	 */
+	protected $interactivity;
+
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+		$this->interactivity = new WP_Interactivity_API();
+		$this->interactivity->state( 'myPlugin', array( 'text' => 'Updated' ) );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive sets inner text content.
+	 */
+	public function test_wp_text_sets_inner_content() {
+		$html     = '<div data-wp-text="myPlugin::state.text">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive works with numerical values.
+	 */
+	public function test_wp_text_sets_inner_content_numbers() {
+		$this->interactivity->state( 'myPlugin', array( 'number' => 100 ) );
+		$html     = '<div data-wp-text="myPlugin::state.number">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.number">100</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive removes inner text content when the
+	 * state is not a string or number.
+	 */
+	public function test_wp_text_removes_inner_content_on_types_that_are_not_strings_or_numbers() {
+		$this->interactivity->state(
+			'myPlugin',
+			array(
+				'true'  => true,
+				'false' => false,
+				'null'  => null,
+				'array' => array(),
+				'func'  => function () {},
+			)
+		);
+		$html     = '<div data-wp-text="myPlugin::state.true">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.true"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.false">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.false"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.null">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.null"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.array">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.array"></div>', $new_html );
+
+		$html     = '<div data-wp-text="myPlugin::state.func">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.func"></div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive overwrites entire inner content,
+	 * including nested tags.
+	 */
+	public function test_wp_text_sets_inner_content_with_nested_tags() {
+		$html     = '<div data-wp-text="myPlugin::state.text"><div><div>Text</div><div>Another text</div></div></div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive works even with unbalanced tags
+	 * when they are different tags (div -> unbalanced span).
+	 */
+	public function test_wp_text_sets_inner_content_even_with_unbalanced_but_different_tags_inside_content() {
+		$html     = '<div data-wp-text="myPlugin::state.text"><span>Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Updated</div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` fails to overwrite inner content if there are
+	 * unbalanced when they are the same tags (div -> unbalanced div).
+	 */
+	public function test_wp_text_fails_with_unbalanced_and_same_tags_inside_content() {
+		$html     = '<div data-wp-text="myPlugin::state.text">Text<div></div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">Text<div></div>', $new_html );
+	}
+
+	/**
+	 * Tests that the `data-wp-text` directive cannot set inner HTML content and
+	 * it will be encoded as text.
+	 */
+	public function test_wp_text_cant_set_inner_html_in_the_content() {
+		$this->interactivity->state( 'myPlugin', array( 'text' => '<span>Updated</span>' ) );
+		$html     = '<div data-wp-text="myPlugin::state.text">Text</div>';
+		$new_html = $this->interactivity->process_directives( $html );
+		$this->assertEquals( '<div data-wp-text="myPlugin::state.text">&lt;span&gt;Updated&lt;/span&gt;</div>', $new_html );
+	}
+}
diff --git a/phpunit/interactivity-api/interactivity-api-test.php b/phpunit/interactivity-api/interactivity-api-test.php
new file mode 100644
index 0000000000000..ba88737cd65d9
--- /dev/null
+++ b/phpunit/interactivity-api/interactivity-api-test.php
@@ -0,0 +1,217 @@
+<?php
+/**
+ * Unit tests covering the functionality of the public functions of the
+ * Interactivity API.
+ *
+ * @package WordPress
+ * @subpackage Interactivity API
+ *
+ * @group interactivity-api
+ */
+class Tests_Interactivity_API_Functions extends WP_UnitTestCase {
+	/**
+	 * Set up.
+	 */
+	public function set_up() {
+		parent::set_up();
+
+		register_block_type(
+			'test/interactive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					return '
+						<div
+							data-wp-interactive=\'{ "namespace": "myPlugin" }\'
+							data-wp-context=\'{ "block": ' . $attributes['block'] . ' }\'
+						>
+							<input
+								class="interactive/block-' . $attributes['block'] . '"
+								data-wp-bind--value="context.block"
+							>' .
+							$content .
+						'</div>';
+				},
+				'supports'        => array(
+					'interactivity' => true,
+				),
+			)
+		);
+
+		register_block_type(
+			'test/non-interactive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					$directive = isset( $attributes['hasDirective'] ) ? ' data-wp-bind--value="context.block"' : '';
+					return '
+						<div>
+							<input class="non-interactive/block-' . $attributes['block'] . '"' . $directive . '>' .
+							$content .
+						'</div>';
+				},
+			)
+		);
+	}
+
+	public function tear_down() {
+		unregister_block_type( 'test/interactive-block' );
+		unregister_block_type( 'test/non-interactive-block' );
+		parent::tear_down();
+	}
+
+	public function test_processs_directives_of_single_interactive_block() {
+		$post_content    = '<!-- wp:test/interactive-block { "block": 1 } /-->';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_multiple_interactive_blocks_in_paralell() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } /-->
+			<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-3' ) );
+		$this->assertNull( $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_inside_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_multple_interactive_blocks_inside_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+				<!-- wp:test/interactive-block { "block": 3 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-3' ) );
+		$this->assertEquals( '3', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_inside_multple_non_interactive_block() {
+		$post_content    = '
+			<!-- wp:test/non-interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } /-->
+			<!-- /wp:test/non-interactive-block -->
+			<!-- wp:test/non-interactive-block { "block": 3 } -->
+				<!-- wp:test/interactive-block { "block": 4 } /-->
+			<!-- /wp:test/non-interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-4' ) );
+		$this->assertEquals( '4', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_without_directives() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/non-interactive-block { "block": 2 } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-2' ) );
+		$this->assertNull( $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_non_interactive_block_with_directives() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/non-interactive-block { "block": 2, "hasDirective": true } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-2' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	public function test_processs_directives_of_interactive_block_containing_nested_interactive_and_non_interactive_blocks() {
+		$post_content    = '
+			<!-- wp:test/interactive-block { "block": 1 } -->
+				<!-- wp:test/interactive-block { "block": 2 } -->
+					<!-- wp:test/non-interactive-block { "block": 3, "hasDirective": true } /-->
+				<!-- /wp:test/interactive-block -->
+				<!-- wp:test/non-interactive-block { "block": 4, "hasDirective": true } /-->
+			<!-- /wp:test/interactive-block -->
+		';
+		$rendered_blocks = do_blocks( $post_content );
+		$p               = new WP_HTML_Tag_Processor( $rendered_blocks );
+		$p->next_tag( array( 'class_name' => 'interactive/block-1' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'interactive/block-2' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-3' ) );
+		$this->assertEquals( '2', $p->get_attribute( 'value' ) );
+		$p->next_tag( array( 'class_name' => 'non-interactive/block-4' ) );
+		$this->assertEquals( '1', $p->get_attribute( 'value' ) );
+	}
+
+	private $data_wp_test_processor_count = 0;
+
+	public function data_wp_test_processor( $p ) {
+		if ( ! $p->is_tag_closer() ) {
+			$this->data_wp_test_processor_count = $this->data_wp_test_processor_count + 1;
+		}
+	}
+
+	public function test_process_directives_only_process_the_root_interactive_blocks() {
+		$class                = new ReflectionClass( 'WP_Interactivity_API' );
+		$directive_processors = $class->getProperty( 'directive_processors' );
+		$directive_processors->setAccessible( true );
+		$directive_processors->setValue( null, array( 'data-wp-test' => array( $this, 'data_wp_test_processor' ) ) );
+		$html                               = '<div data-wp-test></div>';
+		$this->data_wp_test_processor_count = 0;
+		wp_interactivity_process_directives( $html );
+		$this->assertEquals( 1, $this->data_wp_test_processor_count );
+
+		register_block_type(
+			'test/custom-directive-block',
+			array(
+				'render_callback' => function ( $attributes, $content ) {
+					return '<div class="test" data-wp-test>' . $content . '</div>';
+				},
+				'supports'        => array(
+					'interactivity' => true,
+				),
+			)
+		);
+		$post_content                       = '
+			<!-- wp:test/custom-directive-block -->
+				<!-- wp:test/custom-directive-block /-->
+			<!-- /wp:test/custom-directive-block -->
+		';
+		$this->data_wp_test_processor_count = 0;
+		do_blocks( $post_content );
+		$this->assertEquals( 2, $this->data_wp_test_processor_count );
+		unregister_block_type( 'test/custom-directive-block' );
+	}
+}
diff --git a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
index 44507ad34813e..94bb383a142cc 100644
--- a/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
+++ b/test/e2e/specs/interactivity/fixtures/interactivity-utils.ts
@@ -25,11 +25,16 @@ export default class InteractivityUtils {
 			);
 		}
 
-		// Add an extra param to disable directives SSR. This is required at
-		// this moment, as SSR for directives is not stabilized yet and we need
-		// to ensure hydration works, even when the SSR'ed HTML is not correct.
+		/*
+		 * Add an extra param to disable directives SSR. This is required at
+		 * this moment, as SSR for directives is not stabilized yet and we need
+		 * to ensure hydration works, even when the SSR'ed HTML is not correct.
+		 */
 		const url = new URL( link );
-		url.searchParams.append( 'disable_directives_ssr', 'true' );
+		url.searchParams.append(
+			'disable_server_directive_processing',
+			'true'
+		);
 		return url.href;
 	}
 

From 3c3e0e973d37c6603b74cb603b4c07f863f990ad Mon Sep 17 00:00:00 2001
From: Marcelo Serpa <81248+fullofcaffeine@users.noreply.github.com>
Date: Wed, 24 Jan 2024 12:00:23 -0600
Subject: [PATCH 278/296] (editor)(fix) Append the `edit-post-header-toolbar`
 class in NavigableToolbar for backward compatibility with plugin GUI
 injections (#58154)

* Keep the `edit-post-header-toolbar` CSS class in the `NavigableToolbar` as some plugins use it to append GUIs to it

* Add comment justifying the change
---
 packages/editor/src/components/document-tools/index.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/packages/editor/src/components/document-tools/index.js b/packages/editor/src/components/document-tools/index.js
index cf26fc600a038..05907654fa9b8 100644
--- a/packages/editor/src/components/document-tools/index.js
+++ b/packages/editor/src/components/document-tools/index.js
@@ -104,8 +104,16 @@ function DocumentTools( {
 	const shortLabel = ! isInserterOpened ? __( 'Add' ) : __( 'Close' );
 
 	return (
+		// Some plugins expect and use the `edit-post-header-toolbar` CSS class to
+		// find the toolbar and inject UI elements into it. This is not officially
+		// supported, but we're keeping it in the list of class names for backwards
+		// compatibility.
 		<NavigableToolbar
-			className={ classnames( 'editor-document-tools', className ) }
+			className={ classnames(
+				'editor-document-tools',
+				'edit-post-header-toolbar',
+				className
+			) }
 			aria-label={ toolbarAriaLabel }
 			shouldUseKeyboardFocusShortcut={ ! blockToolbarCanBeFocused }
 			variant="unstyled"

From 93dac908c6222fe84e06d1aa2a96344b93dd4ee1 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 18:05:06 +0000
Subject: [PATCH 279/296] Bump plugin version to 17.5.2

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index e3ef3d1612722..9bf5292d1036b 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.1
+ * Version: 17.5.2
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index 48abf7ff587d0..a9168b490cd2b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.1",
+	"version": "17.5.2",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.1",
+			"version": "17.5.2",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index 8550c6ff3f960..c5f0974b11947 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.1",
+	"version": "17.5.2",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From ca5f16a64a2add7dcc150f20749ce528f086d8ad Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 18:26:00 +0000
Subject: [PATCH 280/296] Update Changelog for 17.5.2

---
 changelog.txt | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 193fe8dfe70f6..48396a9eec777 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,23 @@
 == Changelog ==
 
+= 17.5.2 =
+
+## Changelog
+
+### Bug Fixes
+
+- (Preferences)(17.5.1)(fix) Remove non-core-migrated preferences from the deprecation proxy for `get` ([58153](https://github.com/WordPress/gutenberg/pull/58153))
+- (editor)(fix) Append the `edit-post-header-toolbar` class in NavigableToolbar for backward compatibility with plugin GUI injections ([58154](https://github.com/WordPress/gutenberg/pull/58154))
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@fullofcaffeine 
+
+
+
+
 = 17.5.1 =
 
 ## Changelog

From ea329575989de58fc3b558b46f9a90cbfac635cc Mon Sep 17 00:00:00 2001
From: Michal <mmczaplinski@gmail.com>
Date: Wed, 24 Jan 2024 18:46:18 +0000
Subject: [PATCH 281/296] Block Bindings: Update source registration syntax and
 remove APIs that should be private (#58205)

* Refactor block bindings registration

Second param is an array now

* Add array types

* Update params in the sources

* Refactor block bindings to use gutenberg_block_bindings_replace_html

* rename $source_args to $source_properties

* dont safeguard `gutenberg_block_bindings_replace_html` against redeclaration

* Remove textdomain for pattern attributes and post meta sources
---
 .../block-bindings/block-bindings.php         | 118 +++++++++++++--
 .../class-wp-block-bindings.php               | 137 +++---------------
 .../block-bindings/sources/pattern.php        |   6 +-
 .../block-bindings/sources/post-meta.php      |   6 +-
 lib/compat/wordpress-6.5/blocks.php           |   2 +-
 5 files changed, 136 insertions(+), 133 deletions(-)

diff --git a/lib/compat/wordpress-6.5/block-bindings/block-bindings.php b/lib/compat/wordpress-6.5/block-bindings/block-bindings.php
index 83a1d6132f5f4..f9b3394661393 100644
--- a/lib/compat/wordpress-6.5/block-bindings/block-bindings.php
+++ b/lib/compat/wordpress-6.5/block-bindings/block-bindings.php
@@ -27,18 +27,24 @@ function wp_block_bindings() {
  * Registers a new source for block bindings.
  *
  * @param string   $source_name The name of the source.
- * @param string   $label The label of the source.
- * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
- *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
- *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
- *                        - object $block_instance: The block instance.
- *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
- *                        The callable should return a string that will be used to override the block's original value.
+ * @param array    $source_properties   The array of arguments that are used to register a source. The array has two elements:
+ *                                1. string   $label        The label of the source.
+ *                                2. callback $apply        A callback
+ *                                executed when the source is processed during
+ *                                block rendering. The callback should have the
+ *                                following signature:
+ *
+ *                                  `function (object $source_attrs, object $block_instance, string $attribute_name): string`
+ *                                          - @param object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+ *                                          - @param object $block_instance: The block instance.
+ *                                          - @param string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+ *                                 The callback should return a string that will be used to override the block's original value.
+ *
  * @return void
  */
 if ( ! function_exists( 'wp_block_bindings_register_source' ) ) {
-	function wp_block_bindings_register_source( $source_name, $label, $apply ) {
-		wp_block_bindings()->register_source( $source_name, $label, $apply );
+	function wp_block_bindings_register_source( $source_name, array $source_properties ) {
+		wp_block_bindings()->register_source( $source_name, $source_properties );
 	}
 }
 
@@ -62,8 +68,96 @@ function wp_block_bindings_get_sources() {
  * @param string $source_value The value used to replace the HTML.
  * @return string The modified block content.
  */
-if ( ! function_exists( 'wp_block_bindings_replace_html' ) ) {
-	function wp_block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
-		return wp_block_bindings()->replace_html( $block_content, $block_name, $block_attr, $source_value );
+function gutenberg_block_bindings_replace_html( $block_content, $block_name, $block_attr, $source_value ) {
+			$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
+	if ( null === $block_type ) {
+		return;
+	}
+
+	// Depending on the attribute source, the processing will be different.
+	switch ( $block_type->attributes[ $block_attr ]['source'] ) {
+		case 'html':
+		case 'rich-text':
+			$block_reader = new WP_HTML_Tag_Processor( $block_content );
+
+			// TODO: Support for CSS selectors whenever they are ready in the HTML API.
+			// In the meantime, support comma-separated selectors by exploding them into an array.
+			$selectors = explode( ',', $block_type->attributes[ $block_attr ]['selector'] );
+			// Add a bookmark to the first tag to be able to iterate over the selectors.
+			$block_reader->next_tag();
+			$block_reader->set_bookmark( 'iterate-selectors' );
+
+			// TODO: This shouldn't be needed when the `set_inner_html` function is ready.
+			// Store the parent tag and its attributes to be able to restore them later in the button.
+			// The button block has a wrapper while the paragraph and heading blocks don't.
+			if ( 'core/button' === $block_name ) {
+				$button_wrapper                 = $block_reader->get_tag();
+				$button_wrapper_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
+				$button_wrapper_attrs           = array();
+				foreach ( $button_wrapper_attribute_names as $name ) {
+					$button_wrapper_attrs[ $name ] = $block_reader->get_attribute( $name );
+				}
+			}
+
+			foreach ( $selectors as $selector ) {
+				// If the parent tag, or any of its children, matches the selector, replace the HTML.
+				if ( strcasecmp( $block_reader->get_tag( $selector ), $selector ) === 0 || $block_reader->next_tag(
+					array(
+						'tag_name' => $selector,
+					)
+				) ) {
+					$block_reader->release_bookmark( 'iterate-selectors' );
+
+					// TODO: Use `set_inner_html` method whenever it's ready in the HTML API.
+					// Until then, it is hardcoded for the paragraph, heading, and button blocks.
+					// Store the tag and its attributes to be able to restore them later.
+					$selector_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
+					$selector_attrs           = array();
+					foreach ( $selector_attribute_names as $name ) {
+						$selector_attrs[ $name ] = $block_reader->get_attribute( $name );
+					}
+					$selector_markup = "<$selector>" . wp_kses_post( $source_value ) . "</$selector>";
+					$amended_content = new WP_HTML_Tag_Processor( $selector_markup );
+					$amended_content->next_tag();
+					foreach ( $selector_attrs as $attribute_key => $attribute_value ) {
+						$amended_content->set_attribute( $attribute_key, $attribute_value );
+					}
+					if ( 'core/paragraph' === $block_name || 'core/heading' === $block_name ) {
+						return $amended_content->get_updated_html();
+					}
+					if ( 'core/button' === $block_name ) {
+						$button_markup  = "<$button_wrapper>{$amended_content->get_updated_html()}</$button_wrapper>";
+						$amended_button = new WP_HTML_Tag_Processor( $button_markup );
+						$amended_button->next_tag();
+						foreach ( $button_wrapper_attrs as $attribute_key => $attribute_value ) {
+							$amended_button->set_attribute( $attribute_key, $attribute_value );
+						}
+						return $amended_button->get_updated_html();
+					}
+				} else {
+					$block_reader->seek( 'iterate-selectors' );
+				}
+			}
+			$block_reader->release_bookmark( 'iterate-selectors' );
+			return $block_content;
+
+		case 'attribute':
+			$amended_content = new WP_HTML_Tag_Processor( $block_content );
+			if ( ! $amended_content->next_tag(
+				array(
+					// TODO: build the query from CSS selector.
+					'tag_name' => $block_type->attributes[ $block_attr ]['selector'],
+				)
+			) ) {
+				return $block_content;
+			}
+			$amended_content->set_attribute( $block_type->attributes[ $block_attr ]['attribute'], esc_attr( $source_value ) );
+			return $amended_content->get_updated_html();
+			break;
+
+		default:
+			return $block_content;
+			break;
 	}
+	return;
 }
diff --git a/lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php b/lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php
index fedc652688a24..68b51348010e3 100644
--- a/lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php
+++ b/lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings.php
@@ -25,126 +25,31 @@ class WP_Block_Bindings {
 	private $sources = array();
 
 	/**
-	 * Function to register a new source.
+	 * Function to register a new block binding source.
 	 *
-	 * @param string   $source_name The name of the source.
-	 * @param string   $label The label of the source.
-	 * @param callable $apply The callback executed when the source is processed during block rendering. The callable should have the following signature:
-	 *                        function (object $source_attrs, object $block_instance, string $attribute_name): string
-	 *                        - object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
-	 *                        - object $block_instance: The block instance.
-	 *                        - string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
-	 *                        The callable should return a string that will be used to override the block's original value.
+	 * Sources are used to override block's original attributes with a value
+	 * coming from the source. Once a source is registered, it can be used by a
+	 * block by setting its `metadata.bindings` attribute to a value that refers
+	 * to the source.
 	 *
-	 * @return void
-	 */
-	public function register_source( $source_name, $label, $apply ) {
-		$this->sources[ $source_name ] = array(
-			'label' => $label,
-			'apply' => $apply,
-		);
-	}
-
-	/**
-	 * Depending on the block attributes, replace the proper HTML based on the value returned by the source.
+	 * @param string   $source_name             The name of the source.
+	 * @param array    $source_properties       The array of arguments that are used to register a source. The array has two elements:
+	 *                                           1. string   $label        The label of the source.
+	 *                                           2. callback $apply        A callback
+	 *                                           executed when the source is processed during
+	 *                                           block rendering. The callback should have the
+	 *                                           following signature:
+	 *
+	 *                                             `function (object $source_attrs, object $block_instance, string $attribute_name): string`
+	 *                                                     - @param object $source_attrs: Object containing source ID used to look up the override value, i.e. {"value": "{ID}"}.
+	 *                                                     - @param object $block_instance: The block instance.
+	 *                                                     - @param string $attribute_name: The name of an attribute used to retrieve an override value from the block context.
+	 *                                            The callback should return a string that will be used to override the block's original value.
 	 *
-	 * @param string $block_content Block Content.
-	 * @param string $block_name The name of the block to process.
-	 * @param string $block_attr The attribute of the block we want to process.
-	 * @param string $source_value The value used to replace the HTML.
+	 * @return void
 	 */
-	public function replace_html( $block_content, $block_name, $block_attr, $source_value ) {
-		$block_type = WP_Block_Type_Registry::get_instance()->get_registered( $block_name );
-		if ( null === $block_type ) {
-			return;
-		}
-
-		// Depending on the attribute source, the processing will be different.
-		switch ( $block_type->attributes[ $block_attr ]['source'] ) {
-			case 'html':
-			case 'rich-text':
-				$block_reader = new WP_HTML_Tag_Processor( $block_content );
-
-				// TODO: Support for CSS selectors whenever they are ready in the HTML API.
-				// In the meantime, support comma-separated selectors by exploding them into an array.
-				$selectors = explode( ',', $block_type->attributes[ $block_attr ]['selector'] );
-				// Add a bookmark to the first tag to be able to iterate over the selectors.
-				$block_reader->next_tag();
-				$block_reader->set_bookmark( 'iterate-selectors' );
-
-				// TODO: This shouldn't be needed when the `set_inner_html` function is ready.
-				// Store the parent tag and its attributes to be able to restore them later in the button.
-				// The button block has a wrapper while the paragraph and heading blocks don't.
-				if ( 'core/button' === $block_name ) {
-					$button_wrapper                 = $block_reader->get_tag();
-					$button_wrapper_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
-					$button_wrapper_attrs           = array();
-					foreach ( $button_wrapper_attribute_names as $name ) {
-						$button_wrapper_attrs[ $name ] = $block_reader->get_attribute( $name );
-					}
-				}
-
-				foreach ( $selectors as $selector ) {
-					// If the parent tag, or any of its children, matches the selector, replace the HTML.
-					if ( strcasecmp( $block_reader->get_tag( $selector ), $selector ) === 0 || $block_reader->next_tag(
-						array(
-							'tag_name' => $selector,
-						)
-					) ) {
-						$block_reader->release_bookmark( 'iterate-selectors' );
-
-						// TODO: Use `set_inner_html` method whenever it's ready in the HTML API.
-						// Until then, it is hardcoded for the paragraph, heading, and button blocks.
-						// Store the tag and its attributes to be able to restore them later.
-						$selector_attribute_names = $block_reader->get_attribute_names_with_prefix( '' );
-						$selector_attrs           = array();
-						foreach ( $selector_attribute_names as $name ) {
-							$selector_attrs[ $name ] = $block_reader->get_attribute( $name );
-						}
-						$selector_markup = "<$selector>" . wp_kses_post( $source_value ) . "</$selector>";
-						$amended_content = new WP_HTML_Tag_Processor( $selector_markup );
-						$amended_content->next_tag();
-						foreach ( $selector_attrs as $attribute_key => $attribute_value ) {
-							$amended_content->set_attribute( $attribute_key, $attribute_value );
-						}
-						if ( 'core/paragraph' === $block_name || 'core/heading' === $block_name ) {
-							return $amended_content->get_updated_html();
-						}
-						if ( 'core/button' === $block_name ) {
-							$button_markup  = "<$button_wrapper>{$amended_content->get_updated_html()}</$button_wrapper>";
-							$amended_button = new WP_HTML_Tag_Processor( $button_markup );
-							$amended_button->next_tag();
-							foreach ( $button_wrapper_attrs as $attribute_key => $attribute_value ) {
-								$amended_button->set_attribute( $attribute_key, $attribute_value );
-							}
-							return $amended_button->get_updated_html();
-						}
-					} else {
-						$block_reader->seek( 'iterate-selectors' );
-					}
-				}
-				$block_reader->release_bookmark( 'iterate-selectors' );
-				return $block_content;
-
-			case 'attribute':
-				$amended_content = new WP_HTML_Tag_Processor( $block_content );
-				if ( ! $amended_content->next_tag(
-					array(
-						// TODO: build the query from CSS selector.
-						'tag_name' => $block_type->attributes[ $block_attr ]['selector'],
-					)
-				) ) {
-					return $block_content;
-				}
-				$amended_content->set_attribute( $block_type->attributes[ $block_attr ]['attribute'], esc_attr( $source_value ) );
-				return $amended_content->get_updated_html();
-				break;
-
-			default:
-				return $block_content;
-				break;
-		}
-		return;
+	public function register_source( $source_name, array $source_properties ) {
+			$this->sources[ $source_name ] = $source_properties;
 	}
 
 	/**
diff --git a/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php b/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
index 740d1983d6fe8..65ddb7278e703 100644
--- a/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
+++ b/lib/compat/wordpress-6.5/block-bindings/sources/pattern.php
@@ -29,7 +29,9 @@
 	};
 	wp_block_bindings_register_source(
 		'pattern_attributes',
-		__( 'Pattern Attributes', 'gutenberg' ),
-		$pattern_source_callback
+		array(
+			'label' => __( 'Pattern Attributes' ),
+			'apply' => $pattern_source_callback,
+		)
 	);
 }
diff --git a/lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php b/lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php
index 2d53dab6d321a..e52b4f289ccdd 100644
--- a/lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php
+++ b/lib/compat/wordpress-6.5/block-bindings/sources/post-meta.php
@@ -18,7 +18,9 @@
 	};
 	wp_block_bindings_register_source(
 		'post_meta',
-		__( 'Post Meta', 'gutenberg' ),
-		$post_meta_source_callback
+		array(
+			'label' => __( 'Post Meta' ),
+			'apply' => $post_meta_source_callback,
+		)
 	);
 }
diff --git a/lib/compat/wordpress-6.5/blocks.php b/lib/compat/wordpress-6.5/blocks.php
index dccaeba5cc335..e1b91364fe22e 100644
--- a/lib/compat/wordpress-6.5/blocks.php
+++ b/lib/compat/wordpress-6.5/blocks.php
@@ -117,7 +117,7 @@ function gutenberg_process_block_bindings( $block_content, $block, $block_instan
 			}
 
 			// Process the HTML based on the block and the attribute.
-			$modified_block_content = wp_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
+			$modified_block_content = gutenberg_block_bindings_replace_html( $modified_block_content, $block_instance->name, $binding_attribute, $source_value );
 		}
 		return $modified_block_content;
 	}

From fd467521e4ddca70cc7bcd33f6719a0d507cbd52 Mon Sep 17 00:00:00 2001
From: Mario Santos <34552881+SantosGuillamot@users.noreply.github.com>
Date: Wed, 24 Jan 2024 20:01:52 +0100
Subject: [PATCH 282/296] Block Bindings: Disable editing of bound block
 attributes in editor UI (#58085)

* Add actions and selectors to register new sources

* Add hook to read the bindings attribute in Edit

* Add context to all the blocks with bindings

* Lock rich text when `isContentBound` is true

* Adapt paragraph and heading blocks UI

* Adapt button block UI

* Adapt image block UI

* Register post meta source

* Don't use placeholder if attribute is `src` or `href`

* Always share placeholder in case meta is empty

* Remove `keyToLabel` and use just label

* Remove source component until it is needed

* Use translations in the source label

* Move `select` inside `useSource`

* Read `lockEditorUI` prop and add it for patterns

* Move logic to lock editing directly to RichText

* Improve `useSelect` destructuring

* Load all image controls if attributes are bound

* Remove unnecessary condition

* Move `lockAttributesEditing` to source definition

* Move `useSelect` into existing hook

* Fix `RichText` not being selected on click

* Lock button and image controls only when selected

* Remove unnecesarry optional chaining

* Move `shouldDisableEditing` logic inside callback

* Fix formatting issue
---
 .../src/components/block-list/content.scss    |   2 +-
 .../src/components/rich-text/index.js         |  58 +++++--
 packages/block-editor/src/hooks/index.js      |   1 +
 .../src/hooks/use-bindings-attributes.js      | 148 ++++++++++++++++++
 .../block-editor/src/store/private-actions.js |  10 ++
 .../src/store/private-selectors.js            |   8 +
 packages/block-editor/src/store/reducer.js    |  15 ++
 packages/block-library/src/button/edit.js     | 100 +++++++-----
 packages/block-library/src/image/edit.js      |  25 ++-
 packages/block-library/src/image/editor.scss  |   7 +-
 packages/block-library/src/image/image.js     | 140 ++++++++++++-----
 packages/editor/package.json                  |   2 +-
 packages/editor/src/bindings/index.js         |  13 ++
 packages/editor/src/bindings/post-meta.js     |  42 +++++
 packages/editor/src/index.js                  |   1 +
 15 files changed, 475 insertions(+), 97 deletions(-)
 create mode 100644 packages/block-editor/src/hooks/use-bindings-attributes.js
 create mode 100644 packages/editor/src/bindings/index.js
 create mode 100644 packages/editor/src/bindings/post-meta.js

diff --git a/packages/block-editor/src/components/block-list/content.scss b/packages/block-editor/src/components/block-list/content.scss
index a650710bfb119..ba1714063fa8f 100644
--- a/packages/block-editor/src/components/block-list/content.scss
+++ b/packages/block-editor/src/components/block-list/content.scss
@@ -89,7 +89,7 @@ _::-webkit-full-page-media, _:future, :root .has-multi-selection .block-editor-b
 	.block-editor-block-list__block.is-highlighted,
 	.block-editor-block-list__block.is-highlighted ~ .is-multi-selected,
 	&.is-navigate-mode .block-editor-block-list__block.is-selected,
-	.block-editor-block-list__block:not([contenteditable]):focus {
+	.block-editor-block-list__block:not([contenteditable="true"]):focus {
 		outline: none;
 
 		// We're using a pseudo element to overflow placeholder borders
diff --git a/packages/block-editor/src/components/rich-text/index.js b/packages/block-editor/src/components/rich-text/index.js
index 51a70677a5edc..69b04fe4c4904 100644
--- a/packages/block-editor/src/components/rich-text/index.js
+++ b/packages/block-editor/src/components/rich-text/index.js
@@ -19,6 +19,7 @@ import {
 	removeFormat,
 } from '@wordpress/rich-text';
 import { Popover } from '@wordpress/components';
+import { getBlockType } from '@wordpress/blocks';
 
 /**
  * Internal dependencies
@@ -44,6 +45,7 @@ import FormatEdit from './format-edit';
 import { getAllowedFormats } from './utils';
 import { Content } from './content';
 import { withDeprecations } from './with-deprecations';
+import { unlock } from '../../lock-unlock';
 
 export const keyboardShortcutContext = createContext();
 export const inputEventContext = createContext();
@@ -113,7 +115,11 @@ export function RichTextWrapper(
 	props = removeNativeProps( props );
 
 	const anchorRef = useRef();
-	const { clientId, isSelected: isBlockSelected } = useBlockEditContext();
+	const {
+		clientId,
+		isSelected: isBlockSelected,
+		name: blockName,
+	} = useBlockEditContext();
 	const selector = ( select ) => {
 		// Avoid subscribing to the block editor store if the block is not
 		// selected.
@@ -121,10 +127,12 @@ export function RichTextWrapper(
 			return { isSelected: false };
 		}
 
-		const { getSelectionStart, getSelectionEnd } =
+		const { getSelectionStart, getSelectionEnd, getBlockAttributes } =
 			select( blockEditorStore );
 		const selectionStart = getSelectionStart();
 		const selectionEnd = getSelectionEnd();
+		const blockBindings =
+			getBlockAttributes( clientId )?.metadata?.bindings;
 
 		let isSelected;
 
@@ -137,18 +145,44 @@ export function RichTextWrapper(
 			isSelected = selectionStart.clientId === clientId;
 		}
 
+		// Disable Rich Text editing if block bindings specify that.
+		let shouldDisableEditing = false;
+		if ( blockBindings ) {
+			const blockTypeAttributes = getBlockType( blockName ).attributes;
+			const { getBlockBindingsSource } = unlock(
+				select( blockEditorStore )
+			);
+			for ( const [ attribute, args ] of Object.entries(
+				blockBindings
+			) ) {
+				// If any of the attributes with source "rich-text" is part of the bindings,
+				// has a source with `lockAttributesEditing`, disable it.
+				if (
+					blockTypeAttributes?.[ attribute ]?.source ===
+						'rich-text' &&
+					getBlockBindingsSource( args.source.name )
+						?.lockAttributesEditing
+				) {
+					shouldDisableEditing = true;
+					break;
+				}
+			}
+		}
+
 		return {
 			selectionStart: isSelected ? selectionStart.offset : undefined,
 			selectionEnd: isSelected ? selectionEnd.offset : undefined,
 			isSelected,
+			shouldDisableEditing,
 		};
 	};
-	const { selectionStart, selectionEnd, isSelected } = useSelect( selector, [
-		clientId,
-		identifier,
-		originalIsSelected,
-		isBlockSelected,
-	] );
+	const { selectionStart, selectionEnd, isSelected, shouldDisableEditing } =
+		useSelect( selector, [
+			clientId,
+			identifier,
+			originalIsSelected,
+			isBlockSelected,
+		] );
 	const { getSelectionStart, getSelectionEnd, getBlockRootClientId } =
 		useSelect( blockEditorStore );
 	const { selectionChange } = useDispatch( blockEditorStore );
@@ -376,7 +410,7 @@ export function RichTextWrapper(
 					useFirefoxCompat(),
 					anchorRef,
 				] ) }
-				contentEditable={ true }
+				contentEditable={ ! shouldDisableEditing }
 				suppressContentEditableWarning={ true }
 				className={ classnames(
 					'block-editor-rich-text__editable',
@@ -389,7 +423,11 @@ export function RichTextWrapper(
 				// select blocks when Shift Clicking into an element with
 				// tabIndex because Safari will focus the element. However,
 				// Safari will correctly ignore nested contentEditable elements.
-				tabIndex={ props.tabIndex === 0 ? null : props.tabIndex }
+				tabIndex={
+					props.tabIndex === 0 && ! shouldDisableEditing
+						? null
+						: props.tabIndex
+				}
 				data-wp-block-attribute-key={ identifier }
 			/>
 		</>
diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js
index cb0ca4e2ff3e5..5760c8edb4e2a 100644
--- a/packages/block-editor/src/hooks/index.js
+++ b/packages/block-editor/src/hooks/index.js
@@ -27,6 +27,7 @@ import contentLockUI from './content-lock-ui';
 import './metadata';
 import blockHooks from './block-hooks';
 import blockRenaming from './block-renaming';
+import './use-bindings-attributes';
 
 createBlockEditFilter(
 	[
diff --git a/packages/block-editor/src/hooks/use-bindings-attributes.js b/packages/block-editor/src/hooks/use-bindings-attributes.js
new file mode 100644
index 0000000000000..6f669f1a321c2
--- /dev/null
+++ b/packages/block-editor/src/hooks/use-bindings-attributes.js
@@ -0,0 +1,148 @@
+/**
+ * WordPress dependencies
+ */
+import { getBlockType } from '@wordpress/blocks';
+import { createHigherOrderComponent } from '@wordpress/compose';
+import { useRegistry, useSelect } from '@wordpress/data';
+import { addFilter } from '@wordpress/hooks';
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../store';
+import { useBlockEditContext } from '../components/block-edit/context';
+import { unlock } from '../lock-unlock';
+
+/** @typedef {import('@wordpress/compose').WPHigherOrderComponent} WPHigherOrderComponent */
+/** @typedef {import('@wordpress/blocks').WPBlockSettings} WPBlockSettings */
+
+/**
+ * Given a binding of block attributes, returns a higher order component that
+ * overrides its `attributes` and `setAttributes` props to sync any changes needed.
+ *
+ * @return {WPHigherOrderComponent} Higher-order component.
+ */
+
+const BLOCK_BINDINGS_ALLOWED_BLOCKS = {
+	'core/paragraph': [ 'content' ],
+	'core/heading': [ 'content' ],
+	'core/image': [ 'url', 'title', 'alt' ],
+	'core/button': [ 'url', 'text' ],
+};
+
+const createEditFunctionWithBindingsAttribute = () =>
+	createHigherOrderComponent(
+		( BlockEdit ) => ( props ) => {
+			const { clientId, name: blockName } = useBlockEditContext();
+			const { getBlockBindingsSource } = unlock(
+				useSelect( blockEditorStore )
+			);
+			const { getBlockAttributes, updateBlockAttributes } =
+				useSelect( blockEditorStore );
+
+			const updatedAttributes = getBlockAttributes( clientId );
+			if ( updatedAttributes?.metadata?.bindings ) {
+				Object.entries( updatedAttributes.metadata.bindings ).forEach(
+					( [ attributeName, settings ] ) => {
+						const source = getBlockBindingsSource(
+							settings.source.name
+						);
+
+						if ( source ) {
+							// Second argument (`updateMetaValue`) will be used to update the value in the future.
+							const {
+								placeholder,
+								useValue: [ metaValue = null ] = [],
+							} = source.useSource(
+								props,
+								settings.source.attributes
+							);
+
+							if ( placeholder && ! metaValue ) {
+								// If the attribute is `src` or `href`, a placeholder can't be used because it is not a valid url.
+								// Adding this workaround until attributes and metadata fields types are improved and include `url`.
+								const htmlAttribute =
+									getBlockType( blockName ).attributes[
+										attributeName
+									].attribute;
+								if (
+									htmlAttribute === 'src' ||
+									htmlAttribute === 'href'
+								) {
+									updatedAttributes[ attributeName ] = null;
+								} else {
+									updatedAttributes[ attributeName ] =
+										placeholder;
+								}
+							}
+
+							if ( metaValue ) {
+								updatedAttributes[ attributeName ] = metaValue;
+							}
+						}
+					}
+				);
+			}
+
+			const registry = useRegistry();
+
+			return (
+				<>
+					<BlockEdit
+						key="edit"
+						attributes={ updatedAttributes }
+						setAttributes={ ( newAttributes, blockId ) =>
+							registry.batch( () =>
+								updateBlockAttributes( blockId, newAttributes )
+							)
+						}
+						{ ...props }
+					/>
+				</>
+			);
+		},
+		'useBoundAttributes'
+	);
+
+/**
+ * Filters a registered block's settings to enhance a block's `edit` component
+ * to upgrade bound attributes.
+ *
+ * @param {WPBlockSettings} settings Registered block settings.
+ *
+ * @return {WPBlockSettings} Filtered block settings.
+ */
+function shimAttributeSource( settings ) {
+	if ( ! ( settings.name in BLOCK_BINDINGS_ALLOWED_BLOCKS ) ) {
+		return settings;
+	}
+	settings.edit = createEditFunctionWithBindingsAttribute()( settings.edit );
+
+	return settings;
+}
+
+addFilter(
+	'blocks.registerBlockType',
+	'core/editor/custom-sources-backwards-compatibility/shim-attribute-source',
+	shimAttributeSource
+);
+
+// Add the context to all blocks.
+addFilter(
+	'blocks.registerBlockType',
+	'core/block-bindings-ui',
+	( settings, name ) => {
+		if ( ! ( name in BLOCK_BINDINGS_ALLOWED_BLOCKS ) ) {
+			return settings;
+		}
+		const contextItems = [ 'postId', 'postType', 'queryId' ];
+		const usesContextArray = settings.usesContext;
+		const oldUsesContextArray = new Set( usesContextArray );
+		contextItems.forEach( ( item ) => {
+			if ( ! oldUsesContextArray.has( item ) ) {
+				usesContextArray.push( item );
+			}
+		} );
+		settings.usesContext = usesContextArray;
+		return settings;
+	}
+);
diff --git a/packages/block-editor/src/store/private-actions.js b/packages/block-editor/src/store/private-actions.js
index a31455a0b7e7b..aea3613884bb6 100644
--- a/packages/block-editor/src/store/private-actions.js
+++ b/packages/block-editor/src/store/private-actions.js
@@ -360,3 +360,13 @@ export function stopEditingAsBlocks( clientId ) {
 		dispatch.__unstableSetTemporarilyEditingAsBlocks();
 	};
 }
+
+export function registerBlockBindingsSource( source ) {
+	return {
+		type: 'REGISTER_BLOCK_BINDINGS_SOURCE',
+		sourceName: source.name,
+		sourceLabel: source.label,
+		useSource: source.useSource,
+		lockAttributesEditing: source.lockAttributesEditing,
+	};
+}
diff --git a/packages/block-editor/src/store/private-selectors.js b/packages/block-editor/src/store/private-selectors.js
index adad08c7b98dc..caca9507f0770 100644
--- a/packages/block-editor/src/store/private-selectors.js
+++ b/packages/block-editor/src/store/private-selectors.js
@@ -341,3 +341,11 @@ export const getAllPatterns = createRegistrySelector( ( select ) =>
 export function getLastFocus( state ) {
 	return state.lastFocus;
 }
+
+export function getAllBlockBindingsSources( state ) {
+	return state.blockBindingsSources;
+}
+
+export function getBlockBindingsSource( state, sourceName ) {
+	return state.blockBindingsSources[ sourceName ];
+}
diff --git a/packages/block-editor/src/store/reducer.js b/packages/block-editor/src/store/reducer.js
index 70e2dc3488772..dc69a4da609a4 100644
--- a/packages/block-editor/src/store/reducer.js
+++ b/packages/block-editor/src/store/reducer.js
@@ -2023,6 +2023,20 @@ export function lastFocus( state = false, action ) {
 	return state;
 }
 
+function blockBindingsSources( state = {}, action ) {
+	if ( action.type === 'REGISTER_BLOCK_BINDINGS_SOURCE' ) {
+		return {
+			...state,
+			[ action.sourceName ]: {
+				label: action.sourceLabel,
+				useSource: action.useSource,
+				lockAttributesEditing: action.lockAttributesEditing,
+			},
+		};
+	}
+	return state;
+}
+
 function blockPatterns( state = [], action ) {
 	switch ( action.type ) {
 		case 'RECEIVE_BLOCK_PATTERNS':
@@ -2062,6 +2076,7 @@ const combinedReducers = combineReducers( {
 	blockRemovalRules,
 	openedBlockSettingsMenu,
 	registeredInserterMediaCategories,
+	blockBindingsSources,
 	blockPatterns,
 } );
 
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index a0994ce3f84b1..f6e465786ef69 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -9,6 +9,7 @@ import classnames from 'classnames';
 import { NEW_TAB_TARGET, NOFOLLOW_REL } from './constants';
 import { getUpdatedLinkAttributes } from './get-updated-link-attributes';
 import removeAnchorTag from '../utils/remove-anchor-tag';
+import { unlock } from '../lock-unlock';
 
 /**
  * WordPress dependencies
@@ -165,6 +166,7 @@ function ButtonEdit( props ) {
 		text,
 		url,
 		width,
+		metadata,
 	} = attributes;
 
 	const TagName = tagName || 'a';
@@ -230,6 +232,27 @@ function ButtonEdit( props ) {
 	const useEnterRef = useEnter( { content: text, clientId } );
 	const mergedRef = useMergeRefs( [ useEnterRef, richTextRef ] );
 
+	const { lockUrlControls = false } = useSelect(
+		( select ) => {
+			if ( ! isSelected ) {
+				return {};
+			}
+
+			const { getBlockBindingsSource } = unlock(
+				select( blockEditorStore )
+			);
+
+			return {
+				lockUrlControls:
+					!! metadata?.bindings?.url &&
+					getBlockBindingsSource(
+						metadata?.bindings?.url?.source?.name
+					)?.lockAttributesEditing === true,
+			};
+		},
+		[ isSelected ]
+	);
+
 	return (
 		<>
 			<div
@@ -290,7 +313,7 @@ function ButtonEdit( props ) {
 						} }
 					/>
 				) }
-				{ ! isURLSet && isLinkTag && (
+				{ ! isURLSet && isLinkTag && ! lockUrlControls && (
 					<ToolbarButton
 						name="link"
 						icon={ link }
@@ -299,7 +322,7 @@ function ButtonEdit( props ) {
 						onClick={ startEditing }
 					/>
 				) }
-				{ isURLSet && isLinkTag && (
+				{ isURLSet && isLinkTag && ! lockUrlControls && (
 					<ToolbarButton
 						name="link"
 						icon={ linkOff }
@@ -310,43 +333,46 @@ function ButtonEdit( props ) {
 					/>
 				) }
 			</BlockControls>
-			{ isLinkTag && isSelected && ( isEditingURL || isURLSet ) && (
-				<Popover
-					placement="bottom"
-					onClose={ () => {
-						setIsEditingURL( false );
-						richTextRef.current?.focus();
-					} }
-					anchor={ popoverAnchor }
-					focusOnMount={ isEditingURL ? 'firstElement' : false }
-					__unstableSlotName={ '__unstable-block-tools-after' }
-					shift
-				>
-					<LinkControl
-						value={ linkValue }
-						onChange={ ( {
-							url: newURL,
-							opensInNewTab: newOpensInNewTab,
-							nofollow: newNofollow,
-						} ) =>
-							setAttributes(
-								getUpdatedLinkAttributes( {
-									rel,
-									url: newURL,
-									opensInNewTab: newOpensInNewTab,
-									nofollow: newNofollow,
-								} )
-							)
-						}
-						onRemove={ () => {
-							unlink();
+			{ isLinkTag &&
+				isSelected &&
+				( isEditingURL || isURLSet ) &&
+				! metadata?.bindings?.url && (
+					<Popover
+						placement="bottom"
+						onClose={ () => {
+							setIsEditingURL( false );
 							richTextRef.current?.focus();
 						} }
-						forceIsEditingLink={ isEditingURL }
-						settings={ LINK_SETTINGS }
-					/>
-				</Popover>
-			) }
+						anchor={ popoverAnchor }
+						focusOnMount={ isEditingURL ? 'firstElement' : false }
+						__unstableSlotName={ '__unstable-block-tools-after' }
+						shift
+					>
+						<LinkControl
+							value={ linkValue }
+							onChange={ ( {
+								url: newURL,
+								opensInNewTab: newOpensInNewTab,
+								nofollow: newNofollow,
+							} ) =>
+								setAttributes(
+									getUpdatedLinkAttributes( {
+										rel,
+										url: newURL,
+										opensInNewTab: newOpensInNewTab,
+										nofollow: newNofollow,
+									} )
+								)
+							}
+							onRemove={ () => {
+								unlink();
+								richTextRef.current?.focus();
+							} }
+							forceIsEditingLink={ isEditingURL }
+							settings={ LINK_SETTINGS }
+						/>
+					</Popover>
+				) }
 			<InspectorControls>
 				<WidthPanel
 					selectedWidth={ width }
diff --git a/packages/block-library/src/image/edit.js b/packages/block-library/src/image/edit.js
index d189af32efcbe..723c8c27508de 100644
--- a/packages/block-library/src/image/edit.js
+++ b/packages/block-library/src/image/edit.js
@@ -19,7 +19,7 @@ import {
 } from '@wordpress/block-editor';
 import { useEffect, useRef, useState } from '@wordpress/element';
 import { __ } from '@wordpress/i18n';
-import { image as icon } from '@wordpress/icons';
+import { image as icon, plugins as pluginsIcon } from '@wordpress/icons';
 import { store as noticesStore } from '@wordpress/notices';
 
 /**
@@ -111,6 +111,7 @@ export function ImageEdit( {
 		aspectRatio,
 		scale,
 		align,
+		metadata,
 	} = attributes;
 	const [ temporaryURL, setTemporaryURL ] = useState();
 
@@ -332,6 +333,7 @@ export function ImageEdit( {
 	} );
 
 	// Much of this description is duplicated from MediaPlaceholder.
+	const isUrlAttributeConnected = !! metadata?.bindings?.url;
 	const placeholder = ( content ) => {
 		return (
 			<Placeholder
@@ -340,11 +342,14 @@ export function ImageEdit( {
 						!! borderProps.className && ! isSelected,
 				} ) }
 				withIllustration={ true }
-				icon={ icon }
+				icon={ isUrlAttributeConnected ? pluginsIcon : icon }
 				label={ __( 'Image' ) }
-				instructions={ __(
-					'Upload an image file, pick one from your media library, or add one with a URL.'
-				) }
+				instructions={
+					! isUrlAttributeConnected &&
+					__(
+						'Upload an image file, pick one from your media library, or add one with a URL.'
+					)
+				}
 				style={ {
 					aspectRatio:
 						! ( width && height ) && aspectRatio
@@ -356,7 +361,15 @@ export function ImageEdit( {
 					...borderProps.style,
 				} }
 			>
-				{ content }
+				{ isUrlAttributeConnected ? (
+					<span
+						className={ 'block-bindings-media-placeholder-message' }
+					>
+						{ __( 'Connected to a custom field' ) }
+					</span>
+				) : (
+					content
+				) }
 			</Placeholder>
 		);
 	};
diff --git a/packages/block-library/src/image/editor.scss b/packages/block-library/src/image/editor.scss
index 934682ed91b7d..ded3768dfa7d3 100644
--- a/packages/block-library/src/image/editor.scss
+++ b/packages/block-library/src/image/editor.scss
@@ -27,6 +27,12 @@
 			opacity: 0;
 		}
 	}
+	.block-bindings-media-placeholder-message {
+		opacity: 0;
+	}
+	&.is-selected .block-bindings-media-placeholder-message {
+		opacity: 1;
+	}
 
 	// Remove the transition while we still have a legacy placeholder style.
 	// Otherwise the content jumps between the 1px placeholder border, and any inherited custom
@@ -38,7 +44,6 @@
 	}
 }
 
-
 figure.wp-block-image:not(.wp-block) {
 	margin: 0;
 }
diff --git a/packages/block-library/src/image/image.js b/packages/block-library/src/image/image.js
index f2a484b6e03c1..d6d259c428b6e 100644
--- a/packages/block-library/src/image/image.js
+++ b/packages/block-library/src/image/image.js
@@ -124,6 +124,7 @@ export default function Image( {
 		linkTarget,
 		sizeSlug,
 		lightbox,
+		metadata,
 	} = attributes;
 
 	// The only supported unit is px, so we can parseInt to strip the px here.
@@ -411,21 +412,59 @@ export default function Image( {
 		</InspectorControls>
 	);
 
+	const {
+		lockUrlControls = false,
+		lockAltControls = false,
+		lockTitleControls = false,
+	} = useSelect(
+		( select ) => {
+			if ( ! isSelected ) {
+				return {};
+			}
+
+			const { getBlockBindingsSource } = unlock(
+				select( blockEditorStore )
+			);
+			const {
+				url: urlBinding,
+				alt: altBinding,
+				title: titleBinding,
+			} = metadata?.bindings || {};
+			return {
+				lockUrlControls:
+					!! urlBinding &&
+					getBlockBindingsSource( urlBinding?.source?.name )
+						?.lockAttributesEditing === true,
+				lockAltControls:
+					!! altBinding &&
+					getBlockBindingsSource( altBinding?.source?.name )
+						?.lockAttributesEditing === true,
+				lockTitleControls:
+					!! titleBinding &&
+					getBlockBindingsSource( titleBinding?.source?.name )
+						?.lockAttributesEditing === true,
+			};
+		},
+		[ isSelected ]
+	);
+
 	const controls = (
 		<>
 			<BlockControls group="block">
-				{ ! multiImageSelection && ! isEditingImage && (
-					<ImageURLInputUI
-						url={ href || '' }
-						onChangeUrl={ onSetHref }
-						linkDestination={ linkDestination }
-						mediaUrl={ ( image && image.source_url ) || url }
-						mediaLink={ image && image.link }
-						linkTarget={ linkTarget }
-						linkClass={ linkClass }
-						rel={ rel }
-					/>
-				) }
+				{ ! multiImageSelection &&
+					! isEditingImage &&
+					! lockUrlControls && (
+						<ImageURLInputUI
+							url={ href || '' }
+							onChangeUrl={ onSetHref }
+							linkDestination={ linkDestination }
+							mediaUrl={ ( image && image.source_url ) || url }
+							mediaLink={ image && image.link }
+							linkTarget={ linkTarget }
+							linkClass={ linkClass }
+							rel={ rel }
+						/>
+					) }
 				{ allowCrop && (
 					<ToolbarButton
 						onClick={ () => setIsEditingImage( true ) }
@@ -441,19 +480,21 @@ export default function Image( {
 					/>
 				) }
 			</BlockControls>
-			{ ! multiImageSelection && ! isEditingImage && (
-				<BlockControls group="other">
-					<MediaReplaceFlow
-						mediaId={ id }
-						mediaURL={ url }
-						allowedTypes={ ALLOWED_MEDIA_TYPES }
-						accept="image/*"
-						onSelect={ onSelectImage }
-						onSelectURL={ onSelectURL }
-						onError={ onUploadError }
-					/>
-				</BlockControls>
-			) }
+			{ ! multiImageSelection &&
+				! isEditingImage &&
+				! lockUrlControls && (
+					<BlockControls group="other">
+						<MediaReplaceFlow
+							mediaId={ id }
+							mediaURL={ url }
+							allowedTypes={ ALLOWED_MEDIA_TYPES }
+							accept="image/*"
+							onSelect={ onSelectImage }
+							onSelectURL={ onSelectURL }
+							onError={ onUploadError }
+						/>
+					</BlockControls>
+				) }
 			{ ! multiImageSelection && externalBlob && (
 				<BlockControls>
 					<ToolbarGroup>
@@ -484,16 +525,27 @@ export default function Image( {
 								label={ __( 'Alternative text' ) }
 								value={ alt || '' }
 								onChange={ updateAlt }
+								disabled={ lockAltControls }
 								help={
-									<>
-										<ExternalLink href="https://www.w3.org/WAI/tutorials/images/decision-tree">
+									lockAltControls ? (
+										<>
+											{ __(
+												'Connected to a custom field'
+											) }
+										</>
+									) : (
+										<>
+											<ExternalLink href="https://www.w3.org/WAI/tutorials/images/decision-tree">
+												{ __(
+													'Describe the purpose of the image.'
+												) }
+											</ExternalLink>
+											<br />
 											{ __(
-												'Describe the purpose of the image.'
+												'Leave empty if decorative.'
 											) }
-										</ExternalLink>
-										<br />
-										{ __( 'Leave empty if decorative.' ) }
-									</>
+										</>
+									)
 								}
 								__nextHasNoMarginBottom
 							/>
@@ -543,17 +595,22 @@ export default function Image( {
 					label={ __( 'Title attribute' ) }
 					value={ title || '' }
 					onChange={ onSetTitle }
+					disabled={ lockTitleControls }
 					help={
-						<>
-							{ __(
-								'Describe the role of this image on the page.'
-							) }
-							<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
+						lockTitleControls ? (
+							<>{ __( 'Connected to a custom field' ) }</>
+						) : (
+							<>
 								{ __(
-									'(Note: many devices and browsers do not display this text.)'
+									'Describe the role of this image on the page.'
 								) }
-							</ExternalLink>
-						</>
+								<ExternalLink href="https://www.w3.org/TR/html52/dom.html#the-title-attribute">
+									{ __(
+										'(Note: many devices and browsers do not display this text.)'
+									) }
+								</ExternalLink>
+							</>
+						)
 					}
 				/>
 			</InspectorControls>
@@ -748,7 +805,8 @@ export default function Image( {
 	}
 
 	if ( ! url && ! temporaryURL ) {
-		return sizeControls;
+		// Add all controls if the image attributes are connected.
+		return metadata?.bindings ? controls : sizeControls;
 	}
 
 	return (
diff --git a/packages/editor/package.json b/packages/editor/package.json
index b974c7443851f..63c81cbd5cc7f 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -27,7 +27,7 @@
 	"sideEffects": [
 		"build-style/**",
 		"src/**/*.scss",
-		"{src,build,build-module}/{index.js,store/index.js,hooks/**}"
+		"{src,build,build-module}/{index.js,store/index.js,hooks/**,bindings/**}"
 	],
 	"dependencies": {
 		"@babel/runtime": "^7.16.0",
diff --git a/packages/editor/src/bindings/index.js b/packages/editor/src/bindings/index.js
new file mode 100644
index 0000000000000..8a883e8904a71
--- /dev/null
+++ b/packages/editor/src/bindings/index.js
@@ -0,0 +1,13 @@
+/**
+ * WordPress dependencies
+ */
+import { store as blockEditorStore } from '@wordpress/block-editor';
+import { dispatch } from '@wordpress/data';
+/**
+ * Internal dependencies
+ */
+import { unlock } from '../lock-unlock';
+import postMeta from './post-meta';
+
+const { registerBlockBindingsSource } = unlock( dispatch( blockEditorStore ) );
+registerBlockBindingsSource( postMeta );
diff --git a/packages/editor/src/bindings/post-meta.js b/packages/editor/src/bindings/post-meta.js
new file mode 100644
index 0000000000000..17f5e1837e35e
--- /dev/null
+++ b/packages/editor/src/bindings/post-meta.js
@@ -0,0 +1,42 @@
+/**
+ * WordPress dependencies
+ */
+import { useEntityProp } from '@wordpress/core-data';
+import { useSelect } from '@wordpress/data';
+import { __ } from '@wordpress/i18n';
+/**
+ * Internal dependencies
+ */
+import { store as editorStore } from '../store';
+
+export default {
+	name: 'post_meta',
+	label: __( 'Post Meta' ),
+	useSource( props, sourceAttributes ) {
+		const { getCurrentPostType } = useSelect( editorStore );
+		const { context } = props;
+		const { value: metaKey } = sourceAttributes;
+		const postType = context.postType
+			? context.postType
+			: getCurrentPostType();
+		const [ meta, setMeta ] = useEntityProp(
+			'postType',
+			context.postType,
+			'meta',
+			context.postId
+		);
+
+		if ( postType === 'wp_template' ) {
+			return { placeholder: metaKey };
+		}
+		const metaValue = meta[ metaKey ];
+		const updateMetaValue = ( newValue ) => {
+			setMeta( { ...meta, [ metaKey ]: newValue } );
+		};
+		return {
+			placeholder: metaKey,
+			useValue: [ metaValue, updateMetaValue ],
+		};
+	},
+	lockAttributesEditing: true,
+};
diff --git a/packages/editor/src/index.js b/packages/editor/src/index.js
index 05c04b8232907..3f6d7a78d837c 100644
--- a/packages/editor/src/index.js
+++ b/packages/editor/src/index.js
@@ -1,6 +1,7 @@
 /**
  * Internal dependencies
  */
+import './bindings';
 import './hooks';
 
 export { storeConfig, store } from './store';

From 5b4c751f52c810d0b449e2395c4369f5792d399a Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Wed, 24 Jan 2024 20:28:30 +0100
Subject: [PATCH 283/296] Interactivity API: Create
 `@wordpress/interactivity-router` module (#57924)

* Copy the wp-each implementation

* Scaffold files for wp-each e2e tests

* Process template nodes inside `toVdom()`

* Add tests for several list manipulations

* Add a new test to implement

* Add SSRed elements in PHP

* Add SSRed elements to letters test

* Add more test cases

* Test support for siblings in template

* Implement tests for wp-each on navigation

* Update changelog

* Add `wp-each` documentation

* Separate the router from the rest of the runtime

* Import deps from interactivity module

* Add an entry point for the router

* Register interactivity router module

* Add the router module to query block dependencies

* Cache regions on DOMContentLoaded

* Update query block view

* Update e2e tests

* Make router module a dynamic dependency in tests

* Update tests using navigate

* Expose `state` & `actions` from router module

* Fix module dependency definition for tests

* Fix php lint

* Refactor dynamic imports in tests

* Attempt to fix webpack config

* Update caniuse-lite package

* Update snapshots

"ReadableJsAssetsWebpackPlugin" snapshots webpack output
which changes with the updated caniuse-lite data.

function() {} becomes ()=>{} in some places where webpack
uses functions internally.

* Cleanup DEWP name, ensure no dupe plugin

* fixup! Cleanup DEWP name, ensure no dupe plugin

* fixup! fixup! Cleanup DEWP name, ensure no dupe plugin

* Convert `navigate` and `prefetch` into actions

* Do not use generator for `prefetch`

* Add changelog entry

* Create @wordpress/interactivity-router package

* Update package-lock

* Add the new package to the DEWP

* Use module as the externals default in the experimental module support of wp-scripts

* Revert "Update package-lock"

This reverts commit d09960ed740144e7c13dcce54c14589aab4fe472.

* Revert "Create @wordpress/interactivity-router package"

This reverts commit 7b9e112e020037609927449b79025205abcaf62c.

* Remove unnecessary DEWP

* Refactor for new Script Modules API

* Fix router module name inside DEWP

* Add DEWP to plugins

* Revert "Revert "Create @wordpress/interactivity-router package""

This reverts commit e551609d67ef9472d6b9496dc9ad85568396a0c2.

* Revert "Revert "Update package-lock""

This reverts commit 3e50a84d8dafb30ebfbbdd1eb17065cad8953894.

* Update interactivity-router after reverts

* Fix module dependencies in Query block

* Add changelog entry

* Fix typo

* Revert adding externalsType in wp-scripts

---------

Co-authored-by: Jon Surrell <sirreal@users.noreply.github.com>
Co-authored-by: Luis Herranz <luisherranz@gmail.com>
---
 docs/manifest.json                            |   6 +
 .../class-wp-interactivity-api.php            |   7 +
 package-lock.json                             |  25 +++
 packages/block-library/package.json           |   1 +
 packages/block-library/src/query/index.php    |  13 +-
 packages/block-library/src/query/view.js      |  23 ++-
 packages/block-library/tsconfig.json          |   1 +
 .../lib/util.js                               |  20 +-
 packages/e2e-tests/package.json               |   1 +
 .../e2e-tests/plugins/interactive-blocks.php  |   8 +-
 .../directive-context/view.js                 |  14 +-
 .../interactive-blocks/directive-each/view.js |   9 +-
 .../interactive-blocks/directive-key/view.js  |   9 +-
 .../interactive-blocks/directive-run/view.js  |   8 +-
 .../router-navigate/view.js                   |   7 +-
 .../interactive-blocks/router-regions/view.js |   7 +-
 packages/interactivity-router/.npmrc          |   1 +
 packages/interactivity-router/CHANGELOG.md    |   7 +
 packages/interactivity-router/README.md       |  76 ++++++++
 packages/interactivity-router/package.json    |  34 ++++
 packages/interactivity-router/src/index.js    | 160 ++++++++++++++++
 packages/interactivity-router/tsconfig.json   |  11 ++
 packages/interactivity/CHANGELOG.md           |   1 +
 packages/interactivity/src/index.js           |   8 +-
 packages/interactivity/src/init.js            |  35 ++++
 packages/interactivity/src/router.js          | 177 ------------------
 tools/webpack/interactivity.js                |  12 +-
 tsconfig.json                                 |   1 +
 28 files changed, 461 insertions(+), 221 deletions(-)
 create mode 100644 packages/interactivity-router/.npmrc
 create mode 100644 packages/interactivity-router/CHANGELOG.md
 create mode 100644 packages/interactivity-router/README.md
 create mode 100644 packages/interactivity-router/package.json
 create mode 100644 packages/interactivity-router/src/index.js
 create mode 100644 packages/interactivity-router/tsconfig.json
 create mode 100644 packages/interactivity/src/init.js
 delete mode 100644 packages/interactivity/src/router.js

diff --git a/docs/manifest.json b/docs/manifest.json
index 67b8fac99f713..e8c2e0d9d2b0f 100644
--- a/docs/manifest.json
+++ b/docs/manifest.json
@@ -1673,6 +1673,12 @@
 		"markdown_source": "../packages/icons/README.md",
 		"parent": "packages"
 	},
+	{
+		"title": "@wordpress/interactivity-router",
+		"slug": "packages-interactivity-router",
+		"markdown_source": "../packages/interactivity-router/README.md",
+		"parent": "packages"
+	},
 	{
 		"title": "@wordpress/interactivity",
 		"slug": "packages-interactivity",
diff --git a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
index de1d8b2a9e789..ad9e5d7c43953 100644
--- a/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
+++ b/lib/compat/wordpress-6.5/interactivity-api/class-wp-interactivity-api.php
@@ -150,6 +150,13 @@ public function register_script_modules() {
 				array(),
 				defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
 			);
+
+			wp_register_script_module(
+				'@wordpress/interactivity-router',
+				gutenberg_url( '/build/interactivity/router.min.js' ),
+				array( '@wordpress/interactivity' ),
+				defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
+			);
 		}
 
 		/**
diff --git a/package-lock.json b/package-lock.json
index a9168b490cd2b..ff07e701533b8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -17939,6 +17939,10 @@
 			"resolved": "packages/interactivity",
 			"link": true
 		},
+		"node_modules/@wordpress/interactivity-router": {
+			"resolved": "packages/interactivity-router",
+			"link": true
+		},
 		"node_modules/@wordpress/interface": {
 			"resolved": "packages/interface",
 			"link": true
@@ -54066,6 +54070,7 @@
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
 				"@wordpress/interactivity": "file:../interactivity",
+				"@wordpress/interactivity-router": "file:../interactivity-router",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
 				"@wordpress/patterns": "file:../patterns",
@@ -54700,6 +54705,7 @@
 			"dependencies": {
 				"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
 				"@wordpress/interactivity": "file:../interactivity",
+				"@wordpress/interactivity-router": "file:../interactivity-router",
 				"@wordpress/jest-console": "file:../jest-console",
 				"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
 				"@wordpress/scripts": "file:../scripts",
@@ -55237,6 +55243,17 @@
 				"node": ">=12"
 			}
 		},
+		"packages/interactivity-router": {
+			"name": "@wordpress/interactivity-router",
+			"version": "0.1.0",
+			"license": "GPL-2.0-or-later",
+			"dependencies": {
+				"@wordpress/interactivity": "file:../interactivity"
+			},
+			"engines": {
+				"node": ">=12"
+			}
+		},
 		"packages/interactivity/node_modules/@preact/signals": {
 			"version": "1.2.2",
 			"resolved": "https://registry.npmjs.org/@preact/signals/-/signals-1.2.2.tgz",
@@ -69267,6 +69284,7 @@
 				"@wordpress/i18n": "file:../i18n",
 				"@wordpress/icons": "file:../icons",
 				"@wordpress/interactivity": "file:../interactivity",
+				"@wordpress/interactivity-router": "file:../interactivity-router",
 				"@wordpress/keycodes": "file:../keycodes",
 				"@wordpress/notices": "file:../notices",
 				"@wordpress/patterns": "file:../patterns",
@@ -69711,6 +69729,7 @@
 			"requires": {
 				"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
 				"@wordpress/interactivity": "file:../interactivity",
+				"@wordpress/interactivity-router": "file:../interactivity-router",
 				"@wordpress/jest-console": "file:../jest-console",
 				"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
 				"@wordpress/scripts": "file:../scripts",
@@ -70124,6 +70143,12 @@
 				}
 			}
 		},
+		"@wordpress/interactivity-router": {
+			"version": "file:packages/interactivity-router",
+			"requires": {
+				"@wordpress/interactivity": "file:../interactivity"
+			}
+		},
 		"@wordpress/interface": {
 			"version": "file:packages/interface",
 			"requires": {
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 12f4e23d9da4d..d4927b341685e 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -51,6 +51,7 @@
 		"@wordpress/i18n": "file:../i18n",
 		"@wordpress/icons": "file:../icons",
 		"@wordpress/interactivity": "file:../interactivity",
+		"@wordpress/interactivity-router": "file:../interactivity-router",
 		"@wordpress/keycodes": "file:../keycodes",
 		"@wordpress/notices": "file:../notices",
 		"@wordpress/patterns": "file:../patterns",
diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
index f40d9df2fb06b..0239fadc6bf0a 100644
--- a/packages/block-library/src/query/index.php
+++ b/packages/block-library/src/query/index.php
@@ -100,8 +100,17 @@ function register_block_core_query() {
 
 	wp_register_script_module(
 		'@wordpress/block-library/query',
-		'/wp-content/plugins/gutenberg/build/interactivity/query.min.js',
-		array( '@wordpress/interactivity' ),
+		gutenberg_url( '/build/interactivity/query.min.js' ),
+		array(
+			array(
+				'id'     => '@wordpress/interactivity',
+				'import' => 'static',
+			),
+			array(
+				'id'     => '@wordpress/interactivity-router',
+				'import' => 'dynamic',
+			),
+		),
 		defined( 'GUTENBERG_VERSION' ) ? GUTENBERG_VERSION : get_bloginfo( 'version' )
 	);
 }
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
index ccf7081004767..89eb8198d1805 100644
--- a/packages/block-library/src/query/view.js
+++ b/packages/block-library/src/query/view.js
@@ -1,13 +1,7 @@
 /**
  * WordPress dependencies
  */
-import {
-	store,
-	getContext,
-	getElement,
-	navigate,
-	prefetch,
-} from '@wordpress/interactivity';
+import { store, getContext, getElement } from '@wordpress/interactivity';
 
 const isValidLink = ( ref ) =>
 	ref &&
@@ -52,7 +46,10 @@ store( 'core/query', {
 					ctx.animation = 'start';
 				}, 400 );
 
-				yield navigate( ref.href );
+				const { actions } = yield import(
+					'@wordpress/interactivity-router'
+				);
+				yield actions.navigate( ref.href );
 
 				// Dismiss loading message if it hasn't been added yet.
 				clearTimeout( timeout );
@@ -77,7 +74,10 @@ store( 'core/query', {
 			const isDisabled = ref.closest( '[data-wp-navigation-id]' )?.dataset
 				.wpNavigationDisabled;
 			if ( isValidLink( ref ) && ! isDisabled ) {
-				yield prefetch( ref.href );
+				const { actions } = yield import(
+					'@wordpress/interactivity-router'
+				);
+				yield actions.prefetch( ref.href );
 			}
 		},
 	},
@@ -86,7 +86,10 @@ store( 'core/query', {
 			const { url } = getContext();
 			const { ref } = getElement();
 			if ( url && isValidLink( ref ) ) {
-				yield prefetch( ref.href );
+				const { actions } = yield import(
+					'@wordpress/interactivity-router'
+				);
+				yield actions.prefetch( ref.href );
 			}
 		},
 	},
diff --git a/packages/block-library/tsconfig.json b/packages/block-library/tsconfig.json
index a9a30e9804e1f..a5f01298a8fad 100644
--- a/packages/block-library/tsconfig.json
+++ b/packages/block-library/tsconfig.json
@@ -27,6 +27,7 @@
 		{ "path": "../i18n" },
 		{ "path": "../icons" },
 		{ "path": "../interactivity" },
+		{ "path": "../interactivity-router" },
 		{ "path": "../notices" },
 		{ "path": "../keycodes" },
 		{ "path": "../primitives" },
diff --git a/packages/dependency-extraction-webpack-plugin/lib/util.js b/packages/dependency-extraction-webpack-plugin/lib/util.js
index 39b2f4b4bca58..3e1795ddca247 100644
--- a/packages/dependency-extraction-webpack-plugin/lib/util.js
+++ b/packages/dependency-extraction-webpack-plugin/lib/util.js
@@ -59,9 +59,11 @@ function defaultRequestToExternal( request ) {
 /**
  * Default request to external module transformation
  *
- * Currently only @wordpress/interactivity
+ * Currently only @wordpress/interactivity and `@wordpress/interactivity-router`
+ * are supported.
  *
- * Do not use the boolean shorthand here, it's only handled for the `requestToExternalModule` option.
+ * Do not use the boolean shorthand here, it's only handled for the
+ * `requestToExternalModule` option.
  *
  * @param {string} request Module request (the module name in `import from`) to be transformed
  * @return {string|Error|undefined} The resulting external definition.
@@ -71,13 +73,19 @@ function defaultRequestToExternal( request ) {
  */
 function defaultRequestToExternalModule( request ) {
 	if ( request === '@wordpress/interactivity' ) {
-		// This is a special case. Interactivity does not support dynamic imports at this
-		// time. We add the external "module" type to indicate that webpack should
-		// externalize this as a module (instead of our default `import()` external type)
-		// which forces @wordpress/interactivity imports to be hoisted to static imports.
+		// This is a special case. Interactivity does not support dynamic imports at
+		// this time. We add the external "module" type to indicate that webpack
+		// should externalize this as a module (instead of our default `import()`
+		// external type) which forces @wordpress/interactivity imports to be
+		// hoisted to static imports.
 		return `module ${ request }`;
 	}
 
+	if ( request === '@wordpress/interactivity-router' ) {
+		// Assumes this is usually going to be used as a dynamic import.
+		return `import ${ request }`;
+	}
+
 	const isWordPressScript = Boolean( defaultRequestToExternal( request ) );
 
 	if ( isWordPressScript ) {
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 864eba1af12ac..bd6620dadc6b9 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -25,6 +25,7 @@
 	"dependencies": {
 		"@wordpress/e2e-test-utils": "file:../e2e-test-utils",
 		"@wordpress/interactivity": "file:../interactivity",
+		"@wordpress/interactivity-router": "file:../interactivity-router",
 		"@wordpress/jest-console": "file:../jest-console",
 		"@wordpress/jest-puppeteer-axe": "file:../jest-puppeteer-axe",
 		"@wordpress/scripts": "file:../scripts",
diff --git a/packages/e2e-tests/plugins/interactive-blocks.php b/packages/e2e-tests/plugins/interactive-blocks.php
index 66fa658d0da3c..54d68ab674694 100644
--- a/packages/e2e-tests/plugins/interactive-blocks.php
+++ b/packages/e2e-tests/plugins/interactive-blocks.php
@@ -24,7 +24,13 @@ function () {
 				wp_register_script_module(
 					$name . '-view',
 					$view_file,
-					array( '@wordpress/interactivity' ),
+					array(
+						'@wordpress/interactivity',
+						array(
+							'id'     => '@wordpress/interactivity-router',
+							'import' => 'dynamic',
+						),
+					),
 					filemtime( $view_file )
 				);
 
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
index 8317f155d190e..83683a00aff12 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate, getContext } from '@wordpress/interactivity';
+import { store, getContext } from '@wordpress/interactivity';
 
 store( 'directive-context', {
 	state: {
@@ -50,10 +50,14 @@ const { actions } = store( 'directive-context-navigate', {
 			ctx.newText = 'some new text';
 		},
 		navigate() {
-			return navigate( window.location, {
-				force: true,
-				html,
-			} );
+			return import( '@wordpress/interactivity-router' ).then(
+				( { actions: routerActions } ) =>
+					routerActions.navigate(
+						window.location,
+						{ force: true, html },
+					)
+			);
+
 		},
 		*asyncNavigate() {
 			yield actions.navigate();
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
index 55677c9629ad3..b38f531caee96 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, getContext, navigate } from '@wordpress/interactivity';
+import { store, getContext } from '@wordpress/interactivity';
 
 const { state } = store( 'directive-each' );
 
@@ -178,8 +178,11 @@ const html = `
 
 store( 'directive-each', {
 	actions: {
-		navigate() {
-			return navigate( window.location, {
+		*navigate() {
+			const { actions } = yield import(
+				"@wordpress/interactivity-router"
+			);
+			return actions.navigate( window.location, {
 				force: true,
 				html,
 			} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
index cdbcb5b597304..ed51a4bd2e76e 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate } from '@wordpress/interactivity';
+import { store } from '@wordpress/interactivity';
 
 const html = `
 		<div
@@ -17,8 +17,11 @@ const html = `
 
 store( 'directive-key', {
 	actions: {
-		navigate() {
-			navigate( window.location, {
+		*navigate() {
+			const { actions } = yield import(
+				"@wordpress/interactivity-router"
+			);
+			return actions.navigate( window.location, {
 				force: true,
 				html,
 			} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
index b6dd68154d716..f98701c1afe51 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
@@ -4,7 +4,6 @@
 import {
 	store,
 	directive,
-	navigate,
 	useInit,
 	useWatch,
 	cloneElement,
@@ -58,8 +57,11 @@ const { state } = store( 'directive-run', {
 		increment() {
 			state.clickCount = state.clickCount + 1;
 		},
-		navigate() {
-			navigate( window.location, {
+		*navigate() {
+			const { actions } = yield import(
+				"@wordpress/interactivity-router"
+			);
+			return actions.navigate( window.location, {
 				force: true,
 				html,
 			} );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
index 59d0e4b56f70c..1e137969936a0 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate } from '@wordpress/interactivity';
+import { store } from '@wordpress/interactivity';
 
 const { state } = store( 'router', {
 	state: {
@@ -19,7 +19,10 @@ const { state } = store( 'router', {
 			const force = e.target.dataset.forceNavigation === 'true';
 			const { timeout } = state;
 
-			yield navigate( e.target.href, { force, timeout } );
+			const { actions } = yield import(
+				"@wordpress/interactivity-router"
+			);
+			yield actions.navigate( e.target.href, { force, timeout } );
 
 			state.navigations -= 1;
 
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
index 302086c8168f2..2e78dd1592d33 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/view.js
@@ -1,7 +1,7 @@
 /**
  * WordPress dependencies
  */
-import { store, navigate, getContext } from '@wordpress/interactivity';
+import { store, getContext } from '@wordpress/interactivity';
 
 const { state } = store( 'router-regions', {
 	state: {
@@ -19,7 +19,10 @@ const { state } = store( 'router-regions', {
 		router: {
 			*navigate( e ) {
 				e.preventDefault();
-				yield navigate( e.target.href );
+				const { actions } = yield import(
+					"@wordpress/interactivity-router"
+				);
+				yield actions.navigate( e.target.href );
 			},
 			back() {
 				history.back();
diff --git a/packages/interactivity-router/.npmrc b/packages/interactivity-router/.npmrc
new file mode 100644
index 0000000000000..43c97e719a5a8
--- /dev/null
+++ b/packages/interactivity-router/.npmrc
@@ -0,0 +1 @@
+package-lock=false
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
new file mode 100644
index 0000000000000..5c4b2529a9ca6
--- /dev/null
+++ b/packages/interactivity-router/CHANGELOG.md
@@ -0,0 +1,7 @@
+<!-- Learn how to maintain this file at https://github.com/WordPress/gutenberg/tree/HEAD/packages#maintaining-changelogs. -->
+
+## Unreleased
+
+### Breaking changes
+
+-   Initial version. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
diff --git a/packages/interactivity-router/README.md b/packages/interactivity-router/README.md
new file mode 100644
index 0000000000000..94b88e80886c9
--- /dev/null
+++ b/packages/interactivity-router/README.md
@@ -0,0 +1,76 @@
+# Interactivity Router
+
+> **Note**
+> This package is a extension of the API shared at [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/). As part of an [Open Source project](https://developer.wordpress.org/block-editor/getting-started/faq/#the-gutenberg-project) we encourage participation in helping shape this API and the [discussions in GitHub](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) is the best place to engage.
+
+This package defines an Interactivity API store with the `core/router` namespace, exposing state and actions like `navigate` and `prefetch` to handle client-side navigations.
+
+## Usage
+
+The package is intended to be imported dynamically in the `view.js` files of interactive blocks.
+
+```js
+import { store } from '@wordpress/interactivity';
+
+store( 'myblock', {
+	actions: {
+		*navigate( e ) {
+			e.preventDefault();
+			const { actions } = yield import(
+				'@wordpress/interactivity-router'
+			);
+			yield actions.navigate( e.target.href );
+		},
+	},
+} );
+```
+
+## Frequently Asked Questions
+
+At this point, some of the questions you have about the Interactivity API may be:
+
+### What is this?
+
+This is the base of a new standard to create interactive blocks. Read [the proposal](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/) to learn more about this.
+
+### Can I use it?
+
+You can test it, but it's still very experimental.
+
+### How do I get started?
+
+The best place to start with the Interactivity API is this [**Getting started guide**](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/1-getting-started.md). There you'll will find a very quick start guide and the current requirements of the Interactivity API.
+
+### Where can I ask questions?
+
+The [“Interactivity API” category](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) in Gutenberg repo discussions is the best place to ask questions about the Interactivity API.
+
+### Where can I share my feedback about the API?
+
+The [“Interactivity API” category](https://github.com/WordPress/gutenberg/discussions/categories/interactivity-api) in Gutenberg repo discussions is also the best place to share your feedback about the Interactivity API.
+
+## Installation
+
+Install the module:
+
+```bash
+npm install @wordpress/interactivity --save
+```
+
+_This package assumes that your code will run in an **ES2015+** environment. If you're using an environment that has limited or no support for such language features and APIs, you should include [the polyfill shipped in `@wordpress/babel-preset-default`](https://github.com/WordPress/gutenberg/tree/HEAD/packages/babel-preset-default#polyfill) in your code._
+
+## Docs & Examples
+
+**[Interactivity API Documentation](https://github.com/WordPress/gutenberg/tree/trunk/packages/interactivity/docs)** is the best place to learn about this proposal. Although it's still in progress, some key pages are already available:
+
+-   **[Getting Started Guide](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/1-getting-started.md)**: Follow this Getting Started guide to learn how to scaffold a new project and create your first interactive blocks.
+-   **[API Reference](https://github.com/WordPress/gutenberg/blob/trunk/packages/interactivity/docs/2-api-reference.md)**: Check this page for technical detailed explanations and examples of the directives and the store.
+
+Here you have some more resources to learn/read more about the Interactivity API:
+
+-   **[Interactivity API Discussions](https://github.com/WordPress/gutenberg/discussions/52882)**
+-   [Proposal: The Interactivity API – A better developer experience in building interactive blocks](https://make.wordpress.org/core/2023/03/30/proposal-the-interactivity-api-a-better-developer-experience-in-building-interactive-blocks/)
+-   Developer Hours sessions ([Americas](https://www.youtube.com/watch?v=RXNoyP2ZiS8&t=664s) & [APAC/EMEA](https://www.youtube.com/watch?v=6ghbrhyAcvA))
+-   [wpmovies.dev](http://wpmovies.dev/) demo and its [wp-movies-demo](https://github.com/WordPress/wp-movies-demo) repo
+
+<br /><br /><p align="center"><img src="https://s.w.org/style/images/codeispoetry.png?1" alt="Code is Poetry." /></p>
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
new file mode 100644
index 0000000000000..9afb103676c6b
--- /dev/null
+++ b/packages/interactivity-router/package.json
@@ -0,0 +1,34 @@
+{
+	"name": "@wordpress/interactivity-router",
+	"version": "0.1.0",
+	"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
+	"author": "The WordPress Contributors",
+	"license": "GPL-2.0-or-later",
+	"keywords": [
+		"wordpress",
+		"gutenberg",
+		"interactivity"
+	],
+	"homepage": "https://github.com/WordPress/gutenberg/tree/HEAD/packages/interactivity-router/README.md",
+	"repository": {
+		"type": "git",
+		"url": "https://github.com/WordPress/gutenberg.git",
+		"directory": "packages/interactivity-router"
+	},
+	"bugs": {
+		"url": "https://github.com/WordPress/gutenberg/labels/%5BFeature%5D%20Interactivity%20API"
+	},
+	"engines": {
+		"node": ">=12"
+	},
+	"main": "build/index.js",
+	"module": "build-module/index.js",
+	"react-native": "src/index",
+	"types": "build-types",
+	"dependencies": {
+		"@wordpress/interactivity": "file:../interactivity"
+	},
+	"publishConfig": {
+		"access": "public"
+	}
+}
diff --git a/packages/interactivity-router/src/index.js b/packages/interactivity-router/src/index.js
new file mode 100644
index 0000000000000..22637a4602d47
--- /dev/null
+++ b/packages/interactivity-router/src/index.js
@@ -0,0 +1,160 @@
+/**
+ * WordPress dependencies
+ */
+import {
+	render,
+	directivePrefix,
+	toVdom,
+	getRegionRootFragment,
+	store,
+} from '@wordpress/interactivity';
+
+// The cache of visited and prefetched pages.
+const pages = new Map();
+
+// Helper to remove domain and hash from the URL. We are only interesting in
+// caching the path and the query.
+const cleanUrl = ( url ) => {
+	const u = new URL( url, window.location );
+	return u.pathname + u.search;
+};
+
+// Fetch a new page and convert it to a static virtual DOM.
+const fetchPage = async ( url, { html } ) => {
+	try {
+		if ( ! html ) {
+			const res = await window.fetch( url );
+			if ( res.status !== 200 ) return false;
+			html = await res.text();
+		}
+		const dom = new window.DOMParser().parseFromString( html, 'text/html' );
+		return regionsToVdom( dom );
+	} catch ( e ) {
+		return false;
+	}
+};
+
+// Return an object with VDOM trees of those HTML regions marked with a
+// `navigation-id` directive.
+const regionsToVdom = ( dom ) => {
+	const regions = {};
+	const attrName = `data-${ directivePrefix }-navigation-id`;
+	dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
+		const id = region.getAttribute( attrName );
+		regions[ id ] = toVdom( region );
+	} );
+	const title = dom.querySelector( 'title' )?.innerText;
+	return { regions, title };
+};
+
+// Render all interactive regions contained in the given page.
+const renderRegions = ( page ) => {
+	const attrName = `data-${ directivePrefix }-navigation-id`;
+	document.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
+		const id = region.getAttribute( attrName );
+		const fragment = getRegionRootFragment( region );
+		render( page.regions[ id ], fragment );
+	} );
+	if ( page.title ) {
+		document.title = page.title;
+	}
+};
+
+// Variable to store the current navigation.
+let navigatingTo = '';
+
+// Listen to the back and forward buttons and restore the page if it's in the
+// cache.
+window.addEventListener( 'popstate', async () => {
+	const url = cleanUrl( window.location ); // Remove hash.
+	const page = pages.has( url ) && ( await pages.get( url ) );
+	if ( page ) {
+		renderRegions( page );
+	} else {
+		window.location.reload();
+	}
+} );
+
+// Cache the current regions.
+pages.set(
+	cleanUrl( window.location ),
+	Promise.resolve( regionsToVdom( document ) )
+);
+
+export const { state, actions } = store( 'core/router', {
+	actions: {
+		/**
+		 * Navigates to the specified page.
+		 *
+		 * This function normalizes the passed href, fetchs the page HTML if
+		 * needed, and updates any interactive regions whose contents have
+		 * changed. It also creates a new entry in the browser session history.
+		 *
+		 * @param {string}  href              The page href.
+		 * @param {Object}  [options]         Options object.
+		 * @param {boolean} [options.force]   If true, it forces re-fetching the
+		 *                                    URL.
+		 * @param {string}  [options.html]    HTML string to be used instead of
+		 *                                    fetching the requested URL.
+		 * @param {boolean} [options.replace] If true, it replaces the current
+		 *                                    entry in the browser session
+		 *                                    history.
+		 * @param {number}  [options.timeout] Time until the navigation is
+		 *                                    aborted, in milliseconds. Default
+		 *                                    is 10000.
+		 *
+		 * @return {Promise} Promise that resolves once the navigation is
+		 *                   completed or aborted.
+		 */
+		*navigate( href, options = {} ) {
+			const url = cleanUrl( href );
+			navigatingTo = href;
+			actions.prefetch( url, options );
+
+			// Create a promise that resolves when the specified timeout ends.
+			// The timeout value is 10 seconds by default.
+			const timeoutPromise = new Promise( ( resolve ) =>
+				setTimeout( resolve, options.timeout ?? 10000 )
+			);
+
+			const page = yield Promise.race( [
+				pages.get( url ),
+				timeoutPromise,
+			] );
+
+			// Once the page is fetched, the destination URL could have changed
+			// (e.g., by clicking another link in the meantime). If so, bail
+			// out, and let the newer execution to update the HTML.
+			if ( navigatingTo !== href ) return;
+
+			if ( page ) {
+				renderRegions( page );
+				window.history[
+					options.replace ? 'replaceState' : 'pushState'
+				]( {}, '', href );
+			} else {
+				window.location.assign( href );
+				yield new Promise( () => {} );
+			}
+		},
+
+		/**
+		 * Prefetchs the page with the passed URL.
+		 *
+		 * The function normalizes the URL and stores internally the fetch
+		 * promise, to avoid triggering a second fetch for an ongoing request.
+		 *
+		 * @param {string}  url             The page URL.
+		 * @param {Object}  [options]       Options object.
+		 * @param {boolean} [options.force] Force fetching the URL again.
+		 * @param {string}  [options.html]  HTML string to be used instead of
+		 *                                  fetching the requested URL.
+		 */
+		prefetch( url, options = {} ) {
+			url = cleanUrl( url );
+			if ( options.force || ! pages.has( url ) ) {
+				pages.set( url, fetchPage( url, options ) );
+			}
+		},
+	},
+} );
diff --git a/packages/interactivity-router/tsconfig.json b/packages/interactivity-router/tsconfig.json
new file mode 100644
index 0000000000000..9008be9879c07
--- /dev/null
+++ b/packages/interactivity-router/tsconfig.json
@@ -0,0 +1,11 @@
+{
+	"extends": "../../tsconfig.base.json",
+	"compilerOptions": {
+		"rootDir": "src",
+		"declarationDir": "build-types",
+		"checkJs": false,
+		"strict": false
+	},
+	"references": [ { "path": "../interactivity" } ],
+	"include": [ "src/**/*" ]
+}
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 252b200f9d4d0..61f76482090f9 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -19,6 +19,7 @@
 -   Remove `data-wp-slot` and `data-wp-fill`. ([#57854](https://github.com/WordPress/gutenberg/pull/57854))
 -   Remove `wp-data-navigation-link` directive. ([#57853](https://github.com/WordPress/gutenberg/pull/57853))
 -   Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([#57974](https://github.com/WordPress/gutenberg/pull/57974))
+-   Convert `navigate` and `prefetch` function to actions of the new `core/router` store, available when importing the `@wordpress/interactivity-router` module. ([#57924](https://github.com/WordPress/gutenberg/pull/57924))
 
 ### Bug Fix
 
diff --git a/packages/interactivity/src/index.js b/packages/interactivity/src/index.js
index 0864291455310..5d9165dc9920e 100644
--- a/packages/interactivity/src/index.js
+++ b/packages/interactivity/src/index.js
@@ -2,11 +2,10 @@
  * Internal dependencies
  */
 import registerDirectives from './directives';
-import { init } from './router';
+import { init } from './init';
 
 export { store } from './store';
 export { directive, getContext, getElement, getNamespace } from './hooks';
-export { navigate, prefetch } from './router';
 export {
 	withScope,
 	useWatch,
@@ -16,8 +15,11 @@ export {
 	useCallback,
 	useMemo,
 } from './utils';
+export { directivePrefix } from './constants';
+export { toVdom } from './vdom';
+export { getRegionRootFragment } from './init';
 
-export { h as createElement, cloneElement } from 'preact';
+export { h as createElement, cloneElement, render } from 'preact';
 export { useContext, useState, useRef } from 'preact/hooks';
 export { deepSignal } from 'deepsignal';
 
diff --git a/packages/interactivity/src/init.js b/packages/interactivity/src/init.js
new file mode 100644
index 0000000000000..d749003b86f49
--- /dev/null
+++ b/packages/interactivity/src/init.js
@@ -0,0 +1,35 @@
+/**
+ * External dependencies
+ */
+import { hydrate } from 'preact';
+/**
+ * Internal dependencies
+ */
+import { toVdom, hydratedIslands } from './vdom';
+import { createRootFragment } from './utils';
+import { directivePrefix } from './constants';
+
+// Keep the same root fragment for each interactive region node.
+const regionRootFragments = new WeakMap();
+export const getRegionRootFragment = ( region ) => {
+	if ( ! regionRootFragments.has( region ) ) {
+		regionRootFragments.set(
+			region,
+			createRootFragment( region.parentElement, region )
+		);
+	}
+	return regionRootFragments.get( region );
+};
+
+// Initialize the router with the initial DOM.
+export const init = async () => {
+	document
+		.querySelectorAll( `[data-${ directivePrefix }-interactive]` )
+		.forEach( ( node ) => {
+			if ( ! hydratedIslands.has( node ) ) {
+				const fragment = getRegionRootFragment( node );
+				const vdom = toVdom( node );
+				hydrate( vdom, fragment );
+			}
+		} );
+};
diff --git a/packages/interactivity/src/router.js b/packages/interactivity/src/router.js
deleted file mode 100644
index 1082d43ff3a6a..0000000000000
--- a/packages/interactivity/src/router.js
+++ /dev/null
@@ -1,177 +0,0 @@
-/**
- * External dependencies
- */
-import { hydrate, render } from 'preact';
-/**
- * Internal dependencies
- */
-import { toVdom, hydratedIslands } from './vdom';
-import { createRootFragment } from './utils';
-import { directivePrefix } from './constants';
-
-// The cache of visited and prefetched pages.
-const pages = new Map();
-
-// Keep the same root fragment for each interactive region node.
-const regionRootFragments = new WeakMap();
-const getRegionRootFragment = ( region ) => {
-	if ( ! regionRootFragments.has( region ) ) {
-		regionRootFragments.set(
-			region,
-			createRootFragment( region.parentElement, region )
-		);
-	}
-	return regionRootFragments.get( region );
-};
-
-// Helper to remove domain and hash from the URL. We are only interesting in
-// caching the path and the query.
-const cleanUrl = ( url ) => {
-	const u = new URL( url, window.location );
-	return u.pathname + u.search;
-};
-
-// Fetch a new page and convert it to a static virtual DOM.
-const fetchPage = async ( url, { html } ) => {
-	try {
-		if ( ! html ) {
-			const res = await window.fetch( url );
-			if ( res.status !== 200 ) return false;
-			html = await res.text();
-		}
-		const dom = new window.DOMParser().parseFromString( html, 'text/html' );
-		return regionsToVdom( dom );
-	} catch ( e ) {
-		return false;
-	}
-};
-
-// Return an object with VDOM trees of those HTML regions marked with a
-// `navigation-id` directive.
-const regionsToVdom = ( dom ) => {
-	const regions = {};
-	const attrName = `data-${ directivePrefix }-navigation-id`;
-	dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
-		const id = region.getAttribute( attrName );
-		regions[ id ] = toVdom( region );
-	} );
-	const title = dom.querySelector( 'title' )?.innerText;
-	return { regions, title };
-};
-
-/**
- * Prefetchs the page with the passed URL.
- *
- * The function normalizes the URL and stores internally the fetch promise, to
- * avoid triggering a second fetch for an ongoing request.
- *
- * @param {string}  url             The page URL.
- * @param {Object}  [options]       Options object.
- * @param {boolean} [options.force] Force fetching the URL again.
- * @param {string}  [options.html]  HTML string to be used instead of fetching
- *                                  the requested URL.
- */
-export const prefetch = ( url, options = {} ) => {
-	url = cleanUrl( url );
-	if ( options.force || ! pages.has( url ) ) {
-		pages.set( url, fetchPage( url, options ) );
-	}
-};
-
-// Render all interactive regions contained in the given page.
-const renderRegions = ( page ) => {
-	const attrName = `data-${ directivePrefix }-navigation-id`;
-	document.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
-		const id = region.getAttribute( attrName );
-		const fragment = getRegionRootFragment( region );
-		render( page.regions[ id ], fragment );
-	} );
-	if ( page.title ) {
-		document.title = page.title;
-	}
-};
-
-// Variable to store the current navigation.
-let navigatingTo = '';
-
-/**
- * Navigates to the specified page.
- *
- * This function normalizes the passed href, fetchs the page HTML if needed, and
- * updates any interactive regions whose contents have changed. It also creates
- * a new entry in the browser session history.
- *
- * @param {string}  href              The page href.
- * @param {Object}  [options]         Options object.
- * @param {boolean} [options.force]   If true, it forces re-fetching the URL.
- * @param {string}  [options.html]    HTML string to be used instead of fetching
- *                                    the requested URL.
- * @param {boolean} [options.replace] If true, it replaces the current entry in
- *                                    the browser session history.
- * @param {number}  [options.timeout] Time until the navigation is aborted, in
- *                                    milliseconds. Default is 10000.
- *
- * @return {Promise} Promise that resolves once the navigation is completed or
- *                   aborted.
- */
-export const navigate = async ( href, options = {} ) => {
-	const url = cleanUrl( href );
-	navigatingTo = href;
-	prefetch( url, options );
-
-	// Create a promise that resolves when the specified timeout ends. The
-	// timeout value is 10 seconds by default.
-	const timeoutPromise = new Promise( ( resolve ) =>
-		setTimeout( resolve, options.timeout ?? 10000 )
-	);
-
-	const page = await Promise.race( [ pages.get( url ), timeoutPromise ] );
-
-	// Once the page is fetched, the destination URL could have changed (e.g.,
-	// by clicking another link in the meantime). If so, bail out, and let the
-	// newer execution to update the HTML.
-	if ( navigatingTo !== href ) return;
-
-	if ( page ) {
-		renderRegions( page );
-		window.history[ options.replace ? 'replaceState' : 'pushState' ](
-			{},
-			'',
-			href
-		);
-	} else {
-		window.location.assign( href );
-		await new Promise( () => {} );
-	}
-};
-
-// Listen to the back and forward buttons and restore the page if it's in the
-// cache.
-window.addEventListener( 'popstate', async () => {
-	const url = cleanUrl( window.location ); // Remove hash.
-	const page = pages.has( url ) && ( await pages.get( url ) );
-	if ( page ) {
-		renderRegions( page );
-	} else {
-		window.location.reload();
-	}
-} );
-
-// Initialize the router with the initial DOM.
-export const init = async () => {
-	document
-		.querySelectorAll( `[data-${ directivePrefix }-interactive]` )
-		.forEach( ( node ) => {
-			if ( ! hydratedIslands.has( node ) ) {
-				const fragment = getRegionRootFragment( node );
-				const vdom = toVdom( node );
-				hydrate( vdom, fragment );
-			}
-		} );
-
-	// Cache the current regions.
-	pages.set(
-		cleanUrl( window.location ),
-		Promise.resolve( regionsToVdom( document ) )
-	);
-};
diff --git a/tools/webpack/interactivity.js b/tools/webpack/interactivity.js
index 03bb1f576cb78..5dd9192c85566 100644
--- a/tools/webpack/interactivity.js
+++ b/tools/webpack/interactivity.js
@@ -3,6 +3,10 @@
  */
 const { join } = require( 'path' );
 const CopyWebpackPlugin = require( 'copy-webpack-plugin' );
+/**
+ * WordPress dependencies
+ */
+const DependencyExtractionWebpackPlugin = require( '@wordpress/dependency-extraction-webpack-plugin' );
 
 /**
  * Internal dependencies
@@ -14,6 +18,7 @@ module.exports = {
 	name: 'interactivity',
 	entry: {
 		index: `./packages/interactivity/src/index.js`,
+		router: `./packages/interactivity-router/src/index.js`,
 		navigation: './packages/block-library/src/navigation/view.js',
 		query: './packages/block-library/src/query/view.js',
 		image: './packages/block-library/src/image/view.js',
@@ -31,10 +36,8 @@ module.exports = {
 		},
 		path: join( __dirname, '..', '..' ),
 		environment: { module: true },
-	},
-	externalsType: 'module',
-	externals: {
-		'@wordpress/interactivity': '@wordpress/interactivity',
+		module: true,
+		chunkFormat: 'module',
 	},
 	resolve: {
 		extensions: [ '.js', '.ts', '.tsx' ],
@@ -79,6 +82,7 @@ module.exports = {
 				},
 			],
 		} ),
+		new DependencyExtractionWebpackPlugin(),
 	],
 	watchOptions: {
 		ignored: [ '**/node_modules' ],
diff --git a/tsconfig.json b/tsconfig.json
index d05e883ed70b0..584ac01cb60c7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -28,6 +28,7 @@
 		{ "path": "packages/i18n" },
 		{ "path": "packages/icons" },
 		{ "path": "packages/interactivity" },
+		{ "path": "packages/interactivity-router" },
 		{ "path": "packages/is-shallow-equal" },
 		{ "path": "packages/keycodes" },
 		{ "path": "packages/lazy-import" },

From 0c216f100379f222419543cfebf1fc197333848d Mon Sep 17 00:00:00 2001
From: Mario Santos <34552881+SantosGuillamot@users.noreply.github.com>
Date: Wed, 24 Jan 2024 21:02:34 +0100
Subject: [PATCH 284/296] Block Bindings: Fix button popover not showing in
 patterns (#58219)

* Use `lockUrlControls` variable in button

* Add `linkTarget` to JS allowed blocks object
---
 packages/block-editor/src/hooks/use-bindings-attributes.js | 2 +-
 packages/block-library/src/button/edit.js                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/block-editor/src/hooks/use-bindings-attributes.js b/packages/block-editor/src/hooks/use-bindings-attributes.js
index 6f669f1a321c2..94aac654097e5 100644
--- a/packages/block-editor/src/hooks/use-bindings-attributes.js
+++ b/packages/block-editor/src/hooks/use-bindings-attributes.js
@@ -26,7 +26,7 @@ const BLOCK_BINDINGS_ALLOWED_BLOCKS = {
 	'core/paragraph': [ 'content' ],
 	'core/heading': [ 'content' ],
 	'core/image': [ 'url', 'title', 'alt' ],
-	'core/button': [ 'url', 'text' ],
+	'core/button': [ 'url', 'text', 'linkTarget' ],
 };
 
 const createEditFunctionWithBindingsAttribute = () =>
diff --git a/packages/block-library/src/button/edit.js b/packages/block-library/src/button/edit.js
index f6e465786ef69..7dffdfb5c1b66 100644
--- a/packages/block-library/src/button/edit.js
+++ b/packages/block-library/src/button/edit.js
@@ -336,7 +336,7 @@ function ButtonEdit( props ) {
 			{ isLinkTag &&
 				isSelected &&
 				( isEditingURL || isURLSet ) &&
-				! metadata?.bindings?.url && (
+				! lockUrlControls && (
 					<Popover
 						placement="bottom"
 						onClose={ () => {

From a11d04fb3b449952d6229a5fb4c4872b0af9d5f4 Mon Sep 17 00:00:00 2001
From: Tom Cafferkey <tjcafferkey@gmail.com>
Date: Wed, 24 Jan 2024 20:05:33 +0000
Subject: [PATCH 285/296] Update Navigation block to render hooked inner blocks
 (#57754)

---
 .../block-library/src/navigation/index.php    | 142 +++++++++++++++++-
 1 file changed, 139 insertions(+), 3 deletions(-)

diff --git a/packages/block-library/src/navigation/index.php b/packages/block-library/src/navigation/index.php
index 8b39a89022f8b..0f67a63e7acf2 100644
--- a/packages/block-library/src/navigation/index.php
+++ b/packages/block-library/src/navigation/index.php
@@ -190,11 +190,19 @@ private static function get_inner_blocks_from_navigation_post( $attributes ) {
 
 			// 'parse_blocks' includes a null block with '\n\n' as the content when
 			// it encounters whitespace. This code strips it.
-			$compacted_blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
+			$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
+
+			if ( function_exists( 'get_hooked_blocks' ) ) {
+				// Run Block Hooks algorithm to inject hooked blocks.
+				$markup         = block_core_navigation_insert_hooked_blocks( $blocks, $navigation_post );
+				$root_nav_block = parse_blocks( $markup )[0];
+
+				$blocks = isset( $root_nav_block['innerBlocks'] ) ? $root_nav_block['innerBlocks'] : $blocks;
+			}
 
 			// TODO - this uses the full navigation block attributes for the
 			// context which could be refined.
-			return new WP_Block_List( $compacted_blocks, $attributes );
+			return new WP_Block_List( $blocks, $attributes );
 		}
 	}
 
@@ -983,6 +991,17 @@ function block_core_navigation_get_fallback_blocks() {
 		// Normalizing blocks may result in an empty array of blocks if they were all `null` blocks.
 		// In this case default to the (Page List) fallback.
 		$fallback_blocks = ! empty( $maybe_fallback ) ? $maybe_fallback : $fallback_blocks;
+
+		if ( function_exists( 'get_hooked_blocks' ) ) {
+			// Run Block Hooks algorithm to inject hooked blocks.
+			// We have to run it here because we need the post ID of the Navigation block to track ignored hooked blocks.
+			$markup = block_core_navigation_insert_hooked_blocks( $fallback_blocks, $navigation_post );
+			$blocks = parse_blocks( $markup );
+
+			if ( isset( $blocks[0]['innerBlocks'] ) ) {
+				$fallback_blocks = $blocks[0]['innerBlocks'];
+			}
+		}
 	}
 
 	/**
@@ -994,7 +1013,7 @@ function block_core_navigation_get_fallback_blocks() {
 	 *
 	 * @since 5.9.0
 	 *
-	 * @param array[] default fallback blocks provided by the default block mechanic.
+	 * @param array[] $fallback_blocks default fallback blocks provided by the default block mechanic.
 	 */
 	return apply_filters( 'block_core_navigation_render_fallback', $fallback_blocks );
 }
@@ -1323,3 +1342,120 @@ function block_core_navigation_get_most_recently_published_navigation() {
 
 	return null;
 }
+
+/**
+ * Insert hooked blocks into a Navigation block.
+ *
+ * Given a Navigation block's inner blocks and its corresponding `wp_navigation` post object,
+ * this function inserts hooked blocks into it, and returns the serialized inner blocks in a
+ * mock Navigation block wrapper.
+ *
+ * If there are any hooked blocks that need to be inserted as the Navigation block's first or last
+ * children, the `wp_navigation` post's `_wp_ignored_hooked_blocks` meta is checked to see if any
+ * of those hooked blocks should be exempted from insertion.
+ *
+ * @param array   $inner_blocks Parsed inner blocks of a Navigation block.
+ * @param WP_Post $post         `wp_navigation` post object corresponding to the block.
+ * @return string Serialized inner blocks in mock Navigation block wrapper, with hooked blocks inserted, if any.
+ */
+function block_core_navigation_insert_hooked_blocks( $inner_blocks, $post = null ) {
+	$before_block_visitor = null;
+	$after_block_visitor  = null;
+	$hooked_blocks        = get_hooked_blocks();
+	$attributes           = array();
+
+	if ( isset( $post->ID ) ) {
+		$ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
+		if ( ! empty( $ignored_hooked_blocks ) ) {
+			$ignored_hooked_blocks  = json_decode( $ignored_hooked_blocks, true );
+			$attributes['metadata'] = array(
+				'ignoredHookedBlocks' => $ignored_hooked_blocks,
+			);
+		}
+	}
+
+	$mock_anchor_parent_block = array(
+		'blockName'    => 'core/navigation',
+		'attrs'        => $attributes,
+		'innerBlocks'  => $inner_blocks,
+		'innerContent' => array_fill( 0, count( $inner_blocks ), null ),
+	);
+	$before_block_visitor     = null;
+	$after_block_visitor      = null;
+
+	if ( ! empty( $hooked_blocks ) || has_filter( 'hooked_block_types' ) ) {
+		$before_block_visitor = make_before_block_visitor( $hooked_blocks, $post );
+		$after_block_visitor  = make_after_block_visitor( $hooked_blocks, $post );
+	}
+
+	return traverse_and_serialize_block( $mock_anchor_parent_block, $before_block_visitor, $after_block_visitor );
+}
+
+/**
+ * Updates the post meta with the list of ignored hooked blocks when the navigation is created or updated via the REST API.
+ *
+ * @param WP_Post $post Post object.
+ */
+function block_core_navigation_update_ignore_hooked_blocks_meta( $post ) {
+	if ( ! isset( $post->ID ) ) {
+		return;
+	}
+
+	// We run the Block Hooks mechanism so it will return the list of ignored hooked blocks
+	// in the mock root Navigation block's metadata attribute.
+	// We ignore the rest of the returned `$markup`; `$post->post_content` already has the hooked
+	// blocks inserted, whereas `$markup` will have them inserted twice.
+	$blocks                = parse_blocks( $post->post_content );
+	$markup                = block_core_navigation_insert_hooked_blocks( $blocks, $post );
+	$root_nav_block        = parse_blocks( $markup )[0];
+	$ignored_hooked_blocks = isset( $root_nav_block['attrs']['metadata']['ignoredHookedBlocks'] )
+		? $root_nav_block['attrs']['metadata']['ignoredHookedBlocks']
+		: array();
+
+	if ( ! empty( $ignored_hooked_blocks ) ) {
+		$existing_ignored_hooked_blocks = get_post_meta( $post->ID, '_wp_ignored_hooked_blocks', true );
+		if ( ! empty( $existing_ignored_hooked_blocks ) ) {
+			$existing_ignored_hooked_blocks = json_decode( $existing_ignored_hooked_blocks, true );
+			$ignored_hooked_blocks          = array_unique( array_merge( $ignored_hooked_blocks, $existing_ignored_hooked_blocks ) );
+		}
+		update_post_meta( $post->ID, '_wp_ignored_hooked_blocks', json_encode( $ignored_hooked_blocks ) );
+	}
+}
+
+// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.4
+// that are not present in Gutenberg's WP 6.4 compatibility layer.
+if ( function_exists( 'get_hooked_blocks' ) ) {
+	add_action( 'rest_insert_wp_navigation', 'block_core_navigation_update_ignore_hooked_blocks_meta', 10, 3 );
+}
+
+/**
+ * Hooks into the REST API response for the core/navigation block and adds the first and last inner blocks.
+ *
+ * @param WP_REST_Response $response The response object.
+ * @param WP_Post          $post     Post object.
+ * @param WP_REST_Request  $request  Request object.
+ * @return WP_REST_Response The response object.
+ */
+function block_core_navigation_insert_hooked_blocks_into_rest_response( $response, $post ) {
+	if ( ! isset( $response->data['content']['raw'] ) || ! isset( $response->data['content']['rendered'] ) ) {
+		return $response;
+	}
+	$parsed_blocks = parse_blocks( $response->data['content']['raw'] );
+	$content       = block_core_navigation_insert_hooked_blocks( $parsed_blocks, $post );
+
+	// Remove mock Navigation block wrapper.
+	$start   = strpos( $content, '-->' ) + strlen( '-->' );
+	$end     = strrpos( $content, '<!--' );
+	$content = substr( $content, $start, $end - $start );
+
+	$response->data['content']['raw']      = $content;
+	$response->data['content']['rendered'] = apply_filters( 'the_content', $content );
+
+	return $response;
+}
+
+// Injection of hooked blocks into the Navigation block relies on some functions present in WP >= 6.4
+// that are not present in Gutenberg's WP 6.4 compatibility layer.
+if ( function_exists( 'get_hooked_blocks' ) ) {
+	add_filter( 'rest_prepare_wp_navigation', 'block_core_navigation_insert_hooked_blocks_into_rest_response', 10, 3 );
+}

From 28e2bfe5851ea4f4bb9d3ad882a1846524fd7787 Mon Sep 17 00:00:00 2001
From: David Arenas <david.arenas@automattic.com>
Date: Wed, 24 Jan 2024 22:05:29 +0100
Subject: [PATCH 286/296] Interactivity Router: Replace `data-wp-navigation-id`
 with `data-wp-router-region` (#58191)

* Replace all `navigation-id` with `router-region`

* Use `queryRef` to store a reference of the query block
---
 packages/block-library/src/query/index.php    |  3 ++-
 packages/block-library/src/query/view.js      | 20 ++++++++++---------
 .../directive-context/render.php              |  2 +-
 .../directive-context/view.js                 |  2 +-
 .../directive-each/render.php                 |  2 +-
 .../interactive-blocks/directive-each/view.js |  2 +-
 .../directive-key/render.php                  |  2 +-
 .../interactive-blocks/directive-key/view.js  |  2 +-
 .../directive-run/render.php                  |  2 +-
 .../interactive-blocks/directive-run/view.js  |  2 +-
 .../router-navigate/render.php                |  2 +-
 .../router-regions/render.php                 |  6 +++---
 packages/interactivity-router/src/index.js    |  6 +++---
 phpunit/blocks/render-query-test.php          | 12 +++++------
 14 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/packages/block-library/src/query/index.php b/packages/block-library/src/query/index.php
index 0239fadc6bf0a..5d509607a7dc8 100644
--- a/packages/block-library/src/query/index.php
+++ b/packages/block-library/src/query/index.php
@@ -28,7 +28,8 @@ function render_block_core_query( $attributes, $content, $block ) {
 		if ( $p->next_tag() ) {
 			// Add the necessary directives.
 			$p->set_attribute( 'data-wp-interactive', '{"namespace":"core/query"}' );
-			$p->set_attribute( 'data-wp-navigation-id', 'query-' . $attributes['queryId'] );
+			$p->set_attribute( 'data-wp-router-region', 'query-' . $attributes['queryId'] );
+			$p->set_attribute( 'data-wp-init', 'callbacks.setQueryRef' );
 			// Use context to send translated strings.
 			$p->set_attribute(
 				'data-wp-context',
diff --git a/packages/block-library/src/query/view.js b/packages/block-library/src/query/view.js
index 89eb8198d1805..85cd16d9e1422 100644
--- a/packages/block-library/src/query/view.js
+++ b/packages/block-library/src/query/view.js
@@ -31,15 +31,12 @@ store( 'core/query', {
 		*navigate( event ) {
 			const ctx = getContext();
 			const { ref } = getElement();
-			const isDisabled = ref.closest( '[data-wp-navigation-id]' )?.dataset
-				.wpNavigationDisabled;
+			const { queryRef } = ctx;
+			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
 
 			if ( isValidLink( ref ) && isValidEvent( event ) && ! isDisabled ) {
 				event.preventDefault();
 
-				const id = ref.closest( '[data-wp-navigation-id]' ).dataset
-					.wpNavigationId;
-
 				// Don't announce the navigation immediately, wait 400 ms.
 				const timeout = setTimeout( () => {
 					ctx.message = ctx.loadingText;
@@ -65,14 +62,14 @@ store( 'core/query', {
 				ctx.url = ref.href;
 
 				// Focus the first anchor of the Query block.
-				const firstAnchor = `[data-wp-navigation-id=${ id }] .wp-block-post-template a[href]`;
-				document.querySelector( firstAnchor )?.focus();
+				const firstAnchor = `.wp-block-post-template a[href]`;
+				queryRef.querySelector( firstAnchor )?.focus();
 			}
 		},
 		*prefetch() {
+			const { queryRef } = getContext();
 			const { ref } = getElement();
-			const isDisabled = ref.closest( '[data-wp-navigation-id]' )?.dataset
-				.wpNavigationDisabled;
+			const isDisabled = queryRef?.dataset.wpNavigationDisabled;
 			if ( isValidLink( ref ) && ! isDisabled ) {
 				const { actions } = yield import(
 					'@wordpress/interactivity-router'
@@ -92,5 +89,10 @@ store( 'core/query', {
 				yield actions.prefetch( ref.href );
 			}
 		},
+		setQueryRef() {
+			const ctx = getContext();
+			const { ref } = getElement();
+			ctx.queryRef = ref;
+		},
 	},
 } );
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
index b60be101a42d1..c0b01bfea95fc 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/render.php
@@ -124,7 +124,7 @@
 
 <div
 	data-wp-interactive='{"namespace": "directive-context-navigate"}'
-	data-wp-navigation-id="navigation"
+	data-wp-router-region="navigation"
 	data-wp-context='{ "text": "first page" }'
 >
 	<div data-testid="navigation text" data-wp-text="context.text"></div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
index 83683a00aff12..7238185bac3aa 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-context/view.js
@@ -28,7 +28,7 @@ store( 'directive-context', {
 const html = `
 		<div
 			data-wp-interactive='{ "namespace": "directive-context-navigate" }'
-			data-wp-navigation-id="navigation"
+			data-wp-router-region="navigation"
 			data-wp-context='{ "text": "second page" }'
 		>
 			<div data-testid="navigation text" data-wp-text="context.text"></div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
index 1a48611d51ea5..3d018bca46d06 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/render.php
@@ -209,7 +209,7 @@
 
 <div
 	data-wp-interactive='{ "namespace": "directive-each" }'
-	data-wp-navigation-id="navigation-updated list"
+	data-wp-router-region="navigation-updated list"
 	data-wp-context='{ "list": [ "beta", "gamma", "delta" ] }'
 	data-testid="navigation-updated list"
 >
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
index b38f531caee96..20e8fcec4b0d9 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-each/view.js
@@ -158,7 +158,7 @@ store( 'directive-each', {
 const html = `
 <div
 	data-wp-interactive='{ "namespace": "directive-each" }'
-	data-wp-navigation-id="navigation-updated list"
+	data-wp-router-region="navigation-updated list"
 	data-wp-context='{ "list": [ "alpha", "beta", "gamma", "delta" ] }'
 	data-testid="navigation-updated list"
 >
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
index d28002c137792..422d6ac5eadaa 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/render.php
@@ -10,7 +10,7 @@
 
 <div
 	data-wp-interactive='{ "namespace": "directive-key" }'
-	data-wp-navigation-id="some-id"
+	data-wp-router-region="some-id"
 >
 	<ul>
 		<li data-wp-key="id-2" data-testid="first-item">2</li>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
index ed51a4bd2e76e..40fc83621d812 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-key/view.js
@@ -6,7 +6,7 @@ import { store } from '@wordpress/interactivity';
 const html = `
 		<div
 			data-wp-interactive='{ "namespace": "directive-key" }'
-			data-wp-navigation-id="some-id"
+			data-wp-router-region="some-id"
 		>
 			<ul>
 				<li data-wp-key="id-1">1</li>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
index 237a3634b7452..eeb63e64eb0d5 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/render.php
@@ -10,7 +10,7 @@
 
 <div
 	data-wp-interactive='{ "namespace": "directive-run" }'
-	data-wp-navigation-id='test-directive-run'
+	data-wp-router-region='test-directive-run'
 >
 	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
 	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
index f98701c1afe51..5151fb4c6db10 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
+++ b/packages/e2e-tests/plugins/interactive-blocks/directive-run/view.js
@@ -27,7 +27,7 @@ directive(
 const html = `
 <div
 	data-wp-interactive='{ "namespace": "directive-run" }'
-	data-wp-navigation-id='test-directive-run'
+	data-wp-router-region='test-directive-run'
 >
 	<div data-testid="hydrated" data-wp-text="state.isHydrated"></div>
 	<div data-testid="mounted" data-wp-text="state.isMounted"></div>
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
index 560958e8a0d6b..b3b967164e99a 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-navigate/render.php
@@ -12,7 +12,7 @@
 
 <div
 	data-wp-interactive='{ "namespace": "router" }'
-	data-wp-navigation-id="region-1"
+	data-wp-router-region="region-1"
 >
 	<h2 data-testid="title"><?php echo $attributes['title']; ?></h2>
 
diff --git a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
index ebffbab0636c6..1389eb6dade52 100644
--- a/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
+++ b/packages/e2e-tests/plugins/interactive-blocks/router-regions/render.php
@@ -14,7 +14,7 @@
 	<h2>Region 1</h2>
 	<div
 		data-wp-interactive='{"namespace": "router-regions"}'
-		data-wp-navigation-id="region-1"
+		data-wp-router-region="region-1"
 	>
 		<p
 			data-testid="region-1-text"
@@ -58,7 +58,7 @@
 	<h2>Region 2</h2>
 	<div
 		data-wp-interactive='{"namespace": "router-regions"}'
-		data-wp-navigation-id="region-2"
+		data-wp-router-region="region-2"
 	>
 		<p
 			data-testid="region-2-text"
@@ -88,7 +88,7 @@
 				<h2>Nested region</h2>
 				<div
 					data-wp-interactive='{"namespace": "router-regions"}'
-					data-wp-navigation-id="nested-region"
+					data-wp-router-region="nested-region"
 				>
 					<p
 						data-testid="nested-region-ssr"
diff --git a/packages/interactivity-router/src/index.js b/packages/interactivity-router/src/index.js
index 22637a4602d47..7396c21e9638d 100644
--- a/packages/interactivity-router/src/index.js
+++ b/packages/interactivity-router/src/index.js
@@ -35,10 +35,10 @@ const fetchPage = async ( url, { html } ) => {
 };
 
 // Return an object with VDOM trees of those HTML regions marked with a
-// `navigation-id` directive.
+// `router-region` directive.
 const regionsToVdom = ( dom ) => {
 	const regions = {};
-	const attrName = `data-${ directivePrefix }-navigation-id`;
+	const attrName = `data-${ directivePrefix }-router-region`;
 	dom.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
 		const id = region.getAttribute( attrName );
 		regions[ id ] = toVdom( region );
@@ -49,7 +49,7 @@ const regionsToVdom = ( dom ) => {
 
 // Render all interactive regions contained in the given page.
 const renderRegions = ( page ) => {
-	const attrName = `data-${ directivePrefix }-navigation-id`;
+	const attrName = `data-${ directivePrefix }-router-region`;
 	document.querySelectorAll( `[${ attrName }]` ).forEach( ( region ) => {
 		const id = region.getAttribute( attrName );
 		const fragment = getRegionRootFragment( region );
diff --git a/phpunit/blocks/render-query-test.php b/phpunit/blocks/render-query-test.php
index 796c4ae098867..76dbf537e7868 100644
--- a/phpunit/blocks/render-query-test.php
+++ b/phpunit/blocks/render-query-test.php
@@ -69,7 +69,7 @@ public function test_rendering_query_with_enhanced_pagination() {
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
 		$this->assertSame( '{"loadingText":"Loading page, please wait.","loadedText":"Page Loaded."}', $p->get_attribute( 'data-wp-context' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( '{"namespace":"core/query"}', $p->get_attribute( 'data-wp-interactive' ) );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-post' ) );
@@ -127,7 +127,7 @@ public function test_rendering_query_with_enhanced_pagination_auto_disabled_when
 		$p = new WP_HTML_Tag_Processor( $output );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
 	}
 
@@ -205,7 +205,7 @@ public function test_rendering_query_with_enhanced_pagination_auto_disabled_when
 		$p = new WP_HTML_Tag_Processor( $output );
 
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
 	}
 
@@ -254,17 +254,17 @@ public function test_rendering_nested_queries_with_enhanced_pagination_auto_disa
 
 		// Query 0 contains a plugin block inside query-2 -> disabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-0', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
 
 		// Query 1 does not contain a plugin block -> enabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-1', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-1', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( null, $p->get_attribute( 'data-wp-navigation-disabled' ) );
 
 		// Query 2 contains a plugin block -> disabled.
 		$p->next_tag( array( 'class_name' => 'wp-block-query' ) );
-		$this->assertSame( 'query-2', $p->get_attribute( 'data-wp-navigation-id' ) );
+		$this->assertSame( 'query-2', $p->get_attribute( 'data-wp-router-region' ) );
 		$this->assertSame( 'true', $p->get_attribute( 'data-wp-navigation-disabled' ) );
 	}
 }

From e12c4596c8378d9cac1852414bdc1f32d09f0182 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 21:26:29 +0000
Subject: [PATCH 287/296] Bump plugin version to 17.6.0-rc.1

---
 gutenberg.php     | 2 +-
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gutenberg.php b/gutenberg.php
index 9bf5292d1036b..d78f218fe7fea 100644
--- a/gutenberg.php
+++ b/gutenberg.php
@@ -5,7 +5,7 @@
  * Description: Printing since 1440. This is the development plugin for the block editor, site editor, and other future WordPress core functionality.
  * Requires at least: 6.3
  * Requires PHP: 7.0
- * Version: 17.5.2
+ * Version: 17.6.0-rc.1
  * Author: Gutenberg Team
  * Text Domain: gutenberg
  *
diff --git a/package-lock.json b/package-lock.json
index ff07e701533b8..0ce833bb35e5e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.2",
+	"version": "17.6.0-rc.1",
 	"lockfileVersion": 2,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "gutenberg",
-			"version": "17.5.2",
+			"version": "17.6.0-rc.1",
 			"hasInstallScript": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
diff --git a/package.json b/package.json
index c5f0974b11947..e47b3580c2a41 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "gutenberg",
-	"version": "17.5.2",
+	"version": "17.6.0-rc.1",
 	"private": true,
 	"description": "A new WordPress editor experience.",
 	"author": "The WordPress Contributors",

From 9c7e4b07c8a414a1ec2e5380e61207cebe41a528 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 21:42:10 +0000
Subject: [PATCH 288/296] Update Changelog for 17.6.0-rc.1

---
 changelog.txt | 411 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 411 insertions(+)

diff --git a/changelog.txt b/changelog.txt
index 48396a9eec777..85fa8cc791aec 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,416 @@
 == Changelog ==
 
+= 17.6.0-rc.1 =
+
+
+## Changelog
+
+### Features
+
+#### Interactivity API
+- Add `wp-data-on-window` and `wp-data-on-document` directives. ([57931](https://github.com/WordPress/gutenberg/pull/57931))
+- Add `wp-each` directive. ([57859](https://github.com/WordPress/gutenberg/pull/57859))
+- Add `wp-run` directive and `useInit` & `useWatch` hooks. ([57805](https://github.com/WordPress/gutenberg/pull/57805))
+
+#### Typography
+- Add defaultFontSizes option to theme.json. ([56661](https://github.com/WordPress/gutenberg/pull/56661))
+- Font Library: Add wp_get_font_dir() function. ([57730](https://github.com/WordPress/gutenberg/pull/57730))
+
+#### Custom Fields
+- Block Bindings: Disable editing of bound block attributes in editor UI. ([58085](https://github.com/WordPress/gutenberg/pull/58085))
+
+#### Block Editor
+- Add effects/box shadow tools to block inspector. ([57654](https://github.com/WordPress/gutenberg/pull/57654))
+
+
+### Enhancements
+
+- Add gettext content when translating 'Header'. ([51066](https://github.com/WordPress/gutenberg/pull/51066))
+- Disable lock button if user cannot control lock state. ([57274](https://github.com/WordPress/gutenberg/pull/57274))
+- Editor: Unify the Editor Mode preference. ([57642](https://github.com/WordPress/gutenberg/pull/57642))
+- Element: Start reexporting PureComponent. ([58076](https://github.com/WordPress/gutenberg/pull/58076))
+- Live Preview: Show the current theme name on the theme activation modal. ([57588](https://github.com/WordPress/gutenberg/pull/57588))
+- Remove right negative margin from pinned items. ([57666](https://github.com/WordPress/gutenberg/pull/57666))
+- Unify the preferences modal UI between post and site editor. ([57639](https://github.com/WordPress/gutenberg/pull/57639))
+- Update style revision top toolbar text. ([58057](https://github.com/WordPress/gutenberg/pull/58057))
+- Use ClipboardJS latest version and clean up focus loss workaround. ([57156](https://github.com/WordPress/gutenberg/pull/57156))
+
+#### Components
+-  Add opt-in prop for 40px default size for `BoxControl`, `BorderControl`, and `BorderBoxControl`. ([56185](https://github.com/WordPress/gutenberg/pull/56185))
+- BorderControl: Replace style picker with ToggleGroupControl. ([57562](https://github.com/WordPress/gutenberg/pull/57562))
+- ColorPicker: Store internal HSLA state for better slider UX. ([57555](https://github.com/WordPress/gutenberg/pull/57555))
+- Migrate PaletteEdit and CircularOptionPicker tests from user-event to ariakit/test. ([57809](https://github.com/WordPress/gutenberg/pull/57809))
+- Replace `TabPanel` with `Tabs` in the Editor Preferences Modal. ([57293](https://github.com/WordPress/gutenberg/pull/57293))
+- Theme: Set `color` on wrapper. ([58095](https://github.com/WordPress/gutenberg/pull/58095))
+- Tooltip: No-op when nested inside another Tooltip component. ([57202](https://github.com/WordPress/gutenberg/pull/57202))
+- `BoxControl`: Update design. ([56665](https://github.com/WordPress/gutenberg/pull/56665))
+
+#### Interactivity API
+-  Render the root interactive blocks. ([57729](https://github.com/WordPress/gutenberg/pull/57729))
+- Interactivity Router: Replace `data-wp-navigation-id` with `data-wp-router-region`. ([58191](https://github.com/WordPress/gutenberg/pull/58191))
+- Interactivity: Export `withScope()` and allow to use it with asynchronous operations. ([58013](https://github.com/WordPress/gutenberg/pull/58013))
+- Prevent the use of components in `wp-text`. ([57879](https://github.com/WordPress/gutenberg/pull/57879))
+- Remove wp-data-navigation-link directive. ([57853](https://github.com/WordPress/gutenberg/pull/57853))
+- Server Directive Processing Refactor. ([58066](https://github.com/WordPress/gutenberg/pull/58066))
+- Update `preact`, `@preact/signals` and `deepsignal` dependencies. ([57891](https://github.com/WordPress/gutenberg/pull/57891))
+
+#### Block Editor
+- Add copy link button to Link UI. ([58170](https://github.com/WordPress/gutenberg/pull/58170))
+- Improve LinkControl preview. ([57775](https://github.com/WordPress/gutenberg/pull/57775))
+- Keep Link UI open upon initial link creation when used in RichText. ([57726](https://github.com/WordPress/gutenberg/pull/57726))
+- List View: Displace list view items when dragging (a bit more WYSIWYG). ([56625](https://github.com/WordPress/gutenberg/pull/56625))
+- Show initial suggestions in rich text Link UI. ([57743](https://github.com/WordPress/gutenberg/pull/57743))
+
+#### Typography
+- Font Library Modal: Reset the selected font when installing a new font. ([57817](https://github.com/WordPress/gutenberg/pull/57817))
+- Font Library: Disable font library UI using a PHP filter. ([57818](https://github.com/WordPress/gutenberg/pull/57818))
+- Font Library: Filter fonts upload directory. ([57697](https://github.com/WordPress/gutenberg/pull/57697))
+- Font Library: Use data or src file to define font collection data. ([57734](https://github.com/WordPress/gutenberg/pull/57734))
+
+#### Block Library
+- Add more taxonomy options to the post navigation link. ([48912](https://github.com/WordPress/gutenberg/pull/48912))
+- Add: Footnotes support for other CPT's. ([57353](https://github.com/WordPress/gutenberg/pull/57353))
+- Better navigation link variations for post types / taxonomies. ([56100](https://github.com/WordPress/gutenberg/pull/56100))
+- Remove "blocks" from copy and delete labels. ([57769](https://github.com/WordPress/gutenberg/pull/57769))
+
+#### Data Views
+- DataViews: Enable grid layout for templates & parts by default. ([58137](https://github.com/WordPress/gutenberg/pull/58137))
+- DataViews: Make dataviews powered page patterns stable. ([58139](https://github.com/WordPress/gutenberg/pull/58139))
+- DataViews: Make the "Manage Pages" stable. ([58166](https://github.com/WordPress/gutenberg/pull/58166))
+
+#### Site Editor
+- Group templates in sidebar list. ([57711](https://github.com/WordPress/gutenberg/pull/57711))
+- Initial routing refactoring to separate preview from list view. ([57938](https://github.com/WordPress/gutenberg/pull/57938))
+- Iterate on warning text for block removal for query/post template/post content. ([58138](https://github.com/WordPress/gutenberg/pull/58138))
+
+#### Block API
+- Block Bindings: Update source registration syntax and remove APIs that should be private. ([58205](https://github.com/WordPress/gutenberg/pull/58205))
+- Block Hooks: Do not remove toggle if hooked block is present elsewhere. ([57928](https://github.com/WordPress/gutenberg/pull/57928))
+
+#### Synced Patterns
+- Add basic pattern overrides end-to-end tests. ([57792](https://github.com/WordPress/gutenberg/pull/57792))
+- Use a patch format and support `linkTarget` of `core/button` for Pattern Overrides. ([58165](https://github.com/WordPress/gutenberg/pull/58165))
+
+#### Patterns
+- Add image block support for pattern overrides. ([57909](https://github.com/WordPress/gutenberg/pull/57909))
+- Outline editable blocks that are within a content-locked container. ([57901](https://github.com/WordPress/gutenberg/pull/57901))
+
+#### Post Editor
+- Post Lock: Use the new modal size preset. ([58197](https://github.com/WordPress/gutenberg/pull/58197))
+
+#### Font Library
+- Update the default collection data URL to the wordpress.org cdn. ([58186](https://github.com/WordPress/gutenberg/pull/58186))
+
+#### Commands
+- Minor command tweaks. ([58148](https://github.com/WordPress/gutenberg/pull/58148))
+
+#### Extensibility
+- Update Navigation block to render hooked inner blocks. ([57754](https://github.com/WordPress/gutenberg/pull/57754))
+
+#### Global Styles
+- Site editor: Add global styles changes to save flow. ([57470](https://github.com/WordPress/gutenberg/pull/57470))
+
+#### Design Tools
+- Pullquote Block: Add padding and margin support. ([45731](https://github.com/WordPress/gutenberg/pull/45731))
+
+
+### New APIs
+
+#### Block API
+- Block Bindings API: Add block bindings PHP registration mechanisms and "Post meta" source under the experimental flag. ([57249](https://github.com/WordPress/gutenberg/pull/57249))
+- Block Bindings API: Refactor logic into Block Bindings class and singleton pattern. ([57742](https://github.com/WordPress/gutenberg/pull/57742))
+
+
+### Bug Fixes
+
+- (editor)(fix) Append the `edit-post-header-toolbar` class in NavigableToolbar for backward compatibility with plugin GUI injections. ([58154](https://github.com/WordPress/gutenberg/pull/58154))
+- Bring back the chevron. ([57807](https://github.com/WordPress/gutenberg/pull/57807))
+- Fix flaky "create a new pattern" test. ([57747](https://github.com/WordPress/gutenberg/pull/57747))
+- Fix site editor layout regressions. ([58077](https://github.com/WordPress/gutenberg/pull/58077))
+- Preferences: Add a proxy to retrieve the deprecated preferences with a deprecation message. ([58016](https://github.com/WordPress/gutenberg/pull/58016))
+- Remove unused argument from sprintf in pagination.js. ([57823](https://github.com/WordPress/gutenberg/pull/57823))
+- core-js: Only polyfill stable features. ([57674](https://github.com/WordPress/gutenberg/pull/57674))
+
+#### Block Library
+- Avatar block: Fix broken aligments in the editor. ([58114](https://github.com/WordPress/gutenberg/pull/58114))
+- Embed Block: Fix retry processing when embedding with trailing slash fails. ([58007](https://github.com/WordPress/gutenberg/pull/58007))
+- Lightbox: Fix "Expand on click" control being disabled unintentionally. ([56053](https://github.com/WordPress/gutenberg/pull/56053))
+- Modified Date Block: Don't render change date tool. ([57914](https://github.com/WordPress/gutenberg/pull/57914))
+- Only prioritise Quote transform where relevant. ([57749](https://github.com/WordPress/gutenberg/pull/57749))
+- Query Loop: Fix posts list variation detection. ([58194](https://github.com/WordPress/gutenberg/pull/58194))
+
+#### Components
+- Button: Always render the Tooltip component even when a tooltip should not be shown. ([56490](https://github.com/WordPress/gutenberg/pull/56490))
+- CustomSelect: Adjust `renderSelectedValue` to fix sizing. ([57865](https://github.com/WordPress/gutenberg/pull/57865))
+- ToggleGroupControl: Improve controlled value detection. ([57770](https://github.com/WordPress/gutenberg/pull/57770))
+- Tooltip: Accept specific tooltip props. ([58125](https://github.com/WordPress/gutenberg/pull/58125))
+- Tooltip: Forward and merge inner tooltip props correctly. ([57878](https://github.com/WordPress/gutenberg/pull/57878))
+
+#### Data Views
+- DataViews: Default sort order in templates by title. ([58175](https://github.com/WordPress/gutenberg/pull/58175))
+- DataViews: Don't always display horizontal scrollbar. ([58101](https://github.com/WordPress/gutenberg/pull/58101))
+- DataViews: Fix author sorting in templates and template parts. ([58167](https://github.com/WordPress/gutenberg/pull/58167))
+
+#### Patterns
+- Add black border back when editing synced pattern in the post editor. ([57631](https://github.com/WordPress/gutenberg/pull/57631))
+- Outline editable blocks when in a pattern that has locked children. ([57991](https://github.com/WordPress/gutenberg/pull/57991))
+- Remove text align control for paragraph, heading, and button in contentOnly editing mode. ([57906](https://github.com/WordPress/gutenberg/pull/57906))
+
+#### List View
+- Image Block: Make block name affect list view. ([57955](https://github.com/WordPress/gutenberg/pull/57955))
+- More Block: Make block name affect list view. ([58160](https://github.com/WordPress/gutenberg/pull/58160))
+
+#### Block API
+- Block Hooks: Fix toggle. ([57956](https://github.com/WordPress/gutenberg/pull/57956))
+- Fix formats not working in block bindings content. ([58055](https://github.com/WordPress/gutenberg/pull/58055))
+
+#### Global Styles
+- Correctly decode border color values. ([57876](https://github.com/WordPress/gutenberg/pull/57876))
+- Fix: Theme.json application of custom root selector for styles. ([58050](https://github.com/WordPress/gutenberg/pull/58050))
+
+#### Data Layer
+- Data: Allow binding registry selector to multiple registries. ([57943](https://github.com/WordPress/gutenberg/pull/57943))
+- Data: Fix memoized createRegistrySelector. ([57888](https://github.com/WordPress/gutenberg/pull/57888))
+
+#### Typography
+- #56734 When there is no font, the border should not appear. Display further guidance text. ([56825](https://github.com/WordPress/gutenberg/pull/56825))
+- Fluid typography: Do not calculate fluid font size when min and max viewport widths are equal. ([57866](https://github.com/WordPress/gutenberg/pull/57866))
+
+#### Block Editor
+- Fix regression: Content locking does not stops when an outside block is selected. ([57737](https://github.com/WordPress/gutenberg/pull/57737))
+- LinkControl: Remove unnecessary right padding of input fields. ([57784](https://github.com/WordPress/gutenberg/pull/57784))
+
+#### Custom Fields
+- Block Bindings: Fix button popover not showing in patterns. ([58219](https://github.com/WordPress/gutenberg/pull/58219))
+
+#### Font Library
+- Fix typo. ([58193](https://github.com/WordPress/gutenberg/pull/58193))
+
+#### Synced Patterns
+- Fix losing overrides after detaching patterns. ([58164](https://github.com/WordPress/gutenberg/pull/58164))
+
+#### Interactivity API
+- Prevent `wp-data-on=""` from creating `onDefault` handlers. ([57925](https://github.com/WordPress/gutenberg/pull/57925))
+
+#### CSS & Styling
+- Styles revisions: Remove body padding. ([57748](https://github.com/WordPress/gutenberg/pull/57748))
+
+#### Templates API
+- Fix visual indication of switch to default template in the post editor. ([57718](https://github.com/WordPress/gutenberg/pull/57718))
+
+
+### Accessibility
+
+#### Site Editor
+- Fix font variants count color contrast ratio and l10n. ([58117](https://github.com/WordPress/gutenberg/pull/58117))
+- Make the site hub View Site link always visible. ([57423](https://github.com/WordPress/gutenberg/pull/57423))
+
+#### Block Editor
+- Fix parent selector button focus style and metrics. ([57728](https://github.com/WordPress/gutenberg/pull/57728))
+- Restore visual separator between mover buttons when show button label is on. ([57640](https://github.com/WordPress/gutenberg/pull/57640))
+
+#### Widgets Editor
+- Fix Widgets page Undo and Redo accessibility and keyboard interaction. ([57677](https://github.com/WordPress/gutenberg/pull/57677))
+
+
+### Performance
+
+- Add patterns load test. ([57828](https://github.com/WordPress/gutenberg/pull/57828))
+- Block editor: Avoid list re-rendering on select. ([57188](https://github.com/WordPress/gutenberg/pull/57188))
+- Block editor: Don't register shortcuts for preview editors. ([57984](https://github.com/WordPress/gutenberg/pull/57984))
+- Block editor: Fix performance regression after #57950. ([57971](https://github.com/WordPress/gutenberg/pull/57971))
+- Block editor: Use context for useBlockEditingMode. ([57950](https://github.com/WordPress/gutenberg/pull/57950))
+- BlockSwitcher: Defer transform calculations until the Dropdown is open. ([57892](https://github.com/WordPress/gutenberg/pull/57892))
+- Call variation through callback so it's only loaded when needed - in support of  trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+- Editor styles: Cache transform. ([57810](https://github.com/WordPress/gutenberg/pull/57810))
+- Footnotes: Combine format store subscription. ([58129](https://github.com/WordPress/gutenberg/pull/58129))
+- Iframe: Calc compat styles once per page load. ([57798](https://github.com/WordPress/gutenberg/pull/57798))
+- Measure typing with the top toolbar enabled. ([57709](https://github.com/WordPress/gutenberg/pull/57709))
+- Meta boxes: Don't initialise if there are none. ([57182](https://github.com/WordPress/gutenberg/pull/57182))
+- Patterns: Avoid fetching on load. ([57999](https://github.com/WordPress/gutenberg/pull/57999))
+- Site editor: Avoid fetching themes on load. ([57985](https://github.com/WordPress/gutenberg/pull/57985))
+- Site editor: Reduce artificial loading delay from 1s to 100ms. ([57953](https://github.com/WordPress/gutenberg/pull/57953))
+- Site editor: Remove store subscription per block. ([57995](https://github.com/WordPress/gutenberg/pull/57995))
+- Template Part & Query: Avoid server requests on mount. ([57987](https://github.com/WordPress/gutenberg/pull/57987))
+- Template part block: Avoid parsing ALL patterns on mount. ([57856](https://github.com/WordPress/gutenberg/pull/57856))
+
+#### Block Editor
+- Revert "Block editor: Avoid list re-rendering on select". ([58147](https://github.com/WordPress/gutenberg/pull/58147))
+
+#### Post Editor
+- Editor: Use hooks instead of HoCs for `EditorNotices`. ([57772](https://github.com/WordPress/gutenberg/pull/57772))
+
+
+### Experiments
+
+#### Data Views
+- Add: Bulk actions to dataviews with the new design. ([57255](https://github.com/WordPress/gutenberg/pull/57255))
+- Data view list layout: Fix thumbnail dimensions. ([57774](https://github.com/WordPress/gutenberg/pull/57774))
+- Data views table layout: Update cell vertical alignment. ([57804](https://github.com/WordPress/gutenberg/pull/57804))
+- DataViews: Add description to pages. ([57793](https://github.com/WordPress/gutenberg/pull/57793))
+- DataViews: Add front page to pages page sidebar. ([57759](https://github.com/WordPress/gutenberg/pull/57759))
+- DataViews: Better management of `layout` param in templates. ([58116](https://github.com/WordPress/gutenberg/pull/58116))
+- DataViews: Make list layout the default for templates with the experiment enabled. ([57933](https://github.com/WordPress/gutenberg/pull/57933))
+- DataViews: Revert list view as default for pages. ([58081](https://github.com/WordPress/gutenberg/pull/58081))
+- DataViews: Revert list view as default for templates. ([58079](https://github.com/WordPress/gutenberg/pull/58079))
+- DataViews: Set primary field styles. ([57846](https://github.com/WordPress/gutenberg/pull/57846))
+- DataViews: Show loading / no result message for the list layout. ([57764](https://github.com/WordPress/gutenberg/pull/57764))
+- DataViews: Update template parts view. ([57952](https://github.com/WordPress/gutenberg/pull/57952))
+- DataViews: Use button for patterns, pages and templates preview field. ([58071](https://github.com/WordPress/gutenberg/pull/58071))
+- DataViews: Use table layout for templates when experiment disabled. ([57960](https://github.com/WordPress/gutenberg/pull/57960))
+- Stabilise view options button icon. ([57964](https://github.com/WordPress/gutenberg/pull/57964))
+- Update Grid layout design. ([57880](https://github.com/WordPress/gutenberg/pull/57880))
+- Update Pages preview field display. ([57919](https://github.com/WordPress/gutenberg/pull/57919))
+- Update Templates table layout. ([57930](https://github.com/WordPress/gutenberg/pull/57930))
+- Update: Show template sources on templates Dataviews sidebar. ([58124](https://github.com/WordPress/gutenberg/pull/58124))
+
+#### Synced Patterns
+- Add a control to reset pattern overrides. ([57845](https://github.com/WordPress/gutenberg/pull/57845))
+- Allow heading and button in Pattern Overrides. ([57789](https://github.com/WordPress/gutenberg/pull/57789))
+
+#### Typography
+- Download then upload font face assets when installing from a collection. ([57694](https://github.com/WordPress/gutenberg/pull/57694))
+- Use `slug` instead of `id` for Font Collection. ([57735](https://github.com/WordPress/gutenberg/pull/57735))
+
+#### REST API
+- Font Library Refactor. ([57688](https://github.com/WordPress/gutenberg/pull/57688))
+
+#### Block Editor
+- Allow drag and drop to create Rows and Galleries. ([56186](https://github.com/WordPress/gutenberg/pull/56186))
+
+
+### Documentation
+
+- Add a video demonstration to the Quick Start Guide. ([57834](https://github.com/WordPress/gutenberg/pull/57834))
+- Button: Improve `disabled`-related prop descriptions. ([57864](https://github.com/WordPress/gutenberg/pull/57864))
+- Components: Move CHANGELOG entries under the correct release. ([57885](https://github.com/WordPress/gutenberg/pull/57885))
+- Docs: Fix typo in "The block wrapper" document. ([58106](https://github.com/WordPress/gutenberg/pull/58106))
+- Docs: Use 'key' in 'editor.BlockEdit' filter code examples. ([58119](https://github.com/WordPress/gutenberg/pull/58119))
+- Document files/directories requiring backmerging to WP Core for major release. ([58064](https://github.com/WordPress/gutenberg/pull/58064))
+- Fix the iframe markup of the embed video in the Quick Start Guide. ([57857](https://github.com/WordPress/gutenberg/pull/57857))
+- Fix: Link to the nodejs release page. ([57816](https://github.com/WordPress/gutenberg/pull/57816))
+- Fix: Typo on BlockListBlock comments. ([57814](https://github.com/WordPress/gutenberg/pull/57814))
+- Fix: Typos on __unstableSetTemporarilyEditingAsBlocks documentation. ([57768](https://github.com/WordPress/gutenberg/pull/57768))
+- Font Library: Add font collection JSON schema. ([57736](https://github.com/WordPress/gutenberg/pull/57736))
+- Prefixes all php filters with wpdocs_. ([53914](https://github.com/WordPress/gutenberg/pull/53914))
+- Remove the unnecessary TOC and fix grammar/formatting in the Patterns doc. ([57825](https://github.com/WordPress/gutenberg/pull/57825))
+- Remove the 👋 emoji from the Block Editor Handbook. ([58023](https://github.com/WordPress/gutenberg/pull/58023))
+- Update versions-in-wordpress.md. ([57916](https://github.com/WordPress/gutenberg/pull/57916))
+- [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+
+### Code Quality
+
+- Block Renaming - move backported WP 6.5 code to 6.5 compat dir. ([58126](https://github.com/WordPress/gutenberg/pull/58126))
+- Fix comments block. ([57820](https://github.com/WordPress/gutenberg/pull/57820))
+- Fon Library: Remove 'version' property from font collection schema. ([58025](https://github.com/WordPress/gutenberg/pull/58025))
+- Remove unneeded `margin: 0` override for `Notice` component consumer. ([57794](https://github.com/WordPress/gutenberg/pull/57794))
+- Rename __experimentalGetGlobalBlocksByName to getBlocksByName. ([58156](https://github.com/WordPress/gutenberg/pull/58156))
+- Scripts: Remove unused variable in bin/list-experimental-api-matches.sh. ([57771](https://github.com/WordPress/gutenberg/pull/57771))
+- Shadows: Prevent empty style object when removing shadow. ([58155](https://github.com/WordPress/gutenberg/pull/58155))
+- [Fonts API] removing files and files loading no longer needed. ([57972](https://github.com/WordPress/gutenberg/pull/57972))
+
+#### Components
+- PaletteEdit: Improve unit tests. ([57645](https://github.com/WordPress/gutenberg/pull/57645))
+- Tooltip and Button: Tidy up unit tests. ([57975](https://github.com/WordPress/gutenberg/pull/57975))
+- Tooltip: Add test for classname leakage. ([58182](https://github.com/WordPress/gutenberg/pull/58182))
+
+#### Block Editor
+- Soft deprecate custom 'pure' HoC in favor of 'React.memo'. ([57173](https://github.com/WordPress/gutenberg/pull/57173))
+- Stabilise RecursionProvider and useHasRecursion APIs. ([58120](https://github.com/WordPress/gutenberg/pull/58120))
+- Tidy up block patterns selectors. ([57913](https://github.com/WordPress/gutenberg/pull/57913))
+
+#### Block Library
+- Gallery Block: Remove duplicate return statement. ([57746](https://github.com/WordPress/gutenberg/pull/57746))
+- Navigation: Move the renderer class to the main navigation file. ([57979](https://github.com/WordPress/gutenberg/pull/57979))
+
+#### Font Library
+- Remove WP_Font_Family class that is no longer used. ([58184](https://github.com/WordPress/gutenberg/pull/58184))
+
+#### Block Directory
+- DownloadableBlocksPanel: Remove withSelect in favor of useSelect. ([58109](https://github.com/WordPress/gutenberg/pull/58109))
+
+#### Patterns
+- Stabilize the pattern overrides block context. ([58102](https://github.com/WordPress/gutenberg/pull/58102))
+
+#### Block API
+- Block Bindings: Remove the experimental flag. ([58089](https://github.com/WordPress/gutenberg/pull/58089))
+
+#### Post Editor
+- Editor: Use hooks instead of HoCs in 'PostScheduleCheck'. ([57833](https://github.com/WordPress/gutenberg/pull/57833))
+
+#### Script Modules API
+- Update the code and move it to the compat/wordpress-6.5 folder. ([57778](https://github.com/WordPress/gutenberg/pull/57778))
+
+#### Data Views
+- Remove obsolete check from dataviews modal actions title. ([57753](https://github.com/WordPress/gutenberg/pull/57753))
+
+
+### Tools
+
+- (chore) Revert bump to the v17.5.1 (draft) due to bug in the release found by manual testing. ([58027](https://github.com/WordPress/gutenberg/pull/58027))
+- Automate creation of Issue for major release PHP synchronisation. ([57890](https://github.com/WordPress/gutenberg/pull/57890))
+- Fix misplaced ReactRefreshWebpackPlugin. ([57777](https://github.com/WordPress/gutenberg/pull/57777))
+
+#### Testing
+- Add `setGutenbergExperiments` to `requestUtils`. ([56663](https://github.com/WordPress/gutenberg/pull/56663))
+- Add: End to end test to content locking stop editing as blocks behavior. ([57812](https://github.com/WordPress/gutenberg/pull/57812))
+- Attempt to fix php unit tests (variations api change). ([58090](https://github.com/WordPress/gutenberg/pull/58090))
+- Migrate 'block grouping' end-to-end tests to Playwright. ([57684](https://github.com/WordPress/gutenberg/pull/57684))
+- Migrate 'embedding' end-to-end tests to Playwright. ([57969](https://github.com/WordPress/gutenberg/pull/57969))
+- Migrate 'typewriter' end-to-end tests to Playwright. ([57673](https://github.com/WordPress/gutenberg/pull/57673))
+- Remove unused Navigation block end-to-end test fixtures. ([57848](https://github.com/WordPress/gutenberg/pull/57848))
+
+#### Build Tooling
+- Update caniuse-lite package. ([58087](https://github.com/WordPress/gutenberg/pull/58087))
+- Update the cherry pick script to work with the new version of gh. ([57917](https://github.com/WordPress/gutenberg/pull/57917))
+
+
+### Various
+
+- Interactivity API: Fix data-wp-on-document flaky test. ([58008](https://github.com/WordPress/gutenberg/pull/58008))
+- Interactivity API: Fix flaky test on-window. ([58134](https://github.com/WordPress/gutenberg/pull/58134))
+- Pattern Categories: Fix capitalization. ([58112](https://github.com/WordPress/gutenberg/pull/58112))
+- Remove check-latest-npm validation. ([57797](https://github.com/WordPress/gutenberg/pull/57797))
+
+#### Interactivity API
+- Create `@wordpress/interactivity-router` module. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
+- Fix flaky test on-window, remove duplicate expect on-document. ([58181](https://github.com/WordPress/gutenberg/pull/58181))
+- Remove `data-wp-slot` and  `data-wp-fill`. ([57854](https://github.com/WordPress/gutenberg/pull/57854))
+- Remove unused `state` and rename `props` to `attributes` in `getElement()`. ([57974](https://github.com/WordPress/gutenberg/pull/57974))
+
+#### Patterns
+- Remove pattern override experiment completely. ([58105](https://github.com/WordPress/gutenberg/pull/58105))
+- Update pattern overrides to use a hard coded support array. ([57912](https://github.com/WordPress/gutenberg/pull/57912))
+
+#### Data Views
+- Dataviews: Add Bulk actions to page. ([57826](https://github.com/WordPress/gutenberg/pull/57826))
+
+#### Post Editor
+- Add description to the save panel header when nothing is checked. ([57716](https://github.com/WordPress/gutenberg/pull/57716))
+
+#### HTML API
+- Backport updates from Core. ([57022](https://github.com/WordPress/gutenberg/pull/57022))
+
+#### Block Editor
+- Video Block: Add raw transformation from `video` html. ([47159](https://github.com/WordPress/gutenberg/pull/47159))
+
+
+## First time contributors
+
+The following PRs were merged by first time contributors:
+
+- @kt-12: Call variation through callback so it's only loaded when needed - in support of  trac 59969. ([56952](https://github.com/WordPress/gutenberg/pull/56952))
+- @leomuniz: [Type] Developer Documentation - Fix removeAllNotices dispatch on the removeAllNotices doc section of @wordpress/notices. ([57436](https://github.com/WordPress/gutenberg/pull/57436))
+
+
+## Contributors
+
+The following contributors merged PRs in this release:
+
+@aaronrobertshaw @afercia @ajlende @andrewserong @annezazu @artemiomorales @arthur791004 @atachibana @bacoords @bph @brookewp @c4rl0sbr4v0 @carolinan @chad1008 @ciampo @creativecoder @DAreRodz @dcalhoun @derekblank @dmsnell @draganescu @ecgan @ellatrix @fluiddot @fullofcaffeine @gaambo @geriux @getdave @glendaviesnz @gonzomir @inc2734 @jameskoster @jeryj @jffng @jorgefilipecosta @jsnajdr @kevin940726 @kt-12 @leomuniz @luisherranz @MaggieCabrera @Mamaduka @matiasbenedetto @mcsf @michalczaplinski @mikachan @mirka @ndiego @noisysocks @ntsekouras @oandregal @ockham @oguzkocer @pbking @ramonjd @richtabor @SantosGuillamot @scruffian @SiobhyB @sirreal @swissspidy @t-hamano @talldan @tellthemachines @tjcafferkey @tyxla @vcanales @youknowriad
+
+
 = 17.5.2 =
 
 ## Changelog

From e8d9ab28018fa236b243eac328d23d239c5ad3e6 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 21:36:43 +0000
Subject: [PATCH 289/296] Update changelog files

---
 packages/a11y/CHANGELOG.md                                 | 2 ++
 packages/a11y/package.json                                 | 2 +-
 packages/annotations/CHANGELOG.md                          | 2 ++
 packages/annotations/package.json                          | 2 +-
 packages/api-fetch/CHANGELOG.md                            | 2 ++
 packages/api-fetch/package.json                            | 2 +-
 packages/autop/CHANGELOG.md                                | 2 ++
 packages/autop/package.json                                | 2 +-
 packages/babel-plugin-import-jsx-pragma/CHANGELOG.md       | 2 ++
 packages/babel-plugin-import-jsx-pragma/package.json       | 2 +-
 packages/babel-plugin-makepot/CHANGELOG.md                 | 2 ++
 packages/babel-plugin-makepot/package.json                 | 2 +-
 packages/babel-preset-default/CHANGELOG.md                 | 2 ++
 packages/babel-preset-default/package.json                 | 2 +-
 packages/base-styles/CHANGELOG.md                          | 2 ++
 packages/base-styles/package.json                          | 2 +-
 packages/blob/CHANGELOG.md                                 | 2 ++
 packages/blob/package.json                                 | 2 +-
 packages/block-directory/CHANGELOG.md                      | 2 ++
 packages/block-directory/package.json                      | 2 +-
 packages/block-editor/CHANGELOG.md                         | 2 ++
 packages/block-editor/package.json                         | 2 +-
 packages/block-library/CHANGELOG.md                        | 2 ++
 packages/block-library/package.json                        | 2 +-
 packages/block-serialization-default-parser/CHANGELOG.md   | 2 ++
 packages/block-serialization-default-parser/package.json   | 2 +-
 packages/block-serialization-spec-parser/CHANGELOG.md      | 2 ++
 packages/block-serialization-spec-parser/package.json      | 2 +-
 packages/blocks/CHANGELOG.md                               | 2 ++
 packages/blocks/package.json                               | 2 +-
 packages/browserslist-config/CHANGELOG.md                  | 2 ++
 packages/browserslist-config/package.json                  | 2 +-
 packages/commands/CHANGELOG.md                             | 2 ++
 packages/commands/package.json                             | 2 +-
 packages/components/CHANGELOG.md                           | 2 ++
 packages/components/package.json                           | 2 +-
 packages/compose/CHANGELOG.md                              | 2 ++
 packages/compose/package.json                              | 2 +-
 packages/core-commands/CHANGELOG.md                        | 2 ++
 packages/core-commands/package.json                        | 2 +-
 packages/core-data/CHANGELOG.md                            | 2 ++
 packages/core-data/package.json                            | 2 +-
 packages/create-block-interactive-template/CHANGELOG.md    | 2 ++
 packages/create-block-interactive-template/package.json    | 2 +-
 packages/create-block-tutorial-template/CHANGELOG.md       | 2 ++
 packages/create-block-tutorial-template/package.json       | 2 +-
 packages/create-block/CHANGELOG.md                         | 2 ++
 packages/create-block/package.json                         | 2 +-
 packages/customize-widgets/CHANGELOG.md                    | 2 ++
 packages/customize-widgets/package.json                    | 2 +-
 packages/data-controls/CHANGELOG.md                        | 2 ++
 packages/data-controls/package.json                        | 2 +-
 packages/data/CHANGELOG.md                                 | 2 ++
 packages/data/package.json                                 | 2 +-
 packages/dataviews/CHANGELOG.md                            | 2 ++
 packages/dataviews/package.json                            | 2 +-
 packages/date/CHANGELOG.md                                 | 2 ++
 packages/date/package.json                                 | 2 +-
 packages/dependency-extraction-webpack-plugin/CHANGELOG.md | 2 ++
 packages/dependency-extraction-webpack-plugin/package.json | 2 +-
 packages/deprecated/CHANGELOG.md                           | 2 ++
 packages/deprecated/package.json                           | 2 +-
 packages/docgen/CHANGELOG.md                               | 2 ++
 packages/docgen/package.json                               | 2 +-
 packages/dom-ready/CHANGELOG.md                            | 2 ++
 packages/dom-ready/package.json                            | 2 +-
 packages/dom/CHANGELOG.md                                  | 2 ++
 packages/dom/package.json                                  | 2 +-
 packages/e2e-test-utils-playwright/CHANGELOG.md            | 2 ++
 packages/e2e-test-utils-playwright/package.json            | 2 +-
 packages/e2e-test-utils/CHANGELOG.md                       | 2 ++
 packages/e2e-test-utils/package.json                       | 2 +-
 packages/e2e-tests/CHANGELOG.md                            | 2 ++
 packages/e2e-tests/package.json                            | 2 +-
 packages/edit-post/CHANGELOG.md                            | 2 ++
 packages/edit-post/package.json                            | 2 +-
 packages/edit-site/CHANGELOG.md                            | 2 ++
 packages/edit-site/package.json                            | 2 +-
 packages/edit-widgets/CHANGELOG.md                         | 2 ++
 packages/edit-widgets/package.json                         | 2 +-
 packages/editor/CHANGELOG.md                               | 2 ++
 packages/editor/package.json                               | 2 +-
 packages/element/CHANGELOG.md                              | 2 ++
 packages/element/package.json                              | 2 +-
 packages/env/CHANGELOG.md                                  | 2 ++
 packages/env/package.json                                  | 2 +-
 packages/escape-html/CHANGELOG.md                          | 2 ++
 packages/escape-html/package.json                          | 2 +-
 packages/eslint-plugin/CHANGELOG.md                        | 2 ++
 packages/eslint-plugin/package.json                        | 2 +-
 packages/format-library/CHANGELOG.md                       | 2 ++
 packages/format-library/package.json                       | 2 +-
 packages/hooks/CHANGELOG.md                                | 2 ++
 packages/hooks/package.json                                | 2 +-
 packages/html-entities/CHANGELOG.md                        | 2 ++
 packages/html-entities/package.json                        | 2 +-
 packages/i18n/CHANGELOG.md                                 | 2 ++
 packages/i18n/package.json                                 | 2 +-
 packages/icons/CHANGELOG.md                                | 2 ++
 packages/icons/package.json                                | 2 +-
 packages/interactivity-router/CHANGELOG.md                 | 2 ++
 packages/interactivity-router/package.json                 | 2 +-
 packages/interactivity/CHANGELOG.md                        | 2 ++
 packages/interactivity/package.json                        | 2 +-
 packages/interface/CHANGELOG.md                            | 2 ++
 packages/interface/package.json                            | 2 +-
 packages/is-shallow-equal/CHANGELOG.md                     | 2 ++
 packages/is-shallow-equal/package.json                     | 2 +-
 packages/jest-console/CHANGELOG.md                         | 2 ++
 packages/jest-console/package.json                         | 2 +-
 packages/jest-preset-default/CHANGELOG.md                  | 2 ++
 packages/jest-preset-default/package.json                  | 2 +-
 packages/jest-puppeteer-axe/CHANGELOG.md                   | 2 ++
 packages/jest-puppeteer-axe/package.json                   | 2 +-
 packages/keyboard-shortcuts/CHANGELOG.md                   | 2 ++
 packages/keyboard-shortcuts/package.json                   | 2 +-
 packages/keycodes/CHANGELOG.md                             | 2 ++
 packages/keycodes/package.json                             | 2 +-
 packages/lazy-import/CHANGELOG.md                          | 2 ++
 packages/lazy-import/package.json                          | 2 +-
 packages/list-reusable-blocks/CHANGELOG.md                 | 2 ++
 packages/list-reusable-blocks/package.json                 | 2 +-
 packages/media-utils/CHANGELOG.md                          | 2 ++
 packages/media-utils/package.json                          | 2 +-
 packages/notices/CHANGELOG.md                              | 2 ++
 packages/notices/package.json                              | 2 +-
 packages/npm-package-json-lint-config/CHANGELOG.md         | 2 ++
 packages/npm-package-json-lint-config/package.json         | 2 +-
 packages/nux/CHANGELOG.md                                  | 2 ++
 packages/nux/package.json                                  | 2 +-
 packages/patterns/CHANGELOG.md                             | 2 ++
 packages/patterns/package.json                             | 2 +-
 packages/plugins/CHANGELOG.md                              | 2 ++
 packages/plugins/package.json                              | 2 +-
 packages/postcss-plugins-preset/CHANGELOG.md               | 2 ++
 packages/postcss-plugins-preset/package.json               | 2 +-
 packages/postcss-themes/CHANGELOG.md                       | 2 ++
 packages/postcss-themes/package.json                       | 2 +-
 packages/preferences-persistence/CHANGELOG.md              | 2 ++
 packages/preferences-persistence/package.json              | 2 +-
 packages/preferences/CHANGELOG.md                          | 2 ++
 packages/preferences/package.json                          | 2 +-
 packages/prettier-config/CHANGELOG.md                      | 2 ++
 packages/prettier-config/package.json                      | 2 +-
 packages/primitives/CHANGELOG.md                           | 2 ++
 packages/primitives/package.json                           | 2 +-
 packages/priority-queue/CHANGELOG.md                       | 2 ++
 packages/priority-queue/package.json                       | 2 +-
 packages/private-apis/CHANGELOG.md                         | 2 ++
 packages/private-apis/package.json                         | 2 +-
 packages/project-management-automation/CHANGELOG.md        | 2 ++
 packages/project-management-automation/package.json        | 2 +-
 packages/react-i18n/CHANGELOG.md                           | 2 ++
 packages/react-i18n/package.json                           | 2 +-
 packages/readable-js-assets-webpack-plugin/CHANGELOG.md    | 2 ++
 packages/readable-js-assets-webpack-plugin/package.json    | 2 +-
 packages/redux-routine/CHANGELOG.md                        | 2 ++
 packages/redux-routine/package.json                        | 2 +-
 packages/reusable-blocks/CHANGELOG.md                      | 2 ++
 packages/reusable-blocks/package.json                      | 2 +-
 packages/rich-text/CHANGELOG.md                            | 2 ++
 packages/rich-text/package.json                            | 2 +-
 packages/router/CHANGELOG.md                               | 2 ++
 packages/router/package.json                               | 2 +-
 packages/scripts/CHANGELOG.md                              | 2 ++
 packages/scripts/package.json                              | 2 +-
 packages/server-side-render/CHANGELOG.md                   | 2 ++
 packages/server-side-render/package.json                   | 2 +-
 packages/shortcode/CHANGELOG.md                            | 2 ++
 packages/shortcode/package.json                            | 2 +-
 packages/style-engine/CHANGELOG.md                         | 2 ++
 packages/style-engine/package.json                         | 2 +-
 packages/stylelint-config/CHANGELOG.md                     | 2 ++
 packages/stylelint-config/package.json                     | 2 +-
 packages/sync/CHANGELOG.md                                 | 2 ++
 packages/sync/package.json                                 | 2 +-
 packages/token-list/CHANGELOG.md                           | 2 ++
 packages/token-list/package.json                           | 2 +-
 packages/undo-manager/CHANGELOG.md                         | 2 ++
 packages/undo-manager/package.json                         | 2 +-
 packages/url/CHANGELOG.md                                  | 2 ++
 packages/url/package.json                                  | 2 +-
 packages/viewport/CHANGELOG.md                             | 2 ++
 packages/viewport/package.json                             | 2 +-
 packages/warning/CHANGELOG.md                              | 2 ++
 packages/warning/package.json                              | 2 +-
 packages/widgets/CHANGELOG.md                              | 2 ++
 packages/widgets/package.json                              | 2 +-
 packages/wordcount/CHANGELOG.md                            | 2 ++
 packages/wordcount/package.json                            | 2 +-
 190 files changed, 285 insertions(+), 95 deletions(-)

diff --git a/packages/a11y/CHANGELOG.md b/packages/a11y/CHANGELOG.md
index 7c5c9d7978410..e302cf7514cbf 100644
--- a/packages/a11y/CHANGELOG.md
+++ b/packages/a11y/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index c2d1b666339bf..2fb286507c036 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/annotations/CHANGELOG.md b/packages/annotations/CHANGELOG.md
index 42c3783652797..df543928a05ef 100644
--- a/packages/annotations/CHANGELOG.md
+++ b/packages/annotations/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.50.0 (2024-01-24)
+
 ## 2.49.0 (2024-01-10)
 
 ## 2.48.0 (2023-12-13)
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index 007b02ad29a71..5007a40a2f7b6 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.49.0",
+	"version": "2.50.0-prerelease",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/api-fetch/CHANGELOG.md b/packages/api-fetch/CHANGELOG.md
index 67df4dad50c64..5284234afd228 100644
--- a/packages/api-fetch/CHANGELOG.md
+++ b/packages/api-fetch/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.47.0 (2024-01-24)
+
 ## 6.46.0 (2024-01-10)
 
 ## 6.45.0 (2023-12-13)
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index 02d0474156bfc..bf26217d15ae8 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.46.0",
+	"version": "6.47.0-prerelease",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/autop/CHANGELOG.md b/packages/autop/CHANGELOG.md
index 4e4c9a91bc781..969a52ded8a7f 100644
--- a/packages/autop/CHANGELOG.md
+++ b/packages/autop/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/autop/package.json b/packages/autop/package.json
index e335e4ac7349b..760b68c565f1e 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
index 19269095d73d7..8ee06832be474 100644
--- a/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
+++ b/packages/babel-plugin-import-jsx-pragma/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.33.0 (2024-01-24)
+
 ## 4.32.0 (2024-01-10)
 
 ## 4.31.0 (2023-12-13)
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index 3af7e30b2e234..54b68eedccb67 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-import-jsx-pragma",
-	"version": "4.32.0",
+	"version": "4.33.0-prerelease",
 	"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-makepot/CHANGELOG.md b/packages/babel-plugin-makepot/CHANGELOG.md
index fd1a0546da3ad..ef5ce07c677b5 100644
--- a/packages/babel-plugin-makepot/CHANGELOG.md
+++ b/packages/babel-plugin-makepot/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.34.0 (2024-01-24)
+
 ## 5.33.0 (2024-01-10)
 
 ## 5.32.0 (2023-12-13)
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index 6163ad1df3ff1..9e414879658b9 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "5.33.0",
+	"version": "5.34.0-prerelease",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-preset-default/CHANGELOG.md b/packages/babel-preset-default/CHANGELOG.md
index 4149381dce16f..2ebbc9e4efc24 100644
--- a/packages/babel-preset-default/CHANGELOG.md
+++ b/packages/babel-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.34.0 (2024-01-24)
+
 ## 7.33.0 (2024-01-10)
 
 ## 7.32.0 (2023-12-13)
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index 66e63b24ff51e..9018f8d7a635d 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-preset-default",
-	"version": "7.33.0",
+	"version": "7.34.0-prerelease",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/base-styles/CHANGELOG.md b/packages/base-styles/CHANGELOG.md
index a399317b2aef0..614d83a498a33 100644
--- a/packages/base-styles/CHANGELOG.md
+++ b/packages/base-styles/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.41.0 (2024-01-24)
+
 ## 4.40.0 (2024-01-10)
 
 ## 4.39.0 (2023-12-13)
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index 64d3835a00aca..672d6b1e81123 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.40.0",
+	"version": "4.41.0-prerelease",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blob/CHANGELOG.md b/packages/blob/CHANGELOG.md
index b2a501021c5aa..87e1956b5a556 100644
--- a/packages/blob/CHANGELOG.md
+++ b/packages/blob/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/blob/package.json b/packages/blob/package.json
index 53071228e0af1..df913b56cf85b 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-directory/CHANGELOG.md b/packages/block-directory/CHANGELOG.md
index 608fc4c4f005c..25162b8b692bf 100644
--- a/packages/block-directory/CHANGELOG.md
+++ b/packages/block-directory/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index 466d1fd783e95..c83d50a53c567 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/CHANGELOG.md b/packages/block-editor/CHANGELOG.md
index ec4793ec970ee..ecacd192751ed 100644
--- a/packages/block-editor/CHANGELOG.md
+++ b/packages/block-editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.18.0 (2024-01-24)
+
 - Deprecated `__experimentalRecursionProvider` and `__experimentalUseHasRecursion` in favor of their new stable counterparts `RecursionProvider` and `useHasRecursion`.
 
 ## 12.17.0 (2024-01-10)
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index cf8f13a0b9f11..cb5cebceca970 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.17.0",
+	"version": "12.18.0-prerelease",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-library/CHANGELOG.md b/packages/block-library/CHANGELOG.md
index d17ee65991c0a..fd547071ca01f 100644
--- a/packages/block-library/CHANGELOG.md
+++ b/packages/block-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.27.0 (2024-01-24)
+
 ## 8.26.0 (2024-01-10)
 
 ## 8.25.0 (2023-12-13)
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index d4927b341685e..8bb7892ab4332 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.26.0",
+	"version": "8.27.0-prerelease",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-default-parser/CHANGELOG.md b/packages/block-serialization-default-parser/CHANGELOG.md
index b705866a04957..3d22380bb8325 100644
--- a/packages/block-serialization-default-parser/CHANGELOG.md
+++ b/packages/block-serialization-default-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index 668fc92eea94b..6a735a45f8e25 100644
--- a/packages/block-serialization-default-parser/package.json
+++ b/packages/block-serialization-default-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-default-parser",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-spec-parser/CHANGELOG.md b/packages/block-serialization-spec-parser/CHANGELOG.md
index c6f586ce6b480..8c286aeb97510 100644
--- a/packages/block-serialization-spec-parser/CHANGELOG.md
+++ b/packages/block-serialization-spec-parser/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index df841c8a506c1..d38e78081ba72 100644
--- a/packages/block-serialization-spec-parser/package.json
+++ b/packages/block-serialization-spec-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-spec-parser",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blocks/CHANGELOG.md b/packages/blocks/CHANGELOG.md
index d932b12a54531..d019301aaf4c1 100644
--- a/packages/blocks/CHANGELOG.md
+++ b/packages/blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 12.27.0 (2024-01-24)
+
 ## 12.26.0 (2024-01-10)
 
 ## 12.25.0 (2023-12-13)
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index af0e076574518..1d7a665fe1ebf 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.26.0",
+	"version": "12.27.0-prerelease",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/browserslist-config/CHANGELOG.md b/packages/browserslist-config/CHANGELOG.md
index cf94e1caf70e5..db648ec7f8aca 100644
--- a/packages/browserslist-config/CHANGELOG.md
+++ b/packages/browserslist-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.33.0 (2024-01-24)
+
 ## 5.32.0 (2024-01-10)
 
 ## 5.31.0 (2023-12-13)
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index 4b2747e505e16..d1b9b053788a1 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.32.0",
+	"version": "5.33.0-prerelease",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/commands/CHANGELOG.md b/packages/commands/CHANGELOG.md
index 3b42cc552899f..5c03351cf93c0 100644
--- a/packages/commands/CHANGELOG.md
+++ b/packages/commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.21.0 (2024-01-24)
+
 ## 0.20.0 (2024-01-10)
 
 ## Enhancements
diff --git a/packages/commands/package.json b/packages/commands/package.json
index 5314cf671b1ba..12b3d5d466431 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.20.0",
+	"version": "0.21.0-prerelease",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/components/CHANGELOG.md b/packages/components/CHANGELOG.md
index 7ad6becdb8aef..c30aeee656754 100644
--- a/packages/components/CHANGELOG.md
+++ b/packages/components/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 25.16.0 (2024-01-24)
+
 ### Enhancements
 
 -   `ColorPicker`: improve the UX around HSL sliders ([#57555](https://github.com/WordPress/gutenberg/pull/57555)).
diff --git a/packages/components/package.json b/packages/components/package.json
index a16778a7778b5..ed70bcd5eef0b 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.15.0",
+	"version": "25.16.0-prerelease",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/compose/CHANGELOG.md b/packages/compose/CHANGELOG.md
index 54ff6a16252e3..ef0ce8a8b2e43 100644
--- a/packages/compose/CHANGELOG.md
+++ b/packages/compose/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.27.0 (2024-01-24)
+
 ### Deprecations
 
 -   The `pure` HoC has been deprecated. Use `memo` or `PureComponent` instead ([#57173](https://github.com/WordPress/gutenberg/pull/57173)).
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 63ebb740de6fa..972dec62b4288 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.26.0",
+	"version": "6.27.0-prerelease",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-commands/CHANGELOG.md b/packages/core-commands/CHANGELOG.md
index a65a04f4dbe04..67d6b1441befb 100644
--- a/packages/core-commands/CHANGELOG.md
+++ b/packages/core-commands/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.19.0 (2024-01-24)
+
 ## 0.18.0 (2024-01-10)
 
 ## 0.17.0 (2023-12-13)
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index 076dce00569e0..702f8cf28ae96 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.18.0",
+	"version": "0.19.0-prerelease",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-data/CHANGELOG.md b/packages/core-data/CHANGELOG.md
index 306ee51c90eab..75f5329cebcea 100644
--- a/packages/core-data/CHANGELOG.md
+++ b/packages/core-data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.27.0 (2024-01-24)
+
 ## 6.26.0 (2024-01-10)
 
 ## 6.25.0 (2023-12-13)
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index 5970b985a58d4..e4ef1360f0df9 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.26.0",
+	"version": "6.27.0-prerelease",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-interactive-template/CHANGELOG.md b/packages/create-block-interactive-template/CHANGELOG.md
index 2025feabddc63..c2674f25dbae0 100644
--- a/packages/create-block-interactive-template/CHANGELOG.md
+++ b/packages/create-block-interactive-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.13.0 (2024-01-24)
+
 ## 1.12.0 (2024-01-10)
 
 ### Enhancement
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index e95e68fef062a..d5ed2bc861803 100644
--- a/packages/create-block-interactive-template/package.json
+++ b/packages/create-block-interactive-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-interactive-template",
-	"version": "1.12.0",
+	"version": "1.13.0-prerelease",
 	"description": "Template for @wordpress/create-block to create interactive blocks with the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-tutorial-template/CHANGELOG.md b/packages/create-block-tutorial-template/CHANGELOG.md
index 971da45400f01..6a0204e09279b 100644
--- a/packages/create-block-tutorial-template/CHANGELOG.md
+++ b/packages/create-block-tutorial-template/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.4.0 (2024-01-24)
+
 ## 3.3.0 (2024-01-10)
 
 ## 3.2.0 (2023-12-13)
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 6a7f0b85901b0..711a4bf081a93 100644
--- a/packages/create-block-tutorial-template/package.json
+++ b/packages/create-block-tutorial-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-tutorial-template",
-	"version": "3.3.0",
+	"version": "3.4.0-prerelease",
 	"description": "This is a template for @wordpress/create-block that creates an example 'Copyright Date' block. This block is used in the official WordPress block development Quick Start Guide.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block/CHANGELOG.md b/packages/create-block/CHANGELOG.md
index 9d000b18d6aae..09ea7104ca465 100644
--- a/packages/create-block/CHANGELOG.md
+++ b/packages/create-block/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.34.0 (2024-01-24)
+
 ## 4.33.0 (2024-01-10)
 
 ### New Feature
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index b25dd050a1ef4..451dd94321e8b 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.33.0",
+	"version": "4.34.0-prerelease",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/customize-widgets/CHANGELOG.md b/packages/customize-widgets/CHANGELOG.md
index 5ebaf223d81a3..8aab25f38f4ea 100644
--- a/packages/customize-widgets/CHANGELOG.md
+++ b/packages/customize-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 5ee1b3ddb6037..401dd0882be2e 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data-controls/CHANGELOG.md b/packages/data-controls/CHANGELOG.md
index 964ab8830b1c0..150520638fcf9 100644
--- a/packages/data-controls/CHANGELOG.md
+++ b/packages/data-controls/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.19.0 (2024-01-24)
+
 ## 3.18.0 (2024-01-10)
 
 ## 3.17.0 (2023-12-13)
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index 2c1fc4dc011e7..bb584acfc985c 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.18.0",
+	"version": "3.19.0-prerelease",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/CHANGELOG.md b/packages/data/CHANGELOG.md
index 9c56bdfd15831..c41e0870c146b 100644
--- a/packages/data/CHANGELOG.md
+++ b/packages/data/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.20.0 (2024-01-24)
+
 ## 9.19.0 (2024-01-10)
 
 ## 9.18.0 (2023-12-13)
diff --git a/packages/data/package.json b/packages/data/package.json
index 135e9697ad1b1..a8785eaecf69c 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.19.0",
+	"version": "9.20.0-prerelease",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dataviews/CHANGELOG.md b/packages/dataviews/CHANGELOG.md
index 231fa05170a08..31cfbf5b135e3 100644
--- a/packages/dataviews/CHANGELOG.md
+++ b/packages/dataviews/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.4.0 (2024-01-24)
+
 ## 0.3.0 (2024-01-10)
 
 ## 0.2.0 (2023-12-13)
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index ddb51cc846985..b012d4ccbe5f3 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.3.0",
+	"version": "0.4.0-prerelease",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/date/CHANGELOG.md b/packages/date/CHANGELOG.md
index d6158df35df7d..c6d0bd5417b55 100644
--- a/packages/date/CHANGELOG.md
+++ b/packages/date/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/date/package.json b/packages/date/package.json
index 1553dba858339..5698d827bea13 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
index c147941c98e80..bb8641149d5fa 100644
--- a/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
+++ b/packages/dependency-extraction-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.1.0 (2024-01-24)
+
 ## 5.0.0 (2024-01-10)
 
 ### Breaking Changes
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index 06b9efd857d03..549146ee5e5d5 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "5.0.0",
+	"version": "5.1.0-prerelease",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/CHANGELOG.md b/packages/deprecated/CHANGELOG.md
index 3c10ecf640335..9c461615d7567 100644
--- a/packages/deprecated/CHANGELOG.md
+++ b/packages/deprecated/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index 7dc51929550c3..0a841851bfb53 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/CHANGELOG.md b/packages/docgen/CHANGELOG.md
index 8b3827a0c9e81..9d942d34d7bc6 100644
--- a/packages/docgen/CHANGELOG.md
+++ b/packages/docgen/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.59.0 (2024-01-24)
+
 ## 1.58.0 (2024-01-10)
 
 ## 1.57.0 (2023-12-13)
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index 844518cc1cbab..a190c70abef5a 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.58.0",
+	"version": "1.59.0-prerelease",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/CHANGELOG.md b/packages/dom-ready/CHANGELOG.md
index 05d3e7e79f07f..c446d2f3da984 100644
--- a/packages/dom-ready/CHANGELOG.md
+++ b/packages/dom-ready/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index d902a14c662f7..8d9e419a42b7b 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom/CHANGELOG.md b/packages/dom/CHANGELOG.md
index dda6f4e53b489..0cb7cd6668aa2 100644
--- a/packages/dom/CHANGELOG.md
+++ b/packages/dom/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 304653e4074b9..1a6c52c494547 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/CHANGELOG.md b/packages/e2e-test-utils-playwright/CHANGELOG.md
index 8f3e85e901191..d9cd5fafb439d 100644
--- a/packages/e2e-test-utils-playwright/CHANGELOG.md
+++ b/packages/e2e-test-utils-playwright/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.18.0 (2024-01-24)
+
 ## 0.17.0 (2024-01-10)
 
 ## 0.16.0 (2023-12-13)
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index 89bfb6ab66ae8..ce9328880fc74 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils-playwright",
-	"version": "0.17.0",
+	"version": "0.18.0-prerelease",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils/CHANGELOG.md b/packages/e2e-test-utils/CHANGELOG.md
index ef5b7f4de2f9d..8db0e2d5f8974 100644
--- a/packages/e2e-test-utils/CHANGELOG.md
+++ b/packages/e2e-test-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 10.21.0 (2024-01-24)
+
 ## 10.20.0 (2024-01-10)
 
 ## 10.19.0 (2023-12-13)
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index 6943658627510..0f8e9f5acda1f 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils",
-	"version": "10.20.0",
+	"version": "10.21.0-prerelease",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/CHANGELOG.md b/packages/e2e-tests/CHANGELOG.md
index bfd10d63c9271..7c1b7e325fe4c 100644
--- a/packages/e2e-tests/CHANGELOG.md
+++ b/packages/e2e-tests/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.21.0 (2024-01-24)
+
 ## 7.20.0 (2024-01-10)
 
 ## 7.19.0 (2023-12-13)
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index bd6620dadc6b9..4b1fc2a72aead 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.20.0",
+	"version": "7.21.0-prerelease",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/CHANGELOG.md b/packages/edit-post/CHANGELOG.md
index d029f33335102..af71c70cb879a 100644
--- a/packages/edit-post/CHANGELOG.md
+++ b/packages/edit-post/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.27.0 (2024-01-24)
+
 ## 7.26.0 (2024-01-10)
 
 ### Deprecations
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 4041630884f75..7126aa47901f0 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.26.0",
+	"version": "7.27.0-prerelease",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/CHANGELOG.md b/packages/edit-site/CHANGELOG.md
index d61e6028c0042..c4233c27a83b7 100644
--- a/packages/edit-site/CHANGELOG.md
+++ b/packages/edit-site/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.27.0 (2024-01-24)
+
 ## 5.26.0 (2024-01-10)
 
 ## 5.25.0 (2023-12-13)
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index 830d525ed060a..c5a580bef7f64 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.26.0",
+	"version": "5.27.0-prerelease",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-widgets/CHANGELOG.md b/packages/edit-widgets/CHANGELOG.md
index efef3dd674b80..a4982dc43f2f9 100644
--- a/packages/edit-widgets/CHANGELOG.md
+++ b/packages/edit-widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.27.0 (2024-01-24)
+
 ## 5.26.0 (2024-01-10)
 
 ## 5.25.0 (2023-12-13)
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 8861148d173ca..5d182dcdd2a83 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.26.0",
+	"version": "5.27.0-prerelease",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/CHANGELOG.md b/packages/editor/CHANGELOG.md
index 4484201d28fcc..c2f4498cba25c 100644
--- a/packages/editor/CHANGELOG.md
+++ b/packages/editor/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 13.27.0 (2024-01-24)
+
 ## 13.26.0 (2024-01-10)
 
 ### New Features
diff --git a/packages/editor/package.json b/packages/editor/package.json
index 63c81cbd5cc7f..b5bcfde3a3e1a 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.26.0",
+	"version": "13.27.0-prerelease",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/element/CHANGELOG.md b/packages/element/CHANGELOG.md
index f3edc7994bf7a..a0d0448a5b028 100644
--- a/packages/element/CHANGELOG.md
+++ b/packages/element/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.27.0 (2024-01-24)
+
 -   Started exporting the `PureComponent` React API ([#58076](https://github.com/WordPress/gutenberg/pull/58076)).
 
 ## 5.26.0 (2024-01-10)
diff --git a/packages/element/package.json b/packages/element/package.json
index 9f075bdfff56d..4c307abc5d807 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.26.0",
+	"version": "5.27.0-prerelease",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/env/CHANGELOG.md b/packages/env/CHANGELOG.md
index 154e8d36b3b44..b046a20e121bc 100644
--- a/packages/env/CHANGELOG.md
+++ b/packages/env/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.2.0 (2024-01-24)
+
 ## 9.1.0 (2024-01-10)
 
 ## 9.0.0 (2023-12-13)
diff --git a/packages/env/package.json b/packages/env/package.json
index 5036479faa532..b8b0d1b1b1f87 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "9.1.0",
+	"version": "9.2.0-prerelease",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/CHANGELOG.md b/packages/escape-html/CHANGELOG.md
index 8cb9c60a82c57..5788825a97685 100644
--- a/packages/escape-html/CHANGELOG.md
+++ b/packages/escape-html/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.50.0 (2024-01-24)
+
 ## 2.49.0 (2024-01-10)
 
 ## 2.48.0 (2023-12-13)
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index cfeabcb8c06e9..1ce2629d12095 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.49.0",
+	"version": "2.50.0-prerelease",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/CHANGELOG.md b/packages/eslint-plugin/CHANGELOG.md
index 10e82685d7b74..75461289eae1f 100644
--- a/packages/eslint-plugin/CHANGELOG.md
+++ b/packages/eslint-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 17.7.0 (2024-01-24)
+
 ## 17.6.0 (2024-01-10)
 
 ## 17.5.0 (2023-12-13)
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index b56a61ab16044..2f0475dc54df7 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.6.0",
+	"version": "17.7.0-prerelease",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/CHANGELOG.md b/packages/format-library/CHANGELOG.md
index 1ea92da62e1a4..82ed194d5d8ae 100644
--- a/packages/format-library/CHANGELOG.md
+++ b/packages/format-library/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index 280fd5d8c2042..71218253d1e13 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md
index 7b71f8d382f01..5d88e9743b0fd 100644
--- a/packages/hooks/CHANGELOG.md
+++ b/packages/hooks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 08fa1eb54819c..38e202437cd17 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/CHANGELOG.md b/packages/html-entities/CHANGELOG.md
index ba88048d21a5a..af17b93cc51b2 100644
--- a/packages/html-entities/CHANGELOG.md
+++ b/packages/html-entities/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index 10965eaf51fab..90b63c4ff01a6 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/CHANGELOG.md b/packages/i18n/CHANGELOG.md
index cca18773c660e..05d2260013477 100644
--- a/packages/i18n/CHANGELOG.md
+++ b/packages/i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index a2b2ed907cf96..1a00cf15f3988 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/icons/CHANGELOG.md b/packages/icons/CHANGELOG.md
index a5ca30a014f1d..f9b991cfc6345 100644
--- a/packages/icons/CHANGELOG.md
+++ b/packages/icons/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 9.41.0 (2024-01-24)
+
 ## 9.40.0 (2024-01-10)
 
 ## 9.39.0 (2023-12-13)
diff --git a/packages/icons/package.json b/packages/icons/package.json
index b94cb445b5760..d0718e411694b 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.40.0",
+	"version": "9.41.0-prerelease",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity-router/CHANGELOG.md b/packages/interactivity-router/CHANGELOG.md
index 5c4b2529a9ca6..06b0eb7ad8238 100644
--- a/packages/interactivity-router/CHANGELOG.md
+++ b/packages/interactivity-router/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.0.0 (2024-01-24)
+
 ### Breaking changes
 
 -   Initial version. ([57924](https://github.com/WordPress/gutenberg/pull/57924))
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
index 9afb103676c6b..d618a7ecbfadb 100644
--- a/packages/interactivity-router/package.json
+++ b/packages/interactivity-router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity-router",
-	"version": "0.1.0",
+	"version": "1.0.0-prerelease",
 	"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/CHANGELOG.md b/packages/interactivity/CHANGELOG.md
index 61f76482090f9..0c627c9f640c5 100644
--- a/packages/interactivity/CHANGELOG.md
+++ b/packages/interactivity/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.0.0 (2024-01-24)
+
 ### Enhancements
 
 -   Prevent the usage of Preact components in `wp-text`. ([#57879](https://github.com/WordPress/gutenberg/pull/57879))
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index 35c8dd2d85bd8..e795a963677e0 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "3.2.0",
+	"version": "4.0.0-prerelease",
 	"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interface/CHANGELOG.md b/packages/interface/CHANGELOG.md
index a684dc5a6a4ef..076b8e7ef5a27 100644
--- a/packages/interface/CHANGELOG.md
+++ b/packages/interface/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.27.0 (2024-01-24)
+
 ## 5.26.0 (2024-01-10)
 
 ## 5.25.0 (2023-12-13)
diff --git a/packages/interface/package.json b/packages/interface/package.json
index feebc542d3a78..e23f3f73dbff6 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.26.0",
+	"version": "5.27.0-prerelease",
 	"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/CHANGELOG.md b/packages/is-shallow-equal/CHANGELOG.md
index d7d7028dd5e40..1df74538788be 100644
--- a/packages/is-shallow-equal/CHANGELOG.md
+++ b/packages/is-shallow-equal/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index f2600696d54d6..9251313b1a31b 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/is-shallow-equal",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/CHANGELOG.md b/packages/jest-console/CHANGELOG.md
index f82d95dc08cd4..e894a4d5b2a7b 100644
--- a/packages/jest-console/CHANGELOG.md
+++ b/packages/jest-console/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 7.21.0 (2024-01-24)
+
 ## 7.20.0 (2024-01-10)
 
 ## 7.19.0 (2023-12-13)
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index 4dfdea8d61175..63cc4c0b146c9 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.20.0",
+	"version": "7.21.0-prerelease",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/CHANGELOG.md b/packages/jest-preset-default/CHANGELOG.md
index d0525fe187ad5..7d0fb49595b40 100644
--- a/packages/jest-preset-default/CHANGELOG.md
+++ b/packages/jest-preset-default/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 11.21.0 (2024-01-24)
+
 ## 11.20.0 (2024-01-10)
 
 ## 11.19.0 (2023-12-13)
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index aa787861ed89d..454b32c1b299d 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-preset-default",
-	"version": "11.20.0",
+	"version": "11.21.0-prerelease",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/CHANGELOG.md b/packages/jest-puppeteer-axe/CHANGELOG.md
index 89acfcecff4da..dffe7cdad5d6a 100644
--- a/packages/jest-puppeteer-axe/CHANGELOG.md
+++ b/packages/jest-puppeteer-axe/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.21.0 (2024-01-24)
+
 ## 6.20.0 (2024-01-10)
 
 ## 6.19.0 (2023-12-13)
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index d30e2ea781286..f2cf08d44381f 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-puppeteer-axe",
-	"version": "6.20.0",
+	"version": "6.21.0-prerelease",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/CHANGELOG.md b/packages/keyboard-shortcuts/CHANGELOG.md
index 2af0ab1eb2905..671a8c698d371 100644
--- a/packages/keyboard-shortcuts/CHANGELOG.md
+++ b/packages/keyboard-shortcuts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index 7f336adb52510..3478aca26615c 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/CHANGELOG.md b/packages/keycodes/CHANGELOG.md
index 6fda0148feaa8..a7a669a6f853d 100644
--- a/packages/keycodes/CHANGELOG.md
+++ b/packages/keycodes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index c5ce48ea8c2c3..ba09673d9984c 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/CHANGELOG.md b/packages/lazy-import/CHANGELOG.md
index 214141e0d476d..211f48839a2e8 100644
--- a/packages/lazy-import/CHANGELOG.md
+++ b/packages/lazy-import/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.37.0 (2024-01-24)
+
 ## 1.36.0 (2024-01-10)
 
 ## 1.35.0 (2023-12-13)
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index 8ad948e62408a..df1dbbeab69df 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.36.0",
+	"version": "1.37.0-prerelease",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/CHANGELOG.md b/packages/list-reusable-blocks/CHANGELOG.md
index 4c153c4539b35..5e578c0fe5af1 100644
--- a/packages/list-reusable-blocks/CHANGELOG.md
+++ b/packages/list-reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index 403809ae7d72a..02c3221db11af 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/list-reusable-blocks",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/CHANGELOG.md b/packages/media-utils/CHANGELOG.md
index d7a8c61e149bf..277698bd36533 100644
--- a/packages/media-utils/CHANGELOG.md
+++ b/packages/media-utils/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.41.0 (2024-01-24)
+
 ## 4.40.0 (2024-01-10)
 
 ## 4.39.0 (2023-12-13)
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index b01403efff06e..81b88631b25ed 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.40.0",
+	"version": "4.41.0-prerelease",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/notices/CHANGELOG.md b/packages/notices/CHANGELOG.md
index 03f5931c9899b..f58afb038780c 100644
--- a/packages/notices/CHANGELOG.md
+++ b/packages/notices/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.18.0 (2024-01-24)
+
 ## 4.17.0 (2024-01-10)
 
 ## 4.16.0 (2023-12-13)
diff --git a/packages/notices/package.json b/packages/notices/package.json
index 4f763cb6ed576..e6df2bb52933b 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.17.0",
+	"version": "4.18.0-prerelease",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/CHANGELOG.md b/packages/npm-package-json-lint-config/CHANGELOG.md
index 3978d24103d0c..cef063293c540 100644
--- a/packages/npm-package-json-lint-config/CHANGELOG.md
+++ b/packages/npm-package-json-lint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.35.0 (2024-01-24)
+
 ## 4.34.0 (2024-01-10)
 
 ## 4.33.0 (2023-12-13)
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index a05901155c0ad..348b8bbd226ed 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/npm-package-json-lint-config",
-	"version": "4.34.0",
+	"version": "4.35.0-prerelease",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/nux/CHANGELOG.md b/packages/nux/CHANGELOG.md
index e20bca5073fb2..e7d154ee59310 100644
--- a/packages/nux/CHANGELOG.md
+++ b/packages/nux/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 8.12.0 (2024-01-24)
+
 ## 8.11.0 (2024-01-10)
 
 ## 8.10.0 (2023-12-13)
diff --git a/packages/nux/package.json b/packages/nux/package.json
index e59b11cf9b951..c6d1685e70288 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.11.0",
+	"version": "8.12.0-prerelease",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/CHANGELOG.md b/packages/patterns/CHANGELOG.md
index 10fd61c03f939..92903f81dd78f 100644
--- a/packages/patterns/CHANGELOG.md
+++ b/packages/patterns/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.11.0 (2024-01-24)
+
 ## 1.10.0 (2024-01-10)
 
 ## 1.9.0 (2023-12-13)
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index bb130b52f8a98..a9ba16d3e06bd 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.10.0",
+	"version": "1.11.0-prerelease",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/plugins/CHANGELOG.md b/packages/plugins/CHANGELOG.md
index 4fc131ebbcbd4..65ad78884a51a 100644
--- a/packages/plugins/CHANGELOG.md
+++ b/packages/plugins/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.18.0 (2024-01-24)
+
 ## 6.17.0 (2024-01-10)
 
 ## 6.16.0 (2023-12-13)
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 9341fc509e6a8..48582e5b8ec41 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.17.0",
+	"version": "6.18.0-prerelease",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/CHANGELOG.md b/packages/postcss-plugins-preset/CHANGELOG.md
index 0599f401fe8e5..46cfd51cd350b 100644
--- a/packages/postcss-plugins-preset/CHANGELOG.md
+++ b/packages/postcss-plugins-preset/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.34.0 (2024-01-24)
+
 ## 4.33.0 (2024-01-10)
 
 ## 4.32.0 (2023-12-13)
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 0fce1ad734cb9..36461b07d08b3 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-plugins-preset",
-	"version": "4.33.0",
+	"version": "4.34.0-prerelease",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/CHANGELOG.md b/packages/postcss-themes/CHANGELOG.md
index 7cb02c0f86cef..54397c53240c8 100644
--- a/packages/postcss-themes/CHANGELOG.md
+++ b/packages/postcss-themes/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.33.0 (2024-01-24)
+
 ## 5.32.0 (2024-01-10)
 
 ## 5.31.0 (2023-12-13)
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index 9eb9b4c37a647..b2229f24ab978 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.32.0",
+	"version": "5.33.0-prerelease",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/CHANGELOG.md b/packages/preferences-persistence/CHANGELOG.md
index 7eb846236d15b..0c07b4a113012 100644
--- a/packages/preferences-persistence/CHANGELOG.md
+++ b/packages/preferences-persistence/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.42.0 (2024-01-24)
+
 ## 1.41.0 (2024-01-10)
 
 ## 1.40.0 (2023-12-13)
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index 1c40eeb80d3ba..6e18a896d0966 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.41.0",
+	"version": "1.42.0-prerelease",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/CHANGELOG.md b/packages/preferences/CHANGELOG.md
index 6d5b2a7c62c3c..c49590f509e8b 100644
--- a/packages/preferences/CHANGELOG.md
+++ b/packages/preferences/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.27.0 (2024-01-24)
+
 ## 3.26.0 (2024-01-10)
 
 ## 3.25.0 (2023-12-13)
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index 7cab99bfab032..c8d73bfd71990 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.26.0",
+	"version": "3.27.0-prerelease",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/prettier-config/CHANGELOG.md b/packages/prettier-config/CHANGELOG.md
index 4b05f17c43abf..02e3ecca7a792 100644
--- a/packages/prettier-config/CHANGELOG.md
+++ b/packages/prettier-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.7.0 (2024-01-24)
+
 ## 3.6.0 (2024-01-10)
 
 ## 3.5.0 (2023-12-13)
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 3dc8c49a3b1f0..2f62ad5657f59 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.6.0",
+	"version": "3.7.0-prerelease",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/CHANGELOG.md b/packages/primitives/CHANGELOG.md
index 0effaef62c372..dbe0c32eca13f 100644
--- a/packages/primitives/CHANGELOG.md
+++ b/packages/primitives/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.48.0 (2024-01-24)
+
 ## 3.47.0 (2024-01-10)
 
 ## 3.46.0 (2023-12-13)
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index 3aa66baee21da..abcf90ff540a9 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.47.0",
+	"version": "3.48.0-prerelease",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/CHANGELOG.md b/packages/priority-queue/CHANGELOG.md
index ccb782a2fb156..f76bd5449227f 100644
--- a/packages/priority-queue/CHANGELOG.md
+++ b/packages/priority-queue/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.50.0 (2024-01-24)
+
 ## 2.49.0 (2024-01-10)
 
 ## 2.48.0 (2023-12-13)
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index c06d29acf5585..acc95b75cb433 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.49.0",
+	"version": "2.50.0-prerelease",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/CHANGELOG.md b/packages/private-apis/CHANGELOG.md
index 3c2ce0530b5cf..b25bf5f168aba 100644
--- a/packages/private-apis/CHANGELOG.md
+++ b/packages/private-apis/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.32.0 (2024-01-24)
+
 ## 0.31.0 (2024-01-10)
 
 ## 0.30.0 (2023-12-13)
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 8bf5a27dbd8bb..6d784f490ecda 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.31.0",
+	"version": "0.32.0-prerelease",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/CHANGELOG.md b/packages/project-management-automation/CHANGELOG.md
index 69fc6f7498ca8..fe82db36d35b3 100644
--- a/packages/project-management-automation/CHANGELOG.md
+++ b/packages/project-management-automation/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.49.0 (2024-01-24)
+
 ## 1.48.0 (2024-01-10)
 
 ## 1.47.0 (2023-12-13)
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index 46fe20bf9e727..eea61157183ca 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/project-management-automation",
-	"version": "1.48.0",
+	"version": "1.49.0-prerelease",
 	"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/react-i18n/CHANGELOG.md b/packages/react-i18n/CHANGELOG.md
index 893d433ed76c4..3ba4a5bb3873f 100644
--- a/packages/react-i18n/CHANGELOG.md
+++ b/packages/react-i18n/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.48.0 (2024-01-24)
+
 ## 3.47.0 (2024-01-10)
 
 ## 3.46.0 (2023-12-13)
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index b7798f268c13d..670e3221aeb22 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.47.0",
+	"version": "3.48.0-prerelease",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
index fccabbc78e0cd..9ab27fe54a5e3 100644
--- a/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
+++ b/packages/readable-js-assets-webpack-plugin/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.33.0 (2024-01-24)
+
 ## 2.32.0 (2024-01-10)
 
 ## 2.31.0 (2023-12-13)
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index da6750fd93136..7a637365a5dbb 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/readable-js-assets-webpack-plugin",
-	"version": "2.32.0",
+	"version": "2.33.0-prerelease",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/CHANGELOG.md b/packages/redux-routine/CHANGELOG.md
index e79717f26f4d9..72a8d7e77f0eb 100644
--- a/packages/redux-routine/CHANGELOG.md
+++ b/packages/redux-routine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.50.0 (2024-01-24)
+
 ## 4.49.0 (2024-01-10)
 
 ## 4.48.0 (2023-12-13)
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index 347fa98b63510..ffba752ec44f5 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.49.0",
+	"version": "4.50.0-prerelease",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/CHANGELOG.md b/packages/reusable-blocks/CHANGELOG.md
index 6b53ab6270411..077606b4fd73f 100644
--- a/packages/reusable-blocks/CHANGELOG.md
+++ b/packages/reusable-blocks/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index 947d85834784b..abc1dee18aadb 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/CHANGELOG.md b/packages/rich-text/CHANGELOG.md
index 18e1f53183021..2002f84f96622 100644
--- a/packages/rich-text/CHANGELOG.md
+++ b/packages/rich-text/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 6.27.0 (2024-01-24)
+
 ## 6.26.0 (2024-01-10)
 
 ## 6.25.0 (2023-12-13)
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index ef935eea5686f..b7a5e4332ef06 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.26.0",
+	"version": "6.27.0-prerelease",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/router/CHANGELOG.md b/packages/router/CHANGELOG.md
index 5a931c8c945db..66a45653dc1ac 100644
--- a/packages/router/CHANGELOG.md
+++ b/packages/router/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.19.0 (2024-01-24)
+
 ## 0.18.0 (2024-01-10)
 
 ## 0.17.0 (2023-12-13)
diff --git a/packages/router/package.json b/packages/router/package.json
index 4d882bdc5cd9d..77325efc14c78 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.18.0",
+	"version": "0.19.0-prerelease",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/CHANGELOG.md b/packages/scripts/CHANGELOG.md
index 34c2f6049a3da..1983234e31ba9 100644
--- a/packages/scripts/CHANGELOG.md
+++ b/packages/scripts/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 27.1.0 (2024-01-24)
+
 ## 27.0.0 (2024-01-10)
 
 ### New Features
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index b270cac5ea7bf..692a35db5a7ee 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "27.0.0",
+	"version": "27.1.0-prerelease",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/server-side-render/CHANGELOG.md b/packages/server-side-render/CHANGELOG.md
index 245c503e45bb2..b00b60ed1267f 100644
--- a/packages/server-side-render/CHANGELOG.md
+++ b/packages/server-side-render/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 4.27.0 (2024-01-24)
+
 ## 4.26.0 (2024-01-10)
 
 ## 4.25.0 (2023-12-13)
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index 221c36cb20072..743d1a71f1de2 100644
--- a/packages/server-side-render/package.json
+++ b/packages/server-side-render/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/server-side-render",
-	"version": "4.26.0",
+	"version": "4.27.0-prerelease",
 	"description": "The component used with WordPress to server-side render a preview of dynamic blocks to display in the editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/shortcode/CHANGELOG.md b/packages/shortcode/CHANGELOG.md
index 05eb9e9e24526..bcc425504aff9 100644
--- a/packages/shortcode/CHANGELOG.md
+++ b/packages/shortcode/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index 3088836074b9d..1e5ae3a67c6c2 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/style-engine/CHANGELOG.md b/packages/style-engine/CHANGELOG.md
index 2c3a6970e3171..7bca7483bb09e 100644
--- a/packages/style-engine/CHANGELOG.md
+++ b/packages/style-engine/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 1.33.0 (2024-01-24)
+
 ## 1.32.0 (2024-01-10)
 
 ## 1.31.0 (2023-12-13)
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index 4c318049e4fe5..93d9fe693c741 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.32.0",
+	"version": "1.33.0-prerelease",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/stylelint-config/CHANGELOG.md b/packages/stylelint-config/CHANGELOG.md
index eb82f9f916d4e..0e54ebd8cab00 100644
--- a/packages/stylelint-config/CHANGELOG.md
+++ b/packages/stylelint-config/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 21.33.0 (2024-01-24)
+
 ## 21.32.0 (2024-01-10)
 
 ## 21.31.0 (2023-12-13)
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index 40bc6becf03fb..49921e5357069 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.32.0",
+	"version": "21.33.0-prerelease",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
diff --git a/packages/sync/CHANGELOG.md b/packages/sync/CHANGELOG.md
index 353e3dec2c583..7f56c2b2b408e 100644
--- a/packages/sync/CHANGELOG.md
+++ b/packages/sync/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.12.0 (2024-01-24)
+
 ## 0.11.0 (2024-01-10)
 
 ## 0.10.0 (2023-12-13)
diff --git a/packages/sync/package.json b/packages/sync/package.json
index e0e07f11a121b..6b7b3530af083 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.11.0",
+	"version": "0.12.0-prerelease",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/token-list/CHANGELOG.md b/packages/token-list/CHANGELOG.md
index b9f1006ecbb3a..ca991b4b733a3 100644
--- a/packages/token-list/CHANGELOG.md
+++ b/packages/token-list/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.50.0 (2024-01-24)
+
 ## 2.49.0 (2024-01-10)
 
 ## 2.48.0 (2023-12-13)
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index 6e47980844ca2..7c05afcdfb135 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.49.0",
+	"version": "2.50.0-prerelease",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/undo-manager/CHANGELOG.md b/packages/undo-manager/CHANGELOG.md
index 0a3f1ffa8ba57..96590cd27a58b 100644
--- a/packages/undo-manager/CHANGELOG.md
+++ b/packages/undo-manager/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 0.10.0 (2024-01-24)
+
 ## 0.9.0 (2024-01-10)
 
 ## 0.8.0 (2023-12-13)
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index fde1fcf604cbc..83f37faaad14a 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.9.0",
+	"version": "0.10.0-prerelease",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/url/CHANGELOG.md b/packages/url/CHANGELOG.md
index f6befc2b0a8b0..fb8182457d8b2 100644
--- a/packages/url/CHANGELOG.md
+++ b/packages/url/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.51.0 (2024-01-24)
+
 ## 3.50.0 (2024-01-10)
 
 ## 3.49.0 (2023-12-13)
diff --git a/packages/url/package.json b/packages/url/package.json
index 0c2d9993f49e9..7217b3634e191 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.50.0",
+	"version": "3.51.0-prerelease",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/viewport/CHANGELOG.md b/packages/viewport/CHANGELOG.md
index 170371171003c..cf6d7f6cb493f 100644
--- a/packages/viewport/CHANGELOG.md
+++ b/packages/viewport/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 5.27.0 (2024-01-24)
+
 ## 5.26.0 (2024-01-10)
 
 ## 5.25.0 (2023-12-13)
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index dd11ff8db2ba6..30a9b899f4097 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.26.0",
+	"version": "5.27.0-prerelease",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/warning/CHANGELOG.md b/packages/warning/CHANGELOG.md
index 20cae1aa42dc3..39c87ef4f3cff 100644
--- a/packages/warning/CHANGELOG.md
+++ b/packages/warning/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 2.50.0 (2024-01-24)
+
 ## 2.49.0 (2024-01-10)
 
 ## 2.48.0 (2023-12-13)
diff --git a/packages/warning/package.json b/packages/warning/package.json
index 134d58c060d08..87f9e3bce0e6f 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.49.0",
+	"version": "2.50.0-prerelease",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/widgets/CHANGELOG.md b/packages/widgets/CHANGELOG.md
index 3e79836af4d93..ce5da6d2af1b2 100644
--- a/packages/widgets/CHANGELOG.md
+++ b/packages/widgets/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.27.0 (2024-01-24)
+
 ## 3.26.0 (2024-01-10)
 
 ## 3.25.0 (2023-12-13)
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 8f04224c63fb2..43df8ea07af99 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.26.0",
+	"version": "3.27.0-prerelease",
 	"description": "Functionality used by the widgets block editor in the Widgets screen and the Customizer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/wordcount/CHANGELOG.md b/packages/wordcount/CHANGELOG.md
index 3b1ee558fbfe7..ad67f739bf47e 100644
--- a/packages/wordcount/CHANGELOG.md
+++ b/packages/wordcount/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+## 3.50.0 (2024-01-24)
+
 ## 3.49.0 (2024-01-10)
 
 ## 3.48.0 (2023-12-13)
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index b8834399c8f28..141e39acf6b0b 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.49.0",
+	"version": "3.50.0-prerelease",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 323359ccc206a4ee9b045bbc2db94de63929d410 Mon Sep 17 00:00:00 2001
From: Gutenberg Repository Automation <gutenberg@wordpress.org>
Date: Wed, 24 Jan 2024 21:38:20 +0000
Subject: [PATCH 290/296] chore(release): publish

 - @wordpress/a11y@3.50.0
 - @wordpress/annotations@2.50.0
 - @wordpress/api-fetch@6.47.0
 - @wordpress/autop@3.50.0
 - @wordpress/babel-plugin-import-jsx-pragma@4.33.0
 - @wordpress/babel-plugin-makepot@5.34.0
 - @wordpress/babel-preset-default@7.34.0
 - @wordpress/base-styles@4.41.0
 - @wordpress/blob@3.50.0
 - @wordpress/block-directory@4.27.0
 - @wordpress/block-editor@12.18.0
 - @wordpress/block-library@8.27.0
 - @wordpress/block-serialization-default-parser@4.50.0
 - @wordpress/block-serialization-spec-parser@4.50.0
 - @wordpress/blocks@12.27.0
 - @wordpress/browserslist-config@5.33.0
 - @wordpress/commands@0.21.0
 - @wordpress/components@25.16.0
 - @wordpress/compose@6.27.0
 - @wordpress/core-commands@0.19.0
 - @wordpress/core-data@6.27.0
 - @wordpress/create-block@4.34.0
 - @wordpress/create-block-interactive-template@1.13.0
 - @wordpress/create-block-tutorial-template@3.4.0
 - @wordpress/customize-widgets@4.27.0
 - @wordpress/data@9.20.0
 - @wordpress/data-controls@3.19.0
 - @wordpress/dataviews@0.4.0
 - @wordpress/date@4.50.0
 - @wordpress/dependency-extraction-webpack-plugin@5.1.0
 - @wordpress/deprecated@3.50.0
 - @wordpress/docgen@1.59.0
 - @wordpress/dom@3.50.0
 - @wordpress/dom-ready@3.50.0
 - @wordpress/e2e-test-utils@10.21.0
 - @wordpress/e2e-test-utils-playwright@0.18.0
 - @wordpress/e2e-tests@7.21.0
 - @wordpress/edit-post@7.27.0
 - @wordpress/edit-site@5.27.0
 - @wordpress/edit-widgets@5.27.0
 - @wordpress/editor@13.27.0
 - @wordpress/element@5.27.0
 - @wordpress/env@9.2.0
 - @wordpress/escape-html@2.50.0
 - @wordpress/eslint-plugin@17.7.0
 - @wordpress/format-library@4.27.0
 - @wordpress/hooks@3.50.0
 - @wordpress/html-entities@3.50.0
 - @wordpress/i18n@4.50.0
 - @wordpress/icons@9.41.0
 - @wordpress/interactivity@4.0.0
 - @wordpress/interactivity-router@1.0.0
 - @wordpress/interface@5.27.0
 - @wordpress/is-shallow-equal@4.50.0
 - @wordpress/jest-console@7.21.0
 - @wordpress/jest-preset-default@11.21.0
 - @wordpress/jest-puppeteer-axe@6.21.0
 - @wordpress/keyboard-shortcuts@4.27.0
 - @wordpress/keycodes@3.50.0
 - @wordpress/lazy-import@1.37.0
 - @wordpress/list-reusable-blocks@4.27.0
 - @wordpress/media-utils@4.41.0
 - @wordpress/notices@4.18.0
 - @wordpress/npm-package-json-lint-config@4.35.0
 - @wordpress/nux@8.12.0
 - @wordpress/patterns@1.11.0
 - @wordpress/plugins@6.18.0
 - @wordpress/postcss-plugins-preset@4.34.0
 - @wordpress/postcss-themes@5.33.0
 - @wordpress/preferences@3.27.0
 - @wordpress/preferences-persistence@1.42.0
 - @wordpress/prettier-config@3.7.0
 - @wordpress/primitives@3.48.0
 - @wordpress/priority-queue@2.50.0
 - @wordpress/private-apis@0.32.0
 - @wordpress/project-management-automation@1.49.0
 - @wordpress/react-i18n@3.48.0
 - @wordpress/readable-js-assets-webpack-plugin@2.33.0
 - @wordpress/redux-routine@4.50.0
 - @wordpress/reusable-blocks@4.27.0
 - @wordpress/rich-text@6.27.0
 - @wordpress/router@0.19.0
 - @wordpress/scripts@27.1.0
 - @wordpress/server-side-render@4.27.0
 - @wordpress/shortcode@3.50.0
 - @wordpress/style-engine@1.33.0
 - @wordpress/stylelint-config@21.33.0
 - @wordpress/sync@0.12.0
 - @wordpress/token-list@2.50.0
 - @wordpress/undo-manager@0.10.0
 - @wordpress/url@3.51.0
 - @wordpress/viewport@5.27.0
 - @wordpress/warning@2.50.0
 - @wordpress/widgets@3.27.0
 - @wordpress/wordcount@3.50.0
---
 package-lock.json                             | 188 +++++++++---------
 packages/a11y/package.json                    |   2 +-
 packages/annotations/package.json             |   2 +-
 packages/api-fetch/package.json               |   2 +-
 packages/autop/package.json                   |   2 +-
 .../package.json                              |   2 +-
 packages/babel-plugin-makepot/package.json    |   2 +-
 packages/babel-preset-default/package.json    |   2 +-
 packages/base-styles/package.json             |   2 +-
 packages/blob/package.json                    |   2 +-
 packages/block-directory/package.json         |   2 +-
 packages/block-editor/package.json            |   2 +-
 packages/block-library/package.json           |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 packages/blocks/package.json                  |   2 +-
 packages/browserslist-config/package.json     |   2 +-
 packages/commands/package.json                |   2 +-
 packages/components/package.json              |   2 +-
 packages/compose/package.json                 |   2 +-
 packages/core-commands/package.json           |   2 +-
 packages/core-data/package.json               |   2 +-
 .../package.json                              |   2 +-
 .../package.json                              |   2 +-
 packages/create-block/package.json            |   2 +-
 packages/customize-widgets/package.json       |   2 +-
 packages/data-controls/package.json           |   2 +-
 packages/data/package.json                    |   2 +-
 packages/dataviews/package.json               |   2 +-
 packages/date/package.json                    |   2 +-
 .../package.json                              |   2 +-
 packages/deprecated/package.json              |   2 +-
 packages/docgen/package.json                  |   2 +-
 packages/dom-ready/package.json               |   2 +-
 packages/dom/package.json                     |   2 +-
 .../e2e-test-utils-playwright/package.json    |   2 +-
 packages/e2e-test-utils/package.json          |   2 +-
 packages/e2e-tests/package.json               |   2 +-
 packages/edit-post/package.json               |   2 +-
 packages/edit-site/package.json               |   2 +-
 packages/edit-widgets/package.json            |   2 +-
 packages/editor/package.json                  |   2 +-
 packages/element/package.json                 |   2 +-
 packages/env/package.json                     |   2 +-
 packages/escape-html/package.json             |   2 +-
 packages/eslint-plugin/package.json           |   2 +-
 packages/format-library/package.json          |   2 +-
 packages/hooks/package.json                   |   2 +-
 packages/html-entities/package.json           |   2 +-
 packages/i18n/package.json                    |   2 +-
 packages/icons/package.json                   |   2 +-
 packages/interactivity-router/package.json    |   2 +-
 packages/interactivity/package.json           |   2 +-
 packages/interface/package.json               |   2 +-
 packages/is-shallow-equal/package.json        |   2 +-
 packages/jest-console/package.json            |   2 +-
 packages/jest-preset-default/package.json     |   2 +-
 packages/jest-puppeteer-axe/package.json      |   2 +-
 packages/keyboard-shortcuts/package.json      |   2 +-
 packages/keycodes/package.json                |   2 +-
 packages/lazy-import/package.json             |   2 +-
 packages/list-reusable-blocks/package.json    |   2 +-
 packages/media-utils/package.json             |   2 +-
 packages/notices/package.json                 |   2 +-
 .../npm-package-json-lint-config/package.json |   2 +-
 packages/nux/package.json                     |   2 +-
 packages/patterns/package.json                |   2 +-
 packages/plugins/package.json                 |   2 +-
 packages/postcss-plugins-preset/package.json  |   2 +-
 packages/postcss-themes/package.json          |   2 +-
 packages/preferences-persistence/package.json |   2 +-
 packages/preferences/package.json             |   2 +-
 packages/prettier-config/package.json         |   2 +-
 packages/primitives/package.json              |   2 +-
 packages/priority-queue/package.json          |   2 +-
 packages/private-apis/package.json            |   2 +-
 .../package.json                              |   2 +-
 packages/react-i18n/package.json              |   2 +-
 .../package.json                              |   2 +-
 packages/redux-routine/package.json           |   2 +-
 packages/reusable-blocks/package.json         |   2 +-
 packages/rich-text/package.json               |   2 +-
 packages/router/package.json                  |   2 +-
 packages/scripts/package.json                 |   2 +-
 packages/server-side-render/package.json      |   2 +-
 packages/shortcode/package.json               |   2 +-
 packages/style-engine/package.json            |   2 +-
 packages/stylelint-config/package.json        |   2 +-
 packages/sync/package.json                    |   2 +-
 packages/token-list/package.json              |   2 +-
 packages/undo-manager/package.json            |   2 +-
 packages/url/package.json                     |   2 +-
 packages/viewport/package.json                |   2 +-
 packages/warning/package.json                 |   2 +-
 packages/widgets/package.json                 |   2 +-
 packages/wordcount/package.json               |   2 +-
 96 files changed, 189 insertions(+), 189 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 0ce833bb35e5e..c6669febe69f8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -53780,7 +53780,7 @@
 		},
 		"packages/a11y": {
 			"name": "@wordpress/a11y",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53793,7 +53793,7 @@
 		},
 		"packages/annotations": {
 			"name": "@wordpress/annotations",
-			"version": "2.49.0",
+			"version": "2.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53821,7 +53821,7 @@
 		},
 		"packages/api-fetch": {
 			"name": "@wordpress/api-fetch",
-			"version": "6.46.0",
+			"version": "6.47.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53834,7 +53834,7 @@
 		},
 		"packages/autop": {
 			"name": "@wordpress/autop",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53845,7 +53845,7 @@
 		},
 		"packages/babel-plugin-import-jsx-pragma": {
 			"name": "@wordpress/babel-plugin-import-jsx-pragma",
-			"version": "4.32.0",
+			"version": "4.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -53857,7 +53857,7 @@
 		},
 		"packages/babel-plugin-makepot": {
 			"name": "@wordpress/babel-plugin-makepot",
-			"version": "5.33.0",
+			"version": "5.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53874,7 +53874,7 @@
 		},
 		"packages/babel-preset-default": {
 			"name": "@wordpress/babel-preset-default",
-			"version": "7.33.0",
+			"version": "7.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -53897,13 +53897,13 @@
 		},
 		"packages/base-styles": {
 			"name": "@wordpress/base-styles",
-			"version": "4.40.0",
+			"version": "4.41.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/blob": {
 			"name": "@wordpress/blob",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -53914,7 +53914,7 @@
 		},
 		"packages/block-directory": {
 			"name": "@wordpress/block-directory",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -53949,7 +53949,7 @@
 		},
 		"packages/block-editor": {
 			"name": "@wordpress/block-editor",
-			"version": "12.17.0",
+			"version": "12.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54046,7 +54046,7 @@
 		},
 		"packages/block-library": {
 			"name": "@wordpress/block-library",
-			"version": "8.26.0",
+			"version": "8.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54110,7 +54110,7 @@
 		},
 		"packages/block-serialization-default-parser": {
 			"name": "@wordpress/block-serialization-default-parser",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54121,7 +54121,7 @@
 		},
 		"packages/block-serialization-spec-parser": {
 			"name": "@wordpress/block-serialization-spec-parser",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"pegjs": "^0.10.0",
@@ -54133,7 +54133,7 @@
 		},
 		"packages/blocks": {
 			"name": "@wordpress/blocks",
-			"version": "12.26.0",
+			"version": "12.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54187,7 +54187,7 @@
 		},
 		"packages/browserslist-config": {
 			"name": "@wordpress/browserslist-config",
-			"version": "5.32.0",
+			"version": "5.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -54196,7 +54196,7 @@
 		},
 		"packages/commands": {
 			"name": "@wordpress/commands",
-			"version": "0.20.0",
+			"version": "0.21.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54221,7 +54221,7 @@
 		},
 		"packages/components": {
 			"name": "@wordpress/components",
-			"version": "25.15.0",
+			"version": "25.16.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@ariakit/react": "^0.3.12",
@@ -54326,7 +54326,7 @@
 		},
 		"packages/compose": {
 			"name": "@wordpress/compose",
-			"version": "6.26.0",
+			"version": "6.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54362,7 +54362,7 @@
 		},
 		"packages/core-commands": {
 			"name": "@wordpress/core-commands",
-			"version": "0.18.0",
+			"version": "0.19.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54387,7 +54387,7 @@
 		},
 		"packages/core-data": {
 			"name": "@wordpress/core-data",
-			"version": "6.26.0",
+			"version": "6.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54431,7 +54431,7 @@
 		},
 		"packages/create-block": {
 			"name": "@wordpress/create-block",
-			"version": "4.33.0",
+			"version": "4.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54459,13 +54459,13 @@
 		},
 		"packages/create-block-tutorial-template": {
 			"name": "@wordpress/create-block-tutorial-template",
-			"version": "3.3.0",
+			"version": "3.4.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later"
 		},
 		"packages/customize-widgets": {
 			"name": "@wordpress/customize-widgets",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54502,7 +54502,7 @@
 		},
 		"packages/data": {
 			"name": "@wordpress/data",
-			"version": "9.19.0",
+			"version": "9.20.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54530,7 +54530,7 @@
 		},
 		"packages/data-controls": {
 			"name": "@wordpress/data-controls",
-			"version": "3.18.0",
+			"version": "3.19.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54547,7 +54547,7 @@
 		},
 		"packages/dataviews": {
 			"name": "@wordpress/dataviews",
-			"version": "0.3.0",
+			"version": "0.4.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54572,7 +54572,7 @@
 		},
 		"packages/date": {
 			"name": "@wordpress/date",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54586,7 +54586,7 @@
 		},
 		"packages/dependency-extraction-webpack-plugin": {
 			"name": "@wordpress/dependency-extraction-webpack-plugin",
-			"version": "5.0.0",
+			"version": "5.1.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54601,7 +54601,7 @@
 		},
 		"packages/deprecated": {
 			"name": "@wordpress/deprecated",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54613,7 +54613,7 @@
 		},
 		"packages/docgen": {
 			"name": "@wordpress/docgen",
-			"version": "1.58.0",
+			"version": "1.59.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54631,7 +54631,7 @@
 		},
 		"packages/dom": {
 			"name": "@wordpress/dom",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54643,7 +54643,7 @@
 		},
 		"packages/dom-ready": {
 			"name": "@wordpress/dom-ready",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -54654,7 +54654,7 @@
 		},
 		"packages/e2e-test-utils": {
 			"name": "@wordpress/e2e-test-utils",
-			"version": "10.20.0",
+			"version": "10.21.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54676,7 +54676,7 @@
 		},
 		"packages/e2e-test-utils-playwright": {
 			"name": "@wordpress/e2e-test-utils-playwright",
-			"version": "0.17.0",
+			"version": "0.18.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54699,7 +54699,7 @@
 		},
 		"packages/e2e-tests": {
 			"name": "@wordpress/e2e-tests",
-			"version": "7.20.0",
+			"version": "7.21.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -54738,7 +54738,7 @@
 		},
 		"packages/edit-post": {
 			"name": "@wordpress/edit-post",
-			"version": "7.26.0",
+			"version": "7.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54786,7 +54786,7 @@
 		},
 		"packages/edit-site": {
 			"name": "@wordpress/edit-site",
-			"version": "5.26.0",
+			"version": "5.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54851,7 +54851,7 @@
 		},
 		"packages/edit-widgets": {
 			"name": "@wordpress/edit-widgets",
-			"version": "5.26.0",
+			"version": "5.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54894,7 +54894,7 @@
 		},
 		"packages/editor": {
 			"name": "@wordpress/editor",
-			"version": "13.26.0",
+			"version": "13.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54945,7 +54945,7 @@
 		},
 		"packages/element": {
 			"name": "@wordpress/element",
-			"version": "5.26.0",
+			"version": "5.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -54963,7 +54963,7 @@
 		},
 		"packages/env": {
 			"name": "@wordpress/env",
-			"version": "9.1.0",
+			"version": "9.2.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55097,7 +55097,7 @@
 		},
 		"packages/escape-html": {
 			"name": "@wordpress/escape-html",
-			"version": "2.49.0",
+			"version": "2.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55108,7 +55108,7 @@
 		},
 		"packages/eslint-plugin": {
 			"name": "@wordpress/eslint-plugin",
-			"version": "17.6.0",
+			"version": "17.7.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55151,7 +55151,7 @@
 		},
 		"packages/format-library": {
 			"name": "@wordpress/format-library",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55178,7 +55178,7 @@
 		},
 		"packages/hooks": {
 			"name": "@wordpress/hooks",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55189,7 +55189,7 @@
 		},
 		"packages/html-entities": {
 			"name": "@wordpress/html-entities",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55200,7 +55200,7 @@
 		},
 		"packages/i18n": {
 			"name": "@wordpress/i18n",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55219,7 +55219,7 @@
 		},
 		"packages/icons": {
 			"name": "@wordpress/icons",
-			"version": "9.40.0",
+			"version": "9.41.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55232,7 +55232,7 @@
 		},
 		"packages/interactivity": {
 			"name": "@wordpress/interactivity",
-			"version": "3.2.0",
+			"version": "4.0.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@preact/signals": "^1.2.2",
@@ -55245,7 +55245,7 @@
 		},
 		"packages/interactivity-router": {
 			"name": "@wordpress/interactivity-router",
-			"version": "0.1.0",
+			"version": "1.0.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@wordpress/interactivity": "file:../interactivity"
@@ -55305,7 +55305,7 @@
 		},
 		"packages/interface": {
 			"name": "@wordpress/interface",
-			"version": "5.26.0",
+			"version": "5.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55333,7 +55333,7 @@
 		},
 		"packages/is-shallow-equal": {
 			"name": "@wordpress/is-shallow-equal",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55344,7 +55344,7 @@
 		},
 		"packages/jest-console": {
 			"name": "@wordpress/jest-console",
-			"version": "7.20.0",
+			"version": "7.21.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55360,7 +55360,7 @@
 		},
 		"packages/jest-preset-default": {
 			"name": "@wordpress/jest-preset-default",
-			"version": "11.20.0",
+			"version": "11.21.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55377,7 +55377,7 @@
 		},
 		"packages/jest-puppeteer-axe": {
 			"name": "@wordpress/jest-puppeteer-axe",
-			"version": "6.20.0",
+			"version": "6.21.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55399,7 +55399,7 @@
 		},
 		"packages/keyboard-shortcuts": {
 			"name": "@wordpress/keyboard-shortcuts",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55417,7 +55417,7 @@
 		},
 		"packages/keycodes": {
 			"name": "@wordpress/keycodes",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55429,7 +55429,7 @@
 		},
 		"packages/lazy-import": {
 			"name": "@wordpress/lazy-import",
-			"version": "1.36.0",
+			"version": "1.37.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55443,7 +55443,7 @@
 		},
 		"packages/list-reusable-blocks": {
 			"name": "@wordpress/list-reusable-blocks",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55465,7 +55465,7 @@
 		},
 		"packages/media-utils": {
 			"name": "@wordpress/media-utils",
-			"version": "4.40.0",
+			"version": "4.41.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55480,7 +55480,7 @@
 		},
 		"packages/notices": {
 			"name": "@wordpress/notices",
-			"version": "4.17.0",
+			"version": "4.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55496,7 +55496,7 @@
 		},
 		"packages/npm-package-json-lint-config": {
 			"name": "@wordpress/npm-package-json-lint-config",
-			"version": "4.34.0",
+			"version": "4.35.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55508,7 +55508,7 @@
 		},
 		"packages/nux": {
 			"name": "@wordpress/nux",
-			"version": "8.11.0",
+			"version": "8.12.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55531,7 +55531,7 @@
 		},
 		"packages/patterns": {
 			"name": "@wordpress/patterns",
-			"version": "1.10.0",
+			"version": "1.11.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55561,7 +55561,7 @@
 		},
 		"packages/plugins": {
 			"name": "@wordpress/plugins",
-			"version": "6.17.0",
+			"version": "6.18.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55583,7 +55583,7 @@
 		},
 		"packages/postcss-plugins-preset": {
 			"name": "@wordpress/postcss-plugins-preset",
-			"version": "4.33.0",
+			"version": "4.34.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55599,7 +55599,7 @@
 		},
 		"packages/postcss-themes": {
 			"name": "@wordpress/postcss-themes",
-			"version": "5.32.0",
+			"version": "5.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55611,7 +55611,7 @@
 		},
 		"packages/preferences": {
 			"name": "@wordpress/preferences",
-			"version": "3.26.0",
+			"version": "3.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55636,7 +55636,7 @@
 		},
 		"packages/preferences-persistence": {
 			"name": "@wordpress/preferences-persistence",
-			"version": "1.41.0",
+			"version": "1.42.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55648,7 +55648,7 @@
 		},
 		"packages/prettier-config": {
 			"name": "@wordpress/prettier-config",
-			"version": "3.6.0",
+			"version": "3.7.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55660,7 +55660,7 @@
 		},
 		"packages/primitives": {
 			"name": "@wordpress/primitives",
-			"version": "3.47.0",
+			"version": "3.48.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55673,7 +55673,7 @@
 		},
 		"packages/priority-queue": {
 			"name": "@wordpress/priority-queue",
-			"version": "2.49.0",
+			"version": "2.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55685,7 +55685,7 @@
 		},
 		"packages/private-apis": {
 			"name": "@wordpress/private-apis",
-			"version": "0.31.0",
+			"version": "0.32.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -55696,7 +55696,7 @@
 		},
 		"packages/project-management-automation": {
 			"name": "@wordpress/project-management-automation",
-			"version": "1.48.0",
+			"version": "1.49.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -55709,7 +55709,7 @@
 		},
 		"packages/react-i18n": {
 			"name": "@wordpress/react-i18n",
-			"version": "3.47.0",
+			"version": "3.48.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55857,7 +55857,7 @@
 		},
 		"packages/readable-js-assets-webpack-plugin": {
 			"name": "@wordpress/readable-js-assets-webpack-plugin",
-			"version": "2.32.0",
+			"version": "2.33.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"engines": {
@@ -55869,7 +55869,7 @@
 		},
 		"packages/redux-routine": {
 			"name": "@wordpress/redux-routine",
-			"version": "4.49.0",
+			"version": "4.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55913,7 +55913,7 @@
 		},
 		"packages/reusable-blocks": {
 			"name": "@wordpress/reusable-blocks",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55939,7 +55939,7 @@
 		},
 		"packages/rich-text": {
 			"name": "@wordpress/rich-text",
-			"version": "6.26.0",
+			"version": "6.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55963,7 +55963,7 @@
 		},
 		"packages/router": {
 			"name": "@wordpress/router",
-			"version": "0.18.0",
+			"version": "0.19.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -55981,7 +55981,7 @@
 		},
 		"packages/scripts": {
 			"name": "@wordpress/scripts",
-			"version": "27.0.0",
+			"version": "27.1.0",
 			"dev": true,
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
@@ -56203,7 +56203,7 @@
 		},
 		"packages/server-side-render": {
 			"name": "@wordpress/server-side-render",
-			"version": "4.26.0",
+			"version": "4.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56228,7 +56228,7 @@
 		},
 		"packages/shortcode": {
 			"name": "@wordpress/shortcode",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56240,7 +56240,7 @@
 		},
 		"packages/style-engine": {
 			"name": "@wordpress/style-engine",
-			"version": "1.32.0",
+			"version": "1.33.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56252,7 +56252,7 @@
 		},
 		"packages/stylelint-config": {
 			"name": "@wordpress/stylelint-config",
-			"version": "21.32.0",
+			"version": "21.33.0",
 			"dev": true,
 			"license": "MIT",
 			"dependencies": {
@@ -56268,7 +56268,7 @@
 		},
 		"packages/sync": {
 			"name": "@wordpress/sync",
-			"version": "0.11.0",
+			"version": "0.12.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56288,7 +56288,7 @@
 		},
 		"packages/token-list": {
 			"name": "@wordpress/token-list",
-			"version": "2.49.0",
+			"version": "2.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
@@ -56299,7 +56299,7 @@
 		},
 		"packages/undo-manager": {
 			"name": "@wordpress/undo-manager",
-			"version": "0.9.0",
+			"version": "0.10.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56311,7 +56311,7 @@
 		},
 		"packages/url": {
 			"name": "@wordpress/url",
-			"version": "3.50.0",
+			"version": "3.51.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56323,7 +56323,7 @@
 		},
 		"packages/viewport": {
 			"name": "@wordpress/viewport",
-			"version": "5.26.0",
+			"version": "5.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56340,7 +56340,7 @@
 		},
 		"packages/warning": {
 			"name": "@wordpress/warning",
-			"version": "2.49.0",
+			"version": "2.50.0",
 			"license": "GPL-2.0-or-later",
 			"engines": {
 				"node": ">=12"
@@ -56348,7 +56348,7 @@
 		},
 		"packages/widgets": {
 			"name": "@wordpress/widgets",
-			"version": "3.26.0",
+			"version": "3.27.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0",
@@ -56372,7 +56372,7 @@
 		},
 		"packages/wordcount": {
 			"name": "@wordpress/wordcount",
-			"version": "3.49.0",
+			"version": "3.50.0",
 			"license": "GPL-2.0-or-later",
 			"dependencies": {
 				"@babel/runtime": "^7.16.0"
diff --git a/packages/a11y/package.json b/packages/a11y/package.json
index 2fb286507c036..bfdee27579a98 100644
--- a/packages/a11y/package.json
+++ b/packages/a11y/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/a11y",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Accessibility (a11y) utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/annotations/package.json b/packages/annotations/package.json
index 5007a40a2f7b6..ebe468f068da7 100644
--- a/packages/annotations/package.json
+++ b/packages/annotations/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/annotations",
-	"version": "2.50.0-prerelease",
+	"version": "2.50.0",
 	"description": "Annotate content in the Gutenberg editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/api-fetch/package.json b/packages/api-fetch/package.json
index bf26217d15ae8..a7ad0ad752d06 100644
--- a/packages/api-fetch/package.json
+++ b/packages/api-fetch/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/api-fetch",
-	"version": "6.47.0-prerelease",
+	"version": "6.47.0",
 	"description": "Utility to make WordPress REST API requests.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/autop/package.json b/packages/autop/package.json
index 760b68c565f1e..09fac4ca6c660 100644
--- a/packages/autop/package.json
+++ b/packages/autop/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/autop",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "WordPress's automatic paragraph functions `autop` and `removep`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-import-jsx-pragma/package.json b/packages/babel-plugin-import-jsx-pragma/package.json
index 54b68eedccb67..c0ccae09f1811 100644
--- a/packages/babel-plugin-import-jsx-pragma/package.json
+++ b/packages/babel-plugin-import-jsx-pragma/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-import-jsx-pragma",
-	"version": "4.33.0-prerelease",
+	"version": "4.33.0",
 	"description": "Babel transform plugin for automatically injecting an import to be used as the pragma for the React JSX Transform plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-plugin-makepot/package.json b/packages/babel-plugin-makepot/package.json
index 9e414879658b9..3994df49b320a 100644
--- a/packages/babel-plugin-makepot/package.json
+++ b/packages/babel-plugin-makepot/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-plugin-makepot",
-	"version": "5.34.0-prerelease",
+	"version": "5.34.0",
 	"description": "WordPress Babel internationalization (i18n) plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/babel-preset-default/package.json b/packages/babel-preset-default/package.json
index 9018f8d7a635d..6110031337c89 100644
--- a/packages/babel-preset-default/package.json
+++ b/packages/babel-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/babel-preset-default",
-	"version": "7.34.0-prerelease",
+	"version": "7.34.0",
 	"description": "Default Babel preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/base-styles/package.json b/packages/base-styles/package.json
index 672d6b1e81123..f9fe0dbd9230b 100644
--- a/packages/base-styles/package.json
+++ b/packages/base-styles/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/base-styles",
-	"version": "4.41.0-prerelease",
+	"version": "4.41.0",
 	"description": "Base SCSS utilities and variables for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blob/package.json b/packages/blob/package.json
index df913b56cf85b..aaabbefa57978 100644
--- a/packages/blob/package.json
+++ b/packages/blob/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blob",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Blob utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-directory/package.json b/packages/block-directory/package.json
index c83d50a53c567..c47c5ef91389b 100644
--- a/packages/block-directory/package.json
+++ b/packages/block-directory/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-directory",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Extend editor with block directory features to search, download and install blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-editor/package.json b/packages/block-editor/package.json
index cb5cebceca970..d301ab4e67c85 100644
--- a/packages/block-editor/package.json
+++ b/packages/block-editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-editor",
-	"version": "12.18.0-prerelease",
+	"version": "12.18.0",
 	"description": "Generic block editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-library/package.json b/packages/block-library/package.json
index 8bb7892ab4332..50d78be299b22 100644
--- a/packages/block-library/package.json
+++ b/packages/block-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-library",
-	"version": "8.27.0-prerelease",
+	"version": "8.27.0",
 	"description": "Block library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-default-parser/package.json b/packages/block-serialization-default-parser/package.json
index 6a735a45f8e25..a91cfafd09984 100644
--- a/packages/block-serialization-default-parser/package.json
+++ b/packages/block-serialization-default-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-default-parser",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/block-serialization-spec-parser/package.json b/packages/block-serialization-spec-parser/package.json
index d38e78081ba72..317519d3b6b8b 100644
--- a/packages/block-serialization-spec-parser/package.json
+++ b/packages/block-serialization-spec-parser/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/block-serialization-spec-parser",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "Block serialization specification parser for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/blocks/package.json b/packages/blocks/package.json
index 1d7a665fe1ebf..e950643892783 100644
--- a/packages/blocks/package.json
+++ b/packages/blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/blocks",
-	"version": "12.27.0-prerelease",
+	"version": "12.27.0",
 	"description": "Block API for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/browserslist-config/package.json b/packages/browserslist-config/package.json
index d1b9b053788a1..95544e220ea92 100644
--- a/packages/browserslist-config/package.json
+++ b/packages/browserslist-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/browserslist-config",
-	"version": "5.33.0-prerelease",
+	"version": "5.33.0",
 	"description": "WordPress Browserslist shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/commands/package.json b/packages/commands/package.json
index 12b3d5d466431..b0c53a60d7b58 100644
--- a/packages/commands/package.json
+++ b/packages/commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/commands",
-	"version": "0.21.0-prerelease",
+	"version": "0.21.0",
 	"description": "Handles the commands menu.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/components/package.json b/packages/components/package.json
index ed70bcd5eef0b..071fa44727b1d 100644
--- a/packages/components/package.json
+++ b/packages/components/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/components",
-	"version": "25.16.0-prerelease",
+	"version": "25.16.0",
 	"description": "UI components for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/compose/package.json b/packages/compose/package.json
index 972dec62b4288..a8cef68bf1154 100644
--- a/packages/compose/package.json
+++ b/packages/compose/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/compose",
-	"version": "6.27.0-prerelease",
+	"version": "6.27.0",
 	"description": "WordPress higher-order components (HOCs).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-commands/package.json b/packages/core-commands/package.json
index 702f8cf28ae96..72dbcd4da38ff 100644
--- a/packages/core-commands/package.json
+++ b/packages/core-commands/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-commands",
-	"version": "0.19.0-prerelease",
+	"version": "0.19.0",
 	"description": "WordPress core reusable commands.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/core-data/package.json b/packages/core-data/package.json
index e4ef1360f0df9..807702846e0f3 100644
--- a/packages/core-data/package.json
+++ b/packages/core-data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/core-data",
-	"version": "6.27.0-prerelease",
+	"version": "6.27.0",
 	"description": "Access to and manipulation of core WordPress entities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-interactive-template/package.json b/packages/create-block-interactive-template/package.json
index d5ed2bc861803..fd017719b44c1 100644
--- a/packages/create-block-interactive-template/package.json
+++ b/packages/create-block-interactive-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-interactive-template",
-	"version": "1.13.0-prerelease",
+	"version": "1.13.0",
 	"description": "Template for @wordpress/create-block to create interactive blocks with the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block-tutorial-template/package.json b/packages/create-block-tutorial-template/package.json
index 711a4bf081a93..fb09eaeeb3791 100644
--- a/packages/create-block-tutorial-template/package.json
+++ b/packages/create-block-tutorial-template/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block-tutorial-template",
-	"version": "3.4.0-prerelease",
+	"version": "3.4.0",
 	"description": "This is a template for @wordpress/create-block that creates an example 'Copyright Date' block. This block is used in the official WordPress block development Quick Start Guide.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/create-block/package.json b/packages/create-block/package.json
index 451dd94321e8b..2ef2e8f8bfc50 100644
--- a/packages/create-block/package.json
+++ b/packages/create-block/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/create-block",
-	"version": "4.34.0-prerelease",
+	"version": "4.34.0",
 	"description": "Generates PHP, JS and CSS code for registering a block for a WordPress plugin.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/customize-widgets/package.json b/packages/customize-widgets/package.json
index 401dd0882be2e..a7d2eec355508 100644
--- a/packages/customize-widgets/package.json
+++ b/packages/customize-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/customize-widgets",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Widgets blocks in Customizer Module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data-controls/package.json b/packages/data-controls/package.json
index bb584acfc985c..0729202ec6a7f 100644
--- a/packages/data-controls/package.json
+++ b/packages/data-controls/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data-controls",
-	"version": "3.19.0-prerelease",
+	"version": "3.19.0",
 	"description": "A set of common controls for the @wordpress/data api.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/data/package.json b/packages/data/package.json
index a8785eaecf69c..37d1958ef77da 100644
--- a/packages/data/package.json
+++ b/packages/data/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/data",
-	"version": "9.20.0-prerelease",
+	"version": "9.20.0",
 	"description": "Data module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dataviews/package.json b/packages/dataviews/package.json
index b012d4ccbe5f3..a739d08c2253a 100644
--- a/packages/dataviews/package.json
+++ b/packages/dataviews/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dataviews",
-	"version": "0.4.0-prerelease",
+	"version": "0.4.0",
 	"description": "DataViews is a component that provides an API to render datasets using different types of layouts (table, grid, list, etc.).",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/date/package.json b/packages/date/package.json
index 5698d827bea13..04f692917dfa1 100644
--- a/packages/date/package.json
+++ b/packages/date/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/date",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "Date module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dependency-extraction-webpack-plugin/package.json b/packages/dependency-extraction-webpack-plugin/package.json
index 549146ee5e5d5..8a700f35e4288 100644
--- a/packages/dependency-extraction-webpack-plugin/package.json
+++ b/packages/dependency-extraction-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dependency-extraction-webpack-plugin",
-	"version": "5.1.0-prerelease",
+	"version": "5.1.0",
 	"description": "Extract WordPress script dependencies from webpack bundles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/deprecated/package.json b/packages/deprecated/package.json
index 0a841851bfb53..aff14bc79bb2a 100644
--- a/packages/deprecated/package.json
+++ b/packages/deprecated/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/deprecated",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Deprecation utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/docgen/package.json b/packages/docgen/package.json
index a190c70abef5a..06f762daac870 100644
--- a/packages/docgen/package.json
+++ b/packages/docgen/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/docgen",
-	"version": "1.59.0-prerelease",
+	"version": "1.59.0",
 	"description": "Autogenerate public API documentation from exports and JSDoc comments.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom-ready/package.json b/packages/dom-ready/package.json
index 8d9e419a42b7b..398a7f04b5b36 100644
--- a/packages/dom-ready/package.json
+++ b/packages/dom-ready/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom-ready",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Execute callback after the DOM is loaded.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/dom/package.json b/packages/dom/package.json
index 1a6c52c494547..c68fbe53f1a39 100644
--- a/packages/dom/package.json
+++ b/packages/dom/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/dom",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "DOM utilities module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils-playwright/package.json b/packages/e2e-test-utils-playwright/package.json
index ce9328880fc74..8c4dd359e9373 100644
--- a/packages/e2e-test-utils-playwright/package.json
+++ b/packages/e2e-test-utils-playwright/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils-playwright",
-	"version": "0.18.0-prerelease",
+	"version": "0.18.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-test-utils/package.json b/packages/e2e-test-utils/package.json
index 0f8e9f5acda1f..aee0e38d127ec 100644
--- a/packages/e2e-test-utils/package.json
+++ b/packages/e2e-test-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-test-utils",
-	"version": "10.21.0-prerelease",
+	"version": "10.21.0",
 	"description": "End-To-End (E2E) test utils for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/e2e-tests/package.json b/packages/e2e-tests/package.json
index 4b1fc2a72aead..1eb17bf904e19 100644
--- a/packages/e2e-tests/package.json
+++ b/packages/e2e-tests/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/e2e-tests",
-	"version": "7.21.0-prerelease",
+	"version": "7.21.0",
 	"description": "End-To-End (E2E) tests for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-post/package.json b/packages/edit-post/package.json
index 7126aa47901f0..abdcf5bdf3ba7 100644
--- a/packages/edit-post/package.json
+++ b/packages/edit-post/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-post",
-	"version": "7.27.0-prerelease",
+	"version": "7.27.0",
 	"description": "Edit Post module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-site/package.json b/packages/edit-site/package.json
index c5a580bef7f64..2a625f980e0e9 100644
--- a/packages/edit-site/package.json
+++ b/packages/edit-site/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-site",
-	"version": "5.27.0-prerelease",
+	"version": "5.27.0",
 	"description": "Edit Site Page module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/edit-widgets/package.json b/packages/edit-widgets/package.json
index 5d182dcdd2a83..b2e36966443e0 100644
--- a/packages/edit-widgets/package.json
+++ b/packages/edit-widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/edit-widgets",
-	"version": "5.27.0-prerelease",
+	"version": "5.27.0",
 	"description": "Widgets Page module for WordPress..",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/editor/package.json b/packages/editor/package.json
index b5bcfde3a3e1a..874a6b9282440 100644
--- a/packages/editor/package.json
+++ b/packages/editor/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/editor",
-	"version": "13.27.0-prerelease",
+	"version": "13.27.0",
 	"description": "Enhanced block editor for WordPress posts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/element/package.json b/packages/element/package.json
index 4c307abc5d807..b0654bb37ba91 100644
--- a/packages/element/package.json
+++ b/packages/element/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/element",
-	"version": "5.27.0-prerelease",
+	"version": "5.27.0",
 	"description": "Element React module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/env/package.json b/packages/env/package.json
index b8b0d1b1b1f87..d7912fa5132db 100644
--- a/packages/env/package.json
+++ b/packages/env/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/env",
-	"version": "9.2.0-prerelease",
+	"version": "9.2.0",
 	"description": "A zero-config, self contained local WordPress environment for development and testing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/escape-html/package.json b/packages/escape-html/package.json
index 1ce2629d12095..3a3731207abae 100644
--- a/packages/escape-html/package.json
+++ b/packages/escape-html/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/escape-html",
-	"version": "2.50.0-prerelease",
+	"version": "2.50.0",
 	"description": "Escape HTML utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/eslint-plugin/package.json b/packages/eslint-plugin/package.json
index 2f0475dc54df7..fdce2d1c4b05f 100644
--- a/packages/eslint-plugin/package.json
+++ b/packages/eslint-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/eslint-plugin",
-	"version": "17.7.0-prerelease",
+	"version": "17.7.0",
 	"description": "ESLint plugin for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/format-library/package.json b/packages/format-library/package.json
index 71218253d1e13..13837304eee69 100644
--- a/packages/format-library/package.json
+++ b/packages/format-library/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/format-library",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Format library for the WordPress editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/hooks/package.json b/packages/hooks/package.json
index 38e202437cd17..d56ae25b23e99 100644
--- a/packages/hooks/package.json
+++ b/packages/hooks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/hooks",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "WordPress hooks library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/html-entities/package.json b/packages/html-entities/package.json
index 90b63c4ff01a6..c0161b83e0b73 100644
--- a/packages/html-entities/package.json
+++ b/packages/html-entities/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/html-entities",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "HTML entity utilities for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
index 1a00cf15f3988..683fa862ed1f3 100644
--- a/packages/i18n/package.json
+++ b/packages/i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/i18n",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "WordPress internationalization (i18n) library.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/icons/package.json b/packages/icons/package.json
index d0718e411694b..3874edd16d607 100644
--- a/packages/icons/package.json
+++ b/packages/icons/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/icons",
-	"version": "9.41.0-prerelease",
+	"version": "9.41.0",
 	"description": "WordPress Icons package, based on dashicon.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity-router/package.json b/packages/interactivity-router/package.json
index d618a7ecbfadb..8e06056f1991f 100644
--- a/packages/interactivity-router/package.json
+++ b/packages/interactivity-router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity-router",
-	"version": "1.0.0-prerelease",
+	"version": "1.0.0",
 	"description": "Package that exposes state and actions from the `core/router` store, part of the Interactivity API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interactivity/package.json b/packages/interactivity/package.json
index e795a963677e0..1b915b657c1a9 100644
--- a/packages/interactivity/package.json
+++ b/packages/interactivity/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interactivity",
-	"version": "4.0.0-prerelease",
+	"version": "4.0.0",
 	"description": "Package that provides a standard and simple way to handle the frontend interactivity of Gutenberg blocks.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/interface/package.json b/packages/interface/package.json
index e23f3f73dbff6..abf9b5c4ae66c 100644
--- a/packages/interface/package.json
+++ b/packages/interface/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/interface",
-	"version": "5.27.0-prerelease",
+	"version": "5.27.0",
 	"description": "Interface module for WordPress. The package contains shared functionality across the modern JavaScript-based WordPress screens.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/is-shallow-equal/package.json b/packages/is-shallow-equal/package.json
index 9251313b1a31b..cd1de378fcaa8 100644
--- a/packages/is-shallow-equal/package.json
+++ b/packages/is-shallow-equal/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/is-shallow-equal",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "Test for shallow equality between two objects or arrays.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-console/package.json b/packages/jest-console/package.json
index 63cc4c0b146c9..18654b4d1e463 100644
--- a/packages/jest-console/package.json
+++ b/packages/jest-console/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-console",
-	"version": "7.21.0-prerelease",
+	"version": "7.21.0",
 	"description": "Custom Jest matchers for the Console object.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-preset-default/package.json b/packages/jest-preset-default/package.json
index 454b32c1b299d..6b665282e6e9b 100644
--- a/packages/jest-preset-default/package.json
+++ b/packages/jest-preset-default/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-preset-default",
-	"version": "11.21.0-prerelease",
+	"version": "11.21.0",
 	"description": "Default Jest preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/jest-puppeteer-axe/package.json b/packages/jest-puppeteer-axe/package.json
index f2cf08d44381f..db88d8f6022ef 100644
--- a/packages/jest-puppeteer-axe/package.json
+++ b/packages/jest-puppeteer-axe/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/jest-puppeteer-axe",
-	"version": "6.21.0-prerelease",
+	"version": "6.21.0",
 	"description": "Axe API integration with Jest and Puppeteer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keyboard-shortcuts/package.json b/packages/keyboard-shortcuts/package.json
index 3478aca26615c..e9e26283fd316 100644
--- a/packages/keyboard-shortcuts/package.json
+++ b/packages/keyboard-shortcuts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keyboard-shortcuts",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Handling keyboard shortcuts.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/keycodes/package.json b/packages/keycodes/package.json
index ba09673d9984c..61067afead585 100644
--- a/packages/keycodes/package.json
+++ b/packages/keycodes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/keycodes",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Keycodes utilities for WordPress. Used to check for keyboard events across browsers/operating systems.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/lazy-import/package.json b/packages/lazy-import/package.json
index df1dbbeab69df..2a62bd842f48f 100644
--- a/packages/lazy-import/package.json
+++ b/packages/lazy-import/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/lazy-import",
-	"version": "1.37.0-prerelease",
+	"version": "1.37.0",
 	"description": "Lazily import a module, installing it automatically if missing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/list-reusable-blocks/package.json b/packages/list-reusable-blocks/package.json
index 02c3221db11af..04a19d1f6b1dd 100644
--- a/packages/list-reusable-blocks/package.json
+++ b/packages/list-reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/list-reusable-blocks",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Adding Export/Import support to the reusable blocks listing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/media-utils/package.json b/packages/media-utils/package.json
index 81b88631b25ed..a74cadcab596f 100644
--- a/packages/media-utils/package.json
+++ b/packages/media-utils/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/media-utils",
-	"version": "4.41.0-prerelease",
+	"version": "4.41.0",
 	"description": "WordPress Media Upload Utils.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/notices/package.json b/packages/notices/package.json
index e6df2bb52933b..6d456aba34328 100644
--- a/packages/notices/package.json
+++ b/packages/notices/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/notices",
-	"version": "4.18.0-prerelease",
+	"version": "4.18.0",
 	"description": "State management for notices.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/npm-package-json-lint-config/package.json b/packages/npm-package-json-lint-config/package.json
index 348b8bbd226ed..82a153f236f24 100644
--- a/packages/npm-package-json-lint-config/package.json
+++ b/packages/npm-package-json-lint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/npm-package-json-lint-config",
-	"version": "4.35.0-prerelease",
+	"version": "4.35.0",
 	"description": "WordPress npm-package-json-lint shareable configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/nux/package.json b/packages/nux/package.json
index c6d1685e70288..d72e3edc134c6 100644
--- a/packages/nux/package.json
+++ b/packages/nux/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/nux",
-	"version": "8.12.0-prerelease",
+	"version": "8.12.0",
 	"description": "NUX (New User eXperience) module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/patterns/package.json b/packages/patterns/package.json
index a9ba16d3e06bd..79f3c354d6e38 100644
--- a/packages/patterns/package.json
+++ b/packages/patterns/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/patterns",
-	"version": "1.11.0-prerelease",
+	"version": "1.11.0",
 	"description": "Management of user pattern editing.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/plugins/package.json b/packages/plugins/package.json
index 48582e5b8ec41..631cbbf4b24c9 100644
--- a/packages/plugins/package.json
+++ b/packages/plugins/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/plugins",
-	"version": "6.18.0-prerelease",
+	"version": "6.18.0",
 	"description": "Plugins module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-plugins-preset/package.json b/packages/postcss-plugins-preset/package.json
index 36461b07d08b3..9f60cc9032d82 100644
--- a/packages/postcss-plugins-preset/package.json
+++ b/packages/postcss-plugins-preset/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-plugins-preset",
-	"version": "4.34.0-prerelease",
+	"version": "4.34.0",
 	"description": "PostCSS sharable plugins preset for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/postcss-themes/package.json b/packages/postcss-themes/package.json
index b2229f24ab978..3a70f1a3affae 100644
--- a/packages/postcss-themes/package.json
+++ b/packages/postcss-themes/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/postcss-themes",
-	"version": "5.33.0-prerelease",
+	"version": "5.33.0",
 	"description": "PostCSS plugin to generate theme colors.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences-persistence/package.json b/packages/preferences-persistence/package.json
index 6e18a896d0966..3d6b5056c89fd 100644
--- a/packages/preferences-persistence/package.json
+++ b/packages/preferences-persistence/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences-persistence",
-	"version": "1.42.0-prerelease",
+	"version": "1.42.0",
 	"description": "Persistence utilities for `wordpress/preferences`.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/preferences/package.json b/packages/preferences/package.json
index c8d73bfd71990..a695f56f7834e 100644
--- a/packages/preferences/package.json
+++ b/packages/preferences/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/preferences",
-	"version": "3.27.0-prerelease",
+	"version": "3.27.0",
 	"description": "Utilities for managing WordPress preferences.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/prettier-config/package.json b/packages/prettier-config/package.json
index 2f62ad5657f59..3597d2a302b41 100644
--- a/packages/prettier-config/package.json
+++ b/packages/prettier-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/prettier-config",
-	"version": "3.7.0-prerelease",
+	"version": "3.7.0",
 	"description": "WordPress Prettier shared configuration.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/primitives/package.json b/packages/primitives/package.json
index abcf90ff540a9..c6705c08ef676 100644
--- a/packages/primitives/package.json
+++ b/packages/primitives/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/primitives",
-	"version": "3.48.0-prerelease",
+	"version": "3.48.0",
 	"description": "WordPress cross-platform primitives.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/priority-queue/package.json b/packages/priority-queue/package.json
index acc95b75cb433..1f11719519998 100644
--- a/packages/priority-queue/package.json
+++ b/packages/priority-queue/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/priority-queue",
-	"version": "2.50.0-prerelease",
+	"version": "2.50.0",
 	"description": "Generic browser priority queue.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/private-apis/package.json b/packages/private-apis/package.json
index 6d784f490ecda..be0a96e094320 100644
--- a/packages/private-apis/package.json
+++ b/packages/private-apis/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/private-apis",
-	"version": "0.32.0-prerelease",
+	"version": "0.32.0",
 	"description": "Internal experimental APIs for WordPress core.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/project-management-automation/package.json b/packages/project-management-automation/package.json
index eea61157183ca..8b00d128bb22a 100644
--- a/packages/project-management-automation/package.json
+++ b/packages/project-management-automation/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/project-management-automation",
-	"version": "1.49.0-prerelease",
+	"version": "1.49.0",
 	"description": "GitHub Action that implements various automation to assist with managing the Gutenberg GitHub repository.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/react-i18n/package.json b/packages/react-i18n/package.json
index 670e3221aeb22..1a24673c2c222 100644
--- a/packages/react-i18n/package.json
+++ b/packages/react-i18n/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/react-i18n",
-	"version": "3.48.0-prerelease",
+	"version": "3.48.0",
 	"description": "React bindings for @wordpress/i18n.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/readable-js-assets-webpack-plugin/package.json b/packages/readable-js-assets-webpack-plugin/package.json
index 7a637365a5dbb..715b034fcbd2e 100644
--- a/packages/readable-js-assets-webpack-plugin/package.json
+++ b/packages/readable-js-assets-webpack-plugin/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/readable-js-assets-webpack-plugin",
-	"version": "2.33.0-prerelease",
+	"version": "2.33.0",
 	"description": "Generate a readable JS file for each JS asset.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/redux-routine/package.json b/packages/redux-routine/package.json
index ffba752ec44f5..808d1ce95caac 100644
--- a/packages/redux-routine/package.json
+++ b/packages/redux-routine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/redux-routine",
-	"version": "4.50.0-prerelease",
+	"version": "4.50.0",
 	"description": "Redux middleware for generator coroutines.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/reusable-blocks/package.json b/packages/reusable-blocks/package.json
index abc1dee18aadb..e2ed84e27cca0 100644
--- a/packages/reusable-blocks/package.json
+++ b/packages/reusable-blocks/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/reusable-blocks",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "Reusable blocks utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/rich-text/package.json b/packages/rich-text/package.json
index b7a5e4332ef06..dfb07081c1d76 100644
--- a/packages/rich-text/package.json
+++ b/packages/rich-text/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/rich-text",
-	"version": "6.27.0-prerelease",
+	"version": "6.27.0",
 	"description": "Rich text value and manipulation API.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/router/package.json b/packages/router/package.json
index 77325efc14c78..9612dc69c20ac 100644
--- a/packages/router/package.json
+++ b/packages/router/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/router",
-	"version": "0.19.0-prerelease",
+	"version": "0.19.0",
 	"description": "Router API for WordPress pages.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/scripts/package.json b/packages/scripts/package.json
index 692a35db5a7ee..91774aab453d4 100644
--- a/packages/scripts/package.json
+++ b/packages/scripts/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/scripts",
-	"version": "27.1.0-prerelease",
+	"version": "27.1.0",
 	"description": "Collection of reusable scripts for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/server-side-render/package.json b/packages/server-side-render/package.json
index 743d1a71f1de2..aec8af6a9b194 100644
--- a/packages/server-side-render/package.json
+++ b/packages/server-side-render/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/server-side-render",
-	"version": "4.27.0-prerelease",
+	"version": "4.27.0",
 	"description": "The component used with WordPress to server-side render a preview of dynamic blocks to display in the editor.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/shortcode/package.json b/packages/shortcode/package.json
index 1e5ae3a67c6c2..0f83fae4687b4 100644
--- a/packages/shortcode/package.json
+++ b/packages/shortcode/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/shortcode",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "Shortcode module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/style-engine/package.json b/packages/style-engine/package.json
index 93d9fe693c741..10ce8cba3fd58 100644
--- a/packages/style-engine/package.json
+++ b/packages/style-engine/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/style-engine",
-	"version": "1.33.0-prerelease",
+	"version": "1.33.0",
 	"description": "A suite of parsers and compilers for WordPress styles.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/stylelint-config/package.json b/packages/stylelint-config/package.json
index 49921e5357069..89fdb1b0aa6c9 100644
--- a/packages/stylelint-config/package.json
+++ b/packages/stylelint-config/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/stylelint-config",
-	"version": "21.33.0-prerelease",
+	"version": "21.33.0",
 	"description": "stylelint config for WordPress development.",
 	"author": "The WordPress Contributors",
 	"license": "MIT",
diff --git a/packages/sync/package.json b/packages/sync/package.json
index 6b7b3530af083..6394fec563325 100644
--- a/packages/sync/package.json
+++ b/packages/sync/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/sync",
-	"version": "0.12.0-prerelease",
+	"version": "0.12.0",
 	"description": "Sync Data.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/token-list/package.json b/packages/token-list/package.json
index 7c05afcdfb135..62dc16a7bce93 100644
--- a/packages/token-list/package.json
+++ b/packages/token-list/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/token-list",
-	"version": "2.50.0-prerelease",
+	"version": "2.50.0",
 	"description": "Constructable, plain JavaScript DOMTokenList implementation, supporting non-browser runtimes.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/undo-manager/package.json b/packages/undo-manager/package.json
index 83f37faaad14a..f8ff51d9c9c44 100644
--- a/packages/undo-manager/package.json
+++ b/packages/undo-manager/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/undo-manager",
-	"version": "0.10.0-prerelease",
+	"version": "0.10.0",
 	"description": "A small package to manage undo/redo.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/url/package.json b/packages/url/package.json
index 7217b3634e191..b8a51d036332b 100644
--- a/packages/url/package.json
+++ b/packages/url/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/url",
-	"version": "3.51.0-prerelease",
+	"version": "3.51.0",
 	"description": "WordPress URL utilities.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/viewport/package.json b/packages/viewport/package.json
index 30a9b899f4097..018d68161ed40 100644
--- a/packages/viewport/package.json
+++ b/packages/viewport/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/viewport",
-	"version": "5.27.0-prerelease",
+	"version": "5.27.0",
 	"description": "Viewport module for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/warning/package.json b/packages/warning/package.json
index 87f9e3bce0e6f..6a48e80f0c13a 100644
--- a/packages/warning/package.json
+++ b/packages/warning/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/warning",
-	"version": "2.50.0-prerelease",
+	"version": "2.50.0",
 	"description": "Warning utility for WordPress.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/widgets/package.json b/packages/widgets/package.json
index 43df8ea07af99..864e8e8f852e2 100644
--- a/packages/widgets/package.json
+++ b/packages/widgets/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/widgets",
-	"version": "3.27.0-prerelease",
+	"version": "3.27.0",
 	"description": "Functionality used by the widgets block editor in the Widgets screen and the Customizer.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",
diff --git a/packages/wordcount/package.json b/packages/wordcount/package.json
index 141e39acf6b0b..174311ed9a3a7 100644
--- a/packages/wordcount/package.json
+++ b/packages/wordcount/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "@wordpress/wordcount",
-	"version": "3.50.0-prerelease",
+	"version": "3.50.0",
 	"description": "WordPress word count utility.",
 	"author": "The WordPress Contributors",
 	"license": "GPL-2.0-or-later",

From 2e01f2208e1e43492236684315f1654cb54e2973 Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 25 Jan 2024 09:10:12 +1100
Subject: [PATCH 291/296] Dimensions: Add Aspect Ratio block support (#56897)

* Try: Dimensions Aspect Ratio block support

* Try server-rendering output

* Try outputting has-aspect-ratio classname

* Ensure block support is checked properly

* Try adding global styles support

* Update docs, add appropriate checks

* Try unsetting minHeight

* Try unsetting min-height when applying aspect ratio and vice versa

* Allow Cover block to expand when the content extends beyond the boundaries of the aspect-ratio

* Hide cover block resize handle when aspect ratio is set, clear aspect ratio when updating cover block min height

* Clear aspect-ratio if minHeight is set on the site frontend

* Attempt to get unset rules playing nicely in the editor with global styles

* Hide aspectRatio control from global styles for the group block

* Skip output of has-aspect-ratio if value isn't set
---
 .../themes/global-settings-and-styles.md      |  2 +
 docs/how-to-guides/themes/theme-support.md    |  2 +-
 .../block-api/block-supports.md               |  4 +-
 docs/reference-guides/core-blocks.md          |  4 +-
 .../theme-json-reference/theme-json-living.md |  4 +-
 lib/block-supports/dimensions.php             | 77 +++++++++++++++++++
 lib/class-wp-theme-json-gutenberg.php         | 17 +++-
 .../dimensions-tool/aspect-ratio-tool.js      |  5 +-
 .../global-styles/dimensions-panel.js         | 51 +++++++++++-
 .../src/components/global-styles/hooks.js     | 15 ++--
 .../global-styles/use-global-styles-output.js |  6 ++
 packages/block-editor/src/hooks/dimensions.js | 77 ++++++++++++++++++-
 packages/block-editor/src/hooks/index.js      |  2 +
 packages/block-editor/src/hooks/style.js      |  4 +
 packages/block-editor/src/hooks/utils.js      |  4 +
 packages/block-library/src/cover/block.json   |  3 +
 .../block-library/src/cover/edit/index.js     |  3 +-
 .../src/cover/edit/inspector-controls.js      | 15 +++-
 packages/block-library/src/cover/style.scss   |  5 +-
 packages/block-library/src/group/block.json   |  1 +
 packages/blocks/src/api/constants.js          |  5 ++
 .../components/global-styles/screen-block.js  | 10 +++
 .../style-engine/class-wp-style-engine.php    | 11 ++-
 .../src/styles/dimensions/index.ts            | 14 +++-
 packages/style-engine/src/types.ts            |  1 +
 schemas/json/block.json                       |  6 ++
 schemas/json/theme.json                       | 18 ++++-
 27 files changed, 340 insertions(+), 26 deletions(-)

diff --git a/docs/how-to-guides/themes/global-settings-and-styles.md b/docs/how-to-guides/themes/global-settings-and-styles.md
index 130b6271d13bd..617c435b6d70c 100644
--- a/docs/how-to-guides/themes/global-settings-and-styles.md
+++ b/docs/how-to-guides/themes/global-settings-and-styles.md
@@ -233,6 +233,7 @@ The settings section has the following structure:
 		},
 		"custom": {},
 		"dimensions": {
+			"aspectRatio": false,
 			"minHeight": false,
 		},
 		"layout": {
@@ -773,6 +774,7 @@ Each block declares which style properties it exposes via the [block supports me
 			"text": "value"
 		},
 		"dimensions": {
+			"aspectRatio": "value",
 			"minHeight": "value"
 		},
 		"filter": {
diff --git a/docs/how-to-guides/themes/theme-support.md b/docs/how-to-guides/themes/theme-support.md
index 88e69938737b7..4a952c4de657d 100644
--- a/docs/how-to-guides/themes/theme-support.md
+++ b/docs/how-to-guides/themes/theme-support.md
@@ -472,7 +472,7 @@ Use this setting to enable the following Global Styles settings:
 - color: link
 - spacing: blockGap, margin, padding
 - typography: lineHeight
-- dimensions: minHeight
+- dimensions: aspectRatio, minHeight
 - position: sticky
 
 ```php
diff --git a/docs/reference-guides/block-api/block-supports.md b/docs/reference-guides/block-api/block-supports.md
index 4a59c34813448..f035e026ff2e1 100644
--- a/docs/reference-guides/block-api/block-supports.md
+++ b/docs/reference-guides/block-api/block-supports.md
@@ -442,6 +442,7 @@ This value signals that a block supports some of the CSS style properties relate
 ```js
 supports: {
     dimensions: {
+        aspectRatio: true // Enable aspect ratio control.
         minHeight: true // Enable min height control.
     }
 }
@@ -449,12 +450,13 @@ supports: {
 
 When a block declares support for a specific dimensions property, its attributes definition is extended to include the `style` attribute.
 
-- `style`: attribute of `object` type with no default assigned. This is added when `minHeight` support is declared. It stores the custom values set by the user, e.g.:
+- `style`: attribute of `object` type with no default assigned. This is added when `aspectRatio` or `minHeight` support is declared. It stores the custom values set by the user, e.g.:
 
 ```js
 attributes: {
     style: {
         dimensions: {
+            aspectRatio: "16/9",
             minHeight: "50vh"
         }
     }
diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index ab6bb52b6b3b2..0cf9bb77f71f8 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -238,7 +238,7 @@ Add an image or video with a text overlay. ([Source](https://github.com/WordPres
 
 -	**Name:** core/cover
 -	**Category:** media
--	**Supports:** align, anchor, color (heading, text, ~~background~~, ~~enableContrastChecker~~), layout (~~allowJustification~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align, anchor, color (heading, text, ~~background~~, ~~enableContrastChecker~~), dimensions (aspectRatio), layout (~~allowJustification~~), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** allowedBlocks, alt, backgroundType, contentPosition, customGradient, customOverlayColor, dimRatio, focalPoint, gradient, hasParallax, id, isDark, isRepeated, isUserOverlayColor, minHeight, minHeightUnit, overlayColor, tagName, templateLock, url, useFeaturedImage
 
 ## Details
@@ -341,7 +341,7 @@ Gather blocks in a layout container. ([Source](https://github.com/WordPress/gute
 
 -	**Name:** core/group
 -	**Category:** design
--	**Supports:** align (full, wide), anchor, ariaLabel, background (backgroundImage, backgroundSize), color (background, button, gradients, heading, link, text), dimensions (minHeight), layout (allowSizingOnChildren), position (sticky), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
+-	**Supports:** align (full, wide), anchor, ariaLabel, background (backgroundImage, backgroundSize), color (background, button, gradients, heading, link, text), dimensions (aspectRatio, minHeight), layout (allowSizingOnChildren), position (sticky), spacing (blockGap, margin, padding), typography (fontSize, lineHeight), ~~html~~
 -	**Attributes:** allowedBlocks, tagName, templateLock
 
 ## Heading
diff --git a/docs/reference-guides/theme-json-reference/theme-json-living.md b/docs/reference-guides/theme-json-reference/theme-json-living.md
index ee88f779ace1c..5565336ffedb7 100644
--- a/docs/reference-guides/theme-json-reference/theme-json-living.md
+++ b/docs/reference-guides/theme-json-reference/theme-json-living.md
@@ -34,7 +34,7 @@ Setting that enables the following UI tools:
 - background: backgroundImage
 - border: color, radius, style, width
 - color: link
-- dimensions: minHeight
+- dimensions: aspectRatio, minHeight
 - position: sticky
 - spacing: blockGap, margin, padding
 - typography: lineHeight
@@ -116,6 +116,7 @@ Settings related to dimensions.
 
 | Property  | Type   | Default | Props  |
 | ---       | ---    | ---    |---   |
+| aspectRatio | boolean | false |  |
 | minHeight | boolean | false |  |
 
 ---
@@ -237,6 +238,7 @@ Dimensions styles
 
 | Property  | Type   |  Props  |
 | ---       | ---    |---   |
+| aspectRatio | string, object |  |
 | minHeight | string, object |  |
 
 ---
diff --git a/lib/block-supports/dimensions.php b/lib/block-supports/dimensions.php
index 1ef43133c2cdf..1980faba27817 100644
--- a/lib/block-supports/dimensions.php
+++ b/lib/block-supports/dimensions.php
@@ -74,6 +74,83 @@ function gutenberg_apply_dimensions_support( $block_type, $block_attributes ) {
 	return $attributes;
 }
 
+/**
+ * Renders server-side dimensions styles to the block wrapper.
+ * This block support uses the `render_block` hook to ensure that
+ * it is also applied to non-server-rendered blocks.
+ *
+ * @param  string $block_content Rendered block content.
+ * @param  array  $block         Block object.
+ * @return string                Filtered block content.
+ */
+function gutenberg_render_dimensions_support( $block_content, $block ) {
+	$block_type               = WP_Block_Type_Registry::get_instance()->get_registered( $block['blockName'] );
+	$block_attributes         = ( isset( $block['attrs'] ) && is_array( $block['attrs'] ) ) ? $block['attrs'] : array();
+	$has_aspect_ratio_support = block_has_support( $block_type, array( 'dimensions', 'aspectRatio' ), false );
+
+	if (
+		! $has_aspect_ratio_support ||
+		wp_should_skip_block_supports_serialization( $block_type, 'dimensions', 'aspectRatio' )
+	) {
+		return $block_content;
+	}
+
+	$dimensions_block_styles                = array();
+	$dimensions_block_styles['aspectRatio'] = $block_attributes['style']['dimensions']['aspectRatio'] ?? null;
+
+	// To ensure the aspect ratio does not get overridden by `minHeight` unset any existing rule.
+	if (
+		isset( $dimensions_block_styles['aspectRatio'] )
+	) {
+		$dimensions_block_styles['minHeight'] = 'unset';
+	} elseif (
+		isset( $block_attributes['style']['dimensions']['minHeight'] ) ||
+		isset( $block_attributes['minHeight'] )
+	) {
+		$dimensions_block_styles['aspectRatio'] = 'unset';
+	}
+
+	$styles = gutenberg_style_engine_get_styles( array( 'dimensions' => $dimensions_block_styles ) );
+
+	if ( ! empty( $styles['css'] ) ) {
+		// Inject dimensions styles to the first element, presuming it's the wrapper, if it exists.
+		$tags = new WP_HTML_Tag_Processor( $block_content );
+
+		if ( $tags->next_tag() ) {
+			$existing_style = $tags->get_attribute( 'style' );
+			$updated_style  = '';
+
+			if ( ! empty( $existing_style ) ) {
+				$updated_style = $existing_style;
+				if ( ! str_ends_with( $existing_style, ';' ) ) {
+					$updated_style .= ';';
+				}
+			}
+
+			$updated_style .= $styles['css'];
+			$tags->set_attribute( 'style', $updated_style );
+
+			if ( ! empty( $styles['classnames'] ) ) {
+				foreach ( explode( ' ', $styles['classnames'] ) as $class_name ) {
+					if (
+						str_contains( $class_name, 'aspect-ratio' ) &&
+						! isset( $block_attributes['style']['dimensions']['aspectRatio'] )
+					) {
+						continue;
+					}
+					$tags->add_class( $class_name );
+				}
+			}
+		}
+
+		return $tags->get_updated_html();
+	}
+
+	return $block_content;
+}
+
+add_filter( 'render_block', 'gutenberg_render_dimensions_support', 10, 2 );
+
 // Register the block support.
 WP_Block_Supports::get_instance()->register(
 	'dimensions',
diff --git a/lib/class-wp-theme-json-gutenberg.php b/lib/class-wp-theme-json-gutenberg.php
index f4266a7ef66dd..af074c22ead45 100644
--- a/lib/class-wp-theme-json-gutenberg.php
+++ b/lib/class-wp-theme-json-gutenberg.php
@@ -211,6 +211,7 @@ class WP_Theme_JSON_Gutenberg {
 	 * @var array
 	 */
 	const PROPERTIES_METADATA = array(
+		'aspect-ratio'                      => array( 'dimensions', 'aspectRatio' ),
 		'background'                        => array( 'color', 'gradient' ),
 		'background-color'                  => array( 'color', 'background' ),
 		'border-radius'                     => array( 'border', 'radius' ),
@@ -381,7 +382,8 @@ class WP_Theme_JSON_Gutenberg {
 		),
 		'custom'                        => null,
 		'dimensions'                    => array(
-			'minHeight' => null,
+			'aspectRatio' => null,
+			'minHeight'   => null,
 		),
 		'layout'                        => array(
 			'contentSize'                   => null,
@@ -486,7 +488,8 @@ class WP_Theme_JSON_Gutenberg {
 			'text'       => null,
 		),
 		'dimensions' => array(
-			'minHeight' => null,
+			'aspectRatio' => null,
+			'minHeight'   => null,
 		),
 		'filter'     => array(
 			'duotone' => null,
@@ -661,6 +664,7 @@ public static function get_element_class_name( $element ) {
 		array( 'color', 'heading' ),
 		array( 'color', 'button' ),
 		array( 'color', 'caption' ),
+		array( 'dimensions', 'aspectRatio' ),
 		array( 'dimensions', 'minHeight' ),
 		// BEGIN EXPERIMENTAL.
 		// Allow `position.fixed` to be opted-in by default.
@@ -2093,6 +2097,15 @@ protected static function compute_style_properties( $styles, $settings = array()
 				$value = gutenberg_get_typography_font_size_value( array( 'size' => $value ) );
 			}
 
+			if ( 'aspect-ratio' === $css_property ) {
+				// For aspect ratio to work, other dimensions rules must be unset.
+				// This ensures that a fixed height does not override the aspect ratio.
+				$declarations[] = array(
+					'name'  => 'min-height',
+					'value' => 'unset',
+				);
+			}
+
 			$declarations[] = array(
 				'name'  => $css_property,
 				'value' => $value,
diff --git a/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js b/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
index 988c6b5c28686..5ff35ae0e0c88 100644
--- a/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
+++ b/packages/block-editor/src/components/dimensions-tool/aspect-ratio-tool.js
@@ -98,6 +98,7 @@ export default function AspectRatioTool( {
 	onChange = () => {},
 	options = DEFAULT_ASPECT_RATIO_OPTIONS,
 	defaultValue = DEFAULT_ASPECT_RATIO_OPTIONS[ 0 ].value,
+	hasValue,
 	isShownByDefault = true,
 } ) {
 	// Match the CSS default so if the value is used directly in CSS it will look correct in the control.
@@ -105,7 +106,9 @@ export default function AspectRatioTool( {
 
 	return (
 		<ToolsPanelItem
-			hasValue={ () => displayValue !== defaultValue }
+			hasValue={
+				hasValue ? hasValue : () => displayValue !== defaultValue
+			}
 			label={ __( 'Aspect ratio' ) }
 			onDeselect={ () => onChange( undefined ) }
 			isShownByDefault={ isShownByDefault }
diff --git a/packages/block-editor/src/components/global-styles/dimensions-panel.js b/packages/block-editor/src/components/global-styles/dimensions-panel.js
index 47e50aa515e3c..0d486e2945263 100644
--- a/packages/block-editor/src/components/global-styles/dimensions-panel.js
+++ b/packages/block-editor/src/components/global-styles/dimensions-panel.js
@@ -27,6 +27,7 @@ import { getValueFromVariable, TOOLSPANEL_DROPDOWNMENU_PROPS } from './utils';
 import SpacingSizesControl from '../spacing-sizes-control';
 import HeightControl from '../height-control';
 import ChildLayoutControl from '../child-layout-control';
+import AspectRatioTool from '../dimensions-tool/aspect-ratio-tool';
 import { cleanEmptyObject } from '../../hooks/utils';
 import { setImmutably } from '../../utils/object';
 
@@ -39,6 +40,7 @@ export function useHasDimensionsPanel( settings ) {
 	const hasMargin = useHasMargin( settings );
 	const hasGap = useHasGap( settings );
 	const hasMinHeight = useHasMinHeight( settings );
+	const hasAspectRatio = useHasAspectRatio( settings );
 	const hasChildLayout = useHasChildLayout( settings );
 
 	return (
@@ -49,6 +51,7 @@ export function useHasDimensionsPanel( settings ) {
 			hasMargin ||
 			hasGap ||
 			hasMinHeight ||
+			hasAspectRatio ||
 			hasChildLayout )
 	);
 }
@@ -77,6 +80,10 @@ function useHasMinHeight( settings ) {
 	return settings?.dimensions?.minHeight;
 }
 
+function useHasAspectRatio( settings ) {
+	return settings?.dimensions?.aspectRatio;
+}
+
 function useHasChildLayout( settings ) {
 	const {
 		type: parentLayoutType = 'default',
@@ -192,6 +199,7 @@ const DEFAULT_CONTROLS = {
 	margin: true,
 	blockGap: true,
 	minHeight: true,
+	aspectRatio: true,
 	childLayout: true,
 };
 
@@ -346,8 +354,18 @@ export default function DimensionsPanel( {
 	const showMinHeightControl = useHasMinHeight( settings );
 	const minHeightValue = decodeValue( inheritedValue?.dimensions?.minHeight );
 	const setMinHeightValue = ( newValue ) => {
+		const tempValue = setImmutably(
+			value,
+			[ 'dimensions', 'minHeight' ],
+			newValue
+		);
+		// Apply min-height, while removing any applied aspect ratio.
 		onChange(
-			setImmutably( value, [ 'dimensions', 'minHeight' ], newValue )
+			setImmutably(
+				tempValue,
+				[ 'dimensions', 'aspectRatio' ],
+				undefined
+			)
 		);
 	};
 	const resetMinHeightValue = () => {
@@ -355,6 +373,24 @@ export default function DimensionsPanel( {
 	};
 	const hasMinHeightValue = () => !! value?.dimensions?.minHeight;
 
+	// Aspect Ratio
+	const showAspectRatioControl = useHasAspectRatio( settings );
+	const aspectRatioValue = decodeValue(
+		inheritedValue?.dimensions?.aspectRatio
+	);
+	const setAspectRatioValue = ( newValue ) => {
+		const tempValue = setImmutably(
+			value,
+			[ 'dimensions', 'aspectRatio' ],
+			newValue
+		);
+		// Apply aspect-ratio, while removing any applied min-height.
+		onChange(
+			setImmutably( tempValue, [ 'dimensions', 'minHeight' ], undefined )
+		);
+	};
+	const hasAspectRatioValue = () => !! value?.dimensions?.aspectRatio;
+
 	// Child Layout
 	const showChildLayoutControl = useHasChildLayout( settings );
 	const childLayout = inheritedValue?.layout;
@@ -397,6 +433,7 @@ export default function DimensionsPanel( {
 			dimensions: {
 				...previousValue?.dimensions,
 				minHeight: undefined,
+				aspectRatio: undefined,
 			},
 		};
 	}, [] );
@@ -617,6 +654,18 @@ export default function DimensionsPanel( {
 					/>
 				</ToolsPanelItem>
 			) }
+			{ showAspectRatioControl && (
+				<AspectRatioTool
+					hasValue={ hasAspectRatioValue }
+					value={ aspectRatioValue }
+					onChange={ setAspectRatioValue }
+					panelId={ panelId }
+					isShownByDefault={
+						defaultControls.aspectRatio ??
+						DEFAULT_CONTROLS.aspectRatio
+					}
+				/>
+			) }
 			{ showChildLayoutControl && (
 				<VStack
 					as={ ToolsPanelItem }
diff --git a/packages/block-editor/src/components/global-styles/hooks.js b/packages/block-editor/src/components/global-styles/hooks.js
index 2652732807cfd..7c5cf4cbf3e0f 100644
--- a/packages/block-editor/src/components/global-styles/hooks.js
+++ b/packages/block-editor/src/components/global-styles/hooks.js
@@ -49,6 +49,7 @@ const VALID_SETTINGS = [
 	'color.palette',
 	'color.text',
 	'custom',
+	'dimensions.aspectRatio',
 	'dimensions.minHeight',
 	'layout.contentSize',
 	'layout.definitions',
@@ -344,12 +345,14 @@ export function useSettingsForBlockElement(
 			}
 		} );
 
-		if ( ! supportedStyles.includes( 'minHeight' ) ) {
-			updatedSettings.dimensions = {
-				...updatedSettings.dimensions,
-				minHeight: false,
-			};
-		}
+		[ 'aspectRatio', 'minHeight' ].forEach( ( key ) => {
+			if ( ! supportedStyles.includes( key ) ) {
+				updatedSettings.dimensions = {
+					...updatedSettings.dimensions,
+					[ key ]: false,
+				};
+			}
+		} );
 
 		[ 'radius', 'color', 'style', 'width' ].forEach( ( key ) => {
 			if (
diff --git a/packages/block-editor/src/components/global-styles/use-global-styles-output.js b/packages/block-editor/src/components/global-styles/use-global-styles-output.js
index 1cd63ef4d03f0..ac51a0ca443db 100644
--- a/packages/block-editor/src/components/global-styles/use-global-styles-output.js
+++ b/packages/block-editor/src/components/global-styles/use-global-styles-output.js
@@ -434,6 +434,12 @@ export function getStylesDeclarations(
 			);
 		}
 
+		// For aspect ratio to work, other dimensions rules (and Cover block defaults) must be unset.
+		// This ensures that a fixed height does not override the aspect ratio.
+		if ( cssProperty === 'aspect-ratio' ) {
+			output.push( 'min-height: unset' );
+		}
+
 		output.push( `${ cssProperty }: ${ ruleValue }` );
 	} );
 
diff --git a/packages/block-editor/src/hooks/dimensions.js b/packages/block-editor/src/hooks/dimensions.js
index bbf5b12ca27cf..6f03ddac2c650 100644
--- a/packages/block-editor/src/hooks/dimensions.js
+++ b/packages/block-editor/src/hooks/dimensions.js
@@ -1,7 +1,12 @@
+/**
+ * External dependencies
+ */
+import classnames from 'classnames';
+
 /**
  * WordPress dependencies
  */
-import { useState, useEffect, useCallback } from '@wordpress/element';
+import { Platform, useState, useEffect, useCallback } from '@wordpress/element';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { getBlockSupport } from '@wordpress/blocks';
 import deprecated from '@wordpress/deprecated';
@@ -18,8 +23,7 @@ import { MarginVisualizer } from './margin';
 import { PaddingVisualizer } from './padding';
 import { store as blockEditorStore } from '../store';
 import { unlock } from '../lock-unlock';
-
-import { cleanEmptyObject } from './utils';
+import { cleanEmptyObject, shouldSkipSerialization } from './utils';
 
 export const DIMENSIONS_SUPPORT_KEY = 'dimensions';
 export const SPACING_SUPPORT_KEY = 'spacing';
@@ -125,6 +129,73 @@ export function DimensionsPanel( { clientId, name, setAttributes, settings } ) {
 	);
 }
 
+/**
+ * Determine whether there is block support for dimensions.
+ *
+ * @param {string} blockName Block name.
+ * @param {string} feature   Background image feature to check for.
+ *
+ * @return {boolean} Whether there is support.
+ */
+export function hasDimensionsSupport( blockName, feature = 'any' ) {
+	if ( Platform.OS !== 'web' ) {
+		return false;
+	}
+
+	const support = getBlockSupport( blockName, DIMENSIONS_SUPPORT_KEY );
+
+	if ( support === true ) {
+		return true;
+	}
+
+	if ( feature === 'any' ) {
+		return !! ( support?.aspectRatio || !! support?.minHeight );
+	}
+
+	return !! support?.[ feature ];
+}
+
+export default {
+	useBlockProps,
+	attributeKeys: [ 'minHeight', 'style' ],
+	hasSupport( name ) {
+		return hasDimensionsSupport( name, 'aspectRatio' );
+	},
+};
+
+function useBlockProps( { name, minHeight, style } ) {
+	if (
+		! hasDimensionsSupport( name, 'aspectRatio' ) ||
+		shouldSkipSerialization( name, DIMENSIONS_SUPPORT_KEY, 'aspectRatio' )
+	) {
+		return {};
+	}
+
+	const className = classnames( {
+		'has-aspect-ratio': !! style?.dimensions?.aspectRatio,
+	} );
+
+	// Allow dimensions-based inline style overrides to override any global styles rules that
+	// might be set for the block, and therefore affect the display of the aspect ratio.
+	const inlineStyleOverrides = {};
+
+	// Apply rules to unset incompatible styles.
+	// Note that a set `aspectRatio` will win out if both an aspect ratio and a minHeight are set.
+	// This is because the aspect ratio is a newer block support, so (in theory) any aspect ratio
+	// that is set should be intentional and should override any existing minHeight. The Cover block
+	// and dimensions controls have logic that will manually clear the aspect ratio if a minHeight
+	// is set.
+	if ( style?.dimensions?.aspectRatio ) {
+		// To ensure the aspect ratio does not get overridden by `minHeight` unset any existing rule.
+		inlineStyleOverrides.minHeight = 'unset';
+	} else if ( minHeight || style?.dimensions?.minHeight ) {
+		// To ensure the minHeight does not get overridden by `aspectRatio` unset any existing rule.
+		inlineStyleOverrides.aspectRatio = 'unset';
+	}
+
+	return { className, style: inlineStyleOverrides };
+}
+
 /**
  * @deprecated
  */
diff --git a/packages/block-editor/src/hooks/index.js b/packages/block-editor/src/hooks/index.js
index 5760c8edb4e2a..e3c0a7580aab3 100644
--- a/packages/block-editor/src/hooks/index.js
+++ b/packages/block-editor/src/hooks/index.js
@@ -16,6 +16,7 @@ import './generated-class-name';
 import style from './style';
 import './settings';
 import color from './color';
+import dimensions from './dimensions';
 import duotone from './duotone';
 import fontFamily from './font-family';
 import fontSize from './font-size';
@@ -47,6 +48,7 @@ createBlockListBlockFilter( [
 	align,
 	style,
 	color,
+	dimensions,
 	duotone,
 	fontFamily,
 	fontSize,
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
index dec046f888a46..52fd990a3cac4 100644
--- a/packages/block-editor/src/hooks/style.js
+++ b/packages/block-editor/src/hooks/style.js
@@ -133,10 +133,14 @@ const skipSerializationPathsEdit = {
  */
 const skipSerializationPathsSave = {
 	...skipSerializationPathsEdit,
+	[ `${ DIMENSIONS_SUPPORT_KEY }.aspectRatio` ]: [
+		`${ DIMENSIONS_SUPPORT_KEY }.aspectRatio`,
+	], // Skip serialization of aspect ratio in save mode.
 	[ `${ BACKGROUND_SUPPORT_KEY }` ]: [ BACKGROUND_SUPPORT_KEY ], // Skip serialization of background support in save mode.
 };
 
 const skipSerializationPathsSaveChecks = {
+	[ `${ DIMENSIONS_SUPPORT_KEY }.aspectRatio` ]: true,
 	[ `${ BACKGROUND_SUPPORT_KEY }` ]: true,
 };
 
diff --git a/packages/block-editor/src/hooks/utils.js b/packages/block-editor/src/hooks/utils.js
index ea31a516ac634..f13963933e522 100644
--- a/packages/block-editor/src/hooks/utils.js
+++ b/packages/block-editor/src/hooks/utils.js
@@ -195,6 +195,7 @@ export function useBlockSettings( name, parentLayout ) {
 		blockGap,
 		spacingSizes,
 		units,
+		aspectRatio,
 		minHeight,
 		layout,
 		borderColor,
@@ -244,6 +245,7 @@ export function useBlockSettings( name, parentLayout ) {
 		'spacing.blockGap',
 		'spacing.spacingSizes',
 		'spacing.units',
+		'dimensions.aspectRatio',
 		'dimensions.minHeight',
 		'layout',
 		'border.color',
@@ -343,6 +345,7 @@ export function useBlockSettings( name, parentLayout ) {
 				width: borderWidth,
 			},
 			dimensions: {
+				aspectRatio,
 				minHeight,
 			},
 			layout,
@@ -371,6 +374,7 @@ export function useBlockSettings( name, parentLayout ) {
 		blockGap,
 		spacingSizes,
 		units,
+		aspectRatio,
 		minHeight,
 		layout,
 		parentLayout,
diff --git a/packages/block-library/src/cover/block.json b/packages/block-library/src/cover/block.json
index d2c55dd26b4d7..80562da309899 100644
--- a/packages/block-library/src/cover/block.json
+++ b/packages/block-library/src/cover/block.json
@@ -114,6 +114,9 @@
 			"__experimentalSkipSerialization": [ "gradients" ],
 			"enableContrastChecker": false
 		},
+		"dimensions": {
+			"aspectRatio": true
+		},
 		"typography": {
 			"fontSize": true,
 			"lineHeight": true,
diff --git a/packages/block-library/src/cover/edit/index.js b/packages/block-library/src/cover/edit/index.js
index 8c5488584094c..098a3fe6f5d77 100644
--- a/packages/block-library/src/cover/edit/index.js
+++ b/packages/block-library/src/cover/edit/index.js
@@ -431,7 +431,8 @@ function CoverEdit( {
 			toggleSelection( true );
 			setAttributes( { minHeight: newMinHeight } );
 		},
-		showHandle: true,
+		// Hide the resize handle if an aspect ratio is set, as the aspect ratio takes precedence.
+		showHandle: ! attributes.style?.dimensions?.aspectRatio ? true : false,
 		size: resizableBoxDimensions,
 		width,
 	};
diff --git a/packages/block-library/src/cover/edit/inspector-controls.js b/packages/block-library/src/cover/edit/inspector-controls.js
index 4aa655b7229e5..6ac708d046223 100644
--- a/packages/block-library/src/cover/edit/inspector-controls.js
+++ b/packages/block-library/src/cover/edit/inspector-controls.js
@@ -24,6 +24,7 @@ import {
 	__experimentalColorGradientSettingsDropdown as ColorGradientSettingsDropdown,
 	__experimentalUseGradient,
 	__experimentalUseMultipleOriginColorsAndGradients as useMultipleOriginColorsAndGradients,
+	privateApis as blockEditorPrivateApis,
 } from '@wordpress/block-editor';
 import { __ } from '@wordpress/i18n';
 
@@ -31,6 +32,9 @@ import { __ } from '@wordpress/i18n';
  * Internal dependencies
  */
 import { COVER_MIN_HEIGHT, mediaPosition } from '../shared';
+import { unlock } from '../../lock-unlock';
+
+const { cleanEmptyObject } = unlock( blockEditorPrivateApis );
 
 function CoverHeightInput( {
 	onChange,
@@ -306,7 +310,16 @@ export default function CoverInspectorControls( {
 						value={ minHeight }
 						unit={ minHeightUnit }
 						onChange={ ( newMinHeight ) =>
-							setAttributes( { minHeight: newMinHeight } )
+							setAttributes( {
+								minHeight: newMinHeight,
+								style: cleanEmptyObject( {
+									...attributes?.style,
+									dimensions: {
+										...attributes?.style?.dimensions,
+										aspectRatio: undefined, // Reset aspect ratio when minHeight is set.
+									},
+								} ),
+							} )
 						}
 						onUnitChange={ ( nextUnit ) =>
 							setAttributes( {
diff --git a/packages/block-library/src/cover/style.scss b/packages/block-library/src/cover/style.scss
index 837e3834e2e1b..3b4eac41a0d3b 100644
--- a/packages/block-library/src/cover/style.scss
+++ b/packages/block-library/src/cover/style.scss
@@ -8,10 +8,9 @@
 	align-items: center;
 	padding: 1em;
 	// Prevent the `wp-block-cover__background` span from overflowing the container when border-radius is applied.
-	// `overflow: hidden` is provided as a fallback for browsers that don't support `overflow: clip`.
-	overflow: hidden;
 	// Use clip instead of overflow: hidden so that sticky position works on child elements.
-	overflow: clip;
+	// Use overflow-x instead of overflow so that aspect-ratio allows content to expand the area of the cover block.
+	overflow-x: clip;
 	// This block has customizable padding, border-box makes that more predictable.
 	box-sizing: border-box;
 	// Keep the flex layout direction to the physical direction (LTR) in RTL languages.
diff --git a/packages/block-library/src/group/block.json b/packages/block-library/src/group/block.json
index df59c25a7751f..674b0645f5021 100644
--- a/packages/block-library/src/group/block.json
+++ b/packages/block-library/src/group/block.json
@@ -55,6 +55,7 @@
 			}
 		},
 		"dimensions": {
+			"aspectRatio": true,
 			"minHeight": true
 		},
 		"__experimentalBorder": {
diff --git a/packages/blocks/src/api/constants.js b/packages/blocks/src/api/constants.js
index f08717592cb4b..8af2d0940c8fc 100644
--- a/packages/blocks/src/api/constants.js
+++ b/packages/blocks/src/api/constants.js
@@ -20,6 +20,11 @@ export const __EXPERIMENTAL_STYLE_PROPERTY = {
 		value: [ 'color', 'link' ],
 		support: [ 'color', 'link' ],
 	},
+	aspectRatio: {
+		value: [ 'dimensions', 'aspectRatio' ],
+		support: [ 'dimensions', 'aspectRatio' ],
+		useEngine: true,
+	},
 	background: {
 		value: [ 'color', 'gradient' ],
 		support: [ 'color', 'gradients' ],
diff --git a/packages/edit-site/src/components/global-styles/screen-block.js b/packages/edit-site/src/components/global-styles/screen-block.js
index def7d1d627fe4..aaeb1a4a833fa 100644
--- a/packages/edit-site/src/components/global-styles/screen-block.js
+++ b/packages/edit-site/src/components/global-styles/screen-block.js
@@ -109,6 +109,16 @@ function ScreenBlock( { name, variation } ) {
 		settings.spacing.blockGap = false;
 	}
 
+	// Only allow `aspectRatio` support if the block is not the grouping block.
+	// The grouping block allows the user to use Group, Row and Stack variations,
+	// and it is highly likely that the user will not want to set an aspect ratio
+	// for all three at once. Until there is the ability to set a different aspect
+	// ratio for each variation, we disable the aspect ratio controls for the
+	// grouping block in global styles.
+	if ( settings?.dimensions?.aspectRatio && name === 'core/group' ) {
+		settings.dimensions.aspectRatio = false;
+	}
+
 	const blockVariations = useBlockVariations( name );
 	const hasTypographyPanel = useHasTypographyPanel( settings );
 	const hasColorPanel = useHasColorPanel( settings );
diff --git a/packages/style-engine/class-wp-style-engine.php b/packages/style-engine/class-wp-style-engine.php
index f0ecb9f903806..31c18e56e34d8 100644
--- a/packages/style-engine/class-wp-style-engine.php
+++ b/packages/style-engine/class-wp-style-engine.php
@@ -185,7 +185,16 @@ final class WP_Style_Engine {
 			),
 		),
 		'dimensions' => array(
-			'minHeight' => array(
+			'aspectRatio' => array(
+				'property_keys' => array(
+					'default' => 'aspect-ratio',
+				),
+				'path'          => array( 'dimensions', 'aspectRatio' ),
+				'classnames'    => array(
+					'has-aspect-ratio' => true,
+				),
+			),
+			'minHeight'   => array(
 				'property_keys' => array(
 					'default' => 'min-height',
 				),
diff --git a/packages/style-engine/src/styles/dimensions/index.ts b/packages/style-engine/src/styles/dimensions/index.ts
index df3568f779913..4ffb33e65686d 100644
--- a/packages/style-engine/src/styles/dimensions/index.ts
+++ b/packages/style-engine/src/styles/dimensions/index.ts
@@ -16,4 +16,16 @@ const minHeight = {
 	},
 };
 
-export default [ minHeight ];
+const aspectRatio = {
+	name: 'aspectRatio',
+	generate: ( style: Style, options: StyleOptions ) => {
+		return generateRule(
+			style,
+			options,
+			[ 'dimensions', 'aspectRatio' ],
+			'aspectRatio'
+		);
+	},
+};
+
+export default [ minHeight, aspectRatio ];
diff --git a/packages/style-engine/src/types.ts b/packages/style-engine/src/types.ts
index 91a73e158e1ce..b5085ce53f136 100644
--- a/packages/style-engine/src/types.ts
+++ b/packages/style-engine/src/types.ts
@@ -48,6 +48,7 @@ export interface Style {
 		left?: BorderIndividualStyles< 'left' >;
 	};
 	dimensions?: {
+		aspectRatio?: CSSProperties[ 'aspectRatio' ];
 		minHeight?: CSSProperties[ 'minHeight' ];
 	};
 	spacing?: {
diff --git a/schemas/json/block.json b/schemas/json/block.json
index 9cc7a83c2304d..5658361d7aab6 100644
--- a/schemas/json/block.json
+++ b/schemas/json/block.json
@@ -316,6 +316,11 @@
 					"type": "object",
 					"description": "This value signals that a block supports some of the CSS style properties related to dimensions. When it does, the block editor will show UI controls for the user to set their values if the theme declares support.\n\nWhen the block declares support for a specific dimensions property, its attributes definition is extended to include the style attribute.",
 					"properties": {
+						"aspectRatio": {
+							"type": "boolean",
+							"description": "Allow blocks to define an aspect ratio value.",
+							"default": false
+						},
 						"minHeight": {
 							"type": "boolean",
 							"description": "Allow blocks to define a minimum height value.",
@@ -619,6 +624,7 @@
 							"type": "object",
 							"properties": {
 								"root": { "type": "string" },
+								"aspectRatio": { "type": "string" },
 								"minHeight": { "type": "string" }
 							}
 						}
diff --git a/schemas/json/theme.json b/schemas/json/theme.json
index 6ae8d15df63d2..7f12e4f709776 100644
--- a/schemas/json/theme.json
+++ b/schemas/json/theme.json
@@ -20,7 +20,7 @@
 			"type": "object",
 			"properties": {
 				"appearanceTools": {
-					"description": "Setting that enables the following UI tools:\n\n- background: backgroundImage\n- border: color, radius, style, width\n- color: link\n- dimensions: minHeight\n- position: sticky\n- spacing: blockGap, margin, padding\n- typography: lineHeight",
+					"description": "Setting that enables the following UI tools:\n\n- background: backgroundImage\n- border: color, radius, style, width\n- color: link\n- dimensions: aspectRatio, minHeight\n- position: sticky\n- spacing: blockGap, margin, padding\n- typography: lineHeight",
 					"type": "boolean",
 					"default": false
 				}
@@ -271,6 +271,11 @@
 					"description": "Settings related to dimensions.",
 					"type": "object",
 					"properties": {
+						"aspectRatio": {
+							"description": "Allow users to set an aspect ratio.",
+							"type": "boolean",
+							"default": false
+						},
 						"minHeight": {
 							"description": "Allow users to set custom minimum height.",
 							"type": "boolean",
@@ -1419,6 +1424,17 @@
 					"description": "Dimensions styles",
 					"type": "object",
 					"properties": {
+						"aspectRatio": {
+							"description": "Sets the `aspect-ratio` CSS property.",
+							"oneOf": [
+								{
+									"type": "string"
+								},
+								{
+									"$ref": "#/definitions/refComplete"
+								}
+							]
+						},
 						"minHeight": {
 							"description": "Sets the `min-height` CSS property.",
 							"oneOf": [

From a2d973869205d71aa384e88a79032fe3cee5b66e Mon Sep 17 00:00:00 2001
From: Andrew Serong <14988353+andrewserong@users.noreply.github.com>
Date: Thu, 25 Jan 2024 11:26:20 +1100
Subject: [PATCH 292/296] List View: Add keyboard clipboard events for cut,
 copy, paste (#57838)

* List View: Try adding keyboard clipboard events for cut, copy, paste

* Make useClipboardHandler that works with the list view

* Ensure focus remains within list view after cut and paste

* Add e2e tests

* Fix linting issue

* Update packages/block-editor/src/components/list-view/utils.js

Co-authored-by: Robert Anderson <robert@noisysocks.com>

* Try consolidating some of the copy and paste behaviour

* Add comment references the other useClipboardHandler

* Add JSDoc comments for the new utility functions

* Tidy up comment

---------

Co-authored-by: Robert Anderson <robert@noisysocks.com>
---
 .../src/components/list-view/block.js         |   2 +-
 .../src/components/list-view/index.js         |  31 ++-
 .../list-view/use-clipboard-handler.js        | 199 ++++++++++++++++++
 .../src/components/list-view/utils.js         |   8 +-
 .../writing-flow/use-clipboard-handler.js     |  84 +-------
 .../src/components/writing-flow/utils.js      | 103 +++++++++
 .../specs/editor/various/list-view.spec.js    |  96 ++++++++-
 7 files changed, 430 insertions(+), 93 deletions(-)
 create mode 100644 packages/block-editor/src/components/list-view/use-clipboard-handler.js
 create mode 100644 packages/block-editor/src/components/writing-flow/utils.js

diff --git a/packages/block-editor/src/components/list-view/block.js b/packages/block-editor/src/components/list-view/block.js
index aab9d444a5948..6dedabb48f8b8 100644
--- a/packages/block-editor/src/components/list-view/block.js
+++ b/packages/block-editor/src/components/list-view/block.js
@@ -187,7 +187,7 @@ function ListViewBlock( {
 				selectBlock( undefined, focusClientId, null, null );
 			}
 
-			focusListItem( focusClientId, treeGridElementRef );
+			focusListItem( focusClientId, treeGridElementRef?.current );
 		},
 		[ selectBlock, treeGridElementRef ]
 	);
diff --git a/packages/block-editor/src/components/list-view/index.js b/packages/block-editor/src/components/list-view/index.js
index 5270a7af3a296..895571755e4fa 100644
--- a/packages/block-editor/src/components/list-view/index.js
+++ b/packages/block-editor/src/components/list-view/index.js
@@ -42,6 +42,7 @@ import useListViewExpandSelectedItem from './use-list-view-expand-selected-item'
 import { store as blockEditorStore } from '../../store';
 import { BlockSettingsDropdown } from '../block-settings-menu/block-settings-dropdown';
 import { focusListItem } from './utils';
+import useClipboardHandler from './use-clipboard-handler';
 
 const expanded = ( state, action ) => {
 	if ( Array.isArray( action.clientIds ) ) {
@@ -137,14 +138,6 @@ function ListViewComponent(
 
 	const [ expandedState, setExpandedState ] = useReducer( expanded, {} );
 
-	const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
-		dropZoneElement,
-		expandedState,
-		setExpandedState,
-	} );
-	const elementRef = useRef();
-	const treeGridRef = useMergeRefs( [ elementRef, dropZoneRef, ref ] );
-
 	const [ insertedBlock, setInsertedBlock ] = useState( null );
 
 	const { setSelectedTreeId } = useListViewExpandSelectedItem( {
@@ -166,11 +159,31 @@ function ListViewComponent(
 		},
 		[ setSelectedTreeId, updateBlockSelection, onSelect, getBlock ]
 	);
+
+	const { ref: dropZoneRef, target: blockDropTarget } = useListViewDropZone( {
+		dropZoneElement,
+		expandedState,
+		setExpandedState,
+	} );
+	const elementRef = useRef();
+
+	// Allow handling of copy, cut, and paste events.
+	const clipBoardRef = useClipboardHandler( {
+		selectBlock: selectEditorBlock,
+	} );
+
+	const treeGridRef = useMergeRefs( [
+		clipBoardRef,
+		elementRef,
+		dropZoneRef,
+		ref,
+	] );
+
 	useEffect( () => {
 		// If a blocks are already selected when the list view is initially
 		// mounted, shift focus to the first selected block.
 		if ( selectedClientIds?.length ) {
-			focusListItem( selectedClientIds[ 0 ], elementRef );
+			focusListItem( selectedClientIds[ 0 ], elementRef?.current );
 		}
 		// Disable reason: Only focus on the selected item when the list view is mounted.
 		// eslint-disable-next-line react-hooks/exhaustive-deps
diff --git a/packages/block-editor/src/components/list-view/use-clipboard-handler.js b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
new file mode 100644
index 0000000000000..cd25c71e9bf7c
--- /dev/null
+++ b/packages/block-editor/src/components/list-view/use-clipboard-handler.js
@@ -0,0 +1,199 @@
+/**
+ * WordPress dependencies
+ */
+import { useDispatch, useSelect } from '@wordpress/data';
+import { useRefEffect } from '@wordpress/compose';
+
+/**
+ * Internal dependencies
+ */
+import { store as blockEditorStore } from '../../store';
+import { useNotifyCopy } from '../../utils/use-notify-copy';
+import { focusListItem } from './utils';
+import { getPasteBlocks, setClipboardBlocks } from '../writing-flow/utils';
+
+// This hook borrows from useClipboardHandler in ../writing-flow/use-clipboard-handler.js
+// and adds behaviour for the list view, while skipping partial selection.
+export default function useClipboardHandler( { selectBlock } ) {
+	const {
+		getBlockOrder,
+		getBlockRootClientId,
+		getBlocksByClientId,
+		getPreviousBlockClientId,
+		getSelectedBlockClientIds,
+		getSettings,
+		canInsertBlockType,
+		canRemoveBlocks,
+	} = useSelect( blockEditorStore );
+	const { flashBlock, removeBlocks, replaceBlocks, insertBlocks } =
+		useDispatch( blockEditorStore );
+	const notifyCopy = useNotifyCopy();
+
+	return useRefEffect( ( node ) => {
+		function updateFocusAndSelection( focusClientId, shouldSelectBlock ) {
+			if ( shouldSelectBlock ) {
+				selectBlock( undefined, focusClientId, null, null );
+			}
+
+			focusListItem( focusClientId, node );
+		}
+
+		// Determine which blocks to update:
+		// If the current (focused) block is part of the block selection, use the whole selection.
+		// If the focused block is not part of the block selection, only update the focused block.
+		function getBlocksToUpdate( clientId ) {
+			const selectedBlockClientIds = getSelectedBlockClientIds();
+			const isUpdatingSelectedBlocks =
+				selectedBlockClientIds.includes( clientId );
+			const firstBlockClientId = isUpdatingSelectedBlocks
+				? selectedBlockClientIds[ 0 ]
+				: clientId;
+			const firstBlockRootClientId =
+				getBlockRootClientId( firstBlockClientId );
+
+			const blocksToUpdate = isUpdatingSelectedBlocks
+				? selectedBlockClientIds
+				: [ clientId ];
+
+			return {
+				blocksToUpdate,
+				firstBlockClientId,
+				firstBlockRootClientId,
+				originallySelectedBlockClientIds: selectedBlockClientIds,
+			};
+		}
+
+		function handler( event ) {
+			if ( event.defaultPrevented ) {
+				// This was possibly already handled in rich-text/use-paste-handler.js.
+				return;
+			}
+
+			// Only handle events that occur within the list view.
+			if ( ! node.contains( event.target.ownerDocument.activeElement ) ) {
+				return;
+			}
+
+			// Retrieve the block clientId associated with the focused list view row.
+			// This enables applying copy / cut / paste behavior to the focused block,
+			// rather than just the blocks that are currently selected.
+			const listViewRow =
+				event.target.ownerDocument.activeElement?.closest(
+					'[role=row]'
+				);
+			const clientId = listViewRow?.dataset?.block;
+			if ( ! clientId ) {
+				return;
+			}
+
+			const {
+				blocksToUpdate: selectedBlockClientIds,
+				firstBlockClientId,
+				firstBlockRootClientId,
+				originallySelectedBlockClientIds,
+			} = getBlocksToUpdate( clientId );
+
+			if ( selectedBlockClientIds.length === 0 ) {
+				return;
+			}
+
+			event.preventDefault();
+
+			if ( event.type === 'copy' || event.type === 'cut' ) {
+				if ( selectedBlockClientIds.length === 1 ) {
+					flashBlock( selectedBlockClientIds[ 0 ] );
+				}
+
+				notifyCopy( event.type, selectedBlockClientIds );
+				const blocks = getBlocksByClientId( selectedBlockClientIds );
+				setClipboardBlocks( event, blocks );
+			}
+
+			if ( event.type === 'cut' ) {
+				// Don't update the selection if the blocks cannot be deleted.
+				if (
+					! canRemoveBlocks(
+						selectedBlockClientIds,
+						firstBlockRootClientId
+					)
+				) {
+					return;
+				}
+
+				let blockToFocus =
+					getPreviousBlockClientId( firstBlockClientId ) ??
+					// If the previous block is not found (when the first block is deleted),
+					// fallback to focus the parent block.
+					firstBlockRootClientId;
+
+				// Remove blocks, but don't update selection, and it will be handled below.
+				removeBlocks( selectedBlockClientIds, false );
+
+				// Update the selection if the original selection has been removed.
+				const shouldUpdateSelection =
+					originallySelectedBlockClientIds.length > 0 &&
+					getSelectedBlockClientIds().length === 0;
+
+				// If there's no previous block nor parent block, focus the first block.
+				if ( ! blockToFocus ) {
+					blockToFocus = getBlockOrder()[ 0 ];
+				}
+
+				updateFocusAndSelection( blockToFocus, shouldUpdateSelection );
+			} else if ( event.type === 'paste' ) {
+				const {
+					__experimentalCanUserUseUnfilteredHTML:
+						canUserUseUnfilteredHTML,
+				} = getSettings();
+				const blocks = getPasteBlocks(
+					event,
+					canUserUseUnfilteredHTML
+				);
+
+				if ( selectedBlockClientIds.length === 1 ) {
+					const [ selectedBlockClientId ] = selectedBlockClientIds;
+
+					// If a single block is focused, and the blocks to be posted can
+					// be inserted within the block, then append the pasted blocks
+					// within the focused block. For example, if you have copied a paragraph
+					// block and paste it within a single Group block, this will append
+					// the paragraph block within the Group block.
+					if (
+						blocks.every( ( block ) =>
+							canInsertBlockType(
+								block.name,
+								selectedBlockClientId
+							)
+						)
+					) {
+						insertBlocks(
+							blocks,
+							undefined,
+							selectedBlockClientId
+						);
+						updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+						return;
+					}
+				}
+
+				replaceBlocks(
+					selectedBlockClientIds,
+					blocks,
+					blocks.length - 1,
+					-1
+				);
+				updateFocusAndSelection( blocks[ 0 ]?.clientId, false );
+			}
+		}
+
+		node.ownerDocument.addEventListener( 'copy', handler );
+		node.ownerDocument.addEventListener( 'cut', handler );
+		node.ownerDocument.addEventListener( 'paste', handler );
+
+		return () => {
+			node.ownerDocument.removeEventListener( 'copy', handler );
+			node.ownerDocument.removeEventListener( 'cut', handler );
+			node.ownerDocument.removeEventListener( 'paste', handler );
+		};
+	}, [] );
+}
diff --git a/packages/block-editor/src/components/list-view/utils.js b/packages/block-editor/src/components/list-view/utils.js
index ed7a321dea0c8..c91376b047211 100644
--- a/packages/block-editor/src/components/list-view/utils.js
+++ b/packages/block-editor/src/components/list-view/utils.js
@@ -63,12 +63,12 @@ export function getCommonDepthClientIds(
  *
  * @typedef {import('@wordpress/element').RefObject} RefObject
  *
- * @param {string}                 focusClientId      The client ID of the block to focus.
- * @param {RefObject<HTMLElement>} treeGridElementRef The container element to search within.
+ * @param {string}       focusClientId   The client ID of the block to focus.
+ * @param {?HTMLElement} treeGridElement The container element to search within.
  */
-export function focusListItem( focusClientId, treeGridElementRef ) {
+export function focusListItem( focusClientId, treeGridElement ) {
 	const getFocusElement = () => {
-		const row = treeGridElementRef.current?.querySelector(
+		const row = treeGridElement?.querySelector(
 			`[role=row][data-block="${ focusClientId }"]`
 		);
 		if ( ! row ) return null;
diff --git a/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js b/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
index 5b78d2f8656b6..8528655c1dcc9 100644
--- a/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
+++ b/packages/block-editor/src/components/writing-flow/use-clipboard-handler.js
@@ -1,17 +1,9 @@
 /**
  * WordPress dependencies
  */
-import {
-	serialize,
-	pasteHandler,
-	createBlock,
-	findTransform,
-	getBlockTransforms,
-} from '@wordpress/blocks';
 import {
 	documentHasSelection,
 	documentHasUncollapsedSelection,
-	__unstableStripHTML as stripHTML,
 } from '@wordpress/dom';
 import { useDispatch, useSelect } from '@wordpress/data';
 import { useRefEffect } from '@wordpress/compose';
@@ -19,9 +11,9 @@ import { useRefEffect } from '@wordpress/compose';
 /**
  * Internal dependencies
  */
-import { getPasteEventData } from '../../utils/pasting';
 import { store as blockEditorStore } from '../../store';
 import { useNotifyCopy } from '../../utils/use-notify-copy';
+import { getPasteBlocks, setClipboardBlocks } from './utils';
 
 export default function useClipboardHandler() {
 	const {
@@ -112,29 +104,7 @@ export default function useClipboardHandler() {
 						blocks = [ head, ...inBetweenBlocks, tail ];
 					}
 
-					const wrapperBlockName = event.clipboardData.getData(
-						'__unstableWrapperBlockName'
-					);
-
-					if ( wrapperBlockName ) {
-						blocks = createBlock(
-							wrapperBlockName,
-							JSON.parse(
-								event.clipboardData.getData(
-									'__unstableWrapperBlockAttributes'
-								)
-							),
-							blocks
-						);
-					}
-
-					const serialized = serialize( blocks );
-
-					event.clipboardData.setData(
-						'text/plain',
-						toPlainText( serialized )
-					);
-					event.clipboardData.setData( 'text/html', serialized );
+					setClipboardBlocks( event, blocks );
 				}
 			}
 
@@ -153,35 +123,10 @@ export default function useClipboardHandler() {
 					__experimentalCanUserUseUnfilteredHTML:
 						canUserUseUnfilteredHTML,
 				} = getSettings();
-				const { plainText, html, files } = getPasteEventData( event );
-				let blocks = [];
-
-				if ( files.length ) {
-					const fromTransforms = getBlockTransforms( 'from' );
-					blocks = files
-						.reduce( ( accumulator, file ) => {
-							const transformation = findTransform(
-								fromTransforms,
-								( transform ) =>
-									transform.type === 'files' &&
-									transform.isMatch( [ file ] )
-							);
-							if ( transformation ) {
-								accumulator.push(
-									transformation.transform( [ file ] )
-								);
-							}
-							return accumulator;
-						}, [] )
-						.flat();
-				} else {
-					blocks = pasteHandler( {
-						HTML: html,
-						plainText,
-						mode: 'BLOCKS',
-						canUserUseUnfilteredHTML,
-					} );
-				}
+				const blocks = getPasteBlocks(
+					event,
+					canUserUseUnfilteredHTML
+				);
 
 				if ( selectedBlockClientIds.length === 1 ) {
 					const [ selectedBlockClientId ] = selectedBlockClientIds;
@@ -223,20 +168,3 @@ export default function useClipboardHandler() {
 		};
 	}, [] );
 }
-
-/**
- * Given a string of HTML representing serialized blocks, returns the plain
- * text extracted after stripping the HTML of any tags and fixing line breaks.
- *
- * @param {string} html Serialized blocks.
- * @return {string} The plain-text content with any html removed.
- */
-function toPlainText( html ) {
-	// Manually handle BR tags as line breaks prior to `stripHTML` call
-	html = html.replace( /<br>/g, '\n' );
-
-	const plainText = stripHTML( html ).trim();
-
-	// Merge any consecutive line breaks
-	return plainText.replace( /\n\n+/g, '\n\n' );
-}
diff --git a/packages/block-editor/src/components/writing-flow/utils.js b/packages/block-editor/src/components/writing-flow/utils.js
new file mode 100644
index 0000000000000..ef1827077ccbf
--- /dev/null
+++ b/packages/block-editor/src/components/writing-flow/utils.js
@@ -0,0 +1,103 @@
+/**
+ * WordPress dependencies
+ */
+import { __unstableStripHTML as stripHTML } from '@wordpress/dom';
+import {
+	serialize,
+	createBlock,
+	pasteHandler,
+	findTransform,
+	getBlockTransforms,
+} from '@wordpress/blocks';
+
+/**
+ * Internal dependencies
+ */
+import { getPasteEventData } from '../../utils/pasting';
+
+/**
+ * Sets the clipboard data for the provided blocks, with both HTML and plain
+ * text representations.
+ *
+ * @param {ClipboardEvent} event  Clipboard event.
+ * @param {WPBlock[]}      blocks Blocks to set as clipboard data.
+ */
+export function setClipboardBlocks( event, blocks ) {
+	let _blocks = blocks;
+	const wrapperBlockName = event.clipboardData.getData(
+		'__unstableWrapperBlockName'
+	);
+
+	if ( wrapperBlockName ) {
+		_blocks = createBlock(
+			wrapperBlockName,
+			JSON.parse(
+				event.clipboardData.getData(
+					'__unstableWrapperBlockAttributes'
+				)
+			),
+			_blocks
+		);
+	}
+
+	const serialized = serialize( _blocks );
+
+	event.clipboardData.setData( 'text/plain', toPlainText( serialized ) );
+	event.clipboardData.setData( 'text/html', serialized );
+}
+
+/**
+ * Returns the blocks to be pasted from the clipboard event.
+ *
+ * @param {ClipboardEvent} event                    The clipboard event.
+ * @param {boolean}        canUserUseUnfilteredHTML Whether the user can or can't post unfiltered HTML.
+ * @return {Array|string} A list of blocks or a string, depending on `handlerMode`.
+ */
+export function getPasteBlocks( event, canUserUseUnfilteredHTML ) {
+	const { plainText, html, files } = getPasteEventData( event );
+	let blocks = [];
+
+	if ( files.length ) {
+		const fromTransforms = getBlockTransforms( 'from' );
+		blocks = files
+			.reduce( ( accumulator, file ) => {
+				const transformation = findTransform(
+					fromTransforms,
+					( transform ) =>
+						transform.type === 'files' &&
+						transform.isMatch( [ file ] )
+				);
+				if ( transformation ) {
+					accumulator.push( transformation.transform( [ file ] ) );
+				}
+				return accumulator;
+			}, [] )
+			.flat();
+	} else {
+		blocks = pasteHandler( {
+			HTML: html,
+			plainText,
+			mode: 'BLOCKS',
+			canUserUseUnfilteredHTML,
+		} );
+	}
+
+	return blocks;
+}
+
+/**
+ * Given a string of HTML representing serialized blocks, returns the plain
+ * text extracted after stripping the HTML of any tags and fixing line breaks.
+ *
+ * @param {string} html Serialized blocks.
+ * @return {string} The plain-text content with any html removed.
+ */
+function toPlainText( html ) {
+	// Manually handle BR tags as line breaks prior to `stripHTML` call
+	html = html.replace( /<br>/g, '\n' );
+
+	const plainText = stripHTML( html ).trim();
+
+	// Merge any consecutive line breaks
+	return plainText.replace( /\n\n+/g, '\n\n' );
+}
diff --git a/test/e2e/specs/editor/various/list-view.spec.js b/test/e2e/specs/editor/various/list-view.spec.js
index 00f21b4e51c5e..cb15c12c84b49 100644
--- a/test/e2e/specs/editor/various/list-view.spec.js
+++ b/test/e2e/specs/editor/various/list-view.spec.js
@@ -450,7 +450,7 @@ test.describe( 'List View', () => {
 		).toBeFocused();
 	} );
 
-	test( 'should select, duplicate, delete, and deselect blocks using keyboard', async ( {
+	test( 'should cut, copy, paste, select, duplicate, delete, and deselect blocks using keyboard', async ( {
 		editor,
 		page,
 		pageUtils,
@@ -808,6 +808,100 @@ test.describe( 'List View', () => {
 				{ name: 'core/heading', selected: false, focused: false },
 				{ name: 'core/file', selected: false, focused: true },
 			] );
+
+		// Copy and paste blocks. To begin, add another Group block.
+		await editor.insertBlock( {
+			name: 'core/group',
+			innerBlocks: [
+				{ name: 'core/paragraph' },
+				{ name: 'core/pullquote' },
+			],
+		} );
+
+		// Click the newly inserted Group block List View item to ensure it is focused.
+		await listView
+			.getByRole( 'link', {
+				name: 'Group',
+				expanded: false,
+			} )
+			.click();
+
+		// Move down to group block, expand, and then move to the paragraph block.
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowRight' );
+		await page.keyboard.press( 'ArrowDown' );
+		await page.keyboard.press( 'ArrowDown' );
+		await pageUtils.pressKeys( 'primary+c' );
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'primary+v' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to copy focused block and paste in the list view via keyboard shortcuts'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{ name: 'core/file', selected: false, focused: false },
+				{
+					name: 'core/group',
+					selected: true,
+					innerBlocks: [
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: true,
+						},
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+					],
+				},
+			] );
+
+		// Cut and paste blocks.
+		await page.keyboard.press( 'ArrowUp' );
+		await pageUtils.pressKeys( 'primary+x' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to cut a block in the list view, with the preceding block being selected'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{ name: 'core/file', selected: true, focused: true },
+			] );
+
+		await pageUtils.pressKeys( 'primary+v' );
+
+		await expect
+			.poll(
+				listViewUtils.getBlocksWithA11yAttributes,
+				'Should be able to paste previously cut block in the list view via keyboard shortcuts'
+			)
+			.toMatchObject( [
+				{ name: 'core/heading', selected: false, focused: false },
+				{
+					name: 'core/group',
+					selected: true,
+					focused: true,
+					innerBlocks: [
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+						{
+							name: 'core/pullquote',
+							selected: false,
+							focused: false,
+						},
+					],
+				},
+			] );
 	} );
 
 	test( 'block settings dropdown menu', async ( {

From 621a3cd0ee1b86e0a213e820a159fac033cb7a7b Mon Sep 17 00:00:00 2001
From: George Mamadashvili <georgemamadashvili@gmail.com>
Date: Thu, 25 Jan 2024 07:55:59 +0400
Subject: [PATCH 293/296] Try fixing flaky Paragraph block e2e test (#58208)

---
 test/e2e/specs/editor/blocks/paragraph.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/e2e/specs/editor/blocks/paragraph.spec.js b/test/e2e/specs/editor/blocks/paragraph.spec.js
index dd3cd9196efb2..4918ac3d619b5 100644
--- a/test/e2e/specs/editor/blocks/paragraph.spec.js
+++ b/test/e2e/specs/editor/blocks/paragraph.spec.js
@@ -236,8 +236,9 @@ test.describe( 'Paragraph', () => {
 
 				{
 					// Dragging on the top half of the heading block.
+					// Make sure to target the top dropzone by dragging > 30px inside the block.
 					await draggingUtils.dragOver(
-						headingBox.x,
+						headingBox.x + 32,
 						headingBox.y + 1
 					);
 					await expect( draggingUtils.dropZone ).toBeVisible();

From 3da4d4452bab39cc902d280932a46620668d7b3a Mon Sep 17 00:00:00 2001
From: Nick Diego <nick.diego@automattic.com>
Date: Thu, 25 Jan 2024 02:44:47 -0600
Subject: [PATCH 294/296] Add spaces before list markup and remove extra
 spaces. (#58226)

---
 docs/getting-started/fundamentals/block-in-the-editor.md  | 8 +++++---
 docs/getting-started/fundamentals/block-wrapper.md        | 1 +
 .../fundamentals/file-structure-of-a-block.md             | 3 ++-
 .../fundamentals/markup-representation-block.md           | 8 +++++---
 .../fundamentals/registration-of-a-block.md               | 1 +
 .../fundamentals/static-dynamic-rendering.md              | 7 +++++--
 6 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/docs/getting-started/fundamentals/block-in-the-editor.md b/docs/getting-started/fundamentals/block-in-the-editor.md
index 56ba72c283bdf..2089d8aba2f0e 100644
--- a/docs/getting-started/fundamentals/block-in-the-editor.md
+++ b/docs/getting-started/fundamentals/block-in-the-editor.md
@@ -3,6 +3,7 @@
 The Block Editor is a React Single Page Application (SPA) and every block in the editor is displayed through a React component defined in the `edit` property of the settings object used to [register the block on the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side). 
 
 The `props` object received by the block's `Edit` React component includes:
+
 - [`attributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#attributes) - attributes object
 - [`setAttributes`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#setattributes) - method to update the attributes object
 - [`isSelected`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#isselected) - boolean that communicates whether the block is currently selected
@@ -14,18 +15,21 @@ The WordPress Gutenberg project uses <a href="https://wordpress.github.io/gutenb
 </div>
 
 Custom settings controls for the block in the Block Toolbar or the Settings Sidebar can also be defined through this `Edit` React component via built-in components such as:
+
 - [`InspectorControls`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md) 
 - [`BlockControls`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-editor/src/components/block-controls) 
 
 ## Built-in components
 
 The package [`@wordpress/components`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-components/) includes a library of generic WordPress components to create common UI elements for the Block Editor and the WordPress dashboard. Some of the  most commonly used components from this package are:
+
 - [`TextControl`](https://wordpress.github.io/gutenberg/?path=/docs/components-textcontrol--docs) 
 - [`Panel`](https://wordpress.github.io/gutenberg/?path=/docs/components-panel--docs)
 - [`ToggleControl`](https://wordpress.github.io/gutenberg/?path=/docs/components-togglecontrol--docs)
 - [`ExternalLink`](https://wordpress.github.io/gutenberg/?path=/docs/components-externallink--docs)
 
 The package [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/) includes a library of components and hooks for the Block Editor, including those to define custom settings controls for the block in the Editor. Some of the components most commonly used from this package are:
+
 - [`RichText`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md)
 - [`BlockControls`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-editor/src/components/block-controls)
 - [`InspectorControls`](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/inspector-controls/README.md)
@@ -37,13 +41,12 @@ The package <a href="https://developer.wordpress.org/block-editor/reference-guid
 </div>
 
 A good workflow when using a component for the Block Editor is:
+
 - Import the component from a WordPress package
 - Add the corresponding code for the component to your project in JSX format
 - Most built-in components will be used to set [block attributes](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#using-attributes-to-store-block-data), so define any necessary attributes in `block.json` and create event handlers to update those attributes with `setAttributes` in your component
 - If needed, adapt the code to be serialized and stored in the database
 
-
-
 ## Block Controls: Block Toolbar and Settings Sidebar
 
 To simplify block customization and ensure a consistent experience for users, there are a number of built-in UI patterns to help generate the editor preview. 
@@ -95,7 +98,6 @@ _See the [full block example](https://github.com/WordPress/block-development-exa
 
 Note that `BlockControls` is only visible when the block is currently selected and in visual editing mode. `BlockControls` are not shown when editing a block in HTML editing mode.
 
-
 ### Settings Sidebar
 
 The Settings Sidebar is used to display less-often-used settings or settings that require more screen space. The Settings Sidebar should be used for **block-level settings only**.
diff --git a/docs/getting-started/fundamentals/block-wrapper.md b/docs/getting-started/fundamentals/block-wrapper.md
index cf588cf33cf6f..6582d3af3301f 100644
--- a/docs/getting-started/fundamentals/block-wrapper.md
+++ b/docs/getting-started/fundamentals/block-wrapper.md
@@ -24,6 +24,7 @@ For the [`edit` React component and the `save` function](https://developer.wordp
 The [`useBlockProps()`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor/#useblockprops) hook available on the [`@wordpress/block-editor`](https://developer.wordpress.org/block-editor/reference-guides/packages/packages-block-editor) allows passing the required attributes for the Block Editor to the `edit` block's outer wrapper.
 
 Among other things, the `useBlockProps()` hook takes care of including in this wrapper:
+
 - An `id` for the block's markup
 - Some accessibility and `data-` attributes
 - Classes and inline styles reflecting custom settings, which include by default:
diff --git a/docs/getting-started/fundamentals/file-structure-of-a-block.md b/docs/getting-started/fundamentals/file-structure-of-a-block.md
index 72531ccfb2b27..b52f5c5efd0f7 100644
--- a/docs/getting-started/fundamentals/file-structure-of-a-block.md
+++ b/docs/getting-started/fundamentals/file-structure-of-a-block.md
@@ -30,7 +30,8 @@ This file contains the [metadata of the block](https://developer.wordpress.org/b
 
 Among other data it provides properties to define the paths of the files involved in the block's behaviour, output and style. If there's a build process involved, this `block.json` along with the generated files are placed into a destination folder (usually the `build` folder) so the paths provided target to the bundled versions of these files.
 
-The most relevant properties that can be defined in a `block.json` to set the files involved in the block's behaviour, output or style are:
+The most relevant properties that can be defined in a `block.json` to set the files involved in the block's behaviour, output, or style are:
+
 - The [`editorScript`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-script) property, usually set with the path of a bundled `index.js` file (output build from `src/index.js`).
 - The [`style`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#style) property, usually set with the path of a bundled `style-index.css` file (output build from `src/style.(css|scss|sass)`).
 - The [`editorStyle`](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/#editor-style) property, usually set with the path of a bundled `index.css` (output build from `src/editor.(css|scss|sass)`).
diff --git a/docs/getting-started/fundamentals/markup-representation-block.md b/docs/getting-started/fundamentals/markup-representation-block.md
index 506d0feb8d3d1..b048160907a25 100644
--- a/docs/getting-started/fundamentals/markup-representation-block.md
+++ b/docs/getting-started/fundamentals/markup-representation-block.md
@@ -1,8 +1,9 @@
 # Markup representation of a block
 
-When stored, in the database (DB) or in templates as HTML files, blocks are represented using a [specific HTML grammar](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#data-and-attributes), which is technically valid HTML based on HTML comments that act as explicit block delimiters 
+When stored in the database or in templates as HTML files, blocks are represented using a [specific HTML grammar](https://developer.wordpress.org/block-editor/explanations/architecture/key-concepts/#data-and-attributes), which is technically valid HTML based on HTML comments that act as explicit block delimiters 
 
 These are some of the rules for the markup used to represent a block:
+
 - All core block comments start with a prefix and the block name: `wp:blockname`
 - For custom blocks, `blockname` is `namespace/blockname`
 - The comment can be a single line, self-closing, or wrapper for HTML content.
@@ -17,21 +18,22 @@ _Example: Markup representation of an `image` core block_
 ```
 
 The [markup representation of a block is parsed for the Block Editor](https://developer.wordpress.org/block-editor/explanations/architecture/data-flow/) and the block's output for the front end:
+
 - In the editor, WordPress parses this block markup, captures its data and loads its `edit` version
 - In the front end, WordPress parses this block markup, captures its data and generates its final HTML markup
 
 Whenever a block is saved, the `save` function, defined when the [block is registered in the client](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-javascript-client-side), is called to return the markup that will be saved into the database within the block delimiter's comment. If `save` is `null` (common case for blocks with dynamic rendering), only a single line block delimiter's comment is stored, along with any attributes
 
 The Post Editor checks that the markup created by the `save` function is identical to the block's markup saved to the database:
+
 - If there are any differences, the Post Editor triggers a [block validation error](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-edit-save/#validation).
 - Block validation errors usually happen when a block’s `save` function is updated to change the markup produced by the block.
 - A block developer can mitigate these issues by adding a [**block deprecation**](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-deprecation/) to register the change in the block.
 
-The markup of a **block with dynamic rendering** is expected to change so the markup of these blocks is not saved to the database. What is saved in the DB as representation of the block, for blocks with dynamic rendering, is a single line of HTML consisting on just the block delimiter's comment (including block attributes values). That HTML is not subject to the Post Editor’s validation.
+The markup of a **block with dynamic rendering** is expected to change so the markup of these blocks is not saved to the database. What is saved in the database as representation of the block, for blocks with dynamic rendering, is a single line of HTML consisting on just the block delimiter's comment (including block attributes values). That HTML is not subject to the Post Editor’s validation.
 
 _Example: Markup representation of a block with dynamic rendering (`save` = `null`) and attributes_
 
-
 ```html
 <!-- wp:latest-posts {"postsToShow":4,"displayPostDate":true} /-->
 ```
diff --git a/docs/getting-started/fundamentals/registration-of-a-block.md b/docs/getting-started/fundamentals/registration-of-a-block.md
index 7d7b0e5ac3163..65cd85b0fa3e5 100644
--- a/docs/getting-started/fundamentals/registration-of-a-block.md
+++ b/docs/getting-started/fundamentals/registration-of-a-block.md
@@ -69,6 +69,7 @@ The content of <code>block.json</code> (or any other <code>.json</code> file) ca
 </div>
 
 The client-side block settings object passed as a second parameter includes two especially relevant properties:
+
 - `edit`: The React component that gets used in the editor for our block.
 - `save`: The function that returns the static HTML markup that gets saved to the Database. 
 
diff --git a/docs/getting-started/fundamentals/static-dynamic-rendering.md b/docs/getting-started/fundamentals/static-dynamic-rendering.md
index 34d5432850c45..214fb9da8b40f 100644
--- a/docs/getting-started/fundamentals/static-dynamic-rendering.md
+++ b/docs/getting-started/fundamentals/static-dynamic-rendering.md
@@ -63,6 +63,7 @@ The markup stored for a block can be modified before it gets rendered on the fro
 </div>
 
 Some examples of core blocks with static rendering are:
+
 - [`separator`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/separator/save.js) function) 
 - [`spacer`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/spacer/save.js) function).
 - [`button`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/button) (see its [`save`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/button/save.js) function).
@@ -82,10 +83,12 @@ There are some common use cases for dynamic blocks:
 ### How to define dynamic rendering for a block
 
 A block can define dynamic rendering in two main ways:
+
 1. Via the `render_callback` argument that can be passed to the [`register_block_type()` function](https://developer.wordpress.org/block-editor/getting-started/fundamentals/registration-of-a-block/#registration-of-the-block-with-php-server-side).
-1. Via a separate PHP file (usually named `render.php`) which path can be defined at the [`render` property of the `block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style).
+2. Via a separate PHP file (usually named `render.php`) which path can be defined at the [`render` property of the `block.json`](https://developer.wordpress.org/block-editor/getting-started/fundamentals/block-json/#files-for-the-blocks-behavior-output-or-style).
 
 Both of these ways to define the block's dynamic rendering receive the following data:
+
  - `$attributes` - The array of attributes for this block.
  - `$content` - Rendered block output (markup of the block as stored in the database).
  - `$block` - The instance of the [WP_Block](https://developer.wordpress.org/reference/classes/wp_block/) class that represents the block being rendered ([metadata of the block](https://developer.wordpress.org/block-editor/reference-guides/block-api/block-metadata/)).
@@ -95,7 +98,6 @@ Both of these ways to define the block's dynamic rendering receive the following
 
 For example, the [`site-title`](https://github.com/WordPress/gutenberg/tree/trunk/packages/block-library/src/site-title) core block with the following function registered as [`render_callback`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/site-title/index.php)...
 
-
 ```php
 function render_block_core_site_title( $attributes ) {
 	$site_title = get_bloginfo( 'name' );
@@ -159,6 +161,7 @@ For dynamic blocks, the `save` callback function can return just `null`, which t
 Blocks with dynamic rendering can also save an HTML representation of the block as a backup. If you provide a server-side rendering callback, the HTML representing the block in the database will be replaced with the output of your callback, but will be rendered if your block is deactivated (the plugin that registers the block is uninstalled) or your render callback is removed.
 
 In some cases, the block saves an HTML representation of the block and uses a dynamic rendering to fine-tune this markup if some conditions are met. Some examples of core blocks using this approach are:
+
 - The [`cover`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover) block saves a [full HTML representation of the block in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/cover/save.js). This markup is processed via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L74) when requested to do some PHP magic that dynamically [injects the featured image if the "use featured image" setting is enabled](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/cover/index.php#L16).
 - The [`image`](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image) block also saves [its HTML representation in the database](https://github.com/WordPress/gutenberg/blob/trunk/packages/block-library/src/image/save.js) and processes it via a [`render_callback`](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L363) when requested to [add some attributes to the markup](https://github.com/WordPress/gutenberg/blob/22741661998834e69db74ad863705ee2ce97b446/packages/block-library/src/image/index.php#L18) if some conditions are met.
 

From fae5b9a270362ae103a44423dc957d14b7969c1b Mon Sep 17 00:00:00 2001
From: James Koster <james@jameskoster.co.uk>
Date: Thu, 25 Jan 2024 08:49:54 +0000
Subject: [PATCH 295/296] Data views: Remove min-width style on table cells
 (#58204)

* Remove min-width style

* Reduce title maxwidth
---
 packages/dataviews/src/style.scss                     | 4 ----
 packages/edit-site/src/components/page-pages/index.js | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/dataviews/src/style.scss b/packages/dataviews/src/style.scss
index 07797d3624af7..6ce1b9dadcae5 100644
--- a/packages/dataviews/src/style.scss
+++ b/packages/dataviews/src/style.scss
@@ -87,10 +87,6 @@
 		padding: $grid-unit-15;
 		white-space: nowrap;
 
-		@include break-huge() {
-			min-width: 200px;
-		}
-
 		&[data-field-id="actions"] {
 			text-align: right;
 		}
diff --git a/packages/edit-site/src/components/page-pages/index.js b/packages/edit-site/src/components/page-pages/index.js
index ea59eab333c42..603a7b30de2ed 100644
--- a/packages/edit-site/src/components/page-pages/index.js
+++ b/packages/edit-site/src/components/page-pages/index.js
@@ -298,7 +298,7 @@ export default function PagePages() {
 							__( '(no title)' )
 					);
 				},
-				maxWidth: 400,
+				maxWidth: 300,
 				enableHiding: false,
 			},
 			{

From e0005a813686157e2f25f6d4b28cc72ebadbfaae Mon Sep 17 00:00:00 2001
From: Carolina Nymark <myazalea@hotmail.com>
Date: Thu, 25 Jan 2024 09:57:48 +0100
Subject: [PATCH 296/296] Follow up on the Post navigation link taxonomy
 filters (#57949)

* Remove the taxonomy filter with hard coded slugs.
* Remove inSameTerm attribute
* Add filter for publicly_queryable taxonomies
* simplify the check for the taxonomy attribute in index.php
---
 docs/reference-guides/core-blocks.md                      | 2 +-
 .../block-library/src/post-navigation-link/block.json     | 3 ---
 packages/block-library/src/post-navigation-link/edit.js   | 8 +-------
 packages/block-library/src/post-navigation-link/index.php | 7 ++-----
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/docs/reference-guides/core-blocks.md b/docs/reference-guides/core-blocks.md
index 0cf9bb77f71f8..02c6c397d924c 100644
--- a/docs/reference-guides/core-blocks.md
+++ b/docs/reference-guides/core-blocks.md
@@ -639,7 +639,7 @@ Displays the next or previous post link that is adjacent to the current post. ([
 -	**Name:** core/post-navigation-link
 -	**Category:** theme
 -	**Supports:** color (background, link, text), typography (fontSize, lineHeight), ~~html~~, ~~reusable~~
--	**Attributes:** arrow, inSameTerm, label, linkLabel, showTitle, taxonomy, textAlign, type
+-	**Attributes:** arrow, label, linkLabel, showTitle, taxonomy, textAlign, type
 
 ## Post Template
 
diff --git a/packages/block-library/src/post-navigation-link/block.json b/packages/block-library/src/post-navigation-link/block.json
index 61d42f0e55f20..cdfecf6c627ca 100644
--- a/packages/block-library/src/post-navigation-link/block.json
+++ b/packages/block-library/src/post-navigation-link/block.json
@@ -29,9 +29,6 @@
 			"type": "string",
 			"default": "none"
 		},
-		"inSameTerm": {
-			"type": "boolean"
-		},
 		"taxonomy": {
 			"type": "string",
 			"default": ""
diff --git a/packages/block-library/src/post-navigation-link/edit.js b/packages/block-library/src/post-navigation-link/edit.js
index 464531f9d4546..1c41367575cb6 100644
--- a/packages/block-library/src/post-navigation-link/edit.js
+++ b/packages/block-library/src/post-navigation-link/edit.js
@@ -66,7 +66,6 @@ export default function PostNavigationLinkEdit( {
 			const filteredTaxonomies = getTaxonomies( {
 				type: postType,
 				per_page: -1,
-				context: 'view',
 			} );
 			return filteredTaxonomies;
 		},
@@ -78,11 +77,7 @@ export default function PostNavigationLinkEdit( {
 			value: '',
 		};
 		const taxonomyOptions = ( taxonomies ?? [] )
-			.filter(
-				( tax ) =>
-					tax.slug !== 'nav_menu' &&
-					tax.slug !== 'wp_pattern_category'
-			)
+			.filter( ( { visibility } ) => !! visibility?.publicly_queryable )
 			.map( ( item ) => {
 				return {
 					value: item.slug,
@@ -168,7 +163,6 @@ export default function PostNavigationLinkEdit( {
 					onChange={ ( value ) =>
 						setAttributes( {
 							taxonomy: value,
-							inSameTerm: value === '' ? false : true,
 						} )
 					}
 					help={ __(
diff --git a/packages/block-library/src/post-navigation-link/index.php b/packages/block-library/src/post-navigation-link/index.php
index 50106bdd7cce5..69c9a3f39f8a7 100644
--- a/packages/block-library/src/post-navigation-link/index.php
+++ b/packages/block-library/src/post-navigation-link/index.php
@@ -99,9 +99,6 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 		}
 	}
 
-	$in_same_term = isset( $attributes['inSameTerm'] ) ? $attributes['inSameTerm'] : false;
-	$taxonomy     = isset( $attributes['taxonomy'] ) && $in_same_term ? $attributes['taxonomy'] : '';
-
 	/**
 	 * The dynamic portion of the function name, `$navigation_type`,
 	 * Refers to the type of adjacency, 'next' or 'previous'.
@@ -111,8 +108,8 @@ function render_block_core_post_navigation_link( $attributes, $content ) {
 	 */
 	$get_link_function = "get_{$navigation_type}_post_link";
 
-	if ( $in_same_term ) {
-		$content = $get_link_function( $format, $link, $in_same_term, '', $taxonomy );
+	if ( ! empty( $attributes['taxonomy'] ) ) {
+		$content = $get_link_function( $format, $link, true, '', $attributes['taxonomy'] );
 	} else {
 		$content = $get_link_function( $format, $link );
 	}