Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Theme JSON: include block style variations in path only output of get_block_nodes #7784

Closed
wants to merge 3 commits into from
Closed

Theme JSON: include block style variations in path only output of get_block_nodes #7784

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ed1ed2
Including variations in the nodes array when 'include_node_paths_only…
ramonjd Nov 13, 2024
ab8e76d
Update tests/phpunit/tests/theme/wpThemeJson.php
ramonjd Nov 19, 2024
2b2934a
Update tests/phpunit/tests/theme/wpThemeJson.php
ramonjd Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/wp-includes/class-wp-theme-json.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2722,9 +2722,21 @@ private static function get_block_nodes( $theme_json, $selectors = array(), $opt
foreach ( $theme_json['styles']['blocks'] as $name => $node ) {
$node_path = array( 'styles', 'blocks', $name );
if ( $include_node_paths_only ) {
$nodes[] = array(
$variation_paths = array();
if ( $include_variations && isset( $node['variations'] ) ) {
foreach ( $node['variations'] as $variation => $variation_node ) {
$variation_paths[] = array(
'path' => array( 'styles', 'blocks', $name, 'variations', $variation ),
);
}
}
$node = array(
'path' => $node_path,
);
if ( ! empty( $variation_paths ) ) {
$node['variations'] = $variation_paths;
}
$nodes[] = $node;
} else {
$selector = null;
if ( isset( $selectors[ $name ]['selector'] ) ) {
Expand Down
79 changes: 79 additions & 0 deletions tests/phpunit/tests/theme/wpThemeJson.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2502,6 +2502,85 @@
$this->assertEquals( $expected, $block_nodes );
}

/**
* This test covers `get_block_nodes` with the `$include_node_paths_only`
* and `include_block_style_variations` options.
*
* @ticket 62399

Check failure on line 2509 in tests/phpunit/tests/theme/wpThemeJson.php

View workflow job for this annotation

GitHub Actions / PHP coding standards / Run coding standards checks 

Spaces must be used for mid-line alignment; tabs are not allowed

Check failure on line 2509 in tests/phpunit/tests/theme/wpThemeJson.php

View workflow job for this annotation

GitHub Actions / PHP coding standards / Run coding standards checks 

Whitespace found at end of line
*/
public function test_return_block_node_paths_with_variations() {
$theme_json = new ReflectionClass( 'WP_Theme_JSON' );

$func = $theme_json->getMethod( 'get_block_nodes' );
$func->setAccessible( true );

$theme_json = array(
'version' => WP_Theme_JSON::LATEST_SCHEMA,
'styles' => array(
'typography' => array(
'fontSize' => '16px',
),
'blocks' => array(
'core/button' => array(
'color' => array(
'background' => 'red',
),
'variations' => array(
'cheese' => array(
'color' => array(
'background' => 'cheese',
),
),
),
),
'core/group' => array(
'color' => array(
'background' => 'blue',
),
'variations' => array(
'apricot' => array(
'color' => array(
'background' => 'apricot',
),
),
),
),
),
),
);

$block_nodes = $func->invoke(
null,
$theme_json,
array(),
array(
'include_node_paths_only' => true,
'include_block_style_variations' => true,
)
);

$expected = array(
array(
'path' => array( 'styles', 'blocks', 'core/button' ),
'variations' => array(
array(
'path' => array( 'styles', 'blocks', 'core/button', 'variations', 'cheese' ),
),
),
),
array(
'path' => array( 'styles', 'blocks', 'core/group' ),
'variations' => array(
array(
'path' => array( 'styles', 'blocks', 'core/group', 'variations', 'apricot' ),
),
),
),
);

$this->assertEquals( $expected, $block_nodes );
}

/**
* @ticket 54336
*/
Expand Down
Loading