Merge pull request #502 from newfold-labs/enhance/add-fail-safe-checks

Just in case | Fail safe checks
newfold-labs · Mar 4, 2024 · 2885f00 · 2885f00
2 parents 6836f95 + 1683701
commit 2885f00
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/src/OnboardingSPA/steps/SiteGen/Preview/index.js b/src/OnboardingSPA/steps/SiteGen/Preview/index.js
@@ -245,15 +245,17 @@ const SiteGenPreview = () => {
 			const newPreviewSettings = cloneDeep( globalStyles[ 0 ] );
 			newPreviewSettings.settings.color.palette = data.color.palette;
 			const body =
-				data.styles?.blocks[ 0 ]?.[ 'core/body' ].typography.fontFamily;
+				data.styles?.blocks[ 0 ]?.[ 'core/body' ]?.typography
+					?.fontFamily;
 			const headings =
-				data.styles?.blocks[ 0 ]?.[ 'core/heading' ].typography
-					.fontFamily;
-			if ( newPreviewSettings.styles.typography ) {
+				data.styles?.blocks[ 0 ]?.[ 'core/heading' ]?.typography
+					?.fontFamily;
+			if ( newPreviewSettings.styles.typography && body ) {
 				newPreviewSettings.styles.typography.fontFamily = body;
 			}
 			if (
-				newPreviewSettings.styles.blocks[ 'core/heading' ].typography
+				newPreviewSettings.styles.blocks[ 'core/heading' ].typography &&
+				headings
 			) {
 				newPreviewSettings.styles.blocks[
 					'core/heading'