Skip to content

Commit 065d794

Browse files
committed
Another spread fix
1 parent 1dc1f82 commit 065d794

File tree

1 file changed

+14
-9
lines changed

1 file changed

+14
-9
lines changed

packages/edit-site/src/components/global-styles/style-variations-container.js

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -79,19 +79,24 @@ export default function StyleVariationsContainer( { gap = 2 } ) {
7979
} );
8080
}
8181
// Now merge any global custom CSS from current user styles with global custom CSS in the variation.
82-
const globalCustomCSS =
82+
const css =
8383
userStyles?.css || variation.styles?.css
84-
? `${ variation.styles?.css || '' } ${
85-
userStyles?.css || ''
86-
}`
87-
: '';
84+
? {
85+
css: `${ variation.styles?.css || '' } ${
86+
userStyles?.css || ''
87+
}`,
88+
}
89+
: {};
90+
91+
const blocks =
92+
Object.keys( blockStyles ).length > 0
93+
? { blocks: blockStyles }
94+
: {};
8895

8996
const styles = {
9097
...variation.styles,
91-
css: globalCustomCSS,
92-
blocks: {
93-
...blockStyles,
94-
},
98+
...css,
99+
...blocks,
95100
};
96101
return {
97102
...variation,

0 commit comments

Comments
 (0)