Only forward defined refs

emotion-js · Jul 8, 2024 · fd4eec0 · fd4eec0
1 parent de80631
commit fd4eec0
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/.changeset/metal-boxes-admire.md b/.changeset/metal-boxes-admire.md
@@ -0,0 +1,7 @@
+---
+'@emotion/primitives-core': patch
+'@emotion/styled': patch
+'@emotion/react': patch
+---
+
+Only forward defined `ref`s to improve compatibility with the upcoming React 19
diff --git a/packages/primitives-core/src/styled.ts b/packages/primitives-core/src/styled.ts
@@ -76,9 +76,10 @@ export function createStyled(
             newProps[key] = props[key]
           }
         }
-
         newProps.style = [css.apply(mergedProps, styles), props.style]
-        newProps.ref = ref
+        if (ref) {
+          newProps.ref = ref
+        }
 
         return React.createElement(finalTag, newProps)
       })

diff --git a/packages/react/src/emotion-element.js b/packages/react/src/emotion-element.js
@@ -149,8 +149,10 @@ let Emotion = /* #__PURE__ */ withEmotionCache(
         newProps[key] = props[key]
       }
     }
-    newProps.ref = ref
     newProps.className = className
+    if (ref) {
+      newProps.ref = ref
+    }
 
     return (
       <>

diff --git a/packages/styled/src/base.js b/packages/styled/src/base.js
@@ -155,9 +155,10 @@ let createStyled /*: CreateStyled */ = (
             newProps[key] = props[key]
           }
         }
-
         newProps.className = className
-        newProps.ref = ref
+        if (ref) {
+          newProps.ref = ref
+        }
 
         return (
           <>