Font Appearance Control: Fix selectedItem downshift uncontrolled prop…

… warning (#34721) * Font Appearance Control: Fix selectedItem downshift uncontrolled prop warning
WordPress · Sep 14, 2021 · 0e7c88c · 0e7c88c
1 parent 5571694
commit 0e7c88c
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/packages/block-editor/src/components/font-appearance-control/index.js b/packages/block-editor/src/components/font-appearance-control/index.js
@@ -143,12 +143,14 @@ export default function FontAppearanceControl( props ) {
 		return hasFontStyles ? styleOptions() : weightOptions();
 	}, [ props.options ] );
 
-	// Find current selection by comparing font style & weight against options.
-	const currentSelection = selectOptions.find(
-		( option ) =>
-			option.style.fontStyle === fontStyle &&
-			option.style.fontWeight === fontWeight
-	);
+	// Find current selection by comparing font style & weight against options,
+	// and fall back to the Default option if there is no matching option.
+	const currentSelection =
+		selectOptions.find(
+			( option ) =>
+				option.style.fontStyle === fontStyle &&
+				option.style.fontWeight === fontWeight
+		) || selectOptions[ 0 ];
 
 	// Adjusts field label in case either styles or weights are disabled.
 	const getLabel = () => {