Fix Flow type for withTheme (#1397)

emotion-js · Jun 12, 2019 · 3380373 · 3380373
1 parent 62576aa
commit 3380373
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 3 deletions.
diff --git a/.changeset/thick-brooms-yell/changes.json b/.changeset/thick-brooms-yell/changes.json
@@ -0,0 +1,4 @@
+{
+  "releases": [{ "name": "emotion-theming", "type": "patch" }],
+  "dependents": []
+}
diff --git a/.changeset/thick-brooms-yell/changes.md b/.changeset/thick-brooms-yell/changes.md
@@ -0,0 +1 @@
+Fixing flow types for the withTheme HOC
diff --git a/packages/emotion-theming/__tests__/with-theme.js b/packages/emotion-theming/__tests__/with-theme.js
@@ -30,6 +30,7 @@ test(`withTheme(Comp) hoists non-react static class properties`, () => {
   const ComponentWithTheme = withTheme(ExampleComponent)
 
   expect(ComponentWithTheme.displayName).toBe('WithTheme(foo)')
+  // $FlowFixMe
   expect(ComponentWithTheme.someSpecialStatic).toBe(
     ExampleComponent.someSpecialStatic
   )

diff --git a/packages/emotion-theming/src/with-theme.js b/packages/emotion-theming/src/with-theme.js
@@ -7,7 +7,9 @@ type Props = { theme: Object }
 
 // should we change this to be forwardRef/withCSSContext style so it doesn't merge with props?
 
-const withTheme = (Component: React.ComponentType<Props>) => {
+export default function withTheme<Config: {}>(
+  Component: React.AbstractComponent<Config>
+): React.AbstractComponent<$Diff<Config, Props>> {
   const componentName = Component.displayName || Component.name || 'Component'
   let render = (props, ref) => {
     return (
@@ -25,5 +27,3 @@ const withTheme = (Component: React.ComponentType<Props>) => {
 
   return hoistNonReactStatics(WithTheme, Component)
 }
-
-export default withTheme