Editor: Update packages for 6.1 Beta 2.

Package updates for bug and regression fixes:

* @wordpress/block-directory: 3.15.3
* @wordpress/block-editor: 10.0.3
* @wordpress/block-library: 7.14.3
* @wordpress/block-serialization-default-parser: 4.17.1
* @wordpress/blocks: 11.16.3
* @wordpress/components: 21.0.3
* @wordpress/compose: 5.15.2
* @wordpress/core-data: 5.0.3
* @wordpress/customize-widgets: 3.14.3
* @wordpress/edit-post: 6.14.3
* @wordpress/edit-site: 4.14.4
* @wordpress/edit-widgets: 4.14.3
* @wordpress/editor: 12.16.3
* @wordpress/format-library: 3.15.3
* @wordpress/interface: 4.16.3
* @wordpress/list-reusable-blocks: 3.15.3
* @wordpress/nux: 5.15.3
* @wordpress/preferences: 2.9.3
* @wordpress/reusable-blocks: 3.15.3
* @wordpress/server-side-render: 3.15.3
* @wordpress/style-engine: 1.0.2
* @wordpress/widgets: 2.15.3

References:
* [WordPress/gutenberg#44233 Gutenberg PR 44233] – Blocks: Fix searching of blocks when description is non-string
* [WordPress/gutenberg#44301 Gutenberg PR 44301] – Block Toolbar: update position when moving blocks
* [WordPress/gutenberg#44334 Gutenberg PR 44334] – Global Styles: Re-add styles that were removed, for classic themes
* [WordPress/gutenberg#44351 Gutenberg PR 44351] – Comments block: Support nested comments settings in the comments blocks
* [WordPress/gutenberg#44448 Gutenberg PR 44448] – Add a correct TS signature for useEntityRecords
* [WordPress/gutenberg#44315 Gutenberg PR 44315] – Pullquote: fix transform to quote crash
* [WordPress/gutenberg#44446 Gutenberg PR 44446] – Fix spacing property generation in flow layout type.
* [WordPress/gutenberg#44408 Gutenberg PR 44408] – Upgrade react-easy-crop to bring in fix for site editor iframe
* [WordPress/gutenberg#44406 Gutenberg PR 44406] – Style engine: kebab case preset slugs in the editor
* [WordPress/gutenberg#44209 Gutenberg PR 44209] – Fixing padding on the post editor when RootPaddingAwareAlignments setting is enabled
* [WordPress/gutenberg#42950 Gutenberg PR 42950] – Popover: fix limitShift logic by adding iframe offset correctly (and a custom shift limiter)
* [WordPress/gutenberg#44337 Gutenberg PR 44337] – Submenu block href only if url is not empty
* [WordPress/gutenberg#44291 Gutenberg PR 44291] – Add role=application to list view to prevent browse mode triggering in NVDA
* [WordPress/gutenberg#44283 Gutenberg PR 44283] – Navigation block: Fix submenu colors for imported classic menus
* [WordPress/gutenberg#44282 Gutenberg PR 44282] – Fix popover stacking in the customize widgets editor
* [WordPress/gutenberg#44247 Gutenberg PR 44247] – Spacing presets: switch to using numbers instead of t-shirt sizes for labels
* [WordPress/gutenberg#44299 Gutenberg PR 44299] – Backport template creation changes from core
* [WordPress/gutenberg#44294 Gutenberg PR 44294] – [Block Library - Query Loop]: Fix broken preview in specific category template
* [WordPress/gutenberg#44287 Gutenberg PR 44287] – [Block Library]: Rename Comments pagination inner blocks
* [WordPress/gutenberg#44256 Gutenberg PR 44256] – Avoid showing the recursion warning in previews when replacing template parts
* [WordPress/gutenberg#44265 Gutenberg PR 44265] – Blocks: officially deprecated the children and node matchers
* [WordPress/gutenberg#44251 Gutenberg PR 44251] – Global styles: Remove the beta label from global styles header

Props bernhard-reiter, cbravobernal.
See #56467.

git-svn-id: https://develop.svn.wordpress.org/trunk@54335 602fd350-edb4-49c9-b593-d223f7449a82

package.json

@@ -81,56 +81,56 @@
 		"@wordpress/api-fetch": "6.14.1",
 		"@wordpress/autop": "3.17.1",
 		"@wordpress/blob": "3.17.1",
-		"@wordpress/block-directory": "3.15.2",
-		"@wordpress/block-editor": "10.0.2",
-		"@wordpress/block-library": "7.14.2",
+		"@wordpress/block-directory": "3.15.3",
+		"@wordpress/block-editor": "10.0.3",
+		"@wordpress/block-library": "7.14.3",
 		"@wordpress/block-serialization-default-parser": "4.17.1",
-		"@wordpress/blocks": "11.16.2",
-		"@wordpress/components": "21.0.2",
+		"@wordpress/blocks": "11.16.3",
+		"@wordpress/components": "21.0.3",
 		"@wordpress/compose": "5.15.2",
-		"@wordpress/core-data": "5.0.2",
-		"@wordpress/customize-widgets": "3.14.2",
+		"@wordpress/core-data": "5.0.3",
+		"@wordpress/customize-widgets": "3.14.3",
 		"@wordpress/data": "7.1.2",
 		"@wordpress/data-controls": "2.17.2",
 		"@wordpress/date": "4.17.1",
 		"@wordpress/deprecated": "3.17.1",
 		"@wordpress/dom": "3.17.2",
 		"@wordpress/dom-ready": "3.17.1",
-		"@wordpress/edit-post": "6.14.2",
-		"@wordpress/edit-site": "4.14.2",
-		"@wordpress/edit-widgets": "4.14.2",
-		"@wordpress/editor": "12.16.2",
+		"@wordpress/edit-post": "6.14.3",
+		"@wordpress/edit-site": "4.14.4",
+		"@wordpress/edit-widgets": "4.14.3",
+		"@wordpress/editor": "12.16.3",
 		"@wordpress/element": "4.15.1",
 		"@wordpress/escape-html": "2.17.1",
-		"@wordpress/format-library": "3.15.2",
+		"@wordpress/format-library": "3.15.3",
 		"@wordpress/hooks": "3.17.1",
 		"@wordpress/html-entities": "3.17.1",
 		"@wordpress/i18n": "4.17.1",
 		"@wordpress/icons": "9.8.1",
-		"@wordpress/interface": "4.16.2",
+		"@wordpress/interface": "4.16.3",
 		"@wordpress/is-shallow-equal": "4.17.1",
 		"@wordpress/keyboard-shortcuts": "3.15.2",
 		"@wordpress/keycodes": "3.17.1",
-		"@wordpress/list-reusable-blocks": "3.15.2",
+		"@wordpress/list-reusable-blocks": "3.15.3",
 		"@wordpress/media-utils": "4.8.1",
 		"@wordpress/notices": "3.17.2",
-		"@wordpress/nux": "5.15.2",
+		"@wordpress/nux": "5.15.3",
 		"@wordpress/plugins": "4.15.2",
-		"@wordpress/preferences": "2.9.2",
+		"@wordpress/preferences": "2.9.3",
 		"@wordpress/preferences-persistence": "1.9.1",
 		"@wordpress/primitives": "3.15.1",
 		"@wordpress/priority-queue": "2.17.2",
 		"@wordpress/redux-routine": "4.17.1",
-		"@wordpress/reusable-blocks": "3.15.2",
+		"@wordpress/reusable-blocks": "3.15.3",
 		"@wordpress/rich-text": "5.15.2",
-		"@wordpress/server-side-render": "3.15.2",
+		"@wordpress/server-side-render": "3.15.3",
 		"@wordpress/shortcode": "3.17.1",
-		"@wordpress/style-engine": "1.0.1",
+		"@wordpress/style-engine": "1.0.2",
 		"@wordpress/token-list": "2.17.1",
 		"@wordpress/url": "3.18.1",
 		"@wordpress/viewport": "4.15.2",
 		"@wordpress/warning": "2.17.1",
-		"@wordpress/widgets": "2.15.2",
+		"@wordpress/widgets": "2.15.3",
 		"@wordpress/wordcount": "3.17.1",
 		"backbone": "1.4.1",
 		"clipboard": "2.0.10",

src/wp-includes/blocks/comment-template.php

@@ -16,6 +16,8 @@
  */
 function block_core_comment_template_render_comments( $comments, $block ) {
 	global $comment_depth;
+	$thread_comments       = get_option( 'thread_comments' );
+	$thread_comments_depth = get_option( 'thread_comments_depth' );
 
 	if ( empty( $comment_depth ) ) {
 		$comment_depth = 1;
@@ -46,14 +48,22 @@ function block_core_comment_template_render_comments( $comments, $block ) {
 
 		// If the comment has children, recurse to create the HTML for the nested
 		// comments.
-		if ( ! empty( $children ) ) {
-			$comment_depth += 1;
-			$inner_content  = block_core_comment_template_render_comments(
-				$children,
-				$block
-			);
-			$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
-			$comment_depth -= 1;
+		if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
+			if ( $comment_depth < $thread_comments_depth ) {
+				$comment_depth += 1;
+				$inner_content  = block_core_comment_template_render_comments(
+					$children,
+					$block
+				);
+				$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
+				$comment_depth -= 1;
+			} else {
+				$inner_content  = block_core_comment_template_render_comments(
+					$children,
+					$block
+				);
+				$block_content .= sprintf( $inner_content );
+			}
 		}
 
 		$content .= sprintf( '<li id="comment-%1$s" %2$s>%3$s</li>', $comment->comment_ID, $comment_classes, $block_content );

src/wp-includes/blocks/comments-pagination-next/block.json

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/comments-pagination-next",
-	"title": "Next Page",
+	"title": "Comments Next Page",
 	"category": "theme",
 	"parent": [ "core/comments-pagination" ],
 	"description": "Displays the next comment's page link.",

src/wp-includes/blocks/comments-pagination-numbers/block.json

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/comments-pagination-numbers",
-	"title": "Page Numbers",
+	"title": "Comments Page Numbers",
 	"category": "theme",
 	"parent": [ "core/comments-pagination" ],
 	"description": "Displays a list of page numbers for comments pagination.",

src/wp-includes/blocks/comments-pagination-previous/block.json

@@ -2,7 +2,7 @@
 	"$schema": "https://schemas.wp.org/trunk/block.json",
 	"apiVersion": 2,
 	"name": "core/comments-pagination-previous",
-	"title": "Previous Page",
+	"title": "Comments Previous Page",
 	"category": "theme",
 	"parent": [ "core/comments-pagination" ],
 	"description": "Displays the previous comment's page link.",

src/wp-includes/blocks/navigation-submenu.php

@@ -183,7 +183,16 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
 	if ( ! $open_on_click ) {
 		$item_url = isset( $attributes['url'] ) ? $attributes['url'] : '';
 		// Start appending HTML attributes to anchor tag.
-		$html .= '<a class="wp-block-navigation-item__content" href="' . esc_url( $item_url ) . '"';
+		$html .= '<a class="wp-block-navigation-item__content"';
+
+		// The href attribute on a and area elements is not required;
+		// when those elements do not have href attributes they do not create hyperlinks.
+		// But also The href attribute must have a value that is a valid URL potentially
+		// surrounded by spaces.
+		// see: https://html.spec.whatwg.org/multipage/links.html#links-created-by-a-and-area-elements.
+		if ( ! empty( $item_url ) ) {
+			$html .= ' href="' . esc_url( $item_url ) . '"';
+		}
 
 		if ( $is_active ) {
 			$html .= ' aria-current="page"';