Skip to content

Commit fd3c7d5

Browse files
desrosjdesrosj
committed
Editor: Bump pinned hash for the Gutenberg repository.
This updates the pinned hash from the `gutenberg` from `c15cef1d6b07f666df28dac0383bafb0edfe0914 ` to `3a4e8d1418d25da83b70158bcaabf65580690b6b`. The following changes are included: - [WP.7.0] Admin UI: Backport accessibility fixes (WordPress/gutenberg#77617, WordPress/gutenberg#78001) (WordPress/gutenberg#78002) - Fix: Shortcode block does not render in Navigation Overlay (WordPress/gutenberg#77511) - feat: Enhance Connectors page on read-only file system (WordPress/gutenberg#77521) - Connectors: Avoid using centered text (WordPress/gutenberg#78125) - Revisions: Add tooltip to diff marker buttons (WordPress/gutenberg#77690) - Add backport for WP_ALLOW_COLLABORATION (WordPress/gutenberg#78160) - Add aria-label to Revisions button in Post Summary sidebar (WordPress/gutenberg#78140) - Revisions diff markers: enforce 24×24px minimum target size (WCAG 2.5.8) (WordPress/gutenberg#77671) - Connectors: Replace @wordpress/ui Link and Notice usage (WordPress/gutenberg#78117) - Connectors: Increase right padding of callout for mobile layout (WordPress/gutenberg#78126) - isFulfilled: don't change resolution state, call in resolveSelect (WordPress/gutenberg#78201) - Connectors: Restyle AI plugin callout with pastel background and beaker decoration (WordPress/gutenberg#78243) - Block supports: Optimize custom CSS class rendering and parsing (WordPress/gutenberg#78217) - Block Inspector: Hide Styles tab in preview mode (WordPress/gutenberg#78230) - Navigation Link: Preserve custom labels during link updates (WordPress/gutenberg#77186) - Editor: Fix Visual Revisions meta keys overlap (WordPress/gutenberg#78156) - Editor: Disable Visual Revisions when classic meta boxes are present (WordPress/gutenberg#78249) (WordPress/gutenberg#78286) - Revisions: Scale diff markers width with user text-size preference (WordPress/gutenberg#78273) A full list of changes can be found on GitHub: https://github.com/WordPress/gutenberg/compare/c15cef1d6b07f666df28dac0383bafb0edfe0914…3a4e8d1418d25da83b70158bcaabf65580690b6b. Log created with: `git log --reverse --format="- %s" c15cef1d6b07f666df28dac0383bafb0edfe0914..3a4e8d1418d25da83b70158bcaabf65580690b6b | sed 's|#\([0-9][0-9]*\)|https://github.com/WordPress/gutenberg/pull/\1|g; /github\.com\/WordPress\/gutenberg\/pull/!d' | pbcopy` Reviewed by desrosj. Merges [62360] to `trunk`. See #64595. git-svn-id: https://develop.svn.wordpress.org/trunk@62361 602fd350-edb4-49c9-b593-d223f7449a82
1 parent 20b5d10 commit fd3c7d5

10 files changed

Lines changed: 382 additions & 155 deletions

File tree

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"url": "https://develop.svn.wordpress.org/trunk"
88
},
99
"gutenberg": {
10-
"sha": "c15cef1d6b07f666df28dac0383bafb0edfe0914",
10+
"sha": "3a4e8d1418d25da83b70158bcaabf65580690b6b",
1111
"ghcrRepo": "WordPress/gutenberg/gutenberg-wp-develop-build"
1212
},
1313
"engines": {

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@
100100
'wp-url',
101101
'wp-warning'
102102
),
103-
'version' => '7e969d1c58fd6b032753'
103+
'version' => '93c3566b7f24c15b7e17'
104104
),
105105
'block-library.js' => array(
106106
'dependencies' => array(
@@ -142,7 +142,7 @@
142142
'import' => 'dynamic'
143143
)
144144
),
145-
'version' => 'bbcc73335599ce2b8d51'
145+
'version' => '2dffdfe77b9c5cba960e'
146146
),
147147
'block-serialization-default-parser.js' => array(
148148
'dependencies' => array(
@@ -304,7 +304,7 @@
304304
'wp-private-apis',
305305
'wp-redux-routine'
306306
),
307-
'version' => 'dc7feb6ad8da53887680'
307+
'version' => '1756b6a2676c1b3369ab'
308308
),
309309
'data-controls.js' => array(
310310
'dependencies' => array(
@@ -381,7 +381,7 @@
381381
'import' => 'static'
382382
)
383383
),
384-
'version' => '69ec189de328df478ab5'
384+
'version' => '1975171eba5481ff37cd'
385385
),
386386
'edit-site.js' => array(
387387
'dependencies' => array(
@@ -428,7 +428,7 @@
428428
'import' => 'static'
429429
)
430430
),
431-
'version' => '34fbf7f8c7d55055d9cd'
431+
'version' => 'dfd078032a67983c4d32'
432432
),
433433
'edit-widgets.js' => array(
434434
'dependencies' => array(
@@ -519,7 +519,7 @@
519519
'import' => 'static'
520520
)
521521
),
522-
'version' => 'f8cdc22abc621b3f9409'
522+
'version' => '77209b33a51951b61574'
523523
),
524524
'element.js' => array(
525525
'dependencies' => array(

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@
166166
'import' => 'static'
167167
)
168168
),
169-
'version' => '42d3f09bba14cce3054d'
169+
'version' => '54bb5a420026a61c7e4f'
170170
),
171171
'connectors/index.js' => array(
172172
'dependencies' => array(

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

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,11 @@ private static function get_overlay_blocks_from_template_part( $overlay_template
425425
$full_template_part_id = $theme . '//' . $slug;
426426
$block_template = get_block_file_template( $full_template_part_id, 'wp_template_part' );
427427
if ( isset( $block_template->content ) ) {
428-
$parsed_blocks = parse_blocks( $block_template->content );
428+
// Expand shortcodes before parsing blocks, matching the order in
429+
// `render_block_core_template_part()`.
430+
$content = shortcode_unautop( $block_template->content );
431+
$content = do_shortcode( $content );
432+
$parsed_blocks = parse_blocks( $content );
429433
$blocks = block_core_navigation_filter_out_empty_blocks( $parsed_blocks );
430434
// Disable overlay menu for any navigation blocks within the overlay to prevent nested overlays.
431435
$blocks = static::disable_overlay_menu_for_nested_navigation_blocks( $blocks );
@@ -449,6 +453,12 @@ private static function get_overlay_blocks_from_template_part( $overlay_template
449453
// Re-serialize, and run Block Hooks algorithm to inject hooked blocks.
450454
$markup = serialize_blocks( $blocks );
451455
$markup = apply_block_hooks_to_content_from_post_object( $markup, $template_part_post );
456+
457+
// Expand shortcodes before parsing blocks, matching the order in
458+
// `render_block_core_template_part()`.
459+
$markup = shortcode_unautop( $markup );
460+
$markup = do_shortcode( $markup );
461+
452462
$blocks = parse_blocks( $markup );
453463

454464
// Disable overlay menu for any navigation blocks within the overlay to prevent nested overlays.

‎src/wp-includes/build/routes/connectors-home/content.js‎

Lines changed: 327 additions & 102 deletions
Large diffs are not rendered by default.

‎src/wp-includes/build/routes/connectors-home/content.min.asset.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-theme', 'wp-url'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/connectors', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => '8a0e3b7671b73b29d3ab');
1+
<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-element', 'wp-i18n', 'wp-notices', 'wp-primitives', 'wp-private-apis', 'wp-theme', 'wp-url'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/connectors', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => 'b614fcaf0d408b3eff9d');

‎src/wp-includes/build/routes/connectors-home/content.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/wp-includes/build/routes/font-list/content.js‎

Lines changed: 30 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ var { Fill: SidebarToggleFill, Slot: SidebarToggleSlot } = (0, import_components
810810
// packages/admin-ui/build-module/page/header.mjs
811811
var import_jsx_runtime7 = __toESM(require_jsx_runtime(), 1);
812812
function Header({
813-
headingLevel = 2,
813+
headingLevel = 1,
814814
breadcrumbs,
815815
badges,
816816
title,
@@ -819,42 +819,34 @@ function Header({
819819
showSidebarToggle = true
820820
}) {
821821
const HeadingTag = `h${headingLevel}`;
822-
return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(
823-
Stack,
824-
{
825-
direction: "column",
826-
className: "admin-ui-page__header",
827-
render: /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("header", {}),
828-
children: [
829-
/* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Stack, { direction: "row", justify: "space-between", gap: "sm", children: [
830-
/* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Stack, { direction: "row", gap: "sm", align: "center", justify: "start", children: [
831-
showSidebarToggle && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
832-
SidebarToggleSlot,
833-
{
834-
bubblesVirtually: true,
835-
className: "admin-ui-page__sidebar-toggle-slot"
836-
}
837-
),
838-
title && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(HeadingTag, { className: "admin-ui-page__header-title", children: title }),
839-
breadcrumbs,
840-
badges
841-
] }),
842-
/* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
843-
Stack,
844-
{
845-
direction: "row",
846-
gap: "sm",
847-
style: { width: "auto", flexShrink: 0 },
848-
className: "admin-ui-page__header-actions",
849-
align: "center",
850-
children: actions
851-
}
852-
)
853-
] }),
854-
subTitle && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { className: "admin-ui-page__header-subtitle", children: subTitle })
855-
]
856-
}
857-
);
822+
return /* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Stack, { direction: "column", className: "admin-ui-page__header", children: [
823+
/* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Stack, { direction: "row", justify: "space-between", gap: "sm", children: [
824+
/* @__PURE__ */ (0, import_jsx_runtime7.jsxs)(Stack, { direction: "row", gap: "sm", align: "center", justify: "start", children: [
825+
showSidebarToggle && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
826+
SidebarToggleSlot,
827+
{
828+
bubblesVirtually: true,
829+
className: "admin-ui-page__sidebar-toggle-slot"
830+
}
831+
),
832+
title && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)(HeadingTag, { className: "admin-ui-page__header-title", children: title }),
833+
breadcrumbs,
834+
badges
835+
] }),
836+
/* @__PURE__ */ (0, import_jsx_runtime7.jsx)(
837+
Stack,
838+
{
839+
direction: "row",
840+
gap: "sm",
841+
style: { width: "auto", flexShrink: 0 },
842+
className: "admin-ui-page__header-actions",
843+
align: "center",
844+
children: actions
845+
}
846+
)
847+
] }),
848+
subTitle && /* @__PURE__ */ (0, import_jsx_runtime7.jsx)("p", { className: "admin-ui-page__header-subtitle", children: subTitle })
849+
] });
858850
}
859851

860852
// packages/admin-ui/build-module/page/index.mjs
@@ -15480,7 +15472,7 @@ function FontLibraryPage() {
1548015472
}))
1548115473
);
1548215474
}
15483-
return /* @__PURE__ */ React.createElement(page_default, { headingLevel: 1, title: (0, import_i18n46.__)("Fonts") }, /* @__PURE__ */ React.createElement(
15475+
return /* @__PURE__ */ React.createElement(page_default, { title: (0, import_i18n46.__)("Fonts") }, /* @__PURE__ */ React.createElement(
1548415476
Tabs3,
1548515477
{
1548615478
selectedTabId: activeTab,

‎src/wp-includes/build/routes/font-list/content.min.asset.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-private-apis', 'wp-style-engine', 'wp-theme'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => '87ed406cb72d86f09e6b');
1+
<?php return array('dependencies' => array('react', 'react-dom', 'react-jsx-runtime', 'wp-api-fetch', 'wp-block-editor', 'wp-blocks', 'wp-components', 'wp-compose', 'wp-core-data', 'wp-data', 'wp-date', 'wp-editor', 'wp-element', 'wp-i18n', 'wp-keycodes', 'wp-primitives', 'wp-private-apis', 'wp-style-engine', 'wp-theme'), 'module_dependencies' => array(array('id' => '@wordpress/a11y', 'import' => 'static'), array('id' => '@wordpress/route', 'import' => 'static')), 'version' => 'f4a76b3cfc58409a8d9c');

‎src/wp-includes/build/routes/font-list/content.min.js‎

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

0 commit comments

Comments
 (0)