Avoid error in logs on React <19 when using composeRefs (#3285)

radix-ui · Dec 13, 2024 · 4e6e632 · 4e6e632
1 parent 02543ca
commit 4e6e632
Showing 1 changed file with 11 additions and 9 deletions.
diff --git a/packages/react/compose-refs/src/composeRefs.tsx b/packages/react/compose-refs/src/composeRefs.tsx
@@ -21,15 +21,17 @@ function setRef<T>(ref: PossibleRef<T>, value: T) {
 function composeRefs<T>(...refs: PossibleRef<T>[]) {
   return (node: T) => {
     const cleanups = refs.map((ref) => setRef(ref, node));
-    return () => {
-      cleanups.forEach((cleanup, i) => {
-        if (typeof cleanup == 'function') {
-          cleanup();
-        } else {
-          setRef(refs[i], null);
-        }
-      });
-    };
+    if (cleanups.some((c) => typeof c == 'function')) {
+      return () => {
+        cleanups.forEach((cleanup, i) => {
+          if (typeof cleanup == 'function') {
+            cleanup();
+          } else {
+            setRef(refs[i], null);
+          }
+        });
+      };
+    }
   };
 }