Refactor findNearestFontStyle

WordPress · Jul 9, 2024 · b407be1 · b407be1
1 parent b06c4e4
commit b407be1
Showing 1 changed file with 7 additions and 14 deletions.
diff --git a/packages/block-editor/src/components/global-styles/typography-utils.js b/packages/block-editor/src/components/global-styles/typography-utils.js
@@ -199,6 +199,11 @@ export function findNearestFontStyle( availableFontStyles, newFontStyleValue ) {
 		return '';
 	}
 
+	const validStyles = [ 'normal', 'italic', 'oblique' ];
+	if ( ! validStyles.includes( newFontStyleValue ) ) {
+		return '';
+	}
+
 	if (
 		! availableFontStyles ||
 		availableFontStyles.length === 0 ||
@@ -209,26 +214,14 @@ export function findNearestFontStyle( availableFontStyles, newFontStyleValue ) {
 		return newFontStyleValue;
 	}
 
-	let nearestFontStyle = '';
-	const validStyles = [ 'normal', 'italic', 'oblique' ];
-
-	if (
-		! validStyles.includes( newFontStyleValue ) ||
-		! availableFontStyles.find(
-			( style ) => style.value === newFontStyleValue
-		)
-	) {
-		nearestFontStyle = '';
-	}
-
 	if (
 		newFontStyleValue === 'oblique' &&
 		! availableFontStyles.find( ( style ) => style.value === 'oblique' )
 	) {
-		nearestFontStyle = 'italic';
+		return 'italic';
 	}
 
-	return nearestFontStyle;
+	return '';
 }
 
 /**