<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[57885] trunk: Editor: disable `shadow.defaultPresets` for classic themes.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/57885">57885</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/57885","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>swissspidy</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-03-27 15:58:46 +0000 (Wed, 27 Mar 2024)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Editor: disable `shadow.defaultPresets` for classic themes.
With this change default shadow presets are never shown for classic themes, and classic themes have no options for adding custom ones.
This essentially reverts <a href="https://core.trac.wordpress.org/changeset/57717">[57717]</a> and <a href="https://core.trac.wordpress.org/changeset/57827">[57827]</a> / <a href="https://core.trac.wordpress.org/changeset/57828">[57828]</a>, which had unintended consequences.
Props ajlende, oandregal, madhudollu, swissspidy, get_dave, andrewserong, desrosj.
Fixes <a href="https://core.trac.wordpress.org/ticket/60815">#60815</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesclasswpthemejsonresolverphp">trunk/src/wp-includes/class-wp-theme-json-resolver.php</a></li>
<li><a href="#trunksrcwpincludesclasswpthemejsonphp">trunk/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#trunksrcwpincludesthemejson">trunk/src/wp-includes/theme.json</a></li>
<li><a href="#trunktestsphpunitdatathemedir1blockthemethemejson">trunk/tests/phpunit/data/themedir1/block-theme/theme.json</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonphp">trunk/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpThemeJsonResolverphp">trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesclasswpthemejsonresolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json-resolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json-resolver.php 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/src/wp-includes/class-wp-theme-json-resolver.php 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -312,6 +312,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $theme_support_data['settings']['shadow'] ) ) {
+ $theme_support_data['settings']['shadow'] = array();
+ }
+ /*
+ * Shadow presets are explicitly disabled for classic themes until a
+ * decision is made for whether the default presets should match the
+ * other presets or if they should be disabled by default in classic
+ * themes. See https://github.com/WordPress/gutenberg/issues/59989.
+ */
+ $theme_support_data['settings']['shadow']['defaultPresets'] = false;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Allow themes to enable link color setting via theme_support.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( current_theme_supports( 'link-color' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_support_data['settings']['color']['link'] = true;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-theme-json.php 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -658,7 +658,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added `dimensions.minHeight` and `position.sticky`.
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.4.0 Added `background.backgroundImage`.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 6.5.0 Added `background.backgroundSize`, `dimensions.aspectRatio`, and `shadow.defaultPresets`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.5.0 Added `background.backgroundSize` and `dimensions.aspectRatio`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @var array
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> const APPEARANCE_TOOLS_OPT_INS = array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -679,7 +679,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'spacing', 'margin' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'spacing', 'padding' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'typography', 'lineHeight' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- array( 'shadow', 'defaultPresets' ),
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span></span></pre></div>
<a id="trunksrcwpincludesthemejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme.json 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/src/wp-includes/theme.json 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -191,7 +191,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "text": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "shadow": {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "defaultPresets": false,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "defaultPresets": true,
</ins><span class="cx" style="display: block; padding: 0 10px"> "presets": [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "Natural",
</span></span></pre></div>
<a id="trunktestsphpunitdatathemedir1blockthemethemejson"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/data/themedir1/block-theme/theme.json</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/data/themedir1/block-theme/theme.json 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/tests/phpunit/data/themedir1/block-theme/theme.json 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -49,6 +49,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "padding": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "blockGap": true
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "shadow": {
+ "presets": [
+ {
+ "name": "Natural",
+ "slug": "natural",
+ "shadow": "2px 2px 3px #000"
+ },
+ {
+ "name": "Test",
+ "slug": "test",
+ "shadow": "2px 2px 3px #000"
+ }
+ ]
+ },
</ins><span class="cx" style="display: block; padding: 0 10px"> "blocks": {
</span><span class="cx" style="display: block; padding: 0 10px"> "core/paragraph": {
</span><span class="cx" style="display: block; padding: 0 10px"> "color": {
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/wpThemeJson.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJson.php 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/tests/phpunit/tests/theme/wpThemeJson.php 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -293,9 +293,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'typography' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lineHeight' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'shadow' => array(
- 'defaultPresets' => true,
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> 'blocks' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/paragraph' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'typography' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,9 +331,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'typography' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'lineHeight' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'shadow' => array(
- 'defaultPresets' => true,
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunktestsphpunitteststhemewpThemeJsonResolverphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2024-03-27 15:34:22 UTC (rev 57884)
+++ trunk/tests/phpunit/tests/theme/wpThemeJsonResolver.php 2024-03-27 15:58:46 UTC (rev 57885)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -201,6 +201,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'padding' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'blockGap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'shadow' => array(
+ 'presets' => array(
+ 'theme' => array(
+ array(
+ 'name' => 'Natural',
+ 'slug' => 'natural',
+ 'shadow' => '2px 2px 3px #000',
+ ),
+ array(
+ 'name' => 'Test',
+ 'slug' => 'test',
+ 'shadow' => '2px 2px 3px #000',
+ ),
+ ),
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'blocks' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'core/paragraph' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -559,6 +575,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'shadow' => array(
+ 'presets' => array(
+ 'theme' => array(
+ array(
+ 'name' => 'Natural',
+ 'slug' => 'natural',
+ 'shadow' => '2px 2px 3px #000',
+ ),
+ array(
+ 'name' => 'Test',
+ 'slug' => 'test',
+ 'shadow' => '2px 2px 3px #000',
+ ),
+ ),
+ ),
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'spacing' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'blockGap' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'units' => array( 'rem' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1070,4 +1102,78 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $actual_settings
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /**
+ * @ticket 60815
+ */
+ public function test_theme_shadow_presets_do_not_override_default_shadow_presets() {
+ switch_theme( 'block-theme' );
+
+ $theme_json_resolver = new WP_Theme_JSON_Resolver();
+ $theme_json = $theme_json_resolver->get_merged_data();
+ $actual_settings = $theme_json->get_settings()['shadow']['presets'];
+
+ $expected_settings = array(
+ 'default' => array(
+ array(
+ 'name' => 'Natural',
+ 'shadow' => '6px 6px 9px rgba(0, 0, 0, 0.2)',
+ 'slug' => 'natural',
+ ),
+ array(
+ 'name' => 'Deep',
+ 'shadow' => '12px 12px 50px rgba(0, 0, 0, 0.4)',
+ 'slug' => 'deep',
+ ),
+ array(
+ 'name' => 'Sharp',
+ 'shadow' => '6px 6px 0px rgba(0, 0, 0, 0.2)',
+ 'slug' => 'sharp',
+ ),
+ array(
+ 'name' => 'Outlined',
+ 'shadow' => '6px 6px 0px -3px rgba(255, 255, 255, 1), 6px 6px rgba(0, 0, 0, 1)',
+ 'slug' => 'outlined',
+ ),
+ array(
+ 'name' => 'Crisp',
+ 'shadow' => '6px 6px 0px rgba(0, 0, 0, 1)',
+ 'slug' => 'crisp',
+ ),
+ ),
+ 'theme' => array(
+ array(
+ 'name' => 'Test',
+ 'shadow' => '2px 2px 3px #000',
+ 'slug' => 'test',
+ ),
+ ),
+ );
+
+ wp_recursive_ksort( $actual_settings );
+ wp_recursive_ksort( $expected_settings );
+
+ $this->assertSame(
+ $expected_settings,
+ $actual_settings
+ );
+ }
+
+ /**
+ * @ticket 60815
+ */
+ public function test_shadow_default_presets_value_for_block_and_classic_themes() {
+ $theme_json_resolver = new WP_Theme_JSON_Resolver();
+ $theme_json = $theme_json_resolver->get_merged_data();
+
+ $default_presets_for_classic = $theme_json->get_settings()['shadow']['defaultPresets'];
+ $this->assertFalse( $default_presets_for_classic );
+
+ switch_theme( 'block-theme' );
+ $theme_json_resolver = new WP_Theme_JSON_Resolver();
+ $theme_json = $theme_json_resolver->get_merged_data();
+
+ $default_presets_for_block = $theme_json->get_settings()['shadow']['defaultPresets'];
+ $this->assertTrue( $default_presets_for_block );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>