<!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>[60478] trunk/src: Customize: Use explicit labels in hue picker.</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/60478">60478</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/60478","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>joedolson</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-07-16 22:50:07 +0000 (Wed, 16 Jul 2025)</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'>Customize: Use explicit labels in hue picker.
Add `for` and `id` attributes to the customizer hue picker, so labels are explicitly associated. Move picker outside of `label` element. Add `label` value for Twenty Seventeen, Twenty Nineteen, and Twenty Twenty.
Props afercia, subrataemfluence, dlh, jorbin, sainathpoojary, abcd95, mleraygp, joedolson.
Fixes <a href="https://core.trac.wordpress.org/ticket/42078">#42078</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpcontentthemestwentynineteeninccustomizerphp">trunk/src/wp-content/themes/twentynineteen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentynineteenjscustomizecontrolsjs">trunk/src/wp-content/themes/twentynineteen/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeenassetsjscustomizecontrolsjs">trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-controls.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentyseventeeninccustomizerphp">trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyassetsjscustomizejs">trunk/src/wp-content/themes/twentytwenty/assets/js/customize.js</a></li>
<li><a href="#trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentycustomizephp">trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php</a></li>
<li><a href="#trunksrcwpincludescustomizeclasswpcustomizecolorcontrolphp">trunk/src/wp-includes/customize/class-wp-customize-color-control.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpcontentthemestwentynineteeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/inc/customizer.php 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentynineteen/inc/customizer.php 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -75,6 +75,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize,
</span><span class="cx" style="display: block; padding: 0 10px"> 'primary_color_hue',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Custom Color', 'twentynineteen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Apply a custom color for buttons, links, featured images, etc.', 'twentynineteen' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'hue',
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentynineteenjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentynineteen/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentynineteen/js/customize-controls.js 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentynineteen/js/customize-controls.js 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -20,7 +20,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> control.container.slideUp( 180 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The control-specific label is redundant because, visually, this control is part of the Color Scheme control.
+ control.container.find( '.customize-control-title:first' ).addClass( 'screen-reader-text' );
</ins><span class="cx" style="display: block; padding: 0 10px"> visibility();
</span><span class="cx" style="display: block; padding: 0 10px"> setting.bind( visibility );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeenassetsjscustomizecontrolsjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-controls.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-controls.js 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentyseventeen/assets/js/customize-controls.js 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -18,7 +18,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> control.container.slideUp( 180 );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> };
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // The control-specific label is redundant because, visually, this control is part of the Color Scheme control.
+ control.container.find( '.customize-control-title:first' ).addClass( 'screen-reader-text' );
</ins><span class="cx" style="display: block; padding: 0 10px"> visibility();
</span><span class="cx" style="display: block; padding: 0 10px"> setting.bind( visibility );
</span><span class="cx" style="display: block; padding: 0 10px"> });
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentyseventeeninccustomizerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentyseventeen/inc/customizer.php 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,6 +73,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_customize,
</span><span class="cx" style="display: block; padding: 0 10px"> 'colorscheme_hue',
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Hue', 'twentyseventeen' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'hue',
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'priority' => 6,
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyassetsjscustomizejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/assets/js/customize.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/assets/js/customize.js 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentytwenty/assets/js/customize.js 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,6 +22,8 @@
</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">+ // The control-specific label is redundant because, visually, this control is part of the Color Scheme control.
+ control.container.find( '.customize-control-title:first' ).addClass( 'screen-reader-text' );
</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"> }( jQuery, wp.customize ) );
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytwentyclassesclasstwentytwentycustomizephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-content/themes/twentytwenty/classes/class-twentytwenty-customize.php 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -185,6 +185,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'section' => 'colors',
</span><span class="cx" style="display: block; padding: 0 10px"> 'settings' => 'accent_hue',
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'label' => __( 'Custom Color', 'twentytwenty' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'description' => __( 'Apply a custom color for links, buttons, featured images.', 'twentytwenty' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'mode' => 'hue',
</span><span class="cx" style="display: block; padding: 0 10px"> 'active_callback' => static function () use ( $wp_customize ) {
</span></span></pre></div>
<a id="trunksrcwpincludescustomizeclasswpcustomizecolorcontrolphp"></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/customize/class-wp-customize-color-control.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/customize/class-wp-customize-color-control.php 2025-07-16 14:07:58 UTC (rev 60477)
+++ trunk/src/wp-includes/customize/class-wp-customize-color-control.php 2025-07-16 22:50:07 UTC (rev 60478)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,8 +92,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function content_template() {
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <# var defaultValue = '#RRGGBB', defaultValueAttr = '',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <#
+ var defaultValue = '#RRGGBB',
+ defaultValueAttr = '',
+ inputId = _.uniqueId( 'customize-color-control-input-' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> isHueSlider = data.mode === 'hue';
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( data.defaultValue && _.isString( data.defaultValue ) && ! isHueSlider ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( '#' !== data.defaultValue.substring( 0, 1 ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> defaultValue = '#' + data.defaultValue;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -101,7 +105,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> defaultValue = data.defaultValue;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> defaultValueAttr = ' data-default-color=' + defaultValue; // Quotes added automatically.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- } #>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ }
+ #>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( data.label ) { #>
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="customize-control-title">{{{ data.label }}}</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -109,13 +114,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <span class="description customize-control-description">{{{ data.description }}}</span>
</span><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><span class="cx" style="display: block; padding: 0 10px"> <div class="customize-control-content">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <label><span class="screen-reader-text">{{{ data.label }}}</span>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <label for="{{ inputId }}"><span class="screen-reader-text">{{{ data.label }}}</span></label>
</ins><span class="cx" style="display: block; padding: 0 10px"> <# if ( isHueSlider ) { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input class="color-picker-hue" type="text" data-type="hue" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="{{ inputId }}" class="color-picker-hue" type="number" min="1" max="359" data-type="hue" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } else { #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <input class="color-picker-hex" type="text" maxlength="7" placeholder="{{ defaultValue }}" {{ defaultValueAttr }} />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <input id="{{ inputId }}" class="color-picker-hex" type="text" maxlength="7" placeholder="{{ defaultValue }}" {{ defaultValueAttr }} />
</ins><span class="cx" style="display: block; padding: 0 10px"> <# } #>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- </label>
</del><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre>
</div>
</div>
</body>
</html>