mirror of
https://github.com/WordPress/WordPress.git
synced 2024-09-27 14:53:08 +02:00
Editor: Update @wordpress packages for 6.2 RC2.
Updates the `@wordpress` packages to include the following changes: - [Regression] Don't offer Classic block as a recovery action when not registered [https://github.com/WordPress/gutenberg/pull/49051 Gutenberg PR 49051] ✅ - [i18n Change] Fix typo in the media-categories component [https://github.com/WordPress/gutenberg/pull/49047 Gutenberg PR 49047] ✅ - Hide navigation screen in site editor [https://github.com/WordPress/gutenberg/pull/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 [https://github.com/WordPress/gutenberg/pull/48976 Gutenberg PR 48976] ✅ See Trac #57895. - [Regression] Site Editor: Fix lingering insertion point within template parts [https://github.com/WordPress/gutenberg/pull/48913 Gutenberg PR 48913] ✅ > Regression introduced in 6.2 cycle. - Navigation Link: Remove color generation code [https://github.com/WordPress/gutenberg/pull/48927 Gutenberg PR 48927] and [https://github.com/WordPress/gutenberg/pull/49064 Gutenberg PR 49064] ✅ - Fix settings tab active state border in block inspector [https://github.com/WordPress/gutenberg/pull/48945 Gutenberg PR 48945] ✅ - Fix text alignment in the Site Editor sidebar [https://github.com/WordPress/gutenberg/pull/48959 Gutenberg PR 48959] ✅ Making template descriptions more prominent is part of 6.2. References: * [f22a3cbf0c
Packages x.3.9 publish commit] * [356298f91f
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: http://core.svn.wordpress.org/trunk@55054 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
parent
9caf1c4ade
commit
48deabccbe
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
@ -173,13 +173,11 @@ function render_block_core_navigation_link( $attributes, $content, $block ) {
|
|||||||
return '';
|
return '';
|
||||||
}
|
}
|
||||||
|
|
||||||
$colors = block_core_navigation_link_build_css_colors( $block->context, $attributes );
|
|
||||||
$font_sizes = block_core_navigation_link_build_css_font_sizes( $block->context );
|
$font_sizes = block_core_navigation_link_build_css_font_sizes( $block->context );
|
||||||
$classes = array_merge(
|
$classes = array_merge(
|
||||||
$colors['css_classes'],
|
|
||||||
$font_sizes['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 ) );
|
$css_classes = trim( implode( ' ', $classes ) );
|
||||||
$has_submenu = count( $block->inner_blocks ) > 0;
|
$has_submenu = count( $block->inner_blocks ) > 0;
|
||||||
|
@ -75,6 +75,7 @@
|
|||||||
.block-editor-block-inspector .components-panel__body{
|
.block-editor-block-inspector .components-panel__body{
|
||||||
border:none;
|
border:none;
|
||||||
border-top:1px solid #e0e0e0;
|
border-top:1px solid #e0e0e0;
|
||||||
|
margin-top:-1px;
|
||||||
}
|
}
|
||||||
.block-editor-block-inspector .block-editor-block-card{
|
.block-editor-block-inspector .block-editor-block-card{
|
||||||
padding:16px;
|
padding:16px;
|
||||||
|
File diff suppressed because one or more lines are too long
1
wp-includes/css/dist/block-editor/style.css
vendored
1
wp-includes/css/dist/block-editor/style.css
vendored
@ -75,6 +75,7 @@
|
|||||||
.block-editor-block-inspector .components-panel__body{
|
.block-editor-block-inspector .components-panel__body{
|
||||||
border:none;
|
border:none;
|
||||||
border-top:1px solid #e0e0e0;
|
border-top:1px solid #e0e0e0;
|
||||||
|
margin-top:-1px;
|
||||||
}
|
}
|
||||||
.block-editor-block-inspector .block-editor-block-card{
|
.block-editor-block-inspector .block-editor-block-card{
|
||||||
padding:16px;
|
padding:16px;
|
||||||
|
File diff suppressed because one or more lines are too long
8
wp-includes/css/dist/edit-site/style-rtl.css
vendored
8
wp-includes/css/dist/edit-site/style-rtl.css
vendored
@ -2210,12 +2210,11 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
|
|||||||
}
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-item.components-item{
|
.edit-site-sidebar-navigation-item.components-item{
|
||||||
border-width:1.5px;
|
|
||||||
color:#949494;
|
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]{
|
.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;
|
background:#2f2f2f;
|
||||||
border-width:1.5px;
|
|
||||||
color:#fff;
|
color:#fff;
|
||||||
}
|
}
|
||||||
.edit-site-sidebar-navigation-item.components-item[aria-current]{
|
.edit-site-sidebar-navigation-item.components-item[aria-current]{
|
||||||
@ -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{
|
.edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button{
|
||||||
cursor:grab;
|
cursor:grab;
|
||||||
padding:8px;
|
padding:8px;
|
||||||
width:calc(100% - 2px);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-screen{
|
.edit-site-sidebar-navigation-screen{
|
||||||
@ -2304,6 +2302,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
|
|||||||
white-space:nowrap;
|
white-space:nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.edit-site-site-hub__site-title{
|
||||||
|
margin-right:4px;
|
||||||
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-screen__description{
|
.edit-site-sidebar-navigation-screen__description{
|
||||||
margin:0 16px 32px 0;
|
margin:0 16px 32px 0;
|
||||||
}
|
}
|
||||||
|
File diff suppressed because one or more lines are too long
8
wp-includes/css/dist/edit-site/style.css
vendored
8
wp-includes/css/dist/edit-site/style.css
vendored
@ -2210,12 +2210,11 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
|
|||||||
}
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-item.components-item{
|
.edit-site-sidebar-navigation-item.components-item{
|
||||||
border-width:1.5px;
|
|
||||||
color:#949494;
|
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]{
|
.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;
|
background:#2f2f2f;
|
||||||
border-width:1.5px;
|
|
||||||
color:#fff;
|
color:#fff;
|
||||||
}
|
}
|
||||||
.edit-site-sidebar-navigation-item.components-item[aria-current]{
|
.edit-site-sidebar-navigation-item.components-item[aria-current]{
|
||||||
@ -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{
|
.edit-site-sidebar-navigation-screen__content .block-editor-list-view-block-select-button{
|
||||||
cursor:grab;
|
cursor:grab;
|
||||||
padding:8px;
|
padding:8px;
|
||||||
width:calc(100% - 2px);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-screen{
|
.edit-site-sidebar-navigation-screen{
|
||||||
@ -2304,6 +2302,10 @@ body.is-fullscreen-mode .edit-site .components-editor-notices__snackbar{
|
|||||||
white-space:nowrap;
|
white-space:nowrap;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.edit-site-site-hub__site-title{
|
||||||
|
margin-left:4px;
|
||||||
|
}
|
||||||
|
|
||||||
.edit-site-sidebar-navigation-screen__description{
|
.edit-site-sidebar-navigation-screen__description{
|
||||||
margin:0 0 32px 16px;
|
margin:0 0 32px 16px;
|
||||||
}
|
}
|
||||||
|
2
wp-includes/css/dist/edit-site/style.min.css
vendored
2
wp-includes/css/dist/edit-site/style.min.css
vendored
File diff suppressed because one or more lines are too long
9
wp-includes/js/dist/block-editor.js
vendored
9
wp-includes/js/dist/block-editor.js
vendored
@ -8853,14 +8853,14 @@ function __unstableHasActiveBlockOverlayActive(state, clientId) {
|
|||||||
return shouldEnableIfUnselected && !isBlockSelected(state, clientId) && !hasSelectedInnerBlock(state, clientId, true);
|
return shouldEnableIfUnselected && !isBlockSelected(state, clientId) && !hasSelectedInnerBlock(state, clientId, true);
|
||||||
}
|
}
|
||||||
function __unstableIsWithinBlockOverlay(state, clientId) {
|
function __unstableIsWithinBlockOverlay(state, clientId) {
|
||||||
let parent = state.blocks.parents[clientId];
|
let parent = state.blocks.parents.get(clientId);
|
||||||
|
|
||||||
while (!!parent) {
|
while (!!parent) {
|
||||||
if (__unstableHasActiveBlockOverlayActive(state, parent)) {
|
if (__unstableHasActiveBlockOverlayActive(state, parent)) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
parent = state.blocks.parents[parent];
|
parent = state.blocks.parents.get(parent);
|
||||||
}
|
}
|
||||||
|
|
||||||
return false;
|
return false;
|
||||||
@ -16538,6 +16538,7 @@ function BlockInvalidWarning(_ref) {
|
|||||||
block
|
block
|
||||||
} = _ref;
|
} = _ref;
|
||||||
const hasHTMLBlock = !!(0,external_wp_blocks_namespaceObject.getBlockType)('core/html');
|
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 [compare, setCompare] = (0,external_wp_element_namespaceObject.useState)(false);
|
||||||
const onCompare = (0,external_wp_element_namespaceObject.useCallback)(() => setCompare(true), []);
|
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.
|
const onCompareClose = (0,external_wp_element_namespaceObject.useCallback)(() => setCompare(false), []); // We memo the array here to prevent the children components from being updated unexpectedly.
|
||||||
@ -16549,10 +16550,10 @@ function BlockInvalidWarning(_ref) {
|
|||||||
}, hasHTMLBlock && {
|
}, hasHTMLBlock && {
|
||||||
title: (0,external_wp_i18n_namespaceObject.__)('Convert to HTML'),
|
title: (0,external_wp_i18n_namespaceObject.__)('Convert to HTML'),
|
||||||
onClick: convertToHTML
|
onClick: convertToHTML
|
||||||
}, {
|
}, hasClassicBlock && {
|
||||||
title: (0,external_wp_i18n_namespaceObject.__)('Convert to Classic Block'),
|
title: (0,external_wp_i18n_namespaceObject.__)('Convert to Classic Block'),
|
||||||
onClick: convertToClassic
|
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, {
|
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, {
|
actions: [(0,external_wp_element_namespaceObject.createElement)(external_wp_components_namespaceObject.Button, {
|
||||||
key: "recover",
|
key: "recover",
|
||||||
|
2
wp-includes/js/dist/block-editor.min.js
vendored
2
wp-includes/js/dist/block-editor.min.js
vendored
File diff suppressed because one or more lines are too long
9
wp-includes/js/dist/edit-site.js
vendored
9
wp-includes/js/dist/edit-site.js
vendored
@ -5755,11 +5755,12 @@ function SidebarNavigationScreenMain() {
|
|||||||
})
|
})
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
const showNavigationScreen = false ? 0 : false;
|
||||||
return (0,external_wp_element_namespaceObject.createElement)(SidebarNavigationScreen, {
|
return (0,external_wp_element_namespaceObject.createElement)(SidebarNavigationScreen, {
|
||||||
isRoot: true,
|
isRoot: true,
|
||||||
title: (0,external_wp_i18n_namespaceObject.__)('Design'),
|
title: (0,external_wp_i18n_namespaceObject.__)('Design'),
|
||||||
description: (0,external_wp_i18n_namespaceObject.__)('Customize the appearance of your website using the block editor.'),
|
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,
|
as: SidebarNavigationItem,
|
||||||
path: "/navigation",
|
path: "/navigation",
|
||||||
withChevron: true,
|
withChevron: true,
|
||||||
@ -8005,7 +8006,7 @@ const sidebar_navigation_screen_templates_browse_config = {
|
|||||||
},
|
},
|
||||||
wp_template_part: {
|
wp_template_part: {
|
||||||
title: (0,external_wp_i18n_namespaceObject.__)('All template parts'),
|
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() {
|
function SidebarNavigationScreenTemplatesBrowse() {
|
||||||
@ -17402,7 +17403,9 @@ const SiteHub = (0,external_wp_element_namespaceObject.forwardRef)((props, ref)
|
|||||||
className: "edit-site-layout__view-mode-toggle"
|
className: "edit-site-layout__view-mode-toggle"
|
||||||
}), (0,external_wp_element_namespaceObject.createElement)(site_icon, {
|
}), (0,external_wp_element_namespaceObject.createElement)(site_icon, {
|
||||||
className: "edit-site-layout__view-mode-toggle-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);
|
/* harmony default export */ var site_hub = (SiteHub);
|
||||||
|
|
||||||
|
2
wp-includes/js/dist/edit-site.min.js
vendored
2
wp-includes/js/dist/edit-site.min.js
vendored
File diff suppressed because one or more lines are too long
2
wp-includes/js/dist/editor.js
vendored
2
wp-includes/js/dist/editor.js
vendored
@ -12997,7 +12997,7 @@ const getOpenverseCaption = item => {
|
|||||||
} else {
|
} 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".
|
_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)('"%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, ' ');
|
return _caption.replace(/\s{2}/g, ' ');
|
||||||
|
2
wp-includes/js/dist/editor.min.js
vendored
2
wp-includes/js/dist/editor.min.js
vendored
File diff suppressed because one or more lines are too long
@ -16,7 +16,7 @@
|
|||||||
*
|
*
|
||||||
* @global string $wp_version
|
* @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.
|
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.
|
||||||
|
Loading…
Reference in New Issue
Block a user