Skip to content

Make child themes inherit parent's style variations. #46554

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

Merged
jffng merged 15 commits into from
Jan 18, 2023
Merged

Make child themes inherit parent's style variations. #46554

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
176d5a2
Include parent theme dir in style variation getter.
jffng Dec 14, 2022
5e6133b
Fix mismatched variable names.
jffng Dec 14, 2022
06e756a
Refactor to static utility function.
jffng Dec 16, 2022
6a94315
Check for naming collisions via basename.
jffng Dec 16, 2022
b3f2162
Fix linting errors and warnings.
jffng Dec 16, 2022
621ba97
Rebase trunk.
jffng Jan 11, 2023
34f972f
Update version since.
jffng Jan 11, 2023
e704e85
Use _Gutenberg class.
jffng Jan 11, 2023
745cea6
Add back line break.
jffng Jan 11, 2023
8e64d72
Fix linting errors.
jffng Jan 11, 2023
7b1018f
Refactor to allow parent theme variations to show up when child has n…
jffng Jan 11, 2023
2393211
Add unit test for resolver class.
jffng Jan 12, 2023
90f2780
Comment the test.
jffng Jan 12, 2023
7877289
Fix lint.
jffng Jan 12, 2023
fcfbc12
Rename variations to account for child overwriting parent variation.
jffng Jan 17, 2023
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
Prev Previous commit
Next Next commit
Add unit test for resolver class.
  • Loading branch information
@jffng @ockham
jffng authored and ockham committed Jan 16, 2023
commit 23932115883f2e60cb12411a82df4af512e1df7c
59 changes: 59 additions & 0 deletions phpunit/class-wp-theme-json-resolver-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -503,4 +503,63 @@ public function data_get_merged_data_returns_origin() {
);
}

public function test_get_style_variations_returns_all_variations() {
// Switch to a child theme.
switch_theme( 'block-theme-child' );
wp_set_current_user( self::$administrator_id );

$actual_settings = WP_Theme_JSON_Resolver_Gutenberg::get_style_variations();
$expected_settings = array(
array(
'version' => 2,
'title' => 'variation-child',
'settings' => array(
'blocks' => array(
'core/post-title' => array(
'color' => array(
'palette' => array(
'theme' => array(
array(
'slug' => 'light',
'name' => 'Light',
'color' => '#f1f1f1',
),
),
),
),
),
),
),
),
array(
'version' => 2,
'title' => 'variation',
'settings' => array(
'blocks' => array(
'core/paragraph' => array(
'color' => array(
'palette' => array(
'theme' => array(
array(
'slug' => 'light',
'name' => 'Light',
'color' => '#f2f2f2',
),
),
),
),
),
),
),
),
);
self::recursive_ksort( $actual_settings );
self::recursive_ksort( $expected_settings );

$this->assertSame(
$expected_settings,
$actual_settings
);
}

}
18 changes: 18 additions & 0 deletions phpunit/data/themedir1/block-theme-child/styles/variation-child.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"settings": {
"blocks": {
"core/post-title": {
"color": {
"palette": [
{
"slug": "light",
"name": "Light",
"color": "#f1f1f1"
}
]
}
}
}
}
}
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme-child/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
Copy link
Contributor Author

@jffng jffng Jan 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I updated the version number here, which seems like it was incorrect to begin with since it was already using the customTemplates and templateParts properties which were added in v2.

"settings": {
"color": {
"palette": [
Expand Down
18 changes: 18 additions & 0 deletions phpunit/data/themedir1/block-theme/styles/variation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"version": 2,
"settings": {
"blocks": {
"core/paragraph": {
"color": {
"palette": [
{
"slug": "light",
"name": "Light",
"color": "#f2f2f2"
}
]
}
}
}
}
}
2 changes: 1 addition & 1 deletion phpunit/data/themedir1/block-theme/theme.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": 1,
"version": 2,
"settings": {
"color": {
"palette": [
Expand Down