<!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>[58987] branches/6.6/tests/phpunit/tests/theme/wpThemeJson.php: Editor: Fix block custom CSS pseudo element selectors in global styles.</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/58987">58987</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/58987","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>hellofromTonya</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-09-04 14:22:16 +0000 (Wed, 04 Sep 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: Fix block custom CSS pseudo element selectors in global styles.
Fixes a regression introduced in <a href="https://core.trac.wordpress.org/changeset/58241">[58241]</a> where selectors with pseudo elements are wrapped within `:where()` causing malformed CSS and the CSS rule(s) not being applied.
When processing custom CSS for blocks, this changeset:
* Strips the pseudo-elements from the original nested selector, performs the required wrapping in `:root :where`, then re-appends the pseudo-element selector with its leading combinators if present.
* Removes empty CSS rules.
It includes the PHP changes.
Reference:
* PHP changes from [https://github.com/WordPress/gutenberg/pull/63980 Gutenberg PR 63980].
Follow-up to <a href="https://core.trac.wordpress.org/changeset/58241">[58241]</a>, <a href="https://core.trac.wordpress.org/changeset/56812">[56812]</a>, <a href="https://core.trac.wordpress.org/changeset/55216">[55216]</a>.
Reviewed by andrewserong.
Merges <a href="https://core.trac.wordpress.org/changeset/58896">[58896]</a> to the 6.6 branch.
Props aaronrobertshaw, wongjn, harlet7, dballari, ramonopoly, andrewserong, aristath, hellofromTonya.
Fixes <a href="https://core.trac.wordpress.org/ticket/61769">#61769</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches66srcwpincludesclasswpthemejsonphp">branches/6.6/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#branches66testsphpunitteststhemewpThemeJsonphp">branches/6.6/tests/phpunit/tests/theme/wpThemeJson.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches66">branches/6.6/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/6.6
</span><span class="cx" style="display: block; padding: 0 10px">===================================================================
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">--- branches/6.6 2024-09-04 14:00:19 UTC (rev 58986)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/6.6 2024-09-04 14:22:16 UTC (rev 58987)
</ins><a id="branches66"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/6.6</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: svn:mergeinfo</h4></div>
<span class="cx" style="display: block; padding: 0 10px"> /branches/5.0:43681-43682,43684-43688,43719-43720,43723,43726-43727,43729-43731,43734-43744,43747,43751-43754,43758,43760-43765,43767-43770,43772,43774-43781,43783,43785,43790-43806,43808-43821,43825,43828,43830-43834,43836-43843,43846-43863,43867-43889,43891-43894,43897-43905,43908-43909,43911-43929,43931-43942,43946-43947,43949-43956,43959-43964,43967-43969,43988,43994,44014,44017,44047,44183,44185,44187-44206,44208-44213,44231-44232,44235,44248,44284,44287-44288
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.5:49373-49379,49381
</span><span class="cx" style="display: block; padding: 0 10px"> /branches/5.8:51889
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/trunk:58570,58585,58588,58612,58617-58618,58671-58672,58685,58690-58691,58693,58710,58718-58719,58744,58747-58750,58755-58757,58763,58773-58774,58804,58812,58825,58844,58850,58856,58864,58884,58890,58914,58976,58978
</del><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/trunk:58570,58585,58588,58612,58617-58618,58671-58672,58685,58690-58691,58693,58710,58718-58719,58744,58747-58750,58755-58757,58763,58773-58774,58804,58812,58825,58844,58850,58856,58864,58884,58890,58896,58914,58976,58978
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches66srcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.6/src/wp-includes/class-wp-theme-json.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.6/src/wp-includes/class-wp-theme-json.php 2024-09-04 14:00:19 UTC (rev 58986)
+++ branches/6.6/src/wp-includes/class-wp-theme-json.php 2024-09-04 14:22:16 UTC (rev 58987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1439,9 +1439,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> protected function process_blocks_custom_css( $css, $selector ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $processed_css = '';
</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 ( empty( $css ) ) {
+ return $processed_css;
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Split CSS nested rules.
</span><span class="cx" style="display: block; padding: 0 10px"> $parts = explode( '&', $css );
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $parts as $part ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( empty( $part ) ) {
+ continue;
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> $is_root_css = ( ! str_contains( $part, '{' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_root_css ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // If the part doesn't contain braces, it applies to the root level.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1454,11 +1461,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $nested_selector = $part[0];
</span><span class="cx" style="display: block; padding: 0 10px"> $css_value = $part[1];
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $part_selector = str_starts_with( $nested_selector, ' ' )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ /*
+ * Handle pseudo elements such as ::before, ::after etc. Regex will also
+ * capture any leading combinator such as >, +, or ~, as well as spaces.
+ * This allows pseudo elements as descendants e.g. `.parent ::before`.
+ */
+ $matches = array();
+ $has_pseudo_element = preg_match( '/([>+~\s]*::[a-zA-Z-]+)/', $nested_selector, $matches );
+ $pseudo_part = $has_pseudo_element ? $matches[1] : '';
+ $nested_selector = $has_pseudo_element ? str_replace( $pseudo_part, '', $nested_selector ) : $nested_selector;
+
+ // Finalize selector and re-append pseudo element if required.
+ $part_selector = str_starts_with( $nested_selector, ' ' )
</ins><span class="cx" style="display: block; padding: 0 10px"> ? static::scope_selector( $selector, $nested_selector )
</span><span class="cx" style="display: block; padding: 0 10px"> : static::append_to_selector( $selector, $nested_selector );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $final_selector = ":root :where($part_selector)";
- $processed_css .= $final_selector . '{' . trim( $css_value ) . '}';}
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $final_selector = ":root :where($part_selector)$pseudo_part";
+
+ $processed_css .= $final_selector . '{' . trim( $css_value ) . '}';
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> return $processed_css;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="branches66testsphpunitteststhemewpThemeJsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/6.6/tests/phpunit/tests/theme/wpThemeJson.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/6.6/tests/phpunit/tests/theme/wpThemeJson.php 2024-09-04 14:00:19 UTC (rev 58986)
+++ branches/6.6/tests/phpunit/tests/theme/wpThemeJson.php 2024-09-04 14:22:16 UTC (rev 58987)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5153,6 +5153,7 @@
</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"> * @ticket 61165
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @ticket 61769
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @dataProvider data_process_blocks_custom_css
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5180,6 +5181,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function data_process_blocks_custom_css() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // Simple CSS without any nested selectors.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'empty css' => array(
+ 'input' => array(
+ 'selector' => '.foo',
+ 'css' => '',
+ ),
+ 'expected' => '',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'no nested selectors' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.foo',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5195,6 +5203,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'expected' => ':root :where(.foo){color: red; margin: auto;}:root :where(.foo.one){color: blue;}:root :where(.foo .two){color: green;}',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'no root styles' => array(
+ 'input' => array(
+ 'selector' => '.foo',
+ 'css' => '&::before{color: red;}',
+ ),
+ 'expected' => ':root :where(.foo)::before{color: red;}',
+ ),
</ins><span class="cx" style="display: block; padding: 0 10px"> // CSS with pseudo elements.
</span><span class="cx" style="display: block; padding: 0 10px"> 'with pseudo elements' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'input' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5201,7 +5216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.foo',
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => 'color: red; margin: auto; &::before{color: blue;} & ::before{color: green;} &.one::before{color: yellow;} & .two::before{color: purple;}',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'expected' => ':root :where(.foo){color: red; margin: auto;}:root :where(.foo::before){color: blue;}:root :where(.foo ::before){color: green;}:root :where(.foo.one::before){color: yellow;}:root :where(.foo .two::before){color: purple;}',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'expected' => ':root :where(.foo){color: red; margin: auto;}:root :where(.foo)::before{color: blue;}:root :where(.foo) ::before{color: green;}:root :where(.foo.one)::before{color: yellow;}:root :where(.foo .two)::before{color: purple;}',
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> // CSS with multiple root selectors.
</span><span class="cx" style="display: block; padding: 0 10px"> 'with multiple root selectors' => array(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5209,7 +5224,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'selector' => '.foo, .bar',
</span><span class="cx" style="display: block; padding: 0 10px"> 'css' => 'color: red; margin: auto; &.one{color: blue;} & .two{color: green;} &::before{color: yellow;} & ::before{color: purple;} &.three::before{color: orange;} & .four::before{color: skyblue;}',
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'expected' => ':root :where(.foo, .bar){color: red; margin: auto;}:root :where(.foo.one, .bar.one){color: blue;}:root :where(.foo .two, .bar .two){color: green;}:root :where(.foo::before, .bar::before){color: yellow;}:root :where(.foo ::before, .bar ::before){color: purple;}:root :where(.foo.three::before, .bar.three::before){color: orange;}:root :where(.foo .four::before, .bar .four::before){color: skyblue;}',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'expected' => ':root :where(.foo, .bar){color: red; margin: auto;}:root :where(.foo.one, .bar.one){color: blue;}:root :where(.foo .two, .bar .two){color: green;}:root :where(.foo, .bar)::before{color: yellow;}:root :where(.foo, .bar) ::before{color: purple;}:root :where(.foo.three, .bar.three)::before{color: orange;}:root :where(.foo .four, .bar .four)::before{color: skyblue;}',
</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>
</div>
</body>
</html>