<!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>[52759] branches/5.9/src/wp-includes: Editor: Backport Duotone fixes for 5.9.1.</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/52759">52759</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/52759","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-02-17 17:29:04 +0000 (Thu, 17 Feb 2022)</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: Backport Duotone fixes for 5.9.1.
This changeset is a backport for the following Gutenberg PRs:
- Fix duotone theme cache: https://github.com/WordPress/gutenberg/pull/36236
- Fix duotone render in non-fse themes gutenberg: https://github.com/WordPress/gutenberg/pull/37954
- Duotone: Allow users to specify custom filters gutenberg: https://github.com/WordPress/gutenberg/pull/38442
Props oandregal, scruffian, Mamaduka.
Merges <a href="https://core.trac.wordpress.org/changeset/52757">[52757]</a> to the 5.9 branch.
See <a href="https://core.trac.wordpress.org/ticket/55179">#55179</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branches59srcwpincludesblocksupportsduotonephp">branches/5.9/src/wp-includes/block-supports/duotone.php</a></li>
<li><a href="#branches59srcwpincludesclasswpthemejsonphp">branches/5.9/src/wp-includes/class-wp-theme-json.php</a></li>
<li><a href="#branches59srcwpincludesdeprecatedphp">branches/5.9/src/wp-includes/deprecated.php</a></li>
<li><a href="#branches59srcwpincludesglobalstylesandsettingsphp">branches/5.9/src/wp-includes/global-styles-and-settings.php</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#branches59">branches/5.9/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<span class="cx" style="display: block; padding: 0 10px">Index: branches/5.9
</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/5.9 2022-02-17 17:20:27 UTC (rev 52758)
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+++ branches/5.9 2022-02-17 17:29:04 UTC (rev 52759)
</ins><a id="branches59"></a>
<div class="propset"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Property changes: branches/5.9</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:52453-52457,52535-52536,52547,52555,52558,52562-52563,52574,52589,52612-52613,52618,52626,52628,52631,52633,52637,52644,52648,52651,52656,52658,52662,52664,52668,52672-52673,52675-52677,52679,52681-52682,52686,52692,52695,52697,52726,52730,52733,52735,52738,52741,52743-52744,52750,52752
</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:52453-52457,52535-52536,52547,52555,52558,52562-52563,52574,52589,52612-52613,52618,52626,52628,52631,52633,52637,52644,52648,52651,52656,52658,52662,52664,52668,52672-52673,52675-52677,52679,52681-52682,52686,52692,52695,52697,52726,52730,52733,52735,52738,52741,52743-52744,52750,52752,52757
</ins><span class="cx" style="display: block; padding: 0 10px">\ No newline at end of property
</span><a id="branches59srcwpincludesblocksupportsduotonephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/src/wp-includes/block-supports/duotone.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/src/wp-includes/block-supports/duotone.php 2022-02-17 17:20:27 UTC (rev 52758)
+++ branches/5.9/src/wp-includes/block-supports/duotone.php 2022-02-17 17:29:04 UTC (rev 52759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -352,48 +352,49 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Registers the style and colors block attributes for block types that support it.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the prefixed id for the duotone filter for use as a CSS id.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 5.8.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 5.9.1
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Block_Type $block_type Block Type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone filter CSS id.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_register_duotone_support( $block_type ) {
- $has_duotone_support = false;
- if ( property_exists( $block_type, 'supports' ) ) {
- $has_duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_get_duotone_filter_id( $preset ) {
+ if ( ! isset( $preset['slug'] ) ) {
+ return '';
</ins><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">- if ( $has_duotone_support ) {
- if ( ! $block_type->attributes ) {
- $block_type->attributes = array();
- }
-
- if ( ! array_key_exists( 'style', $block_type->attributes ) ) {
- $block_type->attributes['style'] = array(
- 'type' => 'object',
- );
- }
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return 'wp-duotone-' . $preset['slug'];
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Renders the duotone filter SVG and returns the CSS filter property to
- * reference the rendered SVG.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Returns the CSS filter property url to reference the rendered SVG.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone CSS filter property url value.
+ */
+function wp_get_duotone_filter_property( $preset ) {
+ $filter_id = wp_get_duotone_filter_id( $preset );
+ return "url('#" . $filter_id . "')";
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * Returns the duotone filter SVG string for the preset.
+ *
+ * @since 5.9.1
+ * @access private
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $preset Duotone preset value as seen in theme.json.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @return string Duotone CSS filter property.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @return string Duotone SVG filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-function wp_render_duotone_filter_preset( $preset ) {
- $duotone_id = $preset['slug'];
- $duotone_colors = $preset['colors'];
- $filter_id = 'wp-duotone-' . $duotone_id;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_get_duotone_filter_svg( $preset ) {
+ $filter_id = wp_get_duotone_filter_id( $preset );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $duotone_values = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'r' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'g' => array(),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -400,7 +401,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'b' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'a' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- foreach ( $duotone_colors as $color_str ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( ! isset( $preset['colors'] ) || ! is_array( $preset['colors'] ) ) {
+ $preset['colors'] = array();
+ }
+
+ foreach ( $preset['colors'] as $color_str ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $color = wp_tinycolor_string_to_rgb( $color_str );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $duotone_values['r'][] = $color['r'] / 255;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -456,17 +462,34 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $svg = trim( $svg );
</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">- add_action(
- // Safari doesn't render SVG filters defined in data URIs,
- // and SVG filters won't render in the head of a document,
- // so the next best place to put the SVG is in the footer.
- is_admin() ? 'admin_footer' : 'wp_footer',
- function () use ( $svg ) {
- echo $svg;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return $svg;
+}
+
+/**
+ * Registers the style and colors block attributes for block types that support it.
+ *
+ * @since 5.8.0
+ * @access private
+ *
+ * @param WP_Block_Type $block_type Block Type.
+ */
+function wp_register_duotone_support( $block_type ) {
+ $has_duotone_support = false;
+ if ( property_exists( $block_type, 'supports' ) ) {
+ $has_duotone_support = _wp_array_get( $block_type->supports, array( 'color', '__experimentalDuotone' ), false );
+ }
+
+ if ( $has_duotone_support ) {
+ if ( ! $block_type->attributes ) {
+ $block_type->attributes = array();
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return "url('#" . $filter_id . "')";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! array_key_exists( 'style', $block_type->attributes ) ) {
+ $block_type->attributes['style'] = array(
+ 'type' => 'object',
+ );
+ }
+ }
</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 class="lines" style="display: block; padding: 0 10px; color: #888">@@ -500,8 +523,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'slug' => uniqid(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'colors' => $block['attrs']['style']['color']['duotone'],
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $filter_property = wp_render_duotone_filter_preset( $filter_preset );
- $filter_id = 'wp-duotone-' . $filter_preset['slug'];
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $filter_property = wp_get_duotone_filter_property( $filter_preset );
+ $filter_id = wp_get_duotone_filter_id( $filter_preset );
+ $filter_svg = wp_get_duotone_filter_svg( $filter_preset );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $scope = '.' . $filter_id;
</span><span class="cx" style="display: block; padding: 0 10px"> $selectors = explode( ',', $duotone_support );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -521,6 +545,28 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_add_inline_style( $filter_id, $filter_style );
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_style( $filter_id );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_action(
+ 'wp_footer',
+ static function () use ( $filter_svg, $selector ) {
+ echo $filter_svg;
+
+ /*
+ * Safari renders elements incorrectly on first paint when the SVG
+ * filter comes after the content that it is filtering, so we force
+ * a repaint with a WebKit hack which solves the issue.
+ */
+ global $is_safari;
+ if ( $is_safari ) {
+ printf(
+ // Simply accessing el.offsetHeight flushes layout and style
+ // changes in WebKit without having to wait for setTimeout.
+ '<script>( function() { var el = document.querySelector( %s ); var display = el.style.display; el.style.display = "none"; el.offsetHeight; el.style.display = display; } )();</script>',
+ wp_json_encode( $selector )
+ );
+ }
+ }
+ );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // Like the layout hook, this assumes the hook only applies to blocks with a single wrapper.
</span><span class="cx" style="display: block; padding: 0 10px"> return preg_replace(
</span><span class="cx" style="display: block; padding: 0 10px"> '/' . preg_quote( 'class="', '/' ) . '/',
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -538,3 +584,21 @@
</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"> add_filter( 'render_block', 'wp_render_duotone_support', 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Render the SVG filters supplied by theme.json.
+ *
+ * Note that this doesn't render the per-block user-defined
+ * filters which are handled by wp_render_duotone_support,
+ * but it should be rendered in the same location as those to satisfy
+ * Safari's rendering quirks.
+ *
+ * @since 5.9.1
+ */
+function wp_global_styles_render_svg_filters() {
+ $filters = wp_get_global_styles_svg_filters();
+ if ( ! empty( $filters ) ) {
+ echo $filters;
+ }
+}
+add_action( 'wp_body_open', 'wp_global_styles_render_svg_filters' );
</ins></span></pre></div>
<a id="branches59srcwpincludesclasswpthemejsonphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/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/5.9/src/wp-includes/class-wp-theme-json.php 2022-02-17 17:20:27 UTC (rev 52758)
+++ branches/5.9/src/wp-includes/class-wp-theme-json.php 2022-02-17 17:29:04 UTC (rev 52759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -132,7 +132,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'path' => array( 'color', 'duotone' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'override' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'use_default_names' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value_func' => 'wp_render_duotone_filter_preset',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value_func' => 'wp_get_duotone_filter_property',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'css_vars' => '--wp--preset--duotone--$slug',
</span><span class="cx" style="display: block; padding: 0 10px"> 'classes' => array(),
</span><span class="cx" style="display: block; padding: 0 10px"> 'properties' => array( 'filter' ),
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1587,6 +1587,40 @@
</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">+ * Converts all filter (duotone) presets into SVGs.
+ *
+ * @since 5.9.1
+ *
+ * @param array $origins List of origins to process.
+ * @return string SVG filters.
+ */
+ public function get_svg_filters( $origins ) {
+ $blocks_metadata = static::get_blocks_metadata();
+ $setting_nodes = static::get_setting_nodes( $this->theme_json, $blocks_metadata );
+
+ foreach ( $setting_nodes as $metadata ) {
+ $node = _wp_array_get( $this->theme_json, $metadata['path'], array() );
+ if ( empty( $node['color']['duotone'] ) ) {
+ continue;
+ }
+
+ $duotone_presets = $node['color']['duotone'];
+
+ $filters = '';
+ foreach ( $origins as $origin ) {
+ if ( ! isset( $duotone_presets[ $origin ] ) ) {
+ continue;
+ }
+ foreach ( $duotone_presets[ $origin ] as $duotone_preset ) {
+ $filters .= wp_get_duotone_filter_svg( $duotone_preset );
+ }
+ }
+ }
+
+ return $filters;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Returns whether a presets should be overridden or not.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 5.9.0
</span></span></pre></div>
<a id="branches59srcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/src/wp-includes/deprecated.php 2022-02-17 17:20:27 UTC (rev 52758)
+++ branches/5.9/src/wp-includes/deprecated.php 2022-02-17 17:29:04 UTC (rev 52759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4208,3 +4208,20 @@
</span><span class="cx" style="display: block; padding: 0 10px"> _deprecated_function( __FUNCTION__, '5.8.0', '_excerpt_render_inner_blocks()' );
</span><span class="cx" style="display: block; padding: 0 10px"> return _excerpt_render_inner_blocks( $columns, $allowed_blocks );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Renders the duotone filter SVG and returns the CSS filter property to
+ * reference the rendered SVG.
+ *
+ * @since 5.9.0
+ * @deprecated 5.9.1 Use `wp_get_duotone_filter_property` introduced in 5.9.1.
+ *
+ * @see wp_get_duotone_filter_property()
+ *
+ * @param array $preset Duotone preset value as seen in theme.json.
+ * @return string Duotone CSS filter property.
+ */
+function wp_render_duotone_filter_preset( $preset ) {
+ _deprecated_function( __FUNCTION__, '5.9.1', 'wp_get_duotone_filter_property()' );
+ return wp_get_duotone_filter_property( $preset );
+}
</ins></span></pre></div>
<a id="branches59srcwpincludesglobalstylesandsettingsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: branches/5.9/src/wp-includes/global-styles-and-settings.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- branches/5.9/src/wp-includes/global-styles-and-settings.php 2022-02-17 17:20:27 UTC (rev 52758)
+++ branches/5.9/src/wp-includes/global-styles-and-settings.php 2022-02-17 17:29:04 UTC (rev 52759)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -150,3 +150,45 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $stylesheet;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Returns a string containing the SVGs to be referenced as filters (duotone).
+ *
+ * @since 5.9.1
+ *
+ * @return string
+ */
+function wp_get_global_styles_svg_filters() {
+ // Return cached value if it can be used and exists.
+ // It's cached by theme to make sure that theme switching clears the cache.
+ $can_use_cached = (
+ ( ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ) &&
+ ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ) &&
+ ( ! defined( 'REST_REQUEST' ) || ! REST_REQUEST ) &&
+ ! is_admin()
+ );
+ $transient_name = 'global_styles_svg_filters_' . get_stylesheet();
+ if ( $can_use_cached ) {
+ $cached = get_transient( $transient_name );
+ if ( $cached ) {
+ return $cached;
+ }
+ }
+
+ $supports_theme_json = WP_Theme_JSON_Resolver::theme_has_support();
+
+ $origins = array( 'default', 'theme', 'custom' );
+ if ( ! $supports_theme_json ) {
+ $origins = array( 'default' );
+ }
+
+ $tree = WP_Theme_JSON_Resolver::get_merged_data();
+ $svgs = $tree->get_svg_filters( $origins );
+
+ if ( $can_use_cached ) {
+ // Cache for a minute, same as wp_get_global_stylesheet.
+ set_transient( $transient_name, $svgs, MINUTE_IN_SECONDS );
+ }
+
+ return $svgs;
+}
</ins></span></pre>
</div>
</div>
</body>
</html>