Check for themeFontFamilies and customFontFamilies

WordPress · Jul 25, 2024 · 6d65aab · 6d65aab
1 parent 8566c93
commit 6d65aab
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/packages/edit-site/src/components/global-styles/utils.js b/packages/edit-site/src/components/global-styles/utils.js
@@ -57,9 +57,13 @@ export function getFontFamilies( themeJson ) {
 	const customFontFamilies =
 		themeJson?.settings?.typography?.fontFamilies?.custom;
 
-	let fontFamilies = themeFontFamilies;
-	if ( customFontFamilies ) {
+	let fontFamilies = [];
+	if ( themeFontFamilies && customFontFamilies ) {
 		fontFamilies = [ ...themeFontFamilies, ...customFontFamilies ];
+	} else if ( themeFontFamilies ) {
+		fontFamilies = themeFontFamilies;
+	} else if ( customFontFamilies ) {
+		fontFamilies = customFontFamilies;
 	}
 	const bodyFontFamilySetting = themeJson?.styles?.typography?.fontFamily;
 	const bodyFontFamily = getFontFamilyFromSetting(