@primer/react 0.0.0-20260317183818 → 0.0.0-20260317202557
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.
- package/CHANGELOG.md +8 -7
- package/dist/ActionList/LinkItem.d.ts +3 -6
- package/dist/ActionList/LinkItem.d.ts.map +1 -1
- package/dist/ActionList/LinkItem.js +87 -42
- package/dist/ActionList/index.d.ts +1 -25
- package/dist/ActionList/index.d.ts.map +1 -1
- package/dist/Autocomplete/AutocompleteInput.js +3 -3
- package/dist/Autocomplete/AutocompleteOverlay.js +3 -3
- package/dist/Banner/Banner.js +1 -1
- package/dist/Breadcrumbs/Breadcrumbs.d.ts +8 -23
- package/dist/Breadcrumbs/Breadcrumbs.d.ts.map +1 -1
- package/dist/Breadcrumbs/Breadcrumbs.js +65 -27
- package/dist/Button/ButtonBase.d.ts.map +1 -1
- package/dist/Button/ButtonBase.js +3 -4
- package/dist/Details/Details.js +1 -1
- package/dist/Dialog/Dialog.js +3 -3
- package/dist/Heading/Heading.js +3 -3
- package/dist/Link/Link.d.ts.map +1 -1
- package/dist/Link/Link.js +3 -4
- package/dist/NavList/NavList.d.ts +3 -20
- package/dist/NavList/NavList.d.ts.map +1 -1
- package/dist/NavList/NavList.js +124 -50
- package/dist/Overlay/Overlay.js +20 -19
- package/dist/PageLayout/PageLayout.js +5 -5
- package/dist/TextInputWithTokens/TextInputWithTokens.js +91 -90
- package/dist/deprecated/DialogV1/Dialog.js +10 -9
- package/dist/hooks/index.d.ts +1 -0
- package/dist/hooks/index.d.ts.map +1 -1
- package/dist/hooks/useMergedRefs.d.ts +51 -0
- package/dist/hooks/useMergedRefs.d.ts.map +1 -0
- package/dist/hooks/useMergedRefs.js +86 -0
- package/dist/hooks/useProvidedRefOrCreate.d.ts +12 -0
- package/dist/hooks/useProvidedRefOrCreate.d.ts.map +1 -1
- package/dist/hooks/useProvidedRefOrCreate.js +12 -0
- package/dist/hooks/useRefObjectAsForwardedRef.d.ts +12 -0
- package/dist/hooks/useRefObjectAsForwardedRef.d.ts.map +1 -1
- package/dist/hooks/useRefObjectAsForwardedRef.js +12 -0
- package/dist/index.d.ts +1 -0
- package/dist/index.d.ts.map +1 -1
- package/dist/index.js +1 -0
- package/generated/hooks.json +22 -0
- package/package.json +1 -1
- package/dist/internal/hooks/useMergedRefs.d.ts +0 -2
- package/dist/internal/hooks/useMergedRefs.d.ts.map +0 -1
- package/dist/internal/hooks/useMergedRefs.js +0 -16
package/CHANGELOG.md
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
1
|
# @primer/react
|
|
2
2
|
|
|
3
|
-
## 0.0.0-
|
|
3
|
+
## 0.0.0-20260317202557
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
7
|
-
- [#
|
|
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
|
|
8
8
|
|
|
9
|
-
|
|
9
|
+
- Deprecates `useRefObjectAsForwardedRef`; see doc comment for migration instructions
|
|
10
|
+
- Deprecates `useProvidedRefOrCreate`; see doc comment for migration instructions
|
|
10
11
|
|
|
11
|
-
-
|
|
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)
|
|
12
13
|
|
|
13
|
-
|
|
14
|
+
### Patch Changes
|
|
14
15
|
|
|
15
|
-
|
|
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
|
|
16
17
|
|
|
17
|
-
-
|
|
18
|
+
- Fake entry to force publishing
|
|
18
19
|
|
|
19
20
|
## 38.15.1
|
|
20
21
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import
|
|
2
|
-
import type {
|
|
1
|
+
import React from 'react';
|
|
2
|
+
import type { ForwardRefComponent as PolymorphicForwardRefComponent } from '../utils/polymorphic';
|
|
3
3
|
import type { ActionListItemProps } from './shared';
|
|
4
4
|
type LinkProps = {
|
|
5
5
|
download?: string;
|
|
@@ -14,9 +14,6 @@ type LinkProps = {
|
|
|
14
14
|
className?: string;
|
|
15
15
|
};
|
|
16
16
|
export type ActionListLinkItemProps = Pick<ActionListItemProps, 'active' | 'children' | 'inactiveText' | 'variant' | 'size'> & LinkProps;
|
|
17
|
-
declare const
|
|
18
|
-
as?: As | undefined;
|
|
19
|
-
} & React.RefAttributes<unknown>) => React.ReactNode;
|
|
20
|
-
export declare const LinkItem: WithSlotMarker<typeof LinkItemComponent>;
|
|
17
|
+
export declare const LinkItem: PolymorphicForwardRefComponent<"a", ActionListLinkItemProps>;
|
|
21
18
|
export {};
|
|
22
19
|
//# 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,
|
|
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,46 +1,62 @@
|
|
|
1
|
+
import { c } from 'react-compiler-runtime';
|
|
2
|
+
import React from 'react';
|
|
1
3
|
import { Item } from './Item.js';
|
|
2
|
-
import { fixedForwardRef } from '../utils/modern-polymorphic.js';
|
|
3
4
|
import { jsx } from 'react/jsx-runtime';
|
|
4
5
|
import Link from '../Link/Link.js';
|
|
5
6
|
|
|
6
|
-
const
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
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;
|
|
27
52
|
const clickHandler = event => {
|
|
28
53
|
onClick && onClick(event);
|
|
29
54
|
props.onClick && props.onClick(event);
|
|
30
55
|
};
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
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, {
|
|
56
|
+
return inactiveText ? /*#__PURE__*/jsx("span", {
|
|
57
|
+
...rest,
|
|
58
|
+
children: children
|
|
59
|
+
}) : /*#__PURE__*/jsx(Link, {
|
|
44
60
|
as: Component,
|
|
45
61
|
...rest,
|
|
46
62
|
...props,
|
|
@@ -48,13 +64,42 @@ const LinkItemComponent = fixedForwardRef(({
|
|
|
48
64
|
ref: forwardedRef,
|
|
49
65
|
children: children
|
|
50
66
|
});
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
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;
|
|
58
101
|
});
|
|
102
|
+
LinkItem.displayName = 'ActionList.LinkItem';
|
|
103
|
+
LinkItem.__SLOT__ = Symbol('ActionList.LinkItem');
|
|
59
104
|
|
|
60
105
|
export { LinkItem };
|
|
@@ -84,31 +84,7 @@ 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/
|
|
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)>;
|
|
87
|
+
LinkItem: import("../utils/polymorphic").ForwardRefComponent<"a", import("./LinkItem").ActionListLinkItemProps>;
|
|
112
88
|
/** Visually separates `Item`s or `Group`s in an `ActionList`. */
|
|
113
89
|
Divider: import("../utils/types").FCWithSlotMarker<import("react").PropsWithChildren<import("./Divider").ActionListDividerProps>>;
|
|
114
90
|
/** 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
|
|
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 {
|
|
3
|
+
import { useMergedRefs } from '../hooks/useMergedRefs.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
|
-
|
|
39
|
+
const mergedRef = useMergedRefs(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:
|
|
133
|
+
ref: mergedRef,
|
|
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 {
|
|
3
|
+
import { useMergedRefs } from '../hooks/useMergedRefs.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
|
-
|
|
51
|
+
const mergedRef = useMergedRefs(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:
|
|
63
|
+
ref: mergedRef,
|
|
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),
|
package/dist/Banner/Banner.js
CHANGED
|
@@ -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 '../
|
|
6
|
+
import { useMergedRefs } from '../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,6 +1,5 @@
|
|
|
1
1
|
import type { To } from 'history';
|
|
2
2
|
import React from 'react';
|
|
3
|
-
import { type PolymorphicProps } from '../utils/modern-polymorphic';
|
|
4
3
|
export type BreadcrumbsProps = React.PropsWithChildren<{
|
|
5
4
|
/**
|
|
6
5
|
* Optional class name for the breadcrumbs container.
|
|
@@ -28,38 +27,24 @@ declare function Breadcrumbs({ className, children, style, overflow, variant }:
|
|
|
28
27
|
declare namespace Breadcrumbs {
|
|
29
28
|
var displayName: string;
|
|
30
29
|
}
|
|
31
|
-
type
|
|
30
|
+
type DistributiveOmit<T, TOmitted extends PropertyKey> = T extends any ? Omit<T, TOmitted> : never;
|
|
31
|
+
type StyledBreadcrumbsItemProps<As extends React.ElementType> = {
|
|
32
|
+
as?: As;
|
|
32
33
|
to?: To;
|
|
33
34
|
selected?: boolean;
|
|
34
|
-
|
|
35
|
+
className?: string;
|
|
36
|
+
style?: React.CSSProperties;
|
|
37
|
+
} & DistributiveOmit<React.ComponentPropsWithRef<React.ElementType extends As ? 'a' : As>, 'as'>;
|
|
35
38
|
export type BreadcrumbsItemProps<As extends React.ElementType = 'a'> = StyledBreadcrumbsItemProps<As>;
|
|
36
39
|
declare const _default: typeof Breadcrumbs & {
|
|
37
|
-
Item:
|
|
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
|
-
};
|
|
40
|
+
Item: React.ForwardRefExoticComponent<Omit<StyledBreadcrumbsItemProps<React.ElementType<any, keyof React.JSX.IntrinsicElements>>, "ref"> & React.RefAttributes<any>>;
|
|
48
41
|
};
|
|
49
42
|
export default _default;
|
|
50
43
|
/**
|
|
51
44
|
* @deprecated Use the `Breadcrumbs` component instead (i.e. `<Breadcrumb>` → `<Breadcrumbs>`)
|
|
52
45
|
*/
|
|
53
46
|
export declare const Breadcrumb: typeof Breadcrumbs & {
|
|
54
|
-
Item: <
|
|
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;
|
|
47
|
+
Item: React.ForwardRefExoticComponent<Omit<StyledBreadcrumbsItemProps<React.ElementType<any, keyof React.JSX.IntrinsicElements>>, "ref"> & React.RefAttributes<any>>;
|
|
63
48
|
};
|
|
64
49
|
/**
|
|
65
50
|
* @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;
|
|
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"}
|
|
@@ -8,7 +8,6 @@ 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';
|
|
12
11
|
import { jsx, jsxs } from 'react/jsx-runtime';
|
|
13
12
|
import { useFeatureFlag } from '../FeatureFlags/useFeatureFlag.js';
|
|
14
13
|
import Details from '../Details/Details.js';
|
|
@@ -400,26 +399,69 @@ const ItemSeparator = () => {
|
|
|
400
399
|
}
|
|
401
400
|
return t0;
|
|
402
401
|
};
|
|
403
|
-
|
|
404
|
-
|
|
405
|
-
|
|
406
|
-
|
|
407
|
-
|
|
408
|
-
|
|
409
|
-
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
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);
|
|
417
462
|
Breadcrumbs.displayName = 'Breadcrumbs';
|
|
418
|
-
const BreadcrumbsItemWithDisplayName = Object.assign(BreadcrumbsItem, {
|
|
419
|
-
displayName: 'Breadcrumbs.Item'
|
|
420
|
-
});
|
|
421
463
|
var Breadcrumbs_default = Object.assign(Breadcrumbs, {
|
|
422
|
-
Item:
|
|
464
|
+
Item: BreadcrumbsItem
|
|
423
465
|
});
|
|
424
466
|
|
|
425
467
|
/**
|
|
@@ -437,15 +479,11 @@ const Breadcrumb = Object.assign(Breadcrumbs, {
|
|
|
437
479
|
* @deprecated Use the `BreadcrumbsItemProps` type instead
|
|
438
480
|
*/
|
|
439
481
|
function _temp(item, index) {
|
|
440
|
-
const
|
|
441
|
-
|
|
442
|
-
|
|
443
|
-
as: Component,
|
|
444
|
-
...itemProps
|
|
445
|
-
} = item.props;
|
|
482
|
+
const href = item.props.href;
|
|
483
|
+
const children = item.props.children;
|
|
484
|
+
const selected = item.props.selected;
|
|
446
485
|
return /*#__PURE__*/jsx(ActionList.LinkItem, {
|
|
447
|
-
|
|
448
|
-
...itemProps,
|
|
486
|
+
href: href,
|
|
449
487
|
"aria-current": selected ? "page" : undefined,
|
|
450
488
|
children: children
|
|
451
489
|
}, 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,
|
|
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,5 +1,5 @@
|
|
|
1
1
|
import React, { forwardRef } from 'react';
|
|
2
|
-
import {
|
|
2
|
+
import { useMergedRefs } from '../hooks/useMergedRefs.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
|
-
|
|
49
|
+
const combinedRefs = useMergedRefs(forwardedRef, innerRef);
|
|
50
50
|
const uuid = useId(id);
|
|
51
51
|
const loadingAnnouncementID = `${uuid}-loading-announcement`;
|
|
52
52
|
|
|
@@ -74,8 +74,7 @@ const ButtonBase = /*#__PURE__*/forwardRef(({
|
|
|
74
74
|
children: [/*#__PURE__*/jsx(Component, {
|
|
75
75
|
"aria-disabled": loading ? true : undefined,
|
|
76
76
|
...rest,
|
|
77
|
-
|
|
78
|
-
ref: innerRef,
|
|
77
|
+
ref: combinedRefs,
|
|
79
78
|
className: clsx(classes.ButtonBase, className),
|
|
80
79
|
"data-block": block ? 'block' : null,
|
|
81
80
|
"data-inactive": inactive ? true : undefined,
|
package/dist/Details/Details.js
CHANGED
|
@@ -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 '../
|
|
6
|
+
import { useMergedRefs } from '../hooks/useMergedRefs.js';
|
|
7
7
|
import { jsx } from 'react/jsx-runtime';
|
|
8
8
|
|
|
9
9
|
const Root = /*#__PURE__*/React.forwardRef(
|
package/dist/Dialog/Dialog.js
CHANGED
|
@@ -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 {
|
|
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';
|
|
@@ -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
|
-
|
|
130
|
+
const mergedRef = useMergedRefs(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:
|
|
193
|
+
ref: mergedRef,
|
|
194
194
|
role: role,
|
|
195
195
|
"aria-labelledby": dialogLabelId,
|
|
196
196
|
"aria-describedby": dialogDescriptionId,
|
package/dist/Heading/Heading.js
CHANGED
|
@@ -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 {
|
|
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
|
-
|
|
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:
|
|
34
|
+
ref: mergedRef
|
|
35
35
|
});
|
|
36
36
|
});
|
|
37
37
|
Heading.displayName = 'Heading';
|
package/dist/Link/Link.d.ts.map
CHANGED
|
@@ -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,
|
|
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 {
|
|
6
|
+
import { useMergedRefs } from '../hooks/useMergedRefs.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
|
-
|
|
17
|
+
const mergedRef = useMergedRefs(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,8 +36,7 @@ const UnwrappedLink = (props, ref) => {
|
|
|
36
36
|
"data-inline": inline,
|
|
37
37
|
"data-hover-color": hoverColor,
|
|
38
38
|
...restProps,
|
|
39
|
-
|
|
40
|
-
ref: innerRef
|
|
39
|
+
ref: mergedRef
|
|
41
40
|
});
|
|
42
41
|
};
|
|
43
42
|
UnwrappedLink.displayName = "UnwrappedLink";
|