Merge branch 'WordPress:trunk' into trunk

Author: dd32

src/wp-includes/abilities-api.php

@@ -264,9 +264,13 @@
  *             @type bool|null $idempotent  Optional. If true, calling the ability repeatedly with the same arguments
  *                                          will have no additional effect on its environment.
  *         }
+ *         @type bool                     $public       Optional. Whether the ability is intended to be publicly
+ *                                                      available to clients. When true, channel-specific exposure
+ *                                                      flags such as `$show_in_rest` default to true. An explicitly
+ *                                                      set channel flag always takes precedence.
  *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API.
  *                                                      When true, the ability can be invoked via HTTP requests.
- *                                                      Default false.
+ *                                                      Default is the value of `$public` when set, false otherwise.
  *     }
  *     @type string               $ability_class       Optional. Fully-qualified custom class name to instantiate
  *                                                     instead of the default `WP_Ability` class. The custom class

src/wp-includes/abilities-api/class-wp-abilities-registry.php

@@ -71,7 +71,12 @@ final class WP_Abilities_Registry {
 	 *             @type bool|null $idempotent  Optional. If true, calling the ability repeatedly with the same arguments
 	 *                                          will have no additional effect on its environment.
 	 *         }
-	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API. Default false.
+	 *         @type bool                     $public       Optional. Whether the ability is intended to be publicly
+	 *                                                      available to clients. When true, channel-specific exposure
+	 *                                                      flags such as `$show_in_rest` default to true. An explicitly
+	 *                                                      set channel flag always takes precedence.
+	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API.
+	 *                                                      Default is the value of `$public` when set, false otherwise.
 	 *     }
 	 *     @type string               $ability_class         Optional. Custom class to instantiate instead of WP_Ability.
 	 * }
@@ -120,7 +125,11 @@ public function register( string $name, array $args ): ?WP_Ability {
 		 *         Optional. Additional metadata for the ability.
 		 *
 		 *         @type array<string, bool|string> $annotations  Optional. Annotation metadata for the ability.
-		 *         @type bool                       $show_in_rest Optional. Whether to expose this ability in the REST API. Default false.
+		 *         @type bool                       $public       Optional. Whether the ability is intended to be
+		 *                                                        publicly available to clients. Seeds the default for
+		 *                                                        channel-specific exposure flags like `$show_in_rest`.
+		 *         @type bool                       $show_in_rest Optional. Whether to expose this ability in the REST API.
+		 *                                                        Default is the value of `$public` when set, false otherwise.
 		 *     }
 		 *     @type string               $ability_class         Optional. Custom class to instantiate instead of WP_Ability.
 		 * }

src/wp-includes/abilities-api/class-wp-ability.php

@@ -160,7 +160,12 @@ class WP_Ability {
 	 *             @type bool|null $idempotent  Optional. If true, calling the ability repeatedly with the same arguments
 	 *                                          will have no additional effect on its environment.
 	 *         }
-	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API. Default false.
+	 *         @type bool                     $public       Optional. Whether the ability is intended to be publicly
+	 *                                                      available to clients. When true, channel-specific exposure
+	 *                                                      flags such as `$show_in_rest` default to true. An explicitly
+	 *                                                      set channel flag always takes precedence.
+	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API.
+	 *                                                      Default is the value of `$public` when set, false otherwise.
 	 *     }
 	 * }
 	 */
@@ -224,7 +229,12 @@ public function __construct( string $name, array $args ) {
 	 *             @type bool|null $idempotent  Optional. If true, calling the ability repeatedly with the same arguments
 	 *                                          will have no additional effect on its environment.
 	 *         }
-	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API. Default false.
+	 *         @type bool                     $public       Optional. Whether the ability is intended to be publicly
+	 *                                                      available to clients. When true, channel-specific exposure
+	 *                                                      flags such as `$show_in_rest` default to true. An explicitly
+	 *                                                      set channel flag always takes precedence.
+	 *         @type bool                     $show_in_rest Optional. Whether to expose this ability in the REST API.
+	 *                                                      Default is the value of `$public` when set, false otherwise.
 	 *     }
 	 * }
 	 * @return array<string, mixed> {
@@ -252,7 +262,9 @@ public function __construct( string $name, array $args ) {
 	 *             @type bool|null $idempotent  If true, calling the ability repeatedly with the same arguments
 	 *                                          will have no additional effect on its environment.
 	 *         }
-	 *         @type bool                     $show_in_rest Whether to expose this ability in the REST API. Default false.
+	 *         @type bool                     $public       Whether the ability is intended to be publicly available
+	 *                                                      to clients. Only present when provided during registration.
+	 *         @type bool                     $show_in_rest Whether to expose this ability in the REST API.
 	 *     }
 	 * }
 	 * @throws InvalidArgumentException if an argument is invalid.
@@ -322,14 +334,27 @@ protected function prepare_properties( array $args ): array {
 			);
 		}
 
+		if ( isset( $args['meta']['public'] ) && ! is_bool( $args['meta']['public'] ) ) {
+			throw new InvalidArgumentException(
+				__( 'The ability meta should provide a valid `public` boolean.' )
+			);
+		}
+
 		// Set defaults for optional meta.
-		$args['meta']                = wp_parse_args(
+		$args['meta'] = wp_parse_args(
 			$args['meta'] ?? array(),
 			array(
-				'annotations'  => static::$default_annotations,
-				'show_in_rest' => self::DEFAULT_SHOW_IN_REST,
+				'annotations' => static::$default_annotations,
 			)
 		);
+
+		/*
+		 * Resolve `show_in_rest` from most specific to least specific: an explicit
+		 * `show_in_rest` value wins, then the high-level `public` flag seeds the
+		 * default, then the built-in default applies.
+		 */
+		$args['meta']['show_in_rest'] = $args['meta']['show_in_rest'] ?? $args['meta']['public'] ?? self::DEFAULT_SHOW_IN_REST;
+
 		$args['meta']['annotations'] = wp_parse_args(
 			$args['meta']['annotations'],
 			static::$default_annotations

src/wp-includes/block-supports/dimensions.php

@@ -64,7 +64,7 @@ function wp_apply_dimensions_support( $block_type, $block_attributes ) {
 	}
 
 	$dimensions_block_styles = array();
-	$supported_features      = array( 'minHeight', 'height', 'width' );
+	$supported_features      = array( 'minHeight', 'minWidth', 'height', 'width' );
 
 	foreach ( $supported_features as $feature ) {
 		$has_support        = block_has_support( $block_type, array( 'dimensions', $feature ), false );

src/wp-includes/class-wp-theme-json.php

@@ -248,7 +248,7 @@ class WP_Theme_JSON {
 	 * @since 6.7.0 Added `background-attachment` property.
 	 * @since 7.0.0 Added `dimensions.width` and `dimensions.height`.
 	 *              Added `text-indent` property.
-	 * @since 7.1.0 Added `text-shadow` property.
+	 * @since 7.1.0 Added `min-width` and `text-shadow`.
 	 * @var array
 	 */
 	const PROPERTIES_METADATA = array(
@@ -295,6 +295,7 @@ class WP_Theme_JSON {
 		'margin-bottom'                     => array( 'spacing', 'margin', 'bottom' ),
 		'margin-left'                       => array( 'spacing', 'margin', 'left' ),
 		'min-height'                        => array( 'dimensions', 'minHeight' ),
+		'min-width'                         => array( 'dimensions', 'minWidth' ),
 		'outline-color'                     => array( 'outline', 'color' ),
 		'outline-offset'                    => array( 'outline', 'offset' ),
 		'outline-style'                     => array( 'outline', 'style' ),
@@ -417,7 +418,7 @@ class WP_Theme_JSON {
 	 *              Added support for `dimensions.width` and `dimensions.height`.
 	 *              Added support for `typography.textIndent`.
 	 * @since 7.1.0 Added `viewport` property.
-	 *              Added support for `background.gradient` and `blockVisibility.allowEditing`.
+	 *              Added support for `background.gradient`, `dimensions.minWidth` and `blockVisibility.allowEditing`.
 	 * @var array
 	 */
 	const VALID_SETTINGS = array(
@@ -460,6 +461,7 @@ class WP_Theme_JSON {
 			'dimensionSizes'      => null,
 			'height'              => null,
 			'minHeight'           => null,
+			'minWidth'            => null,
 			'width'               => null,
 		),
 		'layout'                        => array(
@@ -563,8 +565,8 @@ class WP_Theme_JSON {
 	 * @since 6.5.0 Added support for `dimensions.aspectRatio`.
 	 * @since 6.6.0 Added `background` sub properties to top-level only.
 	 * @since 7.0.0 Added support for `dimensions.width` and `dimensions.height`.
-	 * @since 7.1.0 Added `background.gradient`.
-	 * @since 7.1.0 Added support for `typography.textShadow`.
+	 * @since 7.1.0 Added support for `background.gradient`,`dimensions.minWidth`,
+	 *              and `typography.textShadow`.
 	 * @var array
 	 */
 	const VALID_STYLES = array(
@@ -595,6 +597,7 @@ class WP_Theme_JSON {
 			'aspectRatio' => null,
 			'height'      => null,
 			'minHeight'   => null,
+			'minWidth'    => null,
 			'width'       => null,
 		),
 		'filter'     => array(
@@ -1035,6 +1038,7 @@ public static function get_element_class_name( $element ) {
 	 * @since 6.5.0 Added `background.backgroundSize` and `dimensions.aspectRatio`.
 	 * @since 7.0.0 Added `dimensions.width` and `dimensions.height`.
 	 * @since 7.1.0 Added `background.gradient`.
+	 *              Added `dimensions.minWidth`.
 	 * @var array
 	 */
 	const APPEARANCE_TOOLS_OPT_INS = array(
@@ -1052,6 +1056,7 @@ public static function get_element_class_name( $element ) {
 		array( 'dimensions', 'aspectRatio' ),
 		array( 'dimensions', 'height' ),
 		array( 'dimensions', 'minHeight' ),
+		array( 'dimensions', 'minWidth' ),
 		array( 'dimensions', 'width' ),
 		array( 'position', 'sticky' ),
 		array( 'spacing', 'blockGap' ),
@@ -2480,21 +2485,89 @@ protected function get_css_variables( $nodes, $origins ) {
 				continue;
 			}
 
-			$selector = $metadata['selector'];
+			$selector          = $metadata['selector'];
+			$feature_selectors = $metadata['selectors'] ?? array();
+			$node              = _wp_array_get( $this->theme_json, $metadata['path'], array() );
+
+			/*
+			 * Group preset declarations by selector. Blocks that define
+			 * feature-level selectors need their preset CSS variables
+			 * output under that feature selector instead of the block's
+			 * root selector.
+			 */
+			$vars_by_selector              = array();
+			$vars_by_selector[ $selector ] = array();
+
+			foreach ( static::PRESETS_METADATA as $preset_metadata ) {
+				if ( empty( $preset_metadata['css_vars'] ) ) {
+					continue;
+				}
+
+				$values_by_slug = static::get_settings_values_by_slug( $node, $preset_metadata, $origins );
+				if ( empty( $values_by_slug ) ) {
+					continue;
+				}
+
+				$target = static::get_feature_selector( $feature_selectors, $preset_metadata['path'][0], $selector );
+
+				if ( ! isset( $vars_by_selector[ $target ] ) ) {
+					$vars_by_selector[ $target ] = array();
+				}
+
+				foreach ( $values_by_slug as $slug => $value ) {
+					$vars_by_selector[ $target ][] = array(
+						'name'  => static::replace_slug_in_string( $preset_metadata['css_vars'], $slug ),
+						'value' => $value,
+					);
+				}
+			}
 
-			$node                    = _wp_array_get( $this->theme_json, $metadata['path'], array() );
-			$declarations            = static::compute_preset_vars( $node, $origins );
-			$theme_vars_declarations = static::compute_theme_vars( $node );
-			foreach ( $theme_vars_declarations as $theme_vars_declaration ) {
-				$declarations[] = $theme_vars_declaration;
+			// Theme vars always use the block's default selector.
+			foreach ( static::compute_theme_vars( $node ) as $theme_var ) {
+				$vars_by_selector[ $selector ][] = $theme_var;
 			}
 
-			$stylesheet .= static::to_ruleset( $selector, $declarations );
+			foreach ( $vars_by_selector as $rule_selector => $declarations ) {
+				$stylesheet .= static::to_ruleset( $rule_selector, $declarations );
+			}
 		}
 
 		return $stylesheet;
 	}
 
+	/**
+	 * Returns the appropriate selector for a block support feature's
+	 * preset CSS variables.
+	 *
+	 * If the block defines a feature-level selector (as a string or an
+	 * object with a `root` key), that selector is returned. Otherwise,
+	 * the block's default selector is used.
+	 *
+	 * @since 7.1.0
+	 *
+	 * @param array<string, string|array<string, string>> $feature_selectors The block's feature selectors map.
+	 * @param string                                      $feature_key       The feature to look up (e.g. 'dimensions').
+	 * @param string                                      $default_selector  Fallback selector.
+	 * @return string The resolved selector.
+	 */
+	private static function get_feature_selector( array $feature_selectors, string $feature_key, string $default_selector ): string {
+		if ( ! isset( $feature_selectors[ $feature_key ] ) ) {
+			return $default_selector;
+		}
+
+		$feature = $feature_selectors[ $feature_key ];
+
+		if ( is_string( $feature ) ) {
+			return $feature;
+		}
+
+		if ( isset( $feature['root'] ) && is_string( $feature['root'] ) ) {
+			return $feature['root'];
+		}
+
+		return $default_selector;
+	}
+
 	/**
 	 * Given a selector and a declaration list,
 	 * creates the corresponding ruleset.
@@ -3145,8 +3218,9 @@ protected static function get_setting_nodes( $theme_json, $selectors = array() )
 			}
 
 			$nodes[] = array(
-				'path'     => array( 'settings', 'blocks', $name ),
-				'selector' => $selector,
+				'path'      => array( 'settings', 'blocks', $name ),
+				'selector'  => $selector,
+				'selectors' => $selectors[ $name ]['selectors'] ?? array(),
 			);
 		}
 

src/wp-includes/rest-api/endpoints/class-wp-rest-abilities-v1-list-controller.php

@@ -312,6 +312,10 @@ public function get_item_schema(): array {
 							),
 							'additionalProperties' => true,
 						),
+						'public'      => array(
+							'description' => __( 'Whether the ability author intends the ability to be publicly available to clients. Only present when set by the ability author.' ),
+							'type'        => 'boolean',
+						),
 					),
 					'context'     => array( 'view', 'edit' ),
 					'readonly'    => true,

src/wp-includes/style-engine/class-wp-style-engine.php

@@ -242,6 +242,15 @@ final class WP_Style_Engine {
 					'dimension' => '--wp--preset--dimension--$slug',
 				),
 			),
+			'minWidth'    => array(
+				'property_keys' => array(
+					'default' => 'min-width',
+				),
+				'path'          => array( 'dimensions', 'minWidth' ),
+				'css_vars'      => array(
+					'dimension' => '--wp--preset--dimension--$slug',
+				),
+			),
 			'objectFit'   => array(
 				'property_keys' => array(
 					'default' => 'object-fit',

tests/phpunit/tests/abilities-api/wpAbilitiesRegistry.php

@@ -358,7 +358,6 @@ public function test_register_incorrect_output_schema_type() {
 		$this->assertNull( $result );
 	}
 
-
 	/**
 	 * Should reject ability registration with invalid `annotations` type.
 	 *
@@ -410,6 +409,23 @@ public function test_register_invalid_show_in_rest_type() {
 		$this->assertNull( $result );
 	}
 
+	/**
+	 * Should reject ability registration with invalid public type.
+	 *
+	 * @ticket 65568
+	 *
+	 * @covers WP_Abilities_Registry::register
+	 * @covers WP_Ability::prepare_properties
+	 *
+	 * @expectedIncorrectUsage WP_Abilities_Registry::register
+	 */
+	public function test_register_invalid_public_type() {
+		self::$test_ability_args['meta']['public'] = 5;
+
+		$result = $this->registry->register( self::$test_ability_name, self::$test_ability_args );
+		$this->assertNull( $result );
+	}
+
 	/**
 	 * Should reject registration for already registered ability.
 	 *