Skip to content

Commit db567a3

Browse files
hellofromtonyahellofromtonya
committed
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
1 parent 7ff7553 commit db567a3

File tree

9 files changed

+600
-438
lines changed

9 files changed

+600
-438
lines changed

‎package-lock.json

Lines changed: 547 additions & 404 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -81,56 +81,56 @@
8181
"@wordpress/api-fetch": "6.14.1",
8282
"@wordpress/autop": "3.17.1",
8383
"@wordpress/blob": "3.17.1",
84-
"@wordpress/block-directory": "3.15.2",
85-
"@wordpress/block-editor": "10.0.2",
86-
"@wordpress/block-library": "7.14.2",
84+
"@wordpress/block-directory": "3.15.3",
85+
"@wordpress/block-editor": "10.0.3",
86+
"@wordpress/block-library": "7.14.3",
8787
"@wordpress/block-serialization-default-parser": "4.17.1",
88-
"@wordpress/blocks": "11.16.2",
89-
"@wordpress/components": "21.0.2",
88+
"@wordpress/blocks": "11.16.3",
89+
"@wordpress/components": "21.0.3",
9090
"@wordpress/compose": "5.15.2",
91-
"@wordpress/core-data": "5.0.2",
92-
"@wordpress/customize-widgets": "3.14.2",
91+
"@wordpress/core-data": "5.0.3",
92+
"@wordpress/customize-widgets": "3.14.3",
9393
"@wordpress/data": "7.1.2",
9494
"@wordpress/data-controls": "2.17.2",
9595
"@wordpress/date": "4.17.1",
9696
"@wordpress/deprecated": "3.17.1",
9797
"@wordpress/dom": "3.17.2",
9898
"@wordpress/dom-ready": "3.17.1",
99-
"@wordpress/edit-post": "6.14.2",
100-
"@wordpress/edit-site": "4.14.2",
101-
"@wordpress/edit-widgets": "4.14.2",
102-
"@wordpress/editor": "12.16.2",
99+
"@wordpress/edit-post": "6.14.3",
100+
"@wordpress/edit-site": "4.14.4",
101+
"@wordpress/edit-widgets": "4.14.3",
102+
"@wordpress/editor": "12.16.3",
103103
"@wordpress/element": "4.15.1",
104104
"@wordpress/escape-html": "2.17.1",
105-
"@wordpress/format-library": "3.15.2",
105+
"@wordpress/format-library": "3.15.3",
106106
"@wordpress/hooks": "3.17.1",
107107
"@wordpress/html-entities": "3.17.1",
108108
"@wordpress/i18n": "4.17.1",
109109
"@wordpress/icons": "9.8.1",
110-
"@wordpress/interface": "4.16.2",
110+
"@wordpress/interface": "4.16.3",
111111
"@wordpress/is-shallow-equal": "4.17.1",
112112
"@wordpress/keyboard-shortcuts": "3.15.2",
113113
"@wordpress/keycodes": "3.17.1",
114-
"@wordpress/list-reusable-blocks": "3.15.2",
114+
"@wordpress/list-reusable-blocks": "3.15.3",
115115
"@wordpress/media-utils": "4.8.1",
116116
"@wordpress/notices": "3.17.2",
117-
"@wordpress/nux": "5.15.2",
117+
"@wordpress/nux": "5.15.3",
118118
"@wordpress/plugins": "4.15.2",
119-
"@wordpress/preferences": "2.9.2",
119+
"@wordpress/preferences": "2.9.3",
120120
"@wordpress/preferences-persistence": "1.9.1",
121121
"@wordpress/primitives": "3.15.1",
122122
"@wordpress/priority-queue": "2.17.2",
123123
"@wordpress/redux-routine": "4.17.1",
124-
"@wordpress/reusable-blocks": "3.15.2",
124+
"@wordpress/reusable-blocks": "3.15.3",
125125
"@wordpress/rich-text": "5.15.2",
126-
"@wordpress/server-side-render": "3.15.2",
126+
"@wordpress/server-side-render": "3.15.3",
127127
"@wordpress/shortcode": "3.17.1",
128-
"@wordpress/style-engine": "1.0.1",
128+
"@wordpress/style-engine": "1.0.2",
129129
"@wordpress/token-list": "2.17.1",
130130
"@wordpress/url": "3.18.1",
131131
"@wordpress/viewport": "4.15.2",
132132
"@wordpress/warning": "2.17.1",
133-
"@wordpress/widgets": "2.15.2",
133+
"@wordpress/widgets": "2.15.3",
134134
"@wordpress/wordcount": "3.17.1",
135135
"backbone": "1.4.1",
136136
"clipboard": "2.0.10",

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

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/wp-includes/blocks/blocks-json.php

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
*/
1717
function block_core_comment_template_render_comments( $comments, $block ) {
1818
global $comment_depth;
19+
$thread_comments = get_option( 'thread_comments' );
20+
$thread_comments_depth = get_option( 'thread_comments_depth' );
1921

2022
if ( empty( $comment_depth ) ) {
2123
$comment_depth = 1;
@@ -46,14 +48,22 @@ function block_core_comment_template_render_comments( $comments, $block ) {
4648

4749
// If the comment has children, recurse to create the HTML for the nested
4850
// comments.
49-
if ( ! empty( $children ) ) {
50-
$comment_depth += 1;
51-
$inner_content = block_core_comment_template_render_comments(
52-
$children,
53-
$block
54-
);
55-
$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
56-
$comment_depth -= 1;
51+
if ( ! empty( $children ) && ! empty( $thread_comments ) ) {
52+
if ( $comment_depth < $thread_comments_depth ) {
53+
$comment_depth += 1;
54+
$inner_content = block_core_comment_template_render_comments(
55+
$children,
56+
$block
57+
);
58+
$block_content .= sprintf( '<ol>%1$s</ol>', $inner_content );
59+
$comment_depth -= 1;
60+
} else {
61+
$inner_content = block_core_comment_template_render_comments(
62+
$children,
63+
$block
64+
);
65+
$block_content .= sprintf( $inner_content );
66+
}
5767
}
5868

5969
$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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "core/comments-pagination-next",
5-
"title": "Next Page",
5+
"title": "Comments Next Page",
66
"category": "theme",
77
"parent": [ "core/comments-pagination" ],
88
"description": "Displays the next comment's page link.",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "core/comments-pagination-numbers",
5-
"title": "Page Numbers",
5+
"title": "Comments Page Numbers",
66
"category": "theme",
77
"parent": [ "core/comments-pagination" ],
88
"description": "Displays a list of page numbers for comments pagination.",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"$schema": "https://schemas.wp.org/trunk/block.json",
33
"apiVersion": 2,
44
"name": "core/comments-pagination-previous",
5-
"title": "Previous Page",
5+
"title": "Comments Previous Page",
66
"category": "theme",
77
"parent": [ "core/comments-pagination" ],
88
"description": "Displays the previous comment's page link.",

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,16 @@ function render_block_core_navigation_submenu( $attributes, $content, $block ) {
183183
if ( ! $open_on_click ) {
184184
$item_url = isset( $attributes['url'] ) ? $attributes['url'] : '';
185185
// Start appending HTML attributes to anchor tag.
186-
$html .= '<a class="wp-block-navigation-item__content" href="' . esc_url( $item_url ) . '"';
186+
$html .= '<a class="wp-block-navigation-item__content"';
187+
188+
// The href attribute on a and area elements is not required;
189+
// when those elements do not have href attributes they do not create hyperlinks.
190+
// But also The href attribute must have a value that is a valid URL potentially
191+
// surrounded by spaces.
192+
// see: https://html.spec.whatwg.org/multipage/links.html#links-created-by-a-and-area-elements.
193+
if ( ! empty( $item_url ) ) {
194+
$html .= ' href="' . esc_url( $item_url ) . '"';
195+
}
187196

188197
if ( $is_active ) {
189198
$html .= ' aria-current="page"';

0 commit comments

Comments
 (0)