Skip to content

Commit add2b40

Browse files
youknowriadyouknowriad
committed
Editor: Update Packages with the latest bug fixes for 6.5 beta1.
It includes all the backports from this Gutenberg PR WordPress/gutenberg#58964 Props youknowriad, get_dave. See #60315. git-svn-id: https://develop.svn.wordpress.org/trunk@57619 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 19b83ff commit add2b40

9 files changed

Lines changed: 495 additions & 474 deletions

File tree

‎package-lock.json‎

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

‎package.json‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -81,61 +81,61 @@
8181
"@emotion/is-prop-valid": "0.8.8",
8282
"@emotion/memoize": "0.7.4",
8383
"@wordpress/a11y": "3.51.0",
84-
"@wordpress/annotations": "2.51.0",
84+
"@wordpress/annotations": "2.51.1",
8585
"@wordpress/api-fetch": "6.48.0",
8686
"@wordpress/autop": "3.51.0",
8787
"@wordpress/blob": "3.51.0",
88-
"@wordpress/block-directory": "4.28.0",
89-
"@wordpress/block-editor": "12.19.0",
90-
"@wordpress/block-library": "8.28.0",
88+
"@wordpress/block-directory": "4.28.1",
89+
"@wordpress/block-editor": "12.19.1",
90+
"@wordpress/block-library": "8.28.1",
9191
"@wordpress/block-serialization-default-parser": "4.51.0",
92-
"@wordpress/blocks": "12.28.0",
93-
"@wordpress/commands": "0.22.0",
94-
"@wordpress/components": "26.0.0",
92+
"@wordpress/blocks": "12.28.1",
93+
"@wordpress/commands": "0.22.1",
94+
"@wordpress/components": "26.0.1",
9595
"@wordpress/compose": "6.28.0",
96-
"@wordpress/core-commands": "0.20.0",
97-
"@wordpress/core-data": "6.28.0",
98-
"@wordpress/customize-widgets": "4.28.0",
96+
"@wordpress/core-commands": "0.20.1",
97+
"@wordpress/core-data": "6.28.1",
98+
"@wordpress/customize-widgets": "4.28.1",
9999
"@wordpress/data": "9.21.0",
100100
"@wordpress/data-controls": "3.20.0",
101-
"@wordpress/dataviews": "0.5.0",
101+
"@wordpress/dataviews": "0.5.1",
102102
"@wordpress/date": "4.51.0",
103103
"@wordpress/deprecated": "3.51.0",
104104
"@wordpress/dom": "3.51.0",
105105
"@wordpress/dom-ready": "3.51.0",
106-
"@wordpress/edit-post": "7.28.0",
107-
"@wordpress/edit-site": "5.28.0",
108-
"@wordpress/edit-widgets": "5.28.0",
109-
"@wordpress/editor": "13.28.0",
106+
"@wordpress/edit-post": "7.28.1",
107+
"@wordpress/edit-site": "5.28.1",
108+
"@wordpress/edit-widgets": "5.28.1",
109+
"@wordpress/editor": "13.28.1",
110110
"@wordpress/element": "5.28.0",
111111
"@wordpress/escape-html": "2.51.0",
112-
"@wordpress/format-library": "4.28.0",
112+
"@wordpress/format-library": "4.28.1",
113113
"@wordpress/hooks": "3.51.0",
114114
"@wordpress/html-entities": "3.51.0",
115115
"@wordpress/i18n": "4.51.0",
116116
"@wordpress/icons": "9.42.0",
117117
"@wordpress/interactivity": "5.0.0",
118118
"@wordpress/interactivity-router": "1.1.0",
119-
"@wordpress/interface": "5.28.0",
119+
"@wordpress/interface": "5.28.1",
120120
"@wordpress/is-shallow-equal": "4.51.0",
121121
"@wordpress/keyboard-shortcuts": "4.28.0",
122122
"@wordpress/keycodes": "3.51.0",
123-
"@wordpress/list-reusable-blocks": "4.28.0",
123+
"@wordpress/list-reusable-blocks": "4.28.1",
124124
"@wordpress/media-utils": "4.42.0",
125125
"@wordpress/notices": "4.19.0",
126-
"@wordpress/nux": "8.13.0",
127-
"@wordpress/patterns": "1.12.0",
128-
"@wordpress/plugins": "6.19.0",
129-
"@wordpress/preferences": "3.28.0",
126+
"@wordpress/nux": "8.13.1",
127+
"@wordpress/patterns": "1.12.1",
128+
"@wordpress/plugins": "6.19.1",
129+
"@wordpress/preferences": "3.28.1",
130130
"@wordpress/preferences-persistence": "1.43.0",
131131
"@wordpress/primitives": "3.49.0",
132132
"@wordpress/priority-queue": "2.51.0",
133133
"@wordpress/private-apis": "0.33.0",
134134
"@wordpress/redux-routine": "4.51.0",
135-
"@wordpress/reusable-blocks": "4.28.0",
136-
"@wordpress/rich-text": "6.28.0",
135+
"@wordpress/reusable-blocks": "4.28.1",
136+
"@wordpress/rich-text": "6.28.1",
137137
"@wordpress/router": "0.20.0",
138-
"@wordpress/server-side-render": "4.28.0",
138+
"@wordpress/server-side-render": "4.28.1",
139139
"@wordpress/shortcode": "3.51.0",
140140
"@wordpress/style-engine": "1.34.0",
141141
"@wordpress/sync": "0.13.0",
@@ -144,7 +144,7 @@
144144
"@wordpress/url": "3.52.0",
145145
"@wordpress/viewport": "5.28.0",
146146
"@wordpress/warning": "2.51.0",
147-
"@wordpress/widgets": "3.28.0",
147+
"@wordpress/widgets": "3.28.1",
148148
"@wordpress/wordcount": "3.51.0",
149149
"backbone": "1.5.0",
150150
"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/file.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ static function ( $matches ) {
5353

5454
$processor = new WP_HTML_Tag_Processor( $content );
5555
$processor->next_tag();
56-
$processor->set_attribute( 'data-wp-interactive', '{"namespace":"core/file"}' );
56+
$processor->set_attribute( 'data-wp-interactive', 'core/file' );
5757
$processor->next_tag( 'object' );
5858
$processor->set_attribute( 'data-wp-bind--hidden', '!state.hasPdfPreview' );
5959
$processor->set_attribute( 'hidden', true );

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ function block_core_image_render_lightbox( $block_content, $block ) {
159159
$figure_class_names = $p->get_attribute( 'class' );
160160
$figure_styles = $p->get_attribute( 'style' );
161161
$p->add_class( 'wp-lightbox-container' );
162-
$p->set_attribute( 'data-wp-interactive', '{"namespace":"core/image"}' );
162+
$p->set_attribute( 'data-wp-interactive', 'core/image' );
163163
$p->set_attribute(
164164
'data-wp-context',
165165
wp_json_encode(
@@ -240,7 +240,7 @@ function block_core_image_print_lightbox_overlay() {
240240
echo <<<HTML
241241
<div
242242
class="wp-lightbox-overlay zoom"
243-
data-wp-interactive='{"namespace":"core/image"}'
243+
data-wp-interactive="core/image"
244244
data-wp-context='{}'
245245
data-wp-bind--role="state.roleAttribute"
246246
data-wp-bind--aria-label="state.currentImage.ariaLabel"

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

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -557,19 +557,17 @@ private static function get_nav_element_directives( $is_interactive, $attributes
557557
return '';
558558
}
559559
// When adding to this array be mindful of security concerns.
560-
$nav_element_context = wp_json_encode(
560+
$nav_element_context = data_wp_context(
561561
array(
562562
'overlayOpenedBy' => array(),
563563
'type' => 'overlay',
564564
'roleAttribute' => '',
565565
'ariaLabel' => __( 'Menu' ),
566-
),
567-
JSON_HEX_TAG | JSON_HEX_APOS | JSON_HEX_AMP
566+
)
568567
);
569568
$nav_element_directives = '
570-
data-wp-interactive=\'{"namespace":"core/navigation"}\'
571-
data-wp-context=\'' . $nav_element_context . '\'
572-
';
569+
data-wp-interactive="core/navigation"'
570+
. $nav_element_context;
573571

574572
/*
575573
* When the navigation's 'overlayMenu' attribute is set to 'always', JavaScript
@@ -780,7 +778,7 @@ function block_core_navigation_add_directives_to_submenu( $tags, $block_attribut
780778
)
781779
) ) {
782780
// Add directives to the parent `<li>`.
783-
$tags->set_attribute( 'data-wp-interactive', '{ "namespace": "core/navigation" }' );
781+
$tags->set_attribute( 'data-wp-interactive', 'core/navigation' );
784782
$tags->set_attribute( 'data-wp-context', '{ "submenuOpenedBy": {}, "type": "submenu" }' );
785783
$tags->set_attribute( 'data-wp-watch', 'callbacks.initMenu' );
786784
$tags->set_attribute( 'data-wp-on--focusout', 'actions.handleMenuFocusout' );

‎src/wp-includes/blocks/query-pagination-numbers.php‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,14 +91,17 @@ function render_block_core_query_pagination_numbers( $attributes, $content, $blo
9191
}
9292

9393
if ( $enhanced_pagination ) {
94-
$p = new WP_HTML_Tag_Processor( $content );
94+
$p = new WP_HTML_Tag_Processor( $content );
95+
$tag_index = 0;
9596
while ( $p->next_tag(
96-
array(
97-
'tag_name' => 'a',
98-
'class_name' => 'page-numbers',
99-
)
97+
array( 'class_name' => 'page-numbers' )
10098
) ) {
101-
$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
99+
if ( null === $p->get_attribute( 'data-wp-key' ) ) {
100+
$p->set_attribute( 'data-wp-key', 'index-' . $tag_index++ );
101+
}
102+
if ( 'A' === $p->get_tag() ) {
103+
$p->set_attribute( 'data-wp-on--click', 'core/query::actions.navigate' );
104+
}
102105
}
103106
$content = $p->get_updated_html();
104107
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function render_block_core_query( $attributes, $content, $block ) {
4949
$p = new WP_HTML_Tag_Processor( $content );
5050
if ( $p->next_tag() ) {
5151
// Add the necessary directives.
52-
$p->set_attribute( 'data-wp-interactive', '{"namespace":"core/query"}' );
52+
$p->set_attribute( 'data-wp-interactive', 'core/query' );
5353
$p->set_attribute( 'data-wp-router-region', 'query-' . $attributes['queryId'] );
5454
$p->set_attribute( 'data-wp-init', 'callbacks.setQueryRef' );
5555
$p->set_attribute( 'data-wp-context', '{}' );

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

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ function render_block_core_search( $attributes ) {
4747
$border_color_classes = get_border_color_classes_for_block_core_search( $attributes );
4848
// This variable is a constant and its value is always false at this moment.
4949
// It is defined this way because some values depend on it, in case it changes in the future.
50-
$open_by_default = 'false';
50+
$open_by_default = false;
5151

5252
$label_inner_html = empty( $attributes['label'] ) ? __( 'Search' ) : wp_kses_post( $attributes['label'] );
5353
$label = new WP_HTML_Tag_Processor( sprintf( '<label %1$s>%2$s</label>', $inline_styles['label'], $label_inner_html ) );
@@ -179,12 +179,20 @@ function render_block_core_search( $attributes ) {
179179
if ( $is_expandable_searchfield ) {
180180
$aria_label_expanded = __( 'Submit Search' );
181181
$aria_label_collapsed = __( 'Expand search field' );
182+
$form_context = data_wp_context(
183+
array(
184+
'isSearchInputVisible' => $open_by_default,
185+
'inputId' => $input_id,
186+
'ariaLabelExpanded' => $aria_label_expanded,
187+
'ariaLabelCollapsed' => $aria_label_collapsed,
188+
)
189+
);
182190
$form_directives = '
183-
data-wp-interactive=\'{ "namespace": "core/search" }\'
184-
data-wp-context=\'{ "isSearchInputVisible": ' . $open_by_default . ', "inputId": "' . $input_id . '", "ariaLabelExpanded": "' . $aria_label_expanded . '", "ariaLabelCollapsed": "' . $aria_label_collapsed . '" }\'
185-
data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
186-
data-wp-on--keydown="actions.handleSearchKeydown"
187-
data-wp-on--focusout="actions.handleSearchFocusout"
191+
data-wp-interactive=\'"core/search"\''
192+
. $form_context .
193+
'data-wp-class--wp-block-search__searchfield-hidden="!context.isSearchInputVisible"
194+
data-wp-on--keydown="actions.handleSearchKeydown"
195+
data-wp-on--focusout="actions.handleSearchFocusout"
188196
';
189197
}
190198

0 commit comments

Comments
 (0)