<!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>[56028] trunk: Editor: add support for block-level link hover colors.</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/56028">56028</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/56028","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>2023-06-26 01:13:56 +0000 (Mon, 26 Jun 2023)</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: add support for block-level link hover colors.
Adds the ability to set link hover colors for individual blocks from the block inspector color panel.
Props @youknowriad, @peterwilsoncc, @kebbet.
Fixes <a href="https://core.trac.wordpress.org/ticket/58575">#58575</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportselementsphp">trunk/src/wp-includes/block-supports/elements.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="#trunktestsphpunitteststhemewpThemeJsonphp">trunk/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportselementsphp"></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/block-supports/elements.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/elements.php 2023-06-25 22:55:34 UTC (rev 56027)
+++ trunk/src/wp-includes/block-supports/elements.php 2023-06-26 01:13:56 UTC (rev 56028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -46,13 +46,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', 'color', 'text' ), null );
</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">+ $hover_link_color = null;
+ if ( ! empty( $block['attrs'] ) ) {
+ $hover_link_color = _wp_array_get( $block['attrs'], array( 'style', 'elements', 'link', ':hover', 'color', 'text' ), null );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /*
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * For now we only care about link color.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * For now we only care about link colors.
</ins><span class="cx" style="display: block; padding: 0 10px"> * This code in the future when we have a public API
</span><span class="cx" style="display: block; padding: 0 10px"> * should take advantage of WP_Theme_JSON::compute_style_properties
</span><span class="cx" style="display: block; padding: 0 10px"> * and work for any element and style.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( null === $link_color ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( null === $link_color && null === $hover_link_color ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> return $block_content;
</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">@@ -104,6 +109,16 @@
</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">+ if ( isset( $link_block_styles[':hover'] ) ) {
+ wp_style_engine_get_styles(
+ $link_block_styles[':hover'],
+ array(
+ 'selector' => ".$class_name a:hover",
+ 'context' => 'block-supports',
+ )
+ );
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> return null;
</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="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 2023-06-25 22:55:34 UTC (rev 56027)
+++ trunk/src/wp-includes/class-wp-theme-json.php 2023-06-26 01:13:56 UTC (rev 56028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -360,6 +360,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'duotone' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'gradients' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'link' => null,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'heading' => null,
+ 'button' => null,
+ 'caption' => null,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'palette' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> 'text' => null,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -562,6 +565,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'border', 'style' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'border', 'width' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'color', 'link' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ array( 'color', 'heading' ),
+ array( 'color', 'button' ),
+ array( 'color', 'caption' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> array( 'dimensions', 'minHeight' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'position', 'sticky' ),
</span><span class="cx" style="display: block; padding: 0 10px"> array( 'spacing', 'blockGap' ),
</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 2023-06-25 22:55:34 UTC (rev 56027)
+++ trunk/src/wp-includes/theme.json 2023-06-26 01:13:56 UTC (rev 56028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,6 +11,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px"> "color": {
</span><span class="cx" style="display: block; padding: 0 10px"> "background": true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "button": true,
+ "caption": true,
</ins><span class="cx" style="display: block; padding: 0 10px"> "custom": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "customDuotone": true,
</span><span class="cx" style="display: block; padding: 0 10px"> "customGradient": true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -121,6 +123,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> "slug": "midnight"
</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">+ "heading": true,
</ins><span class="cx" style="display: block; padding: 0 10px"> "link": false,
</span><span class="cx" style="display: block; padding: 0 10px"> "palette": [
</span><span class="cx" style="display: block; padding: 0 10px"> {
</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 2023-06-25 22:55:34 UTC (rev 56027)
+++ trunk/tests/phpunit/tests/theme/wpThemeJson.php 2023-06-26 01:13:56 UTC (rev 56028)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -269,7 +269,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link' => true,
+ 'heading' => true,
+ 'button' => true,
+ 'caption' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dimensions' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minHeight' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -299,7 +302,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'link' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'link' => true,
+ 'heading' => true,
+ 'button' => true,
+ 'caption' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'dimensions' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'minHeight' => true,
</span></span></pre>
</div>
</div>
</body>
</html>