Apply ref access fix to presence component

radix-ui · Apr 27, 2024 · 45b510a · 45b510a
1 parent 82bff21
commit 45b510a
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/packages/react/presence/src/Presence.tsx b/packages/react/presence/src/Presence.tsx
@@ -19,7 +19,10 @@ const Presence: React.FC<PresenceProps> = (props) => {
       : React.Children.only(children)
   ) as React.ReactElement;
 
-  const ref = useComposedRefs(presence.ref, (child as any).ref);
+  // Accessing the ref from props, else fallback to element.ref
+  // https://github.com/facebook/react/pull/28348
+  const childrenRef = child.props.ref ?? (child as any).ref;
+  const ref = useComposedRefs(presence.ref, childrenRef);
   const forceMount = typeof children === 'function';
   return forceMount || presence.isPresent ? React.cloneElement(child, { ref }) : null;
 };