Fix flow errors

emotion-js · Aug 23, 2020 · 81a6877 · 81a6877
1 parent cacfbb9
commit 81a6877
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/packages/styled/src/base.js b/packages/styled/src/base.js
@@ -169,7 +169,6 @@ let createStyled: CreateStyled = (tag: any, options?: StyledOptions) => {
     Styled.__emotion_real = Styled
     Styled.__emotion_base = baseTag
     Styled.__emotion_styles = styles
-    Styled.__emotion_identifier = identifierName
     Styled.__emotion_forwardProp = shouldForwardProp
 
     Object.defineProperty(Styled, 'toString', {
@@ -191,6 +190,7 @@ let createStyled: CreateStyled = (tag: any, options?: StyledOptions) => {
     ) => {
       return createStyled(nextTag, {
         ...options,
+        // $FlowFixMe
         ...nextOptions,
         shouldForwardProp: composeShouldForwardProps(Styled, nextOptions, true)
       })(...styles)

diff --git a/packages/styled/src/utils.js b/packages/styled/src/utils.js
@@ -40,17 +40,18 @@ export const getDefaultShouldForwardProp = (tag: ElementType) =>
 
 export const composeShouldForwardProps = (
   tag: PrivateStyledComponent<any>,
-  options: StyledOptions | undefined,
+  options: StyledOptions | void,
   isReal: boolean
 ) => {
   let shouldForwardProp
   if (options) {
+    const optionsShouldForwardProp = options.shouldForwardProp
     shouldForwardProp =
-      tag.__emotion_forwardProp && options.shouldForwardProp
-        ? propName =>
+      tag.__emotion_forwardProp && optionsShouldForwardProp
+        ? (propName: string) =>
             tag.__emotion_forwardProp(propName) &&
-            options.shouldForwardProp(propName)
-        : options.shouldForwardProp // $FlowFixMe
+            optionsShouldForwardProp(propName)
+        : optionsShouldForwardProp
   }
 
   if (typeof shouldForwardProp !== 'function' && isReal) {