@primer/react 0.0.0-20260317165323 → 0.0.0-20260317170538

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 (45) hide show
  1. package/CHANGELOG.md +7 -8
  2. package/dist/ActionList/LinkItem.d.ts +6 -3
  3. package/dist/ActionList/LinkItem.d.ts.map +1 -1
  4. package/dist/ActionList/LinkItem.js +42 -87
  5. package/dist/ActionList/index.d.ts +25 -1
  6. package/dist/ActionList/index.d.ts.map +1 -1
  7. package/dist/Autocomplete/AutocompleteInput.js +3 -3
  8. package/dist/Autocomplete/AutocompleteOverlay.js +3 -3
  9. package/dist/Banner/Banner.js +1 -1
  10. package/dist/Breadcrumbs/Breadcrumbs.d.ts +23 -8
  11. package/dist/Breadcrumbs/Breadcrumbs.d.ts.map +1 -1
  12. package/dist/Breadcrumbs/Breadcrumbs.js +27 -65
  13. package/dist/Button/ButtonBase.d.ts.map +1 -1
  14. package/dist/Button/ButtonBase.js +4 -3
  15. package/dist/Details/Details.js +1 -1
  16. package/dist/Dialog/Dialog.js +3 -3
  17. package/dist/Heading/Heading.js +3 -3
  18. package/dist/Link/Link.d.ts.map +1 -1
  19. package/dist/Link/Link.js +4 -3
  20. package/dist/NavList/NavList.d.ts +20 -3
  21. package/dist/NavList/NavList.d.ts.map +1 -1
  22. package/dist/NavList/NavList.js +50 -124
  23. package/dist/Overlay/Overlay.js +19 -20
  24. package/dist/PageLayout/PageLayout.js +5 -5
  25. package/dist/TextInputWithTokens/TextInputWithTokens.js +90 -91
  26. package/dist/deprecated/DialogV1/Dialog.js +9 -10
  27. package/dist/hooks/index.d.ts +0 -1
  28. package/dist/hooks/index.d.ts.map +1 -1
  29. package/dist/hooks/useProvidedRefOrCreate.d.ts +0 -12
  30. package/dist/hooks/useProvidedRefOrCreate.d.ts.map +1 -1
  31. package/dist/hooks/useProvidedRefOrCreate.js +0 -12
  32. package/dist/hooks/useRefObjectAsForwardedRef.d.ts +0 -12
  33. package/dist/hooks/useRefObjectAsForwardedRef.d.ts.map +1 -1
  34. package/dist/hooks/useRefObjectAsForwardedRef.js +0 -12
  35. package/dist/index.d.ts +0 -1
  36. package/dist/index.d.ts.map +1 -1
  37. package/dist/index.js +0 -1
  38. package/dist/internal/hooks/useMergedRefs.d.ts +2 -0
  39. package/dist/internal/hooks/useMergedRefs.d.ts.map +1 -0
  40. package/dist/internal/hooks/useMergedRefs.js +16 -0
  41. package/generated/hooks.json +0 -22
  42. package/package.json +1 -1
  43. package/dist/hooks/useMergedRefs.d.ts +0 -51
  44. package/dist/hooks/useMergedRefs.d.ts.map +0 -1
  45. package/dist/hooks/useMergedRefs.js +0 -86
package/CHANGELOG.md CHANGED
@@ -1,21 +1,20 @@
1
1
  # @primer/react
2
2
 
3
- ## 0.0.0-20260317165323
3
+ ## 0.0.0-20260317170538
4
4
 
5
5
  ### Minor Changes
6
6
 
7
- - [#7638](https://github.com/primer/react/pull/7638) [`973f184`](https://github.com/primer/react/commit/973f184c7ed18526c786404376c11f2df71f2e54) Thanks [@iansan5653](https://github.com/iansan5653)! - - New: Exposes new `useMergedRefs` hook that can merge two refs into a single combined ref
7
+ - [#7658](https://github.com/primer/react/pull/7658) [`259fdff`](https://github.com/primer/react/commit/259fdff67550e328b851129a78e87413ddb07229) Thanks [@hussam-i-am](https://github.com/hussam-i-am)! - fix(polymorphic): Improve prop passthrough for ActionList.LinkItem and Breadcrumbs.Item
8
8
 
9
- - Deprecates `useRefObjectAsForwardedRef`; see doc comment for migration instructions
10
- - Deprecates `useProvidedRefOrCreate`; see doc comment for migration instructions
9
+ ### Patch Changes
11
10
 
12
- - [#7661](https://github.com/primer/react/pull/7661) [`dceb79c`](https://github.com/primer/react/commit/dceb79c5e0f8ab5c25bbc9727bc3207fb77d520e) Thanks [@TylerJDev](https://github.com/TylerJDev)! - AnchoredOverlay: Add CSS Anchor Positioning to `AnchoredOverlay` (under a feature flag)
11
+ - Fake entry to force publishing
13
12
 
14
- ### Patch Changes
13
+ ## 38.16.0
15
14
 
16
- - [#7645](https://github.com/primer/react/pull/7645) [`bdb0e39`](https://github.com/primer/react/commit/bdb0e39d56bfb13ab3e321622402369251cc3207) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Update internal implementations of combined refs to improve performance and add support for React 19 callback refs
15
+ ### Minor Changes
17
16
 
18
- - Fake entry to force publishing
17
+ - [#7661](https://github.com/primer/react/pull/7661) [`dceb79c`](https://github.com/primer/react/commit/dceb79c5e0f8ab5c25bbc9727bc3207fb77d520e) Thanks [@TylerJDev](https://github.com/TylerJDev)! - AnchoredOverlay: Add CSS Anchor Positioning to `AnchoredOverlay` (under a feature flag)
19
18
 
20
19
  ## 38.15.1
21
20
 
@@ -1,5 +1,5 @@
1
- import React from 'react';
2
- import type { ForwardRefComponent as PolymorphicForwardRefComponent } from '../utils/polymorphic';
1
+ import type React from 'react';
2
+ import type { WithSlotMarker } from '../utils/types/Slots';
3
3
  import type { ActionListItemProps } from './shared';
4
4
  type LinkProps = {
5
5
  download?: string;
@@ -14,6 +14,9 @@ type LinkProps = {
14
14
  className?: string;
15
15
  };
16
16
  export type ActionListLinkItemProps = Pick<ActionListItemProps, 'active' | 'children' | 'inactiveText' | 'variant' | 'size'> & LinkProps;
17
- export declare const LinkItem: PolymorphicForwardRefComponent<"a", ActionListLinkItemProps>;
17
+ declare const LinkItemComponent: <As extends React.ElementType = "a">(props: (React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & Pick<ActionListItemProps, "children" | "size" | "active" | "variant" | "inactiveText"> & LinkProps extends infer T ? T extends React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & Pick<ActionListItemProps, "children" | "size" | "active" | "variant" | "inactiveText"> & LinkProps ? T extends unknown ? Omit<T, "as"> : never : never : never) & {
18
+ as?: As | undefined;
19
+ } & React.RefAttributes<unknown>) => React.ReactNode;
20
+ export declare const LinkItem: WithSlotMarker<typeof LinkItemComponent>;
18
21
  export {};
19
22
  //# sourceMappingURL=LinkItem.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"LinkItem.d.ts","sourceRoot":"","sources":["../../src/ActionList/LinkItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAG/F,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAA;AAGjD,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,CAAC,CAAA;IAChF,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAGD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,EACnB,QAAQ,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,CAC5D,GACC,SAAS,CAAA;AAEX,eAAO,MAAM,QAAQ,EA4BhB,8BAA8B,CAAC,GAAG,EAAE,uBAAuB,CAAC,CAAA"}
1
+ {"version":3,"file":"LinkItem.d.ts","sourceRoot":"","sources":["../../src/ActionList/LinkItem.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAE9B,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAA;AAGxD,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAA;AAIjD,KAAK,SAAS,GAAG;IACf,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,GAAG,CAAC,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,MAAM,CAAA;IACf,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,cAAc,CAAC,EAAE,KAAK,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,CAAC,gBAAgB,CAAC,CAAA;IAChF,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAA;AAGD,MAAM,MAAM,uBAAuB,GAAG,IAAI,CACxC,mBAAmB,EACnB,QAAQ,GAAG,UAAU,GAAG,cAAc,GAAG,SAAS,GAAG,MAAM,CAC5D,GACC,SAAS,CAAA;AAIX,QAAA,MAAM,iBAAiB,GACpB,EAAE,SAAS,KAAK,CAAC,WAAW;;oDAqC9B,CAAA;AAED,eAAO,MAAM,QAAQ,EAAE,cAAc,CAAC,OAAO,iBAAiB,CAG5D,CAAA"}
@@ -1,62 +1,46 @@
1
- import { c } from 'react-compiler-runtime';
2
- import React from 'react';
3
1
  import { Item } from './Item.js';
2
+ import { fixedForwardRef } from '../utils/modern-polymorphic.js';
4
3
  import { jsx } from 'react/jsx-runtime';
5
4
  import Link from '../Link/Link.js';
6
5
 
7
- const LinkItem = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
8
- const $ = c(22);
9
- let Component;
10
- let active;
11
- let className;
12
- let inactiveText;
13
- let props;
14
- let size;
15
- let variant;
16
- if ($[0] !== t0) {
17
- ({
18
- active,
19
- inactiveText,
20
- variant,
21
- size,
22
- as: Component,
23
- className,
24
- ...props
25
- } = t0);
26
- $[0] = t0;
27
- $[1] = Component;
28
- $[2] = active;
29
- $[3] = className;
30
- $[4] = inactiveText;
31
- $[5] = props;
32
- $[6] = size;
33
- $[7] = variant;
34
- } else {
35
- Component = $[1];
36
- active = $[2];
37
- className = $[3];
38
- inactiveText = $[4];
39
- props = $[5];
40
- size = $[6];
41
- variant = $[7];
42
- }
43
- const t1 = inactiveText ? true : undefined;
44
- let t2;
45
- if ($[8] !== Component || $[9] !== forwardedRef || $[10] !== inactiveText || $[11] !== props) {
46
- t2 = t3 => {
47
- const {
48
- children,
49
- onClick,
50
- ...rest
51
- } = t3;
6
+ const LinkItemComponent = fixedForwardRef(({
7
+ active,
8
+ inactiveText,
9
+ variant,
10
+ size,
11
+ as: Component,
12
+ className,
13
+ ...props
14
+ }, forwardedRef) => {
15
+ return /*#__PURE__*/jsx(Item, {
16
+ className: className,
17
+ active: active,
18
+ inactiveText: inactiveText,
19
+ "data-inactive": inactiveText ? true : undefined,
20
+ variant: variant,
21
+ size: size,
22
+ _PrivateItemWrapper: ({
23
+ children,
24
+ onClick,
25
+ ...rest
26
+ }) => {
52
27
  const clickHandler = event => {
53
28
  onClick && onClick(event);
54
29
  props.onClick && props.onClick(event);
55
30
  };
56
- return inactiveText ? /*#__PURE__*/jsx("span", {
57
- ...rest,
58
- children: children
59
- }) : /*#__PURE__*/jsx(Link, {
31
+ if (inactiveText) {
32
+ return /*#__PURE__*/jsx("span", {
33
+ ...rest,
34
+ children: children
35
+ });
36
+ }
37
+
38
+ // Type safety for the polymorphic `as` prop is enforced at the
39
+ // LinkItem boundary via fixedForwardRef. Internally we widen
40
+ // Link's type so TypeScript doesn't re-check the generic
41
+ // constraint across two polymorphic layers.
42
+ const InternalLink = Link;
43
+ return /*#__PURE__*/jsx(InternalLink, {
60
44
  as: Component,
61
45
  ...rest,
62
46
  ...props,
@@ -64,42 +48,13 @@ const LinkItem = /*#__PURE__*/React.forwardRef((t0, forwardedRef) => {
64
48
  ref: forwardedRef,
65
49
  children: children
66
50
  });
67
- };
68
- $[8] = Component;
69
- $[9] = forwardedRef;
70
- $[10] = inactiveText;
71
- $[11] = props;
72
- $[12] = t2;
73
- } else {
74
- t2 = $[12];
75
- }
76
- let t3;
77
- if ($[13] !== active || $[14] !== className || $[15] !== inactiveText || $[16] !== props.children || $[17] !== size || $[18] !== t1 || $[19] !== t2 || $[20] !== variant) {
78
- t3 = /*#__PURE__*/jsx(Item, {
79
- className: className,
80
- active: active,
81
- inactiveText: inactiveText,
82
- "data-inactive": t1,
83
- variant: variant,
84
- size: size,
85
- _PrivateItemWrapper: t2,
86
- children: props.children
87
- });
88
- $[13] = active;
89
- $[14] = className;
90
- $[15] = inactiveText;
91
- $[16] = props.children;
92
- $[17] = size;
93
- $[18] = t1;
94
- $[19] = t2;
95
- $[20] = variant;
96
- $[21] = t3;
97
- } else {
98
- t3 = $[21];
99
- }
100
- return t3;
51
+ },
52
+ children: props.children
53
+ });
54
+ });
55
+ const LinkItem = Object.assign(LinkItemComponent, {
56
+ displayName: 'ActionList.LinkItem',
57
+ __SLOT__: Symbol('ActionList.LinkItem')
101
58
  });
102
- LinkItem.displayName = 'ActionList.LinkItem';
103
- LinkItem.__SLOT__ = Symbol('ActionList.LinkItem');
104
59
 
105
60
  export { LinkItem };
@@ -84,7 +84,31 @@ export declare const ActionList: (<As extends React.ElementType = "ul">(props: (
84
84
  __SLOT__: symbol;
85
85
  };
86
86
  /** A `Item` that renders a full-size anchor inside ListItem */
87
- LinkItem: import("../utils/polymorphic").ForwardRefComponent<"a", import("./LinkItem").ActionListLinkItemProps>;
87
+ LinkItem: import("../utils/types").WithSlotMarker<(<As extends React.ElementType = "a">(props: (import("react").ComponentPropsWithRef<import("react").ElementType extends As ? "a" : As> & Pick<import("./shared").ActionListItemProps, "children" | "size" | "active" | "variant" | "inactiveText"> & {
88
+ download?: string;
89
+ href?: string;
90
+ hrefLang?: string;
91
+ media?: string;
92
+ ping?: string;
93
+ rel?: string;
94
+ target?: string;
95
+ type?: string;
96
+ referrerPolicy?: React.AnchorHTMLAttributes<HTMLAnchorElement>["referrerPolicy"];
97
+ className?: string;
98
+ } extends infer T ? T extends import("react").ComponentPropsWithRef<import("react").ElementType extends As ? "a" : As> & Pick<import("./shared").ActionListItemProps, "children" | "size" | "active" | "variant" | "inactiveText"> & {
99
+ download?: string;
100
+ href?: string;
101
+ hrefLang?: string;
102
+ media?: string;
103
+ ping?: string;
104
+ rel?: string;
105
+ target?: string;
106
+ type?: string;
107
+ referrerPolicy?: React.AnchorHTMLAttributes<HTMLAnchorElement>["referrerPolicy"];
108
+ className?: string;
109
+ } ? T extends unknown ? Omit<T, "as"> : never : never : never) & {
110
+ as?: As | undefined;
111
+ } & import("react").RefAttributes<unknown>) => React.ReactNode)>;
88
112
  /** Visually separates `Item`s or `Group`s in an `ActionList`. */
89
113
  Divider: import("../utils/types").FCWithSlotMarker<import("react").PropsWithChildren<import("./Divider").ActionListDividerProps>>;
90
114
  /** Secondary text which provides additional information about an `Item`. */
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ActionList/index.ts"],"names":[],"mappings":"AAUA,YAAY,EAAC,eAAe,EAAC,MAAM,UAAU,CAAA;AAC7C,YAAY,EAAC,oBAAoB,EAAE,2BAA2B,EAAC,MAAM,SAAS,CAAA;AAC9E,YAAY,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAA;AACjD,YAAY,EAAC,uBAAuB,EAAC,MAAM,YAAY,CAAA;AACvD,YAAY,EAAC,sBAAsB,EAAC,MAAM,WAAW,CAAA;AACrD,YAAY,EAAC,0BAA0B,EAAC,MAAM,eAAe,CAAA;AAC7D,YAAY,EAAC,4BAA4B,EAAE,6BAA6B,EAAC,MAAM,WAAW,CAAA;AAC1F,YAAY,EAAC,sBAAsB,EAAC,MAAM,WAAW,CAAA;AACrD,YAAY,EAAC,6BAA6B,EAAC,MAAM,kBAAkB,CAAA;AAEnE;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;IACrB,mDAAmD;;IAGnD,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGzC,+DAA+D;;IAG/D,iEAAiE;;IAGjE,4EAA4E;;IAG5E,uDAAuD;;IAGvD,sDAAsD;;IAGtD,mCAAmC;;IAGnC,qCAAqC;;IAGrC,uBAAuB;;CAEvB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/ActionList/index.ts"],"names":[],"mappings":"AAUA,YAAY,EAAC,eAAe,EAAC,MAAM,UAAU,CAAA;AAC7C,YAAY,EAAC,oBAAoB,EAAE,2BAA2B,EAAC,MAAM,SAAS,CAAA;AAC9E,YAAY,EAAC,mBAAmB,EAAC,MAAM,UAAU,CAAA;AACjD,YAAY,EAAC,uBAAuB,EAAC,MAAM,YAAY,CAAA;AACvD,YAAY,EAAC,sBAAsB,EAAC,MAAM,WAAW,CAAA;AACrD,YAAY,EAAC,0BAA0B,EAAC,MAAM,eAAe,CAAA;AAC7D,YAAY,EAAC,4BAA4B,EAAE,6BAA6B,EAAC,MAAM,WAAW,CAAA;AAC1F,YAAY,EAAC,sBAAsB,EAAC,MAAM,WAAW,CAAA;AACrD,YAAY,EAAC,6BAA6B,EAAC,MAAM,kBAAkB,CAAA;AAEnE;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;IACrB,mDAAmD;;IAGnD,yCAAyC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGzC,+DAA+D;;;;;;;;;;;;;;;;;;;;;;;;;;IAG/D,iEAAiE;;IAGjE,4EAA4E;;IAG5E,uDAAuD;;IAGvD,sDAAsD;;IAGtD,mCAAmC;;IAGnC,qCAAqC;;IAGrC,uBAAuB;;CAEvB,CAAA"}
@@ -1,6 +1,6 @@
1
1
  import React, { useContext, useState, useCallback, useEffect } from 'react';
2
2
  import { AutocompleteContext, AutocompleteInputContext } from './AutocompleteContext.js';
3
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
3
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
4
4
  import useSafeTimeout from '../hooks/useSafeTimeout.js';
5
5
  import { jsx } from 'react/jsx-runtime';
6
6
  import TextInput from '../TextInput/TextInput.js';
@@ -36,7 +36,7 @@ const AutocompleteInput = /*#__PURE__*/React.forwardRef(({
36
36
  inputValue = '',
37
37
  isMenuDirectlyActivated
38
38
  } = inputContext;
39
- const mergedRef = useMergedRefs(forwardedRef, inputRef);
39
+ useRefObjectAsForwardedRef(forwardedRef, inputRef);
40
40
  const [highlightRemainingText, setHighlightRemainingText] = useState(true);
41
41
  const {
42
42
  safeSetTimeout
@@ -130,7 +130,7 @@ const AutocompleteInput = /*#__PURE__*/React.forwardRef(({
130
130
  onKeyDown: handleInputKeyDown,
131
131
  onKeyPress: onInputKeyPress,
132
132
  onKeyUp: handleInputKeyUp,
133
- ref: mergedRef,
133
+ ref: inputRef,
134
134
  "aria-controls": `${id}-listbox`,
135
135
  "aria-autocomplete": "both",
136
136
  role: "combobox",
@@ -1,6 +1,6 @@
1
1
  import { useContext, useRef, useEffect, useCallback } from 'react';
2
2
  import { AutocompleteContext } from './AutocompleteContext.js';
3
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
3
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
4
4
  import VisuallyHidden from '../_VisuallyHidden.js';
5
5
  import classes from './AutocompleteOverlay.module.css.js';
6
6
  import { clsx } from 'clsx';
@@ -48,7 +48,7 @@ function AutocompleteOverlay({
48
48
  align: 'start',
49
49
  anchorElementRef: computedAnchorRef
50
50
  }, [showMenu, selectedItemLength]);
51
- const mergedRef = useMergedRefs(scrollContainerRef, floatingElementRef);
51
+ useRefObjectAsForwardedRef(scrollContainerRef, floatingElementRef);
52
52
  const closeOptionList = useCallback(() => {
53
53
  setShowMenu(false);
54
54
  }, [setShowMenu]);
@@ -60,7 +60,7 @@ function AutocompleteOverlay({
60
60
  preventFocusOnOpen: true,
61
61
  onClickOutside: closeOptionList,
62
62
  onEscape: closeOptionList,
63
- ref: mergedRef,
63
+ ref: floatingElementRef,
64
64
  top: position === null || position === void 0 ? void 0 : position.top,
65
65
  left: position === null || position === void 0 ? void 0 : position.left,
66
66
  className: clsx(classes.Overlay, className),
@@ -3,7 +3,7 @@ import React, { useEffect, forwardRef } from 'react';
3
3
  import { XIcon, AlertIcon, InfoIcon, CheckCircleIcon, StopIcon } from '@primer/octicons-react';
4
4
  import { IconButton } from '../Button/IconButton.js';
5
5
  import { ButtonComponent } from '../Button/Button.js';
6
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
6
+ import { useMergedRefs } from '../internal/hooks/useMergedRefs.js';
7
7
  import { useId } from '../hooks/useId.js';
8
8
  import classes from './Banner.module.css.js';
9
9
  import { jsx, jsxs } from 'react/jsx-runtime';
@@ -1,5 +1,6 @@
1
1
  import type { To } from 'history';
2
2
  import React from 'react';
3
+ import { type PolymorphicProps } from '../utils/modern-polymorphic';
3
4
  export type BreadcrumbsProps = React.PropsWithChildren<{
4
5
  /**
5
6
  * Optional class name for the breadcrumbs container.
@@ -27,24 +28,38 @@ declare function Breadcrumbs({ className, children, style, overflow, variant }:
27
28
  declare namespace Breadcrumbs {
28
29
  var displayName: string;
29
30
  }
30
- type DistributiveOmit<T, TOmitted extends PropertyKey> = T extends any ? Omit<T, TOmitted> : never;
31
- type StyledBreadcrumbsItemProps<As extends React.ElementType> = {
32
- as?: As;
31
+ type StyledBreadcrumbsItemProps<As extends React.ElementType = 'a'> = PolymorphicProps<As, 'a', {
33
32
  to?: To;
34
33
  selected?: boolean;
35
- className?: string;
36
- style?: React.CSSProperties;
37
- } & DistributiveOmit<React.ComponentPropsWithRef<React.ElementType extends As ? 'a' : As>, 'as'>;
34
+ }>;
38
35
  export type BreadcrumbsItemProps<As extends React.ElementType = 'a'> = StyledBreadcrumbsItemProps<As>;
39
36
  declare const _default: typeof Breadcrumbs & {
40
- Item: React.ForwardRefExoticComponent<Omit<StyledBreadcrumbsItemProps<React.ElementType<any, keyof React.JSX.IntrinsicElements>>, "ref"> & React.RefAttributes<any>>;
37
+ Item: (<As extends React.ElementType = "a">(props: (React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & {
38
+ to?: To;
39
+ selected?: boolean;
40
+ } extends infer T ? T extends React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & {
41
+ to?: To;
42
+ selected?: boolean;
43
+ } ? T extends unknown ? Omit<T, "as"> : never : never : never) & {
44
+ as?: As | undefined;
45
+ } & React.RefAttributes<any>) => React.ReactNode) & {
46
+ displayName: string;
47
+ };
41
48
  };
42
49
  export default _default;
43
50
  /**
44
51
  * @deprecated Use the `Breadcrumbs` component instead (i.e. `<Breadcrumb>` → `<Breadcrumbs>`)
45
52
  */
46
53
  export declare const Breadcrumb: typeof Breadcrumbs & {
47
- Item: React.ForwardRefExoticComponent<Omit<StyledBreadcrumbsItemProps<React.ElementType<any, keyof React.JSX.IntrinsicElements>>, "ref"> & React.RefAttributes<any>>;
54
+ Item: <As extends React.ElementType = "a">(props: (React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & {
55
+ to?: To;
56
+ selected?: boolean;
57
+ } extends infer T ? T extends React.ComponentPropsWithRef<React.ElementType extends As ? "a" : As> & {
58
+ to?: To;
59
+ selected?: boolean;
60
+ } ? T extends unknown ? Omit<T, "as"> : never : never : never) & {
61
+ as?: As | undefined;
62
+ } & React.RefAttributes<any>) => React.ReactNode;
48
63
  };
49
64
  /**
50
65
  * @deprecated Use the `BreadcrumbsProps` type instead
@@ -1 +1 @@
1
- {"version":3,"file":"Breadcrumbs.d.ts","sourceRoot":"","sources":["../../src/Breadcrumbs/Breadcrumbs.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,EAAE,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,KAA6E,MAAM,OAAO,CAAA;AAYjG,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACrD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAA;IAC7C;;;;OAIG;IACH,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B,CAAC,CAAA;AA2GF,iBAAS,WAAW,CAAC,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAiB,EAAE,OAAkB,EAAC,EAAE,gBAAgB,qBA+MzG;kBA/MQ,WAAW;;;AA4NpB,KAAK,gBAAgB,CAAC,CAAC,EAAE,QAAQ,SAAS,WAAW,IAAI,CAAC,SAAS,GAAG,GAAG,IAAI,CAAC,CAAC,EAAE,QAAQ,CAAC,GAAG,KAAK,CAAA;AAElG,KAAK,0BAA0B,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,IAAI;IAC9D,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B,GAAG,gBAAgB,CAAC,KAAK,CAAC,qBAAqB,CAAC,KAAK,CAAC,WAAW,SAAS,EAAE,GAAG,GAAG,GAAG,EAAE,CAAC,EAAE,IAAI,CAAC,CAAA;AAwBhG,MAAM,MAAM,oBAAoB,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAA;;;;AACrG,wBAAkE;AAElE;;GAEG;AACH,eAAO,MAAM,UAAU;;CAAsD,CAAA;AAE7E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,gBAAgB,CAAA;AAE9C;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI,oBAAoB,CAAC,EAAE,CAAC,CAAA"}
1
+ {"version":3,"file":"Breadcrumbs.d.ts","sourceRoot":"","sources":["../../src/Breadcrumbs/Breadcrumbs.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,EAAE,EAAC,MAAM,SAAS,CAAA;AAC/B,OAAO,KAA6E,MAAM,OAAO,CAAA;AAWjG,OAAO,EAAC,KAAK,gBAAgB,EAAkB,MAAM,6BAA6B,CAAA;AAElF,MAAM,MAAM,gBAAgB,GAAG,KAAK,CAAC,iBAAiB,CAAC;IACrD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;OAKG;IACH,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,gBAAgB,CAAA;IAC7C;;;;OAIG;IACH,OAAO,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAC/B;;OAEG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAA;CAC5B,CAAC,CAAA;AA8GF,iBAAS,WAAW,CAAC,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAiB,EAAE,OAAkB,EAAC,EAAE,gBAAgB,qBA+MzG;kBA/MQ,WAAW;;;AA2NpB,KAAK,0BAA0B,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI,gBAAgB,CACpF,EAAE,EACF,GAAG,EACH;IACE,EAAE,CAAC,EAAE,EAAE,CAAA;IACP,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CACF,CAAA;AAsBD,MAAM,MAAM,oBAAoB,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI,0BAA0B,CAAC,EAAE,CAAC,CAAA;;YAnBlG,EAAE,SAAS,KAAK,CAAC,WAAW;aANtB,EAAE;mBACI,OAAO;;aADb,EAAE;mBACI,OAAO;;;;;;;AA2BtB,wBAAiF;AAEjF;;GAEG;AACH,eAAO,MAAM,UAAU;WA3BpB,EAAE,SAAS,KAAK,CAAC,WAAW;aANtB,EAAE;mBACI,OAAO;;aADb,EAAE;mBACI,OAAO;;;;CAgCuD,CAAA;AAE7E;;GAEG;AACH,MAAM,MAAM,eAAe,GAAG,gBAAgB,CAAA;AAE9C;;GAEG;AACH,MAAM,MAAM,mBAAmB,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,GAAG,IAAI,oBAAoB,CAAC,EAAE,CAAC,CAAA"}
@@ -8,6 +8,7 @@ import { KebabHorizontalIcon } from '@primer/octicons-react';
8
8
  import { useResizeObserver } from '../hooks/useResizeObserver.js';
9
9
  import { useOnEscapePress } from '../hooks/useOnEscapePress.js';
10
10
  import { useOnOutsideClick } from '../hooks/useOnOutsideClick.js';
11
+ import { fixedForwardRef } from '../utils/modern-polymorphic.js';
11
12
  import { jsx, jsxs } from 'react/jsx-runtime';
12
13
  import { useFeatureFlag } from '../FeatureFlags/useFeatureFlag.js';
13
14
  import Details from '../Details/Details.js';
@@ -399,69 +400,26 @@ const ItemSeparator = () => {
399
400
  }
400
401
  return t0;
401
402
  };
402
-
403
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
404
-
405
- function BreadcrumbsItemComponent(props, ref) {
406
- const $ = c(14);
407
- let className;
408
- let rest;
409
- let selected;
410
- let t0;
411
- if ($[0] !== props) {
412
- ({
413
- as: t0,
414
- selected,
415
- className,
416
- ...rest
417
- } = props);
418
- $[0] = props;
419
- $[1] = className;
420
- $[2] = rest;
421
- $[3] = selected;
422
- $[4] = t0;
423
- } else {
424
- className = $[1];
425
- rest = $[2];
426
- selected = $[3];
427
- t0 = $[4];
428
- }
429
- const Component = t0 === undefined ? "a" : t0;
430
- const t1 = selected && "selected";
431
- let t2;
432
- if ($[5] !== className || $[6] !== t1) {
433
- t2 = clsx(className, classes.Item, t1);
434
- $[5] = className;
435
- $[6] = t1;
436
- $[7] = t2;
437
- } else {
438
- t2 = $[7];
439
- }
440
- const t3 = selected ? "page" : undefined;
441
- let t4;
442
- if ($[8] !== Component || $[9] !== ref || $[10] !== rest || $[11] !== t2 || $[12] !== t3) {
443
- t4 = /*#__PURE__*/jsx(Component, {
444
- className: t2,
445
- "aria-current": t3,
446
- ref: ref,
447
- ...rest
448
- });
449
- $[8] = Component;
450
- $[9] = ref;
451
- $[10] = rest;
452
- $[11] = t2;
453
- $[12] = t3;
454
- $[13] = t4;
455
- } else {
456
- t4 = $[13];
457
- }
458
- return t4;
459
- }
460
- BreadcrumbsItemComponent.displayName = 'Breadcrumbs.Item';
461
- const BreadcrumbsItem = /*#__PURE__*/React.forwardRef(BreadcrumbsItemComponent);
403
+ const BreadcrumbsItem = fixedForwardRef((props, ref) => {
404
+ const {
405
+ as: Component = 'a',
406
+ selected,
407
+ className,
408
+ ...rest
409
+ } = props;
410
+ return /*#__PURE__*/jsx(Component, {
411
+ className: clsx(className, classes.Item, selected && 'selected'),
412
+ "aria-current": selected ? 'page' : undefined,
413
+ ref: ref,
414
+ ...rest
415
+ });
416
+ });
462
417
  Breadcrumbs.displayName = 'Breadcrumbs';
418
+ const BreadcrumbsItemWithDisplayName = Object.assign(BreadcrumbsItem, {
419
+ displayName: 'Breadcrumbs.Item'
420
+ });
463
421
  var Breadcrumbs_default = Object.assign(Breadcrumbs, {
464
- Item: BreadcrumbsItem
422
+ Item: BreadcrumbsItemWithDisplayName
465
423
  });
466
424
 
467
425
  /**
@@ -479,11 +437,15 @@ const Breadcrumb = Object.assign(Breadcrumbs, {
479
437
  * @deprecated Use the `BreadcrumbsItemProps` type instead
480
438
  */
481
439
  function _temp(item, index) {
482
- const href = item.props.href;
483
- const children = item.props.children;
484
- const selected = item.props.selected;
440
+ const {
441
+ children,
442
+ selected,
443
+ as: Component,
444
+ ...itemProps
445
+ } = item.props;
485
446
  return /*#__PURE__*/jsx(ActionList.LinkItem, {
486
- href: href,
447
+ as: Component,
448
+ ...itemProps,
487
449
  "aria-current": selected ? "page" : undefined,
488
450
  children: children
489
451
  }, index);
@@ -1 +1 @@
1
- {"version":3,"file":"ButtonBase.d.ts","sourceRoot":"","sources":["../../src/Button/ButtonBase.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAC/F,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AA2BxC,QAAA,MAAM,UAAU,EA0JV,8BAA8B,CAAC,QAAQ,GAAG,GAAG,EAAE,WAAW,CAAC,CAAA;AAEjE,OAAO,EAAC,UAAU,EAAC,CAAA"}
1
+ {"version":3,"file":"ButtonBase.d.ts","sourceRoot":"","sources":["../../src/Button/ButtonBase.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAC/F,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AA2BxC,QAAA,MAAM,UAAU,EA2JV,8BAA8B,CAAC,QAAQ,GAAG,GAAG,EAAE,WAAW,CAAC,CAAA;AAEjE,OAAO,EAAC,UAAU,EAAC,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import React, { forwardRef } from 'react';
2
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
2
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
3
3
  import { ConditionalWrapper } from '../internal/components/ConditionalWrapper.js';
4
4
  import { clsx } from 'clsx';
5
5
  import classes from './ButtonBase.module.css.js';
@@ -46,7 +46,7 @@ const ButtonBase = /*#__PURE__*/forwardRef(({
46
46
  ...rest
47
47
  } = props;
48
48
  const innerRef = React.useRef(null);
49
- const combinedRefs = useMergedRefs(forwardedRef, innerRef);
49
+ useRefObjectAsForwardedRef(forwardedRef, innerRef);
50
50
  const uuid = useId(id);
51
51
  const loadingAnnouncementID = `${uuid}-loading-announcement`;
52
52
 
@@ -74,7 +74,8 @@ const ButtonBase = /*#__PURE__*/forwardRef(({
74
74
  children: [/*#__PURE__*/jsx(Component, {
75
75
  "aria-disabled": loading ? true : undefined,
76
76
  ...rest,
77
- ref: combinedRefs,
77
+ // @ts-ignore temporary disable as we migrate to css modules, until we remove PolymorphicForwardRefComponent
78
+ ref: innerRef,
78
79
  className: clsx(classes.ButtonBase, className),
79
80
  "data-block": block ? 'block' : null,
80
81
  "data-inactive": inactive ? true : undefined,
@@ -3,7 +3,7 @@ import React, { useEffect } from 'react';
3
3
  import { warning } from '../utils/warning.js';
4
4
  import { clsx } from 'clsx';
5
5
  import classes from './Details.module.css.js';
6
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
6
+ import { useMergedRefs } from '../internal/hooks/useMergedRefs.js';
7
7
  import { jsx } from 'react/jsx-runtime';
8
8
 
9
9
  const Root = /*#__PURE__*/React.forwardRef(
@@ -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 { useMergedRefs } from '../hooks/useMergedRefs.js';
9
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
10
10
  import { useId } from '../hooks/useId.js';
11
11
  import classes from './Dialog.module.css.js';
12
12
  import { clsx } from 'clsx';
@@ -127,7 +127,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
127
127
  footer: Dialog.Footer
128
128
  });
129
129
  const dialogRef = useRef(null);
130
- const mergedRef = useMergedRefs(forwardedRef, dialogRef);
130
+ useRefObjectAsForwardedRef(forwardedRef, dialogRef);
131
131
  const backdropRef = useRef(null);
132
132
  useFocusTrap({
133
133
  containerRef: dialogRef,
@@ -190,7 +190,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
190
190
  setLastMouseDownIsBackdrop(e.target === e.currentTarget);
191
191
  },
192
192
  children: /*#__PURE__*/jsxs("div", {
193
- ref: mergedRef,
193
+ ref: dialogRef,
194
194
  role: role,
195
195
  "aria-labelledby": dialogLabelId,
196
196
  "aria-describedby": dialogDescriptionId,
@@ -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 { useMergedRefs } from '../hooks/useMergedRefs.js';
5
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.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
- const mergedRef = useMergedRefs(forwardedRef, innerRef);
14
+ useRefObjectAsForwardedRef(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: mergedRef
34
+ ref: innerRef
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,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"}
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"}
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 { useMergedRefs } from '../hooks/useMergedRefs.js';
6
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
7
7
 
8
8
  const UnwrappedLink = (props, ref) => {
9
9
  const {
@@ -14,7 +14,7 @@ const UnwrappedLink = (props, ref) => {
14
14
  ...restProps
15
15
  } = props;
16
16
  const innerRef = React.useRef(null);
17
- const mergedRef = useMergedRefs(ref, innerRef);
17
+ useRefObjectAsForwardedRef(ref, innerRef);
18
18
  if (process.env.NODE_ENV !== "production") {
19
19
  /**
20
20
  * The Linter yells because it thinks this conditionally calls an effect,
@@ -36,7 +36,8 @@ const UnwrappedLink = (props, ref) => {
36
36
  "data-inline": inline,
37
37
  "data-hover-color": hoverColor,
38
38
  ...restProps,
39
- ref: mergedRef
39
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
40
+ ref: innerRef
40
41
  });
41
42
  };
42
43
  UnwrappedLink.displayName = "UnwrappedLink";