@primer/react 38.25.0-rc.89740d738 → 38.25.0-rc.c42b3864e

package/CHANGELOG.md

@@ -6,6 +6,10 @@
 
 - [#7852](https://github.com/primer/react/pull/7852) [`5504680`](https://github.com/primer/react/commit/5504680614bacc2ce3eecaaa55d10887e6fb152d) Thanks [@liuliu-dev](https://github.com/liuliu-dev)! - Card: Add `data-component` attributes to `Card` and its subcomponents (`Icon`, `Image`, `Heading`, `Description`, `Metadata`, `Menu`). Add an `as` prop (`'div' | 'section'`) so standalone Cards can render as a labelled region landmark; `as="section"` requires `aria-label` or `aria-labelledby`. `Card` now requires `children`. Also improves docs and stories.
 
+### Patch Changes
+
+- [#7843](https://github.com/primer/react/pull/7843) [`fc571fd`](https://github.com/primer/react/commit/fc571fd8c3899f19a1dd9e77b8a22f6528d776e2) Thanks [@joshblack](https://github.com/joshblack)! - Update useMergedRefs so that in React 18 no warning is emitted
+
 ## 38.24.0
 
 ### Minor Changes

package/dist/hooks/useMergedRefs.d.ts

@@ -29,7 +29,7 @@ import type { ForwardedRef, Ref as StandardRef } from 'react';
  *  return <button ref={combinedRef} />
  * }
  */
-export declare function useMergedRefs<T>(refA: Ref<T | null>, refB: Ref<T | null>): (value: T | null) => () => void;
+export declare function useMergedRefs<T>(refA: Ref<T | null>, refB: Ref<T | null>): (value: T | null) => (() => void) | undefined;
 type CleanupFunction = () => void;
 /**
  * React 19 supports callback refs that can return a cleanup function. If a cleanup function is returned, the

package/dist/hooks/useMergedRefs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useMergedRefs.d.ts","sourceRoot":"","sources":["../../src/hooks/useMergedRefs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,GAAG,IAAI,WAAW,EAAmB,MAAM,OAAO,CAAA;AAG7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,WAE7D,CAAC,GAAG,IAAI,gBAiBnB;AAED,KAAK,eAAe,GAAG,MAAM,IAAI,CAAA;AAEjC;;;GAGG;AAEH,KAAK,kBAAkB,CAAC,CAAC,IAAI;IAC3B,cAAc,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,GAAG,eAAe,CAAA;CACpD,CAAC,gBAAgB,CAAC,CAAA;AAEnB;;;;;;;GAOG;AACH,KAAK,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA"}
+{"version":3,"file":"useMergedRefs.d.ts","sourceRoot":"","sources":["../../src/hooks/useMergedRefs.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,YAAY,EAAE,GAAG,IAAI,WAAW,EAAmB,MAAM,OAAO,CAAA;AAa7E;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA6BG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,WAE7D,CAAC,GAAG,IAAI,8BAsBnB;AAED,KAAK,eAAe,GAAG,MAAM,IAAI,CAAA;AAEjC;;;GAGG;AAEH,KAAK,kBAAkB,CAAC,CAAC,IAAI;IAC3B,cAAc,CAAC,QAAQ,EAAE,CAAC,GAAG,IAAI,GAAG,eAAe,CAAA;CACpD,CAAC,gBAAgB,CAAC,CAAA;AAEnB;;;;;;;GAOG;AACH,KAAK,GAAG,CAAC,CAAC,IAAI,YAAY,CAAC,CAAC,CAAC,GAAG,kBAAkB,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,CAAC,CAAC,GAAG,SAAS,CAAA"}

package/dist/hooks/useMergedRefs.js

@@ -1,5 +1,15 @@
 import { c } from 'react-compiler-runtime';
 import 'react';
+import { reactMajorVersion, isExperimentalReactVersion } from '../utils/environment.js';
+
+/**
+ * Cleanup functions for refs were introduced in React 19. For feature detection,
+ * we look to see if current version of React is >= 19 or if it is an
+ * experimental version of React
+ *
+ * @see https://react.dev/blog/2024/12/05/react-19
+ */
+const supportsRefCleanup = reactMajorVersion >= 19 || isExperimentalReactVersion;
 
 /**
  * Combine two refs of matching type (typically an external or forwarded ref and an internal `useRef` object or
@@ -38,6 +48,9 @@ function useMergedRefs(refA, refB) {
     t0 = value => {
       const cleanupA = setRef(refA, value);
       const cleanupB = setRef(refB, value);
+      if (!supportsRefCleanup) {
+        return;
+      }
       return () => {
         if (cleanupA) {
           cleanupA();

package/dist/utils/environment.d.ts

@@ -3,5 +3,8 @@
  *
  * @see https://github.com/facebook/fbjs/blob/4d1751311d3f67af2dcce2e40df8512a23c7b9c6/packages/fbjs/src/core/ExecutionEnvironment.js#L12
  */
-export const canUseDOM: boolean;
+declare const canUseDOM: boolean;
+declare const reactMajorVersion: number;
+declare const isExperimentalReactVersion: boolean;
+export { canUseDOM, reactMajorVersion, isExperimentalReactVersion };
 //# sourceMappingURL=environment.d.ts.map

package/dist/utils/environment.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/utils/environment.js"],"names":[],"mappings":"AAAA;;;;GAIG;AAEH,gCAA8G"}
+{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/utils/environment.ts"],"names":[],"mappings":"AAEA;;;;GAIG;AAEH,QAAA,MAAM,SAAS,SAAwF,CAAA;AAWvG,QAAA,MAAM,iBAAiB,QAAgC,CAAA;AAGvD,QAAA,MAAM,0BAA0B,SAAiD,CAAA;AAEjF,OAAO,EAAC,SAAS,EAAE,iBAAiB,EAAE,0BAA0B,EAAC,CAAA"}

package/dist/utils/environment.js

@@ -1,9 +1,24 @@
+import { version } from 'react';
+
 /**
  * Indicate whether current execution environment can access the DOM.
  *
  * @see https://github.com/facebook/fbjs/blob/4d1751311d3f67af2dcce2e40df8512a23c7b9c6/packages/fbjs/src/core/ExecutionEnvironment.js#L12
  */
-// eslint-disable-next-line ssr-friendly/no-dom-globals-in-module-scope
+// eslint-disable-next-line @typescript-eslint/no-unnecessary-condition,ssr-friendly/no-dom-globals-in-module-scope
 const canUseDOM = !!(typeof window !== 'undefined' && window.document && window.document.createElement);
 
-export { canUseDOM };
+// Grab the major version from react. This could be formatted as any valid
+// semver version, e.g.:
+//
+// - 19.0.0
+// - 19.0.0-rc.1
+// - 0.0.0-{channel}-{commit}-{time}
+//
+// So we only pull the first part of the version and parse it.
+const reactVersion = version.split('.');
+const reactMajorVersion = parseInt(reactVersion[0], 10);
+const EXPERIMENTAL_REACT_VERSION_REGEX = /^0\.0\.0-experimental-[a-f0-9]{8}-\d{8}$/;
+const isExperimentalReactVersion = EXPERIMENTAL_REACT_VERSION_REGEX.test(version);
+
+export { canUseDOM, isExperimentalReactVersion, reactMajorVersion };

package/package.json

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