<!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>[58394] trunk: Editor: register block style variations defined by the theme using the init action.</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/58394">58394</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/58394","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>oandregal</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2024-06-12 07:15:06 +0000 (Wed, 12 Jun 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: register block style variations defined by the theme using the init action.
Props oandregal, aaronrobertshaw, annezazu.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/58264">[58264]</a>.
See <a href="https://core.trac.wordpress.org/ticket/61312">#61312</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesblocksupportsblockstylevariationsphp">trunk/src/wp-includes/block-supports/block-style-variations.php</a></li>
<li><a href="#trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp">trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php</a></li>
<li><a href="#trunktestsphpunittestsblocksupportsblockstylevariationsphp">trunk/tests/phpunit/tests/block-supports/block-style-variations.php</a></li>
<li><a href="#trunktestsphpunittestsrestapirestglobalstylescontrollerphp">trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesblocksupportsblockstylevariationsphp"></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/block-style-variations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/block-supports/block-style-variations.php 2024-06-12 06:09:10 UTC (rev 58393)
+++ trunk/src/wp-includes/block-supports/block-style-variations.php 2024-06-12 07:15:06 UTC (rev 58394)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -213,9 +213,6 @@
</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"> * Collects block style variation data for merging with theme.json data.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * As each block style variation is processed it is registered if it hasn't
- * been already. This registration is required for later sanitization of
- * theme.json data.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 6.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -224,7 +221,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array Block variations data to be merged under `styles.blocks`.
</span><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_resolve_and_register_block_style_variations( $variations ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+function wp_resolve_block_style_variations( $variations ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $variations_data = array();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $variations ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,7 +228,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return $variations_data;
</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">- $registry = WP_Block_Styles_Registry::get_instance();
</del><span class="cx" style="display: block; padding: 0 10px"> $have_named_variations = ! wp_is_numeric_array( $variations );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $variations as $key => $variation ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -253,23 +249,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Block style variations read in via standalone theme.json partials
</span><span class="cx" style="display: block; padding: 0 10px"> * need to have their name set to the kebab case version of their title.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
- $variation_label = $variation['title'] ?? $variation_name;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( $supported_blocks as $block_type ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $registered_styles = $registry->get_registered_styles_for_block( $block_type );
-
- // Register block style variation if it hasn't already been registered.
- if ( ! array_key_exists( $variation_name, $registered_styles ) ) {
- register_block_style(
- $block_type,
- array(
- 'name' => $variation_name,
- 'label' => $variation_label,
- )
- );
- }
-
</del><span class="cx" style="display: block; padding: 0 10px"> // Add block style variation data under current block type.
</span><span class="cx" style="display: block; padding: 0 10px"> $path = array( $block_type, 'variations', $variation_name );
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_array_set( $variations_data, $path, $variation_data );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -327,7 +309,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_resolve_block_style_variations_from_theme_style_variation( $theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_data = $theme_json->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $shared_variations = $theme_json_data['styles']['blocks']['variations'] ?? array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variations_data = wp_resolve_and_register_block_style_variations( $shared_variations );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variations_data = wp_resolve_block_style_variations( $shared_variations );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_merge_block_style_variations_data( $variations_data, $theme_json, 'user' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -345,7 +327,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_resolve_block_style_variations_from_theme_json_partials( $theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $block_style_variations = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variations_data = wp_resolve_and_register_block_style_variations( $block_style_variations );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variations_data = wp_resolve_block_style_variations( $block_style_variations );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_merge_block_style_variations_data( $variations_data, $theme_json );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -364,7 +346,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_resolve_block_style_variations_from_primary_theme_json( $theme_json ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme_json_data = $theme_json->get_data();
</span><span class="cx" style="display: block; padding: 0 10px"> $block_style_variations = $theme_json_data['styles']['blocks']['variations'] ?? array();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $variations_data = wp_resolve_and_register_block_style_variations( $block_style_variations );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $variations_data = wp_resolve_block_style_variations( $block_style_variations );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return wp_merge_block_style_variations_data( $variations_data, $theme_json );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -422,3 +404,97 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_theme_json_data_theme', 'wp_resolve_block_style_variations_from_styles_registry', 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_theme_json_data_user', 'wp_resolve_block_style_variations_from_theme_style_variation', 10, 1 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * Registers any block style variations contained within the provided
+ * theme.json data.
+ *
+ * @since 6.6.0
+ * @access private
+ *
+ * @param array $variations Shared block style variations.
+ */
+function wp_register_block_style_variations_from_theme_json_data( $variations ) {
+ if ( empty( $variations ) ) {
+ return $variations;
+ }
+
+ $registry = WP_Block_Styles_Registry::get_instance();
+ $have_named_variations = ! wp_is_numeric_array( $variations );
+
+ foreach ( $variations as $key => $variation ) {
+ $supported_blocks = $variation['blockTypes'] ?? array();
+
+ /*
+ * Standalone theme.json partial files for block style variations
+ * will have their styles under a top-level property by the same name.
+ * Variations defined within an existing theme.json or theme style
+ * variation will themselves already be the required styles data.
+ */
+ $variation_data = $variation['styles'] ?? $variation;
+
+ if ( empty( $variation_data ) ) {
+ continue;
+ }
+
+ /*
+ * Block style variations read in via standalone theme.json partials
+ * need to have their name set to the kebab case version of their title.
+ */
+ $variation_name = $have_named_variations ? $key : _wp_to_kebab_case( $variation['title'] );
+ $variation_label = $variation['title'] ?? $variation_name;
+
+ foreach ( $supported_blocks as $block_type ) {
+ $registered_styles = $registry->get_registered_styles_for_block( $block_type );
+
+ // Register block style variation if it hasn't already been registered.
+ if ( ! array_key_exists( $variation_name, $registered_styles ) ) {
+ register_block_style(
+ $block_type,
+ array(
+ 'name' => $variation_name,
+ 'label' => $variation_label,
+ )
+ );
+ }
+ }
+ }
+}
+
+/**
+ * Register shared block style variations defined by the theme.
+ *
+ * These can come in three forms:
+ * - the theme's theme.json
+ * - the theme's partials (standalone files in `/styles` that only define block style variations)
+ * - the user's theme.json (for example, theme style variations the user selected)
+ *
+ * @since 6.6.0
+ * @access private
+ */
+function wp_register_block_style_variations_from_theme() {
+ // Partials from `/styles`.
+ $variations_partials = WP_Theme_JSON_Resolver::get_style_variations( 'block' );
+ wp_register_block_style_variations_from_theme_json_data( $variations_partials );
+
+ /*
+ * Pull the data from the specific origin instead of the merged data.
+ * This is because, for 6.6, we only support registering block style variations
+ * for the 'theme' and 'custom' origins but not for 'default' (core theme.json)
+ * or 'custom' (theme.json in a block).
+ *
+ * When/If we add support for every origin, we should switch to using the public API
+ * instead, e.g.: wp_get_global_styles( array( 'blocks', 'variations' ) ).
+ */
+
+ // theme.json of the theme.
+ $theme_json_theme = WP_Theme_JSON_Resolver::get_theme_data();
+ $variations_theme = $theme_json_theme->get_data()['styles']['blocks']['variations'] ?? array();
+ wp_register_block_style_variations_from_theme_json_data( $variations_theme );
+
+ // User data linked for this theme.
+ $theme_json_user = WP_Theme_JSON_Resolver::get_user_data();
+ $variations_user = $theme_json_user->get_data()['styles']['blocks']['variations'] ?? array();
+ wp_register_block_style_variations_from_theme_json_data( $variations_user );
+}
+add_action( 'init', 'wp_register_block_style_variations_from_theme' );
</ins></span></pre></div>
<a id="trunksrcwpincludesrestapiendpointsclasswprestglobalstylescontrollerphp"></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/rest-api/endpoints/class-wp-rest-global-styles-controller.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2024-06-12 06:09:10 UTC (rev 58393)
+++ trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-global-styles-controller.php 2024-06-12 07:15:06 UTC (rev 58394)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -231,6 +231,7 @@
</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 class="cx" style="display: block; padding: 0 10px"> * @since 6.2.0 Added validation of styles.css property.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 6.6.0 Added registration of newly created style variations provided by the user.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_REST_Request $request Request object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return stdClass|WP_Error Prepared item on success. WP_Error on when the custom CSS is not valid.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -263,6 +264,25 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $existing_config['styles'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $config['styles'] = $existing_config['styles'];
</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 the incoming request is going to create a new variation
+ * that is not yet registered, we register it here.
+ * This is because the variations are registered on init,
+ * but we want this endpoint to return the new variation immediately:
+ * if we don't register it, it'll be stripped out of the response
+ * just in this request (subsequent ones will be ok).
+ * Take the variations defined in styles.blocks.variations from the incoming request
+ * that are not part of the $exsting_config.
+ */
+ if ( isset( $request['styles']['blocks']['variations'] ) ) {
+ $existing_variations = isset( $existing_config['styles']['blocks']['variations'] ) ? $existing_config['styles']['blocks']['variations'] : array();
+ $new_variations = array_diff_key( $request['styles']['blocks']['variations'], $existing_variations );
+ if ( ! empty( $new_variations ) ) {
+ wp_register_block_style_variations_from_theme_json_data( $new_variations );
+ }
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $request['settings'] ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $config['settings'] = $request['settings'];
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( isset( $existing_config['settings'] ) ) {
</span></span></pre></div>
<a id="trunktestsphpunittestsblocksupportsblockstylevariationsphp"></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/block-supports/block-style-variations.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/block-supports/block-style-variations.php 2024-06-12 06:09:10 UTC (rev 58393)
+++ trunk/tests/phpunit/tests/block-supports/block-style-variations.php 2024-06-12 07:15:06 UTC (rev 58394)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -65,6 +65,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_add_registered_block_styles_to_theme_data() {
</span><span class="cx" style="display: block; padding: 0 10px"> switch_theme( 'block-theme' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /*
+ * Trigger block style registration that occurs on `init` action.
+ * do_action( 'init' ) could be used here however this direct call
+ * means only the updates being tested are performed.
+ */
+ wp_register_block_style_variations_from_theme();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $variation_styles_data = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'color' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'background' => 'darkslateblue',
</span></span></pre></div>
<a id="trunktestsphpunittestsrestapirestglobalstylescontrollerphp"></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-global-styles-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-global-styles-controller.php 2024-06-12 06:09:10 UTC (rev 58393)
+++ trunk/tests/phpunit/tests/rest-api/rest-global-styles-controller.php 2024-06-12 07:15:06 UTC (rev 58394)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -603,6 +603,55 @@
</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 the submission of a custom block style variation that was defined
+ * within a theme style variation and wouldn't be registered at the time
+ * of saving via the API.
+ *
+ * @covers WP_REST_Global_Styles_Controller_Gutenberg::update_item
+ * @ticket 61312
+ */
+ public function test_update_item_with_custom_block_style_variations() {
+ wp_set_current_user( self::$admin_id );
+ if ( is_multisite() ) {
+ grant_super_admin( self::$admin_id );
+ }
+
+ $group_variations = array(
+ 'fromThemeStyleVariation' => array(
+ 'color' => array(
+ 'background' => '#ffffff',
+ 'text' => '#000000',
+ ),
+ ),
+ );
+
+ $request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' . self::$global_styles_id );
+ $request->set_body_params(
+ array(
+ 'styles' => array(
+ 'blocks' => array(
+ 'variations' => array(
+ 'fromThemeStyleVariation' => array(
+ 'blockTypes' => array( 'core/group', 'core/columns' ),
+ 'color' => array(
+ 'background' => '#000000',
+ 'text' => '#ffffff',
+ ),
+ ),
+ ),
+ 'core/group' => array(
+ 'variations' => $group_variations,
+ ),
+ ),
+ ),
+ )
+ );
+ $response = rest_get_server()->dispatch( $request );
+ $data = $response->get_data();
+ $this->assertSame( $group_variations, $data['styles']['blocks']['core/group']['variations'] );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * @doesNotPerformAssertions
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_delete_item() {
</span></span></pre>
</div>
</div>
</body>
</html>