@primer/react 0.0.0-20260408164838 → 0.0.0-20260408170654

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 (42) hide show
  1. package/CHANGELOG.md +1 -3
  2. package/dist/ActionBar/ActionBar.js +3 -3
  3. package/dist/ActionList/Heading.js +16 -17
  4. package/dist/ActionList/List.d.ts.map +1 -1
  5. package/dist/ActionList/List.js +41 -41
  6. package/dist/AnchoredOverlay/AnchoredOverlay.d.ts.map +1 -1
  7. package/dist/AnchoredOverlay/AnchoredOverlay.js +13 -3
  8. package/dist/Autocomplete/AutocompleteInput.js +3 -3
  9. package/dist/Autocomplete/AutocompleteOverlay.js +3 -3
  10. package/dist/Button/ButtonBase.d.ts.map +1 -1
  11. package/dist/Button/ButtonBase.js +4 -3
  12. package/dist/ButtonGroup/ButtonGroup.d.ts.map +1 -1
  13. package/dist/ButtonGroup/ButtonGroup.js +23 -23
  14. package/dist/Checkbox/Checkbox.d.ts.map +1 -1
  15. package/dist/Checkbox/Checkbox.js +5 -5
  16. package/dist/Dialog/Dialog.d.ts.map +1 -1
  17. package/dist/Dialog/Dialog.js +9 -7
  18. package/dist/FilteredActionList/FilteredActionList.d.ts.map +1 -1
  19. package/dist/FilteredActionList/FilteredActionList.js +8 -8
  20. package/dist/Heading/Heading.js +3 -3
  21. package/dist/Link/Link.d.ts.map +1 -1
  22. package/dist/Link/Link.js +4 -3
  23. package/dist/Overlay/Overlay.js +20 -21
  24. package/dist/PageHeader/PageHeader.d.ts.map +1 -1
  25. package/dist/PageHeader/PageHeader.js +31 -30
  26. package/dist/PageLayout/PageLayout.js +5 -5
  27. package/dist/TextInput/TextInput.d.ts.map +1 -1
  28. package/dist/TextInput/TextInput.js +6 -5
  29. package/dist/TextInputWithTokens/TextInputWithTokens.js +90 -91
  30. package/dist/TooltipV2/Tooltip.d.ts.map +1 -1
  31. package/dist/TooltipV2/Tooltip.js +4 -4
  32. package/dist/deprecated/DialogV1/Dialog.js +9 -10
  33. package/dist/experimental/Tabs/Tabs.d.ts +1 -1
  34. package/dist/experimental/Tabs/Tabs.d.ts.map +1 -1
  35. package/dist/experimental/Tabs/Tabs.js +16 -16
  36. package/dist/hooks/useMergedRefs.d.ts +5 -5
  37. package/dist/hooks/useMergedRefs.d.ts.map +1 -1
  38. package/dist/hooks/useMergedRefs.js +5 -11
  39. package/dist/hooks/useProvidedRefOrCreate.d.ts +10 -7
  40. package/dist/hooks/useProvidedRefOrCreate.d.ts.map +1 -1
  41. package/dist/hooks/useProvidedRefOrCreate.js +10 -10
  42. package/package.json +1 -1
package/CHANGELOG.md CHANGED
@@ -1,6 +1,6 @@
1
1
  # @primer/react
2
2
 
3
- ## 0.0.0-20260408164838
3
+ ## 0.0.0-20260408170654
4
4
 
5
5
  ### Minor Changes
6
6
 
@@ -14,8 +14,6 @@
14
14
 
15
15
  - [#7707](https://github.com/primer/react/pull/7707) [`6431bfe`](https://github.com/primer/react/commit/6431bfecd72e24db1dfa90b02f8a42834e63843b) Thanks [@liuliu-dev](https://github.com/liuliu-dev)! - Fix anchor-name not being set on the anchor element when SelectPanel is opened in Copilot code agent.
16
16
 
17
- - [#7638](https://github.com/primer/react/pull/7638) [`f04e85d`](https://github.com/primer/react/commit/f04e85df536cd6e8047f70b070bd3cf7c0961f92) Thanks [@iansan5653](https://github.com/iansan5653)! - Update internal implementations of combined refs to improve performance and add support for React 19 callback refs
18
-
19
17
  - Fake entry to force publishing
20
18
 
21
19
  - [#7633](https://github.com/primer/react/pull/7633) [`a107d39`](https://github.com/primer/react/commit/a107d398e0574b5f8085485c96b27a168061eb50) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - Graduate `primer_react_css_has_selector_perf` feature flag: the CSS `:has()` performance optimization (`body[data-dialog-scroll-disabled]`) is now the default behavior for Dialog scroll disabling
@@ -10,7 +10,7 @@ import styles from './ActionBar.module.css.js';
10
10
  import { clsx } from 'clsx';
11
11
  import { createDescendantRegistry } from '../utils/descendant-registry.js';
12
12
  import { jsxs, jsx } from 'react/jsx-runtime';
13
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
13
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
14
14
  import { FocusKeys } from '@primer/behaviors';
15
15
  import { ActionMenu } from '../ActionMenu/ActionMenu.js';
16
16
 
@@ -423,7 +423,7 @@ const ActionBarIconButton = /*#__PURE__*/forwardRef(({
423
423
  ...props
424
424
  }, forwardedRef) => {
425
425
  const ref = useRef(null);
426
- const mergedRef = useMergedRefs(ref, forwardedRef);
426
+ useRefObjectAsForwardedRef(forwardedRef, ref);
427
427
  const {
428
428
  size,
429
429
  isVisibleChild
@@ -453,7 +453,7 @@ const ActionBarIconButton = /*#__PURE__*/forwardRef(({
453
453
  if (!isVisibleChild(id) || groupId && !isVisibleChild(groupId)) return null;
454
454
  return /*#__PURE__*/jsx(IconButton, {
455
455
  "aria-disabled": disabled,
456
- ref: mergedRef,
456
+ ref: ref,
457
457
  size: size,
458
458
  onClick: clickHandler,
459
459
  ...props,
@@ -7,12 +7,12 @@ import { invariant } from '../utils/invariant.js';
7
7
  import { clsx } from 'clsx';
8
8
  import classes from './Heading.module.css.js';
9
9
  import { jsx } from 'react/jsx-runtime';
10
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
10
+ import { useRefObjectAsForwardedRef } from '../hooks/useRefObjectAsForwardedRef.js';
11
11
  import Heading$1 from '../Heading/Heading.js';
12
12
 
13
13
  const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
14
14
  var _props$id;
15
- const $ = c(21);
15
+ const $ = c(20);
16
16
  let as;
17
17
  let children;
18
18
  let className;
@@ -45,7 +45,7 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
45
45
  }
46
46
  const visuallyHidden = t1 === undefined ? false : t1;
47
47
  const innerRef = React.useRef(null);
48
- const mergedRef = useMergedRefs(forwardedRef, innerRef);
48
+ useRefObjectAsForwardedRef(forwardedRef, innerRef);
49
49
  const {
50
50
  headingId,
51
51
  variant: listVariant
@@ -65,11 +65,11 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
65
65
  t4 = $[8];
66
66
  }
67
67
  let t5;
68
- if ($[9] !== as || $[10] !== children || $[11] !== listVariant || $[12] !== mergedRef || $[13] !== props || $[14] !== size || $[15] !== t3 || $[16] !== t4) {
68
+ if ($[9] !== as || $[10] !== children || $[11] !== listVariant || $[12] !== props || $[13] !== size || $[14] !== t3 || $[15] !== t4) {
69
69
  t5 = /*#__PURE__*/jsx(Heading$1, {
70
70
  as: as,
71
71
  variant: size,
72
- ref: mergedRef,
72
+ ref: innerRef,
73
73
  id: t3,
74
74
  className: t4,
75
75
  "data-list-variant": listVariant,
@@ -79,26 +79,25 @@ const Heading = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
79
79
  $[9] = as;
80
80
  $[10] = children;
81
81
  $[11] = listVariant;
82
- $[12] = mergedRef;
83
- $[13] = props;
84
- $[14] = size;
85
- $[15] = t3;
86
- $[16] = t4;
87
- $[17] = t5;
82
+ $[12] = props;
83
+ $[13] = size;
84
+ $[14] = t3;
85
+ $[15] = t4;
86
+ $[16] = t5;
88
87
  } else {
89
- t5 = $[17];
88
+ t5 = $[16];
90
89
  }
91
90
  let t6;
92
- if ($[18] !== t2 || $[19] !== t5) {
91
+ if ($[17] !== t2 || $[18] !== t5) {
93
92
  t6 = /*#__PURE__*/jsx(VisuallyHidden, {
94
93
  isVisible: t2,
95
94
  children: t5
96
95
  });
97
- $[18] = t2;
98
- $[19] = t5;
99
- $[20] = t6;
96
+ $[17] = t2;
97
+ $[18] = t5;
98
+ $[19] = t6;
100
99
  } else {
101
- t6 = $[20];
100
+ t6 = $[19];
102
101
  }
103
102
  return t6;
104
103
  });
@@ -1 +1 @@
1
- {"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../src/ActionList/List.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyB,MAAM,OAAO,CAAA;AAuF7C,QAAA,MAAM,IAAI,GA3Ea,EAAE,SAAS,KAAK,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;oDA2ER,CAAA;AAI3C,OAAO,EAAC,IAAI,EAAC,CAAA"}
1
+ {"version":3,"file":"List.d.ts","sourceRoot":"","sources":["../../src/ActionList/List.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAiB,MAAM,OAAO,CAAA;AAuFrC,QAAA,MAAM,IAAI,GA3Ea,EAAE,SAAS,KAAK,CAAC,WAAW;;;;;;;;;;;;;;;;;;;;oDA2ER,CAAA;AAI3C,OAAO,EAAC,IAAI,EAAC,CAAA"}
@@ -1,5 +1,5 @@
1
1
  import { c } from 'react-compiler-runtime';
2
- import React, { useRef } from 'react';
2
+ import React from 'react';
3
3
  import { fixedForwardRef } from '../utils/modern-polymorphic.js';
4
4
  import { ActionListContainerContext } from './ActionListContainerContext.js';
5
5
  import { useSlots } from '../hooks/useSlots.js';
@@ -10,12 +10,12 @@ import { useFocusZone } from '../hooks/useFocusZone.js';
10
10
  import { clsx } from 'clsx';
11
11
  import classes from './ActionList.module.css.js';
12
12
  import { jsx, jsxs } from 'react/jsx-runtime';
13
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
13
+ import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
14
14
  import { FocusKeys } from '@primer/behaviors';
15
15
 
16
16
  const UnwrappedList = (props, forwardedRef) => {
17
17
  var _slots$heading$props$;
18
- const $ = c(36);
18
+ const $ = c(37);
19
19
  let className;
20
20
  let restProps;
21
21
  let role;
@@ -78,8 +78,7 @@ const UnwrappedList = (props, forwardedRef) => {
78
78
  } = React.useContext(ActionListContainerContext);
79
79
  const ariaLabelledBy = slots.heading ? (_slots$heading$props$ = slots.heading.props.id) !== null && _slots$heading$props$ !== void 0 ? _slots$heading$props$ : headingId : listLabelledBy;
80
80
  const listRole = role || listRoleFromContainer;
81
- const listRef = useRef(null);
82
- const mergedRef = useMergedRefs(forwardedRef, listRef);
81
+ const listRef = useProvidedRefOrCreate(forwardedRef);
83
82
  let enableFocusZone = false;
84
83
  if (enableFocusZoneFromContainer !== undefined) {
85
84
  enableFocusZone = enableFocusZoneFromContainer;
@@ -98,23 +97,24 @@ const UnwrappedList = (props, forwardedRef) => {
98
97
  const t5 = !enableFocusZone;
99
98
  const t6 = listRole === "menu" || container === "SelectPanel" || container === "FilteredActionList" ? "wrap" : undefined;
100
99
  let t7;
101
- if ($[11] !== t5 || $[12] !== t6) {
100
+ if ($[11] !== listRef || $[12] !== t5 || $[13] !== t6) {
102
101
  t7 = {
103
102
  disabled: t5,
104
103
  containerRef: listRef,
105
104
  bindKeys: FocusKeys.ArrowVertical | FocusKeys.HomeAndEnd | FocusKeys.PageUpDown,
106
105
  focusOutBehavior: t6
107
106
  };
108
- $[11] = t5;
109
- $[12] = t6;
110
- $[13] = t7;
107
+ $[11] = listRef;
108
+ $[12] = t5;
109
+ $[13] = t6;
110
+ $[14] = t7;
111
111
  } else {
112
- t7 = $[13];
112
+ t7 = $[14];
113
113
  }
114
114
  useFocusZone(t7);
115
115
  const t8 = selectionVariant || containerSelectionVariant;
116
116
  let t9;
117
- if ($[14] !== headingId || $[15] !== listRole || $[16] !== showDividers || $[17] !== t8 || $[18] !== variant) {
117
+ if ($[15] !== headingId || $[16] !== listRole || $[17] !== showDividers || $[18] !== t8 || $[19] !== variant) {
118
118
  t9 = {
119
119
  variant,
120
120
  selectionVariant: t8,
@@ -122,62 +122,62 @@ const UnwrappedList = (props, forwardedRef) => {
122
122
  role: listRole,
123
123
  headingId
124
124
  };
125
- $[14] = headingId;
126
- $[15] = listRole;
127
- $[16] = showDividers;
128
- $[17] = t8;
129
- $[18] = variant;
130
- $[19] = t9;
125
+ $[15] = headingId;
126
+ $[16] = listRole;
127
+ $[17] = showDividers;
128
+ $[18] = t8;
129
+ $[19] = variant;
130
+ $[20] = t9;
131
131
  } else {
132
- t9 = $[19];
132
+ t9 = $[20];
133
133
  }
134
134
  const listContextValue = t9;
135
135
  const t10 = slots.heading;
136
136
  let t11;
137
- if ($[20] !== className) {
137
+ if ($[21] !== className) {
138
138
  t11 = clsx(classes.ActionList, className);
139
- $[20] = className;
140
- $[21] = t11;
139
+ $[21] = className;
140
+ $[22] = t11;
141
141
  } else {
142
- t11 = $[21];
142
+ t11 = $[22];
143
143
  }
144
144
  let t12;
145
- if ($[22] !== Component || $[23] !== ariaLabelledBy || $[24] !== childrenWithoutSlots || $[25] !== listRole || $[26] !== mergedRef || $[27] !== restProps || $[28] !== showDividers || $[29] !== t11 || $[30] !== variant) {
145
+ if ($[23] !== Component || $[24] !== ariaLabelledBy || $[25] !== childrenWithoutSlots || $[26] !== listRef || $[27] !== listRole || $[28] !== restProps || $[29] !== showDividers || $[30] !== t11 || $[31] !== variant) {
146
146
  t12 = /*#__PURE__*/jsx(Component, {
147
147
  className: t11,
148
148
  role: listRole,
149
149
  "aria-labelledby": ariaLabelledBy,
150
- ref: mergedRef,
150
+ ref: listRef,
151
151
  "data-dividers": showDividers,
152
152
  "data-variant": variant,
153
153
  ...restProps,
154
154
  children: childrenWithoutSlots
155
155
  });
156
- $[22] = Component;
157
- $[23] = ariaLabelledBy;
158
- $[24] = childrenWithoutSlots;
159
- $[25] = listRole;
160
- $[26] = mergedRef;
161
- $[27] = restProps;
162
- $[28] = showDividers;
163
- $[29] = t11;
164
- $[30] = variant;
165
- $[31] = t12;
156
+ $[23] = Component;
157
+ $[24] = ariaLabelledBy;
158
+ $[25] = childrenWithoutSlots;
159
+ $[26] = listRef;
160
+ $[27] = listRole;
161
+ $[28] = restProps;
162
+ $[29] = showDividers;
163
+ $[30] = t11;
164
+ $[31] = variant;
165
+ $[32] = t12;
166
166
  } else {
167
- t12 = $[31];
167
+ t12 = $[32];
168
168
  }
169
169
  let t13;
170
- if ($[32] !== listContextValue || $[33] !== slots.heading || $[34] !== t12) {
170
+ if ($[33] !== listContextValue || $[34] !== slots.heading || $[35] !== t12) {
171
171
  t13 = /*#__PURE__*/jsxs(ListContext.Provider, {
172
172
  value: listContextValue,
173
173
  children: [t10, t12]
174
174
  });
175
- $[32] = listContextValue;
176
- $[33] = slots.heading;
177
- $[34] = t12;
178
- $[35] = t13;
175
+ $[33] = listContextValue;
176
+ $[34] = slots.heading;
177
+ $[35] = t12;
178
+ $[36] = t13;
179
179
  } else {
180
- t13 = $[35];
180
+ t13 = $[36];
181
181
  }
182
182
  return t13;
183
183
  };
@@ -1 +1 @@
1
- {"version":3,"file":"AnchoredOverlay.d.ts","sourceRoot":"","sources":["../../src/AnchoredOverlay/AnchoredOverlay.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"AnchoredOverlay.d.ts","sourceRoot":"","sources":["../../src/AnchoredOverlay/AnchoredOverlay.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAC9B,OAAO,EAAiC,KAAK,GAAG,EAAC,MAAM,OAAO,CAAA;AAE9D,OAAO,KAAK,EAAC,YAAY,EAAC,MAAM,YAAY,CAAA;AAE5C,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAA;AAEhE,OAAO,KAAK,EAAC,qBAAqB,EAAC,MAAM,uBAAuB,CAAA;AAIhE,OAAO,KAAK,EAAC,cAAc,EAAE,gBAAgB,EAAC,MAAM,mBAAmB,CAAA;AACvE,OAAO,EAAC,KAAK,eAAe,EAAC,MAAM,6BAA6B,CAAA;AAChE,OAAO,EAAa,KAAK,eAAe,EAAC,MAAM,WAAW,CAAA;AAM1D,UAAU,8BAA8B;IACtC;;;OAGG;IACH,YAAY,EAAE,CAAC,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,cAAc,CAAC,WAAW,CAAC,EAAE,YAAY,GAAG,iBAAiB,CAAC,EAChG,KAAK,EAAE,CAAC,KACL,GAAG,CAAC,OAAO,CAAA;IAEhB;;OAEG;IACH,SAAS,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IAE/C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,UAAU,iCAAiC;IACzC;;;OAGG;IACH,YAAY,EAAE,IAAI,CAAA;IAElB;;;OAGG;IACH,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IAC9C;;OAEG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,MAAM,iCAAiC,GACzC,OAAO,CAAC,8BAA8B,CAAC,GACvC,iCAAiC,CAAA;AAErC,UAAU,wBAAyB,SAAQ,IAAI,CAAC,YAAY,EAAE,QAAQ,GAAG,OAAO,CAAC;IAC/E;;OAEG;IACH,IAAI,EAAE,OAAO,CAAA;IAEb;;OAEG;IACH,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,kBAAkB,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,aAAa,CAAC,WAAW,CAAC,KAAK,OAAO,CAAA;IAE5G;;OAEG;IACH,OAAO,CAAC,EAAE,CAAC,OAAO,EAAE,cAAc,GAAG,eAAe,GAAG,QAAQ,GAAG,OAAO,KAAK,OAAO,CAAA;IAErF;;OAEG;IACH,YAAY,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAA;IAEpC;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAElD;;OAEG;IACH,iBAAiB,CAAC,EAAE,OAAO,CAAC,qBAAqB,CAAC,CAAA;IAElD;;OAEG;IACH,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;OAEG;IACH,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB;;OAEG;IACH,OAAO,CAAC,EAAE,eAAe,CAAC,UAAU,EAAE,UAAU,GAAG,YAAY,CAAC,CAAA;IAChE;;OAEG;IACH,gBAAgB,CAAC,EAAE,CAAC,EAAC,QAAQ,EAAC,EAAE;QAAC,QAAQ,EAAE,cAAc,CAAA;KAAC,KAAK,IAAI,CAAA;IACnE;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAA;IAC5B;;OAEG;IACH,gBAAgB,CAAC,EAAE,OAAO,CAAC,eAAe,CAAC,CAAA;CAC5C;AAED,MAAM,MAAM,oBAAoB,GAAG,wBAAwB,GACzD,CAAC,8BAA8B,GAAG,iCAAiC,CAAC,GACpE,OAAO,CAAC,IAAI,CAAC,gBAAgB,EAAE,OAAO,GAAG,MAAM,GAAG,cAAc,GAAG,iBAAiB,GAAG,mBAAmB,CAAC,CAAC,CAAA;AAoB9G;;;GAGG;AACH,eAAO,MAAM,eAAe,EAAE,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAwNnF,CAAA"}
@@ -11,7 +11,6 @@ import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
11
11
  import { useFeatureFlag } from '../FeatureFlags/useFeatureFlag.js';
12
12
  import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
13
13
  import { useRenderForcingRef } from '../hooks/useRenderForcingRef.js';
14
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
15
14
  import { useAnchoredPosition } from '../hooks/useAnchoredPosition.js';
16
15
  import Overlay from '../Overlay/Overlay.js';
17
16
 
@@ -64,7 +63,6 @@ const AnchoredOverlay = ({
64
63
  const cssAnchorPositioning = useFeatureFlag('primer_react_css_anchor_positioning');
65
64
  const anchorRef = useProvidedRefOrCreate(externalAnchorRef);
66
65
  const [overlayRef, updateOverlayRef] = useRenderForcingRef();
67
- const mergedOverlayRef = useMergedRefs(updateOverlayRef, overlayProps === null || overlayProps === void 0 ? void 0 : overlayProps.ref);
68
66
  const anchorId = useId(externalAnchorId);
69
67
  const onClickOutside = useCallback(() => onClose === null || onClose === void 0 ? void 0 : onClose('click-outside'), [onClose]);
70
68
  const onEscape = useCallback(() => onClose === null || onClose === void 0 ? void 0 : onClose('escape'), [onClose]);
@@ -209,7 +207,12 @@ const AnchoredOverlay = ({
209
207
  ...(cssAnchorPositioning ? {
210
208
  id: popoverId
211
209
  } : {}),
212
- ref: mergedOverlayRef,
210
+ ref: node => {
211
+ if (overlayProps !== null && overlayProps !== void 0 && overlayProps.ref) {
212
+ assignRef(overlayProps.ref, node);
213
+ }
214
+ updateOverlayRef(node);
215
+ },
213
216
  "data-anchor-position": cssAnchorPositioning,
214
217
  "data-side": cssAnchorPositioning ? side : position_0 === null || position_0 === void 0 ? void 0 : position_0.anchorSide,
215
218
  children: [showXIcon ? /*#__PURE__*/jsx("div", {
@@ -235,6 +238,13 @@ const AnchoredOverlay = ({
235
238
  }) : null]
236
239
  });
237
240
  };
241
+ function assignRef(ref, value) {
242
+ if (typeof ref === 'function') {
243
+ ref(value);
244
+ } else if (ref) {
245
+ ref.current = value;
246
+ }
247
+ }
238
248
  AnchoredOverlay.displayName = 'AnchoredOverlay';
239
249
 
240
250
  export { AnchoredOverlay };
@@ -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),
@@ -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,
@@ -1 +1 @@
1
- {"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["../../src/ButtonGroup/ButtonGroup.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAS,KAAK,iBAAiB,EAAC,MAAM,OAAO,CAAA;AAK3D,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAE/F,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;IAC/C,4BAA4B;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,QAAA,MAAM,WAAW,EAoBX,8BAA8B,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;AAI7D,eAAe,WAAW,CAAA"}
1
+ {"version":3,"file":"ButtonGroup.d.ts","sourceRoot":"","sources":["../../src/ButtonGroup/ButtonGroup.tsx"],"names":[],"mappings":"AAAA,OAAc,EAAC,KAAK,iBAAiB,EAAC,MAAM,OAAO,CAAA;AAKnD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAE/F,MAAM,MAAM,gBAAgB,GAAG,iBAAiB,CAAC;IAC/C,4BAA4B;IAC5B,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,sCAAsC;IACtC,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB,CAAC,CAAA;AAEF,QAAA,MAAM,WAAW,EAoBX,8BAA8B,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAA;AAI7D,eAAe,WAAW,CAAA"}
@@ -1,14 +1,14 @@
1
1
  import { c } from 'react-compiler-runtime';
2
- import React, { useRef } from 'react';
2
+ import React from 'react';
3
3
  import classes from './ButtonGroup.module.css.js';
4
4
  import { clsx } from 'clsx';
5
5
  import { useFocusZone } from '../hooks/useFocusZone.js';
6
6
  import { jsx } from 'react/jsx-runtime';
7
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
7
+ import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
8
8
  import { FocusKeys } from '@primer/behaviors';
9
9
 
10
10
  const ButtonGroup = /*#__PURE__*/React.forwardRef(function ButtonGroup(t0, forwardRef) {
11
- const $ = c(19);
11
+ const $ = c(20);
12
12
  let children;
13
13
  let className;
14
14
  let rest;
@@ -45,49 +45,49 @@ const ButtonGroup = /*#__PURE__*/React.forwardRef(function ButtonGroup(t0, forwa
45
45
  t2 = $[7];
46
46
  }
47
47
  const buttons = t2;
48
- const buttonRef = useRef(null);
49
- const mergedRef = useMergedRefs(buttonRef, forwardRef);
48
+ const buttonRef = useProvidedRefOrCreate(forwardRef);
50
49
  const t3 = role !== "toolbar";
51
50
  let t4;
52
- if ($[8] !== t3) {
51
+ if ($[8] !== buttonRef || $[9] !== t3) {
53
52
  t4 = {
54
53
  containerRef: buttonRef,
55
54
  disabled: t3,
56
55
  bindKeys: FocusKeys.ArrowHorizontal,
57
56
  focusOutBehavior: "wrap"
58
57
  };
59
- $[8] = t3;
60
- $[9] = t4;
58
+ $[8] = buttonRef;
59
+ $[9] = t3;
60
+ $[10] = t4;
61
61
  } else {
62
- t4 = $[9];
62
+ t4 = $[10];
63
63
  }
64
64
  useFocusZone(t4);
65
65
  let t5;
66
- if ($[10] !== className) {
66
+ if ($[11] !== className) {
67
67
  t5 = clsx(className, classes.ButtonGroup);
68
- $[10] = className;
69
- $[11] = t5;
68
+ $[11] = className;
69
+ $[12] = t5;
70
70
  } else {
71
- t5 = $[11];
71
+ t5 = $[12];
72
72
  }
73
73
  let t6;
74
- if ($[12] !== BaseComponent || $[13] !== buttons || $[14] !== mergedRef || $[15] !== rest || $[16] !== role || $[17] !== t5) {
74
+ if ($[13] !== BaseComponent || $[14] !== buttonRef || $[15] !== buttons || $[16] !== rest || $[17] !== role || $[18] !== t5) {
75
75
  t6 = /*#__PURE__*/jsx(BaseComponent, {
76
- ref: mergedRef,
76
+ ref: buttonRef,
77
77
  className: t5,
78
78
  role: role,
79
79
  ...rest,
80
80
  children: buttons
81
81
  });
82
- $[12] = BaseComponent;
83
- $[13] = buttons;
84
- $[14] = mergedRef;
85
- $[15] = rest;
86
- $[16] = role;
87
- $[17] = t5;
88
- $[18] = t6;
82
+ $[13] = BaseComponent;
83
+ $[14] = buttonRef;
84
+ $[15] = buttons;
85
+ $[16] = rest;
86
+ $[17] = role;
87
+ $[18] = t5;
88
+ $[19] = t6;
89
89
  } else {
90
- t6 = $[18];
90
+ t6 = $[19];
91
91
  }
92
92
  return t6;
93
93
  });
@@ -1 +1 @@
1
- {"version":3,"file":"Checkbox.d.ts","sourceRoot":"","sources":["../../src/Checkbox/Checkbox.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAKZ,KAAK,mBAAmB,EAEzB,MAAM,OAAO,CAAA;AAEd,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,qCAAqC,CAAA;AAI7E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAElD,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IACvC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IACvC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,CAAA;AAE3D;;GAEG;AACH,QAAA,MAAM,QAAQ,qGAiDb,CAAA;wBAK0B,cAAc,CAAC,OAAO,QAAQ,CAAC;AAA1D,wBAA0D"}
1
+ {"version":3,"file":"Checkbox.d.ts","sourceRoot":"","sources":["../../src/Checkbox/Checkbox.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,EAAiD,KAAK,mBAAmB,EAAoB,MAAM,OAAO,CAAA;AAExH,OAAO,KAAK,EAAC,oBAAoB,EAAC,MAAM,qCAAqC,CAAA;AAI7E,OAAO,KAAK,EAAC,cAAc,EAAC,MAAM,gBAAgB,CAAA;AAElD,MAAM,MAAM,aAAa,GAAG;IAC1B;;OAEG;IACH,aAAa,CAAC,EAAE,OAAO,CAAA;IACvB;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,GAAG,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAA;IACvC;;OAEG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB;;OAEG;IACH,gBAAgB,CAAC,EAAE,oBAAoB,CAAA;IACvC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,GAAG,OAAO,CAAC,mBAAmB,CAAC,gBAAgB,CAAC,EAAE,OAAO,CAAC,CAAA;AAE3D;;GAEG;AACH,QAAA,MAAM,QAAQ,qGAgDb,CAAA;wBAK0B,cAAc,CAAC,OAAO,QAAQ,CAAC;AAA1D,wBAA0D"}
@@ -1,11 +1,11 @@
1
1
  import { clsx } from 'clsx';
2
- import React, { useRef, useContext, useEffect } from 'react';
2
+ import React, { useContext, useEffect } from 'react';
3
3
  import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
4
4
  import { CheckboxGroupContext } from '../CheckboxGroup/CheckboxGroupContext.js';
5
5
  import classes from './Checkbox.module.css.js';
6
6
  import sharedClasses from './shared.module.css.js';
7
7
  import { jsx } from 'react/jsx-runtime';
8
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
8
+ import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
9
9
 
10
10
  /**
11
11
  * An accessible, native checkbox component
@@ -24,8 +24,7 @@ const Checkbox = /*#__PURE__*/React.forwardRef(({
24
24
  }, ref
25
25
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
26
26
  ) => {
27
- const checkboxRef = useRef(null);
28
- const mergedRef = useMergedRefs(checkboxRef, ref);
27
+ const checkboxRef = useProvidedRefOrCreate(ref);
29
28
  const checkboxGroupContext = useContext(CheckboxGroupContext);
30
29
  const handleOnChange = e => {
31
30
  checkboxGroupContext.onChange && checkboxGroupContext.onChange(e);
@@ -34,7 +33,7 @@ const Checkbox = /*#__PURE__*/React.forwardRef(({
34
33
  const inputProps = {
35
34
  type: 'checkbox',
36
35
  disabled,
37
- ref: mergedRef,
36
+ ref: checkboxRef,
38
37
  checked: indeterminate ? false : checked,
39
38
  defaultChecked,
40
39
  required,
@@ -63,6 +62,7 @@ const Checkbox = /*#__PURE__*/React.forwardRef(({
63
62
  checkbox.setAttribute('aria-checked', checkbox.checked ? 'true' : 'false');
64
63
  }
65
64
  });
65
+ // @ts-expect-error inputProp needs a non nullable ref
66
66
  return /*#__PURE__*/jsx("input", {
67
67
  ...inputProps,
68
68
  className: clsx(className, sharedClasses.Input, classes.Checkbox)
@@ -1 +1 @@
1
- {"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"Dialog.d.ts","sourceRoot":"","sources":["../../src/Dialog/Dialog.tsx"],"names":[],"mappings":"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"}
@@ -6,15 +6,16 @@ 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
10
  import { useId } from '../hooks/useId.js';
10
11
  import classes from './Dialog.module.css.js';
11
12
  import { clsx } from 'clsx';
12
13
  import { useSlots } from '../hooks/useSlots.js';
13
14
  import { useResizeObserver } from '../hooks/useResizeObserver.js';
14
15
  import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
15
- import { useMergedRefs } from '../hooks/useMergedRefs.js';
16
16
  import { useOnEscapePress } from '../hooks/useOnEscapePress.js';
17
17
  import { ScrollableRegion } from '../ScrollableRegion/ScrollableRegion.js';
18
+ import { useProvidedRefOrCreate } from '../hooks/useProvidedRefOrCreate.js';
18
19
 
19
20
  let dialogScrollDisabledCount = 0;
20
21
  const DefaultHeader = ({
@@ -130,7 +131,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
130
131
  footer: Dialog.Footer
131
132
  });
132
133
  const dialogRef = useRef(null);
133
- const mergedRef = useMergedRefs(forwardedRef, dialogRef);
134
+ useRefObjectAsForwardedRef(forwardedRef, dialogRef);
134
135
  const backdropRef = useRef(null);
135
136
  useFocusTrap({
136
137
  containerRef: dialogRef,
@@ -204,7 +205,7 @@ const _Dialog = /*#__PURE__*/React.forwardRef((props, forwardedRef) => {
204
205
  setLastMouseDownIsBackdrop(e.target === e.currentTarget);
205
206
  },
206
207
  children: /*#__PURE__*/jsxs("div", {
207
- ref: mergedRef,
208
+ ref: dialogRef,
208
209
  role: role,
209
210
  "aria-labelledby": dialogLabelId,
210
211
  "aria-describedby": dialogDescriptionId,
@@ -289,8 +290,7 @@ const Buttons = ({
289
290
  buttons
290
291
  }) => {
291
292
  var _buttons$find;
292
- const autoFocusRef = useRef(null);
293
- const mergedRef = useMergedRefs(autoFocusRef, (_buttons$find = buttons.find(button => button.autoFocus)) === null || _buttons$find === void 0 ? void 0 : _buttons$find.ref);
293
+ const autoFocusRef = useProvidedRefOrCreate((_buttons$find = buttons.find(button => button.autoFocus)) === null || _buttons$find === void 0 ? void 0 : _buttons$find.ref);
294
294
  let autoFocusCount = 0;
295
295
  const [hasRendered, setHasRendered] = useState(0);
296
296
  useEffect(() => {
@@ -313,8 +313,10 @@ const Buttons = ({
313
313
  return /*#__PURE__*/jsx(ButtonComponent, {
314
314
  ...buttonProps,
315
315
  // 'normal' value is equivalent to 'default', this is used for backwards compatibility
316
- variant: buttonType === 'normal' ? 'default' : buttonType,
317
- ref: autoFocus && autoFocusCount === 0 ? (autoFocusCount++, mergedRef) : null,
316
+ variant: buttonType === 'normal' ? 'default' : buttonType
317
+ // @ts-expect-error it needs a non nullable ref
318
+ ,
319
+ ref: autoFocus && autoFocusCount === 0 ? (autoFocusCount++, autoFocusRef) : null,
318
320
  children: content
319
321
  }, index);
320
322
  })