@primer/react 0.0.0-20260330165843 → 0.0.0-20260330174802

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (35) hide show
  1. package/CHANGELOG.md +5 -1
  2. package/dist/ActionBar/ActionBar.js +3 -3
  3. package/dist/ActionList/ActionList-8b212f46.css +2 -0
  4. package/dist/ActionList/ActionList-8b212f46.css.map +1 -0
  5. package/dist/ActionList/ActionList.module.css.js +1 -1
  6. package/dist/ActionList/Heading.js +17 -16
  7. package/dist/ActionList/List.d.ts.map +1 -1
  8. package/dist/ActionList/List.js +31 -55
  9. package/dist/Autocomplete/AutocompleteInput.js +3 -3
  10. package/dist/Autocomplete/AutocompleteOverlay.js +3 -3
  11. package/dist/Button/ButtonBase.d.ts.map +1 -1
  12. package/dist/Button/ButtonBase.js +3 -4
  13. package/dist/Dialog/{Dialog-b577691f.css → Dialog-f9bb927a.css} +2 -2
  14. package/dist/Dialog/Dialog-f9bb927a.css.map +1 -0
  15. package/dist/Dialog/Dialog.d.ts.map +1 -1
  16. package/dist/Dialog/Dialog.js +9 -21
  17. package/dist/Dialog/Dialog.module.css.js +2 -2
  18. package/dist/FeatureFlags/DefaultFeatureFlags.d.ts.map +1 -1
  19. package/dist/FeatureFlags/DefaultFeatureFlags.js +0 -1
  20. package/dist/FeatureFlags/FeatureFlags.d.ts +0 -6
  21. package/dist/FeatureFlags/FeatureFlags.d.ts.map +1 -1
  22. package/dist/FeatureFlags/FeatureFlags.js +32 -41
  23. package/dist/Heading/Heading.js +3 -3
  24. package/dist/Link/Link.d.ts.map +1 -1
  25. package/dist/Link/Link.js +3 -4
  26. package/dist/Overlay/Overlay.js +21 -20
  27. package/dist/PageLayout/PageLayout.js +5 -5
  28. package/dist/TextInputWithTokens/TextInputWithTokens.js +91 -90
  29. package/dist/deprecated/DialogV1/Dialog.js +10 -9
  30. package/dist/hooks/useMergedRefs.d.ts +4 -4
  31. package/dist/hooks/useMergedRefs.js +4 -4
  32. package/package.json +1 -1
  33. package/dist/ActionList/ActionList-fcbc6ef6.css +0 -2
  34. package/dist/ActionList/ActionList-fcbc6ef6.css.map +0 -1
  35. package/dist/Dialog/Dialog-b577691f.css.map +0 -1
@@ -6,7 +6,7 @@ import { XIcon } from '@primer/octicons-react';
6
6
  import { useFocusZone } from '../hooks/useFocusZone.js';
7
7
  import { FocusKeys } from '@primer/behaviors';
8
8
  import { Portal } from '../Portal/Portal.js';
9
- import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
9
+ import { useMergedRefs } from '../hooks/useMergedRefs.js';
10
10
  import { useId } from '../hooks/useId.js';
11
11
  import classes from './Dialog.module.css.js';
12
12
  import { clsx } from 'clsx';
@@ -17,6 +17,7 @@ import { useOnEscapePress } from '../hooks/useOnEscapePress.js';
17
17
  import { ScrollableRegion } from '../ScrollableRegion/ScrollableRegion.js';
18
18
  import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
19
19
 
20
+ let dialogScrollDisabledCount = 0;
20
21
  const DefaultHeader = ({
21
22
  dialogLabelId,
22
23
  title,
@@ -106,7 +107,6 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
106
107
  const autoFocusedFooterButtonRef = useRef(null);
107
108
  for (const footerButton of footerButtons) {
108
109
  if (footerButton.autoFocus) {
109
- // eslint-disable-next-line react-hooks/immutability
110
110
  footerButton.ref = autoFocusedFooterButtonRef;
111
111
  }
112
112
  }
@@ -131,7 +131,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
131
131
  footer: Dialog.Footer
132
132
  });
133
133
  const dialogRef = useRef(null);
134
- useRefObjectAsForwardedRef(forwardedRef, dialogRef);
134
+ const mergedRef = useMergedRefs(forwardedRef, dialogRef);
135
135
  const backdropRef = useRef(null);
136
136
  useFocusTrap({
137
137
  containerRef: dialogRef,
@@ -145,26 +145,14 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
145
145
  }, [onClose]);
146
146
  React.useEffect(() => {
147
147
  const scrollbarWidth = window.innerWidth - document.body.clientWidth;
148
- const dialog = dialogRef.current;
149
- const usePerfOptimization = document.body.hasAttribute('data-dialog-scroll-optimized');
150
-
151
- // Add DisableScroll class to this dialog (for legacy :has() selector path)
152
- dialog === null || dialog === void 0 ? void 0 : dialog.classList.add(classes.DisableScroll);
148
+ dialogScrollDisabledCount++;
153
149
  document.body.style.setProperty('--prc-dialog-scrollgutter', `${scrollbarWidth}px`);
154
- if (usePerfOptimization) {
155
- // Optimized path: set attribute on body for direct CSS targeting
156
- document.body.setAttribute('data-dialog-scroll-disabled', '');
157
- }
158
- // Legacy path: no action needed - CSS :has(.Dialog.DisableScroll) handles it
159
-
150
+ document.body.setAttribute('data-dialog-scroll-disabled', '');
160
151
  return () => {
161
- dialog === null || dialog === void 0 ? void 0 : dialog.classList.remove(classes.DisableScroll);
162
- const remainingDialogs = document.querySelectorAll(`.${classes.DisableScroll}`);
163
- if (remainingDialogs.length === 0) {
152
+ dialogScrollDisabledCount--;
153
+ if (dialogScrollDisabledCount === 0) {
164
154
  document.body.style.removeProperty('--prc-dialog-scrollgutter');
165
- if (usePerfOptimization) {
166
- document.body.removeAttribute('data-dialog-scroll-disabled');
167
- }
155
+ document.body.removeAttribute('data-dialog-scroll-disabled');
168
156
  }
169
157
  };
170
158
  }, []);
@@ -217,7 +205,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
217
205
  setLastMouseDownIsBackdrop(e.target === e.currentTarget);
218
206
  },
219
207
  children: /*#__PURE__*/jsxs("div", {
220
- ref: dialogRef,
208
+ ref: mergedRef,
221
209
  role: role,
222
210
  "aria-labelledby": dialogLabelId,
223
211
  "aria-describedby": dialogDescriptionId,
@@ -1,5 +1,5 @@
1
- import './Dialog-b577691f.css';
1
+ import './Dialog-f9bb927a.css';
2
2
 
3
- var classes = {"Backdrop":"prc-Dialog-Backdrop-5Nt2U","dialog-backdrop-appear":"prc-Dialog-dialog-backdrop-appear-tCG2K","Dialog":"prc-Dialog-Dialog-G8cDF","Overlay--motion-scaleFade":"prc-Dialog-Overlay--motion-scaleFade-mE6-C","Overlay--motion-slideInRight":"prc-Dialog-Overlay--motion-slideInRight-BR-CZ","Overlay--motion-slideInLeft":"prc-Dialog-Overlay--motion-slideInLeft-ISmQZ","Overlay--motion-slideUp":"prc-Dialog-Overlay--motion-slideUp-tPElO","DisableScroll":"prc-Dialog-DisableScroll-UkWFM","DialogOverflowWrapper":"prc-Dialog-DialogOverflowWrapper-JvHzz","detect-scroll":"prc-Dialog-detect-scroll-b3i8Q","Header":"prc-Dialog-Header-f7Me-","HeaderInner":"prc-Dialog-HeaderInner-H-fFY","HeaderContent":"prc-Dialog-HeaderContent-mjAsn","Title":"prc-Dialog-Title-M-iPn","Subtitle":"prc-Dialog-Subtitle-aBFSq","Body":"prc-Dialog-Body-bB903","Footer":"prc-Dialog-Footer-PMeQk"};
3
+ var classes = {"Backdrop":"prc-Dialog-Backdrop-5Nt2U","dialog-backdrop-appear":"prc-Dialog-dialog-backdrop-appear-tCG2K","Dialog":"prc-Dialog-Dialog-G8cDF","Overlay--motion-scaleFade":"prc-Dialog-Overlay--motion-scaleFade-mE6-C","Overlay--motion-slideInRight":"prc-Dialog-Overlay--motion-slideInRight-BR-CZ","Overlay--motion-slideInLeft":"prc-Dialog-Overlay--motion-slideInLeft-ISmQZ","Overlay--motion-slideUp":"prc-Dialog-Overlay--motion-slideUp-tPElO","DialogOverflowWrapper":"prc-Dialog-DialogOverflowWrapper-JvHzz","detect-scroll":"prc-Dialog-detect-scroll-b3i8Q","Header":"prc-Dialog-Header-f7Me-","HeaderInner":"prc-Dialog-HeaderInner-H-fFY","HeaderContent":"prc-Dialog-HeaderContent-mjAsn","Title":"prc-Dialog-Title-M-iPn","Subtitle":"prc-Dialog-Subtitle-aBFSq","Body":"prc-Dialog-Body-bB903","Footer":"prc-Dialog-Footer-PMeQk"};
4
4
 
5
5
  export { classes as default };
@@ -1 +1 @@
1
- {"version":3,"file":"DefaultFeatureFlags.d.ts","sourceRoot":"","sources":["../../src/FeatureFlags/DefaultFeatureFlags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AAEnD,eAAO,MAAM,mBAAmB,kBAS9B,CAAA"}
1
+ {"version":3,"file":"DefaultFeatureFlags.d.ts","sourceRoot":"","sources":["../../src/FeatureFlags/DefaultFeatureFlags.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAA;AAEnD,eAAO,MAAM,mBAAmB,kBAQ9B,CAAA"}
@@ -3,7 +3,6 @@ import { FeatureFlagScope } from './FeatureFlagScope.js';
3
3
  const DefaultFeatureFlags = FeatureFlagScope.create({
4
4
  primer_react_breadcrumbs_overflow_menu: false,
5
5
  primer_react_css_anchor_positioning: false,
6
- primer_react_css_has_selector_perf: false,
7
6
  primer_react_select_panel_fullscreen_on_narrow: false,
8
7
  primer_react_select_panel_order_selected_at_top: false,
9
8
  primer_react_select_panel_remove_active_descendant: false,
@@ -3,11 +3,5 @@ import { type FeatureFlags } from './FeatureFlagScope';
3
3
  export type FeatureFlagsProps = React.PropsWithChildren<{
4
4
  flags: FeatureFlags;
5
5
  }>;
6
- /**
7
- * Reset the ref count for testing purposes only.
8
- *
9
- * @internal - Not part of the public API. Only exported for test isolation.
10
- */
11
- export declare function __resetDialogScrollOptimizedCount(): void;
12
6
  export declare function FeatureFlags({ children, flags }: FeatureFlagsProps): React.JSX.Element;
13
7
  //# sourceMappingURL=FeatureFlags.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"FeatureFlags.d.ts","sourceRoot":"","sources":["../../src/FeatureFlags/FeatureFlags.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,EAAmB,KAAK,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAGtE,MAAM,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACtD,KAAK,EAAE,YAAY,CAAA;CACpB,CAAC,CAAA;AAcF;;;;GAIG;AACH,wBAAgB,iCAAiC,IAAI,IAAI,CAGxD;AAED,wBAAgB,YAAY,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,iBAAiB,qBAyBhE"}
1
+ {"version":3,"file":"FeatureFlags.d.ts","sourceRoot":"","sources":["../../src/FeatureFlags/FeatureFlags.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,OAAO,EAAmB,KAAK,YAAY,EAAC,MAAM,oBAAoB,CAAA;AAEtE,MAAM,MAAM,iBAAiB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACtD,KAAK,EAAE,YAAY,CAAA;CACpB,CAAC,CAAA;AAEF,wBAAgB,YAAY,CAAC,EAAC,QAAQ,EAAE,KAAK,EAAC,EAAE,iBAAiB,qBAQhE"}
@@ -1,49 +1,40 @@
1
- import { useContext, useMemo } from 'react';
1
+ import { c } from 'react-compiler-runtime';
2
+ import { useContext } from 'react';
2
3
  import { FeatureFlagContext } from './FeatureFlagContext.js';
3
4
  import { FeatureFlagScope } from './FeatureFlagScope.js';
4
- import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
5
5
  import { jsx } from 'react/jsx-runtime';
6
6
 
7
- /**
8
- * Ref count for data-dialog-scroll-optimized attribute management.
9
- *
10
- * NOTE: This is temporary infrastructure while we feature flag the CSS :has()
11
- * performance optimization (primer_react_css_has_selector_perf). Once the flag
12
- * is removed and the optimization is the default behavior, this ref counting
13
- * can be removed - the attribute can simply always be present.
14
- *
15
- * @internal - Not part of the public API
16
- */
17
- let dialogScrollOptimizedCount = 0;
18
- function FeatureFlags({
19
- children,
20
- flags
21
- }) {
7
+ function FeatureFlags(t0) {
8
+ const $ = c(6);
9
+ const {
10
+ children,
11
+ flags
12
+ } = t0;
22
13
  const parentFeatureFlags = useContext(FeatureFlagContext);
23
- const value = useMemo(() => {
24
- const scope = FeatureFlagScope.merge(parentFeatureFlags, FeatureFlagScope.create(flags));
25
- return scope;
26
- }, [parentFeatureFlags, flags]);
27
- const isOptimizationEnabled = value.enabled('primer_react_css_has_selector_perf');
28
-
29
- // Set body attribute for CSS :has() optimization when flag is enabled
30
- useIsomorphicLayoutEffect(() => {
31
- if (isOptimizationEnabled) {
32
- dialogScrollOptimizedCount++;
33
- document.body.setAttribute('data-dialog-scroll-optimized', '');
34
- return () => {
35
- dialogScrollOptimizedCount--;
36
- if (dialogScrollOptimizedCount === 0) {
37
- document.body.removeAttribute('data-dialog-scroll-optimized');
38
- }
39
- };
40
- }
41
- }, [isOptimizationEnabled]);
42
- return /*#__PURE__*/jsx(FeatureFlagContext.Provider, {
43
- value: value,
44
- children: children
45
- });
14
+ let t1;
15
+ if ($[0] !== flags || $[1] !== parentFeatureFlags) {
16
+ t1 = FeatureFlagScope.merge(parentFeatureFlags, FeatureFlagScope.create(flags));
17
+ $[0] = flags;
18
+ $[1] = parentFeatureFlags;
19
+ $[2] = t1;
20
+ } else {
21
+ t1 = $[2];
22
+ }
23
+ const scope = t1;
24
+ const value = scope;
25
+ let t2;
26
+ if ($[3] !== children || $[4] !== value) {
27
+ t2 = /*#__PURE__*/jsx(FeatureFlagContext.Provider, {
28
+ value: value,
29
+ children: children
30
+ });
31
+ $[3] = children;
32
+ $[4] = value;
33
+ $[5] = t2;
34
+ } else {
35
+ t2 = $[5];
36
+ }
37
+ return t2;
46
38
  }
47
- FeatureFlags.displayName = "FeatureFlags";
48
39
 
49
40
  export { FeatureFlags };
@@ -2,7 +2,7 @@ import { clsx } from 'clsx';
2
2
  import React, { forwardRef, useEffect } from 'react';
3
3
  import classes from './Heading.module.css.js';
4
4
  import { jsx } from 'react/jsx-runtime';
5
- import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
5
+ import { useMergedRefs } from '../hooks/useMergedRefs.js';
6
6
 
7
7
  const Heading = /*#__PURE__*/forwardRef(({
8
8
  as: Component = 'h2',
@@ -11,7 +11,7 @@ const Heading = /*#__PURE__*/forwardRef(({
11
11
  ...props
12
12
  }, forwardedRef) => {
13
13
  const innerRef = React.useRef(null);
14
- useRefObjectAsForwardedRef(forwardedRef, innerRef);
14
+ const mergedRef = useMergedRefs(forwardedRef, innerRef);
15
15
  if (process.env.NODE_ENV !== "production") {
16
16
  /**
17
17
  * The Linter yells because it thinks this conditionally calls an effect,
@@ -31,7 +31,7 @@ const Heading = /*#__PURE__*/forwardRef(({
31
31
  className: clsx(className, classes.Heading),
32
32
  "data-variant": variant,
33
33
  ...props,
34
- ref: innerRef
34
+ ref: mergedRef
35
35
  });
36
36
  });
37
37
  Heading.displayName = 'Heading';
@@ -1 +1 @@
1
- {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/Link/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAY,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AAG1E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAC,KAAK,gBAAgB,EAAkB,MAAM,6BAA6B,CAAA;AAElF,KAAK,eAAe,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI;IACzD,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,EAC9D,OAAO,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,eAAe,CAAC,EACjD,KAAK,YAAY,CAAC,OAAO,CAAC,sBAyC3B,CAAA;AAID,QAAA,MAAM,IAAI,IA/CoB,EAAE,SAAS,KAAK,CAAC,WAAW;;;;CA+CM,CAAA;AAEhE,MAAM,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,IAAI,CAAC,CAAA;AACnD,eAAe,IAAI,CAAA"}
1
+ {"version":3,"file":"Link.d.ts","sourceRoot":"","sources":["../../src/Link/Link.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAY,KAAK,YAAY,EAAkB,MAAM,OAAO,CAAA;AAG1E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAClD,OAAO,EAAC,KAAK,gBAAgB,EAAkB,MAAM,6BAA6B,CAAA;AAElF,KAAK,eAAe,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI;IACzD,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,uDAAuD;IACvD,UAAU,CAAC,EAAE,MAAM,CAAA;IACnB,KAAK,CAAC,EAAE,OAAO,CAAA;IAEf,MAAM,CAAC,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,aAAa,GAAI,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,EAC9D,OAAO,gBAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,eAAe,CAAC,EACjD,KAAK,YAAY,CAAC,OAAO,CAAC,sBAwC3B,CAAA;AAID,QAAA,MAAM,IAAI,IA9CoB,EAAE,SAAS,KAAK,CAAC,WAAW;;;;CA8CM,CAAA;AAEhE,MAAM,MAAM,SAAS,GAAG,cAAc,CAAC,OAAO,IAAI,CAAC,CAAA;AACnD,eAAe,IAAI,CAAA"}
package/dist/Link/Link.js CHANGED
@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
3
3
  import classes from './Link.module.css.js';
4
4
  import { fixedForwardRef } from '../utils/modern-polymorphic.js';
5
5
  import { jsx } from 'react/jsx-runtime';
6
- import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
6
+ import { useMergedRefs } from '../hooks/useMergedRefs.js';
7
7
 
8
8
  const UnwrappedLink = (props, ref) => {
9
9
  const {
@@ -15,7 +15,7 @@ const UnwrappedLink = (props, ref) => {
15
15
  ...restProps
16
16
  } = props;
17
17
  const innerRef = React.useRef(null);
18
- useRefObjectAsForwardedRef(ref, innerRef);
18
+ const mergedRef = useMergedRefs(ref, innerRef);
19
19
  if (process.env.NODE_ENV !== "production") {
20
20
  /**
21
21
  * The Linter yells because it thinks this conditionally calls an effect,
@@ -37,8 +37,7 @@ const UnwrappedLink = (props, ref) => {
37
37
  "data-inline": inline,
38
38
  "data-hover-color": hoverColor,
39
39
  ...restProps,
40
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
41
- ref: innerRef
40
+ ref: mergedRef
42
41
  });
43
42
  };
44
43
  UnwrappedLink.displayName = "UnwrappedLink";
@@ -2,7 +2,7 @@ import { c } from 'react-compiler-runtime';
2
2
  import React, { useRef, useEffect } from 'react';
3
3
  import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
4
4
  import { Portal } from '../Portal/Portal.js';
5
- import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
5
+ import { useMergedRefs } from '../hooks/useMergedRefs.js';
6
6
  import classes from './Overlay.module.css.js';
7
7
  import { clsx } from 'clsx';
8
8
  import { jsx } from 'react/jsx-runtime';
@@ -116,7 +116,7 @@ const BaseOverlay = /*#__PURE__*/React.forwardRef(({
116
116
 
117
117
  */
118
118
  const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
119
- const $ = c(49);
119
+ const $ = c(50);
120
120
  let _PrivateDisablePortal;
121
121
  let anchorSide;
122
122
  let ignoreClickRefs;
@@ -202,7 +202,7 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
202
202
  const width = t5 === undefined ? "auto" : t5;
203
203
  const featureFlagMaxHeightClampToViewport = useFeatureFlag("primer_react_overlay_max_height_clamp_to_viewport");
204
204
  const overlayRef = useRef(null);
205
- useRefObjectAsForwardedRef(forwardedRef, overlayRef);
205
+ const mergedRef = useMergedRefs(forwardedRef, overlayRef);
206
206
  const cssAnchorPositioning = useFeatureFlag("primer_react_css_anchor_positioning");
207
207
  let t6;
208
208
  if ($[19] !== ignoreClickRefs || $[20] !== initialFocusRef || $[21] !== onClickOutside || $[22] !== onEscape || $[23] !== preventFocusOnOpen || $[24] !== returnFocusRef) {
@@ -286,12 +286,12 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
286
286
  t12 = $[34];
287
287
  }
288
288
  let t13;
289
- if ($[35] !== height || $[36] !== leftPosition || $[37] !== props || $[38] !== responsiveVariant || $[39] !== right || $[40] !== role || $[41] !== t11 || $[42] !== t12 || $[43] !== visibility || $[44] !== width) {
289
+ if ($[35] !== height || $[36] !== leftPosition || $[37] !== mergedRef || $[38] !== props || $[39] !== responsiveVariant || $[40] !== right || $[41] !== role || $[42] !== t11 || $[43] !== t12 || $[44] !== visibility || $[45] !== width) {
290
290
  t13 = /*#__PURE__*/jsx(BaseOverlay, {
291
291
  role: role,
292
292
  width: width,
293
293
  "data-reflow-container": t11,
294
- ref: overlayRef,
294
+ ref: mergedRef,
295
295
  left: leftPosition,
296
296
  right: right,
297
297
  height: height,
@@ -302,33 +302,34 @@ const Overlay = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
302
302
  });
303
303
  $[35] = height;
304
304
  $[36] = leftPosition;
305
- $[37] = props;
306
- $[38] = responsiveVariant;
307
- $[39] = right;
308
- $[40] = role;
309
- $[41] = t11;
310
- $[42] = t12;
311
- $[43] = visibility;
312
- $[44] = width;
313
- $[45] = t13;
305
+ $[37] = mergedRef;
306
+ $[38] = props;
307
+ $[39] = responsiveVariant;
308
+ $[40] = right;
309
+ $[41] = role;
310
+ $[42] = t11;
311
+ $[43] = t12;
312
+ $[44] = visibility;
313
+ $[45] = width;
314
+ $[46] = t13;
314
315
  } else {
315
- t13 = $[45];
316
+ t13 = $[46];
316
317
  }
317
318
  const overlayContent = t13;
318
319
  if (_PrivateDisablePortal && cssAnchorPositioning) {
319
320
  return overlayContent;
320
321
  }
321
322
  let t14;
322
- if ($[46] !== overlayContent || $[47] !== portalContainerName) {
323
+ if ($[47] !== overlayContent || $[48] !== portalContainerName) {
323
324
  t14 = /*#__PURE__*/jsx(Portal, {
324
325
  containerName: portalContainerName,
325
326
  children: overlayContent
326
327
  });
327
- $[46] = overlayContent;
328
- $[47] = portalContainerName;
329
- $[48] = t14;
328
+ $[47] = overlayContent;
329
+ $[48] = portalContainerName;
330
+ $[49] = t14;
330
331
  } else {
331
- t14 = $[48];
332
+ t14 = $[49];
332
333
  }
333
334
  return t14;
334
335
  });
@@ -1,7 +1,7 @@
1
1
  import React, { useRef, memo } from 'react';
2
2
  import { clsx } from 'clsx';
3
3
  import { useId } from '../hooks/useId.js';
4
- import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
4
+ import { useMergedRefs } from '../hooks/useMergedRefs.js';
5
5
  import { isResponsiveValue } from '../hooks/useResponsiveValue.js';
6
6
  import { useSlots } from '../hooks/useSlots.js';
7
7
  import { useOverflow } from '../hooks/useOverflow.js';
@@ -581,7 +581,7 @@ const Pane = /*#__PURE__*/React.forwardRef(({
581
581
  onResizeEnd,
582
582
  currentWidth: controlledWidth
583
583
  });
584
- useRefObjectAsForwardedRef(forwardRef, paneRef);
584
+ const mergedRef = useMergedRefs(forwardRef, paneRef);
585
585
  const hasOverflow = useOverflow(paneRef);
586
586
  const paneId = useId(id);
587
587
  const labelProp = {};
@@ -615,7 +615,7 @@ const Pane = /*#__PURE__*/React.forwardRef(({
615
615
  },
616
616
  position: positionProp
617
617
  }), /*#__PURE__*/jsx("div", {
618
- ref: paneRef
618
+ ref: mergedRef
619
619
  // Suppress hydration mismatch for --pane-width when localStorage
620
620
  // provides a width that differs from the server-rendered default.
621
621
  // Not needed when onResizeEnd is provided (localStorage isn't read).
@@ -785,7 +785,7 @@ const Sidebar = /*#__PURE__*/React.forwardRef(({
785
785
  contentWrapperRef: sidebarContentWrapperRef,
786
786
  constrainToViewport: true
787
787
  });
788
- useRefObjectAsForwardedRef(forwardRef, sidebarRef);
788
+ const mergedRef = useMergedRefs(forwardRef, sidebarRef);
789
789
  const hasOverflow = useOverflow(sidebarRef);
790
790
  const sidebarId = useId(id);
791
791
  const labelProp = {};
@@ -824,7 +824,7 @@ const Sidebar = /*#__PURE__*/React.forwardRef(({
824
824
  getDefaultWidth: getDefaultWidth,
825
825
  saveWidth: saveWidth
826
826
  }), /*#__PURE__*/jsx("div", {
827
- ref: sidebarRef
827
+ ref: mergedRef
828
828
  // Suppress hydration mismatch for --pane-width when localStorage
829
829
  // provides a width that differs from the server-rendered default.
830
830
  ,