fix(emotion): fix css & styled function with babel-plugin-emotion

smooth-code · Oct 17, 2018 · a214b18 · a214b18
1 parent 5b46cfc
commit a214b18
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/packages/shared/core/styled-engine/emotion.js b/packages/shared/core/styled-engine/emotion.js
@@ -60,12 +60,15 @@ const css = (...args) => {
 
 function patchStyledComponent(StyledComponent) {
   const { withComponent } = StyledComponent
-  StyledComponent.withComponent = component => {
+  StyledComponent.withComponent = (component, options) => {
     // eslint-disable-next-line no-underscore-dangle
     const BaseComponent = StyledComponent.__emotion_base
     return Object.assign(
       patchStyledComponent(
-        withComponent(props => <BaseComponent as={component} {...props} />),
+        withComponent(
+          props => <BaseComponent as={component} {...props} />,
+          options,
+        ),
       ),
       StyledComponent,
     )
@@ -83,7 +86,8 @@ function wrapCreateStyledComponent(createStyledComponent) {
 }
 
 function wrapStyled(styled) {
-  return component => wrapCreateStyledComponent(styled(component))
+  return (component, options) =>
+    wrapCreateStyledComponent(styled(component, options))
 }
 
 const styled = wrapStyled(emotionStyled)