WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update @wordpress packages 

Update packages to include these bug fixes from Gutenberg:

- Include cascading properties in Navigation deprecation
- Reorganize e2e tests folders and file
- Border panel: Update to display multiple palette origins
- Add CSS fix for 33580
- Add: Uneditable duotone palette on the palette gradient panel
- Site Editor: Allow editing custom template title
- Writing Flow: Double escape unselects all blocks
- Fix icon scaling.
- [Block Library - Query Pagination Next/Previous]: Remove text and link color support
- Add: Border indication to global styles colors.
- Color Picker: Improve border, padding, and box shadow styles.
- theme.json: sort keys alphabetically
- Remove navigationArea context.

See #54487.

Built from https://develop.svn.wordpress.org/trunk@52277


git-svn-id: http://core.svn.wordpress.org/trunk@51869 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
noisysocks 2021-11-30 05:48:28 +00:00
parent 43290b2e04
commit dc3ffcbde3
30 changed files with 286 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-includes/assets/script-loader-packages.php
View File

File diff suppressed because one or more lines are too long

27
wp-includes/blocks/legacy-widget.php
View File

@ -108,6 +108,33 @@ function handle_legacy_widget_preview_iframe() {
padding: 0 !important; padding: 0 !important;
margin: 0 !important; margin: 0 !important;
} }
/* Hide root level text nodes */
body {
font-size: 0 !important;
}
/* Hide non-widget elements */
body *:not(#page):not(#content):not(.widget):not(.widget *) {
display: none !important;
font-size: 0 !important;
height: 0 !important;
left: -9999px !important;
max-height: 0 !important;
max-width: 0 !important;
opacity: 0 !important;
pointer-events: none !important;
position: absolute !important;
top: -9999px !important;
transform: translate(-9999px, -9999px) !important;
visibility: hidden !important;
z-index: -999 !important;
}
/* Restore widget font-size */
.widget {
font-size: var(--global--font-size-base);
}
</style> </style>
</head> </head>
<body <?php body_class(); ?>> <body <?php body_class(); ?>>

8
wp-includes/blocks/navigation.php
View File

@ -284,14 +284,6 @@ function render_block_core_navigation( $attributes, $content, $block ) {
$inner_blocks = new WP_Block_List( $parsed_blocks, $attributes ); $inner_blocks = new WP_Block_List( $parsed_blocks, $attributes );
} }
if ( ! empty( $block->context['navigationArea'] ) ) {
$area = $block->context['navigationArea'];
$mapping = get_option( 'wp_navigation_areas', array() );
if ( ! empty( $mapping[ $area ] ) ) {
$attributes['ref'] = $mapping[ $area ];
}
}
// Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render. // Ensure that blocks saved with the legacy ref attribute name (navigationMenuId) continue to render.
if ( array_key_exists( 'navigationMenuId', $attributes ) ) { if ( array_key_exists( 'navigationMenuId', $attributes ) ) {
$attributes['ref'] = $attributes['navigationMenuId']; $attributes['ref'] = $attributes['navigationMenuId'];

1
wp-includes/blocks/navigation/style-rtl.css
View File

@ -122,6 +122,7 @@
line-height: 0; line-height: 0;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: inherit;
padding: 0; padding: 0;
background-color: inherit; background-color: inherit;
color: currentColor; color: currentColor;

2
wp-includes/blocks/navigation/style-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/blocks/navigation/style.css
View File

@ -122,6 +122,7 @@
line-height: 0; line-height: 0;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: inherit;
padding: 0; padding: 0;
background-color: inherit; background-color: inherit;
color: currentColor; color: currentColor;

2
wp-includes/blocks/navigation/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/blocks/query-pagination-next/block.json
View File

@ -17,7 +17,7 @@
"html": false, "html": false,
"color": { "color": {
"gradients": true, "gradients": true,
"link": true "text": false
}, },
"typography": { "typography": {
"fontSize": true, "fontSize": true,

2
wp-includes/blocks/query-pagination-previous/block.json
View File

@ -17,7 +17,7 @@
"html": false, "html": false,
"color": { "color": {
"gradients": true, "gradients": true,
"link": true "text": false
}, },
"typography": { "typography": {
"fontSize": true, "fontSize": true,

1
wp-includes/css/dist/block-library/style-rtl.css vendored
View File

@ -1534,6 +1534,7 @@ ul.has-background {
line-height: 0; line-height: 0;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: inherit;
padding: 0; padding: 0;
background-color: inherit; background-color: inherit;
color: currentColor; color: currentColor;

2
wp-includes/css/dist/block-library/style-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

1
wp-includes/css/dist/block-library/style.css vendored
View File

@ -1556,6 +1556,7 @@ ul.has-background {
line-height: 0; line-height: 0;
display: inline-block; display: inline-block;
vertical-align: middle; vertical-align: middle;
font-size: inherit;
padding: 0; padding: 0;
background-color: inherit; background-color: inherit;
color: currentColor; color: currentColor;

2
wp-includes/css/dist/block-library/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
wp-includes/css/dist/components/style-rtl.css vendored
View File

@ -890,6 +890,15 @@ input.components-combobox-control__input[type=text]:focus {
cursor: pointer; cursor: pointer;
} }
.components-dropdown__content.components-color-palette__custom-color-dropdown-content .components-popover__content {
overflow: visible;
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.05);
border: none;
}
.components-dropdown__content.components-color-palette__custom-color-dropdown-content .components-popover__content > div {
padding: 0;
}
.components-custom-gradient-picker__gradient-bar:not(.has-gradient) { .components-custom-gradient-picker__gradient-bar:not(.has-gradient) {
opacity: 0.4; opacity: 0.4;
} }

2
wp-includes/css/dist/components/style-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

9
wp-includes/css/dist/components/style.css vendored
View File

@ -890,6 +890,15 @@ input.components-combobox-control__input[type=text]:focus {
cursor: pointer; cursor: pointer;
} }
.components-dropdown__content.components-color-palette__custom-color-dropdown-content .components-popover__content {
overflow: visible;
box-shadow: 0 4px 4px rgba(0, 0, 0, 0.05);
border: none;
}
.components-dropdown__content.components-color-palette__custom-color-dropdown-content .components-popover__content > div {
padding: 0;
}
.components-custom-gradient-picker__gradient-bar:not(.has-gradient) { .components-custom-gradient-picker__gradient-bar:not(.has-gradient) {
opacity: 0.4; opacity: 0.4;
} }

2
wp-includes/css/dist/components/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-includes/css/dist/edit-site/style-rtl.css vendored
View File

@ -566,13 +566,13 @@ body.is-fullscreen-mode .interface-interface-skeleton {
margin-right: 0; margin-right: 0;
display: block; display: block;
border-radius: 50%; border-radius: 50%;
border: 0;
height: 24px; height: 24px;
width: 24px; width: 24px;
padding: 0; padding: 0;
background-image: repeating-linear-gradient(-45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0), repeating-linear-gradient(-45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0); background-image: repeating-linear-gradient(-45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0), repeating-linear-gradient(-45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0);
background-position: 100% 0, 25px 25px; background-position: 100% 0, 25px 25px;
background-size: calc(2 * 5px) calc(2 * 5px); background-size: calc(2 * 5px) calc(2 * 5px);
border: 1px solid #ddd;
} }
.edit-site-global-styles-header__description { .edit-site-global-styles-header__description {
@ -594,6 +594,14 @@ body.is-fullscreen-mode .interface-interface-skeleton {
min-height: 32px; min-height: 32px;
} }
h2.edit-site-global-styles-gradient-palette-panel__duotone-heading.components-heading {
text-transform: uppercase;
line-height: 24px;
font-weight: 500;
font-size: 11px;
margin-bottom: 8px;
}
.edit-site-header { .edit-site-header {
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;

2
wp-includes/css/dist/edit-site/style-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

10
wp-includes/css/dist/edit-site/style.css vendored
View File

@ -566,13 +566,13 @@ body.is-fullscreen-mode .interface-interface-skeleton {
margin-left: 0; margin-left: 0;
display: block; display: block;
border-radius: 50%; border-radius: 50%;
border: 0;
height: 24px; height: 24px;
width: 24px; width: 24px;
padding: 0; padding: 0;
background-image: repeating-linear-gradient(45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0), repeating-linear-gradient(45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0); background-image: repeating-linear-gradient(45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0), repeating-linear-gradient(45deg, #e0e0e0 25%, transparent 25%, transparent 75%, #e0e0e0 75%, #e0e0e0);
background-position: 0 0, 25px 25px; background-position: 0 0, 25px 25px;
background-size: calc(2 * 5px) calc(2 * 5px); background-size: calc(2 * 5px) calc(2 * 5px);
border: 1px solid #ddd;
} }
.edit-site-global-styles-header__description { .edit-site-global-styles-header__description {
@ -594,6 +594,14 @@ body.is-fullscreen-mode .interface-interface-skeleton {
min-height: 32px; min-height: 32px;
} }
h2.edit-site-global-styles-gradient-palette-panel__duotone-heading.components-heading {
text-transform: uppercase;
line-height: 24px;
font-weight: 500;
font-size: 11px;
margin-bottom: 8px;
}
.edit-site-header { .edit-site-header {
align-items: center; align-items: center;
background-color: #fff; background-color: #fff;

2
wp-includes/css/dist/edit-site/style.min.css vendored
View File

File diff suppressed because one or more lines are too long

228
wp-includes/js/dist/block-editor.js vendored
View File

@ -2420,6 +2420,105 @@ function JustifyToolbar(props) {
} }
/***/ }),
/***/ "0LBR":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return useMultipleOriginColorsAndGradients; });
/* harmony import */ var _wordpress_element__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("GRId");
/* harmony import */ var _wordpress_element__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__);
/* harmony import */ var _wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__("l3Sj");
/* harmony import */ var _wordpress_i18n__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__);
/* harmony import */ var _use_setting__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__("v5LD");
/* harmony import */ var _use_common_single_multiple_selects__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__("pY5h");
/**
* WordPress dependencies
*/
/**
* Internal dependencies
*/
/**
* Retrieves color and gradient related settings.
*
* The arrays for colors and gradients are made up of color palettes from each
* origin i.e. "Core", "Theme", and "User".
*
* @return {Object} Color and gradient related settings.
*/
function useMultipleOriginColorsAndGradients() {
const colorGradientSettings = Object(_use_common_single_multiple_selects__WEBPACK_IMPORTED_MODULE_3__[/* default */ "a"])();
const customColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.palette.custom');
const themeColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.palette.theme');
const defaultColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.palette.default');
const shouldDisplayDefaultColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.defaultPalette');
colorGradientSettings.colors = Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__["useMemo"])(() => {
const result = [];
if (themeColors && themeColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Theme', 'Indicates this palette comes from the theme.'),
colors: themeColors
});
}
if (shouldDisplayDefaultColors && defaultColors && defaultColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Default', 'Indicates this palette comes from WordPress.'),
colors: defaultColors
});
}
if (customColors && customColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Custom', 'Indicates this palette comes from the theme.'),
colors: customColors
});
}
return result;
}, [defaultColors, themeColors, customColors]);
const customGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.gradients.custom');
const themeGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.gradients.theme');
const defaultGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.gradients.default');
const shouldDisplayDefaultGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_2__[/* default */ "a"])('color.defaultGradients');
colorGradientSettings.gradients = Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_0__["useMemo"])(() => {
const result = [];
if (themeGradients && themeGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Theme', 'Indicates this palette comes from the theme.'),
gradients: themeGradients
});
}
if (shouldDisplayDefaultGradients && defaultGradients && defaultGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Default', 'Indicates this palette comes from WordPress.'),
gradients: defaultGradients
});
}
if (customGradients && customGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_1__["_x"])('Custom', 'Indicates this palette is created by the user.'),
gradients: customGradients
});
}
return result;
}, [customGradients, themeGradients, defaultGradients]);
return colorGradientSettings;
}
/***/ }), /***/ }),
/***/ "14PQ": /***/ "14PQ":
@ -39681,6 +39780,26 @@ BlockSettingsMenuControls.Slot = BlockSettingsMenuControlsSlot;
/* harmony default export */ var block_settings_menu_controls = __webpack_exports__["a"] = (BlockSettingsMenuControls); /* harmony default export */ var block_settings_menu_controls = __webpack_exports__["a"] = (BlockSettingsMenuControls);
/***/ }),
/***/ "pY5h":
/***/ (function(module, __webpack_exports__, __webpack_require__) {
"use strict";
/* harmony export (binding) */ __webpack_require__.d(__webpack_exports__, "a", function() { return useCommonSingleMultipleSelects; });
/* harmony import */ var _use_setting__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__("v5LD");
/**
* Internal dependencies
*/
function useCommonSingleMultipleSelects() {
return {
disableCustomColors: !Object(_use_setting__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])('color.custom'),
disableCustomGradients: !Object(_use_setting__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])('color.customGradient')
};
}
/***/ }), /***/ }),
/***/ "plpT": /***/ "plpT":
@ -41396,6 +41515,9 @@ var use_setting = __webpack_require__("v5LD");
// EXTERNAL MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors-gradients/control.js // EXTERNAL MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors-gradients/control.js
var control = __webpack_require__("hMaJ"); var control = __webpack_require__("hMaJ");
// EXTERNAL MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors-gradients/use-multiple-origin-colors-and-gradients.js
var use_multiple_origin_colors_and_gradients = __webpack_require__("0LBR");
// EXTERNAL MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors/utils.js // EXTERNAL MODULE: ./node_modules/@wordpress/block-editor/build-module/components/colors/utils.js
var utils = __webpack_require__("bVpQ"); var utils = __webpack_require__("bVpQ");
@ -41426,6 +41548,7 @@ var hooks_utils = __webpack_require__("715p");
// Defining empty array here instead of inline avoids unnecessary re-renders of // Defining empty array here instead of inline avoids unnecessary re-renders of
// color control. // color control.
@ -41452,18 +41575,17 @@ function BorderColorEdit(props) {
}, },
setAttributes setAttributes
} = props; } = props;
const colors = Object(use_setting["a" /* default */])('color.palette') || EMPTY_ARRAY; const colorGradientSettings = Object(use_multiple_origin_colors_and_gradients["a" /* default */])();
const disableCustomColors = !Object(use_setting["a" /* default */])('color.custom'); const availableColors = colorGradientSettings.colors.reduce((colors, origin) => colors.concat(origin.colors), []);
const disableCustomGradients = !Object(use_setting["a" /* default */])('color.customGradient');
const [colorValue, setColorValue] = Object(external_wp_element_["useState"])(() => { const [colorValue, setColorValue] = Object(external_wp_element_["useState"])(() => {
var _getColorObjectByAttr, _style$border; var _getColorObjectByAttr, _style$border;
return (_getColorObjectByAttr = Object(utils["b" /* getColorObjectByAttributeValues */])(colors, borderColor, style === null || style === void 0 ? void 0 : (_style$border = style.border) === null || _style$border === void 0 ? void 0 : _style$border.color)) === null || _getColorObjectByAttr === void 0 ? void 0 : _getColorObjectByAttr.color; return (_getColorObjectByAttr = Object(utils["b" /* getColorObjectByAttributeValues */])(availableColors, borderColor, style === null || style === void 0 ? void 0 : (_style$border = style.border) === null || _style$border === void 0 ? void 0 : _style$border.color)) === null || _getColorObjectByAttr === void 0 ? void 0 : _getColorObjectByAttr.color;
}); });
const onChangeColor = value => { const onChangeColor = value => {
setColorValue(value); setColorValue(value);
const colorObject = Object(utils["c" /* getColorObjectByColorValue */])(colors, value); const colorObject = Object(utils["c" /* getColorObjectByColorValue */])(availableColors, value);
const newStyle = { ...style, const newStyle = { ...style,
border: { ...(style === null || style === void 0 ? void 0 : style.border), border: { ...(style === null || style === void 0 ? void 0 : style.border),
color: colorObject !== null && colorObject !== void 0 && colorObject.slug ? undefined : value color: colorObject !== null && colorObject !== void 0 && colorObject.slug ? undefined : value
@ -41477,15 +41599,13 @@ function BorderColorEdit(props) {
}); });
}; };
return Object(external_wp_element_["createElement"])(control["a" /* default */], { return Object(external_wp_element_["createElement"])(control["a" /* default */], Object(esm_extends["a" /* default */])({
label: Object(external_wp_i18n_["__"])('Color'), label: Object(external_wp_i18n_["__"])('Color'),
colorValue: colorValue, colorValue: colorValue,
colors: colors, onColorChange: onChangeColor,
gradients: undefined, clearable: false,
disableCustomColors: disableCustomColors, __experimentalHasMultipleOrigins: true
disableCustomGradients: disableCustomGradients, }, colorGradientSettings));
onColorChange: onChangeColor
});
} }
/** /**
* Filters registered block settings, extending attributes to include * Filters registered block settings, extending attributes to include
@ -47842,7 +47962,8 @@ function BlockSelectionButton(_ref) {
getSelectedBlockClientId, getSelectedBlockClientId,
getMultiSelectedBlocksEndClientId, getMultiSelectedBlocksEndClientId,
getPreviousBlockClientId, getPreviousBlockClientId,
getNextBlockClientId getNextBlockClientId,
isNavigationMode
} = Object(external_wp_data_["useSelect"])(store["a" /* store */]); } = Object(external_wp_data_["useSelect"])(store["a" /* store */]);
const { const {
selectBlock, selectBlock,
@ -47899,6 +48020,11 @@ function BlockSelectionButton(_ref) {
const startingBlockClientId = hasBlockMovingClientId(); const startingBlockClientId = hasBlockMovingClientId();
if (isEscape && isNavigationMode()) {
clearSelectedBlock();
event.preventDefault();
}
if (isEscape && startingBlockClientId && !event.defaultPrevented) { if (isEscape && startingBlockClientId && !event.defaultPrevented) {
setBlockMovingClientId(null); setBlockMovingClientId(null);
event.preventDefault(); event.preventDefault();
@ -49421,6 +49547,8 @@ function InserterListboxGroup(props, ref) {
/* harmony import */ var _colors__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("bVpQ"); /* harmony import */ var _colors__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__("bVpQ");
/* harmony import */ var _gradients__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("Cn0l"); /* harmony import */ var _gradients__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__("Cn0l");
/* harmony import */ var _use_setting__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("v5LD"); /* harmony import */ var _use_setting__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__("v5LD");
/* harmony import */ var _use_common_single_multiple_selects__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__("pY5h");
/* harmony import */ var _use_multiple_origin_colors_and_gradients__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__("0LBR");
@ -49435,7 +49563,6 @@ function InserterListboxGroup(props, ref) {
/** /**
* Internal dependencies * Internal dependencies
*/ */
@ -49443,6 +49570,8 @@ function InserterListboxGroup(props, ref) {
// translators: first %s: The type of color or gradient (e.g. background, overlay...), second %s: the color name or value (e.g. red or #ff0000) // translators: first %s: The type of color or gradient (e.g. background, overlay...), second %s: the color name or value (e.g. red or #ff0000)
const colorIndicatorAriaLabel = Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["__"])('(%s: color %s)'); // translators: first %s: The type of color or gradient (e.g. background, overlay...), second %s: the color name or value (e.g. red or #ff0000) const colorIndicatorAriaLabel = Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["__"])('(%s: color %s)'); // translators: first %s: The type of color or gradient (e.g. background, overlay...), second %s: the color name or value (e.g. red or #ff0000)
@ -49532,82 +49661,15 @@ const PanelColorGradientSettingsInner = _ref3 => {
}, setting))), children); }, setting))), children);
}; };
function useCommonSingleMultipleSelects() {
return {
disableCustomColors: !Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.custom'),
disableCustomGradients: !Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.customGradient')
};
}
const PanelColorGradientSettingsSingleSelect = props => { const PanelColorGradientSettingsSingleSelect = props => {
const colorGradientSettings = useCommonSingleMultipleSelects(); const colorGradientSettings = Object(_use_common_single_multiple_selects__WEBPACK_IMPORTED_MODULE_10__[/* default */ "a"])();
colorGradientSettings.colors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.palette'); colorGradientSettings.colors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.palette');
colorGradientSettings.gradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.gradients'); colorGradientSettings.gradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.gradients');
return Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["createElement"])(PanelColorGradientSettingsInner, Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])({}, colorGradientSettings, props)); return Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["createElement"])(PanelColorGradientSettingsInner, Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])({}, colorGradientSettings, props));
}; };
const PanelColorGradientSettingsMultipleSelect = props => { const PanelColorGradientSettingsMultipleSelect = props => {
const colorGradientSettings = useCommonSingleMultipleSelects(); const colorGradientSettings = Object(_use_multiple_origin_colors_and_gradients__WEBPACK_IMPORTED_MODULE_11__[/* default */ "a"])();
const customColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.palette.custom');
const themeColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.palette.theme');
const defaultColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.palette.default');
const shouldDisplayDefaultColors = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.defaultPalette');
colorGradientSettings.colors = Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["useMemo"])(() => {
const result = [];
if (themeColors && themeColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Theme', 'Indicates this palette comes from the theme.'),
colors: themeColors
});
}
if (shouldDisplayDefaultColors && defaultColors && defaultColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Default', 'Indicates this palette comes from WordPress.'),
colors: defaultColors
});
}
if (customColors && customColors.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Custom', 'Indicates this palette comes from the theme.'),
colors: customColors
});
}
return result;
}, [defaultColors, themeColors, customColors]);
const customGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.gradients.custom');
const themeGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.gradients.theme');
const defaultGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.gradients.default');
const shouldDisplayDefaultGradients = Object(_use_setting__WEBPACK_IMPORTED_MODULE_9__[/* default */ "a"])('color.defaultGradients');
colorGradientSettings.gradients = Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["useMemo"])(() => {
const result = [];
if (themeGradients && themeGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Theme', 'Indicates this palette comes from the theme.'),
gradients: themeGradients
});
}
if (shouldDisplayDefaultGradients && defaultGradients && defaultGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Default', 'Indicates this palette comes from WordPress.'),
gradients: defaultGradients
});
}
if (customGradients && customGradients.length) {
result.push({
name: Object(_wordpress_i18n__WEBPACK_IMPORTED_MODULE_5__["_x"])('Custom', 'Indicates this palette is created by the user.'),
gradients: customGradients
});
}
return result;
}, [customGradients, themeGradients, defaultGradients]);
return Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["createElement"])(PanelColorGradientSettingsInner, Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])({}, colorGradientSettings, props)); return Object(_wordpress_element__WEBPACK_IMPORTED_MODULE_1__["createElement"])(PanelColorGradientSettingsInner, Object(_babel_runtime_helpers_esm_extends__WEBPACK_IMPORTED_MODULE_0__[/* default */ "a"])({}, colorGradientSettings, props));
}; };

4
wp-includes/js/dist/block-editor.min.js vendored
View File

File diff suppressed because one or more lines are too long

20
wp-includes/js/dist/block-library.js vendored
View File

@ -22120,21 +22120,23 @@ const deprecated_migrateWithLayout = attributes => {
const { const {
itemsJustification, itemsJustification,
orientation orientation,
...updatedAttributes
} = attributes; } = attributes;
const updatedAttributes = { ...attributes
};
if (itemsJustification || orientation) { if (itemsJustification || orientation) {
Object.assign(updatedAttributes, { Object.assign(updatedAttributes, {
layout: { layout: {
type: 'flex', type: 'flex',
justifyContent: itemsJustification || 'left', setCascadingProperties: 'true',
orientation: orientation || 'horizontal' ...(itemsJustification && {
justifyContent: itemsJustification
}),
...(orientation && {
orientation
})
} }
}); });
delete updatedAttributes.itemsJustification;
delete updatedAttributes.orientation;
} }
return updatedAttributes; return updatedAttributes;
@ -30882,7 +30884,7 @@ const query_pagination_next_metadata = {
html: false, html: false,
color: { color: {
gradients: true, gradients: true,
link: true text: false
}, },
typography: { typography: {
fontSize: true, fontSize: true,
@ -31093,7 +31095,7 @@ const query_pagination_previous_metadata = {
html: false, html: false,
color: { color: {
gradients: true, gradients: true,
link: true text: false
}, },
typography: { typography: {
fontSize: true, fontSize: true,

2
wp-includes/js/dist/block-library.min.js vendored
View File

File diff suppressed because one or more lines are too long

4
wp-includes/js/dist/components.js vendored
View File

@ -41033,6 +41033,7 @@ function ColorPalette(_ref5) {
spacing: 3, spacing: 3,
className: className className: className
}, !disableCustomColors && Object(external_wp_element_["createElement"])(Dropdown, { }, !disableCustomColors && Object(external_wp_element_["createElement"])(Dropdown, {
contentClassName: "components-color-palette__custom-color-dropdown-content",
renderContent: renderCustomColorPicker, renderContent: renderCustomColorPicker,
renderToggle: _ref6 => { renderToggle: _ref6 => {
let { let {
@ -48712,6 +48713,7 @@ function CustomDuotoneBar(_ref) {
function DuotonePicker(_ref) { function DuotonePicker(_ref) {
let { let {
clearable = true,
colorPalette, colorPalette,
duotonePalette, duotonePalette,
disableCustomColors, disableCustomColors,
@ -48748,7 +48750,7 @@ function DuotonePicker(_ref) {
} }
}); });
}), }),
actions: Object(external_wp_element_["createElement"])(CircularOptionPicker.ButtonAction, { actions: !!clearable && Object(external_wp_element_["createElement"])(CircularOptionPicker.ButtonAction, {
onClick: () => onChange(undefined) onClick: () => onChange(undefined)
}, Object(external_wp_i18n_["__"])('Clear')) }, Object(external_wp_i18n_["__"])('Clear'))
}, !disableCustomColors && !disableCustomDuotone && Object(external_wp_element_["createElement"])(CustomDuotoneBar, { }, !disableCustomColors && !disableCustomDuotone && Object(external_wp_element_["createElement"])(CustomDuotoneBar, {

2
wp-includes/js/dist/components.min.js vendored
View File

File diff suppressed because one or more lines are too long

45
wp-includes/js/dist/edit-site.js vendored
View File

@ -2286,6 +2286,30 @@ function TemplateAreas(_ref4) {
})); }));
} }
// CONCATENATED MODULE: ./node_modules/@wordpress/edit-site/build-module/components/template-details/edit-template-title.js
/**
* WordPress dependencies
*/
function EditTemplateTitle(_ref) {
let {
template
} = _ref;
const [title, setTitle] = Object(external_wp_coreData_["useEntityProp"])('postType', template.type, 'title', template.id);
return Object(external_wp_element_["createElement"])(external_wp_components_["TextControl"], {
label: Object(external_wp_i18n_["__"])('Title'),
value: title,
help: Object(external_wp_i18n_["__"])('Give the template a title that indicates its purpose, e.g. "Full Width".'),
onChange: newTitle => {
setTitle(newTitle || template.slug);
}
});
}
// CONCATENATED MODULE: ./node_modules/@wordpress/edit-site/build-module/components/template-details/index.js // CONCATENATED MODULE: ./node_modules/@wordpress/edit-site/build-module/components/template-details/index.js
@ -2306,6 +2330,7 @@ function TemplateAreas(_ref4) {
function TemplateDetails(_ref) { function TemplateDetails(_ref) {
let { let {
template, template,
@ -2347,7 +2372,9 @@ function TemplateDetails(_ref) {
className: "edit-site-template-details" className: "edit-site-template-details"
}, Object(external_wp_element_["createElement"])("div", { }, Object(external_wp_element_["createElement"])("div", {
className: "edit-site-template-details__group" className: "edit-site-template-details__group"
}, Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalHeading"], { }, template.is_custom ? Object(external_wp_element_["createElement"])(EditTemplateTitle, {
template: template
}) : Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalHeading"], {
level: 4, level: 4,
weight: 600, weight: 600,
className: "edit-site-template-details__title" className: "edit-site-template-details__title"
@ -4102,11 +4129,16 @@ function ColorPalettePanel(_ref) {
// CONCATENATED MODULE: ./node_modules/@wordpress/edit-site/build-module/components/global-styles/gradients-palette-panel.js // CONCATENATED MODULE: ./node_modules/@wordpress/edit-site/build-module/components/global-styles/gradients-palette-panel.js
/**
* External dependencies
*/
/** /**
* WordPress dependencies * WordPress dependencies
*/ */
/** /**
* Internal dependencies * Internal dependencies
*/ */
@ -4122,10 +4154,19 @@ function GradientPalettePanel(_ref) {
const [baseDefaultGradients] = useSetting('color.gradients.default', name, 'base'); const [baseDefaultGradients] = useSetting('color.gradients.default', name, 'base');
const [customGradients, setCustomGradients] = useSetting('color.gradients.custom', name); const [customGradients, setCustomGradients] = useSetting('color.gradients.custom', name);
const [defaultPaletteEnabled] = useSetting('color.defaultGradients', name); const [defaultPaletteEnabled] = useSetting('color.defaultGradients', name);
const [duotonePalette] = useSetting('color.duotone') || [];
return Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalVStack"], { return Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalVStack"], {
className: "edit-site-global-styles-gradient-palette-panel", className: "edit-site-global-styles-gradient-palette-panel",
spacing: 10 spacing: 10
}, !!themeGradients && !!themeGradients.length && Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalPaletteEdit"], { }, Object(external_wp_element_["createElement"])("div", null, Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalHeading"], {
className: "edit-site-global-styles-gradient-palette-panel__duotone-heading"
}, Object(external_wp_i18n_["__"])('Duotone')), Object(external_wp_element_["createElement"])(external_wp_components_["DuotonePicker"], {
duotonePalette: duotonePalette,
disableCustomDuotone: true,
disableCustomColors: true,
clearable: false,
onChange: external_lodash_["noop"]
})), !!themeGradients && !!themeGradients.length && Object(external_wp_element_["createElement"])(external_wp_components_["__experimentalPaletteEdit"], {
canReset: themeGradients !== baseThemeGradients, canReset: themeGradients !== baseThemeGradients,
canOnlyChangeValues: true, canOnlyChangeValues: true,
gradients: themeGradients, gradients: themeGradients,

2
wp-includes/js/dist/edit-site.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.9-alpha-52276'; $wp_version = '5.9-alpha-52277';
/** /**
* 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.