Fixed random collapse of the color settings section (#32388)

WordPress · Jun 7, 2021 · cd25dc4 · cd25dc4
1 parent 1c07f00
commit cd25dc4
Showing 1 changed file with 16 additions and 12 deletions.
diff --git a/packages/block-editor/src/hooks/style.js b/packages/block-editor/src/hooks/style.js
@@ -243,9 +243,7 @@ export const withBlockControls = createHigherOrderComponent(
 const withElementsStyles = createHigherOrderComponent(
 	( BlockListBlock ) => ( props ) => {
 		const elements = props.attributes.style?.elements;
-		if ( ! elements ) {
-			return <BlockListBlock { ...props } />;
-		}
+
 		const blockElementsContainerIdentifier = `wp-elements-${ useInstanceId(
 			BlockListBlock
 		) }`;
@@ -256,17 +254,23 @@ const withElementsStyles = createHigherOrderComponent(
 
 		return (
 			<>
-				<style
-					dangerouslySetInnerHTML={ {
-						__html: styles,
-					} }
-				/>
+				{ elements && (
+					<style
+						dangerouslySetInnerHTML={ {
+							__html: styles,
+						} }
+					/>
+				) }
+
 				<BlockListBlock
 					{ ...props }
-					className={ classnames(
-						props.classname,
-						blockElementsContainerIdentifier
-					) }
+					className={
+						elements &&
+						classnames(
+							props.classname,
+							blockElementsContainerIdentifier
+						)
+					}
 				/>
 			</>
 		);