Fix inline block declaration in global styles ui (#47374)

WordPress · Jan 24, 2023 · 1c2827f · 1c2827f · github-actions · Jan 24, 2023
1 parent 8014a85
commit 1c2827f
Showing 1 changed file with 16 additions and 11 deletions.
diff --git a/packages/edit-site/src/components/global-styles/ui.js b/packages/edit-site/src/components/global-styles/ui.js
@@ -72,6 +72,21 @@ function BlockStyleVariationsScreens( { name } ) {
 	) );
 }
 
+function BlockStylesNavigationScreens( {
+	parentMenu,
+	blockStyles,
+	blockName,
+} ) {
+	return blockStyles.map( ( style, index ) => (
+		<GlobalStylesNavigationScreen
+			key={ index }
+			path={ parentMenu + '/variations/' + style.name }
+		>
+			<ScreenVariation blockName={ blockName } style={ style } />
+		</GlobalStylesNavigationScreen>
+	) );
+}
+
 function ContextScreens( { name, parentMenu = '' } ) {
 	const hasVariationPath = parentMenu.search( 'variations' );
 	const variationPath =
@@ -89,17 +104,6 @@ function ContextScreens( { name, parentMenu = '' } ) {
 		[ name ]
 	);
 
-	const BlockStylesNavigationScreens = ( { blockStyles, blockName } ) => {
-		return blockStyles.map( ( style, index ) => (
-			<GlobalStylesNavigationScreen
-				key={ index }
-				path={ parentMenu + '/variations/' + style.name }
-			>
-				<ScreenVariation blockName={ blockName } style={ style } />
-			</GlobalStylesNavigationScreen>
-		) );
-	};
-
 	return (
 		<>
 			<GlobalStylesNavigationScreen path={ parentMenu + '/typography' }>
@@ -198,6 +202,7 @@ function ContextScreens( { name, parentMenu = '' } ) {
 
 			{ !! blockStyleVariations?.length && (
 				<BlockStylesNavigationScreens
+					parentMenu={ parentMenu }
 					blockStyles={ blockStyleVariations }
 					blockName={ name }
 				/>