Skip to content

Commit d6f9c7d

Browse files
dream-encodedream-encode
committed
Editor: Update packages for 6.1 Release Candidate 1.
Package updates for bug and regression fixes: @wordpress/block-directory: 3.15.6 @wordpress/block-editor: 10.0.6 @wordpress/block-library: 7.14.6 @wordpress/components: 21.0.5 @wordpress/customize-widgets: 3.14.6 @wordpress/edit-post: 6.14.6 @wordpress/edit-site: 4.14.8 @wordpress/edit-widgets: 4.14.6 @wordpress/editor: 12.16.6 @wordpress/format-library: 3.15.6 @wordpress/interface: 4.16.5 @wordpress/list-reusable-blocks: 3.15.5 @wordpress/nux: 5.15.5 @wordpress/preferences: 2.9.5 @wordpress/reusable-blocks: 3.15.6 @wordpress/server-side-render: 3.15.5 @wordpress/widgets: 2.15.6 References: * [WordPress/gutenberg#43181 Gutenberg PR 43181] - Merge inner blocks if wrappers are equal * [WordPress/gutenberg#44098 Gutenberg PR 44098] - Fix content blocks with nested blocks always appear as top level * [WordPress/gutenberg#44150 Gutenberg PR 44150] - Refresh selection styles * [WordPress/gutenberg#44415 Gutenberg PR 44415] - Removes `__unstableMaxPages` attribute from Page List and Nav blocks * [WordPress/gutenberg#44463 Gutenberg PR 44463] - Follow discussion settings in the comments block edit * [WordPress/gutenberg#44584 Gutenberg PR 44584] - Avoid querying block templates during installation * [WordPress/gutenberg#44637 Gutenberg PR 44637] - Resizable editor: Fix height setting bug * [WordPress/gutenberg#44640 Gutenberg PR 44640] - Only include theme.css if the theme declares support for wp-block-styles * [WordPress/gutenberg#44650 Gutenberg PR 44650] - Fix empty links being created for the author's name comment * [WordPress/gutenberg#44652 Gutenberg PR 44652] - Block Editor: Fix block search for non-Latin characters * [WordPress/gutenberg#44660 Gutenberg PR 44660] - Legacy Group inner block wrapper should work with constrained layout * [WordPress/gutenberg#44676 Gutenberg PR 44676] - Hide list items from content area of content locked blocks * [WordPress/gutenberg#44718 Gutenberg PR 44718] - Margin visualizer: Apply negative value to margins with `calc()` * [WordPress/gutenberg#44721 Gutenberg PR 44721] - Remove anchor support from the navigation block * [WordPress/gutenberg#44731 Gutenberg PR 44731] - Buttons: Add specificity for the editor Follow-up to [54257], [54335], and [54383]. Props bernhard-reiter, czapla, annezazu, cbravobernal, ndiego, bjorsch, nendeb55. See #56467. git-svn-id: https://develop.svn.wordpress.org/trunk@54483 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 525d6d2 commit d6f9c7d

14 files changed

Lines changed: 628 additions & 613 deletions

‎package-lock.json‎

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

‎package.json‎

Lines changed: 17 additions & 17 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.4",
85-
"@wordpress/block-editor": "10.0.4",
86-
"@wordpress/block-library": "7.14.4",
84+
"@wordpress/block-directory": "3.15.6",
85+
"@wordpress/block-editor": "10.0.6",
86+
"@wordpress/block-library": "7.14.6",
8787
"@wordpress/block-serialization-default-parser": "4.17.1",
8888
"@wordpress/blocks": "11.16.4",
89-
"@wordpress/components": "21.0.4",
89+
"@wordpress/components": "21.0.5",
9090
"@wordpress/compose": "5.15.2",
9191
"@wordpress/core-data": "5.0.4",
92-
"@wordpress/customize-widgets": "3.14.4",
92+
"@wordpress/customize-widgets": "3.14.6",
9393
"@wordpress/data": "7.1.3",
9494
"@wordpress/data-controls": "2.17.3",
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.4",
100-
"@wordpress/edit-site": "4.14.6",
101-
"@wordpress/edit-widgets": "4.14.4",
102-
"@wordpress/editor": "12.16.4",
99+
"@wordpress/edit-post": "6.14.6",
100+
"@wordpress/edit-site": "4.14.8",
101+
"@wordpress/edit-widgets": "4.14.6",
102+
"@wordpress/editor": "12.16.6",
103103
"@wordpress/element": "4.15.1",
104104
"@wordpress/escape-html": "2.17.1",
105-
"@wordpress/format-library": "3.15.4",
105+
"@wordpress/format-library": "3.15.6",
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.4",
110+
"@wordpress/interface": "4.16.5",
111111
"@wordpress/is-shallow-equal": "4.17.1",
112112
"@wordpress/keyboard-shortcuts": "3.15.3",
113113
"@wordpress/keycodes": "3.17.1",
114-
"@wordpress/list-reusable-blocks": "3.15.4",
114+
"@wordpress/list-reusable-blocks": "3.15.5",
115115
"@wordpress/media-utils": "4.8.1",
116116
"@wordpress/notices": "3.17.3",
117-
"@wordpress/nux": "5.15.4",
117+
"@wordpress/nux": "5.15.5",
118118
"@wordpress/plugins": "4.15.2",
119-
"@wordpress/preferences": "2.9.4",
119+
"@wordpress/preferences": "2.9.5",
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.4",
124+
"@wordpress/reusable-blocks": "3.15.6",
125125
"@wordpress/rich-text": "5.15.3",
126-
"@wordpress/server-side-render": "3.15.4",
126+
"@wordpress/server-side-render": "3.15.5",
127127
"@wordpress/shortcode": "3.17.1",
128128
"@wordpress/style-engine": "1.0.3",
129129
"@wordpress/token-list": "2.17.1",
130130
"@wordpress/url": "3.18.1",
131131
"@wordpress/viewport": "4.15.3",
132132
"@wordpress/warning": "2.17.1",
133-
"@wordpress/widgets": "2.15.4",
133+
"@wordpress/widgets": "2.15.6",
134134
"@wordpress/wordcount": "3.17.1",
135135
"backbone": "1.4.1",
136136
"clipboard": "2.0.11",

‎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-author-name.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function render_block_core_comment_author_name( $attributes, $content, $block )
3434
$comment_author = get_comment_author( $comment );
3535
$link = get_comment_author_url( $comment );
3636

37-
if ( ! empty( $attributes['isLink'] ) && ! empty( $attributes['linkTarget'] ) ) {
37+
if ( ! empty( $link ) && ! empty( $attributes['isLink'] ) && ! empty( $attributes['linkTarget'] ) ) {
3838
$comment_author = sprintf( '<a rel="external nofollow ugc" href="%1s" target="%2s" >%3s</a>', esc_url( $link ), esc_attr( $attributes['linkTarget'] ), $comment_author );
3939
}
4040
if ( '0' === $comment->comment_approved && ! $show_pending_links ) {

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,14 @@ function block_core_navigation_link_build_css_font_sizes( $context ) {
9898
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
9999
} elseif ( $has_custom_font_size ) {
100100
// Add the custom font size inline style.
101-
$font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
101+
$font_sizes['inline_styles'] = sprintf(
102+
'font-size: %s;',
103+
gutenberg_get_typography_font_size_value(
104+
array(
105+
'size' => $context['style']['typography']['fontSize'],
106+
)
107+
)
108+
);
102109
}
103110

104111
return $font_sizes;

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

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,14 @@ function block_core_navigation_submenu_build_css_font_sizes( $context ) {
9898
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
9999
} elseif ( $has_custom_font_size ) {
100100
// Add the custom font size inline style.
101-
$font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
101+
$font_sizes['inline_styles'] = sprintf(
102+
'font-size: %s;',
103+
gutenberg_get_typography_font_size_value(
104+
array(
105+
'size' => $context['style']['typography']['fontSize'],
106+
)
107+
)
108+
);
102109
}
103110

104111
return $font_sizes;

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -307,9 +307,6 @@ function block_core_navigation_get_fallback_blocks() {
307307
$page_list_fallback = array(
308308
array(
309309
'blockName' => 'core/page-list',
310-
'attrs' => array(
311-
'__unstableMaxPages' => 4,
312-
),
313310
),
314311
);
315312

‎src/wp-includes/blocks/navigation/block.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,6 @@
8888
},
8989
"supports": {
9090
"align": [ "wide", "full" ],
91-
"anchor": true,
9291
"html": false,
9392
"inserter": true,
9493
"typography": {

‎src/wp-includes/blocks/page-list.php‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,14 @@ function block_core_page_list_build_css_font_sizes( $context ) {
119119
$font_sizes['css_classes'][] = sprintf( 'has-%s-font-size', $context['fontSize'] );
120120
} elseif ( $has_custom_font_size ) {
121121
// Add the custom font size inline style.
122-
$font_sizes['inline_styles'] = sprintf( 'font-size: %s;', $context['style']['typography']['fontSize'] );
122+
$font_sizes['inline_styles'] = sprintf(
123+
'font-size: %s;',
124+
gutenberg_get_typography_font_size_value(
125+
array(
126+
'size' => $context['style']['typography']['fontSize'],
127+
)
128+
)
129+
);
123130
}
124131

125132
return $font_sizes;
@@ -299,11 +306,6 @@ function render_block_core_page_list( $attributes, $content, $block ) {
299306

300307
$nested_pages = block_core_page_list_nest_pages( $top_level_pages, $pages_with_children );
301308

302-
// Limit the number of items to be visually displayed.
303-
if ( ! empty( $attributes['__unstableMaxPages'] ) ) {
304-
$nested_pages = array_slice( $nested_pages, 0, $attributes['__unstableMaxPages'] );
305-
}
306-
307309
$is_navigation_child = array_key_exists( 'showSubmenuIcon', $block->context );
308310

309311
$open_submenus_on_click = array_key_exists( 'openSubmenusOnClick', $block->context ) ? $block->context['openSubmenusOnClick'] : false;

0 commit comments

Comments
 (0)