← All changes
|
modules/google-fonts/current/class-jetpack-google-font-face.php
+19
-7
13.7.2
→
16.3-a.5
View file →
| @@ -8,8 +8,10 @@ | ||
| 8 | 8 | /** |
| 9 | 9 | * Jetpack Google Font Face disables Font Face hooks in Core that prints **ALL** font faces. |
| 10 | 10 | * Instead, it collects fonts that are used in global styles or block-level settings and |
| 11 | 11 | * print those fonts in use. |
| 12 | + * | |
| 13 | + * @phan-constructor-used-for-side-effects | |
| 12 | 14 | */ |
| 13 | 15 | class Jetpack_Google_Font_Face { |
| 14 | 16 | /** |
| 15 | 17 | * The fonts that are used in global styles or block-level settings. |
| @@ -26,9 +28,14 @@ | ||
| 26 | 28 | add_action( 'wp_loaded', array( $this, 'wp_loaded' ) ); |
| 27 | 29 | add_action( 'current_screen', array( $this, 'current_screen' ), 10 ); |
| 28 | 30 | |
| 29 | 31 | // Collect and print fonts in use |
| 30 | - add_action( 'wp_head', array( $this, 'print_font_faces' ), 50 ); | |
| 32 | + if ( wp_is_block_theme() ) { | |
| 33 | + add_action( 'wp_head', array( $this, 'print_font_faces' ), 50 ); | |
| 34 | + } else { | |
| 35 | + // In classic themes wp_head runs before the blocks are processed to collect the block fonts. | |
| 36 | + add_action( 'wp_footer', array( $this, 'print_font_faces' ), 50 ); | |
| 37 | + } | |
| 31 | 38 | add_filter( 'pre_render_block', array( $this, 'collect_block_fonts' ), 10, 2 ); |
| 32 | 39 | } |
| 33 | 40 | |
| 34 | 41 | /** |
| @@ -36,8 +43,11 @@ | ||
| 36 | 43 | */ |
| 37 | 44 | public function wp_loaded() { |
| 38 | 45 | remove_action( 'wp_head', 'wp_print_fonts', 50 ); |
| 39 | 46 | remove_action( 'wp_head', 'wp_print_font_faces', 50 ); |
| 47 | + // Gutenberg 22.4+ overrides Core's font printing with its own function | |
| 48 | + // for classic theme support. Remove it so we can print only fonts in use. | |
| 49 | + remove_action( 'wp_head', 'gutenberg_print_font_faces', 50 ); | |
| 40 | 50 | } |
| 41 | 51 | |
| 42 | 52 | /** |
| 43 | 53 | * Turn off hooks to print fonts on wp-admin, except for GB editor pages. |
| @@ -63,9 +73,9 @@ | ||
| 63 | 73 | $fonts_in_use = array_map( |
| 64 | 74 | function ( $font_slug ) use ( $font_slug_aliases ) { |
| 65 | 75 | return $font_slug_aliases[ $font_slug ] ?? $font_slug; |
| 66 | 76 | }, |
| 67 | - $this->fonts_in_use | |
| 77 | + $fonts_in_use | |
| 68 | 78 | ); |
| 69 | 79 | |
| 70 | 80 | foreach ( $fonts as $font_faces ) { |
| 71 | 81 | $font_family = $font_faces[0]['font-family'] ?? ''; |
| @@ -163,8 +173,11 @@ | ||
| 163 | 173 | $theme_json = WP_Theme_JSON_Resolver::get_theme_data(); |
| 164 | 174 | $raw_data = $theme_json->get_data(); |
| 165 | 175 | if ( ! empty( $raw_data['settings']['typography']['fontFamilies'] ) ) { |
| 166 | 176 | foreach ( $raw_data['settings']['typography']['fontFamilies'] as $font ) { |
| 177 | + if ( ! isset( $font['fontFamily'] ) ) { | |
| 178 | + continue; | |
| 179 | + } | |
| 167 | 180 | $font_family_name = $this->format_font( $this->get_font_family_name( $font ) ); |
| 168 | 181 | $font_slug = $font['slug'] ?? ''; |
| 169 | 182 | if ( $font_slug && $font_slug !== $font_family_name && ! array_key_exists( $font_slug, $font_slug_aliases ) ) { |
| 170 | 183 | $font_slug_aliases[ $font_slug ] = $font_family_name; |
| @@ -209,11 +222,10 @@ | ||
| 209 | 222 | if ( ! is_string( $font_family ) ) { |
| 210 | 223 | return null; |
| 211 | 224 | } |
| 212 | 225 | |
| 213 | - // Full string: var(--wp--preset--font-family--slug). | |
| 214 | - // We do not care about the origin of the font, only its slug. | |
| 215 | - preg_match( '/font-family--(?P<slug>.+)\)$/', $font_family, $matches ); | |
| 226 | + // A preset reference can include a var() fallback and a trailing font stack. | |
| 227 | + preg_match( '/^\s*var\(\s*--wp--preset--font-family--(?P<slug>[^\s,()]+)\s*[,)]/', $font_family, $matches ); | |
| 216 | 228 | |
| 217 | 229 | if ( isset( $matches['slug'] ) ) { |
| 218 | 230 | return $matches['slug']; |
| 219 | 231 | } |
| @@ -219,15 +231,15 @@ | ||
| 219 | 231 | } |
| 220 | 232 | |
| 221 | 233 | // Full string: var:preset|font-family|slug |
| 222 | 234 | // We do not care about the origin of the font, only its slug. |
| 223 | - preg_match( '/font-family\|(?P<slug>.+)$/', $font_family, $matches ); | |
| 235 | + preg_match( '/^\s*var:preset\|font-family\|(?P<slug>[^\s,]+)/', $font_family, $matches ); | |
| 224 | 236 | |
| 225 | 237 | if ( isset( $matches['slug'] ) ) { |
| 226 | 238 | return $matches['slug']; |
| 227 | 239 | } |
| 228 | 240 | |
| 229 | - return $font_family; | |
| 241 | + return self::get_font_family_name( $setting['typography'] ); | |
| 230 | 242 | } |
| 231 | 243 | |
| 232 | 244 | /** |
| 233 | 245 | * Check if the current screen is the block editor. |