Merge branch 'trunk' into update/all-pages-view-title

.eslintrc.js

@@ -354,20 +354,25 @@ module.exports = {
 		},
 		{
 			files: [ 'packages/components/src/**' ],
-			excludedFiles: [ 'packages/components/src/utils/colors-values.js' ],
+			excludedFiles: [
+				'packages/components/src/utils/colors-values.js',
+				'packages/components/src/theme/**',
+			],
 			rules: {
 				'no-restricted-syntax': [
 					'error',
 					{
-						selector: 'Literal[value=/--wp-admin-theme-/]',
+						selector:
+							':matches(Literal[value=/--wp-admin-theme-/],TemplateElement[value.cooked=/--wp-admin-theme-/])',
 						message:
 							'--wp-admin-theme-* variables do not support component theming. Use variables from the COLORS object in packages/components/src/utils/colors-values.js instead.',
 					},
 					{
 						selector:
-							'TemplateElement[value.cooked=/--wp-admin-theme-/]',
+							// Allow overriding definitions, but not access with var()
+							':matches(Literal[value=/var\\(\\s*--wp-components-color-/],TemplateElement[value.cooked=/var\\(\\s*--wp-components-color-/])',
 						message:
-							'--wp-admin-theme-* variables do not support component theming. Use variables from the COLORS object in packages/components/src/utils/colors-values.js instead.',
+							'To ensure proper fallbacks, --wp-components-color-* variables should not be used directly. Use variables from the COLORS object in packages/components/src/utils/colors-values.js instead.',
 					},
 				],
 			},

.stylelintrc.json

@@ -4,6 +4,14 @@
 		"at-rule-empty-line-before": null,
 		"at-rule-no-unknown": null,
 		"comment-empty-line-before": null,
+		"declaration-property-value-disallowed-list": [
+			{
+				"/.*/": [ "/--wp-components-color-/" ]
+			},
+			{
+				"message": "--wp-components-color-* variables are not ready to be used outside of the components package."
+			}
+		],
 		"font-weight-notation": null,
 		"max-line-length": null,
 		"no-descending-specificity": null,

docs/reference-guides/data/data-core-edit-post.md

@@ -476,6 +476,8 @@ _Parameters_
 
 ### switchEditorMode
 
+> **Deprecated**
+
 Triggers an action used to switch editor mode.
 
 _Parameters_
@@ -484,6 +486,8 @@ _Parameters_
 
 ### toggleDistractionFree
 
+> **Deprecated**
+
 Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
 
 ### toggleEditorPanelEnabled

docs/reference-guides/data/data-core-edit-site.md

@@ -395,10 +395,18 @@ _Returns_
 
 ### switchEditorMode
 
-Undocumented declaration.
+> **Deprecated**
+
+Triggers an action used to switch editor mode.
+
+_Parameters_
+
+-   _mode_ `string`: The editor mode.
 
 ### toggleDistractionFree
 
+> **Deprecated**
+
 Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
 
 ### toggleFeature

docs/reference-guides/data/data-core-editor.md

@@ -353,6 +353,18 @@ _Returns_
 
 -   `Array`: Block list.
 
+### getEditorMode
+
+Returns the current editing mode.
+
+_Parameters_
+
+-   _state_ `Object`: Global application state.
+
+_Returns_
+
+-   `string`: Editing mode.
+
 ### getEditorSelection
 
 Returns the current selection.
@@ -1467,6 +1479,14 @@ _Related_
 
 -   stopTyping in core/block-editor store.
 
+### switchEditorMode
+
+Triggers an action used to switch editor mode.
+
+_Parameters_
+
+-   _mode_ `string`: The editor mode.
+
 ### synchronizeTemplate
 
 _Related_
@@ -1479,6 +1499,10 @@ _Related_
 
 -   toggleBlockMode in core/block-editor store.
 
+### toggleDistractionFree
+
+Action that toggles Distraction free mode. Distraction free mode expects there are no sidebars, as due to the z-index values set, you can't close sidebars.
+
 ### toggleEditorPanelEnabled
 
 Returns an action object used to enable or disable a panel in the editor.

docs/reference-guides/richtext.md

@@ -81,7 +81,7 @@ If you'd still like to use RichText, you can eliminate all of the formatting opt
 
 If you want to limit the formats allowed, you can specify using `allowedFormats` property in your code, see the example above or [the component documentation](https://github.com/WordPress/gutenberg/blob/HEAD/packages/block-editor/src/components/rich-text/README.md#allowedformats-array) for details.
 
-### Disable specific fromat types in Editor
+### Disable specific format types in Editor
 
 The RichText component uses formats to display inline elements, for example images within the paragraph block. If you just want to disable a format from the editor, you can use the `unregisterFormatType` function. For example to disable inline images, use:
 

lib/block-supports/elements.php

@@ -142,8 +142,9 @@ function gutenberg_render_elements_support_styles( $pre_render, $block ) {
 			'skip'     => $skip_button_color_serialization,
 		),
 		'link'    => array(
-			'selector'       => ".$class_name a",
-			'hover_selector' => ".$class_name a:hover",
+			// :where(:not) matches theme.json selector.
+			'selector'       => ".$class_name a:where(:not(.wp-element-button))",
+			'hover_selector' => ".$class_name a:where(:not(.wp-element-button)):hover",
 			'skip'           => $skip_link_color_serialization,
 		),
 		'heading' => array(

lib/block-supports/layout.php

@@ -596,13 +596,16 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 
 	/**
 	 * If columnSpan is set, and the parent grid is responsive, i.e. if it has a minimumColumnWidth set,
-	 * the columnSpan should be removed on small grids.
+	 * the columnSpan should be removed on small grids. If there's a minimumColumnWidth, the grid is responsive.
+	 * But if the minimumColumnWidth value wasn't changed, it won't be set. In that case, if columnCount doesn't
+	 * exist, we can assume that the grid is responsive.
 	 */
-	if ( isset( $block['attrs']['style']['layout']['columnSpan'] ) && isset( $block['attrs']['style']['layout']['parentColumnWidth'] ) ) {
+	if ( isset( $block['attrs']['style']['layout']['columnSpan'] ) && ( isset( $block['parentLayout']['minimumColumnWidth'] ) || ! isset( $block['parentLayout']['columnCount'] ) ) ) {
 		$column_span_number  = floatval( $block['attrs']['style']['layout']['columnSpan'] );
-		$parent_column_width = $block['attrs']['style']['layout']['parentColumnWidth'];
+		$parent_column_width = isset( $block['parentLayout']['minimumColumnWidth'] ) ? $block['parentLayout']['minimumColumnWidth'] : '12rem';
 		$parent_column_value = floatval( $parent_column_width );
 		$parent_column_unit  = explode( $parent_column_value, $parent_column_width );
+
 		/**
 		 * If there is no unit, the width has somehow been mangled so we reset both unit and value
 		 * to defaults.
@@ -887,6 +890,25 @@ function gutenberg_render_layout_support_flag( $block_content, $block ) {
 	return $processor->get_updated_html();
 }
 
+/**
+ * Add a `render_block_data` filter to fetch the parent block layout data.
+ */
+add_filter(
+	'render_block_data',
+	function ( $parsed_block, $source_block, $parent_block ) {
+		/**
+		 * Check if the parent block exists and if it has a layout attribute.
+		 * If it does, add the parent layout to the parsed block.
+		 */
+		if ( $parent_block && isset( $parent_block->parsed_block['attrs']['layout'] ) ) {
+			$parsed_block['parentLayout'] = $parent_block->parsed_block['attrs']['layout'];
+		}
+		return $parsed_block;
+	},
+	10,
+	3
+);
+
 // Register the block support. (overrides core one).
 WP_Block_Supports::get_instance()->register(
 	'layout',

lib/compat/wordpress-6.5/block-bindings/block-bindings.php

@@ -25,18 +25,19 @@
  * @param array  $source_properties {
  *     The array of arguments that are used to register a source.
  *
- *     @type string   $label              The label of the source.
- *     @type callback $get_value_callback A callback executed when the source is processed during block rendering.
- *                                        The callback should have the following signature:
+ *     @type string   $label                   The label of the source.
+ *     @type callback $get_value_callback      A callback executed when the source is processed during block rendering.
+ *                                             The callback should have the following signature:
  *
- *                                        `function ($source_args, $block_instance,$attribute_name): mixed`
- *                                            - @param array    $source_args    Array containing source arguments
- *                                                                              used to look up the override value,
- *                                                                              i.e. {"key": "foo"}.
- *                                            - @param WP_Block $block_instance The block instance.
- *                                            - @param string   $attribute_name The name of an attribute .
- *                                        The callback has a mixed return type; it may return a string to override
- *                                        the block's original value, null, false to remove an attribute, etc.
+ *                                             `function ($source_args, $block_instance,$attribute_name): mixed`
+ *                                                 - @param array    $source_args    Array containing source arguments
+ *                                                                                   used to look up the override value,
+ *                                                                                   i.e. {"key": "foo"}.
+ *                                                 - @param WP_Block $block_instance The block instance.
+ *                                                 - @param string   $attribute_name The name of an attribute .
+ *                                             The callback has a mixed return type; it may return a string to override
+ *                                             the block's original value, null, false to remove an attribute, etc.
+ *     @type array    $uses_context (optional) Array of values to add to block `uses_context` needed by the source.
  * }
  * @return WP_Block_Bindings_Source|false Source when the registration was successful, or `false` on failure.
  */

lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings-registry.php

@@ -32,6 +32,31 @@ final class WP_Block_Bindings_Registry {
 		 */
 		private static $instance = null;
 
+		/**
+		 * Supported source properties that can be passed to the registered source.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private $allowed_source_properties = array(
+			'label',
+			'get_value_callback',
+			'uses_context',
+		);
+
+		/**
+		 * Supported blocks that can use the block bindings API.
+		 *
+		 * @since 6.5.0
+		 * @var array
+		 */
+		private $supported_blocks = array(
+			'core/paragraph',
+			'core/heading',
+			'core/image',
+			'core/button',
+		);
+
 		/**
 		 * Registers a new block bindings source.
 		 *
@@ -48,18 +73,19 @@ final class WP_Block_Bindings_Registry {
 		 * @param array    $source_properties {
 		 *     The array of arguments that are used to register a source.
 		 *
-		 *     @type string   $label              The label of the source.
-		 *     @type callback $get_value_callback A callback executed when the source is processed during block rendering.
-		 *                                        The callback should have the following signature:
-		 *
-		 *                                        `function ($source_args, $block_instance,$attribute_name): mixed`
-		 *                                            - @param array    $source_args    Array containing source arguments
-		 *                                                                              used to look up the override value,
-		 *                                                                              i.e. {"key": "foo"}.
-		 *                                            - @param WP_Block $block_instance The block instance.
-		 *                                            - @param string   $attribute_name The name of the target attribute.
-		 *                                        The callback has a mixed return type; it may return a string to override
-		 *                                        the block's original value, null, false to remove an attribute, etc.
+		 *     @type string   $label                   The label of the source.
+		 *     @type callback $get_value_callback      A callback executed when the source is processed during block rendering.
+		 *                                             The callback should have the following signature:
+		 *
+		 *                                             `function ($source_args, $block_instance,$attribute_name): mixed`
+		 *                                                 - @param array    $source_args    Array containing source arguments
+		 *                                                                                   used to look up the override value,
+		 *                                                                                   i.e. {"key": "foo"}.
+		 *                                                 - @param WP_Block $block_instance The block instance.
+		 *                                                 - @param string   $attribute_name The name of the target attribute.
+		 *                                             The callback has a mixed return type; it may return a string to override
+		 *                                             the block's original value, null, false to remove an attribute, etc.
+		 *     @type array    $uses_context (optional) Array of values to add to block `uses_context` needed by the source.
 		 * }
 		 * @return WP_Block_Bindings_Source|false Source when the registration was successful, or `false` on failure.
 		 */
@@ -102,7 +128,7 @@ public function register( string $source_name, array $source_properties ) {
 				return false;
 			}
 
-			/* Validate that the source properties contain the label */
+			// Validate that the source properties contain the label.
 			if ( ! isset( $source_properties['label'] ) ) {
 				_doing_it_wrong(
 					__METHOD__,
@@ -112,7 +138,7 @@ public function register( string $source_name, array $source_properties ) {
 				return false;
 			}
 
-			/* Validate that the source properties contain the get_value_callback */
+			// Validate that the source properties contain the get_value_callback.
 			if ( ! isset( $source_properties['get_value_callback'] ) ) {
 				_doing_it_wrong(
 					__METHOD__,
@@ -122,7 +148,7 @@ public function register( string $source_name, array $source_properties ) {
 				return false;
 			}
 
-			/* Validate that the get_value_callback is a valid callback */
+			// Validate that the get_value_callback is a valid callback.
 			if ( ! is_callable( $source_properties['get_value_callback'] ) ) {
 				_doing_it_wrong(
 					__METHOD__,
@@ -132,13 +158,49 @@ public function register( string $source_name, array $source_properties ) {
 				return false;
 			}
 
+			// Validate that the uses_context parameter is an array.
+			if ( isset( $source_properties['uses_context'] ) && ! is_array( $source_properties['uses_context'] ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					__( 'The "uses_context" parameter must be an array.' ),
+					'6.5.0'
+				);
+				return false;
+			}
+
+			// Validate that the source properties contain only allowed properties.
+			if ( ! empty( array_diff( array_keys( $source_properties ), $this->allowed_source_properties ) ) ) {
+				_doing_it_wrong(
+					__METHOD__,
+					__( 'The $source_properties array contains invalid properties.' ),
+					'6.5.0'
+				);
+				return false;
+			}
+
 			$source = new WP_Block_Bindings_Source(
 				$source_name,
 				$source_properties
 			);
 
 			$this->sources[ $source_name ] = $source;
 
+			// Add `uses_context` defined by block bindings sources.
+			add_filter(
+				'register_block_type_args',
+				function ( $args, $block_name ) use ( $source ) {
+					if ( ! in_array( $block_name, $this->supported_blocks, true ) || empty( $source->uses_context ) ) {
+						return $args;
+					}
+					$original_use_context = isset( $args['uses_context'] ) ? $args['uses_context'] : array();
+					// Use array_values to reset the array keys.
+					$args['uses_context'] = array_values( array_unique( array_merge( $original_use_context, $source->uses_context ) ) );
+
+					return $args;
+				},
+				10,
+				2
+			);
 			return $source;
 		}
 

lib/compat/wordpress-6.5/block-bindings/class-wp-block-bindings-source.php

@@ -46,6 +46,14 @@ final class WP_Block_Bindings_Source {
 		 */
 		private $get_value_callback;
 
+		/**
+		 * The context added to the blocks needed by the source.
+		 *
+		 * @since 6.5.0
+		 * @var array|null
+		 */
+		public $uses_context = null;
+
 		/**
 		 * Constructor.
 		 *
@@ -58,9 +66,10 @@ final class WP_Block_Bindings_Source {
 		 * @param array  $source_properties  The properties of the source.
 		 */
 		public function __construct( string $name, array $source_properties ) {
-			$this->name               = $name;
-			$this->label              = $source_properties['label'];
-			$this->get_value_callback = $source_properties['get_value_callback'];
+			$this->name = $name;
+			foreach ( $source_properties as $property_name => $property_value ) {
+				$this->$property_name = $property_value;
+			}
 		}
 
 		/**