<!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>[57259] trunk: Editor: output palette presets when appearance tools or border are enabled.</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/57259">57259</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/57259","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>isabel_brison</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-01-09 23:30:10 +0000 (Tue, 09 Jan 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: output palette presets when appearance tools or border are enabled.
Adds color palette presets to global styles output if current theme supports either appearance tools or border.
Props andrewserong, noisysocks.
Fixes <a href="https://core.trac.wordpress.org/ticket/60134">#60134</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesglobalstylesandsettingsphp">trunk/src/wp-includes/global-styles-and-settings.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestthemescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php</a></li>
<li><a href="#trunktestsphpunitteststhemewpGetGlobalStylesheetphp">trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesglobalstylesandsettingsphp"></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/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/global-styles-and-settings.php 2024-01-09 20:15:30 UTC (rev 57258)
+++ trunk/src/wp-includes/global-styles-and-settings.php 2024-01-09 23:30:10 UTC (rev 57259)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -222,7 +222,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wp_add_global_styles_for_blocks
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $origins = array( 'default', 'theme', 'custom' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ! $supports_theme_json ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * If the theme doesn't have theme.json but supports both appearance tools and color palette,
+ * the 'theme' origin should be included so color palette presets are also output.
+ */
+ if ( ! $supports_theme_json && ( current_theme_supports( 'appearance-tools' ) || current_theme_supports( 'border' ) ) && current_theme_supports( 'editor-color-palette' ) ) {
+ $origins = array( 'default', 'theme' );
+ } elseif ( ! $supports_theme_json ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $origins = array( 'default' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $styles_rest = $tree->get_stylesheet( $types, $origins );
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestthemescontrollerphp"></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/rest-api/rest-themes-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php 2024-01-09 20:15:30 UTC (rev 57258)
+++ trunk/tests/phpunit/tests/rest-api/rest-themes-controller.php 2024-01-09 23:30:10 UTC (rev 57259)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,6 +127,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$subscriber_id );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$contributor_id );
</span><span class="cx" style="display: block; padding: 0 10px"> self::delete_user( self::$admin_id );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ remove_theme_support( 'editor-gradient-presets' );
+ remove_theme_support( 'editor-color-palette' );
</ins><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="trunktestsphpunitteststhemewpGetGlobalStylesheetphp"></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/wpGetGlobalStylesheet.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php 2024-01-09 20:15:30 UTC (rev 57258)
+++ trunk/tests/phpunit/tests/theme/wpGetGlobalStylesheet.php 2024-01-09 23:30:10 UTC (rev 57259)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -19,6 +19,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> private $remove_theme_support_at_teardown = false;
</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">+ * Flag to indicate whether to remove 'border' theme support at tear_down().
+ *
+ * @var bool
+ */
+ private $remove_border_support_at_teardown = false;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Flag to indicate whether to switch back to the default theme at tear down.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @var bool
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -40,6 +47,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( WP_DEFAULT_THEME );
</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">+ if ( $this->remove_border_support_at_teardown ) {
+ $this->remove_border_support_at_teardown = false;
+ remove_theme_support( 'border' );
+ remove_theme_support( 'editor-color-palette' );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> parent::tear_down();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -247,6 +260,64 @@
</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">+ * Tests that theme color palette presets are output when appearance tools are enabled via theme support.
+ *
+ * @ticket 60134
+ */
+ public function test_theme_color_palette_presets_output_when_border_support_enabled() {
+
+ $args = array(
+ array(
+ 'name' => 'Black',
+ 'slug' => 'nice-black',
+ 'color' => '#000000',
+ ),
+ array(
+ 'name' => 'Dark Gray',
+ 'slug' => 'dark-gray',
+ 'color' => '#28303D',
+ ),
+ array(
+ 'name' => 'Green',
+ 'slug' => 'haunted-green',
+ 'color' => '#D1E4DD',
+ ),
+ array(
+ 'name' => 'Blue',
+ 'slug' => 'soft-blue',
+ 'color' => '#D1DFE4',
+ ),
+ array(
+ 'name' => 'Purple',
+ 'slug' => 'cool-purple',
+ 'color' => '#D1D1E4',
+ ),
+ );
+
+ // Add theme support for appearance tools.
+ add_theme_support( 'border' );
+ add_theme_support( 'editor-color-palette', $args );
+ $this->remove_border_support_at_teardown = true;
+
+ // Check for both the variable declaration and its use as a value.
+ $variables = wp_get_global_stylesheet( array( 'variables' ) );
+
+ $this->assertStringContainsString( '--wp--preset--color--nice-black: #000000', $variables );
+ $this->assertStringContainsString( '--wp--preset--color--dark-gray: #28303D', $variables );
+ $this->assertStringContainsString( '--wp--preset--color--haunted-green: #D1E4DD', $variables );
+ $this->assertStringContainsString( '--wp--preset--color--soft-blue: #D1DFE4', $variables );
+ $this->assertStringContainsString( '--wp--preset--color--cool-purple: #D1D1E4', $variables );
+
+ $presets = wp_get_global_stylesheet( array( 'presets' ) );
+
+ $this->assertStringContainsString( 'var(--wp--preset--color--nice-black)', $presets );
+ $this->assertStringContainsString( 'var(--wp--preset--color--dark-gray)', $presets );
+ $this->assertStringContainsString( 'var(--wp--preset--color--haunted-green)', $presets );
+ $this->assertStringContainsString( 'var(--wp--preset--color--soft-blue)', $presets );
+ $this->assertStringContainsString( 'var(--wp--preset--color--cool-purple)', $presets );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Adds the 'editor-font-sizes' theme support with custom font sizes.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $add_theme_support Whether to add the theme support.
</span></span></pre>
</div>
</div>
</body>
</html>