@primer/react 0.0.0-20260623170141 → 0.0.0-20260623191445
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 +10 -16
- package/dist/ConfirmationDialog/useConfirm.d.ts.map +1 -1
- package/dist/ConfirmationDialog/useConfirm.js +4 -8
- package/dist/Radio/Radio.d.ts.map +1 -1
- package/dist/Radio/Radio.js +1 -2
- package/dist/RadioGroup/RadioGroup.js +0 -1
- package/dist/RelativeTime/RelativeTime.js +0 -1
- package/dist/ScrollableRegion/ScrollableRegion.d.ts.map +1 -1
- package/dist/ScrollableRegion/ScrollableRegion.js +0 -1
- package/dist/SegmentedControl/SegmentedControl.d.ts.map +1 -1
- package/dist/SegmentedControl/SegmentedControl.js +0 -1
- package/dist/SegmentedControl/SegmentedControlButton.d.ts.map +1 -1
- package/dist/SegmentedControl/SegmentedControlButton.js +0 -1
- package/dist/SegmentedControl/SegmentedControlIconButton.d.ts.map +1 -1
- package/dist/SegmentedControl/SegmentedControlIconButton.js +0 -1
- package/dist/Select/Select.d.ts.map +1 -1
- package/dist/Select/Select.js +2 -6
- package/dist/SideNav.d.ts.map +1 -1
- package/dist/SideNav.js +0 -2
- package/dist/Skeleton/SkeletonBox.d.ts +0 -1
- package/dist/Skeleton/SkeletonBox.d.ts.map +1 -1
- package/dist/Skeleton/SkeletonBox.js +47 -54
- package/dist/SkeletonText/SkeletonText.d.ts.map +1 -1
- package/dist/SkeletonText/SkeletonText.js +2 -2
- package/dist/Spinner/Spinner.js +0 -1
- package/dist/TextInput/TextInput.d.ts.map +1 -1
- package/dist/TextInput/TextInput.js +27 -68
- package/dist/Textarea/Textarea.d.ts.map +1 -1
- package/dist/Textarea/Textarea.js +158 -186
- package/dist/UnderlineNav/UnderlineNav.d.ts.map +1 -1
- package/dist/UnderlineNav/UnderlineNav.js +66 -12
- package/dist/_VisuallyHidden.js +2 -2
- package/dist/_VisuallyHidden.module.css.js +2 -2
- package/dist/live-region/Announce.d.ts.map +1 -1
- package/dist/live-region/Announce.js +51 -36
- package/dist/utils/character-counter.d.ts +16 -21
- package/dist/utils/character-counter.d.ts.map +1 -1
- package/dist/utils/character-counter.js +23 -59
- package/package.json +1 -1
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
import { c } from 'react-compiler-runtime';
|
|
2
|
-
import React, {
|
|
2
|
+
import React, { useId, useState } from 'react';
|
|
3
3
|
import { TextInputBaseWrapper } from '../internal/components/TextInputWrapper.js';
|
|
4
4
|
import classes from './TextArea.module.css.js';
|
|
5
5
|
import { AlertFillIcon } from '@primer/octicons-react';
|
|
6
|
-
import {
|
|
6
|
+
import { SCREEN_READER_DELAY, getCharacterCountState } from '../utils/character-counter.js';
|
|
7
7
|
import VisuallyHidden from '../_VisuallyHidden.js';
|
|
8
|
+
import visuallyHiddenClasses from '../_VisuallyHidden.module.css.js';
|
|
8
9
|
import { clsx } from 'clsx';
|
|
9
10
|
import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
|
|
11
|
+
import { AriaStatus } from '../live-region/AriaStatus.js';
|
|
10
12
|
import Text from '../Text/Text.js';
|
|
11
13
|
|
|
12
14
|
const DEFAULT_TEXTAREA_ROWS = 7;
|
|
@@ -17,7 +19,7 @@ const DEFAULT_TEXTAREA_RESIZE = 'both';
|
|
|
17
19
|
* This component accepts all native HTML <textarea> attributes as props.
|
|
18
20
|
*/
|
|
19
21
|
const Textarea = /*#__PURE__*/React.forwardRef((t0, ref) => {
|
|
20
|
-
const $ = c(
|
|
22
|
+
const $ = c(76);
|
|
21
23
|
let block;
|
|
22
24
|
let characterLimit;
|
|
23
25
|
let className;
|
|
@@ -95,200 +97,170 @@ const Textarea = /*#__PURE__*/React.forwardRef((t0, ref) => {
|
|
|
95
97
|
const rows = t1 === undefined ? DEFAULT_TEXTAREA_ROWS : t1;
|
|
96
98
|
const cols = t2 === undefined ? DEFAULT_TEXTAREA_COLS : t2;
|
|
97
99
|
const resize = t3 === undefined ? DEFAULT_TEXTAREA_RESIZE : t3;
|
|
98
|
-
const [characterCount, setCharacterCount] = React.useState("");
|
|
99
|
-
const [isOverLimit, setIsOverLimit] = React.useState(false);
|
|
100
|
-
const [screenReaderMessage, setScreenReaderMessage] = React.useState("");
|
|
101
|
-
const characterCounterRef = useRef(null);
|
|
102
100
|
const characterCountId = useId();
|
|
103
101
|
const characterCountStaticMessageId = useId();
|
|
102
|
+
const isControlled = value !== undefined;
|
|
104
103
|
let t4;
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
if (characterLimit) {
|
|
109
|
-
characterCounterRef.current = new CharacterCounter({
|
|
110
|
-
onCountUpdate: (count, overLimit, message) => {
|
|
111
|
-
setCharacterCount(message);
|
|
112
|
-
setIsOverLimit(overLimit);
|
|
113
|
-
},
|
|
114
|
-
onScreenReaderAnnounce: message_0 => {
|
|
115
|
-
setScreenReaderMessage(message_0);
|
|
116
|
-
}
|
|
117
|
-
});
|
|
118
|
-
return () => {
|
|
119
|
-
var _characterCounterRef$;
|
|
120
|
-
(_characterCounterRef$ = characterCounterRef.current) === null || _characterCounterRef$ === void 0 ? void 0 : _characterCounterRef$.cleanup();
|
|
121
|
-
};
|
|
122
|
-
}
|
|
123
|
-
};
|
|
124
|
-
t5 = [characterLimit];
|
|
125
|
-
$[18] = characterLimit;
|
|
104
|
+
if ($[18] !== defaultValue) {
|
|
105
|
+
t4 = () => defaultValue !== undefined ? String(defaultValue).length : 0;
|
|
106
|
+
$[18] = defaultValue;
|
|
126
107
|
$[19] = t4;
|
|
127
|
-
$[20] = t5;
|
|
128
108
|
} else {
|
|
129
109
|
t4 = $[19];
|
|
130
|
-
t5 = $[20];
|
|
131
|
-
}
|
|
132
|
-
useEffect(t4, t5);
|
|
133
|
-
let t6;
|
|
134
|
-
let t7;
|
|
135
|
-
if ($[21] !== characterLimit || $[22] !== defaultValue || $[23] !== value) {
|
|
136
|
-
t6 = () => {
|
|
137
|
-
if (characterLimit && characterCounterRef.current) {
|
|
138
|
-
const currentValue = value !== undefined ? String(value) : defaultValue !== undefined ? String(defaultValue) : "";
|
|
139
|
-
characterCounterRef.current.updateCharacterCount(currentValue.length, characterLimit);
|
|
140
|
-
}
|
|
141
|
-
};
|
|
142
|
-
t7 = [value, defaultValue, characterLimit];
|
|
143
|
-
$[21] = characterLimit;
|
|
144
|
-
$[22] = defaultValue;
|
|
145
|
-
$[23] = value;
|
|
146
|
-
$[24] = t6;
|
|
147
|
-
$[25] = t7;
|
|
148
|
-
} else {
|
|
149
|
-
t6 = $[24];
|
|
150
|
-
t7 = $[25];
|
|
151
|
-
}
|
|
152
|
-
useEffect(t6, t7);
|
|
153
|
-
let t8;
|
|
154
|
-
if ($[26] !== characterLimit || $[27] !== onChange) {
|
|
155
|
-
t8 = e => {
|
|
156
|
-
var _onChange;
|
|
157
|
-
if (characterLimit && characterCounterRef.current) {
|
|
158
|
-
characterCounterRef.current.updateCharacterCount(e.target.value.length, characterLimit);
|
|
159
|
-
}
|
|
160
|
-
(_onChange = onChange) === null || _onChange === void 0 ? void 0 : _onChange(e);
|
|
161
|
-
};
|
|
162
|
-
$[26] = characterLimit;
|
|
163
|
-
$[27] = onChange;
|
|
164
|
-
$[28] = t8;
|
|
165
|
-
} else {
|
|
166
|
-
t8 = $[28];
|
|
167
|
-
}
|
|
168
|
-
const handleTextareaChange = t8;
|
|
169
|
-
const isValid = isOverLimit ? "error" : validationStatus;
|
|
170
|
-
const t9 = isValid === "error" ? "true" : "false";
|
|
171
|
-
let t10;
|
|
172
|
-
if ($[29] !== maxHeight || $[30] !== minHeight || $[31] !== style) {
|
|
173
|
-
t10 = {
|
|
174
|
-
minHeight,
|
|
175
|
-
maxHeight,
|
|
176
|
-
...style
|
|
177
|
-
};
|
|
178
|
-
$[29] = maxHeight;
|
|
179
|
-
$[30] = minHeight;
|
|
180
|
-
$[31] = style;
|
|
181
|
-
$[32] = t10;
|
|
182
|
-
} else {
|
|
183
|
-
t10 = $[32];
|
|
184
|
-
}
|
|
185
|
-
let t11;
|
|
186
|
-
if ($[33] !== characterCountStaticMessageId || $[34] !== characterLimit || $[35] !== rest) {
|
|
187
|
-
t11 = characterLimit ? [characterCountStaticMessageId, rest["aria-describedby"]].filter(Boolean).join(" ") || undefined : rest["aria-describedby"];
|
|
188
|
-
$[33] = characterCountStaticMessageId;
|
|
189
|
-
$[34] = characterLimit;
|
|
190
|
-
$[35] = rest;
|
|
191
|
-
$[36] = t11;
|
|
192
|
-
} else {
|
|
193
|
-
t11 = $[36];
|
|
194
110
|
}
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
214
|
-
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
$[
|
|
223
|
-
|
|
224
|
-
|
|
225
|
-
|
|
226
|
-
|
|
227
|
-
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
|
|
233
|
-
|
|
234
|
-
|
|
235
|
-
|
|
236
|
-
|
|
237
|
-
|
|
238
|
-
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
242
|
-
|
|
243
|
-
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
$[57]
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
"aria-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
|
|
111
|
+
const [uncontrolledLength, setUncontrolledLength] = useState(t4);
|
|
112
|
+
const currentLength = isControlled ? String(value).length : uncontrolledLength;
|
|
113
|
+
let t5;
|
|
114
|
+
if ($[20] !== block || $[21] !== characterCountId || $[22] !== characterCountStaticMessageId || $[23] !== characterLimit || $[24] !== className || $[25] !== cols || $[26] !== contrast || $[27] !== currentLength || $[28] !== defaultValue || $[29] !== disabled || $[30] !== isControlled || $[31] !== maxHeight || $[32] !== minHeight || $[33] !== onChange || $[34] !== ref || $[35] !== required || $[36] !== resize || $[37] !== rest || $[38] !== rows || $[39] !== style || $[40] !== validationStatus || $[41] !== value) {
|
|
115
|
+
var _counter$isOverLimit;
|
|
116
|
+
const counter = characterLimit ? getCharacterCountState(currentLength, characterLimit) : undefined;
|
|
117
|
+
const isOverLimit = (_counter$isOverLimit = counter === null || counter === void 0 ? void 0 : counter.isOverLimit) !== null && _counter$isOverLimit !== void 0 ? _counter$isOverLimit : false;
|
|
118
|
+
let t6;
|
|
119
|
+
if ($[43] !== characterLimit || $[44] !== isControlled || $[45] !== onChange) {
|
|
120
|
+
t6 = e => {
|
|
121
|
+
var _onChange;
|
|
122
|
+
if (characterLimit && !isControlled) {
|
|
123
|
+
setUncontrolledLength(e.target.value.length);
|
|
124
|
+
}
|
|
125
|
+
(_onChange = onChange) === null || _onChange === void 0 ? void 0 : _onChange(e);
|
|
126
|
+
};
|
|
127
|
+
$[43] = characterLimit;
|
|
128
|
+
$[44] = isControlled;
|
|
129
|
+
$[45] = onChange;
|
|
130
|
+
$[46] = t6;
|
|
131
|
+
} else {
|
|
132
|
+
t6 = $[46];
|
|
133
|
+
}
|
|
134
|
+
const handleTextareaChange = t6;
|
|
135
|
+
const isValid = isOverLimit ? "error" : validationStatus;
|
|
136
|
+
const t7 = isValid === "error" ? "true" : "false";
|
|
137
|
+
let t8;
|
|
138
|
+
if ($[47] !== maxHeight || $[48] !== minHeight || $[49] !== style) {
|
|
139
|
+
t8 = {
|
|
140
|
+
minHeight,
|
|
141
|
+
maxHeight,
|
|
142
|
+
...style
|
|
143
|
+
};
|
|
144
|
+
$[47] = maxHeight;
|
|
145
|
+
$[48] = minHeight;
|
|
146
|
+
$[49] = style;
|
|
147
|
+
$[50] = t8;
|
|
148
|
+
} else {
|
|
149
|
+
t8 = $[50];
|
|
150
|
+
}
|
|
151
|
+
let t9;
|
|
152
|
+
if ($[51] !== characterCountStaticMessageId || $[52] !== characterLimit || $[53] !== rest) {
|
|
153
|
+
t9 = characterLimit ? [characterCountStaticMessageId, rest["aria-describedby"]].filter(Boolean).join(" ") || undefined : rest["aria-describedby"];
|
|
154
|
+
$[51] = characterCountStaticMessageId;
|
|
155
|
+
$[52] = characterLimit;
|
|
156
|
+
$[53] = rest;
|
|
157
|
+
$[54] = t9;
|
|
158
|
+
} else {
|
|
159
|
+
t9 = $[54];
|
|
160
|
+
}
|
|
161
|
+
let t10;
|
|
162
|
+
if ($[55] !== cols || $[56] !== defaultValue || $[57] !== disabled || $[58] !== handleTextareaChange || $[59] !== ref || $[60] !== required || $[61] !== resize || $[62] !== rest || $[63] !== rows || $[64] !== t7 || $[65] !== t8 || $[66] !== t9 || $[67] !== value) {
|
|
163
|
+
t10 = /*#__PURE__*/jsx("textarea", {
|
|
164
|
+
value: value,
|
|
165
|
+
defaultValue: defaultValue,
|
|
166
|
+
"data-resize": resize,
|
|
167
|
+
"aria-required": required,
|
|
168
|
+
"aria-invalid": t7,
|
|
169
|
+
ref: ref,
|
|
170
|
+
disabled: disabled,
|
|
171
|
+
rows: rows,
|
|
172
|
+
cols: cols,
|
|
173
|
+
className: classes.TextArea,
|
|
174
|
+
onChange: handleTextareaChange,
|
|
175
|
+
style: t8,
|
|
176
|
+
...rest,
|
|
177
|
+
"aria-describedby": t9
|
|
178
|
+
});
|
|
179
|
+
$[55] = cols;
|
|
180
|
+
$[56] = defaultValue;
|
|
181
|
+
$[57] = disabled;
|
|
182
|
+
$[58] = handleTextareaChange;
|
|
183
|
+
$[59] = ref;
|
|
184
|
+
$[60] = required;
|
|
185
|
+
$[61] = resize;
|
|
186
|
+
$[62] = rest;
|
|
187
|
+
$[63] = rows;
|
|
188
|
+
$[64] = t7;
|
|
189
|
+
$[65] = t8;
|
|
190
|
+
$[66] = t9;
|
|
191
|
+
$[67] = value;
|
|
192
|
+
$[68] = t10;
|
|
193
|
+
} else {
|
|
194
|
+
t10 = $[68];
|
|
195
|
+
}
|
|
196
|
+
let t11;
|
|
197
|
+
if ($[69] !== block || $[70] !== className || $[71] !== contrast || $[72] !== disabled || $[73] !== isValid || $[74] !== t10) {
|
|
198
|
+
t11 = /*#__PURE__*/jsx(TextInputBaseWrapper, {
|
|
199
|
+
validationStatus: isValid,
|
|
200
|
+
disabled: disabled,
|
|
201
|
+
block: block,
|
|
202
|
+
contrast: contrast,
|
|
203
|
+
className: className,
|
|
204
|
+
children: t10
|
|
205
|
+
});
|
|
206
|
+
$[69] = block;
|
|
207
|
+
$[70] = className;
|
|
208
|
+
$[71] = contrast;
|
|
209
|
+
$[72] = disabled;
|
|
210
|
+
$[73] = isValid;
|
|
211
|
+
$[74] = t10;
|
|
212
|
+
$[75] = t11;
|
|
213
|
+
} else {
|
|
214
|
+
t11 = $[75];
|
|
215
|
+
}
|
|
216
|
+
t5 = /*#__PURE__*/jsxs(Fragment, {
|
|
217
|
+
children: [t11, characterLimit && /*#__PURE__*/jsxs(Fragment, {
|
|
218
|
+
children: [/*#__PURE__*/jsx(AriaStatus, {
|
|
219
|
+
announceOnShow: false,
|
|
220
|
+
delayMs: SCREEN_READER_DELAY,
|
|
221
|
+
className: visuallyHiddenClasses.InternalVisuallyHidden,
|
|
222
|
+
children: counter === null || counter === void 0 ? void 0 : counter.message
|
|
223
|
+
}), /*#__PURE__*/jsxs(VisuallyHidden, {
|
|
224
|
+
id: characterCountStaticMessageId,
|
|
225
|
+
children: ["You can enter up to ", characterLimit, " ", characterLimit === 1 ? "character" : "characters"]
|
|
226
|
+
}), /*#__PURE__*/jsxs(Text, {
|
|
227
|
+
"aria-hidden": "true",
|
|
228
|
+
id: characterCountId,
|
|
229
|
+
size: "small",
|
|
230
|
+
className: clsx(classes.CharacterCounter, isOverLimit && classes["CharacterCounter--error"]),
|
|
231
|
+
children: [isOverLimit && /*#__PURE__*/jsx(AlertFillIcon, {
|
|
232
|
+
size: 16
|
|
233
|
+
}), counter === null || counter === void 0 ? void 0 : counter.message]
|
|
234
|
+
})]
|
|
268
235
|
})]
|
|
269
236
|
});
|
|
270
|
-
$[
|
|
271
|
-
$[
|
|
272
|
-
$[
|
|
273
|
-
$[
|
|
274
|
-
$[
|
|
275
|
-
$[
|
|
276
|
-
$[
|
|
277
|
-
|
|
278
|
-
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
$[
|
|
286
|
-
$[
|
|
287
|
-
$[
|
|
237
|
+
$[20] = block;
|
|
238
|
+
$[21] = characterCountId;
|
|
239
|
+
$[22] = characterCountStaticMessageId;
|
|
240
|
+
$[23] = characterLimit;
|
|
241
|
+
$[24] = className;
|
|
242
|
+
$[25] = cols;
|
|
243
|
+
$[26] = contrast;
|
|
244
|
+
$[27] = currentLength;
|
|
245
|
+
$[28] = defaultValue;
|
|
246
|
+
$[29] = disabled;
|
|
247
|
+
$[30] = isControlled;
|
|
248
|
+
$[31] = maxHeight;
|
|
249
|
+
$[32] = minHeight;
|
|
250
|
+
$[33] = onChange;
|
|
251
|
+
$[34] = ref;
|
|
252
|
+
$[35] = required;
|
|
253
|
+
$[36] = resize;
|
|
254
|
+
$[37] = rest;
|
|
255
|
+
$[38] = rows;
|
|
256
|
+
$[39] = style;
|
|
257
|
+
$[40] = validationStatus;
|
|
258
|
+
$[41] = value;
|
|
259
|
+
$[42] = t5;
|
|
288
260
|
} else {
|
|
289
|
-
|
|
261
|
+
t5 = $[42];
|
|
290
262
|
}
|
|
291
|
-
return
|
|
263
|
+
return t5;
|
|
292
264
|
});
|
|
293
265
|
Textarea.displayName = 'Textarea';
|
|
294
266
|
Textarea.__SLOT__ = Symbol('Textarea');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnderlineNav.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNav.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAA;AAqBtE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,YAAY,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;IACjD,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC5B,CAAA;AAGD,eAAO,MAAM,cAAc,KAAK,CAAA;AAsGhC,eAAO,MAAM,YAAY,
|
|
1
|
+
{"version":3,"file":"UnderlineNav.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNav.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAA;AAqBtE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAA;IACzB,YAAY,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,YAAY,CAAC,CAAA;IACjD,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;OAEG;IACH,eAAe,CAAC,EAAE,OAAO,CAAA;IACzB;;;;OAIG;IACH,OAAO,CAAC,EAAE,OAAO,GAAG,OAAO,CAAA;CAC5B,CAAA;AAGD,eAAO,MAAM,cAAc,KAAK,CAAA;AAsGhC,eAAO,MAAM,YAAY,mFA6UxB,CAAA"}
|
|
@@ -130,31 +130,80 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
130
130
|
const disclosureWidgetId = useId();
|
|
131
131
|
const [isWidgetOpen, setIsWidgetOpen] = useState(false);
|
|
132
132
|
const [iconsVisible, setIconsVisible] = useState(true);
|
|
133
|
-
|
|
134
|
-
|
|
133
|
+
// Width measurements are stored keyed by item text so that adding/removing/reordering
|
|
134
|
+
// children does not produce stale or out-of-order entries (as the previous append-only
|
|
135
|
+
// arrays did). See https://github.com/github/primer/issues/6389.
|
|
136
|
+
const [childWidthMap, setChildWidthMap] = useState({});
|
|
137
|
+
const [noIconChildWidthMap, setNoIconChildWidthMap] = useState({});
|
|
135
138
|
// Track whether the initial overflow calculation is complete to prevent CLS
|
|
136
139
|
const [isOverflowMeasured, setIsOverflowMeasured] = useState(false);
|
|
137
140
|
const validChildren = getValidChildren(children);
|
|
138
141
|
|
|
142
|
+
// Build ordered width arrays from the current children so order always matches
|
|
143
|
+
// `validChildren`, even after items are added, removed, or reordered.
|
|
144
|
+
const childWidthArray = validChildren.map(child => {
|
|
145
|
+
var _childWidthMap$text;
|
|
146
|
+
const text = child.props.children;
|
|
147
|
+
return {
|
|
148
|
+
text,
|
|
149
|
+
width: (_childWidthMap$text = childWidthMap[text]) !== null && _childWidthMap$text !== void 0 ? _childWidthMap$text : 0
|
|
150
|
+
};
|
|
151
|
+
});
|
|
152
|
+
const noIconChildWidthArray = validChildren.map(child => {
|
|
153
|
+
var _noIconChildWidthMap$;
|
|
154
|
+
const text = child.props.children;
|
|
155
|
+
return {
|
|
156
|
+
text,
|
|
157
|
+
width: (_noIconChildWidthMap$ = noIconChildWidthMap[text]) !== null && _noIconChildWidthMap$ !== void 0 ? _noIconChildWidthMap$ : 0
|
|
158
|
+
};
|
|
159
|
+
});
|
|
160
|
+
|
|
139
161
|
// Responsive props object manages which items are in the list and which items are in the menu.
|
|
140
162
|
const [responsiveProps, setResponsiveProps] = useState({
|
|
141
163
|
items: validChildren,
|
|
142
164
|
menuItems: []
|
|
143
165
|
});
|
|
144
166
|
|
|
167
|
+
// The ordered signature drives `useResizeObserver` deps below so it re-fires whenever
|
|
168
|
+
// children are added, removed, or reordered.
|
|
169
|
+
const childrenSignature = validChildren.map(child => {
|
|
170
|
+
var _child$key;
|
|
171
|
+
return String((_child$key = child.key) !== null && _child$key !== void 0 ? _child$key : '');
|
|
172
|
+
}).join('|');
|
|
173
|
+
|
|
174
|
+
// `childrenChanged` only tracks membership (set of keys), not order. This is intentional
|
|
175
|
+
// because `swapMenuItemWithListItem` legitimately reorders `responsiveProps.items` (to keep
|
|
176
|
+
// the selected item visible), and we don't want that to be treated as a stale-children
|
|
177
|
+
// situation. We only need to fall back to rendering `validChildren` directly when a child
|
|
178
|
+
// was actually added or removed (so a new item isn't missed and a removed item isn't kept).
|
|
179
|
+
const responsiveKeys = new Set();
|
|
180
|
+
for (const item of responsiveProps.items) {
|
|
181
|
+
var _item$key;
|
|
182
|
+
responsiveKeys.add(String((_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : ''));
|
|
183
|
+
}
|
|
184
|
+
for (const item of responsiveProps.menuItems) {
|
|
185
|
+
var _item$key2;
|
|
186
|
+
responsiveKeys.add(String((_item$key2 = item.key) !== null && _item$key2 !== void 0 ? _item$key2 : ''));
|
|
187
|
+
}
|
|
188
|
+
const validKeys = validChildren.map(child => {
|
|
189
|
+
var _child$key2;
|
|
190
|
+
return String((_child$key2 = child.key) !== null && _child$key2 !== void 0 ? _child$key2 : '');
|
|
191
|
+
});
|
|
192
|
+
const childrenChanged = validKeys.length !== responsiveKeys.size || validKeys.some(key => !responsiveKeys.has(key));
|
|
193
|
+
|
|
145
194
|
// Make sure to have the fresh props data for list items when children are changed (keeping aria-current up-to-date)
|
|
146
|
-
const listItems = responsiveProps.items.map(item => {
|
|
195
|
+
const listItems = childrenChanged ? validChildren : responsiveProps.items.map(item => {
|
|
147
196
|
var _validChildren$find;
|
|
148
197
|
return (_validChildren$find = validChildren.find(child => child.key === item.key)) !== null && _validChildren$find !== void 0 ? _validChildren$find : item;
|
|
149
198
|
});
|
|
150
199
|
|
|
151
200
|
// Make sure to have the fresh props data for menu items when children are changed (keeping aria-current up-to-date)
|
|
152
|
-
const menuItems = responsiveProps.menuItems.map(menuItem => {
|
|
201
|
+
const menuItems = childrenChanged ? [] : responsiveProps.menuItems.map(menuItem => {
|
|
153
202
|
var _validChildren$find2;
|
|
154
203
|
return (_validChildren$find2 = validChildren.find(child => child.key === menuItem.key)) !== null && _validChildren$find2 !== void 0 ? _validChildren$find2 : menuItem;
|
|
155
204
|
});
|
|
156
205
|
// This is the case where the viewport is too narrow to show any list item with the more menu. In this case, we only show the dropdown
|
|
157
|
-
const onlyMenuVisible = responsiveProps.items.length === 0;
|
|
206
|
+
const onlyMenuVisible = !childrenChanged && responsiveProps.items.length === 0;
|
|
158
207
|
useDevOnlyEffect(() => {
|
|
159
208
|
// Address illegal state where there are multiple items that have `aria-current='page'` attribute
|
|
160
209
|
const activeElements = validChildren.filter(child => {
|
|
@@ -212,15 +261,15 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
212
261
|
}
|
|
213
262
|
}, []);
|
|
214
263
|
const setChildrenWidth = useCallback(size => {
|
|
215
|
-
|
|
216
|
-
|
|
217
|
-
|
|
264
|
+
setChildWidthMap(prev => prev[size.text] === size.width ? prev : {
|
|
265
|
+
...prev,
|
|
266
|
+
[size.text]: size.width
|
|
218
267
|
});
|
|
219
268
|
}, []);
|
|
220
269
|
const setNoIconChildrenWidth = useCallback(size => {
|
|
221
|
-
|
|
222
|
-
|
|
223
|
-
|
|
270
|
+
setNoIconChildWidthMap(prev => prev[size.text] === size.width ? prev : {
|
|
271
|
+
...prev,
|
|
272
|
+
[size.text]: size.width
|
|
224
273
|
});
|
|
225
274
|
}, []);
|
|
226
275
|
const closeOverlay = React.useCallback(() => {
|
|
@@ -248,12 +297,17 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
248
297
|
containerRef,
|
|
249
298
|
ignoreClickRefs: [moreMenuBtnRef]
|
|
250
299
|
});
|
|
300
|
+
|
|
301
|
+
// The resize observer fires when the nav element resizes, and re-observes (firing the
|
|
302
|
+
// callback again with current size) whenever its deps change. Passing `childrenSignature`
|
|
303
|
+
// ensures the overflow calculation re-runs when child tabs are added, removed, or
|
|
304
|
+
// reordered. See https://github.com/github/primer/issues/6389.
|
|
251
305
|
useResizeObserver(resizeObserverEntries => {
|
|
252
306
|
var _moreMenuRef$current$, _moreMenuRef$current;
|
|
253
307
|
const navWidth = resizeObserverEntries[0].contentRect.width;
|
|
254
308
|
const moreMenuWidth = (_moreMenuRef$current$ = (_moreMenuRef$current = moreMenuRef.current) === null || _moreMenuRef$current === void 0 ? void 0 : _moreMenuRef$current.getBoundingClientRect().width) !== null && _moreMenuRef$current$ !== void 0 ? _moreMenuRef$current$ : 0;
|
|
255
309
|
navWidth !== 0 && overflowEffect(navWidth, moreMenuWidth, validChildren, childWidthArray, noIconChildWidthArray, updateListAndMenu);
|
|
256
|
-
}, navRef);
|
|
310
|
+
}, navRef, [childrenSignature]);
|
|
257
311
|
|
|
258
312
|
// Compute menuInlineStyles if needed
|
|
259
313
|
let menuInlineStyles = {
|
package/dist/_VisuallyHidden.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { c } from 'react-compiler-runtime';
|
|
2
|
-
import
|
|
2
|
+
import visuallyHiddenClasses from './_VisuallyHidden.module.css.js';
|
|
3
3
|
import { clsx } from 'clsx';
|
|
4
4
|
import { jsx } from 'react/jsx-runtime';
|
|
5
5
|
|
|
@@ -36,7 +36,7 @@ function VisuallyHidden(t0) {
|
|
|
36
36
|
let t2;
|
|
37
37
|
if ($[6] !== className || $[7] !== t1) {
|
|
38
38
|
t2 = clsx(className, {
|
|
39
|
-
[
|
|
39
|
+
[visuallyHiddenClasses.InternalVisuallyHidden]: t1
|
|
40
40
|
});
|
|
41
41
|
$[6] = className;
|
|
42
42
|
$[7] = t1;
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import './_VisuallyHidden-1f156b61.css';
|
|
2
2
|
|
|
3
|
-
var
|
|
3
|
+
var visuallyHiddenClasses = {"InternalVisuallyHidden":"prc-src-InternalVisuallyHidden-2YaI6"};
|
|
4
4
|
|
|
5
|
-
export {
|
|
5
|
+
export { visuallyHiddenClasses as default };
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Announce.d.ts","sourceRoot":"","sources":["../../src/live-region/Announce.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAA;AAEjE,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,IAAI,gBAAgB,CACxE,EAAE,EACF,KAAK,EACL;IACE;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IAExB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAEhB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,CAAA;CACpC,CACF,CAAA;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"Announce.d.ts","sourceRoot":"","sources":["../../src/live-region/Announce.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,OAAO,KAAK,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAA;AAEjE,MAAM,MAAM,aAAa,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,IAAI,gBAAgB,CACxE,EAAE,EACF,KAAK,EACL;IACE;;;;OAIG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;IAExB;;;OAGG;IACH,MAAM,CAAC,EAAE,OAAO,CAAA;IAEhB;;;OAGG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;IAEhB;;;OAGG;IACH,UAAU,CAAC,EAAE,WAAW,GAAG,QAAQ,CAAA;CACpC,CACF,CAAA;AAED;;;;GAIG;AACH,wBAAgB,QAAQ,CAAC,EAAE,SAAS,KAAK,CAAC,WAAW,GAAG,KAAK,EAAE,KAAK,EAAE,aAAa,CAAC,EAAE,CAAC,qBAsGtF"}
|