Skip to content

Commit 5b3c331

Browse files
desrosjdesrosj
committed
Block Editor: Update packages with latest fixes for 5.8 RC2
Includes the following fixes: - [Block Library]: Less warnings when blocks try to render themselves. - Reset z-index on focused widget form - Refactor appender margin. - Fix slash inserter for widgets screen. - Widget screens: set html block as freeform content handler. - Widget Block: widget_id is undefined when a widget is placed. - Add <CopyHandler> to WidgetAreasBlockEditorProvider - Add width: 100% to components-base-control inside wp-block-legacy-widget - [Widgets editor] Replace the "technical" error notice a more user-friendly one - Fix legacy widget height overflow - Fix "Select all" behavior in the editor - Increase specificity of the NoPreview CSS rules to avoid conflicts with theme styles - Fix move to widget area checkmark - Replace legacy widget icon with its new version - [Block Library - Query Loop]: Set default block variations not to inherit from global query Merges [51344] to the 5.8 branch. Fixes #53397. git-svn-id: https://develop.svn.wordpress.org/branches/5.8@51346 602fd350-edb4-49c9-b593-d223f7449a82
1 parent f3f9ba9 commit 5b3c331

File tree

7 files changed

+470
-442
lines changed

7 files changed

+470
-442
lines changed

‎package-lock.json‎

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

‎package.json‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -78,56 +78,56 @@
7878
},
7979
"dependencies": {
8080
"@wordpress/a11y": "3.1.1",
81-
"@wordpress/annotations": "2.1.2",
81+
"@wordpress/annotations": "2.1.3",
8282
"@wordpress/api-fetch": "5.1.1",
8383
"@wordpress/autop": "3.1.1",
8484
"@wordpress/blob": "3.1.1",
85-
"@wordpress/block-directory": "2.1.14",
86-
"@wordpress/block-editor": "6.1.8",
87-
"@wordpress/block-library": "3.2.12",
85+
"@wordpress/block-directory": "2.1.15",
86+
"@wordpress/block-editor": "6.1.9",
87+
"@wordpress/block-library": "3.2.13",
8888
"@wordpress/block-serialization-default-parser": "4.1.1",
89-
"@wordpress/blocks": "9.1.4",
90-
"@wordpress/components": "14.1.5",
91-
"@wordpress/compose": "4.1.2",
92-
"@wordpress/core-data": "3.1.8",
93-
"@wordpress/customize-widgets": "1.0.13",
94-
"@wordpress/data": "5.1.2",
95-
"@wordpress/data-controls": "2.1.2",
89+
"@wordpress/blocks": "9.1.5",
90+
"@wordpress/components": "14.1.6",
91+
"@wordpress/compose": "4.1.3",
92+
"@wordpress/core-data": "3.1.9",
93+
"@wordpress/customize-widgets": "1.0.14",
94+
"@wordpress/data": "5.1.3",
95+
"@wordpress/data-controls": "2.1.3",
9696
"@wordpress/date": "4.1.1",
9797
"@wordpress/deprecated": "3.1.1",
98-
"@wordpress/dom": "3.1.1",
98+
"@wordpress/dom": "3.1.2",
9999
"@wordpress/dom-ready": "3.1.1",
100-
"@wordpress/edit-post": "4.1.14",
101-
"@wordpress/edit-widgets": "2.1.14",
102-
"@wordpress/editor": "10.1.11",
100+
"@wordpress/edit-post": "4.1.15",
101+
"@wordpress/edit-widgets": "2.1.15",
102+
"@wordpress/editor": "10.1.12",
103103
"@wordpress/element": "3.1.1",
104104
"@wordpress/escape-html": "2.1.1",
105-
"@wordpress/format-library": "2.1.8",
105+
"@wordpress/format-library": "2.1.9",
106106
"@wordpress/hooks": "3.1.1",
107107
"@wordpress/html-entities": "3.1.1",
108108
"@wordpress/i18n": "4.1.1",
109-
"@wordpress/icons": "4.0.1",
110-
"@wordpress/interface": "3.1.6",
109+
"@wordpress/icons": "4.0.2",
110+
"@wordpress/interface": "3.1.7",
111111
"@wordpress/is-shallow-equal": "4.1.1",
112-
"@wordpress/keyboard-shortcuts": "2.1.2",
112+
"@wordpress/keyboard-shortcuts": "2.1.3",
113113
"@wordpress/keycodes": "3.1.1",
114-
"@wordpress/list-reusable-blocks": "2.1.5",
114+
"@wordpress/list-reusable-blocks": "2.1.6",
115115
"@wordpress/media-utils": "2.1.1",
116-
"@wordpress/notices": "3.1.2",
117-
"@wordpress/nux": "4.1.5",
118-
"@wordpress/plugins": "3.1.2",
116+
"@wordpress/notices": "3.1.3",
117+
"@wordpress/nux": "4.1.6",
118+
"@wordpress/plugins": "3.1.3",
119119
"@wordpress/primitives": "2.1.1",
120120
"@wordpress/priority-queue": "2.1.1",
121121
"@wordpress/redux-routine": "4.1.1",
122-
"@wordpress/reusable-blocks": "2.1.11",
123-
"@wordpress/rich-text": "4.1.2",
124-
"@wordpress/server-side-render": "2.1.6",
122+
"@wordpress/reusable-blocks": "2.1.12",
123+
"@wordpress/rich-text": "4.1.3",
124+
"@wordpress/server-side-render": "2.1.7",
125125
"@wordpress/shortcode": "3.1.1",
126126
"@wordpress/token-list": "2.1.1",
127127
"@wordpress/url": "3.1.1",
128-
"@wordpress/viewport": "3.1.2",
128+
"@wordpress/viewport": "3.1.3",
129129
"@wordpress/warning": "2.1.1",
130-
"@wordpress/widgets": "1.1.13",
130+
"@wordpress/widgets": "1.1.14",
131131
"@wordpress/wordcount": "3.1.1",
132132
"backbone": "1.4.0",
133133
"clipboard": "2.0.8",

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

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

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

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,6 @@ function render_block_core_block( $attributes ) {
2525
}
2626

2727
if ( isset( $seen_refs[ $attributes['ref'] ] ) ) {
28-
if ( ! is_admin() ) {
29-
trigger_error(
30-
sprintf(
31-
// translators: %s is the user-provided title of the reusable block.
32-
__( 'Could not render Reusable Block <strong>%s</strong>. Block cannot be rendered inside itself.' ),
33-
$reusable_block->post_title
34-
),
35-
E_USER_WARNING
36-
);
37-
}
38-
3928
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
4029
// is set in `wp_debug_mode()`.
4130
$is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&

‎src/wp-includes/blocks/legacy-widget.php‎

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ function render_block_core_legacy_widget( $attributes ) {
2525
}
2626

2727
$id_base = $attributes['idBase'];
28-
if ( method_exists( $wp_widget_factory, 'get_widget_key' ) ) {
29-
$widget_key = $wp_widget_factory->get_widget_key( $id_base );
28+
if ( method_exists( $wp_widget_factory, 'get_widget_key' ) && method_exists( $wp_widget_factory, 'get_widget_object' ) ) {
29+
$widget_key = $wp_widget_factory->get_widget_key( $id_base );
30+
$widget_object = $wp_widget_factory->get_widget_object( $id_base );
3031
} else {
31-
$widget_key = gutenberg_get_widget_key( $id_base );
32+
$widget_key = gutenberg_get_widget_key( $id_base );
33+
$widget_object = gutenberg_get_widget_object( $id_base );
3234
}
3335

34-
if ( ! $widget_key ) {
36+
if ( ! $widget_key || ! $widget_object ) {
3537
return '';
3638
}
3739

@@ -45,8 +47,13 @@ function render_block_core_legacy_widget( $attributes ) {
4547
$instance = array();
4648
}
4749

50+
$args = array(
51+
'widget_id' => $widget_object->id,
52+
'widget_name' => $widget_object->name,
53+
);
54+
4855
ob_start();
49-
the_widget( $widget_key, $instance );
56+
the_widget( $widget_key, $instance, $args );
5057
return ob_get_clean();
5158
}
5259

‎src/wp-includes/blocks/post-content.php‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,19 +23,11 @@ function render_block_core_post_content( $attributes, $content, $block ) {
2323
$post_id = $block->context['postId'];
2424

2525
if ( isset( $seen_ids[ $post_id ] ) ) {
26-
if ( ! is_admin() ) {
27-
trigger_error(
28-
sprintf(
29-
// translators: %s is a post ID (integer).
30-
__( 'Could not render Post Content block with post ID: <code>%s</code>. Block cannot be rendered inside itself.' ),
31-
$post_id
32-
),
33-
E_USER_WARNING
34-
);
35-
}
36-
26+
// WP_DEBUG_DISPLAY must only be honored when WP_DEBUG. This precedent
27+
// is set in `wp_debug_mode()`.
3728
$is_debug = defined( 'WP_DEBUG' ) && WP_DEBUG &&
3829
defined( 'WP_DEBUG_DISPLAY' ) && WP_DEBUG_DISPLAY;
30+
3931
return $is_debug ?
4032
// translators: Visible only in the front end, this warning takes the place of a faulty block.
4133
__( '[block rendering halted]' ) :
@@ -44,7 +36,7 @@ function render_block_core_post_content( $attributes, $content, $block ) {
4436

4537
$seen_ids[ $post_id ] = true;
4638

47-
if ( ! in_the_loop() ) {
39+
if ( ! in_the_loop() && have_posts() ) {
4840
the_post();
4941
}
5042

‎tests/phpunit/tests/blocks/render-reusable.php‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -100,26 +100,6 @@ public function test_render_subsequent() {
100100
$this->assertSame( '<p>Hello world!</p><p>Hello world!</p>', $output );
101101
}
102102

103-
/**
104-
* Throw a warning if blocks are recursively nested.
105-
*
106-
* @ticket 52364
107-
*/
108-
public function test_recursive_render_warning() {
109-
$recursive_reusable_block = array(
110-
'ID' => self::$block_id,
111-
'post_content' => '<!-- wp:block {"ref":' . self::$block_id . '} /-->',
112-
);
113-
wp_update_post( $recursive_reusable_block );
114-
115-
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/block' );
116-
117-
// The block_render method for `core/block` triggers a user warning if it
118-
// encounters a recursively nested block.
119-
$this->expectException( 'PHPUnit_Framework_Error_Warning' );
120-
$block_type->render( array( 'ref' => self::$block_id ) );
121-
}
122-
123103
public function test_ref_empty() {
124104
$block_type = WP_Block_Type_Registry::get_instance()->get_registered( 'core/block' );
125105
$output = $block_type->render( array() );

0 commit comments

Comments
 (0)