Carry styles from flattened components with withComponent (#589)

emotion-js · Mar 6, 2018 · f88f228 · f88f228
1 parent 5e23a73
commit f88f228
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/packages/create-emotion-styled/src/index.js b/packages/create-emotion-styled/src/index.js
@@ -158,7 +158,7 @@ function createEmotionStyled(emotion: Emotion, view: ReactType) {
             ? // $FlowFixMe
               omitAssign(testAlwaysTrue, {}, options, nextOptions)
             : options
-        )(...args)
+        )(...styles)
       }
 
       return Styled

diff --git a/packages/react-emotion/test/__snapshots__/index.test.js.snap b/packages/react-emotion/test/__snapshots__/index.test.js.snap
@@ -796,8 +796,9 @@ exports[`styled with higher order component that hoists statics 1`] = `
 />
 `;
 
-exports[`styled withComponent does not carry styles from flattened component 1`] = `
+exports[`styled withComponent carries styles from flattened components 1`] = `
 .emotion-0 {
+  color: green;
   color: hotpink;
 }
 

diff --git a/packages/react-emotion/test/index.test.js b/packages/react-emotion/test/index.test.js
@@ -1109,7 +1109,7 @@ describe('styled', () => {
       .toJSON()
     expect(tree).toMatchSnapshot()
   })
-  test('withComponent does not carry styles from flattened component', () => {
+  test('withComponent carries styles from flattened components', () => {
     const SomeComponent = styled.div`
       color: green;
     `