-
Notifications
You must be signed in to change notification settings - Fork 844
Google Fonts: Update the implementation of the print_font_faces (2nd try) #35986
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.
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
Conversation
* Google Fonts: Update the implementation of the print_font_faces * changelog
|
Are you an Automattician? Please test your changes on all WordPress.com environments to help mitigate accidental explosions.
Interested in more tips and information?
|
|
Thank you for your PR! When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:
This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖 The e2e test report can be found here. Please note that it can take a few minutes after the e2e tests checks are complete for the report to be available. Once your PR is ready for review, check one last time that all required checks appearing at the bottom of this PR are passing or skipped. Jetpack plugin: The Jetpack plugin has different release cadences depending on the platform:
If you have any questions about the release process, please ask in the #jetpack-releases channel on Slack. |
|
I am a bit lost. Is there any existing issue in production (or in theory) that this PR is fixing? |
The returned value of the WP_Font_Face_Resolver::get_fonts_from_theme_json() is changing to an indexed array (WordPress/wordpress-develop#6161). - if ( ! array_key_exists( $font_family_name, $fonts ) ) {
- $fonts[ $font_family_name ] = array();
- }
- $fonts[ $font_family_name ] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
+ $fonts[] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );For example, // before
$fonts = array(
'Inter' =>
array(
array(
'src' =>
array(
'https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf',
),
'font-family' => 'Inter',
'font-stretch' => 'normal',
'font-style' => 'normal',
'font-weight' => '200',
),
),
);
// after
$fonts = array(
array(
array(
'src' =>
array(
'https://example.org/assets/fonts/inter/Inter-VariableFont_slnt,wght.ttf',
),
'font-family' => 'Inter',
'font-stretch' => 'normal',
'font-style' => 'normal',
'font-weight' => '200',
),
),
);As a result, we cannot use the key (font family) of |
fushar
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the explanation. After adding debug statements here and there in my WoA site, I think I understand now.
This works well on Muscat and TT4 👍
Related to #35890, #35983, WordPress/gutenberg#59376
Proposed changes:
WP_Font_Face_Resolver::get_fonts_from_theme_json()is changing to an indexed array (here), so we cannot rely on the key of the returned value. As a result, this PR avoids using the key from the value and just loops the array to collect the fonts to print.$fonts_in_useto its actual font family to get rid of using the key from the returned value of theWP_Font_Face_Resolver::get_fonts_from_theme_json()Other information:
Jetpack product discussion
Does this pull request change what data or activity we track or use?
Testing instructions: