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

Jump to bottom

Font Face: Get name from "fontFamily" setting, not "name". #54615

Merged
merged 9 commits into from
Sep 22, 2023
Merged

Font Face: Get name from "fontFamily" setting, not "name". #54615

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
5689b53
Gets name from fontFamily as fallback check.
hellofromtonya Sep 19, 2023
370caf0
Move tests into existing test.
hellofromtonya Sep 19, 2023
1c1b96e
Do not use "name".
hellofromtonya Sep 19, 2023
8483b7f
trim quotes on font family name
matiasbenedetto Sep 20, 2023
e0f88c0
making sure the name value differs from fontFamily to validate that t…
matiasbenedetto Sep 20, 2023
60a5a50
validate trimming changes
matiasbenedetto Sep 20, 2023
014b4e3
Merge branch 'trunk' into fix/font-face/backup-font-family-name-check
matiasbenedetto Sep 20, 2023
084e83d
Merge branch 'trunk' into fix/font-face/backup-font-family-name-check
ironprogrammer Sep 22, 2023
29df9f8
Remove test temporarily
ironprogrammer Sep 22, 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
42 changes: 33 additions & 9 deletions lib/compat/wordpress-6.4/fonts/font-face/class-wp-font-face-resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,30 +56,54 @@ private static function parse_settings( array $settings ) {
foreach ( $settings['typography']['fontFamilies'] as $font_families ) {
foreach ( $font_families as $definition ) {

// // Skip if font-family "name" is not defined.
// if ( empty( $definition['name'] ) ) {
// continue;
// }

// Skip if "fontFace" is not defined, meaning there are no variations.
if ( empty( $definition['fontFace'] ) ) {
continue;
}

$font_family = $definition['name'];
// Skip if "fontFamily" is not defined.
if ( empty( $definition['fontFamily'] ) ) {
continue;
}

$font_family_name = static::maybe_parse_name_from_comma_separated_list( $definition['fontFamily'] );

// Skip if no font family is defined.
if ( empty( $font_family_name ) ) {
continue;
}

// Prepare the fonts array structure for this font-family.
if ( ! array_key_exists( $font_family, $fonts ) ) {
$fonts[ $font_family ] = array();
if ( ! array_key_exists( $font_family_name, $fonts ) ) {
$fonts[ $font_family_name ] = array();
}

$fonts[ $font_family ] = static::convert_font_face_properties( $definition['fontFace'], $font_family );
$fonts[ $font_family_name ] = static::convert_font_face_properties( $definition['fontFace'], $font_family_name );
}
}

return $fonts;
}

/**
* Parse font-family name from comma-separated lists.
*
* If the given `fontFamily` is a comma-separated lists (example: "Inter, sans-serif" ),
* parse and return the fist font from the list.
*
* @since 6.4.0
*
* @param string $font_family Font family `fontFamily' to parse.
* @return string Font-family name.
*/
private static function maybe_parse_name_from_comma_separated_list( $font_family ) {
if ( str_contains( $font_family, ',' ) ) {
$font_family = explode( ',', $font_family )[0];
}

return trim( $font_family, "\"'" );
}

/**
* Converts font-face properties from theme.json format.
*
Expand Down
Loading