@primer/react 38.24.0-rc.4089ee5c5 → 38.24.0-rc.5e9bf77b1

package/CHANGELOG.md

@@ -28,6 +28,8 @@
 
 ### Patch Changes
 
+- [#7824](https://github.com/primer/react/pull/7824) [`6889235`](https://github.com/primer/react/commit/6889235fac93f17cfd0354758f4f9a1e6ff01942) Thanks [@jonrohan](https://github.com/jonrohan)! - Fix `usePaneWidth` triggering unnecessary React re-renders on every window resize
+
 - [#7833](https://github.com/primer/react/pull/7833) [`dfed7ca`](https://github.com/primer/react/commit/dfed7ca73532922ec0526dd85afcf7ae471c566e) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Timeline: Remove border override from TimelineBadge when variant is set
 
 ## 38.23.0

package/dist/ActionBar/ActionBar.js

@@ -8,7 +8,7 @@ import styles from './ActionBar.module.css.js';
 import { clsx } from 'clsx';
 import { createDescendantRegistry } from '../utils/descendant-registry.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import { FocusKeys } from '@primer/behaviors';
 import { ActionMenu } from '../ActionMenu/ActionMenu.js';
 
@@ -328,7 +328,7 @@ const ActionBarIconButton = /*#__PURE__*/forwardRef(({
   ...props
 }, forwardedRef) => {
   const ref = useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, ref);
+  const mergedRef = useMergedRefs(forwardedRef, ref);
   const {
     size
   } = React.useContext(ActionBarContext);
@@ -351,7 +351,7 @@ const ActionBarIconButton = /*#__PURE__*/forwardRef(({
   }, [disabled, onClick]);
   return /*#__PURE__*/jsx(IconButton, {
     "aria-disabled": disabled,
-    ref: ref,
+    ref: mergedRef,
     size: size,
     onClick: clickHandler,
     ...props,

package/dist/ActionList/Heading.js

@@ -7,12 +7,12 @@ import { invariant } from '../utils/invariant.js';
 import { clsx } from 'clsx';
 import classes from './Heading.module.css.js';
 import { jsx } from 'react/jsx-runtime';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import Heading$1 from '../Heading/Heading.js';
 
 const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
   var _props$id;
-  const $ = c(20);
+  const $ = c(21);
   let as;
   let children;
   let className;
@@ -45,7 +45,7 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
   }
   const visuallyHidden = t1 === undefined ? false : t1;
   const innerRef = React.useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, innerRef);
+  const mergedRef = useMergedRefs(forwardedRef, innerRef);
   const {
     headingId,
     variant: listVariant
@@ -65,11 +65,11 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
     t4 = $[8];
   }
   let t5;
-  if ($[9] !== as || $[10] !== children || $[11] !== listVariant || $[12] !== props || $[13] !== size || $[14] !== t3 || $[15] !== t4) {
+  if ($[9] !== as || $[10] !== children || $[11] !== listVariant || $[12] !== mergedRef || $[13] !== props || $[14] !== size || $[15] !== t3 || $[16] !== t4) {
     t5 = /*#__PURE__*/jsx(Heading$1, {
       as: as,
       variant: size,
-      ref: innerRef,
+      ref: mergedRef,
       id: t3,
       className: t4,
       "data-component": "ActionList.Heading",
@@ -80,25 +80,26 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
     $[9] = as;
     $[10] = children;
     $[11] = listVariant;
-    $[12] = props;
-    $[13] = size;
-    $[14] = t3;
-    $[15] = t4;
-    $[16] = t5;
+    $[12] = mergedRef;
+    $[13] = props;
+    $[14] = size;
+    $[15] = t3;
+    $[16] = t4;
+    $[17] = t5;
   } else {
-    t5 = $[16];
+    t5 = $[17];
   }
   let t6;
-  if ($[17] !== t2 || $[18] !== t5) {
+  if ($[18] !== t2 || $[19] !== t5) {
     t6 = /*#__PURE__*/jsx(VisuallyHidden, {
       isVisible: t2,
       children: t5
     });
-    $[17] = t2;
-    $[18] = t5;
-    $[19] = t6;
+    $[18] = t2;
+    $[19] = t5;
+    $[20] = t6;
   } else {
-    t6 = $[19];
+    t6 = $[20];
   }
   return t6;
 });

package/dist/Autocomplete/AutocompleteInput.js

@@ -1,6 +1,6 @@
 import React, { useContext, useState, useCallback, useEffect } from 'react';
 import { AutocompleteContext, AutocompleteInputContext } from './AutocompleteContext.js';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import useSafeTimeout from '../hooks/useSafeTimeout.js';
 import { jsx } from 'react/jsx-runtime';
 import TextInput from '../TextInput/TextInput.js';
@@ -36,7 +36,7 @@ const AutocompleteInput = /*#__PURE__*/React.forwardRef(({
     inputValue = '',
     isMenuDirectlyActivated
   } = inputContext;
-  useRefObjectAsForwardedRef(forwardedRef, inputRef);
+  const mergedRef = useMergedRefs(forwardedRef, inputRef);
   const [highlightRemainingText, setHighlightRemainingText] = useState(true);
   const {
     safeSetTimeout
@@ -130,7 +130,7 @@ const AutocompleteInput = /*#__PURE__*/React.forwardRef(({
     onKeyDown: handleInputKeyDown,
     onKeyPress: onInputKeyPress,
     onKeyUp: handleInputKeyUp,
-    ref: inputRef,
+    ref: mergedRef,
     "aria-controls": `${id}-listbox`,
     "aria-autocomplete": "both",
     role: "combobox",

package/dist/Autocomplete/AutocompleteOverlay.js

@@ -1,6 +1,6 @@
 import { useContext, useRef, useEffect, useCallback } from 'react';
 import { AutocompleteContext } from './AutocompleteContext.js';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import VisuallyHidden from '../_VisuallyHidden.js';
 import classes from './AutocompleteOverlay.module.css.js';
 import { clsx } from 'clsx';
@@ -48,7 +48,7 @@ function AutocompleteOverlay({
     align: 'start',
     anchorElementRef: computedAnchorRef
   }, [showMenu, selectedItemLength]);
-  useRefObjectAsForwardedRef(scrollContainerRef, floatingElementRef);
+  const mergedScrollContainerRef = useMergedRefs(scrollContainerRef, floatingElementRef);
   const closeOptionList = useCallback(() => {
     setShowMenu(false);
   }, [setShowMenu]);
@@ -60,7 +60,7 @@ function AutocompleteOverlay({
     preventFocusOnOpen: true,
     onClickOutside: closeOptionList,
     onEscape: closeOptionList,
-    ref: floatingElementRef,
+    ref: mergedScrollContainerRef,
     top: position === null || position === void 0 ? void 0 : position.top,
     left: position === null || position === void 0 ? void 0 : position.left,
     className: clsx(classes.Overlay, className),

package/dist/Button/ButtonBase.js

@@ -1,5 +1,5 @@
 import React, { forwardRef } from 'react';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import { ConditionalWrapper } from '../internal/components/ConditionalWrapper.js';
 import { clsx } from 'clsx';
 import classes from './ButtonBase.module.css.js';
@@ -46,7 +46,7 @@ const ButtonBase = /*#__PURE__*/forwardRef(({
     ...rest
   } = props;
   const innerRef = React.useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, innerRef);
+  const mergedRef = useMergedRefs(forwardedRef, innerRef);
   const uuid = useId(id);
   const loadingAnnouncementID = `${uuid}-loading-announcement`;
 
@@ -76,7 +76,7 @@ const ButtonBase = /*#__PURE__*/forwardRef(({
       "data-component": "Button",
       ...rest,
       // @ts-ignore temporary disable as we migrate to css modules, until we remove PolymorphicForwardRefComponent
-      ref: innerRef,
+      ref: mergedRef,
       className: clsx(classes.ButtonBase, className),
       "data-block": block ? 'block' : null,
       "data-inactive": inactive ? true : undefined,

package/dist/Dialog/Dialog.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsE,MAAM,OAAO,CAAA;AAC1F,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,WAAW,CAAA;AAU1C,OAAO,KAAK,EAAC,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAChE,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAgB/F;;;GAGG;AACH,MAAM,MAAM,iBAAiB,GAAG,IAAI,CAAC,WAAW,EAAE,SAAS,CAAC,GAAG;IAC7D;;OAEG;IACH,UAAU,CAAC,EAAE,SAAS,GAAG,SAAS,GAAG,QAAQ,GAAG,QAAQ,CAAA;IAExD;;OAEG;IACH,OAAO,EAAE,KAAK,CAAC,SAAS,CAAA;IAExB;;;OAGG;IACH,SAAS,CAAC,EAAE,OAAO,CAAA;IAEnB;;;OAGG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,iBAAiB,GAAG,IAAI,CAAC,CAAA;CAChD,CAAA;AAED;;GAEG;AACH,MAAM,WAAW,WAAW;IAC1B,gBAAgB,CAAC,EAAE,MAAM,CAAA;IACzB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAEvB;;;;OAIG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAE1B;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,CAAA;IAElF;;;;;;OAMG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAA;IAE1E;;;;;;OAMG;IACH,YAAY,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,CAAA;IAE5E;;OAEG;IACH,aAAa,CAAC,EAAE,iBAAiB,EAAE,CAAA;IAEnC;;;;;OAKG;IACH,OAAO,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,QAAQ,KAAK,IAAI,CAAA;IAErD;;;;OAIG;IACH,IAAI,CAAC,EAAE,QAAQ,GAAG,aAAa,CAAA;IAE/B;;;;;;OAMG;IACH,KAAK,CAAC,EAAE,WAAW,CAAA;IAEnB;;;;;OAKG;IACH,MAAM,CAAC,EAAE,YAAY,CAAA;IAErB;;OAEG;IACH,QAAQ,CAAC,EAAE,QAAQ,GAAG,MAAM,GAAG,OAAO,GAAG,eAAe,CAAC,MAAM,GAAG,OAAO,GAAG,QAAQ,GAAG,YAAY,GAAG,QAAQ,CAAC,CAAA;IAE/G;;;;;OAKG;IACH,KAAK,CAAC,EAAE,KAAK,GAAG,QAAQ,GAAG,QAAQ,CAAA;IAEnC;;;OAGG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IAEpD;;OAEG;IACH,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IAErD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B;AAED;;GAEG;AACH,MAAM,WAAW,iBAAkB,SAAQ,WAAW;IACpD;;;OAGG;IACH,aAAa,EAAE,MAAM,CAAA;IAErB;;;OAGG;IACH,mBAAmB,EAAE,MAAM,CAAA;CAC5B;AAGD,QAAA,MAAM,SAAS;;;;CAIL,CAAA;AAGV,QAAA,MAAM,QAAQ;;;;;CAKJ,CAAA;AAEV,MAAM,MAAM,WAAW,GAAG,MAAM,OAAO,QAAQ,CAAA;AAC/C,MAAM,MAAM,YAAY,GAAG,MAAM,OAAO,SAAS,CAAA;AAiDjD,eAAO,MAAM,aAAa,mCAAqD,CAAA;AA4R/E,eAAO,MAAM,MAAM;;;;;;;;;;iBA1EuC,iBAAiB,EAAE;;;iBAoCf,MAAM,IAAI;;CA+CtE,CAAA"}

package/dist/Dialog/Dialog.js

@@ -6,13 +6,13 @@ import { XIcon } from '@primer/octicons-react';
 import { useFocusZone } from '../hooks/useFocusZone.js';
 import { FocusKeys } from '@primer/behaviors';
 import { Portal } from '../Portal/Portal.js';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
 import { useId } from '../hooks/useId.js';
 import classes from './Dialog.module.css.js';
 import { clsx } from 'clsx';
 import { useSlots } from '../hooks/useSlots.js';
 import { useResizeObserver } from '../hooks/useResizeObserver.js';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import { useOnEscapePress } from '../hooks/useOnEscapePress.js';
 import { ScrollableRegion } from '../ScrollableRegion/ScrollableRegion.js';
 import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
@@ -133,7 +133,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
     footer: Dialog.Footer
   });
   const dialogRef = useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, dialogRef);
+  const mergedDialogRef = useMergedRefs(forwardedRef, dialogRef);
   const backdropRef = useRef(null);
   useFocusTrap({
     containerRef: dialogRef,
@@ -209,7 +209,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
           setLastMouseDownIsBackdrop(e.target === e.currentTarget);
         },
         children: /*#__PURE__*/jsxs("div", {
-          ref: dialogRef,
+          ref: mergedDialogRef,
           role: role,
           "aria-labelledby": dialogLabelId,
           "aria-describedby": dialogDescriptionId,

package/dist/Heading/Heading.js

@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
 import React, { forwardRef, useEffect } from 'react';
 import classes from './Heading.module.css.js';
 import { jsx } from 'react/jsx-runtime';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 
 const Heading = /*#__PURE__*/forwardRef(({
   as: Component = 'h2',
@@ -11,7 +11,7 @@ const Heading = /*#__PURE__*/forwardRef(({
   ...props
 }, forwardedRef) => {
   const innerRef = React.useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, innerRef);
+  const mergedRef = useMergedRefs(forwardedRef, innerRef);
   if (process.env.NODE_ENV !== "production") {
     /**
      * The Linter yells because it thinks this conditionally calls an effect,
@@ -32,7 +32,7 @@ const Heading = /*#__PURE__*/forwardRef(({
     "data-variant": variant,
     "data-component": "Heading",
     ...props,
-    ref: innerRef
+    ref: mergedRef
   });
 });
 Heading.displayName = 'Heading';

package/dist/Link/Link.js

@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
 import classes from './Link.module.css.js';
 import { fixedForwardRef } from '../utils/modern-polymorphic.js';
 import { jsx } from 'react/jsx-runtime';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 
 const UnwrappedLink = (props, ref) => {
   const {
@@ -15,7 +15,7 @@ const UnwrappedLink = (props, ref) => {
     ...restProps
   } = props;
   const innerRef = React.useRef(null);
-  useRefObjectAsForwardedRef(ref, innerRef);
+  const mergedRef = useMergedRefs(ref, innerRef);
   if (process.env.NODE_ENV !== "production") {
     /**
      * The Linter yells because it thinks this conditionally calls an effect,
@@ -39,7 +39,7 @@ const UnwrappedLink = (props, ref) => {
     "data-hover-color": hoverColor,
     ...restProps,
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    ref: innerRef
+    ref: mergedRef
   });
 };
 UnwrappedLink.displayName = "UnwrappedLink";

package/dist/Overlay/Overlay.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Overlay.d.ts","sourceRoot":"","sources":["../../src/Overlay/Overlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,qBAAqB,EAAe,MAAM,OAAO,CAAA;AAC9D,OAAO,KAA0B,MAAM,OAAO,CAAA;AAE9C,OAAO,KAAK,EAAC,QAAQ,EAAE,KAAK,EAAC,MAAM,gBAAgB,CAAA;AACnD,OAAO,KAAK,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAA;AAI/C,OAAO,KAAK,EAAC,UAAU,EAAC,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAK/F,KAAK,kBAAkB,GAAG;IACxB,KAAK,CAAC,EAAE,MAAM,OAAO,QAAQ,CAAA;IAC7B,MAAM,CAAC,EAAE,MAAM,OAAO,SAAS,CAAA;IAC/B,SAAS,CAAC,EAAE,MAAM,IAAI,CAAC,OAAO,SAAS,EAAE,MAAM,GAAG,SAAS,CAAC,CAAA;IAC5D,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAC,OAAO,QAAQ,EAAE,MAAM,CAAC,CAAA;IAC9C,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IACjC,QAAQ,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAA;IACnD,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,SAAS;;;;;;;;;CASrB,CAAA;AAED,eAAO,MAAM,QAAQ;;;;;;;CAOpB,CAAA;AAiBD,KAAK,gBAAgB,GAAG;IACtB,UAAU,CAAC,EAAE,SAAS,GAAG,QAAQ,CAAA;IACjC,cAAc,CAAC,EAAE,OAAO,CAAA;IACxB,QAAQ,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,UAAU,CAAC,CAAA;IAC1C,GAAG,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAA;IAChC,IAAI,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,CAAA;IAClC,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IACpC,MAAM,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,QAAQ,CAAC,CAAA;IACtC,IAAI,CAAC,EAAE,QAAQ,CAAA;IACf,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,iBAAiB,CAAC,EAAE,YAAY,CAAA;CACjC,CAAA;AAED,KAAK,eAAe,GAAG,KAAK,CAAC,kBAAkB,EAAE,gBAAgB,CAAC,CAAA;AAElE;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,WAAW,EA+CnB,8BAA8B,CAAC,KAAK,EAAE,eAAe,CAAC,CAAA;AAE3D,KAAK,cAAc,GAAG;IACpB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,qBAAqB,CAAC,EAAE,OAAO,CAAA;IAC/B,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,EAAE,CAAA;IACvD,eAAe,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IACrD,cAAc,EAAE,CAAC,CAAC,EAAE,iBAAiB,KAAK,IAAI,CAAA;IAC9C,QAAQ,EAAE,CAAC,CAAC,EAAE,aAAa,KAAK,IAAI,CAAA;IACpC,mBAAmB,CAAC,EAAE,MAAM,CAAA;IAC5B,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B,cAAc,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;CACpD,CAAA;AAED,KAAK,oBAAoB,GAAG,KAAK,CAAC,eAAe,EAAE,cAAc,CAAC,CAAA;AAElE;;;;;;;;;;;;;;;GAeG;AACH,QAAA,MAAM,OAAO,EA6FR,8BAA8B,CAAC,KAAK,EAAE,oBAAoB,CAAC,CAAA;AAEhE,MAAM,MAAM,YAAY,GAAG,qBAAqB,CAAC,OAAO,OAAO,CAAC,CAAA;AAEhE,eAAe,OAAO,CAAA"}
+{"version":3,"file":"Overlay.d.ts","sourceRoot":"","sources":["../../src/Overlay/Overlay.tsx"],"names":[],"mappings":"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"}

package/dist/Overlay/Overlay.js

@@ -2,10 +2,10 @@ import { c } from 'react-compiler-runtime';
 import React, { useRef, useEffect } from 'react';
 import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
 import { Portal } from '../Portal/Portal.js';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
 import classes from './Overlay.module.css.js';
 import { clsx } from 'clsx';
 import { jsx } from 'react/jsx-runtime';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import { useFeatureFlag } from '../FeatureFlags/useFeatureFlag.js';
 import { useOverlay } from '../hooks/useOverlay.js';
 
@@ -124,7 +124,7 @@ const BaseOverlay = /*#__PURE__*/React.forwardRef(({
 
  */
 const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
-  const $ = c(46);
+  const $ = c(47);
   let _PrivateDisablePortal;
   let anchorSide;
   let ignoreClickRefs;
@@ -209,7 +209,7 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
   const visibility = t4 === undefined ? "visible" : t4;
   const width = t5 === undefined ? "auto" : t5;
   const overlayRef = useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, overlayRef);
+  const mergedOverlayRef = useMergedRefs(forwardedRef, overlayRef);
   const cssAnchorPositioning = useFeatureFlag("primer_react_css_anchor_positioning");
   let t6;
   if ($[19] !== ignoreClickRefs || $[20] !== initialFocusRef || $[21] !== onClickOutside || $[22] !== onEscape || $[23] !== preventFocusOnOpen || $[24] !== returnFocusRef) {
@@ -283,12 +283,12 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
   const leftPosition = left === undefined && right === undefined ? 0 : left;
   const t11 = !preventOverflow ? true : undefined;
   let t12;
-  if ($[33] !== height || $[34] !== leftPosition || $[35] !== props || $[36] !== responsiveVariant || $[37] !== right || $[38] !== role || $[39] !== t11 || $[40] !== visibility || $[41] !== width) {
+  if ($[33] !== height || $[34] !== leftPosition || $[35] !== mergedOverlayRef || $[36] !== props || $[37] !== responsiveVariant || $[38] !== right || $[39] !== role || $[40] !== t11 || $[41] !== visibility || $[42] !== width) {
     t12 = /*#__PURE__*/jsx(BaseOverlay, {
       role: role,
       width: width,
       "data-reflow-container": t11,
-      ref: overlayRef,
+      ref: mergedOverlayRef,
       left: leftPosition,
       right: right,
       height: height,
@@ -298,32 +298,33 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
     });
     $[33] = height;
     $[34] = leftPosition;
-    $[35] = props;
-    $[36] = responsiveVariant;
-    $[37] = right;
-    $[38] = role;
-    $[39] = t11;
-    $[40] = visibility;
-    $[41] = width;
-    $[42] = t12;
+    $[35] = mergedOverlayRef;
+    $[36] = props;
+    $[37] = responsiveVariant;
+    $[38] = right;
+    $[39] = role;
+    $[40] = t11;
+    $[41] = visibility;
+    $[42] = width;
+    $[43] = t12;
   } else {
-    t12 = $[42];
+    t12 = $[43];
   }
   const overlayContent = t12;
   if (_PrivateDisablePortal && cssAnchorPositioning) {
     return overlayContent;
   }
   let t13;
-  if ($[43] !== overlayContent || $[44] !== portalContainerName) {
+  if ($[44] !== overlayContent || $[45] !== portalContainerName) {
     t13 = /*#__PURE__*/jsx(Portal, {
       containerName: portalContainerName,
       children: overlayContent
     });
-    $[43] = overlayContent;
-    $[44] = portalContainerName;
-    $[45] = t13;
+    $[44] = overlayContent;
+    $[45] = portalContainerName;
+    $[46] = t13;
   } else {
-    t13 = $[45];
+    t13 = $[46];
   }
   return t13;
 });

package/dist/PageLayout/PageLayout.js

@@ -1,7 +1,6 @@
 import React, { useRef, memo } from 'react';
 import { clsx } from 'clsx';
 import { useId } from '../hooks/useId.js';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
 import { isResponsiveValue } from '../hooks/useResponsiveValue.js';
 import { useSlots } from '../hooks/useSlots.js';
 import { useOverflow } from '../hooks/useOverflow.js';
@@ -11,6 +10,7 @@ import classes from './PageLayout.module.css.js';
 import { usePaneWidth, isPaneWidth, isCustomWidthOptions, updateAriaValues, ARROW_KEY_STEP } from './usePaneWidth.js';
 import { setDraggingStyles, removeDraggingStyles } from './paneUtils.js';
 import { jsx, jsxs } from 'react/jsx-runtime';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 
 const isArrowKey = key => key === 'ArrowLeft' || key === 'ArrowRight' || key === 'ArrowUp' || key === 'ArrowDown';
 const isShrinkKey = key => key === 'ArrowLeft' || key === 'ArrowDown';
@@ -581,7 +581,7 @@ const Pane = /*#__PURE__*/React.forwardRef(({
     onResizeEnd,
     currentWidth: controlledWidth
   });
-  useRefObjectAsForwardedRef(forwardRef, paneRef);
+  const mergedPaneRef = useMergedRefs(forwardRef, paneRef);
   const hasOverflow = useOverflow(paneRef);
   const paneId = useId(id);
   const labelProp = {};
@@ -615,7 +615,7 @@ const Pane = /*#__PURE__*/React.forwardRef(({
       },
       position: positionProp
     }), /*#__PURE__*/jsx("div", {
-      ref: paneRef
+      ref: mergedPaneRef
       // Suppress hydration mismatch for --pane-width when localStorage
       // provides a width that differs from the server-rendered default.
       // Not needed when onResizeEnd is provided (localStorage isn't read).
@@ -785,7 +785,7 @@ const Sidebar = /*#__PURE__*/React.forwardRef(({
     contentWrapperRef: sidebarContentWrapperRef,
     constrainToViewport: true
   });
-  useRefObjectAsForwardedRef(forwardRef, sidebarRef);
+  const mergedSidebarRef = useMergedRefs(forwardRef, sidebarRef);
   const hasOverflow = useOverflow(sidebarRef);
   const sidebarId = useId(id);
   const labelProp = {};
@@ -824,7 +824,7 @@ const Sidebar = /*#__PURE__*/React.forwardRef(({
       getDefaultWidth: getDefaultWidth,
       saveWidth: saveWidth
     }), /*#__PURE__*/jsx("div", {
-      ref: sidebarRef
+      ref: mergedSidebarRef
       // Suppress hydration mismatch for --pane-width when localStorage
       // provides a width that differs from the server-rendered default.
       ,

package/dist/PageLayout/usePaneWidth.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePaneWidth.d.ts","sourceRoot":"","sources":["../../src/PageLayout/usePaneWidth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"usePaneWidth.d.ts","sourceRoot":"","sources":["../../src/PageLayout/usePaneWidth.ts"],"names":[],"mappings":"AAAA,OAAO,KAAiC,MAAM,OAAO,CAAA;AAQrD,KAAK,WAAW,GAAG,GAAG,MAAM,IAAI,CAAA;AAEhC,MAAM,MAAM,kBAAkB,GAAG;IAC/B,GAAG,EAAE,WAAW,CAAA;IAChB,OAAO,EAAE,WAAW,CAAA;IACpB,GAAG,EAAE,WAAW,CAAA;CACjB,CAAA;AAED,MAAM,MAAM,SAAS,GAAG,OAAO,GAAG,QAAQ,GAAG,OAAO,CAAA;AAEpD;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,SAAS,GAAG,kBAAkB,CAAA;AAE3D,MAAM,MAAM,mBAAmB,GAAG;IAChC,KAAK,EAAE,cAAc,CAAA;IACrB,QAAQ,EAAE,MAAM,CAAA;IAChB,SAAS,EAAE,OAAO,CAAA;IAClB,uFAAuF;IACvF,eAAe,CAAC,EAAE,MAAM,CAAA;IACxB,OAAO,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAA;IAC/C,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAA;IACjD,iBAAiB,EAAE,KAAK,CAAC,SAAS,CAAC,cAAc,GAAG,IAAI,CAAC,CAAA;IACzD;;;;OAIG;IACH,mBAAmB,CAAC,EAAE,OAAO,CAAA;IAC7B,oFAAoF;IACpF,WAAW,CAAC,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IACrC,8HAA8H;IAC9H,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,8DAA8D;IAC9D,YAAY,EAAE,MAAM,CAAA;IACpB,wDAAwD;IACxD,eAAe,EAAE,KAAK,CAAC,gBAAgB,CAAC,MAAM,CAAC,CAAA;IAC/C,iCAAiC;IACjC,YAAY,EAAE,MAAM,CAAA;IACpB,8DAA8D;IAC9D,YAAY,EAAE,MAAM,CAAA;IACpB,6CAA6C;IAC7C,eAAe,EAAE,MAAM,MAAM,CAAA;IAC7B,yDAAyD;IACzD,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;IAClC,6BAA6B;IAC7B,eAAe,EAAE,MAAM,MAAM,CAAA;CAC9B,CAAA;AAKD;;;GAGG;AACH,eAAO,MAAM,sBAAsB,QAA6C,CAAA;AAEhF;;;GAGG;AACH,eAAO,MAAM,8BAA8B,QAAgD,CAAA;AAO3F;;;GAGG;AACH,eAAO,MAAM,qBAAqB,MAAM,CAAA;AAExC;;;GAGG;AACH,eAAO,MAAM,cAAc,IAAI,CAAA;AAE/B,6CAA6C;AAC7C,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,SAAS,EAAE,MAAM,CAAyC,CAAA;AAKhG,eAAO,MAAM,oBAAoB,GAAI,OAAO,cAAc,KAAG,KAAK,IAAI,kBAErE,CAAA;AAED,eAAO,MAAM,WAAW,GAAI,OAAO,cAAc,KAAG,KAAK,IAAI,SAE5D,CAAA;AAED,eAAO,MAAM,mBAAmB,GAAI,GAAG,cAAc,KAAG,MAOvD,CAAA;AAED;;;;GAIG;AACH,wBAAgB,2BAA2B,IAAI,MAAM,CAGpD;AAID,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,WAAW,GAAG,IAAI,EAC1B,QAAQ;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAC;IAAC,GAAG,CAAC,EAAE,MAAM,CAAA;CAAC,SASvD,CAAA;AA8BD;;;;;;;;;GASG;AACH,wBAAgB,YAAY,CAAC,EAC3B,KAAK,EACL,QAAQ,EACR,SAAS,EACT,eAAe,EACf,OAAO,EACP,SAAS,EACT,iBAAiB,EACjB,mBAA2B,EAC3B,WAAW,EACX,YAAY,EAAE,eAAe,GAC9B,EAAE,mBAAmB,GAAG,kBAAkB,CAkR1C"}

package/dist/PageLayout/usePaneWidth.js

@@ -246,6 +246,7 @@ function usePaneWidth(t0) {
     t6 = $[16];
   }
   const [maxPaneWidth, setMaxPaneWidth] = React.useState(t6);
+  const maxPaneWidthRef = React.useRef(maxPaneWidth);
   let t7;
   let t8;
   if ($[17] !== currentWidth) {
@@ -335,15 +336,20 @@ function usePaneWidth(t0) {
           max: actualMax,
           current: currentWidthRef.current
         });
-        startTransition(() => {
-          setMaxPaneWidth(actualMax);
-          if (wasClamped) {
-            setCurrentWidthState(actualMax);
-          }
-        });
+        const maxChanged = actualMax !== maxPaneWidthRef.current;
+        if (maxChanged || wasClamped) {
+          maxPaneWidthRef.current = actualMax;
+          startTransition(() => {
+            setMaxPaneWidth(actualMax);
+            if (wasClamped) {
+              setCurrentWidthState(actualMax);
+            }
+          });
+        }
       };
       maxWidthDiffRef.current = getMaxWidthDiffFromViewport();
       const initialMax = getMaxPaneWidthRef.current();
+      maxPaneWidthRef.current = initialMax;
       setMaxPaneWidth(initialMax);
       (_paneRef$current3 = paneRef.current) === null || _paneRef$current3 === void 0 ? void 0 : _paneRef$current3.style.setProperty("--pane-max-width", `${initialMax}px`);
       updateAriaValues(handleRef.current, {

package/dist/TextInputWithTokens/TextInputWithTokens.js

@@ -3,7 +3,7 @@ import { FocusKeys } from '@primer/behaviors';
 import { isFocusable } from '@primer/behaviors/utils';
 import React, { useRef, useState } from 'react';
 import { isValidElementType } from 'react-is';
-import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../hooks/useMergedRefs.js';
 import { useFocusZone } from '../hooks/useFocusZone.js';
 import { useId } from '../hooks/useId.js';
 import Token from '../Token/Token.js';
@@ -25,7 +25,7 @@ const overflowCountClassMap = {
 
 // using forwardRef is important so that other components (ex. Autocomplete) can use the ref
 function TextInputWithTokensInnerComponent(t0, forwardedRef) {
-  const $ = c(151);
+  const $ = c(152);
   let IconComponent;
   let LeadingVisual;
   let TrailingVisual;
@@ -164,8 +164,8 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
     role = $[31];
   }
   const ref = useRef(null);
+  const mergedRef = useMergedRefs(forwardedRef, ref);
   const selectedValuesDescriptionId = useId();
-  useRefObjectAsForwardedRef(forwardedRef, ref);
   const [selectedTokenIndex, setSelectedTokenIndex] = useState();
   const [tokensAreTruncated, setTokensAreTruncated] = useState(Boolean(visibleTokenCount));
   let t6;
@@ -457,9 +457,9 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
   const t32 = validationStatus === "error" ? "true" : "false";
   const t33 = ariaDescribedBy || undefined;
   let t34;
-  if ($[80] !== disabled || $[81] !== handleInputBlur || $[82] !== handleInputFocus || $[83] !== handleInputKeyDown || $[84] !== inputPropsRest || $[85] !== role || $[86] !== t32 || $[87] !== t33) {
+  if ($[80] !== disabled || $[81] !== handleInputBlur || $[82] !== handleInputFocus || $[83] !== handleInputKeyDown || $[84] !== inputPropsRest || $[85] !== mergedRef || $[86] !== role || $[87] !== t32 || $[88] !== t33) {
     t34 = /*#__PURE__*/jsx(UnstyledTextInput, {
-      ref: ref,
+      ref: mergedRef,
       disabled: disabled,
       onFocus: handleInputFocus,
       onBlur: handleInputBlur,
@@ -477,42 +477,43 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
     $[82] = handleInputFocus;
     $[83] = handleInputKeyDown;
     $[84] = inputPropsRest;
-    $[85] = role;
-    $[86] = t32;
-    $[87] = t33;
-    $[88] = t34;
+    $[85] = mergedRef;
+    $[86] = role;
+    $[87] = t32;
+    $[88] = t33;
+    $[89] = t34;
   } else {
-    t34 = $[88];
+    t34 = $[89];
   }
   let t35;
-  if ($[89] !== selectedValuesDescription || $[90] !== selectedValuesDescriptionId || $[91] !== shouldExposeSelectedValuesDescription) {
+  if ($[90] !== selectedValuesDescription || $[91] !== selectedValuesDescriptionId || $[92] !== shouldExposeSelectedValuesDescription) {
     t35 = shouldExposeSelectedValuesDescription ? /*#__PURE__*/jsx(VisuallyHidden, {
       id: selectedValuesDescriptionId,
       children: selectedValuesDescription
     }) : null;
-    $[89] = selectedValuesDescription;
-    $[90] = selectedValuesDescriptionId;
-    $[91] = shouldExposeSelectedValuesDescription;
-    $[92] = t35;
+    $[90] = selectedValuesDescription;
+    $[91] = selectedValuesDescriptionId;
+    $[92] = shouldExposeSelectedValuesDescription;
+    $[93] = t35;
   } else {
-    t35 = $[92];
+    t35 = $[93];
   }
   let t36;
-  if ($[93] !== t34 || $[94] !== t35) {
+  if ($[94] !== t34 || $[95] !== t35) {
     t36 = /*#__PURE__*/jsxs("div", {
       className: styles.InputWrapper,
       children: [t34, t35]
     });
-    $[93] = t34;
-    $[94] = t35;
-    $[95] = t36;
+    $[94] = t34;
+    $[95] = t35;
+    $[96] = t36;
   } else {
-    t36 = $[95];
+    t36 = $[96];
   }
   let t37;
-  if ($[96] !== TokenComponent || $[97] !== disabled || $[98] !== handleTokenBlur || $[99] !== handleTokenFocus || $[100] !== handleTokenRemove || $[101] !== hideTokenRemoveButtons || $[102] !== selectedTokenIndex || $[103] !== size || $[104] !== visibleTokens) {
+  if ($[97] !== TokenComponent || $[98] !== disabled || $[99] !== handleTokenBlur || $[100] !== handleTokenFocus || $[101] !== handleTokenRemove || $[102] !== hideTokenRemoveButtons || $[103] !== selectedTokenIndex || $[104] !== size || $[105] !== visibleTokens) {
     let t38;
-    if ($[106] !== TokenComponent || $[107] !== disabled || $[108] !== handleTokenBlur || $[109] !== handleTokenFocus || $[110] !== handleTokenRemove || $[111] !== hideTokenRemoveButtons || $[112] !== selectedTokenIndex || $[113] !== size) {
+    if ($[107] !== TokenComponent || $[108] !== disabled || $[109] !== handleTokenBlur || $[110] !== handleTokenFocus || $[111] !== handleTokenRemove || $[112] !== hideTokenRemoveButtons || $[113] !== selectedTokenIndex || $[114] !== size) {
       t38 = (t39, i) => {
         const {
           id,
@@ -535,75 +536,75 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
           ...tokenRest
         }, id);
       };
-      $[106] = TokenComponent;
-      $[107] = disabled;
-      $[108] = handleTokenBlur;
-      $[109] = handleTokenFocus;
-      $[110] = handleTokenRemove;
-      $[111] = hideTokenRemoveButtons;
-      $[112] = selectedTokenIndex;
-      $[113] = size;
-      $[114] = t38;
+      $[107] = TokenComponent;
+      $[108] = disabled;
+      $[109] = handleTokenBlur;
+      $[110] = handleTokenFocus;
+      $[111] = handleTokenRemove;
+      $[112] = hideTokenRemoveButtons;
+      $[113] = selectedTokenIndex;
+      $[114] = size;
+      $[115] = t38;
     } else {
-      t38 = $[114];
+      t38 = $[115];
     }
     t37 = visibleTokens.map(t38);
-    $[96] = TokenComponent;
-    $[97] = disabled;
-    $[98] = handleTokenBlur;
-    $[99] = handleTokenFocus;
-    $[100] = handleTokenRemove;
-    $[101] = hideTokenRemoveButtons;
-    $[102] = selectedTokenIndex;
-    $[103] = size;
-    $[104] = visibleTokens;
-    $[105] = t37;
+    $[97] = TokenComponent;
+    $[98] = disabled;
+    $[99] = handleTokenBlur;
+    $[100] = handleTokenFocus;
+    $[101] = handleTokenRemove;
+    $[102] = hideTokenRemoveButtons;
+    $[103] = selectedTokenIndex;
+    $[104] = size;
+    $[105] = visibleTokens;
+    $[106] = t37;
   } else {
-    t37 = $[105];
+    t37 = $[106];
   }
   let t38;
-  if ($[115] !== size || $[116] !== tokens.length || $[117] !== tokensAreTruncated || $[118] !== visibleTokens.length) {
+  if ($[116] !== size || $[117] !== tokens.length || $[118] !== tokensAreTruncated || $[119] !== visibleTokens.length) {
     t38 = tokensAreTruncated && tokens.length - visibleTokens.length ? /*#__PURE__*/jsxs(Text, {
       className: overflowCountClassMap[size],
       "data-component": "TextInputWithTokens.OverflowCount",
       children: ["+", tokens.length - visibleTokens.length]
     }) : null;
-    $[115] = size;
-    $[116] = tokens.length;
-    $[117] = tokensAreTruncated;
-    $[118] = visibleTokens.length;
-    $[119] = t38;
+    $[116] = size;
+    $[117] = tokens.length;
+    $[118] = tokensAreTruncated;
+    $[119] = visibleTokens.length;
+    $[120] = t38;
   } else {
-    t38 = $[119];
+    t38 = $[120];
   }
   let t39;
-  if ($[120] !== preventTokenWrapping || $[121] !== t31 || $[122] !== t36 || $[123] !== t37 || $[124] !== t38) {
+  if ($[121] !== preventTokenWrapping || $[122] !== t31 || $[123] !== t36 || $[124] !== t37 || $[125] !== t38) {
     t39 = /*#__PURE__*/jsxs("div", {
       ref: t31,
       className: styles.Container,
       "data-prevent-token-wrapping": preventTokenWrapping,
       children: [t36, t37, t38]
     });
-    $[120] = preventTokenWrapping;
-    $[121] = t31;
-    $[122] = t36;
-    $[123] = t37;
-    $[124] = t38;
-    $[125] = t39;
+    $[121] = preventTokenWrapping;
+    $[122] = t31;
+    $[123] = t36;
+    $[124] = t37;
+    $[125] = t38;
+    $[126] = t39;
   } else {
-    t39 = $[125];
+    t39 = $[126];
   }
   const t40 = typeof loading === "boolean";
   let t41;
-  if ($[126] !== TrailingVisual) {
+  if ($[127] !== TrailingVisual) {
     t41 = typeof TrailingVisual !== "string" && isValidElementType(TrailingVisual) ? /*#__PURE__*/jsx(TrailingVisual, {}) : TrailingVisual;
-    $[126] = TrailingVisual;
-    $[127] = t41;
+    $[127] = TrailingVisual;
+    $[128] = t41;
   } else {
-    t41 = $[127];
+    t41 = $[128];
   }
   let t42;
-  if ($[128] !== showTrailingLoadingIndicator || $[129] !== t40 || $[130] !== t41) {
+  if ($[129] !== showTrailingLoadingIndicator || $[130] !== t40 || $[131] !== t41) {
     t42 = /*#__PURE__*/jsx(TextInputInnerVisualSlot, {
       hasLoadingIndicator: t40,
       visualPosition: "trailing",
@@ -611,15 +612,15 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
       componentPrefix: "TextInputWithTokens",
       children: t41
     });
-    $[128] = showTrailingLoadingIndicator;
-    $[129] = t40;
-    $[130] = t41;
-    $[131] = t42;
+    $[129] = showTrailingLoadingIndicator;
+    $[130] = t40;
+    $[131] = t41;
+    $[132] = t42;
   } else {
-    t42 = $[131];
+    t42 = $[132];
   }
   let t43;
-  if ($[132] !== block || $[133] !== contrast || $[134] !== disabled || $[135] !== maxWidthProp || $[136] !== minWidthProp || $[137] !== t21 || $[138] !== t22 || $[139] !== t23 || $[140] !== t24 || $[141] !== t25 || $[142] !== t26 || $[143] !== t27 || $[144] !== t30 || $[145] !== t39 || $[146] !== t42 || $[147] !== validationStatus || $[148] !== variantProp || $[149] !== widthProp) {
+  if ($[133] !== block || $[134] !== contrast || $[135] !== disabled || $[136] !== maxWidthProp || $[137] !== minWidthProp || $[138] !== t21 || $[139] !== t22 || $[140] !== t23 || $[141] !== t24 || $[142] !== t25 || $[143] !== t26 || $[144] !== t27 || $[145] !== t30 || $[146] !== t39 || $[147] !== t42 || $[148] !== validationStatus || $[149] !== variantProp || $[150] !== widthProp) {
     t43 = /*#__PURE__*/jsxs(TextInputWrapper, {
       block: block,
       contrast: contrast,
@@ -639,27 +640,27 @@ function TextInputWithTokensInnerComponent(t0, forwardedRef) {
       "data-component": "TextInputWithTokens",
       children: [t27, t30, t39, t42]
     });
-    $[132] = block;
-    $[133] = contrast;
-    $[134] = disabled;
-    $[135] = maxWidthProp;
-    $[136] = minWidthProp;
-    $[137] = t21;
-    $[138] = t22;
-    $[139] = t23;
-    $[140] = t24;
-    $[141] = t25;
-    $[142] = t26;
-    $[143] = t27;
-    $[144] = t30;
-    $[145] = t39;
-    $[146] = t42;
-    $[147] = validationStatus;
-    $[148] = variantProp;
-    $[149] = widthProp;
-    $[150] = t43;
+    $[133] = block;
+    $[134] = contrast;
+    $[135] = disabled;
+    $[136] = maxWidthProp;
+    $[137] = minWidthProp;
+    $[138] = t21;
+    $[139] = t22;
+    $[140] = t23;
+    $[141] = t24;
+    $[142] = t25;
+    $[143] = t26;
+    $[144] = t27;
+    $[145] = t30;
+    $[146] = t39;
+    $[147] = t42;
+    $[148] = validationStatus;
+    $[149] = variantProp;
+    $[150] = widthProp;
+    $[151] = t43;
   } else {
-    t43 = $[150];
+    t43 = $[151];
   }
   return t43;
 }

package/dist/deprecated/DialogV1/Dialog.js

@@ -2,7 +2,7 @@ import { c } from 'react-compiler-runtime';
 import React, { forwardRef, useRef } from 'react';
 import { IconButton } from '../../Button/IconButton.js';
 import useDialog from '../../hooks/useDialog.js';
-import { useRefObjectAsForwardedRef } from '../../hooks/useRefObjectAsForwardedRef.js';
+import { useMergedRefs } from '../../hooks/useMergedRefs.js';
 import { XIcon } from '@primer/octicons-react';
 import { clsx } from 'clsx';
 import classes from './Dialog.module.css.js';
@@ -78,7 +78,7 @@ function _temp(ch) {
   return typeof ch === "string";
 }
 const Dialog = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
-  const $ = c(25);
+  const $ = c(26);
   let children;
   let className;
   let initialFocusRef;
@@ -121,7 +121,7 @@ const Dialog = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
   const Component = t2 === undefined ? "div" : t2;
   const overlayRef = useRef(null);
   const modalRef = useRef(null);
-  useRefObjectAsForwardedRef(forwardedRef, modalRef);
+  const mergedRef = useMergedRefs(forwardedRef, modalRef);
   const closeButtonRef = useRef(null);
   let t3;
   if ($[9] !== onDismiss || $[10] !== returnFocusRef) {
@@ -161,14 +161,14 @@ const Dialog = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
     getDialogProps
   } = useDialog(t4);
   let t5;
-  if ($[17] !== Component || $[18] !== children || $[19] !== className || $[20] !== getDialogProps || $[21] !== isOpen || $[22] !== onCloseClick || $[23] !== props) {
+  if ($[17] !== Component || $[18] !== children || $[19] !== className || $[20] !== getDialogProps || $[21] !== isOpen || $[22] !== mergedRef || $[23] !== onCloseClick || $[24] !== props) {
     t5 = isOpen ? /*#__PURE__*/jsxs(Fragment, {
       children: [/*#__PURE__*/jsx("span", {
         className: classes.Overlay,
         ref: overlayRef
       }), /*#__PURE__*/jsxs(Component, {
         tabIndex: -1,
-        ref: modalRef,
+        ref: mergedRef,
         role: "dialog",
         "aria-modal": "true",
         ...props,
@@ -190,11 +190,12 @@ const Dialog = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
     $[19] = className;
     $[20] = getDialogProps;
     $[21] = isOpen;
-    $[22] = onCloseClick;
-    $[23] = props;
-    $[24] = t5;
+    $[22] = mergedRef;
+    $[23] = onCloseClick;
+    $[24] = props;
+    $[25] = t5;
   } else {
-    t5 = $[24];
+    t5 = $[25];
   }
   return t5;
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@primer/react",
   "type": "module",
-  "version": "38.24.0-rc.4089ee5c5",
+  "version": "38.24.0-rc.5e9bf77b1",
   "description": "An implementation of GitHub's Primer Design System using React",
   "main": "./dist/index.js",
   "module": "./dist/index.js",