Skip to content

Commit

Permalink
Editor: Update @WordPress packages for 6.2 RC2.
Browse files Browse the repository at this point in the history
Updates the `@wordpress` packages to include the following changes:

- [Regression] Don't offer Classic block as a recovery action when not registered [WordPress/gutenberg#49051 Gutenberg PR 49051] ✅ 
- [i18n Change] Fix typo in the media-categories component [WordPress/gutenberg#49047 Gutenberg PR 49047] ✅
- Hide navigation screen in site editor [WordPress/gutenberg#49043 Gutenberg PR 49043] ✅ 
 [https://make.wordpress.org/core/2023/03/14/fyi-navigation-section-of-new-site-editor-experienced-removed-for-6-2-rc-2/ Feature is not ready for 6.2]
- [i18n Change] Site editor: Fix non-us spelling in sidebar [WordPress/gutenberg#48976 Gutenberg PR 48976] ✅ See Trac #57895.
- [Regression] Site Editor: Fix lingering insertion point within template parts [WordPress/gutenberg#48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle.
- Navigation Link: Remove color generation code [WordPress/gutenberg#48927 Gutenberg PR 48927] and [WordPress/gutenberg#49064 Gutenberg PR 49064] ✅
- Fix settings tab active state border in block inspector [WordPress/gutenberg#48945 Gutenberg PR 48945] ✅
- Fix text alignment in the Site Editor sidebar  [WordPress/gutenberg#48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2.

References:
* [WordPress/gutenberg@f22a3cb Packages x.3.9 publish commit]
* [WordPress/gutenberg@356298f Packages x.3.10 publish commit]

Follow-up to [55496].

Props mamaduka, tobifjellner, davidbaumwald, costdev, audrasjb, hellofromTonya.
See #57471.
Fixes #57895.
Built from https://develop.svn.wordpress.org/trunk@55542


git-svn-id: https://core.svn.wordpress.org/trunk@55054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
  • Loading branch information
hellofromtonya committed Mar 14, 2023
1 parent 457dba5 commit f71da79
Show file tree
Hide file tree
Showing 18 changed files with 35 additions and 27 deletions.
2 changes: 1 addition & 1 deletion wp-includes/assets/script-loader-packages.min.php

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-includes/assets/script-loader-packages.php

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions wp-includes/blocks/navigation-link.php
Original file line number Diff line number Diff line change
Expand Up @@ -173,13 +173,11 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
return '';
}

$colors = block_core_navigation_link_build_css_colors( $block->context, $attributes );
$font_sizes = block_core_navigation_link_build_css_font_sizes( $block->context );
$classes = array_merge(
$colors['css_classes'],
$font_sizes['css_classes']
);
$style_attribute = ( $colors['inline_styles'] . $font_sizes['inline_styles'] );
$style_attribute = $font_sizes['inline_styles'];

$css_classes = trim( implode( ' ', $classes ) );
$has_submenu = count( $block->inner_blocks ) > 0;
Expand Down
1 change: 1 addition & 0 deletions wp-includes/css/dist/block-editor/style-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
.block-editor-block-inspector .components-panel__body{
border:none;
border-top:1px solid #e0e0e0;
margin-top:-1px;
}
.block-editor-block-inspector .block-editor-block-card{
padding:16px;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/css/dist/block-editor/style-rtl.min.css

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions wp-includes/css/dist/block-editor/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@
.block-editor-block-inspector .components-panel__body{
border:none;
border-top:1px solid #e0e0e0;
margin-top:-1px;
}
.block-editor-block-inspector .block-editor-block-card{
padding:16px;
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/css/dist/block-editor/style.min.css

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions wp-includes/css/dist/edit-site/style-rtl.css
Original file line number Diff line number Diff line change
Expand Up @@ -2210,12 +2210,11 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
}

.edit-site-sidebar-navigation-item.components-item{
border-width:1.5px;
color:#949494;
margin:0 4px;
}
.edit-site-sidebar-navigation-item.components-item:focus,.edit-site-sidebar-navigation-item.components-item:hover,.edit-site-sidebar-navigation-item.components-item[aria-current]{
background:#2f2f2f;
border-width:1.5px;
color:#fff;
}
.edit-site-sidebar-navigation-item.components-item[aria-current]{
Expand All @@ -2225,7 +2224,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
.edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button{
cursor:grab;
padding:8px;
width:calc(100% - 2px);
}

.edit-site-sidebar-navigation-screen{
Expand Down Expand Up @@ -2304,6 +2302,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
white-space:nowrap;
}

.edit-site-site-hub__site-title{
margin-right:4px;
}

.edit-site-sidebar-navigation-screen__description{
margin:0 16px 32px 0;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/css/dist/edit-site/style-rtl.min.css

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions wp-includes/css/dist/edit-site/style.css
Original file line number Diff line number Diff line change
Expand Up @@ -2210,12 +2210,11 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
}

.edit-site-sidebar-navigation-item.components-item{
border-width:1.5px;
color:#949494;
margin:0 4px;
}
.edit-site-sidebar-navigation-item.components-item:focus,.edit-site-sidebar-navigation-item.components-item:hover,.edit-site-sidebar-navigation-item.components-item[aria-current]{
background:#2f2f2f;
border-width:1.5px;
color:#fff;
}
.edit-site-sidebar-navigation-item.components-item[aria-current]{
Expand All @@ -2225,7 +2224,6 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
.edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button{
cursor:grab;
padding:8px;
width:calc(100% - 2px);
}

.edit-site-sidebar-navigation-screen{
Expand Down Expand Up @@ -2304,6 +2302,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
white-space:nowrap;
}

.edit-site-site-hub__site-title{
margin-left:4px;
}

.edit-site-sidebar-navigation-screen__description{
margin:0 0 32px 16px;
}
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/css/dist/edit-site/style.min.css

Large diffs are not rendered by default.

9 changes: 5 additions & 4 deletions wp-includes/js/dist/block-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -8853,14 +8853,14 @@ function __unstableHasActiveBlockOverlayActive(state, clientId) {
return shouldEnableIfUnselected && !isBlockSelected(state, clientId) && !hasSelectedInnerBlock(state, clientId, true);
}
function __unstableIsWithinBlockOverlay(state, clientId) {
let parent = state.blocks.parents[clientId];
let parent = state.blocks.parents.get(clientId);

while (!!parent) {
if (__unstableHasActiveBlockOverlayActive(state, parent)) {
return true;
}

parent = state.blocks.parents[parent];
parent = state.blocks.parents.get(parent);
}

return false;
Expand Down Expand Up @@ -16538,6 +16538,7 @@ function BlockInvalidWarning(_ref) {
block
} = _ref;
const hasHTMLBlock = !!(0,external_wp_blocks_namespaceObject.getBlockType)('core/html');
const hasClassicBlock = !!(0,external_wp_blocks_namespaceObject.getBlockType)('core/freeform');
const [compare, setCompare] = (0,external_wp_element_namespaceObject.useState)(false);
const onCompare = (0,external_wp_element_namespaceObject.useCallback)(() => setCompare(true), []);
const onCompareClose = (0,external_wp_element_namespaceObject.useCallback)(() => setCompare(false), []); // We memo the array here to prevent the children components from being updated unexpectedly.
Expand All @@ -16549,10 +16550,10 @@ function BlockInvalidWarning(_ref) {
}, hasHTMLBlock && {
title: (0,external_wp_i18n_namespaceObject.__)('Convert to HTML'),
onClick: convertToHTML
}, {
}, hasClassicBlock && {
title: (0,external_wp_i18n_namespaceObject.__)('Convert to Classic Block'),
onClick: convertToClassic
}].filter(Boolean), [onCompare, convertToHTML, convertToClassic]);
}].filter(Boolean), [onCompare, hasHTMLBlock, convertToHTML, hasClassicBlock, convertToClassic]);
return (0,external_wp_element_namespaceObject.createElement)(external_wp_element_namespaceObject.Fragment, null, (0,external_wp_element_namespaceObject.createElement)(warning, {
actions: [(0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.Button, {
key: "recover",
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/block-editor.min.js

Large diffs are not rendered by default.

9 changes: 6 additions & 3 deletions wp-includes/js/dist/edit-site.js
Original file line number Diff line number Diff line change
Expand Up @@ -5755,11 +5755,12 @@ function SidebarNavigationScreenMain() {
})
};
});
const showNavigationScreen = false ? 0 : false;
return (0,external_wp_element_namespaceObject.createElement)(SidebarNavigationScreen, {
isRoot: true,
title: (0,external_wp_i18n_namespaceObject.__)('Design'),
description: (0,external_wp_i18n_namespaceObject.__)('Customize the appearance of your website using the block editor.'),
content: (0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.__experimentalItemGroup, null, !!navigationMenus && navigationMenus.length > 0 && (0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.__experimentalNavigatorButton, {
content: (0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.__experimentalItemGroup, null, showNavigationScreen && (0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.__experimentalNavigatorButton, {
as: SidebarNavigationItem,
path: "/navigation",
withChevron: true,
Expand Down Expand Up @@ -8005,7 +8006,7 @@ const sidebar_navigation_screen_templates_browse_config = {
},
wp_template_part: {
title: (0,external_wp_i18n_namespaceObject.__)('All template parts'),
description: (0,external_wp_i18n_namespaceObject.__)('Create new template parts, or reset any customisations made to the template parts supplied by your theme.')
description: (0,external_wp_i18n_namespaceObject.__)('Create new template parts, or reset any customizations made to the template parts supplied by your theme.')
}
};
function SidebarNavigationScreenTemplatesBrowse() {
Expand Down Expand Up @@ -17402,7 +17403,9 @@ const SiteHub = (0,external_wp_element_namespaceObject.forwardRef)((props, ref)
className: "edit-site-layout__view-mode-toggle"
}), (0,external_wp_element_namespaceObject.createElement)(site_icon, {
className: "edit-site-layout__view-mode-toggle-icon"
}))), showLabels && (0,external_wp_element_namespaceObject.createElement)("div", null, siteTitle)));
}))), showLabels && (0,external_wp_element_namespaceObject.createElement)("div", {
className: "edit-site-site-hub__site-title"
}, siteTitle)));
});
/* harmony default export */ var site_hub = (SiteHub);

Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/edit-site.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-includes/js/dist/editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -12997,7 +12997,7 @@ const getOpenverseCaption = item => {
} else {
_caption = title ? (0,external_wp_i18n_namespaceObject.sprintf)( // translators: %1s: Title of a media work from Openverse; %2s: Work's licence e.g: "CC0 1.0".
(0,external_wp_i18n_namespaceObject._x)('"%1$s"/ %2$s', 'caption'), getExternalLink(foreignLandingUrl, (0,external_wp_htmlEntities_namespaceObject.decodeEntities)(title)), licenseUrl ? getExternalLink(`${licenseUrl}?ref=openverse`, fullLicense) : fullLicense) : (0,external_wp_i18n_namespaceObject.sprintf)( // translators: %1s: Link attributes for a given Openverse media work; %2s: Works's licence e.g: "CC0 1.0".
(0,external_wp_i18n_namespaceObject._x)('<a %1$s>Work</a>/ %3$s', 'caption'), getExternalLinkAttributes(foreignLandingUrl), licenseUrl ? getExternalLink(`${licenseUrl}?ref=openverse`, fullLicense) : fullLicense);
(0,external_wp_i18n_namespaceObject._x)('<a %1$s>Work</a>/ %2$s', 'caption'), getExternalLinkAttributes(foreignLandingUrl), licenseUrl ? getExternalLink(`${licenseUrl}?ref=openverse`, fullLicense) : fullLicense);
}

return _caption.replace(/\s{2}/g, ' ');
Expand Down
2 changes: 1 addition & 1 deletion wp-includes/js/dist/editor.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion wp-includes/version.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.3-alpha-55541';
$wp_version = '6.3-alpha-55542';

/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
Expand Down

0 comments on commit f71da79

Please sign in to comment.