← All changes | lib/class-wp-theme-json-gutenberg.php +76 -17 24.0.0 → trunk View file →

		@@ -124,8 +124,9 @@
124	124	* `prevent_override` value for `color.duotone` to use `color.defaultDuotone`.
125	125	* @since 6.2.0 Added 'shadow' presets.
126	126	* @since 6.6.0 Updated the 'prevent_override' value for font size presets to use 'typography.defaultFontSizes' and spacing size presets to use `spacing.defaultSpacingSizes`.
127	127	* @since 6.6.0 Added `aspectRatios`.
	128	+ * @since 7.2.0 Added 'textShadow' presets.
128	129	* @var array
129	130	*/
130	131	const PRESETS_METADATA = array(
131	132	array(
		@@ -186,8 +187,17 @@
186	187	'classes' => array( '.has-$slug-font-family' => 'font-family' ),
187	188	'properties' => array( 'font-family' ),
188	189	),
189	190	array(
	191	+ 'path' => array( 'typography', 'textShadowPresets' ),
	192	+ 'prevent_override' => array( 'typography', 'defaultTextShadowPresets' ),
	193	+ 'use_default_names' => false,
	194	+ 'value_key' => 'textShadow',
	195	+ 'css_vars' => '--wp--preset--text-shadow--$slug',
	196	+ 'classes' => array( '.has-$slug-text-shadow' => 'text-shadow' ),
	197	+ 'properties' => array( 'text-shadow' ),
	198	+ ),
	199	+ array(
190	200	'path' => array( 'spacing', 'spacingSizes' ),
191	201	'prevent_override' => array( 'spacing', 'defaultSpacingSizes' ),
192	202	'use_default_names' => true,
193	203	'value_key' => 'size',
		@@ -392,8 +402,10 @@
392	402	* @since 7.0.0 Added type markers to the schema for boolean values.
393	403	* @since 7.0.0 Added `dimensions.width`, `dimensions.height`, and
394	404	* `typography.textIndent` properties.
395	405	* @since 7.1.0 Added `viewport` property.
	406	+ * @since 7.2.0 Added `typography.textShadow`, `typography.textShadowPresets`,
	407	+ * and `typography.defaultTextShadowPresets`.
396	408	* @var array
397	409	*/
398	410	const VALID_SETTINGS = array(
399	411	'appearanceTools' => null,
		@@ -469,24 +481,27 @@
469	481	'presets' => null,
470	482	'defaultPresets' => null,
471	483	),
472	484	'typography' => array(
473		- 'fluid' => null,
474		- 'customFontSize' => null,
475		- 'defaultFontSizes' => null,
476		- 'dropCap' => null,
477		- 'fontFamilies' => null,
478		- 'fontSizes' => null,
479		- 'fontStyle' => null,
480		- 'fontWeight' => null,
481		- 'letterSpacing' => null,
482		- 'lineHeight' => null,
483		- 'textAlign' => null,
484		- 'textColumns' => null,
485		- 'textDecoration' => null,
486		- 'textIndent' => null,
487		- 'textTransform' => null,
488		- 'writingMode' => null,
	485	+ 'fluid' => null,
	486	+ 'customFontSize' => null,
	487	+ 'defaultFontSizes' => null,
	488	+ 'dropCap' => null,
	489	+ 'fontFamilies' => null,
	490	+ 'fontSizes' => null,
	491	+ 'fontStyle' => null,
	492	+ 'fontWeight' => null,
	493	+ 'letterSpacing' => null,
	494	+ 'lineHeight' => null,
	495	+ 'textAlign' => null,
	496	+ 'textColumns' => null,
	497	+ 'textDecoration' => null,
	498	+ 'textIndent' => null,
	499	+ 'textTransform' => null,
	500	+ 'textShadow' => null,
	501	+ 'defaultTextShadowPresets' => null,
	502	+ 'textShadowPresets' => null,
	503	+ 'writingMode' => null,
489	504	),
490	505	'viewport' => array(
491	506	'mobile' => null,
492	507	'tablet' => null,
		@@ -916,8 +931,10 @@
916	931
917	932	/**
918	933	* Processes pseudo-selectors for any node (block or variation).
919	934	*
	935	+ * @since 7.0.0
	936	+ *
920	937	* @param array $node The node data (block or variation).
921	938	* @param string $base_selector The base selector.
922	939	* @param array $settings The theme settings.
923	940	* @param string $block_name The block name.
		@@ -1230,8 +1247,10 @@
1230	1247	*
1231	1248	* @since 5.8.0
1232	1249	* @since 5.9.0 Added the `$valid_block_names` and `$valid_element_name` parameters.
1233	1250	* @since 6.6.0 Extended schema definition to allow enhanced block style variations.
	1251	+ * @since 7.1.1 Updated schema to allow responsive breakpoint states and pseudo-selectors
	1252	+ * at the top level of `styles` for block style variation partials.
1234	1253	*
1235	1254	* @param array $input Structure to sanitize.
1236	1255	* @param array $valid_block_names List of valid block names.
1237	1256	* @param array $valid_element_names List of valid element names.
		@@ -1390,9 +1409,8 @@
1390	1409	// Add responsive breakpoint states to block style variations.
1391	1410	foreach ( array_keys( $responsive_media_queries ) as $breakpoint_state ) {
1392	1411	$variation_schema[ $breakpoint_state ] = $styles_non_top_level;
1393	1412	$variation_schema[ $breakpoint_state ]['elements'] = $schema_styles_elements;
1394		- $variation_schema[ $breakpoint_state ]['blocks'] = $schema_styles_blocks;
1395	1413
1396	1414	if ( isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $block ] ) ) {
1397	1415	foreach ( static::VALID_BLOCK_PSEUDO_SELECTORS[ $block ] as $pseudo_selector ) {
1398	1416	$variation_schema[ $breakpoint_state ][ $pseudo_selector ] = $styles_non_top_level;
		@@ -1419,8 +1437,49 @@
1419	1437	$schema['styles']['elements'] = $schema_styles_elements;
1420	1438	$schema['settings'] = static::VALID_SETTINGS;
1421	1439	$schema['settings']['blocks'] = $schema_settings_blocks;
1422	1440	$schema['settings']['typography']['fontFamilies'] = static::schema_in_root_and_per_origin( static::FONT_FAMILY_SCHEMA );
	1441	+
	1442	+ /*
	1443	+ * Add block style variation states to the top-level styles schema.
	1444	+ *
	1445	+ * Block style variations defined in a standalone JSON partial within a
	1446	+ * theme's `styles` directory declare their styles at the root of the
	1447	+ * `styles` object, so they are sanitized against the top-level schema.
	1448	+ * It needs to allow the same states that are allowed for variations
	1449	+ * declared inline in theme.json, otherwise those states are silently
	1450	+ * removed as unknown keys.
	1451	+ *
	1452	+ * The `blockTypes` property is only present on block style variation
	1453	+ * partials, so it both identifies the config as a variation and
	1454	+ * determines which pseudo-selectors are valid for it. Regular
	1455	+ * theme.json files are unaffected.
	1456	+ */
	1457	+ if ( ! empty( $input['blockTypes'] ) && is_array( $input['blockTypes'] ) ) {
	1458	+ $variation_pseudo_selectors = array();
	1459	+ foreach ( $input['blockTypes'] as $variation_block_type ) {
	1460	+ if ( isset( static::VALID_BLOCK_PSEUDO_SELECTORS[ $variation_block_type ] ) ) {
	1461	+ $variation_pseudo_selectors = array_merge(
	1462	+ $variation_pseudo_selectors,
	1463	+ static::VALID_BLOCK_PSEUDO_SELECTORS[ $variation_block_type ]
	1464	+ );
	1465	+ }
	1466	+ }
	1467	+ $variation_pseudo_selectors = array_unique( $variation_pseudo_selectors );
	1468	+
	1469	+ foreach ( $breakpoint_states as $breakpoint_state ) {
	1470	+ $schema['styles'][ $breakpoint_state ] = $styles_non_top_level;
	1471	+ $schema['styles'][ $breakpoint_state ]['elements'] = $schema_styles_elements;
	1472	+
	1473	+ foreach ( $variation_pseudo_selectors as $pseudo_selector ) {
	1474	+ $schema['styles'][ $breakpoint_state ][ $pseudo_selector ] = $styles_non_top_level;
	1475	+ }
	1476	+ }
	1477	+
	1478	+ foreach ( $variation_pseudo_selectors as $pseudo_selector ) {
	1479	+ $schema['styles'][ $pseudo_selector ] = $styles_non_top_level;
	1480	+ }
	1481	+ }
1423	1482
1424	1483	// Remove anything that's not present in the schema.
1425	1484	foreach ( array( 'styles', 'settings' ) as $subtree ) {
1426	1485	if ( ! isset( $input[ $subtree ] ) ) {