Skip to content

fix: optimize google font loading #3567

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
bfintal merged 1 commit into from
Jul 31, 2025
Merged

fix: optimize google font loading #3567

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 14 additions & 6 deletions src/fonts.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,14 +45,14 @@ public static function gather_theme_fonts() {
$theme_fonts = WP_Font_Face_Resolver::get_fonts_from_theme_json();

foreach ( $theme_fonts as $key => $value ) {
self::$theme_fonts[] = $value[ 0 ][ 'font-family' ];
self::$theme_fonts[ $value[ 0 ][ 'font-family' ] ] = true;
}

return self::$theme_fonts;
}

public static function is_theme_font( $font_name ) {
return in_array( strtolower( $font_name ), self::gather_theme_fonts() );
return isset( self::gather_theme_fonts()[ strtolower( $font_name ) ] );
}

public function register_rest_fields() {
Expand All @@ -72,7 +72,7 @@ public function register_rest_fields() {
* @return array
*/
public static function get_theme_fonts() {
$response = self::gather_theme_fonts();
$response = array_keys( self::gather_theme_fonts() );

return new WP_REST_Response( $response, 200 );
}
Expand All @@ -87,6 +87,7 @@ public static function get_theme_fonts() {
class Stackable_Google_Fonts {

public static $google_fonts = [];
public static $done_registering = [];

function __construct() {
if ( is_frontend() ) {
Expand Down Expand Up @@ -116,7 +117,7 @@ public function gather_google_fonts( $block_content, $block ) {
}

public static function enqueue_frontend_block_fonts() {
self::enqueue_google_fonts( array_unique( self::$google_fonts ) );
self::enqueue_google_fonts( array_keys( self::$google_fonts ) );
}

public static function is_web_font( $font_name ) {
Expand All @@ -131,18 +132,25 @@ public function is_stackable_block( $block_name ) {
}

public static function register_font( $font_name ) {
if ( isset( self::$done_registering[ $font_name ] ) ) {
return;
}

if ( ! self::is_web_font( $font_name ) ) {
self::$done_registering[ $font_name ] = true;
return;
}

if ( Stackable_Theme_Fonts::is_theme_font( $font_name ) ) {
self::$done_registering[ $font_name ] = true;
return;
}

if ( ! in_array( $font_name, self::$google_fonts ) ) {
if ( ! isset( self::$google_fonts[ $font_name ] ) ) {
// Allow themes to disable enqueuing fonts, helpful for custom fonts.
if ( apply_filters( 'stackable_enqueue_font', true, $font_name ) ) {
self::$google_fonts[] = $font_name;
self::$google_fonts[ $font_name ] = true;
self::$done_registering[ $font_name ] = true;

// Enqueue the fonts in the footer.
add_filter( 'wp_footer', array( 'Stackable_Google_Fonts', 'enqueue_frontend_block_fonts' ) );
Expand Down
Loading