← All changes
|
modules/google-fonts/current/class-jetpack-google-font-face.php
+58
-22
13.0.2
→
16.3-a.7
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. |
| @@ -53,16 +63,25 @@ | ||
| 53 | 63 | /** |
| 54 | 64 | * Print fonts that are used in global styles or block-level settings. |
| 55 | 65 | */ |
| 56 | 66 | public function print_font_faces() { |
| 57 | - $fonts = $this->get_fonts(); | |
| 58 | - $fonts_to_print = array(); | |
| 67 | + $fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json(); | |
| 68 | + $font_slug_aliases = $this->get_font_slug_aliases(); | |
| 69 | + $fonts_to_print = array(); | |
| 59 | 70 | |
| 60 | 71 | $this->collect_global_styles_fonts(); |
| 61 | - $this->fonts_in_use = array_values( array_unique( $this->fonts_in_use, SORT_STRING ) ); | |
| 62 | - foreach ( $fonts as $font_family => $font_faces ) { | |
| 63 | - if ( in_array( _wp_to_kebab_case( $font_family ), $this->fonts_in_use, true ) ) { | |
| 64 | - $fonts_to_print[ $font_family ] = $font_faces; | |
| 72 | + $fonts_in_use = array_values( array_unique( $this->fonts_in_use, SORT_STRING ) ); | |
| 73 | + $fonts_in_use = array_map( | |
| 74 | + function ( $font_slug ) use ( $font_slug_aliases ) { | |
| 75 | + return $font_slug_aliases[ $font_slug ] ?? $font_slug; | |
| 76 | + }, | |
| 77 | + $fonts_in_use | |
| 78 | + ); | |
| 79 | + | |
| 80 | + foreach ( $fonts as $font_faces ) { | |
| 81 | + $font_family = $font_faces[0]['font-family'] ?? ''; | |
| 82 | + if ( in_array( $this->format_font( $font_family ), $fonts_in_use, true ) ) { | |
| 83 | + $fonts_to_print[] = $font_faces; | |
| 65 | 84 | } |
| 66 | 85 | } |
| 67 | 86 | |
| 68 | 87 | if ( ! empty( $fonts_to_print ) ) { |
| @@ -124,32 +143,50 @@ | ||
| 124 | 143 | * |
| 125 | 144 | * @param string $font_slug The font slug. |
| 126 | 145 | */ |
| 127 | 146 | public function add_font( $font_slug ) { |
| 128 | - $this->fonts_in_use[] = _wp_to_kebab_case( $font_slug ); | |
| 147 | + if ( is_string( $font_slug ) ) { | |
| 148 | + $this->fonts_in_use[] = $this->format_font( $font_slug ); | |
| 149 | + } | |
| 129 | 150 | } |
| 130 | 151 | |
| 131 | 152 | /** |
| 132 | - * Get all font definitions from theme json. | |
| 153 | + * Format the given font slug. | |
| 154 | + * | |
| 155 | + * @example "ABeeZee" formats to "abeezee" | |
| 156 | + * @example "ADLaM Display" formats to "adlam-display" | |
| 157 | + * @param string $font_slug The font slug. | |
| 158 | + * @return string The formatted font slug. | |
| 133 | 159 | */ |
| 134 | - public function get_fonts() { | |
| 135 | - $fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json(); | |
| 160 | + public function format_font( $font_slug ) { | |
| 161 | + return _wp_to_kebab_case( strtolower( $font_slug ) ); | |
| 162 | + } | |
| 136 | 163 | |
| 137 | - // The font definition might define an alias slug name, so we have to add the map from the slug name to font faces. | |
| 138 | - // See https://github.com/WordPress/twentytwentyfour/blob/df92472089ede6fae5924c124a93c843b84e8cbd/theme.json#L215. | |
| 164 | + /** | |
| 165 | + * Get the font slug aliases that maps the font slug to the font family if they are different. | |
| 166 | + * | |
| 167 | + * The font definition may define an alias slug name, so we have to add the map from the slug name to the font family. | |
| 168 | + * See https://github.com/WordPress/twentytwentyfour/blob/df92472089ede6fae5924c124a93c843b84e8cbd/theme.json#L215. | |
| 169 | + */ | |
| 170 | + public function get_font_slug_aliases() { | |
| 171 | + $font_slug_aliases = array(); | |
| 172 | + | |
| 139 | 173 | $theme_json = WP_Theme_JSON_Resolver::get_theme_data(); |
| 140 | 174 | $raw_data = $theme_json->get_data(); |
| 141 | 175 | if ( ! empty( $raw_data['settings']['typography']['fontFamilies'] ) ) { |
| 142 | 176 | foreach ( $raw_data['settings']['typography']['fontFamilies'] as $font ) { |
| 143 | - $font_family_name = $this->get_font_family_name( $font ); | |
| 177 | + if ( ! isset( $font['fontFamily'] ) ) { | |
| 178 | + continue; | |
| 179 | + } | |
| 180 | + $font_family_name = $this->format_font( $this->get_font_family_name( $font ) ); | |
| 144 | 181 | $font_slug = $font['slug'] ?? ''; |
| 145 | - if ( $font_slug && ! array_key_exists( $font_slug, $fonts ) && array_key_exists( $font_family_name, $fonts ) ) { | |
| 146 | - $fonts[ $font_slug ] = $fonts[ $font_family_name ]; | |
| 182 | + if ( $font_slug && $font_slug !== $font_family_name && ! array_key_exists( $font_slug, $font_slug_aliases ) ) { | |
| 183 | + $font_slug_aliases[ $font_slug ] = $font_family_name; | |
| 147 | 184 | } |
| 148 | 185 | } |
| 149 | 186 | } |
| 150 | 187 | |
| 151 | - return $fonts; | |
| 188 | + return $font_slug_aliases; | |
| 152 | 189 | } |
| 153 | 190 | |
| 154 | 191 | /** |
| 155 | 192 | * Get the font family name from a font. |
| @@ -185,11 +222,10 @@ | ||
| 185 | 222 | if ( ! is_string( $font_family ) ) { |
| 186 | 223 | return null; |
| 187 | 224 | } |
| 188 | 225 | |
| 189 | - // Full string: var(--wp--preset--font-family--slug). | |
| 190 | - // We do not care about the origin of the font, only its slug. | |
| 191 | - 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 ); | |
| 192 | 228 | |
| 193 | 229 | if ( isset( $matches['slug'] ) ) { |
| 194 | 230 | return $matches['slug']; |
| 195 | 231 | } |
| @@ -195,15 +231,15 @@ | ||
| 195 | 231 | } |
| 196 | 232 | |
| 197 | 233 | // Full string: var:preset|font-family|slug |
| 198 | 234 | // We do not care about the origin of the font, only its slug. |
| 199 | - preg_match( '/font-family\|(?P<slug>.+)$/', $font_family, $matches ); | |
| 235 | + preg_match( '/^\s*var:preset\|font-family\|(?P<slug>[^\s,]+)/', $font_family, $matches ); | |
| 200 | 236 | |
| 201 | 237 | if ( isset( $matches['slug'] ) ) { |
| 202 | 238 | return $matches['slug']; |
| 203 | 239 | } |
| 204 | 240 | |
| 205 | - return $font_family; | |
| 241 | + return self::get_font_family_name( $setting['typography'] ); | |
| 206 | 242 | } |
| 207 | 243 | |
| 208 | 244 | /** |
| 209 | 245 | * Check if the current screen is the block editor. |