Another spread fix

WordPress · May 22, 2024 · 8756450 · 8756450
1 parent b298d91
commit 8756450
Showing 1 changed file with 14 additions and 9 deletions.
diff --git a/packages/edit-site/src/components/global-styles/style-variations-container.js b/packages/edit-site/src/components/global-styles/style-variations-container.js
@@ -79,19 +79,24 @@ export default function StyleVariationsContainer( { gap = 2 } ) {
 					} );
 				}
 				// Now merge any global custom CSS from current user styles with global custom CSS in the variation.
-				const globalCustomCSS =
+				const css =
 					userStyles?.css || variation.styles?.css
-						? `${ variation.styles?.css || '' } ${
-								userStyles?.css || ''
-						  }`
-						: '';
+						? {
+								css: `${ variation.styles?.css || '' } ${
+									userStyles?.css || ''
+								}`,
+						  }
+						: {};
+
+				const blocks =
+					Object.keys( blockStyles ).length > 0
+						? { blocks: blockStyles }
+						: {};
 
 				const styles = {
 					...variation.styles,
-					css: globalCustomCSS,
-					blocks: {
-						...blockStyles,
-					},
+					...css,
+					...blocks,
 				};
 				return {
 					...variation,