Skip to content

Backport theme.json version 3 migrations #6616

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

Closed
ajlende wants to merge 27 commits into from
Closed

Backport theme.json version 3 migrations #6616

Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
668c31e
Backport 58409 class-wp-theme-json.php
ajlende Jun 3, 2024
4c02184
Backport 58409 class-wp-theme-json-schema.php
ajlende May 23, 2024
a4e24a0
Backport 58409 class-wp-theme-json-data.php
ajlende May 23, 2024
4696b35
Backport 58409 class-wp-theme-json-resolver.php
ajlende May 23, 2024
97a24e0
Backport 58409 theme.json
ajlende May 23, 2024
719a4bd
Backport 58409 PHPUnit wpThemeJsonSchema.php
ajlende May 23, 2024
9a0e4b4
Backport 58409 PHPUnit wpThemeJson.php
ajlende May 23, 2024
915f254
Backport 58409 PHPUnit rest-global-styles-controller.php
ajlende May 23, 2024
2f9b431
Backport 58409 PHPUnit data
ajlende May 23, 2024
3769e79
Backport 61842 class-wp-theme-json.php
ajlende May 23, 2024
dc57d38
Backport 61842 class-wp-theme-json-resolver.php
ajlende May 23, 2024
943d9bb
Backport 61842 class-wp-theme-json-schema.php
ajlende May 23, 2024
0a33eb1
Backport 61842 theme.json
ajlende May 23, 2024
35695f2
Backport 61842 PHPUnit wpThemeJsonSchema.php
ajlende May 23, 2024
7599a7f
Backport 61842 PHPUnit wpThemeJson.php
ajlende May 23, 2024
ca161da
Merge 6.6 `@since` tags
ajlende Jun 3, 2024
caaeb72
Update LATEST_THEME_JSON_VERSION_SUPPORTED in font-faces controller
ajlende Jun 3, 2024
6569a11
Add default-font-sizes options for classic themes
ajlende Jun 3, 2024
d073251
Add default-spacing-sizes options for classic themes
ajlende Jun 3, 2024
93e3c82
Add editor-spacing-sizes for consistency
ajlende Jun 3, 2024
ea23bf0
Update LATEST_THEME_JSON_VERSION_SUPPORTED in font-families controller
ajlende Jun 3, 2024
afe235e
Fix phpunit tests
ajlende Jun 3, 2024
1b583a1
Update wp-api-generated
ajlende Jun 3, 2024
1e93db4
Added 6.6.0 doc comments
ajlende Jun 3, 2024
c8cdcc1
register_theme_feature( 'editor-spacing-sizes' )
ajlende Jun 4, 2024
5214e4f
Copy spacingSizes from editor-spacing-sizes
ajlende Jun 4, 2024
6b6d2b6
Fix tests
ajlende Jun 4, 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
Prev Previous commit
Next Next commit
Add default-font-sizes options for classic themes
  • Loading branch information
@ajlende @ellatrix
ajlende authored and ellatrix committed Jun 4, 2024
commit 6569a11ffd3fe5c4a7c5f9e53eddcf0df20a2dac
13 changes: 13 additions & 0 deletions src/wp-includes/class-wp-theme-json-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -310,6 +310,19 @@ public static function get_theme_data( $deprecated = array(), $options = array()
}
$theme_support_data['settings']['color']['defaultGradients'] = $default_gradients;

if ( ! isset( $theme_support_data['settings']['typography'] ) ) {
$theme_support_data['settings']['typography'] = array();
}
$default_font_sizes = false;
if ( current_theme_supports( 'default-font-sizes' ) ) {
$default_font_sizes = true;
}
if ( ! isset( $theme_support_data['settings']['typography']['fontSizes'] ) ) {
// If the theme does not have any font sizes, we still want to show the core one.
$default_font_sizes = true;
Copy link
Member

@ramonjd ramonjd Jun 4, 2024

Choose a reason for hiding this comment

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

I haven't tested, but optional for follow up, these conditions return bools so the return value can be used to set the var, e.g.,

$default_font_sizes = ! isset( $theme_support_data['settings']['typography']['fontSizes'] );

Not really required though, just filling space here... 😄

Copy link
Author

@ajlende ajlende Jun 4, 2024

Choose a reason for hiding this comment

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

The whole thing could use a refactor. I chose to use the same structure as colors, gradients, and shadows above and below this for now to be clear that it was doing exactly the same thing as those other settings. https://github.com/WordPress/wordpress-develop/pull/6616/files#diff-d6b86476eed058e7cf8b6e57fa52c4fd75b1f0907e1a9ccb0149528a24f7578bR294-R302

}
$theme_support_data['settings']['typography']['defaultFontSizes'] = $default_font_sizes;

if ( ! isset( $theme_support_data['settings']['shadow'] ) ) {
$theme_support_data['settings']['shadow'] = array();
}
Expand Down