Merge branch 'trunk' into update/default-control-heights

lib/compat/wordpress-6.4/block-patterns.php

@@ -16,21 +16,20 @@
  */
 function gutenberg_register_taxonomy_patterns() {
 	$args = array(
-		'public'                => true,
-		'publicly_queryable'    => false,
-		'hierarchical'          => false,
-		'labels'                => array(
+		'public'             => true,
+		'publicly_queryable' => false,
+		'hierarchical'       => false,
+		'labels'             => array(
 			'name'          => _x( 'Pattern Categories', 'taxonomy general name' ),
 			'singular_name' => _x( 'Pattern Category', 'taxonomy singular name' ),
 		),
-		'query_var'             => false,
-		'rewrite'               => false,
-		'show_ui'               => true,
-		'_builtin'              => true,
-		'show_in_nav_menus'     => false,
-		'show_in_rest'          => true,
-		'show_admin_column'     => true,
-		'rest_controller_class' => 'Gutenberg_REST_Pattern_Categories_Controller',
+		'query_var'          => false,
+		'rewrite'            => false,
+		'show_ui'            => true,
+		'_builtin'           => true,
+		'show_in_nav_menus'  => false,
+		'show_in_rest'       => true,
+		'show_admin_column'  => true,
 	);
 	register_taxonomy( 'wp_pattern_category', array( 'wp_block' ), $args );
 }

lib/compat/wordpress-6.4/blocks.php

@@ -21,27 +21,3 @@ function gutenberg_add_custom_capabilities_to_wp_block( $args ) {
 	return $args;
 }
 add_filter( 'register_wp_block_post_type_args', 'gutenberg_add_custom_capabilities_to_wp_block', 10, 1 );
-
-/**
- * Updates the wp_block REST enpoint in order to modify the wp_pattern_category action
- * links that are returned because as although the taxonomy is flat Author level users
- * are only allowed to assign categories.
- *
- * Note: This should be removed when the minimum required WP version is >= 6.4.
- *
- * @see https://github.com/WordPress/gutenberg/pull/55379
- *
- * @param array  $args Register post type args.
- * @param string $post_type The post type string.
- *
- * @return array Register post type args.
- */
-function gutenberg_update_patterns_block_rest_controller_class( $args, $post_type ) {
-	if ( 'wp_block' === $post_type ) {
-		$args['rest_controller_class'] = 'Gutenberg_REST_Blocks_Controller_6_4';
-	}
-
-	return $args;
-}
-
-add_filter( 'register_post_type_args', 'gutenberg_update_patterns_block_rest_controller_class', 11, 2 );

lib/load.php

@@ -53,8 +53,6 @@ function gutenberg_is_experiment_enabled( $name ) {
 	// WordPress 6.4 compat.
 	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-global-styles-revisions-controller-6-4.php';
 	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-block-patterns-controller.php';
-	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-blocks-controller-6-4.php';
-	require_once __DIR__ . '/compat/wordpress-6.4/class-gutenberg-rest-pattern-categories-controller.php';
 	require_once __DIR__ . '/compat/wordpress-6.4/rest-api.php';
 	require_once __DIR__ . '/compat/wordpress-6.4/theme-previews.php';
 

packages/base-styles/_mixins.scss

@@ -64,7 +64,7 @@
  */
 
 @mixin block-toolbar-button-style__focus() {
-	box-shadow: inset 0 0 0 var(--wp-admin-border-width-focus) var(--wp-admin-theme-color), inset 0 0 0 4px $white;
+	box-shadow: inset 0 0 0 $border-width var(--wp-components-color-background, $white), 0 0 0 var(--wp-admin-border-width-focus) var(--wp-components-color-accent, var(--wp-admin-theme-color, #3858e9));
 
 	// Windows High Contrast mode will show this outline, but not the box-shadow.
 	outline: 2px solid transparent;