Merge pull request #3447 from Automattic/add/bcb-fonts

Blank Canvas Blocks: Add Google fonts

blank-canvas-blocks/functions.php

@@ -19,7 +19,8 @@ if ( ! function_exists( 'blank_canvas_blocks_support' ) ) :
 		add_theme_support( 'editor-styles' );
 
 		// Enqueue editor styles.
-		add_editor_style( array( 
+		add_editor_style( array(
+			blank_canvas_blocks_fonts_url(),
 			'/assets/ponyfill.css'
 		) );
 
@@ -28,10 +29,36 @@ if ( ! function_exists( 'blank_canvas_blocks_support' ) ) :
 endif;
 
 /**
- * 
+ *
  * Enqueue scripts and styles.
  */
 function blank_canvas_blocks_scripts() {
+	// Enqueue Google fonts
+	wp_enqueue_style( 'blank-canvas-blocks-fonts', blank_canvas_blocks_fonts_url(), array(), null );
+
 	wp_enqueue_style( 'blank_canvas_blocks-ponyfill', get_template_directory_uri() . '/assets/ponyfill.css', array(), wp_get_theme()->get( 'Version' )  );
 }
 add_action( 'wp_enqueue_scripts', 'blank_canvas_blocks_scripts', 11 );
+
+/**
+ * Add Google webfonts
+ *
+ * @return $fonts_url
+ */
+
+function blank_canvas_blocks_fonts_url() {
+	$fonts_url = '';
+
+	$theme_data = WP_Theme_JSON_Resolver::get_merged_data()->get_settings();
+	$custom_data = $theme_data['defaults']['custom'];
+	if ( array_key_exists( 'fontsToLoadFromGoogle', $custom_data ) ) {
+		$font_families = $theme_data['defaults']['custom']['fontsToLoadFromGoogle'];
+
+		$font_families[] = 'display=swap';
+
+		// Make a single request for the theme fonts.
+		$fonts_url = 'https://fonts.googleapis.com/css2?' . implode( '&', $font_families );
+	}
+
+	return esc_url_raw( $fonts_url );
+}

blank-canvas-blocks/sass/blocks/_heading.scss

@@ -2,4 +2,4 @@ h1, h2, h3, h4, h5, h6 {
 	clear: both;
 	font-family: var(--wp--custom--heading--typography--font-family);
 	font-weight: var(--wp--custom--heading--typography--font-weight);
-}
+}