fix(emotion): fix interpolation usage (#184)

styled-components · Jan 31, 2021 · d093e7f · d093e7f
1 parent 3fb9239
commit d093e7f
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 11 deletions.
diff --git a/packages/emotion/src/css.test.tsx b/packages/emotion/src/css.test.tsx
@@ -63,6 +63,34 @@ describe('#css', () => {
     expect(container.firstChild).toHaveStyle('margin: 4px 8px;')
   })
 
+  it('accepts object', () => {
+    const Dummy = styled.div`
+      ${css({
+        margin: '1 2',
+      })}
+    `
+    const { container } = render(
+      <SpaceTheme>
+        <Dummy />
+      </SpaceTheme>,
+    )
+    expect(container.firstChild).toHaveStyle('margin: 4px 8px;')
+  })
+
+  it('accepts function', () => {
+    const Dummy = styled.div`
+      ${css((p) => ({
+        margin: '1 2',
+      }))}
+    `
+    const { container } = render(
+      <SpaceTheme>
+        <Dummy />
+      </SpaceTheme>,
+    )
+    expect(container.firstChild).toHaveStyle('margin: 4px 8px;')
+  })
+
   it('transforms babel-plugin-emotion output', () => {
     const Dummy = styled.div`
       ${css({

diff --git a/packages/emotion/src/css.ts b/packages/emotion/src/css.ts
@@ -1,4 +1,4 @@
-import { css as emCss } from '@emotion/react'
+import { css as emCss, SerializedStyles, Theme } from '@emotion/react'
 import { CSSInterpolation } from '@emotion/serialize'
 import { transform } from '@xstyled/core'
 
@@ -9,15 +9,36 @@ function styleToString(style: any, props: any): any {
   return style
 }
 
-// @ts-ignore
-export const css: typeof emCss = (
+interface Props {
+  theme?: Theme
+}
+
+interface CSSInterpolationFn {
+  (props: Props): CSSInterpolation
+}
+
+interface SerializedStylesFn {
+  (props: Props): SerializedStyles
+}
+
+export function css(fn: CSSInterpolationFn): SerializedStylesFn
+export function css(...args: CSSInterpolation[]): SerializedStylesFn
+export function css(
   strings: TemplateStringsArray,
-  ...rawArgs: Array<CSSInterpolation>
-) => {
-  const emCssArgs = emCss(strings, ...rawArgs)
-  const transformedStyles = transform(emCssArgs.styles)
-  return (props: any) => ({
-    ...emCssArgs,
-    styles: styleToString(transformedStyles, props),
-  })
+  ...rawArgs: CSSInterpolation[]
+): SerializedStylesFn
+export function css(
+  strings: TemplateStringsArray | CSSInterpolation | CSSInterpolationFn,
+  ...rawArgs: CSSInterpolation[]
+): SerializedStylesFn {
+  return (props: Props): SerializedStyles => {
+    const emCssArgs =
+      typeof strings === 'function'
+        ? emCss(strings(props))
+        : emCss(strings as TemplateStringsArray, ...rawArgs)
+    return {
+      ...emCssArgs,
+      styles: styleToString(transform(emCssArgs.styles), props),
+    }
+  }
 }
diff --git a/packages/emotion/src/styled.test.tsx b/packages/emotion/src/styled.test.tsx
@@ -118,6 +118,18 @@ describe('#styled', () => {
     expect(container.firstChild).toHaveStyle('margin: 8px;')
   })
 
+  it('works with css as object and function prop', () => {
+    const Dummy = styled.div(() => ({
+      margin: '2',
+    }))
+    const { container } = render(
+      <SpaceTheme>
+        <Dummy />
+      </SpaceTheme>,
+    )
+    expect(container.firstChild).toHaveStyle('margin: 8px;')
+  })
+
   it('transforms first class interpolations', () => {
     const Dummy = styled.div`
       ${() => [