Skip to content

Google Fonts: Update the implementation of the print_font_faces #35890

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
arthur791004 merged 2 commits into from
Feb 26, 2024
Merged

Google Fonts: Update the implementation of the print_font_faces #35890

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cae3929
Google Fonts: Update the implementation of the print_font_faces
arthur791004 Feb 23, 2024
504b754
changelog
arthur791004 Feb 23, 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
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/update-google-fonts-print-font-faces
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: minor
Type: other

Google Fonts: Update the implement of print_font_faces as the value of WP_Font_Face_Resolver::get_fonts_from_theme_json may be an indexed array
33 changes: 21 additions & 12 deletions projects/plugins/jetpack/modules/google-fonts/current/class-jetpack-google-font-face.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,21 @@ public function current_screen() {
* Print fonts that are used in global styles or block-level settings.
*/
public function print_font_faces() {
$fonts = $this->get_fonts();
$fonts_to_print = array();
$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
$font_slug_aliases = $this->get_font_slug_aliases();
$fonts_to_print = array();

$this->collect_global_styles_fonts();
$this->fonts_in_use = array_values( array_unique( $this->fonts_in_use, SORT_STRING ) );
$fonts_in_use = array_values( array_unique( $this->fonts_in_use, SORT_STRING ) );
$fonts_in_use = array_map(
function ( $font_slug ) use ( $font_slug_aliases ) {
return $font_slug_aliases[ $font_slug ] ?? $font_slug;
},
$this->fonts_in_use
);

foreach ( $fonts as $font_family => $font_faces ) {
if ( in_array( $this->format_font( $font_family ), $this->fonts_in_use, true ) ) {
if ( in_array( $this->format_font( $font_family ), $fonts_in_use, true ) ) {
$fonts_to_print[ $font_family ] = $font_faces;
}
}
Expand Down Expand Up @@ -141,26 +149,27 @@ public function format_font( $font_slug ) {
}

/**
* Get all font definitions from theme json.
* Get the font slug aliases that maps the font slug to the font family if they are different.
*
* The font definition may define an alias slug name, so we have to add the map from the slug name to the font family.
* See https://github.com/WordPress/twentytwentyfour/blob/df92472089ede6fae5924c124a93c843b84e8cbd/theme.json#L215.
*/
public function get_fonts() {
$fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();
public function get_font_slug_aliases() {
$font_slug_aliases = array();

// The font definition might define an alias slug name, so we have to add the map from the slug name to font faces.
// See https://github.com/WordPress/twentytwentyfour/blob/df92472089ede6fae5924c124a93c843b84e8cbd/theme.json#L215.
$theme_json = WP_Theme_JSON_Resolver::get_theme_data();
$raw_data = $theme_json->get_data();
if ( ! empty( $raw_data['settings']['typography']['fontFamilies'] ) ) {
foreach ( $raw_data['settings']['typography']['fontFamilies'] as $font ) {
$font_family_name = $this->get_font_family_name( $font );
$font_slug = $font['slug'] ?? '';
if ( $font_slug && ! array_key_exists( $font_slug, $fonts ) && array_key_exists( $font_family_name, $fonts ) ) {
$fonts[ $font_slug ] = $fonts[ $font_family_name ];
if ( $font_slug && $font_slug !== $font_family_name && ! array_key_exists( $font_slug, $font_slug_aliases ) ) {
$font_slug_aliases[ $font_slug ] = $font_family_name;
}
}
}

return $fonts;
return $font_slug_aliases;
}

/**
Expand Down