@primer/react 38.29.0-rc.9dc2e199b → 38.29.0-rc.aa262b98e

package/dist/hooks/useMergedRefs.js

@@ -1,5 +1,4 @@
-import { c } from 'react-compiler-runtime';
-import 'react';
+import { useCallback } from 'react';
 import { reactMajorVersion, isExperimentalReactVersion } from '../utils/environment.js';
 
 /**
@@ -42,35 +41,23 @@ const supportsRefCleanup = reactMajorVersion >= 19 || isExperimentalReactVersion
  * }
  */
 function useMergedRefs(refA, refB) {
-  const $ = c(3);
-  let t0;
-  if ($[0] !== refA || $[1] !== refB) {
-    t0 = value => {
-      const cleanupA = setRef(refA, value);
-      const cleanupB = setRef(refB, value);
-      if (!supportsRefCleanup) {
-        return;
-      }
-      return () => {
-        if (cleanupA) {
-          cleanupA();
-        } else {
-          setRef(refA, null);
-        }
-        if (cleanupB) {
-          cleanupB();
-        } else {
-          setRef(refB, null);
-        }
-      };
+  return useCallback(value => {
+    const cleanupA = setRef(refA, value);
+    const cleanupB = setRef(refB, value);
+
+    // TODO: remove when we are on React 19
+    if (!supportsRefCleanup) {
+      return;
+    }
+
+    // Only works in React 19. In React 18, the cleanup function will be ignored and the ref will get called with
+    // `null` which will be passed to each ref as expected.
+    return () => {
+      // For object refs and callback refs that don't return cleanups, we still need to pass `null` on cleanup
+      if (cleanupA) cleanupA();else setRef(refA, null);
+      if (cleanupB) cleanupB();else setRef(refB, null);
     };
-    $[0] = refA;
-    $[1] = refB;
-    $[2] = t0;
-  } else {
-    t0 = $[2];
-  }
-  return t0;
+  }, [refA, refB]);
 }
 
 /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@primer/react",
   "type": "module",
-  "version": "38.29.0-rc.9dc2e199b",
+  "version": "38.29.0-rc.aa262b98e",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "./dist/index.js",
   "module": "./dist/index.js",