Skip to content

Commit a4054c0

Browse files
ellatrixdmsnell
ellatrix
authored and
dmsnell
committed
Restore: Sync Gutenberg @ 487a096a9782ba6110a7686d7b4b2d0c55ed1b06
See changelog in 3678df3 > Editor: Bump pinned hash for the Gutenberg repository. This updates the pinned hash from the `gutenberg` from `8c78d87453509661a9f28f978ba2c242d515563b` to `487a096a9782ba6110a7686d7b4b2d0c55ed1b06`. > The following changes are included: > > - Disables anchor support for the Page Break block. (WordPress/gutenberg#76434)
1 parent ffb1ca2 commit a4054c0

34 files changed

Lines changed: 3500 additions & 1944 deletions

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

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
'wp-url',
101101
'wp-warning'
102102
),
103-
'version' => 'd803068b8e202e8ddcc9'
103+
'version' => 'c6c0d76c9541b0d32d67'
104104
),
105105
'block-library.min.js' => array(
106106
'dependencies' => array(
@@ -142,7 +142,7 @@
142142
'import' => 'dynamic'
143143
)
144144
),
145-
'version' => '34fa1c224ed894b32e72'
145+
'version' => '7df45ee84aa052551d68'
146146
),
147147
'block-serialization-default-parser.min.js' => array(
148148
'dependencies' => array(
@@ -214,7 +214,7 @@
214214
'wp-rich-text',
215215
'wp-warning'
216216
),
217-
'version' => 'e778951c7b5eb4671d91'
217+
'version' => 'e4a2b31831c0887fbe70'
218218
),
219219
'compose.min.js' => array(
220220
'dependencies' => array(
@@ -228,7 +228,7 @@
228228
'wp-priority-queue',
229229
'wp-undo-manager'
230230
),
231-
'version' => '42e10ac07bc50b2c5314'
231+
'version' => 'edb5a8c0b5bf71686403'
232232
),
233233
'core-commands.min.js' => array(
234234
'dependencies' => array(
@@ -266,7 +266,7 @@
266266
'wp-url',
267267
'wp-warning'
268268
),
269-
'version' => '767b16974e5758002db2'
269+
'version' => '4d15c0f82a9fb01a04ed'
270270
),
271271
'customize-widgets.min.js' => array(
272272
'dependencies' => array(
@@ -291,7 +291,7 @@
291291
'wp-private-apis',
292292
'wp-widgets'
293293
),
294-
'version' => 'e80611931675bf2bbbc8'
294+
'version' => '524dc7a4326b77064831'
295295
),
296296
'data.min.js' => array(
297297
'dependencies' => array(
@@ -344,7 +344,10 @@
344344
'media-models',
345345
'media-views',
346346
'postbox',
347+
'react',
348+
'react-dom',
347349
'react-jsx-runtime',
350+
'wp-a11y',
348351
'wp-api-fetch',
349352
'wp-block-editor',
350353
'wp-block-library',
@@ -368,6 +371,7 @@
368371
'wp-primitives',
369372
'wp-private-apis',
370373
'wp-style-engine',
374+
'wp-theme',
371375
'wp-url',
372376
'wp-widgets'
373377
),
@@ -377,7 +381,7 @@
377381
'import' => 'static'
378382
)
379383
),
380-
'version' => '5eccb583f18c127f6b68'
384+
'version' => 'f84d20a8526b3463e9ff'
381385
),
382386
'edit-site.min.js' => array(
383387
'dependencies' => array(
@@ -424,11 +428,14 @@
424428
'import' => 'static'
425429
)
426430
),
427-
'version' => 'd2dda88d87840f09cc45'
431+
'version' => 'a688ac97344ffdfcca99'
428432
),
429433
'edit-widgets.min.js' => array(
430434
'dependencies' => array(
435+
'react',
436+
'react-dom',
431437
'react-jsx-runtime',
438+
'wp-a11y',
432439
'wp-api-fetch',
433440
'wp-block-editor',
434441
'wp-block-library',
@@ -451,6 +458,7 @@
451458
'wp-preferences',
452459
'wp-primitives',
453460
'wp-private-apis',
461+
'wp-theme',
454462
'wp-url',
455463
'wp-viewport',
456464
'wp-widgets'
@@ -461,7 +469,7 @@
461469
'import' => 'static'
462470
)
463471
),
464-
'version' => '806130674ab07f4de152'
472+
'version' => '899c5ac5dcb94e19d378'
465473
),
466474
'editor.min.js' => array(
467475
'dependencies' => array(
@@ -511,7 +519,7 @@
511519
'import' => 'static'
512520
)
513521
),
514-
'version' => 'd6964395bb65759fe0ab'
522+
'version' => 'dc833098f1b4c066828b'
515523
),
516524
'element.min.js' => array(
517525
'dependencies' => array(
@@ -626,7 +634,7 @@
626634
'wp-url',
627635
'wp-warning'
628636
),
629-
'version' => '490d1513362c0dd0d184'
637+
'version' => '85f1375ab5f23cd5d13c'
630638
),
631639
'notices.min.js' => array(
632640
'dependencies' => array(
@@ -809,7 +817,7 @@
809817
'wp-hooks',
810818
'wp-private-apis'
811819
),
812-
'version' => '520093735c1b81307ab4'
820+
'version' => 'b16dc8f0d4c00e4dba22'
813821
),
814822
'theme.min.js' => array(
815823
'dependencies' => array(
@@ -848,7 +856,7 @@
848856
'import' => 'dynamic'
849857
)
850858
),
851-
'version' => '2dac6787d62a1c93f85e'
859+
'version' => 'd359c2cccf866d7082d2'
852860
),
853861
'url.min.js' => array(
854862
'dependencies' => array(

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@
132132
),
133133
'boot/index.min.js' => array(
134134
'dependencies' => array(
135+
'react',
136+
'react-dom',
135137
'react-jsx-runtime',
136138
'wp-commands',
137139
'wp-components',
@@ -164,7 +166,7 @@
164166
'import' => 'static'
165167
)
166168
),
167-
'version' => '77514d54b76613289de5'
169+
'version' => '105defe2f1526f8a43e8'
168170
),
169171
'connectors/index.min.js' => array(
170172
'dependencies' => array(
@@ -175,7 +177,7 @@
175177
'wp-i18n',
176178
'wp-private-apis'
177179
),
178-
'version' => '0db9a26c7920b6ab9f4a'
180+
'version' => 'c9991cd0656dfe1c46e9'
179181
),
180182
'core-abilities/index.min.js' => array(
181183
'dependencies' => array(
@@ -209,7 +211,7 @@
209211
'dependencies' => array(
210212

211213
),
212-
'version' => 'f5a180d17cd8a38658aa'
214+
'version' => '4d2a3a72c7410d548881'
213215
),
214216
'interactivity-router/full-page.min.js' => array(
215217
'dependencies' => array(
@@ -298,7 +300,7 @@
298300
'dependencies' => array(
299301

300302
),
301-
'version' => '61b86a5f5540ba666280'
303+
'version' => 'aff5e5c5b28ae6b73aaa'
302304
),
303305
'workflow/index.min.js' => array(
304306
'dependencies' => array(

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4542,7 +4542,6 @@
45424542
),
45434543
'textdomain' => 'default',
45444544
'supports' => array(
4545-
'anchor' => true,
45464545
'customClassName' => false,
45474546
'className' => false,
45484547
'html' => false,

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

Lines changed: 24 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -697,14 +697,10 @@ private static function get_responsive_container_markup( $attributes, $inner_blo
697697
if ( ! empty( $attributes['overlay'] ) ) {
698698
// Get blocks from the overlay template part.
699699
$overlay_blocks = static::get_overlay_blocks_from_template_part( $attributes['overlay'], $attributes );
700-
// Check if overlay contains a navigation-overlay-close block.
701-
$has_custom_overlay_close_block = block_core_navigation_block_tree_has_block_type(
702-
$overlay_blocks,
703-
'core/navigation-overlay-close',
704-
array( 'core/navigation' ) // Skip navigation blocks, as they cannot contain an overlay close block
705-
);
706700
// Render template part blocks directly without navigation container wrapper.
707701
$overlay_blocks_html = static::get_template_part_blocks_html( $overlay_blocks );
702+
// Check if overlay contains a navigation-overlay-close block (detect in rendered HTML so it works with patterns).
703+
$has_custom_overlay_close_block = block_core_navigation_overlay_html_has_close_block( $overlay_blocks_html );
708704
// Add Interactivity API directives to the overlay close block if present.
709705
if ( $has_custom_overlay_close_block && $is_interactive ) {
710706
$tags = new WP_HTML_Tag_Processor( $overlay_blocks_html );
@@ -1094,6 +1090,28 @@ function block_core_navigation_get_inner_blocks_from_unstable_location( $attribu
10941090
}
10951091
}
10961092

1093+
/**
1094+
* Checks if the overlay HTML contains a navigation-overlay-close block.
1095+
*
1096+
* Uses WP_HTML_Tag_Processor to detect the close button in rendered output,
1097+
* so it works when the overlay uses patterns (pattern content is rendered at
1098+
* output time, not in the block tree).
1099+
*
1100+
* @since 7.0.0
1101+
*
1102+
* @param string $html The rendered overlay HTML.
1103+
* @return bool True if a close button element is found.
1104+
*/
1105+
function block_core_navigation_overlay_html_has_close_block( $html ) {
1106+
$tags = new WP_HTML_Tag_Processor( $html );
1107+
return $tags->next_tag(
1108+
array(
1109+
'tag_name' => 'BUTTON',
1110+
'class_name' => 'wp-block-navigation-overlay-close',
1111+
)
1112+
);
1113+
}
1114+
10971115
/**
10981116
* Add Interactivity API directives to the navigation-overlay-close block
10991117
* markup using the Tag Processor.

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"parent": [ "core/post-content" ],
1010
"textdomain": "default",
1111
"supports": {
12-
"anchor": true,
1312
"customClassName": false,
1413
"className": false,
1514
"html": false,

‎src/wp-includes/build/pages/font-library/page-wp-admin.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ function wp_font_library_wp_admin_render_page() {
231231

232232
/* Reset wp-admin padding */
233233
#wpcontent {
234-
padding-left: 0;
234+
padding-inline-start: 0;
235235
}
236236
#wpbody-content {
237237
padding-bottom: 0;
@@ -247,14 +247,14 @@ function wp_font_library_wp_admin_render_page() {
247247

248248
/* Accessibility regions */
249249
.a11y-speak-region {
250-
left: -1px;
250+
inset-inline-start: -1px;
251251
top: -1px;
252252
}
253253

254254
/* Admin menu indicators */
255255
ul#adminmenu a.wp-has-current-submenu::after,
256256
ul#adminmenu > li.current > a.current::after {
257-
border-right-color: #fff;
257+
border-inline-end-color: #fff;
258258
}
259259

260260
/* Media frame fix */

‎src/wp-includes/build/pages/options-connectors/page-wp-admin.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ function wp_options_connectors_wp_admin_render_page() {
231231

232232
/* Reset wp-admin padding */
233233
#wpcontent {
234-
padding-left: 0;
234+
padding-inline-start: 0;
235235
}
236236
#wpbody-content {
237237
padding-bottom: 0;
@@ -247,14 +247,14 @@ function wp_options_connectors_wp_admin_render_page() {
247247

248248
/* Accessibility regions */
249249
.a11y-speak-region {
250-
left: -1px;
250+
inset-inline-start: -1px;
251251
top: -1px;
252252
}
253253

254254
/* Admin menu indicators */
255255
ul#adminmenu a.wp-has-current-submenu::after,
256256
ul#adminmenu > li.current > a.current::after {
257-
border-right-color: #fff;
257+
border-inline-end-color: #fff;
258258
}
259259

260260
/* Media frame fix */

0 commit comments

Comments
 (0)