Merge remote-tracking branch 'upstream' into add/twemoji-17.0

Author: desrosj

package-lock.json

@@ -82,32 +82,32 @@
 		"@wordpress/autop": "4.33.1",
 		"@wordpress/base-styles": "6.9.1",
 		"@wordpress/blob": "4.33.1",
-		"@wordpress/block-directory": "5.33.3",
-		"@wordpress/block-editor": "15.6.1",
-		"@wordpress/block-library": "9.33.2",
+		"@wordpress/block-directory": "5.33.5",
+		"@wordpress/block-editor": "15.6.3",
+		"@wordpress/block-library": "9.33.4",
 		"@wordpress/block-serialization-default-parser": "5.33.1",
 		"@wordpress/blocks": "15.6.1",
 		"@wordpress/commands": "1.33.1",
 		"@wordpress/components": "30.6.1",
 		"@wordpress/compose": "7.33.1",
-		"@wordpress/core-commands": "1.33.1",
-		"@wordpress/core-data": "7.33.1",
-		"@wordpress/customize-widgets": "5.33.2",
+		"@wordpress/core-commands": "1.33.3",
+		"@wordpress/core-data": "7.33.3",
+		"@wordpress/customize-widgets": "5.33.4",
 		"@wordpress/data": "10.33.1",
 		"@wordpress/data-controls": "4.33.1",
-		"@wordpress/dataviews": "10.1.1",
+		"@wordpress/dataviews": "10.1.2",
 		"@wordpress/date": "5.33.1",
 		"@wordpress/deprecated": "4.33.1",
 		"@wordpress/dom": "4.33.1",
 		"@wordpress/dom-ready": "4.33.1",
-		"@wordpress/edit-post": "8.33.3",
-		"@wordpress/edit-site": "6.33.3",
-		"@wordpress/edit-widgets": "6.33.2",
-		"@wordpress/editor": "14.33.3",
+		"@wordpress/edit-post": "8.33.5",
+		"@wordpress/edit-site": "6.33.5",
+		"@wordpress/edit-widgets": "6.33.4",
+		"@wordpress/editor": "14.33.5",
 		"@wordpress/element": "6.33.1",
 		"@wordpress/escape-html": "3.33.1",
-		"@wordpress/fields": "0.25.3",
-		"@wordpress/format-library": "5.33.1",
+		"@wordpress/fields": "0.25.5",
+		"@wordpress/format-library": "5.33.3",
 		"@wordpress/hooks": "4.33.1",
 		"@wordpress/html-entities": "4.33.1",
 		"@wordpress/i18n": "6.6.1",
@@ -123,15 +123,15 @@
 		"@wordpress/media-utils": "5.33.1",
 		"@wordpress/notices": "5.33.1",
 		"@wordpress/nux": "9.33.1",
-		"@wordpress/patterns": "2.33.1",
+		"@wordpress/patterns": "2.33.3",
 		"@wordpress/plugins": "7.33.1",
 		"@wordpress/preferences": "4.33.1",
 		"@wordpress/preferences-persistence": "2.33.1",
 		"@wordpress/primitives": "4.33.1",
 		"@wordpress/priority-queue": "3.33.1",
 		"@wordpress/private-apis": "1.33.1",
 		"@wordpress/redux-routine": "5.33.1",
-		"@wordpress/reusable-blocks": "5.33.1",
+		"@wordpress/reusable-blocks": "5.33.3",
 		"@wordpress/rich-text": "7.33.1",
 		"@wordpress/router": "1.33.1",
 		"@wordpress/server-side-render": "6.9.1",
@@ -143,9 +143,9 @@
 		"@wordpress/upload-media": "0.18.1",
 		"@wordpress/url": "4.33.1",
 		"@wordpress/viewport": "6.33.1",
-		"@wordpress/views": "1.0.2",
+		"@wordpress/views": "1.0.3",
 		"@wordpress/warning": "3.33.1",
-		"@wordpress/widgets": "4.33.1",
+		"@wordpress/widgets": "4.33.3",
 		"@wordpress/wordcount": "4.33.1",
 		"backbone": "1.6.0",
 		"clipboard": "2.0.11",

package.json

@@ -17,7 +17,7 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 
 	/**
 	 * @since 2.5.0
-	 * @var resource
+	 * @var FTP\Connection|resource|false
 	 */
 	public $link;
 

src/wp-admin/includes/class-wp-filesystem-ftpext.php

@@ -728,8 +728,8 @@ public function get_test_php_version() {
 
 		$result = array(
 			'label'       => sprintf(
-				/* translators: %s: The recommended PHP version. */
-				__( 'Your site is running a recommended version of PHP (%s)' ),
+				/* translators: %s: The server PHP version. */
+				__( 'Your site is running PHP %s' ),
 				PHP_VERSION
 			),
 			'status'      => 'good',
@@ -739,11 +739,7 @@ public function get_test_php_version() {
 			),
 			'description' => sprintf(
 				'<p>%s</p>',
-				sprintf(
-					/* translators: %s: The minimum recommended PHP version. */
-					__( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site&#8217;s performance. The minimum recommended version of PHP is %s.' ),
-					$response ? $response['recommended_version'] : ''
-				)
+				__( 'PHP is one of the programming languages used to build WordPress. Newer versions of PHP receive regular security updates and may increase your site&#8217;s performance.' )
 			),
 			'actions'     => sprintf(
 				'<p><a href="%s" target="_blank">%s<span class="screen-reader-text"> %s</span><span aria-hidden="true" class="dashicons dashicons-external"></span></a></p>',
@@ -755,8 +751,36 @@ public function get_test_php_version() {
 			'test'        => 'php_version',
 		);
 
+		if ( ! $response ) {
+			$result['label'] = sprintf(
+				/* translators: %s: The server PHP version. */
+				__( 'Unable to determine the status of the current PHP version (%s)' ),
+				PHP_VERSION
+			);
+			$result['status']      = 'recommended';
+			$result['description'] = '<p><em>' . sprintf(
+				/* translators: %s is the URL to the Serve Happy docs page. */
+				__( 'Unable to access the WordPress.org API for <a href="%s">Serve Happy</a>.' ),
+				'https://codex.wordpress.org/WordPress.org_API#Serve_Happy'
+			) . '</em></p>' . $result['description'];
+			return $result;
+		}
+
+		$result['description'] .= '<p>' . sprintf(
+			/* translators: %s: The minimum recommended PHP version. */
+			__( 'The minimum recommended version of PHP is %s.' ),
+			$response['recommended_version']
+		) . '</p>';
+
 		// PHP is up to date.
-		if ( ! $response || version_compare( PHP_VERSION, $response['recommended_version'], '>=' ) ) {
+		if ( version_compare( PHP_VERSION, $response['recommended_version'], '>=' ) ) {
+			$result['label'] = sprintf(
+				/* translators: %s: The server PHP version. */
+				__( 'Your site is running a recommended version of PHP (%s)' ),
+				PHP_VERSION
+			);
+			$result['status'] = 'good';
+
 			return $result;
 		}
 

src/wp-admin/includes/class-wp-site-health.php

@@ -306,7 +306,7 @@ function wp_typography_get_preset_inline_style_value( $style_value, $css_propert
  * @return string Filtered block content.
  */
 function wp_render_typography_support( $block_content, $block ) {
-	if ( ! empty( $block['attrs']['fitText'] ) ) {
+	if ( ! empty( $block['attrs']['fitText'] ) && ! is_admin() ) {
 		wp_enqueue_script_module( '@wordpress/block-editor/utils/fit-text-frontend' );
 	}
 	if ( ! isset( $block['attrs']['style']['typography']['fontSize'] ) ) {

src/wp-includes/assets/script-loader-packages.min.php

@@ -4,7 +4,7 @@
 	"name": "core/accordion-heading",
 	"title": "Accordion Heading",
 	"category": "design",
-	"description": "Toggles the accordion panel.",
+	"description": "Displays a heading that toggles the accordion panel.",
 	"parent": [ "core/accordion-item" ],
 	"usesContext": [
 		"core/accordion-icon-position",

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

@@ -66,9 +66,12 @@ function render_block_core_archives( $attributes ) {
 		$show_label = empty( $attributes['showLabel'] ) ? ' screen-reader-text' : '';
 
 		$block_content = '<label for="' . $dropdown_id . '" class="wp-block-archives__label' . $show_label . '">' . esc_html( $title ) . '</label>
-		<select id="' . $dropdown_id . '" name="archive-dropdown" onchange="document.location.href=this.options[this.selectedIndex].value;">
+		<select id="' . esc_attr( $dropdown_id ) . '" name="archive-dropdown">
 		<option value="">' . esc_html( $label ) . '</option>' . $archives . '</select>';
 
+		// Inject the dropdown script immediately after the select dropdown.
+		$block_content .= block_core_archives_build_dropdown_script( $dropdown_id );
+
 		return sprintf(
 			'<div %1$s>%2$s</div>',
 			$wrapper_attributes,
@@ -106,6 +109,55 @@ function render_block_core_archives( $attributes ) {
 	);
 }
 
+/**
+ * Generates the inline script for an archives dropdown field.
+ *
+ * @since 6.9.0
+ *
+ * @param string $dropdown_id ID of the dropdown field.
+ *
+ * @return string Returns the dropdown onChange redirection script.
+ */
+function block_core_archives_build_dropdown_script( $dropdown_id ) {
+	ob_start();
+
+	$exports = array( $dropdown_id, home_url() );
+	?>
+	<script>
+	( ( [ dropdownId, homeUrl ] ) => {
+		const dropdown = document.getElementById( dropdownId );
+		function onSelectChange() {
+			setTimeout( () => {
+				if ( 'escape' === dropdown.dataset.lastkey ) {
+					return;
+				}
+				if ( dropdown.value ) {
+					location.href = dropdown.value;
+				}
+			}, 250 );
+		}
+		function onKeyUp( event ) {
+			if ( 'Escape' === event.key ) {
+				dropdown.dataset.lastkey = 'escape';
+			} else {
+				delete dropdown.dataset.lastkey;
+			}
+		}
+		function onClick() {
+			delete dropdown.dataset.lastkey;
+		}
+		dropdown.addEventListener( 'keyup', onKeyUp );
+		dropdown.addEventListener( 'click', onClick );
+		dropdown.addEventListener( 'change', onSelectChange );
+	} )( <?php echo wp_json_encode( $exports, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES ); ?> );
+	</script>
+	<?php
+	return wp_get_inline_script_tag(
+		trim( str_replace( array( '<script>', '</script>' ), '', ob_get_clean() ) ) .
+		"\n//# sourceURL=" . rawurlencode( __FUNCTION__ )
+	);
+}
+
 /**
  * Register archives block.
  *

src/wp-includes/blocks/accordion-heading/block.json

@@ -104,7 +104,7 @@
     'name' => 'core/accordion-heading',
     'title' => 'Accordion Heading',
     'category' => 'design',
-    'description' => 'Toggles the accordion panel.',
+    'description' => 'Displays a heading that toggles the accordion panel.',
     'parent' => array(
       'core/accordion-item'
     ),
@@ -2516,9 +2516,13 @@
       )
     ),
     'supports' => array(
+      'html' => false,
       'className' => false,
       'customClassName' => false,
-      'reusable' => false
+      'lock' => false,
+      'reusable' => false,
+      'renaming' => false,
+      'blockVisibility' => false
     ),
     'editorStyle' => 'wp-block-freeform-editor'
   ),
@@ -3825,7 +3829,10 @@
       'customClassName' => false,
       'inserter' => false,
       'html' => false,
+      'lock' => false,
       'reusable' => false,
+      'renaming' => false,
+      'blockVisibility' => false,
       'interactivity' => array(
         'clientNavigation' => true
       )

src/wp-includes/blocks/archives.php

@@ -104,14 +104,32 @@ function build_dropdown_script_block_core_categories( $dropdown_id ) {
 	?>
 	<script>
 	( ( [ dropdownId, homeUrl ] ) => {
-		document.getElementById( dropdownId ).addEventListener( 'change', ( event ) => {
-			const dropdown = /** @type {HTMLSelectElement} */ ( event.target );
-			if ( dropdown.value && dropdown.value !== '-1' ) {
-				const url = new URL( homeUrl );
-				url.searchParams.set( dropdown.name, dropdown.value );
-				location.href = url.href;
+		const dropdown = document.getElementById( dropdownId );
+		function onSelectChange() {
+			setTimeout( () => {
+				if ( 'escape' === dropdown.dataset.lastkey ) {
+					return;
+				}
+				if ( dropdown.value && dropdown instanceof HTMLSelectElement ) {
+					const url = new URL( homeUrl );
+					url.searchParams.set( dropdown.name, dropdown.value );
+					location.href = url.href;
+				}
+			}, 250 );
+		}
+		function onKeyUp( event ) {
+			if ( 'Escape' === event.key ) {
+				dropdown.dataset.lastkey = 'escape';
+			} else {
+				delete dropdown.dataset.lastkey;
 			}
-		} );
+		}
+		function onClick() {
+			delete dropdown.dataset.lastkey;
+		}
+		dropdown.addEventListener( 'keyup', onKeyUp );
+		dropdown.addEventListener( 'click', onClick );
+		dropdown.addEventListener( 'change', onSelectChange );
 	} )( <?php echo wp_json_encode( $exports, JSON_HEX_TAG | JSON_UNESCAPED_SLASHES ); ?> );
 	</script>
 	<?php