@primer/react 0.0.0-20260223174439 → 0.0.0-20260223175050
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 +3 -5
- package/dist/Autocomplete/Autocomplete.js +159 -76
- package/dist/Autocomplete/AutocompleteMenu.js +333 -128
- package/dist/Autocomplete/AutocompleteOverlay.js +130 -49
- package/dist/Banner/Banner.js +238 -64
- package/dist/Checkbox/Checkbox.js +163 -55
- package/dist/Dialog/Dialog.js +347 -105
- package/dist/PageLayout/PageLayout.js +1560 -622
- package/dist/SelectPanel/SelectPanel.d.ts.map +1 -1
- package/dist/SelectPanel/SelectPanel.js +32 -82
- package/dist/TreeView/useRovingTabIndex.d.ts +14 -0
- package/dist/TreeView/useRovingTabIndex.d.ts.map +1 -1
- package/dist/TreeView/useRovingTabIndex.js +94 -16
- package/dist/UnderlineNav/UnderlineNavItem.js +149 -56
- package/dist/experimental/SelectPanel2/SelectPanel.js +593 -209
- package/dist/hooks/useScrollFlash.js +27 -17
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SelectPanel.d.ts","sourceRoot":"","sources":["../../src/SelectPanel/SelectPanel.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"SelectPanel.d.ts","sourceRoot":"","sources":["../../src/SelectPanel/SelectPanel.tsx"],"names":[],"mappings":"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"}
|
|
@@ -133,6 +133,8 @@ function Panel({
|
|
|
133
133
|
wide: false
|
|
134
134
|
}, false);
|
|
135
135
|
const [selectedOnSort, setSelectedOnSort] = useState([]);
|
|
136
|
+
const [prevItems, setPrevItems] = useState([]);
|
|
137
|
+
const [prevOpen, setPrevOpen] = useState(open);
|
|
136
138
|
const initialHeightRef = useRef(0);
|
|
137
139
|
const initialScaleRef = useRef(1);
|
|
138
140
|
const noticeRef = useRef(null);
|
|
@@ -204,19 +206,6 @@ function Panel({
|
|
|
204
206
|
resetSort();
|
|
205
207
|
}
|
|
206
208
|
}, [loadingManagedInternally, externalOnFilterChange, setInternalFilterValue, dataLoadedOnce, safeSetTimeout, safeClearTimeout, items.length, resetSort]);
|
|
207
|
-
|
|
208
|
-
// Pre-compute a Set of item IDs in the current filtered view for O(1) lookups
|
|
209
|
-
const itemsInViewSet = useMemo(() => {
|
|
210
|
-
const set = new Set();
|
|
211
|
-
for (const item of items) {
|
|
212
|
-
if (item.id !== undefined) {
|
|
213
|
-
set.add(item.id);
|
|
214
|
-
} else {
|
|
215
|
-
set.add(item);
|
|
216
|
-
}
|
|
217
|
-
}
|
|
218
|
-
return set;
|
|
219
|
-
}, [items]);
|
|
220
209
|
const handleSelectAllChange = useCallback(checked => {
|
|
221
210
|
// Exit early if not in multi-select mode
|
|
222
211
|
if (!isMultiSelectVariant(selected)) {
|
|
@@ -224,20 +213,13 @@ function Panel({
|
|
|
224
213
|
}
|
|
225
214
|
const multiSelectOnChange = onSelectedChange;
|
|
226
215
|
const selectedArray = selected;
|
|
227
|
-
|
|
228
|
-
// Use Set for O(1) lookup instead of O(n) items.some()
|
|
229
|
-
const selectedItemsNotInFilteredView = selectedArray.filter(selectedItem => {
|
|
230
|
-
if (selectedItem.id !== undefined) {
|
|
231
|
-
return !itemsInViewSet.has(selectedItem.id);
|
|
232
|
-
}
|
|
233
|
-
return !itemsInViewSet.has(selectedItem);
|
|
234
|
-
});
|
|
216
|
+
const selectedItemsNotInFilteredView = selectedArray.filter(selectedItem => !items.some(item => areItemsEqual(item, selectedItem)));
|
|
235
217
|
if (checked) {
|
|
236
218
|
multiSelectOnChange([...selectedItemsNotInFilteredView, ...items]);
|
|
237
219
|
} else {
|
|
238
220
|
multiSelectOnChange(selectedItemsNotInFilteredView);
|
|
239
221
|
}
|
|
240
|
-
}, [items,
|
|
222
|
+
}, [items, onSelectedChange, selected]);
|
|
241
223
|
|
|
242
224
|
// disable body scroll when the panel is open on narrow screens
|
|
243
225
|
useEffect(() => {
|
|
@@ -403,29 +385,10 @@ function Panel({
|
|
|
403
385
|
});
|
|
404
386
|
};
|
|
405
387
|
}, [placeholder, renderAnchor, selected]);
|
|
406
|
-
|
|
407
|
-
// Pre-compute a Set of selected item IDs/references for O(1) lookups
|
|
408
|
-
// This optimizes isItemCurrentlySelected from O(m) to O(1) per call
|
|
409
|
-
const selectedItemsSet = useMemo(() => {
|
|
410
|
-
const set = new Set();
|
|
411
|
-
if (isMultiSelectVariant(selected)) {
|
|
412
|
-
for (const item of selected) {
|
|
413
|
-
if (item.id !== undefined) {
|
|
414
|
-
set.add(item.id);
|
|
415
|
-
} else {
|
|
416
|
-
set.add(item);
|
|
417
|
-
}
|
|
418
|
-
}
|
|
419
|
-
}
|
|
420
|
-
return set;
|
|
421
|
-
}, [selected]);
|
|
422
388
|
const isItemCurrentlySelected = useCallback(item => {
|
|
423
|
-
// For multi-select,
|
|
389
|
+
// For multi-select, we just need to check if the item is in the selected array
|
|
424
390
|
if (isMultiSelectVariant(selected)) {
|
|
425
|
-
|
|
426
|
-
return selectedItemsSet.has(item.id);
|
|
427
|
-
}
|
|
428
|
-
return selectedItemsSet.has(item);
|
|
391
|
+
return doesItemsIncludeItem(selected, item);
|
|
429
392
|
}
|
|
430
393
|
|
|
431
394
|
// For single-select modal, there is an intermediate state when the user has selected
|
|
@@ -436,24 +399,8 @@ function Panel({
|
|
|
436
399
|
|
|
437
400
|
// For single-select anchored, we just need to check if the item is the selected item
|
|
438
401
|
return (selected === null || selected === void 0 ? void 0 : selected.id) !== undefined ? selected.id === item.id : selected === item;
|
|
439
|
-
}, [selected,
|
|
402
|
+
}, [selected, intermediateSelected, isSingleSelectModal]);
|
|
440
403
|
const itemsToRender = useMemo(() => {
|
|
441
|
-
// Pre-compute a Set of selected item IDs/references for O(1) lookups during sorting
|
|
442
|
-
// This avoids O(m * k) work per comparison in the sort function
|
|
443
|
-
const selectedOnSortSet = new Set();
|
|
444
|
-
for (const item of selectedOnSort) {
|
|
445
|
-
if (item.id !== undefined) {
|
|
446
|
-
selectedOnSortSet.add(item.id);
|
|
447
|
-
} else {
|
|
448
|
-
selectedOnSortSet.add(item);
|
|
449
|
-
}
|
|
450
|
-
}
|
|
451
|
-
const isSelectedForSort = item => {
|
|
452
|
-
if (item.id !== undefined) {
|
|
453
|
-
return selectedOnSortSet.has(item.id);
|
|
454
|
-
}
|
|
455
|
-
return selectedOnSortSet.has(item);
|
|
456
|
-
};
|
|
457
404
|
return items.map(item => {
|
|
458
405
|
return {
|
|
459
406
|
...item,
|
|
@@ -490,39 +437,42 @@ function Panel({
|
|
|
490
437
|
};
|
|
491
438
|
}).sort((itemA, itemB) => {
|
|
492
439
|
if (shouldOrderSelectedFirst) {
|
|
493
|
-
|
|
494
|
-
const
|
|
440
|
+
// itemA is selected (for sorting purposes) if an object in selectedOnSort matches every property of itemA, except for the selected property
|
|
441
|
+
const itemASelected = selectedOnSort.some(item => Object.entries(item).every(([key, value]) => {
|
|
442
|
+
if (key === 'selected') {
|
|
443
|
+
return true;
|
|
444
|
+
}
|
|
445
|
+
return itemA[key] === value;
|
|
446
|
+
}));
|
|
447
|
+
|
|
448
|
+
// itemB is selected (for sorting purposes) if an object in selectedOnSort matches every property of itemA, except for the selected property
|
|
449
|
+
const itemBSelected = selectedOnSort.some(item => Object.entries(item).every(([key, value]) => {
|
|
450
|
+
if (key === 'selected') {
|
|
451
|
+
return true;
|
|
452
|
+
}
|
|
453
|
+
return itemB[key] === value;
|
|
454
|
+
}));
|
|
495
455
|
|
|
496
456
|
// order selected items first
|
|
497
|
-
if (itemASelected
|
|
457
|
+
if (itemASelected > itemBSelected) {
|
|
498
458
|
return -1;
|
|
499
|
-
} else if (
|
|
459
|
+
} else if (itemASelected < itemBSelected) {
|
|
500
460
|
return 1;
|
|
501
461
|
}
|
|
502
462
|
}
|
|
503
463
|
return 0;
|
|
504
464
|
});
|
|
505
465
|
}, [onClose, onSelectedChange, items, selected, isItemCurrentlySelected, isSingleSelectModal, intermediateSelected, shouldOrderSelectedFirst, selectedOnSort]);
|
|
506
|
-
|
|
507
|
-
|
|
508
|
-
|
|
509
|
-
useEffect(() => {
|
|
510
|
-
if (prevItemsRef.current !== items) {
|
|
511
|
-
if (prevItemsRef.current.length === 0 && items.length > 0) {
|
|
512
|
-
resetSort();
|
|
513
|
-
}
|
|
514
|
-
prevItemsRef.current = items;
|
|
515
|
-
}
|
|
516
|
-
}, [items, resetSort]);
|
|
517
|
-
|
|
518
|
-
// Reset sort when panel opens
|
|
519
|
-
const prevOpenRef = useRef(open);
|
|
520
|
-
useEffect(() => {
|
|
521
|
-
if (prevOpenRef.current !== open) {
|
|
466
|
+
if (prevItems !== items) {
|
|
467
|
+
setPrevItems(items);
|
|
468
|
+
if (prevItems.length === 0 && items.length > 0) {
|
|
522
469
|
resetSort();
|
|
523
|
-
prevOpenRef.current = open;
|
|
524
470
|
}
|
|
525
|
-
}
|
|
471
|
+
}
|
|
472
|
+
if (open !== prevOpen) {
|
|
473
|
+
setPrevOpen(open);
|
|
474
|
+
resetSort();
|
|
475
|
+
}
|
|
526
476
|
const focusTrapSettings = {
|
|
527
477
|
initialFocusRef: inputRef || undefined
|
|
528
478
|
};
|
|
@@ -5,6 +5,20 @@ export declare function useRovingTabIndex({ containerRef, mouseDownRef, }: {
|
|
|
5
5
|
}): void;
|
|
6
6
|
export declare function getNextFocusableElement(activeElement: HTMLElement, event: KeyboardEvent): HTMLElement | undefined;
|
|
7
7
|
export declare function getElementState(element: HTMLElement): 'open' | 'closed' | 'end';
|
|
8
|
+
/**
|
|
9
|
+
* Find the next or previous visible treeitem using direct DOM traversal.
|
|
10
|
+
*
|
|
11
|
+
* PERFORMANCE: This is O(tree depth) instead of O(n) because it walks
|
|
12
|
+
* siblings and parent/child edges directly, rather than creating a TreeWalker
|
|
13
|
+
* that scans from the root to find the current element on every keystroke.
|
|
14
|
+
*
|
|
15
|
+
* NOTE: This relies on TreeView.SubTree unmounting its children when collapsed
|
|
16
|
+
* (returning null when !isExpanded). Because collapsed subtree children are
|
|
17
|
+
* never in the DOM, we can safely skip them by only entering children of nodes
|
|
18
|
+
* with aria-expanded="true". If SubTree ever changes to keep collapsed children
|
|
19
|
+
* mounted (e.g. via CSS display:none), this logic would need to add filtering
|
|
20
|
+
* for items inside collapsed parents.
|
|
21
|
+
*/
|
|
8
22
|
export declare function getVisibleElement(element: HTMLElement, direction: 'next' | 'previous'): HTMLElement | undefined;
|
|
9
23
|
export declare function getFirstChildElement(element: HTMLElement): HTMLElement | undefined;
|
|
10
24
|
export declare function getParentElement(element: HTMLElement): HTMLElement | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRovingTabIndex.d.ts","sourceRoot":"","sources":["../../src/TreeView/useRovingTabIndex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,wBAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,YAAY,GACb,EAAE;IACD,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAC1C,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;CACvC,QAwDA;AAID,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,GAAG,WAAW,GAAG,SAAS,CAyDjH;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAa/E;AAED,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"useRovingTabIndex.d.ts","sourceRoot":"","sources":["../../src/TreeView/useRovingTabIndex.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAI9B,wBAAgB,iBAAiB,CAAC,EAChC,YAAY,EACZ,YAAY,GACb,EAAE;IACD,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,WAAW,CAAC,CAAA;IAC1C,YAAY,EAAE,KAAK,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;CACvC,QAwDA;AAID,wBAAgB,uBAAuB,CAAC,aAAa,EAAE,WAAW,EAAE,KAAK,EAAE,aAAa,GAAG,WAAW,GAAG,SAAS,CAyDjH;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,MAAM,GAAG,QAAQ,GAAG,KAAK,CAa/E;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,GAAG,UAAU,GAAG,WAAW,GAAG,SAAS,CAK/G;AAsFD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,CAGlF;AAED,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,CAI9E;AAED,wBAAgB,eAAe,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,CAI7E;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,WAAW,GAAG,WAAW,GAAG,SAAS,CAuB5E"}
|
|
@@ -123,25 +123,103 @@ function getElementState(element) {
|
|
|
123
123
|
return 'end';
|
|
124
124
|
}
|
|
125
125
|
}
|
|
126
|
+
|
|
127
|
+
/**
|
|
128
|
+
* Find the next or previous visible treeitem using direct DOM traversal.
|
|
129
|
+
*
|
|
130
|
+
* PERFORMANCE: This is O(tree depth) instead of O(n) because it walks
|
|
131
|
+
* siblings and parent/child edges directly, rather than creating a TreeWalker
|
|
132
|
+
* that scans from the root to find the current element on every keystroke.
|
|
133
|
+
*
|
|
134
|
+
* NOTE: This relies on TreeView.SubTree unmounting its children when collapsed
|
|
135
|
+
* (returning null when !isExpanded). Because collapsed subtree children are
|
|
136
|
+
* never in the DOM, we can safely skip them by only entering children of nodes
|
|
137
|
+
* with aria-expanded="true". If SubTree ever changes to keep collapsed children
|
|
138
|
+
* mounted (e.g. via CSS display:none), this logic would need to add filtering
|
|
139
|
+
* for items inside collapsed parents.
|
|
140
|
+
*/
|
|
126
141
|
function getVisibleElement(element, direction) {
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
142
|
+
if (direction === 'next') {
|
|
143
|
+
return getNextVisibleElement(element);
|
|
144
|
+
}
|
|
145
|
+
return getPreviousVisibleElement(element);
|
|
146
|
+
}
|
|
147
|
+
function getNextVisibleElement(element) {
|
|
148
|
+
// If the current item is expanded, the next visible item is its first child
|
|
149
|
+
if (element.getAttribute('aria-expanded') === 'true') {
|
|
150
|
+
const firstChild = getFirstChildElement(element);
|
|
151
|
+
if (firstChild) return firstChild;
|
|
152
|
+
}
|
|
153
|
+
|
|
154
|
+
// Otherwise, walk up the tree looking for a next sibling
|
|
155
|
+
let current = element;
|
|
156
|
+
while (current) {
|
|
157
|
+
const next = getNextSiblingTreeItem(current);
|
|
158
|
+
if (next) return next;
|
|
138
159
|
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
160
|
+
// No next sibling at this level, try the parent's next sibling
|
|
161
|
+
current = getParentElement(current);
|
|
162
|
+
}
|
|
163
|
+
return undefined;
|
|
164
|
+
}
|
|
165
|
+
function getPreviousVisibleElement(element) {
|
|
166
|
+
const prev = getPreviousSiblingTreeItem(element);
|
|
167
|
+
if (prev) {
|
|
168
|
+
// Navigate to the deepest last visible descendant of the previous sibling
|
|
169
|
+
return getDeepestLastDescendant(prev);
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
// No previous sibling, the parent is the previous visible element
|
|
173
|
+
return getParentElement(element);
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/**
|
|
177
|
+
* Walk into expanded subtrees to find the deepest last visible descendant.
|
|
178
|
+
* For example, if the last sibling is an expanded directory whose last child
|
|
179
|
+
* is also an expanded directory, we drill all the way down.
|
|
180
|
+
*/
|
|
181
|
+
function getDeepestLastDescendant(element) {
|
|
182
|
+
let current = element;
|
|
183
|
+
while (current.getAttribute('aria-expanded') === 'true') {
|
|
184
|
+
const lastChild = getLastChildTreeItem(current);
|
|
185
|
+
if (!lastChild) break;
|
|
186
|
+
current = lastChild;
|
|
187
|
+
}
|
|
188
|
+
return current;
|
|
189
|
+
}
|
|
190
|
+
function getNextSiblingTreeItem(element) {
|
|
191
|
+
let sibling = element.nextElementSibling;
|
|
192
|
+
while (sibling) {
|
|
193
|
+
if (sibling instanceof HTMLElement && sibling.getAttribute('role') === 'treeitem') {
|
|
194
|
+
return sibling;
|
|
195
|
+
}
|
|
196
|
+
sibling = sibling.nextElementSibling;
|
|
197
|
+
}
|
|
198
|
+
return undefined;
|
|
199
|
+
}
|
|
200
|
+
function getPreviousSiblingTreeItem(element) {
|
|
201
|
+
let sibling = element.previousElementSibling;
|
|
202
|
+
while (sibling) {
|
|
203
|
+
if (sibling instanceof HTMLElement && sibling.getAttribute('role') === 'treeitem') {
|
|
204
|
+
return sibling;
|
|
205
|
+
}
|
|
206
|
+
sibling = sibling.previousElementSibling;
|
|
207
|
+
}
|
|
208
|
+
return undefined;
|
|
209
|
+
}
|
|
210
|
+
function getLastChildTreeItem(element) {
|
|
211
|
+
// Find the [role=group] child (the subtree container), then get its last treeitem
|
|
212
|
+
for (let i = element.children.length - 1; i >= 0; i--) {
|
|
213
|
+
const child = element.children[i];
|
|
214
|
+
if (child instanceof HTMLElement && child.getAttribute('role') === 'group') {
|
|
215
|
+
let lastChild = child.lastElementChild;
|
|
216
|
+
while (lastChild && !(lastChild instanceof HTMLElement && lastChild.getAttribute('role') === 'treeitem')) {
|
|
217
|
+
lastChild = lastChild.previousElementSibling;
|
|
218
|
+
}
|
|
219
|
+
return lastChild instanceof HTMLElement ? lastChild : undefined;
|
|
220
|
+
}
|
|
143
221
|
}
|
|
144
|
-
return
|
|
222
|
+
return undefined;
|
|
145
223
|
}
|
|
146
224
|
function getFirstChildElement(element) {
|
|
147
225
|
const firstChild = element.querySelector('[role=treeitem]');
|
|
@@ -1,21 +1,58 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { c } from 'react-compiler-runtime';
|
|
2
|
+
import { forwardRef, useRef, useContext } from 'react';
|
|
2
3
|
import { UnderlineNavContext } from './UnderlineNavContext.js';
|
|
3
4
|
import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
|
|
4
5
|
import { UnderlineItem } from '../internal/components/UnderlineTabbedInterface.js';
|
|
5
6
|
import classes from './UnderlineNavItem.module.css.js';
|
|
6
7
|
import { jsx } from 'react/jsx-runtime';
|
|
7
8
|
|
|
8
|
-
const UnderlineNavItem = /*#__PURE__*/forwardRef(({
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
9
|
+
const UnderlineNavItem = /*#__PURE__*/forwardRef((t0, forwardedRef) => {
|
|
10
|
+
var _leadingVisual;
|
|
11
|
+
const $ = c(32);
|
|
12
|
+
let Icon;
|
|
13
|
+
let ariaCurrent;
|
|
14
|
+
let children;
|
|
15
|
+
let counter;
|
|
16
|
+
let leadingVisual;
|
|
17
|
+
let onSelect;
|
|
18
|
+
let props;
|
|
19
|
+
let t1;
|
|
20
|
+
let t2;
|
|
21
|
+
if ($[0] !== t0) {
|
|
22
|
+
({
|
|
23
|
+
as: t1,
|
|
24
|
+
href: t2,
|
|
25
|
+
children,
|
|
26
|
+
counter,
|
|
27
|
+
onSelect,
|
|
28
|
+
"aria-current": ariaCurrent,
|
|
29
|
+
icon: Icon,
|
|
30
|
+
leadingVisual,
|
|
31
|
+
...props
|
|
32
|
+
} = t0);
|
|
33
|
+
$[0] = t0;
|
|
34
|
+
$[1] = Icon;
|
|
35
|
+
$[2] = ariaCurrent;
|
|
36
|
+
$[3] = children;
|
|
37
|
+
$[4] = counter;
|
|
38
|
+
$[5] = leadingVisual;
|
|
39
|
+
$[6] = onSelect;
|
|
40
|
+
$[7] = props;
|
|
41
|
+
$[8] = t1;
|
|
42
|
+
$[9] = t2;
|
|
43
|
+
} else {
|
|
44
|
+
Icon = $[1];
|
|
45
|
+
ariaCurrent = $[2];
|
|
46
|
+
children = $[3];
|
|
47
|
+
counter = $[4];
|
|
48
|
+
leadingVisual = $[5];
|
|
49
|
+
onSelect = $[6];
|
|
50
|
+
props = $[7];
|
|
51
|
+
t1 = $[8];
|
|
52
|
+
t2 = $[9];
|
|
53
|
+
}
|
|
54
|
+
const Component = t1 === undefined ? "a" : t1;
|
|
55
|
+
const href = t2 === undefined ? "#" : t2;
|
|
19
56
|
const backupRef = useRef(null);
|
|
20
57
|
const ref = forwardedRef !== null && forwardedRef !== void 0 ? forwardedRef : backupRef;
|
|
21
58
|
const {
|
|
@@ -24,51 +61,107 @@ const UnderlineNavItem = /*#__PURE__*/forwardRef(({
|
|
|
24
61
|
loadingCounters,
|
|
25
62
|
iconsVisible
|
|
26
63
|
} = useContext(UnderlineNavContext);
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
text
|
|
36
|
-
width:
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
}
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
64
|
+
let t3;
|
|
65
|
+
let t4;
|
|
66
|
+
if ($[10] !== ref || $[11] !== setChildrenWidth || $[12] !== setNoIconChildrenWidth) {
|
|
67
|
+
t3 = () => {
|
|
68
|
+
if (ref.current) {
|
|
69
|
+
const domRect = ref.current.getBoundingClientRect();
|
|
70
|
+
const icon = Array.from(ref.current.children).find(_temp);
|
|
71
|
+
const content = Array.from(ref.current.children).find(_temp2);
|
|
72
|
+
const text = content.textContent;
|
|
73
|
+
const iconWidthWithMargin = icon ? icon.getBoundingClientRect().width + Number(getComputedStyle(icon).marginRight.slice(0, -2)) + Number(getComputedStyle(icon).marginLeft.slice(0, -2)) : 0;
|
|
74
|
+
setChildrenWidth({
|
|
75
|
+
text,
|
|
76
|
+
width: domRect.width
|
|
77
|
+
});
|
|
78
|
+
setNoIconChildrenWidth({
|
|
79
|
+
text,
|
|
80
|
+
width: domRect.width - iconWidthWithMargin
|
|
81
|
+
});
|
|
82
|
+
}
|
|
83
|
+
};
|
|
84
|
+
t4 = [ref, setChildrenWidth, setNoIconChildrenWidth];
|
|
85
|
+
$[10] = ref;
|
|
86
|
+
$[11] = setChildrenWidth;
|
|
87
|
+
$[12] = setNoIconChildrenWidth;
|
|
88
|
+
$[13] = t3;
|
|
89
|
+
$[14] = t4;
|
|
90
|
+
} else {
|
|
91
|
+
t3 = $[13];
|
|
92
|
+
t4 = $[14];
|
|
93
|
+
}
|
|
94
|
+
useIsomorphicLayoutEffect(t3, t4);
|
|
95
|
+
let t5;
|
|
96
|
+
if ($[15] !== onSelect) {
|
|
97
|
+
t5 = event => {
|
|
98
|
+
if ((event.key === " " || event.key === "Enter") && !event.defaultPrevented && typeof onSelect === "function") {
|
|
99
|
+
onSelect(event);
|
|
100
|
+
}
|
|
101
|
+
};
|
|
102
|
+
$[15] = onSelect;
|
|
103
|
+
$[16] = t5;
|
|
104
|
+
} else {
|
|
105
|
+
t5 = $[16];
|
|
106
|
+
}
|
|
107
|
+
const keyDownHandler = t5;
|
|
108
|
+
let t6;
|
|
109
|
+
if ($[17] !== onSelect) {
|
|
110
|
+
t6 = event_0 => {
|
|
111
|
+
if (!event_0.defaultPrevented && typeof onSelect === "function") {
|
|
112
|
+
onSelect(event_0);
|
|
113
|
+
}
|
|
114
|
+
};
|
|
115
|
+
$[17] = onSelect;
|
|
116
|
+
$[18] = t6;
|
|
117
|
+
} else {
|
|
118
|
+
t6 = $[18];
|
|
119
|
+
}
|
|
120
|
+
const clickHandler = t6;
|
|
121
|
+
const t7 = (_leadingVisual = leadingVisual) !== null && _leadingVisual !== void 0 ? _leadingVisual : Icon;
|
|
122
|
+
let t8;
|
|
123
|
+
if ($[19] !== Component || $[20] !== ariaCurrent || $[21] !== children || $[22] !== clickHandler || $[23] !== counter || $[24] !== href || $[25] !== iconsVisible || $[26] !== keyDownHandler || $[27] !== loadingCounters || $[28] !== props || $[29] !== ref || $[30] !== t7) {
|
|
124
|
+
t8 = /*#__PURE__*/jsx("li", {
|
|
125
|
+
className: classes.UnderlineNavItem,
|
|
126
|
+
children: /*#__PURE__*/jsx(UnderlineItem, {
|
|
127
|
+
ref: ref,
|
|
128
|
+
as: Component,
|
|
129
|
+
href: href,
|
|
130
|
+
"aria-current": ariaCurrent,
|
|
131
|
+
onKeyDown: keyDownHandler,
|
|
132
|
+
onClick: clickHandler,
|
|
133
|
+
counter: counter,
|
|
134
|
+
icon: t7,
|
|
135
|
+
loadingCounters: loadingCounters,
|
|
136
|
+
iconsVisible: iconsVisible,
|
|
137
|
+
...props,
|
|
138
|
+
children: children
|
|
139
|
+
})
|
|
140
|
+
});
|
|
141
|
+
$[19] = Component;
|
|
142
|
+
$[20] = ariaCurrent;
|
|
143
|
+
$[21] = children;
|
|
144
|
+
$[22] = clickHandler;
|
|
145
|
+
$[23] = counter;
|
|
146
|
+
$[24] = href;
|
|
147
|
+
$[25] = iconsVisible;
|
|
148
|
+
$[26] = keyDownHandler;
|
|
149
|
+
$[27] = loadingCounters;
|
|
150
|
+
$[28] = props;
|
|
151
|
+
$[29] = ref;
|
|
152
|
+
$[30] = t7;
|
|
153
|
+
$[31] = t8;
|
|
154
|
+
} else {
|
|
155
|
+
t8 = $[31];
|
|
156
|
+
}
|
|
157
|
+
return t8;
|
|
71
158
|
});
|
|
72
159
|
UnderlineNavItem.displayName = 'UnderlineNavItem';
|
|
160
|
+
function _temp(child) {
|
|
161
|
+
return child.getAttribute("data-component") === "icon";
|
|
162
|
+
}
|
|
163
|
+
function _temp2(child_0) {
|
|
164
|
+
return child_0.getAttribute("data-component") === "text";
|
|
165
|
+
}
|
|
73
166
|
|
|
74
167
|
export { UnderlineNavItem };
|