Remove unused code

blockbase/functions.php

@@ -1,9 +1,8 @@
 <?php
 
+// Load Jetpack packages included with theme (Jetpack plugin is not required).
 require_once 'vendor/autoload.php';
 
-$blockbase_block_font_families = array();
-
 if ( ! function_exists( 'blockbase_support' ) ) :
 	function blockbase_support() {
 		// Alignwide and alignfull classes in the block editor.
@@ -100,55 +99,18 @@ function blockbase_scripts() {
 }
 add_action( 'wp_enqueue_scripts', 'blockbase_scripts' );
 
-/**
- * Add Google webfonts
- *
- * @return $fonts_url
- */
-function blockbase_fonts_url() {
-	global $blockbase_block_font_families;
-
-	$font_families = [];
-	$global_styles_fonts = \Automattic\Jetpack\Fonts\Introspectors\Global_Styles::collect_fonts_from_global_styles();
-	$fonts_to_load = array_merge( $blockbase_block_font_families, $global_styles_fonts );
-	$fonts_to_load = array_unique( $fonts_to_load );
-	$font_settings = blockbase_get_font_settings();
-
-	foreach( $fonts_to_load as $font_slug ) {
-		if ( isset( $font_settings[ $font_slug ]['google'] ) ) {
-			$font_families[] = $font_settings[ $font_slug ]['google'];
-		}
-	}
-
-	if ( empty( $font_families ) ) {
-		return '';
-	}
-
-	// Make a single request for the theme or user fonts.
-	return esc_url_raw( 'https://fonts.googleapis.com/css2?' . implode( '&', array_unique( $font_families ) ) . '&display=swap' );
-}
-
-function blockbase_get_font_settings() {
-	$font_settings = wp_get_global_settings( array( 'typography', 'fontFamilies' ) );
-	$remapped_font_settings = array();
-
-	foreach( $font_settings['theme'] as $font ) {
-		$remapped_font_settings[ $font['slug'] ] = $font;
-	}
-
-	return $remapped_font_settings;
-}
-
 /**
  * Customize Global Styles
  */
 if ( class_exists( 'WP_Theme_JSON_Resolver_Gutenberg' ) ) {
 	require get_template_directory() . '/inc/customizer/wp-customize-colors.php';
 	require get_template_directory() . '/inc/customizer/wp-customize-color-palettes.php';
-	require get_template_directory() . '/inc/customizer/wp-customize-fonts.php';
 	require get_template_directory() . '/inc/social-navigation.php';
 }
 
+// Font settings migration and deprecation message. Fonts now set in Global Styles.
+require get_template_directory() . '/inc/customizer/wp-customize-fonts.php';
+
 // Force menus to reload
 add_action(
 	'customize_controls_enqueue_scripts',
@@ -181,13 +143,69 @@ if ( file_exists( get_stylesheet_directory() . '/inc/block-patterns.php' ) ) {
 	require_once get_stylesheet_directory() . '/inc/block-patterns.php';
 }
 
-function blockbase_disable_jetpack_google_fonts() {
-	if ( method_exists( 'Jetpack', 'is_module_active' ) && Jetpack::is_module_active( 'google-fonts' ) ) {
-		Jetpack::deactivate_module( 'google-fonts' );
+
+// ----------	Custom Fonts ---------- //
+
+/**
+ * Font families used in block settings.
+ *
+ * @var array
+ */
+$blockbase_block_font_families = array();
+
+/**
+ * Generate url used to load font-face css from Google.
+ *
+ * @return string
+ */
+function blockbase_fonts_url() {
+	global $blockbase_block_font_families;
+
+	$font_families = [];
+	$global_styles_fonts = \Automattic\Jetpack\Fonts\Introspectors\Global_Styles::collect_fonts_from_global_styles();
+	$fonts_to_load = array_merge( $blockbase_block_font_families, $global_styles_fonts );
+	$fonts_to_load = array_unique( $fonts_to_load );
+	$font_settings = blockbase_get_font_settings();
+
+	foreach( $fonts_to_load as $font_slug ) {
+		if ( isset( $font_settings[ $font_slug ]['google'] ) ) {
+			$font_families[] = $font_settings[ $font_slug ]['google'];
+		}
 	}
+
+	if ( empty( $font_families ) ) {
+		return '';
+	}
+
+	// Make a single request for the theme or user fonts.
+	return esc_url_raw( 'https://fonts.googleapis.com/css2?' . implode( '&', array_unique( $font_families ) ) . '&display=swap' );
 }
-add_action( 'init', 'blockbase_disable_jetpack_google_fonts', 0 );
 
+/**
+ * Get an array of the fonts from theme.json, with font slug as the key.
+ *
+ * @return array
+ */
+function blockbase_get_font_settings() {
+	$font_settings = wp_get_global_settings( array( 'typography', 'fontFamilies' ) );
+	$remapped_font_settings = array();
+
+	foreach( $font_settings['theme'] as $font ) {
+		$remapped_font_settings[ $font['slug'] ] = $font;
+	}
+
+	return $remapped_font_settings;
+}
+
+/**
+ * Gather fonts set in block settings.
+ *
+ * @filter pre_render_block
+ *
+ * @param string|null $content The pre-rendered content. Default null.
+ * @param array       $parsed_block The block being rendered.
+ * @return string|null
+ */
 function blockbase_enqueue_block_fonts( $content, $parsed_block ) {
 	global $blockbase_block_font_families;
 
@@ -199,3 +217,17 @@ function blockbase_enqueue_block_fonts( $content, $parsed_block ) {
 	return $content;
 }
 add_filter( 'pre_render_block', 'blockbase_enqueue_block_fonts', 20, 2 );
+
+/**
+ * Disable the Jetpack Google Fonts module, since Blockbase provids it's own font loading.
+ *
+ * Prevents duplicate fonts in font family settings.
+ *
+ * @return void
+ */
+function blockbase_disable_jetpack_google_fonts() {
+	if ( method_exists( 'Jetpack', 'is_module_active' ) && Jetpack::is_module_active( 'google-fonts' ) ) {
+		Jetpack::deactivate_module( 'google-fonts' );
+	}
+}
+add_action( 'init', 'blockbase_disable_jetpack_google_fonts', 0 );

blockbase/inc/customizer/wp-customize-fonts.php

@@ -33,8 +33,8 @@ function migrate_blockbase_custom_fonts() {
 	}
 
 	// Get the user's global styles CPT id
-	$user_custom_post_type_id       = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
-	$global_styles_controller       = new Gutenberg_REST_Global_Styles_Controller();
+	$user_custom_post_type_id       = WP_Theme_JSON_Resolver::get_user_global_styles_post_id();
+	$global_styles_controller       = new WP_REST_Global_Styles_Controller();
 	$global_styles                  = fetch_global_styles( $user_custom_post_type_id, $global_styles_controller );
 	$blockbase_legacy_font_settings = $global_styles->data['settings']['typography']['fontFamilies']['custom'];
 
@@ -80,7 +80,6 @@ function migrate_blockbase_custom_fonts() {
 
 	update_global_styles( $new_settings, $new_styles, $user_custom_post_type_id, $global_styles_controller );
 
-	// TODO: Verify that we want to store an array
 	update_option( 'blockbase_legacy_font_settings', json_encode( $blockbase_legacy_font_settings ) );
 }
 
@@ -129,218 +128,8 @@ class GlobalStylesFontsCustomizer {
 
 	private $section_key = 'customize-global-styles-fonts';
 
-	private $font_settings;
-
-	private $font_control_default_body;
-	private $font_control_default_heading;
-
-	//Not all fonts support v2 of the API that allows for the shorter URls
-	//list of supported fonts: https://fonts.google.com/variablefonts
-	private $fonts = array(
-		'system-font'       => array(
-			'fontFamily' => '-apple-system,BlinkMacSystemFont,"Segoe UI",Roboto,Oxygen-Sans,Ubuntu,Cantarell,"Helvetica Neue",sans-serif',
-			'slug'       => 'system-font',
-			'name'       => 'System Font',
-		),
-		'arvo'              => array(
-			'fontFamily' => '"Arvo", serif',
-			'slug'       => 'arvo',
-			'name'       => 'Arvo',
-			'google'     => 'family=Arvo:ital,wght@0,400;0,700;1,400;1,700',
-		),
-		'bodoni-moda'       => array(
-			'fontFamily' => '"Bodoni Moda", serif',
-			'slug'       => 'bodoni-moda',
-			'name'       => 'Bodoni Moda',
-			'google'     => 'family=Bodoni+Moda:ital,wght@0,400..900;1,400..900',
-		),
-		'cabin'             => array(
-			'fontFamily' => '"Cabin", sans-serif',
-			'slug'       => 'cabin',
-			'name'       => 'Cabin',
-			'google'     => 'family=Cabin:ital,wght@0,400..700;1,400..700',
-		),
-		'chivo'             => array(
-			'fontFamily' => '"Chivo", sans-serif',
-			'slug'       => 'chivo',
-			'name'       => 'Chivo',
-			'google'     => 'family=Chivo:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900',
-		),
-		'courier-prime'     => array(
-			'fontFamily' => '"Courier Prime", serif',
-			'slug'       => 'courier-prime',
-			'name'       => 'Courier Prime',
-			'google'     => 'family=Courier+Prime:ital,wght@0,400;0,700;1,400;1,700',
-		),
-		'dm-sans'           => array(
-			'fontFamily' => '"DM Sans", sans-serif',
-			'slug'       => 'dm-sans',
-			'name'       => 'DM Sans',
-			'google'     => 'family=DM+Sans:ital,wght@0,400;0,500;0,700;1,400;1,500;1,700"',
-		),
-		'domine'            => array(
-			'fontFamily' => '"Domine", serif',
-			'slug'       => 'domine',
-			'name'       => 'Domine',
-			'google'     => 'family=Domine:wght@400..700',
-		),
-		'eb-garamond'       => array(
-			'fontFamily' => '"EB Garamond", serif',
-			'slug'       => 'eb-garamond',
-			'name'       => 'EB Garamond',
-			'google'     => 'family=EB+Garamond:ital,wght@0,400..800;1,400..800',
-		),
-		'fira-sans'         => array(
-			'fontFamily' => '"Fira Sans", sans-serif',
-			'slug'       => 'fira-sans',
-			'name'       => 'Fira Sans',
-			'google'     => 'family=Fira+Sans:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900',
-		),
-		'ibm-plex-mono'     => array(
-			'fontFamily' => '"IBM Plex Mono", monospace',
-			'slug'       => 'ibm-plex-mono',
-			'name'       => 'IBM Plex Mono',
-			'google'     => 'family=IBM+Plex+Mono:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;1,100;1,200;1,300;1,400;1,500;1,600;1,700',
-		),
-		'inter'             => array(
-			'fontFamily' => '"Inter", sans-serif',
-			'slug'       => 'inter',
-			'name'       => 'Inter',
-			'google'     => 'family=Inter:wght@100..900',
-		),
-		'josefin-sans'      => array(
-			'fontFamily' => '"Josefin Sans", sans-serif',
-			'slug'       => 'josefin-sans',
-			'name'       => 'Josefin Sans',
-			'google'     => 'family=Josefin+Sans:ital,wght@0,100..700;1,100..700',
-		),
-		'libre-baskerville' => array(
-			'fontFamily' => '"Libre Baskerville", serif',
-			'slug'       => 'libre-baskerville',
-			'name'       => 'Libre Baskerville',
-			'google'     => 'family=Libre+Baskerville:ital,wght@0,400;0,700;1,400',
-		),
-		'libre-franklin'    => array(
-			'fontFamily' => '"Libre Franklin", sans-serif',
-			'slug'       => 'libre-franklin',
-			'name'       => 'Libre Franklin',
-			'google'     => 'family=Libre+Franklin:ital,wght@0,100..900;1,100..900',
-		),
-		'lora'              => array(
-			'fontFamily' => '"Lora", serif',
-			'slug'       => 'lora',
-			'name'       => 'Lora',
-			'google'     => 'family=Lora:ital,wght@0,400..700;1,400..700',
-		),
-		'merriweather'      => array(
-			'fontFamily' => '"Merriweather", serif',
-			'slug'       => 'merriweather',
-			'name'       => 'Merriweather',
-			'google'     => 'family=Merriweather:ital,wght@0,300;0,400;0,700;0,900;1,300;1,400;1,700;1,900',
-		),
-		'montserrat'        => array(
-			'fontFamily' => '"Montserrat", sans-serif',
-			'slug'       => 'montserrat',
-			'name'       => 'Montserrat',
-			'google'     => 'family=Montserrat:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900',
-		),
-		'nunito'            => array(
-			'fontFamily' => '"Nunito", sans-serif',
-			'slug'       => 'nunito',
-			'name'       => 'Nunito',
-			'google'     => 'family=Nunito:ital,wght@0,200;0,300;0,400;0,600;0,700;0,800;0,900;1,200;1,300;1,400;1,600;1,700;1,800;1,900',
-		),
-		'open-sans'         => array(
-			'fontFamily' => '"Open Sans", sans-serif',
-			'slug'       => 'open-sans',
-			'name'       => 'Open Sans',
-			'google'     => 'family=Open+Sans:ital,wght@0,300;0,400;0,600;0,700;0,800;1,300;1,400;1,600;1,700;1,800',
-		),
-		'overpass'          => array(
-			'fontFamily' => '"Overpass", sans-serif',
-			'slug'       => 'overpass',
-			'name'       => 'Overpass',
-			'google'     => 'family=Overpass:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900',
-		),
-		'playfair-display'  => array(
-			'fontFamily' => '"Playfair Display", serif',
-			'slug'       => 'playfair-display',
-			'name'       => 'Playfair Display',
-			'google'     => 'family=Playfair+Display:ital,wght@0,400..900;1,400..900',
-		),
-		'poppins'           => array(
-			'fontFamily' => '"Poppins", sans-serif',
-			'slug'       => 'poppins',
-			'name'       => 'Poppins',
-			'google'     => 'family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900',
-		),
-		'raleway'           => array(
-			'fontFamily' => '"Raleway", sans-serif',
-			'slug'       => 'raleway',
-			'name'       => 'Raleway',
-			'google'     => 'family=Raleway:ital,wght@0,100..900;1,100..900',
-		),
-		'red-hat-display'   => array(
-			'fontFamily' => '"Red Hat Display", sans-serif',
-			'slug'       => 'red-hat-display',
-			'name'       => 'Red Hat Display',
-			'google'     => 'family=Red+Hat+Display:ital,wght@0,400;0,500;0,700;0,900;1,400;1,500;1,700;1,900',
-		),
-		'roboto'            => array(
-			'fontFamily' => '"Roboto", sans-serif',
-			'slug'       => 'roboto',
-			'name'       => 'Roboto',
-			'google'     => 'family=Roboto:ital,wght@0,100;0,300;0,400;0,500;0,700;0,900;1,100;1,300;1,400;1,500;1,700;1,800;1,900',
-		),
-		'roboto-slab'       => array(
-			'fontFamily' => '"Roboto Slab", sans-serif',
-			'slug'       => 'roboto-slab',
-			'name'       => 'Roboto Slab',
-			'google'     => 'family=Roboto+Slab:wght@100..900',
-		),
-		'rubik'             => array(
-			'fontFamily' => '"Rubik", sans-serif',
-			'slug'       => 'rubik',
-			'name'       => 'Rubik',
-			'google'     => 'family=Rubik:ital,wght@0,300..900;1,300..900',
-		),
-		'source-sans-pro'   => array(
-			'fontFamily' => '"Source Sans Pro", sans-serif',
-			'slug'       => 'source-sans-pro',
-			'name'       => 'Source Sans Pro',
-			'google'     => 'family=Source+Sans+Pro:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700;1,900',
-		),
-		'source-serif-pro'  => array(
-			'fontFamily' => '"Source Serif Pro", serif',
-			'slug'       => 'source-serif-pro',
-			'name'       => 'Source Serif Pro',
-			'google'     => 'family=Source+Serif+Pro:ital,wght@0,200;0,300;0,400;0,600;0,700;0,900;1,200;1,300;1,400;1,600;1,700;1,900',
-		),
-		'space-mono'        => array(
-			'fontFamily' => '"Space Mono", sans-serif',
-			'slug'       => 'space-mono',
-			'name'       => 'Space Mono',
-			'google'     => 'family=Space+Mono:ital,wght@0,400;0,700;1,400;1,700',
-		),
-		'work-sans'         => array(
-			'fontFamily' => '"Work Sans", sans-serif',
-			'slug'       => 'work-sans',
-			'name'       => 'Work Sans',
-			'google'     => 'family=Work+Sans:ital,wght@0,100..900;1,100..900',
-		),
-	);
-
 	function __construct() {
-		if ( get_option( 'blockbase_legacy_font_settings' )  ) {
-			add_action( 'customize_register', array( $this, 'init_deprecation_notice' ) );
-			return;
-		}
-
-		add_action( 'customize_register', array( $this, 'initialize' ) );
-		add_action( 'customize_preview_init', array( $this, 'handle_customize_preview_init' ) );
-		add_action( 'customize_register', array( $this, 'enqueue_google_fonts' ) );
-		add_action( 'customize_save_after', array( $this, 'handle_customize_save_after' ) );
-		add_action( 'customize_controls_enqueue_scripts', array( $this, 'customize_control_js' ) );
+		add_action( 'customize_register', array( $this, 'init_deprecation_notice' ) );
 	}
 
 	function generate_deprecation_message() {
@@ -372,12 +161,18 @@ class GlobalStylesFontsCustomizer {
 			)
 		);
 
+		$home_template = array_merge( _resolve_home_block_template(), array( 'styles' => 'open' ) );
+		$site_editor_url = add_query_arg(
+			$home_template,
+			admin_url( 'site-editor.php' )
+		);
+
 		// TODO: Can this link directly to Global Styles panel?
 		$wp_customize->add_control(
 			$this->section_key . '-site-editor-button',
 			array(
 				'type'        => 'hidden',
-				'description' => sprintf( '<a class="button button-primary" href=%s style="font-style: normal;" >Use Site Editor</a>', esc_url( admin_url( 'site-editor.php' ) ) ),
+				'description' => sprintf( '<a class="button button-primary" href=%s style="font-style: normal;" >Use Site Editor</a>', esc_url( $site_editor_url ) ),
 				'settings'    => array(),
 				'section'     => $this->section_key,
 			)
@@ -386,340 +181,6 @@ class GlobalStylesFontsCustomizer {
 		// TODO: add link to support doc
 		// https://wordpress.com/support/using-styles/
 	}
-
-	function handle_customize_preview_init( $wp_customize ) {
-		$this->update_font_settings( $wp_customize );
-		$this->customize_preview_js( $wp_customize );
-		$this->create_customization_style_element( $wp_customize );
-	}
-
-	function customize_preview_js( $wp_customize ) {
-		if ( $this->fonts && $this->font_settings ) {
-			wp_enqueue_script( 'customizer-preview-fonts', get_template_directory_uri() . '/inc/customizer/wp-customize-fonts-preview.js', array( 'customize-preview' ) );
-			wp_localize_script( 'customizer-preview-fonts', 'googleFonts', $this->fonts );
-			wp_localize_script( 'customizer-preview-fonts', 'fontSettings', $this->font_settings );
-		}
-	}
-
-	function customize_control_js() {
-		if ( $this->font_control_default_body && $this->font_control_default_heading ) {
-			wp_enqueue_script( 'customizer-font-control', get_template_directory_uri() . '/inc/customizer/wp-customize-fonts-control.js', array( 'customize-controls' ), null, true );
-			wp_localize_script( 'customizer-font-control', 'fontControlDefaultBody', array( $this->font_control_default_body ) );
-			wp_localize_script( 'customizer-font-control', 'fontControlDefaultHeading', array( $this->font_control_default_heading ) );
-		}
-	}
-
-	function enqueue_google_fonts() {
-		wp_enqueue_style( 'blockbase-google-fonts', $this->google_fonts_url(), array(), null );
-	}
-
-	function create_customization_style_element( $wp_customize ) {
-		if ( $this->font_settings ) {
-			wp_enqueue_style( 'global-styles-fonts-customizations', ' ', array( 'global-styles' ) ); // This needs to load after global_styles, hence the dependency
-			$css  = 'body {';
-			$css .= '--wp--preset--font-family--body-font:' . $this->font_settings['body'] . ';';
-			$css .= '--wp--preset--font-family--heading-font:' . $this->font_settings['heading'] . ';';
-			$css .= '}';
-			wp_add_inline_style( 'global-styles-fonts-customizations', $css );
-		}
-	}
-
-	function update_font_settings( $wp_customize ) {
-		$body_setting    = $wp_customize->get_setting( $this->section_key . 'body' );
-		$heading_setting = $wp_customize->get_setting( $this->section_key . 'heading' );
-		if ( $body_setting && $heading_setting ) {
-			$body_value = $body_setting->post_value();
-			if ( $body_value ) {
-				$body_font_setting           = $this->fonts[ $body_value ];
-				$this->font_settings['body'] = $body_font_setting['fontFamily'];
-			}
-
-			$heading_value = $heading_setting->post_value();
-			if ( $heading_value ) {
-				$heading_font_setting           = $this->fonts[ $heading_value ];
-				$this->font_settings['heading'] = $heading_font_setting['fontFamily'];
-			}
-		}
-	}
-
-	function google_fonts_url() {
-		$font_families = array();
-		foreach ( $this->fonts as $font ) {
-			if ( ! empty( $font['google'] ) ) {
-				$font_families[] = $font['google'];
-			}
-		}
-		$font_families[] = 'display=swap';
-
-		// Make a single request for the theme fonts.
-		return esc_url_raw( 'https://fonts.googleapis.com/css2?' . implode( '&', $font_families ) );
-	}
-
-	function initialize( $wp_customize ) {
-		$theme = wp_get_theme();
-
-		//Add a Section to the Customizer for these bits
-		$wp_customize->add_section(
-			$this->section_key,
-			array(
-				'capability'  => 'edit_theme_options',
-				'description' => sprintf( __( 'Font Customization for %1$s', 'blockbase' ), $theme->name ),
-				'title'       => __( 'Fonts', 'blockbase' ),
-			)
-		);
-
-		$merged_json                = WP_Theme_JSON_Resolver_Gutenberg::get_merged_data()->get_raw_data();
-		$theme_font_families        = $merged_json['settings']['typography']['fontFamilies']['theme'];
-		$body_font_default_array    = array_filter(
-			$theme_font_families,
-			function( $font_family ) {
-				return 'body-font' === $font_family['slug'];
-			}
-		);
-		$body_font_default          = array_shift( $body_font_default_array );
-		$heading_font_default_array = array_filter(
-			$theme_font_families,
-			function( $font_family ) {
-				return 'heading-font' === $font_family['slug'];
-			}
-		);
-		$heading_font_default       = array_shift( $heading_font_default_array );
-
-		// See if the child theme has been updated. If not then show a notice.
-		if ( ! $body_font_default && ! $heading_font_default ) {
-			$wp_customize->add_control(
-				$this->section_key . '-v1-blockbase-format-notice',
-				array(
-					'type'        => 'hidden',
-					'description' => '<div class="notice notice-warning">
-					<p>' . __( 'Your theme needs to be updated before you can customize fonts', 'blockbase' ) . '</p>
-					</div>',
-					'settings'    => array(),
-					'section'     => $this->section_key,
-				)
-			);
-
-			return;
-		}
-
-		if ( array_key_exists( 'custom', $merged_json['settings']['typography']['fontFamilies'] ) ) {
-			$merged_font_families     = $merged_json['settings']['typography']['fontFamilies']['custom'];
-			$body_font_selected_array = array_filter(
-				$merged_font_families,
-				function( $font_family ) {
-					return 'body-font' === $font_family['slug'];
-				}
-			);
-			$body_font_selected       = array_shift( $body_font_selected_array );
-
-			$heading_font_selected_array = array_filter(
-				$merged_font_families,
-				function( $font_family ) {
-					return 'heading-font' === $font_family['slug'];
-				}
-			);
-			$heading_font_selected       = array_shift( $heading_font_selected_array );
-
-			// NOTE: This should be removed once Gutenberg 12.1 lands stably in all environments
-		} elseif ( array_key_exists( 'user', $merged_json['settings']['typography']['fontFamilies'] ) ) {
-			$merged_font_families = $merged_json['settings']['typography']['fontFamilies']['user'];
-
-			$body_font_selected_array = array_filter(
-				$merged_font_families,
-				function( $font_family ) {
-					return 'body-font' === $font_family['slug'];
-				}
-			);
-			$body_font_selected       = array_shift( $body_font_selected_array );
-
-			$heading_font_selected_array = array_filter(
-				$merged_font_families,
-				function( $font_family ) {
-					return 'heading-font' === $font_family['slug'];
-				}
-			);
-			$heading_font_selected       = array_shift( $heading_font_selected_array );
-			// End Gutenberg < 12.1 compatibility patch
-
-		} else {
-			$body_font_selected    = $body_font_default;
-			$heading_font_selected = $heading_font_default;
-		}
-
-		// If there's no selected font then the user is probably using the old format for font customization
-		if ( $body_font_selected && $heading_font_selected ) {
-			$body_font_selected_font_family    = $body_font_selected['fontFamily'];
-			$body_font_selected_font_slug      = $body_font_selected['fontSlug'];
-			$heading_font_selected_font_family = $heading_font_selected['fontFamily'];
-			$heading_font_selected_font_slug   = $heading_font_selected['fontSlug'];
-		} else {
-			$body_font_selected_font_family    = null;
-			$body_font_selected_font_slug      = null;
-			$heading_font_selected_font_family = null;
-			$heading_font_selected_font_slug   = null;
-		}
-
-		$this->font_settings = array(
-			'body'    => $body_font_selected_font_family,
-			'heading' => $heading_font_selected_font_family,
-		);
-
-		// Add a reset button
-		$this->font_control_default_body    = $body_font_default['fontSlug'];
-		$this->font_control_default_heading = $heading_font_default['fontSlug'];
-		$wp_customize->add_control(
-			$this->section_key . '-reset-button',
-			array(
-				'type'        => 'button',
-				'settings'    => array(),
-				'section'     => $this->section_key,
-				'input_attrs' => array(
-					'value' => __( 'Reset to Default', 'blockbase' ),
-					'class' => 'button button-link',
-				),
-			)
-		);
-
-		$this->add_setting_and_control( $wp_customize, 'body', __( 'Body font', 'blockbase' ), $body_font_default['fontSlug'], $body_font_selected_font_slug, 'sanitize_title' );
-		$this->add_setting_and_control( $wp_customize, 'heading', __( 'Heading font', 'blockbase' ), $heading_font_default['fontSlug'], $heading_font_selected_font_slug, 'sanitize_title' );
-	}
-
-	function get_font_family( $array, $configuration ) {
-		$variable = get_settings_array( $array, $configuration );
-		$slug     = preg_replace( '/var\(--wp--preset--font-family--(.*)\)/', '$1', $variable );
-		if ( ! isset( $this->fonts[ $slug ] ) ) {
-			$this->fonts[ $slug ] = $this->build_font_from_theme_data( $slug, $configuration );
-		}
-		return $this->fonts[ $slug ];
-	}
-
-	function build_font_from_theme_data( $slug, $configuration ) {
-		$new_font      = array();
-		$font_families = $configuration['settings']['typography']['fontFamilies']['theme'];
-		foreach ( $font_families as $font_family ) {
-			if ( $font_family['slug'] === $slug ) {
-				$new_font['fontFamily'] = $font_family['fontFamily'];
-				$new_font['name']       = $font_family['name'];
-				if ( ! empty( $font_family['google'] ) ) {
-					$new_font['google'] = $font_family['google'];
-				}
-			}
-		}
-		$new_font['slug'] = $slug;
-		return $new_font;
-	}
-
-	function add_setting_and_control( $wp_customize, $name, $label, $default, $user_value, $sanitize_callback ) {
-		$setting_name          = $this->section_key . $name;
-		$global_styles_setting = new WP_Customize_Global_Styles_Setting(
-			$wp_customize,
-			$setting_name,
-			array(
-				'default'    => $default,
-				'user_value' => $user_value,
-			)
-		);
-		$wp_customize->add_setting(
-			$global_styles_setting,
-			array(
-				'sanitize_callback' => $sanitize_callback,
-			)
-		);
-
-		$choices = array();
-		foreach ( $this->fonts as $font_slug => $font_setting ) {
-			$choices[ $font_slug ] = $font_setting['name'];
-		}
-
-		$wp_customize->add_control(
-			$setting_name,
-			array(
-				'section' => $this->section_key,
-				'label'   => $label,
-				'type'    => 'select',
-				'choices' => $choices,
-			)
-		);
-
-		// Update the setting to the dirty value.
-		// This is needed to preserve the settings when other Customizer settings change.
-		$dirty_value = $wp_customize->get_setting( $setting_name )->post_value();
-		if ( ! empty( $dirty_value ) ) {
-			$wp_customize->get_setting( $setting_name )->user_value = $dirty_value;
-		}
-	}
-
-	function handle_customize_save_after( $wp_customize ) {
-		$body_value    = $wp_customize->get_setting( $this->section_key . 'body' )->value();
-		$heading_value = $wp_customize->get_setting( $this->section_key . 'heading' )->value();
-
-		if ( ! isset( $body_value ) && ! isset( $heading_value ) ) {
-			return;
-		}
-
-		$body_default    = $wp_customize->get_setting( $this->section_key . 'body' )->default;
-		$heading_default = $wp_customize->get_setting( $this->section_key . 'heading' )->default;
-
-		if ( ! isset( $body_value ) ) {
-			$body_value = $body_default;
-		}
-
-		if ( ! isset( $heading_value ) ) {
-			$heading_value = $heading_default;
-		}
-
-		$body_setting             = $this->fonts[ $body_value ];
-		$body_setting['name']     = 'Body (' . $body_setting['name'] . ')';
-		$body_setting['fontSlug'] = $body_setting['slug'];
-		$body_setting['slug']     = 'body-font';
-
-		$heading_setting             = $this->fonts[ $heading_value ];
-		$heading_setting['name']     = 'Heading (' . $heading_setting['name'] . ')';
-		$heading_setting['fontSlug'] = $heading_setting['slug'];
-		$heading_setting['slug']     = 'heading-font';
-
-		// Set up variables for the theme.json.
-		$font_families = array(
-			$body_setting,
-			$heading_setting,
-		);
-
-		$body_font_family_variable    = 'var(--wp--preset--font-family--' . $body_setting['slug'] . ')';
-		$heading_font_family_variable = 'var(--wp--preset--font-family--' . $heading_setting['slug'] . ')';
-
-		// Get the user's global styles CPT id
-		$user_custom_post_type_id = WP_Theme_JSON_Resolver_Gutenberg::get_user_global_styles_post_id();
-
-		// API request to get global styles
-		$get_request = new WP_REST_Request( 'GET', '/wp/v2/global-styles/' );
-		$get_request->set_param( 'id', $user_custom_post_type_id );
-
-		$global_styles_controller = new Gutenberg_REST_Global_Styles_Controller();
-		$global_styles            = $global_styles_controller->get_item( $get_request );
-
-		// converts data to array (in some cases settings and styles are objects insted of arrays)
-		$new_settings = (array) $global_styles->data['settings'];
-		$new_styles   = (array) $global_styles->data['styles'];
-
-		// Set new typography settings
-		if ( $font_families ) {
-			$new_settings['typography']['fontFamilies']['custom'] = $font_families;
-		}
-
-		// Add the updated global styles to the update request
-		$update_request = new WP_REST_Request( 'PUT', '/wp/v2/global-styles/' );
-		$update_request->set_param( 'id', $user_custom_post_type_id );
-		$update_request->set_param( 'settings', $new_settings );
-		$update_request->set_param( 'styles', $new_styles );
-
-		// Update the theme.json with the new settings.
-		$updated_global_styles = $global_styles_controller->update_item( $update_request );
-		delete_transient( 'global_styles' );
-		delete_transient( 'global_styles_' . get_stylesheet() );
-		delete_transient( 'gutenberg_global_styles' );
-		delete_transient( 'gutenberg_global_styles_' . get_stylesheet() );
-	}
-
 }
 
 new GlobalStylesFontsCustomizer;