@primer/react 0.0.0-20260528165452 → 0.0.0-20260528170817
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 +9 -13
- package/dist/AnchoredOverlay/AnchoredOverlay.d.ts.map +1 -1
- package/dist/AnchoredOverlay/AnchoredOverlay.js +1 -1
- package/dist/UnderlineNav/UnderlineNav.d.ts +2 -0
- package/dist/UnderlineNav/UnderlineNav.d.ts.map +1 -1
- package/dist/UnderlineNav/UnderlineNav.js +123 -263
- package/dist/UnderlineNav/UnderlineNavContext.d.ts +10 -1
- package/dist/UnderlineNav/UnderlineNavContext.d.ts.map +1 -1
- package/dist/UnderlineNav/UnderlineNavContext.js +2 -0
- package/dist/UnderlineNav/UnderlineNavItem.d.ts +1 -3
- package/dist/UnderlineNav/UnderlineNavItem.d.ts.map +1 -1
- package/dist/UnderlineNav/UnderlineNavItem.js +22 -7
- package/dist/UnderlineNav/types.d.ts +5 -1
- package/dist/UnderlineNav/types.d.ts.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,12 @@
|
|
|
1
1
|
# @primer/react
|
|
2
2
|
|
|
3
|
-
## 0.0.0-
|
|
3
|
+
## 0.0.0-20260528170817
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Fake entry to force publishing
|
|
8
|
+
|
|
9
|
+
## 38.26.0
|
|
4
10
|
|
|
5
11
|
### Minor Changes
|
|
6
12
|
|
|
@@ -36,19 +42,9 @@
|
|
|
36
42
|
`src/utils/testing/profiler.tsx` so future regressions can be pinned with
|
|
37
43
|
`counter.updateCount` and `counter.nestedUpdateCount` assertions.
|
|
38
44
|
|
|
39
|
-
- [#
|
|
40
|
-
|
|
41
|
-
- Fake entry to force publishing
|
|
45
|
+
- [#7892](https://github.com/primer/react/pull/7892) [`4dd08af`](https://github.com/primer/react/commit/4dd08af9e4942962ebb253050b1807c13382dc76) Thanks [@TylerJDev](https://github.com/TylerJDev)! - AnchoredOverlay: Disable CSS anchor positioning if related CSS rules are not supported
|
|
42
46
|
|
|
43
|
-
- [#
|
|
44
|
-
mount. Each `UnderlineNav.Item` no longer dispatches measurement setState calls
|
|
45
|
-
back into its parent via context; `UnderlineNav` now walks its rendered items
|
|
46
|
-
in a single layout effect and stores widths in refs. Overflow state is
|
|
47
|
-
consolidated into one `useState` object (one commit per change), the context
|
|
48
|
-
value is memoized, `UnderlineNav.Item` is wrapped in `React.memo`, and the
|
|
49
|
-
external-`aria-current` swap was moved out of render-phase setState into a
|
|
50
|
-
layout effect. Behavior is unchanged for consumers, but the initial mount and
|
|
51
|
-
overflow-state transitions produce far fewer per-item renders.
|
|
47
|
+
- [#7878](https://github.com/primer/react/pull/7878) [`8c468fd`](https://github.com/primer/react/commit/8c468fd28322456f48601f9cbf6226fc4c35b661) Thanks [@mattcosta7](https://github.com/mattcosta7)! - FilteredActionList: Guard against `undefined` items in the virtualizer's `getItemKey` callback to prevent a crash when `@tanstack/react-virtual` invokes it with an index whose item was just removed (e.g. when filtering shrinks the items list).
|
|
52
48
|
|
|
53
49
|
- [#7876](https://github.com/primer/react/pull/7876) [`980e94c`](https://github.com/primer/react/commit/980e94cc1de7807bb2b3fc4dd006ea8dbf3e8303) Thanks [@mattcosta7](https://github.com/mattcosta7)! - UnderlinePanels: Eliminate the empty-tablist frame on mount and the cascading
|
|
54
50
|
re-render when icons toggle. Tabs and panels are now derived in render
|
|
@@ -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":"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"}
|
|
@@ -53,7 +53,7 @@ const AnchoredOverlay = ({
|
|
|
53
53
|
const cssAnchorPositioningFlag = useFeatureFlag('primer_react_css_anchor_positioning');
|
|
54
54
|
// Lazy initial state so feature detection runs once per mount on the client.
|
|
55
55
|
// Guarded for SSR where `document` is undefined.
|
|
56
|
-
const [supportsNativeCSSAnchorPositioning] = useState(() => typeof document !== 'undefined' && 'anchorName' in document.documentElement.style);
|
|
56
|
+
const [supportsNativeCSSAnchorPositioning] = useState(() => typeof document !== 'undefined' && 'anchorName' in document.documentElement.style && 'positionTryFallbacks' in document.documentElement.style && 'positionVisibility' in document.documentElement.style);
|
|
57
57
|
const cssAnchorPositioning = cssAnchorPositioningFlag && supportsNativeCSSAnchorPositioning && !(overlayProps !== null && overlayProps !== void 0 && overlayProps.portalContainerName);
|
|
58
58
|
// Only use Popover API when both CSS anchor positioning is enabled AND renderAs is true
|
|
59
59
|
const shouldRenderAsPopover = cssAnchorPositioning && renderAs === 'popover';
|
|
@@ -15,5 +15,7 @@ export type UnderlineNavProps = {
|
|
|
15
15
|
*/
|
|
16
16
|
variant?: 'inset' | 'flush';
|
|
17
17
|
};
|
|
18
|
+
export declare const MORE_BTN_WIDTH = 86;
|
|
19
|
+
export declare const getValidChildren: (children: React.ReactNode) => React.ReactElement<any>[];
|
|
18
20
|
export declare const UnderlineNav: React.ForwardRefExoticComponent<UnderlineNavProps & React.RefAttributes<unknown>>;
|
|
19
21
|
//# sourceMappingURL=UnderlineNav.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnderlineNav.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNav.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"UnderlineNav.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNav.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAA;AAoBtE,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;AAwEhC,eAAO,MAAM,gBAAgB,GAAI,UAAU,KAAK,CAAC,SAAS,KAEgC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,EAChH,CAAA;AAgCD,eAAO,MAAM,YAAY,mFA0SxB,CAAA"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import React, { forwardRef, useRef, useState, useCallback
|
|
1
|
+
import React, { forwardRef, useRef, useState, useCallback } from 'react';
|
|
2
2
|
import { useDevOnlyEffect } from '../internal/hooks/useDevOnlyEffect.js';
|
|
3
3
|
import { UnderlineNavContext } from './UnderlineNavContext.js';
|
|
4
4
|
import { useResizeObserver } from '../hooks/useResizeObserver.js';
|
|
5
|
-
import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
|
|
6
5
|
import VisuallyHidden from '../_VisuallyHidden.js';
|
|
7
|
-
import {
|
|
6
|
+
import { dividerStyles, baseMenuMinWidth, menuItemStyles } from './styles.js';
|
|
8
7
|
import { UnderlineWrapper, UnderlineItemList, LoadingCounter, GAP } from '../internal/components/UnderlineTabbedInterface.js';
|
|
9
8
|
import { TriangleDownIcon } from '@primer/octicons-react';
|
|
10
9
|
import { useOnEscapePress } from '../hooks/useOnEscapePress.js';
|
|
@@ -23,19 +22,19 @@ import CounterLabel from '../CounterLabel/CounterLabel.js';
|
|
|
23
22
|
const MORE_BTN_WIDTH = 86;
|
|
24
23
|
// The height is needed to make sure we don't have a layout shift when the more button is the only item in the nav.
|
|
25
24
|
const MORE_BTN_HEIGHT = 45;
|
|
26
|
-
const
|
|
25
|
+
const overflowEffect = (navWidth, moreMenuWidth, childArray, childWidthArray, noIconChildWidthArray, updateListAndMenu) => {
|
|
27
26
|
let iconsVisible = true;
|
|
28
|
-
if (
|
|
29
|
-
|
|
27
|
+
if (childWidthArray.length === 0) {
|
|
28
|
+
updateListAndMenu({
|
|
30
29
|
items: childArray,
|
|
31
|
-
menuItems: []
|
|
32
|
-
|
|
33
|
-
|
|
30
|
+
menuItems: []
|
|
31
|
+
}, iconsVisible, false);
|
|
32
|
+
return;
|
|
34
33
|
}
|
|
35
|
-
const numberOfItemsPossible = calculatePossibleItems(
|
|
36
|
-
const numberOfItemsWithoutIconPossible = calculatePossibleItems(
|
|
34
|
+
const numberOfItemsPossible = calculatePossibleItems(childWidthArray, navWidth);
|
|
35
|
+
const numberOfItemsWithoutIconPossible = calculatePossibleItems(noIconChildWidthArray, navWidth);
|
|
37
36
|
// We need to take more menu width into account when calculating the number of items possible
|
|
38
|
-
const numberOfItemsPossibleWithMoreMenu = calculatePossibleItems(
|
|
37
|
+
const numberOfItemsPossibleWithMoreMenu = calculatePossibleItems(noIconChildWidthArray, navWidth, moreMenuWidth || MORE_BTN_WIDTH);
|
|
39
38
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
40
39
|
const items = [];
|
|
41
40
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
@@ -78,27 +77,26 @@ const computeOverflow = (navWidth, moreMenuWidth, childArray, childWidths, noIco
|
|
|
78
77
|
}
|
|
79
78
|
}
|
|
80
79
|
}
|
|
81
|
-
|
|
80
|
+
updateListAndMenu({
|
|
82
81
|
items,
|
|
83
|
-
menuItems
|
|
84
|
-
|
|
85
|
-
};
|
|
82
|
+
menuItems
|
|
83
|
+
}, iconsVisible, true);
|
|
86
84
|
};
|
|
87
85
|
const getValidChildren = children => {
|
|
88
86
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
89
87
|
return React.Children.toArray(children).filter(child => /*#__PURE__*/React.isValidElement(child));
|
|
90
88
|
};
|
|
91
|
-
const calculatePossibleItems = (
|
|
89
|
+
const calculatePossibleItems = (childWidthArray, navWidth, moreMenuWidth = 0) => {
|
|
92
90
|
const widthToFit = navWidth - moreMenuWidth;
|
|
93
|
-
let breakpoint =
|
|
91
|
+
let breakpoint = childWidthArray.length; // assume all items will fit
|
|
94
92
|
let sumsOfChildWidth = 0;
|
|
95
|
-
for (const [index,
|
|
96
|
-
|
|
97
|
-
const width = (_widthMap$get = widthMap.get(String(child.key))) !== null && _widthMap$get !== void 0 ? _widthMap$get : 0;
|
|
98
|
-
sumsOfChildWidth = sumsOfChildWidth + width + GAP;
|
|
93
|
+
for (const [index, childWidth] of childWidthArray.entries()) {
|
|
94
|
+
sumsOfChildWidth = sumsOfChildWidth + childWidth.width + GAP;
|
|
99
95
|
if (sumsOfChildWidth > widthToFit) {
|
|
100
96
|
breakpoint = index;
|
|
101
97
|
break;
|
|
98
|
+
} else {
|
|
99
|
+
continue;
|
|
102
100
|
}
|
|
103
101
|
}
|
|
104
102
|
return breakpoint;
|
|
@@ -125,6 +123,7 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
125
123
|
className,
|
|
126
124
|
children
|
|
127
125
|
}, forwardedRef) => {
|
|
126
|
+
var _listRef$current2;
|
|
128
127
|
const backupRef = useRef(null);
|
|
129
128
|
const navRef = forwardedRef !== null && forwardedRef !== void 0 ? forwardedRef : backupRef;
|
|
130
129
|
const listRef = useRef(null);
|
|
@@ -133,70 +132,32 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
133
132
|
const containerRef = React.useRef(null);
|
|
134
133
|
const disclosureWidgetId = useId();
|
|
135
134
|
const [isWidgetOpen, setIsWidgetOpen] = useState(false);
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
140
|
-
const
|
|
135
|
+
const [iconsVisible, setIconsVisible] = useState(true);
|
|
136
|
+
const [childWidthArray, setChildWidthArray] = useState([]);
|
|
137
|
+
const [noIconChildWidthArray, setNoIconChildWidthArray] = useState([]);
|
|
138
|
+
// Track whether the initial overflow calculation is complete to prevent CLS
|
|
139
|
+
const [isOverflowMeasured, setIsOverflowMeasured] = useState(false);
|
|
141
140
|
const validChildren = getValidChildren(children);
|
|
142
|
-
// Stable signature of the children list — when it changes we re-run the
|
|
143
|
-
// measurement pass with all items rendered (with icons) in the list. The
|
|
144
|
-
// delimiter is U+0000 (NUL) because React rejects NUL inside element keys,
|
|
145
|
-
// so consumer-provided keys cannot collide with the separator.
|
|
146
|
-
const childrenKey = validChildren.map(c => String(c.key)).join('\u0000');
|
|
147
|
-
|
|
148
|
-
// Single consolidated overflow state. Bundling `items`, `menuItems`,
|
|
149
|
-
// `iconsVisible`, `measured`, and `childrenKey` together means every
|
|
150
|
-
// overflow update — measurement, swap, resize, or children-change reset —
|
|
151
|
-
// is exactly one setState call (one commit), instead of fanning out to
|
|
152
|
-
// multiple back-to-back commits.
|
|
153
141
|
|
|
154
|
-
|
|
142
|
+
// Responsive props object manages which items are in the list and which items are in the menu.
|
|
143
|
+
const [responsiveProps, setResponsiveProps] = useState({
|
|
155
144
|
items: validChildren,
|
|
156
|
-
menuItems: []
|
|
157
|
-
|
|
158
|
-
measured: false,
|
|
159
|
-
childrenKey
|
|
160
|
-
}));
|
|
161
|
-
|
|
162
|
-
// Derived-state reset: when the children list changes, push everything back into
|
|
163
|
-
// the list (with icons) so the next layout effect can measure all items in one
|
|
164
|
-
// pass. This is React's recommended "store information from previous renders"
|
|
165
|
-
// pattern — calling setState during render lets React discard the in-progress
|
|
166
|
-
// render and re-render immediately with the reset state, before paint.
|
|
167
|
-
if (overflowState.childrenKey !== childrenKey) {
|
|
168
|
-
setOverflowState({
|
|
169
|
-
items: validChildren,
|
|
170
|
-
menuItems: [],
|
|
171
|
-
iconsVisible: true,
|
|
172
|
-
measured: false,
|
|
173
|
-
childrenKey
|
|
174
|
-
});
|
|
175
|
-
}
|
|
176
|
-
|
|
177
|
-
// Build a key-indexed view of validChildren once per render so the listItems /
|
|
178
|
-
// menuItems prop-refresh below is O(N) instead of O(N^2) via Array.prototype.find.
|
|
179
|
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
180
|
-
const validChildrenByKey = new Map();
|
|
181
|
-
for (const c of validChildren) validChildrenByKey.set(String(c.key), c);
|
|
182
|
-
const {
|
|
183
|
-
iconsVisible,
|
|
184
|
-
measured: isOverflowMeasured
|
|
185
|
-
} = overflowState;
|
|
145
|
+
menuItems: []
|
|
146
|
+
});
|
|
186
147
|
|
|
187
148
|
// Make sure to have the fresh props data for list items when children are changed (keeping aria-current up-to-date)
|
|
188
|
-
const listItems =
|
|
189
|
-
var
|
|
190
|
-
return (
|
|
149
|
+
const listItems = responsiveProps.items.map(item => {
|
|
150
|
+
var _validChildren$find;
|
|
151
|
+
return (_validChildren$find = validChildren.find(child => child.key === item.key)) !== null && _validChildren$find !== void 0 ? _validChildren$find : item;
|
|
191
152
|
});
|
|
192
153
|
|
|
193
154
|
// Make sure to have the fresh props data for menu items when children are changed (keeping aria-current up-to-date)
|
|
194
|
-
const menuItems =
|
|
195
|
-
var
|
|
196
|
-
return (
|
|
155
|
+
const menuItems = responsiveProps.menuItems.map(menuItem => {
|
|
156
|
+
var _validChildren$find2;
|
|
157
|
+
return (_validChildren$find2 = validChildren.find(child => child.key === menuItem.key)) !== null && _validChildren$find2 !== void 0 ? _validChildren$find2 : menuItem;
|
|
197
158
|
});
|
|
198
159
|
// 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
|
|
199
|
-
const onlyMenuVisible =
|
|
160
|
+
const onlyMenuVisible = responsiveProps.items.length === 0;
|
|
200
161
|
useDevOnlyEffect(() => {
|
|
201
162
|
// Address illegal state where there are multiple items that have `aria-current='page'` attribute
|
|
202
163
|
const activeElements = validChildren.filter(child => {
|
|
@@ -205,145 +166,66 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
205
166
|
!(activeElements.length <= 1) ? process.env.NODE_ENV !== "production" ? invariant(false, 'Only one current element is allowed') : invariant(false) : void 0;
|
|
206
167
|
!ariaLabel ? process.env.NODE_ENV !== "production" ? invariant(false, 'Use the `aria-label` prop to provide an accessible label for assistive technology') : invariant(false) : void 0;
|
|
207
168
|
}, [validChildren, ariaLabel]);
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
const getItemNoIconWidth = item => {
|
|
214
|
-
var _noIconChildWidthsRef;
|
|
215
|
-
return (_noIconChildWidthsRef = noIconChildWidthsRef.current.get(String(item.key))) !== null && _noIconChildWidthsRef !== void 0 ? _noIconChildWidthsRef : 0;
|
|
216
|
-
};
|
|
217
|
-
|
|
218
|
-
// Pure: returns the {items, menuItems} that result from promoting
|
|
219
|
-
// `prospectiveListItem` (currently at position `indexOfProspectiveListItem`
|
|
220
|
-
// in `currentMenuItems`) into `currentItems`. Does not call setState.
|
|
221
|
-
const computeSwap = (currentItems, currentMenuItems, prospectiveListItem, indexOfProspectiveListItem) => {
|
|
169
|
+
function getItemsWidth(itemText) {
|
|
170
|
+
var _noIconChildWidthArra, _noIconChildWidthArra2;
|
|
171
|
+
return (_noIconChildWidthArra = (_noIconChildWidthArra2 = noIconChildWidthArray.find(item => item.text === itemText)) === null || _noIconChildWidthArra2 === void 0 ? void 0 : _noIconChildWidthArra2.width) !== null && _noIconChildWidthArra !== void 0 ? _noIconChildWidthArra : 0;
|
|
172
|
+
}
|
|
173
|
+
const swapMenuItemWithListItem = (prospectiveListItem, indexOfProspectiveListItem, event, callback) => {
|
|
222
174
|
var _navRef$current$getBo, _navRef$current, _listRef$current$getB, _listRef$current;
|
|
223
|
-
|
|
175
|
+
// get the selected menu item's width
|
|
176
|
+
const widthToFitIntoList = getItemsWidth(prospectiveListItem.props.children);
|
|
177
|
+
// Check if there is any empty space on the right side of the list
|
|
224
178
|
const availableSpace = ((_navRef$current$getBo = (_navRef$current = navRef.current) === null || _navRef$current === void 0 ? void 0 : _navRef$current.getBoundingClientRect().width) !== null && _navRef$current$getBo !== void 0 ? _navRef$current$getBo : 0) - ((_listRef$current$getB = (_listRef$current = listRef.current) === null || _listRef$current === void 0 ? void 0 : _listRef$current.getBoundingClientRect().width) !== null && _listRef$current$getB !== void 0 ? _listRef$current$getB : 0);
|
|
225
179
|
|
|
226
|
-
//
|
|
227
|
-
//
|
|
228
|
-
|
|
229
|
-
|
|
230
|
-
|
|
231
|
-
|
|
232
|
-
if (widthToFitIntoList < widthToSwap + availableSpace) {
|
|
233
|
-
breakpoint = index;
|
|
234
|
-
break;
|
|
235
|
-
}
|
|
236
|
-
}
|
|
237
|
-
const indexToSliceAt = currentItems.length - 1 - breakpoint;
|
|
238
|
-
const itemsLeftInList = currentItems.slice(0, indexToSliceAt);
|
|
180
|
+
// Calculate how many items need to be pulled in to the menu to make room for the selected menu item
|
|
181
|
+
// I.e. if we need to pull 2 items in (index 0 and index 1), breakpoint (index) will return 1.
|
|
182
|
+
const index = getBreakpointForItemSwapping(widthToFitIntoList, availableSpace);
|
|
183
|
+
const indexToSliceAt = responsiveProps.items.length - 1 - index;
|
|
184
|
+
// Form the new list of items
|
|
185
|
+
const itemsLeftInList = [...responsiveProps.items].slice(0, indexToSliceAt);
|
|
239
186
|
const updatedItemList = [...itemsLeftInList, prospectiveListItem];
|
|
240
|
-
|
|
241
|
-
const
|
|
187
|
+
// Form the new menu items
|
|
188
|
+
const itemsToAddToMenu = [...responsiveProps.items].slice(indexToSliceAt);
|
|
189
|
+
const updatedMenuItems = [...menuItems];
|
|
190
|
+
// Add itemsToAddToMenu array's items to the menu at the index of the prospectiveListItem and remove 1 count of items (prospectiveListItem)
|
|
242
191
|
updatedMenuItems.splice(indexOfProspectiveListItem, 1, ...itemsToAddToMenu);
|
|
243
|
-
|
|
192
|
+
callback({
|
|
244
193
|
items: updatedItemList,
|
|
245
194
|
menuItems: updatedMenuItems
|
|
246
|
-
};
|
|
195
|
+
}, false, true);
|
|
247
196
|
};
|
|
248
|
-
|
|
249
|
-
|
|
250
|
-
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
};
|
|
258
|
-
|
|
259
|
-
// Single combined layout effect that performs measurement (when needed) and
|
|
260
|
-
// the external-aria-current promotion (when needed), then commits at most
|
|
261
|
-
// one setOverflowState per pass. Replaces the previous two effects (each of
|
|
262
|
-
// which produced its own commit) and removes the render-phase setState that
|
|
263
|
-
// the original component used to do the same swap from inside menuItems.map.
|
|
264
|
-
//
|
|
265
|
-
// Why no deps array: the swap branch depends on `aria-current` which lives
|
|
266
|
-
// on item props (not on `overflowState`); a deps-driven effect would not
|
|
267
|
-
// notice prop-only changes without rebuilding a signature. The body
|
|
268
|
-
// short-circuits cheaply on every render where neither pass needs to run.
|
|
269
|
-
useIsomorphicLayoutEffect(() => {
|
|
270
|
-
var _next;
|
|
271
|
-
const listEl = listRef.current;
|
|
272
|
-
const navEl = navRef.current;
|
|
273
|
-
if (!listEl || !navEl) return;
|
|
274
|
-
let next = null;
|
|
275
|
-
|
|
276
|
-
// Pass 1: measurement (runs once after each remeasure trigger).
|
|
277
|
-
if (!isOverflowMeasured) {
|
|
278
|
-
var _moreMenuRef$current$, _moreMenuRef$current;
|
|
279
|
-
const widths = new Map();
|
|
280
|
-
const noIconWidths = new Map();
|
|
281
|
-
const itemEls = listEl.querySelectorAll('[data-underlinenav-item="true"]');
|
|
282
|
-
|
|
283
|
-
// The N-th [data-underlinenav-item] element corresponds to validChildren[N]
|
|
284
|
-
// because the measurement pass runs only when all items are in the list,
|
|
285
|
-
// in render order. Pair them up positionally so we can key widths by the
|
|
286
|
-
// element's React key.
|
|
287
|
-
const upToBoundary = Math.min(itemEls.length, validChildren.length);
|
|
288
|
-
for (let index = 0; index < upToBoundary; index++) {
|
|
289
|
-
const liEl = itemEls[index];
|
|
290
|
-
const linkEl = liEl.querySelector('a, button');
|
|
291
|
-
if (!linkEl) continue;
|
|
292
|
-
const child = validChildren[index];
|
|
293
|
-
const key = String(child.key);
|
|
294
|
-
const domRect = linkEl.getBoundingClientRect();
|
|
295
|
-
const iconEl = linkEl.querySelector('[data-component="icon"]');
|
|
296
|
-
let iconWidthWithMargin = 0;
|
|
297
|
-
if (iconEl) {
|
|
298
|
-
const style = getComputedStyle(iconEl);
|
|
299
|
-
iconWidthWithMargin = iconEl.getBoundingClientRect().width + (parseFloat(style.marginRight) || 0) + (parseFloat(style.marginLeft) || 0);
|
|
300
|
-
}
|
|
301
|
-
widths.set(key, domRect.width);
|
|
302
|
-
noIconWidths.set(key, domRect.width - iconWidthWithMargin);
|
|
197
|
+
// How many items do we need to pull in to the menu to make room for the selected menu item.
|
|
198
|
+
function getBreakpointForItemSwapping(widthToFitIntoList, availableSpace) {
|
|
199
|
+
let widthToSwap = 0;
|
|
200
|
+
let breakpoint = 0;
|
|
201
|
+
for (const [index, item] of [...responsiveProps.items].reverse().entries()) {
|
|
202
|
+
widthToSwap += getItemsWidth(item.props.children);
|
|
203
|
+
if (widthToFitIntoList < widthToSwap + availableSpace) {
|
|
204
|
+
breakpoint = index;
|
|
205
|
+
break;
|
|
303
206
|
}
|
|
304
|
-
childWidthsRef.current = widths;
|
|
305
|
-
noIconChildWidthsRef.current = noIconWidths;
|
|
306
|
-
const navWidth = navEl.getBoundingClientRect().width;
|
|
307
|
-
if (navWidth === 0) return;
|
|
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;
|
|
309
|
-
const result = computeOverflow(navWidth, moreMenuWidth, validChildren, widths, noIconWidths);
|
|
310
|
-
next = {
|
|
311
|
-
items: result.items,
|
|
312
|
-
menuItems: result.menuItems,
|
|
313
|
-
iconsVisible: result.iconsVisible,
|
|
314
|
-
measured: true,
|
|
315
|
-
childrenKey: overflowState.childrenKey
|
|
316
|
-
};
|
|
317
207
|
}
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
322
|
-
|
|
323
|
-
|
|
324
|
-
|
|
325
|
-
// O(N) and ran inside a .map() — quadratic on every commit).
|
|
326
|
-
const freshMenuItems = considered.menuItems.map(item => {
|
|
327
|
-
var _validChildrenByKey$g3;
|
|
328
|
-
return (_validChildrenByKey$g3 = validChildrenByKey.get(String(item.key))) !== null && _validChildrenByKey$g3 !== void 0 ? _validChildrenByKey$g3 : item;
|
|
329
|
-
});
|
|
330
|
-
const indexOfCurrent = freshMenuItems.findIndex(item => {
|
|
331
|
-
const c = item.props['aria-current'];
|
|
332
|
-
return Boolean(c) && c !== 'false';
|
|
333
|
-
});
|
|
334
|
-
if (indexOfCurrent !== -1) {
|
|
335
|
-
const swap = computeSwap(considered.items, freshMenuItems, freshMenuItems[indexOfCurrent], indexOfCurrent);
|
|
336
|
-
next = {
|
|
337
|
-
items: swap.items,
|
|
338
|
-
menuItems: swap.menuItems,
|
|
339
|
-
iconsVisible: false,
|
|
340
|
-
measured: true,
|
|
341
|
-
childrenKey: considered.childrenKey
|
|
342
|
-
};
|
|
343
|
-
}
|
|
208
|
+
return breakpoint;
|
|
209
|
+
}
|
|
210
|
+
const updateListAndMenu = useCallback((props, displayIcons, overflowMeasured) => {
|
|
211
|
+
setResponsiveProps(props);
|
|
212
|
+
setIconsVisible(displayIcons);
|
|
213
|
+
if (overflowMeasured) {
|
|
214
|
+
setIsOverflowMeasured(true);
|
|
344
215
|
}
|
|
345
|
-
|
|
346
|
-
|
|
216
|
+
}, []);
|
|
217
|
+
const setChildrenWidth = useCallback(size => {
|
|
218
|
+
setChildWidthArray(arr => {
|
|
219
|
+
const newArr = [...arr, size];
|
|
220
|
+
return newArr;
|
|
221
|
+
});
|
|
222
|
+
}, []);
|
|
223
|
+
const setNoIconChildrenWidth = useCallback(size => {
|
|
224
|
+
setNoIconChildWidthArray(arr => {
|
|
225
|
+
const newArr = [...arr, size];
|
|
226
|
+
return newArr;
|
|
227
|
+
});
|
|
228
|
+
}, []);
|
|
347
229
|
const closeOverlay = React.useCallback(() => {
|
|
348
230
|
setIsWidgetOpen(false);
|
|
349
231
|
}, [setIsWidgetOpen]);
|
|
@@ -370,66 +252,36 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
370
252
|
ignoreClickRefs: [moreMenuBtnRef]
|
|
371
253
|
});
|
|
372
254
|
useResizeObserver(resizeObserverEntries => {
|
|
373
|
-
var _moreMenuRef$current
|
|
255
|
+
var _moreMenuRef$current$, _moreMenuRef$current;
|
|
374
256
|
const navWidth = resizeObserverEntries[0].contentRect.width;
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
const result = computeOverflow(navWidth, moreMenuWidth, validChildren, childWidthsRef.current, noIconChildWidthsRef.current);
|
|
378
|
-
setOverflowState(prev => ({
|
|
379
|
-
items: result.items,
|
|
380
|
-
menuItems: result.menuItems,
|
|
381
|
-
iconsVisible: result.iconsVisible,
|
|
382
|
-
measured: childWidthsRef.current.size > 0 || prev.measured,
|
|
383
|
-
childrenKey: prev.childrenKey
|
|
384
|
-
}));
|
|
257
|
+
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;
|
|
258
|
+
navWidth !== 0 && overflowEffect(navWidth, moreMenuWidth, validChildren, childWidthArray, noIconChildWidthArray, updateListAndMenu);
|
|
385
259
|
}, navRef);
|
|
386
260
|
|
|
387
|
-
//
|
|
388
|
-
|
|
389
|
-
|
|
390
|
-
|
|
391
|
-
|
|
392
|
-
// This used to be computed inline during render by reading
|
|
393
|
-
// containerRef.current / listRef.current — refs are mutable and unsafe to
|
|
394
|
-
// read during render under concurrent rendering (the first render saw null
|
|
395
|
-
// refs and fell through to the unanchored fallback; subsequent renders
|
|
396
|
-
// anchored differently, producing a perceptible reflow).
|
|
397
|
-
const [menuAnchorLeft, setMenuAnchorLeft] = useState(undefined);
|
|
398
|
-
useIsomorphicLayoutEffect(() => {
|
|
399
|
-
const container = containerRef.current;
|
|
400
|
-
const list = listRef.current;
|
|
401
|
-
if (!container || !list) return;
|
|
402
|
-
if (list.clientWidth >= baseMenuMinWidth) {
|
|
403
|
-
if (menuAnchorLeft !== undefined) setMenuAnchorLeft(undefined);
|
|
404
|
-
return;
|
|
405
|
-
}
|
|
261
|
+
// Compute menuInlineStyles if needed
|
|
262
|
+
let menuInlineStyles = {
|
|
263
|
+
...baseMenuInlineStyles
|
|
264
|
+
};
|
|
265
|
+
if (containerRef.current && listRef.current) {
|
|
406
266
|
const {
|
|
407
267
|
left
|
|
408
|
-
} = getAnchoredPosition(
|
|
268
|
+
} = getAnchoredPosition(containerRef.current, listRef.current, {
|
|
409
269
|
align: 'start',
|
|
410
270
|
side: 'outside-bottom'
|
|
411
271
|
});
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
|
|
416
|
-
|
|
417
|
-
|
|
418
|
-
const contextValue = useMemo(() => ({
|
|
419
|
-
loadingCounters,
|
|
420
|
-
iconsVisible
|
|
421
|
-
}), [loadingCounters, iconsVisible]);
|
|
422
|
-
const menuStyle = menuAnchorLeft !== undefined ? {
|
|
423
|
-
...baseMenuInlineStyles,
|
|
424
|
-
right: undefined,
|
|
425
|
-
left: menuAnchorLeft,
|
|
426
|
-
display: isWidgetOpen ? 'block' : 'none'
|
|
427
|
-
} : {
|
|
428
|
-
...baseMenuInlineStyles,
|
|
429
|
-
display: isWidgetOpen ? 'block' : 'none'
|
|
430
|
-
};
|
|
272
|
+
menuInlineStyles = {
|
|
273
|
+
...baseMenuInlineStyles,
|
|
274
|
+
right: undefined,
|
|
275
|
+
left
|
|
276
|
+
};
|
|
277
|
+
}
|
|
431
278
|
return /*#__PURE__*/jsxs(UnderlineNavContext.Provider, {
|
|
432
|
-
value:
|
|
279
|
+
value: {
|
|
280
|
+
setChildrenWidth,
|
|
281
|
+
setNoIconChildrenWidth,
|
|
282
|
+
loadingCounters,
|
|
283
|
+
iconsVisible
|
|
284
|
+
},
|
|
433
285
|
children: [ariaLabel && /*#__PURE__*/jsx(VisuallyHidden, {
|
|
434
286
|
as: "h2",
|
|
435
287
|
children: `${ariaLabel} navigation`
|
|
@@ -476,23 +328,31 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
476
328
|
selectionVariant: "single",
|
|
477
329
|
ref: containerRef,
|
|
478
330
|
id: disclosureWidgetId,
|
|
479
|
-
style:
|
|
331
|
+
style: {
|
|
332
|
+
...((_listRef$current2 = listRef.current) !== null && _listRef$current2 !== void 0 && _listRef$current2.clientWidth && listRef.current.clientWidth >= baseMenuMinWidth ? baseMenuInlineStyles : menuInlineStyles),
|
|
333
|
+
display: isWidgetOpen ? 'block' : 'none'
|
|
334
|
+
},
|
|
480
335
|
children: menuItems.map((menuItem, index) => {
|
|
481
336
|
const {
|
|
482
337
|
children: menuItemChildren,
|
|
483
338
|
counter,
|
|
484
|
-
|
|
485
|
-
// directly from item.props (not via these destructured locals).
|
|
486
|
-
// eslint-disable-next-line @typescript-eslint/no-unused-vars
|
|
487
|
-
'aria-current': _ariaCurrent,
|
|
339
|
+
'aria-current': ariaCurrent,
|
|
488
340
|
onSelect,
|
|
489
341
|
...menuItemProps
|
|
490
342
|
} = menuItem.props;
|
|
343
|
+
|
|
344
|
+
// This logic is used to pop the selected item out of the menu and into the list when the navigation is control externally
|
|
345
|
+
if (Boolean(ariaCurrent) && ariaCurrent !== 'false') {
|
|
346
|
+
const event = new MouseEvent('click');
|
|
347
|
+
!onlyMenuVisible && swapMenuItemWithListItem(menuItem, index,
|
|
348
|
+
// @ts-ignore - not a big deal because it is internally creating an event but ask help
|
|
349
|
+
event, updateListAndMenu);
|
|
350
|
+
}
|
|
491
351
|
return /*#__PURE__*/jsx(ActionList.LinkItem, {
|
|
492
352
|
style: menuItemStyles,
|
|
493
353
|
onClick: event => {
|
|
494
354
|
// When there are no items in the list, do not run the swap function as we want to keep everything in the menu.
|
|
495
|
-
!onlyMenuVisible && swapMenuItemWithListItem(menuItem, index);
|
|
355
|
+
!onlyMenuVisible && swapMenuItemWithListItem(menuItem, index, event, updateListAndMenu);
|
|
496
356
|
closeOverlay();
|
|
497
357
|
focusOnMoreMenuBtn();
|
|
498
358
|
// fire onSelect event that comes from the UnderlineNav.Item (if it is defined)
|
|
@@ -508,7 +368,7 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
508
368
|
})
|
|
509
369
|
})]
|
|
510
370
|
})
|
|
511
|
-
},
|
|
371
|
+
}, menuItemChildren);
|
|
512
372
|
})
|
|
513
373
|
})]
|
|
514
374
|
})]
|
|
@@ -518,4 +378,4 @@ const UnderlineNav = /*#__PURE__*/forwardRef(({
|
|
|
518
378
|
});
|
|
519
379
|
UnderlineNav.displayName = 'UnderlineNav';
|
|
520
380
|
|
|
521
|
-
export { UnderlineNav };
|
|
381
|
+
export { MORE_BTN_WIDTH, UnderlineNav, getValidChildren };
|
|
@@ -1,4 +1,13 @@
|
|
|
1
|
-
|
|
1
|
+
import type React from 'react';
|
|
2
|
+
export declare const UnderlineNavContext: React.Context<{
|
|
3
|
+
setChildrenWidth: React.Dispatch<{
|
|
4
|
+
text: string;
|
|
5
|
+
width: number;
|
|
6
|
+
}>;
|
|
7
|
+
setNoIconChildrenWidth: React.Dispatch<{
|
|
8
|
+
text: string;
|
|
9
|
+
width: number;
|
|
10
|
+
}>;
|
|
2
11
|
loadingCounters: boolean;
|
|
3
12
|
iconsVisible: boolean;
|
|
4
13
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnderlineNavContext.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNavContext.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"UnderlineNavContext.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNavContext.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAA;AAG9B,eAAO,MAAM,mBAAmB;sBACZ,KAAK,CAAC,QAAQ,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;4BACvC,KAAK,CAAC,QAAQ,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAC,CAAC;qBACpD,OAAO;kBACV,OAAO;EAMrB,CAAA"}
|
|
@@ -43,7 +43,5 @@ export type UnderlineNavItemProps = {
|
|
|
43
43
|
*/
|
|
44
44
|
counter?: number | string;
|
|
45
45
|
} & LinkProps;
|
|
46
|
-
declare const
|
|
47
|
-
export declare const UnderlineNavItem: typeof UnderlineNavItemImpl;
|
|
48
|
-
export {};
|
|
46
|
+
export declare const UnderlineNavItem: PolymorphicForwardRefComponent<"a", UnderlineNavItemProps>;
|
|
49
47
|
//# sourceMappingURL=UnderlineNavItem.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UnderlineNavItem.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNavItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAA;AAC3D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;
|
|
1
|
+
{"version":3,"file":"UnderlineNavItem.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/UnderlineNavItem.tsx"],"names":[],"mappings":"AACA,OAAO,KAAuC,MAAM,OAAO,CAAA;AAC3D,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AACrD,OAAO,KAAK,EAAC,mBAAmB,IAAI,8BAA8B,EAAC,MAAM,sBAAsB,CAAA;AAO/F,MAAM,MAAM,SAAS,GAAG;IACtB,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;CACjF,CAAA;AAED,MAAM,MAAM,qBAAqB,GAAG;IAClC;;OAEG;IACH,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAA;IAE1B;;OAEG;IACH,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,CAAC,UAAU,CAAC,iBAAiB,CAAC,GAAG,KAAK,CAAC,aAAa,CAAC,iBAAiB,CAAC,KAAK,IAAI,CAAA;IAExG;;OAEG;IACH,cAAc,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,UAAU,GAAG,MAAM,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,OAAO,CAAA;IAE5F;;;OAGG;IAEH,IAAI,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IAEnE;;OAEG;IACH,aAAa,CAAC,EAAE,KAAK,CAAC,YAAY,CAAA;IAElC;;QAEI;IACJ,EAAE,CAAC,EAAE,KAAK,CAAC,WAAW,GAAG,GAAG,CAAA;IAE5B;;OAEG;IACH,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,CAAA;CAC1B,GAAG,SAAS,CAAA;AAEb,eAAO,MAAM,gBAAgB,EAgFxB,8BAA8B,CAAC,GAAG,EAAE,qBAAqB,CAAC,CAAA"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import React, { forwardRef, useRef, useContext } from 'react';
|
|
2
2
|
import { UnderlineNavContext } from './UnderlineNavContext.js';
|
|
3
|
+
import useIsomorphicLayoutEffect from '../utils/useIsomorphicLayoutEffect.js';
|
|
3
4
|
import { UnderlineItem } from '../internal/components/UnderlineTabbedInterface.js';
|
|
4
5
|
import classes from './UnderlineNavItem.module.css.js';
|
|
5
6
|
import { jsx } from 'react/jsx-runtime';
|
|
6
7
|
|
|
7
|
-
const
|
|
8
|
+
const UnderlineNavItem = /*#__PURE__*/forwardRef(({
|
|
8
9
|
as: Component = 'a',
|
|
9
10
|
href = '#',
|
|
10
11
|
children,
|
|
@@ -18,9 +19,28 @@ const UnderlineNavItemImpl = /*#__PURE__*/forwardRef(({
|
|
|
18
19
|
const backupRef = useRef(null);
|
|
19
20
|
const ref = forwardedRef !== null && forwardedRef !== void 0 ? forwardedRef : backupRef;
|
|
20
21
|
const {
|
|
22
|
+
setChildrenWidth,
|
|
23
|
+
setNoIconChildrenWidth,
|
|
21
24
|
loadingCounters,
|
|
22
25
|
iconsVisible
|
|
23
26
|
} = useContext(UnderlineNavContext);
|
|
27
|
+
useIsomorphicLayoutEffect(() => {
|
|
28
|
+
if (ref.current) {
|
|
29
|
+
const domRect = ref.current.getBoundingClientRect();
|
|
30
|
+
const icon = Array.from(ref.current.children).find(child => child.getAttribute('data-component') === 'icon');
|
|
31
|
+
const content = Array.from(ref.current.children).find(child => child.getAttribute('data-component') === 'text');
|
|
32
|
+
const text = content.textContent;
|
|
33
|
+
const iconWidthWithMargin = icon ? icon.getBoundingClientRect().width + Number(getComputedStyle(icon).marginRight.slice(0, -2)) + Number(getComputedStyle(icon).marginLeft.slice(0, -2)) : 0;
|
|
34
|
+
setChildrenWidth({
|
|
35
|
+
text,
|
|
36
|
+
width: domRect.width
|
|
37
|
+
});
|
|
38
|
+
setNoIconChildrenWidth({
|
|
39
|
+
text,
|
|
40
|
+
width: domRect.width - iconWidthWithMargin
|
|
41
|
+
});
|
|
42
|
+
}
|
|
43
|
+
}, [ref, setChildrenWidth, setNoIconChildrenWidth]);
|
|
24
44
|
const keyDownHandler = React.useCallback(event => {
|
|
25
45
|
if ((event.key === ' ' || event.key === 'Enter') && !event.defaultPrevented && typeof onSelect === 'function') {
|
|
26
46
|
onSelect(event);
|
|
@@ -33,7 +53,6 @@ const UnderlineNavItemImpl = /*#__PURE__*/forwardRef(({
|
|
|
33
53
|
}, [onSelect]);
|
|
34
54
|
return /*#__PURE__*/jsx("li", {
|
|
35
55
|
className: classes.UnderlineNavItem,
|
|
36
|
-
"data-underlinenav-item": "true",
|
|
37
56
|
children: /*#__PURE__*/jsx(UnderlineItem, {
|
|
38
57
|
ref: ref,
|
|
39
58
|
as: Component,
|
|
@@ -50,10 +69,6 @@ const UnderlineNavItemImpl = /*#__PURE__*/forwardRef(({
|
|
|
50
69
|
})
|
|
51
70
|
});
|
|
52
71
|
});
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
// Memoized so that re-renders of UnderlineNav (e.g. when overflow state changes)
|
|
56
|
-
// do not re-render every item when the consumer-provided children haven't changed.
|
|
57
|
-
const UnderlineNavItem = /*#__PURE__*/React.memo(UnderlineNavItemImpl);
|
|
72
|
+
UnderlineNavItem.displayName = 'UnderlineNavItem';
|
|
58
73
|
|
|
59
74
|
export { UnderlineNavItem };
|
|
@@ -1,4 +1,8 @@
|
|
|
1
|
-
export type
|
|
1
|
+
export type ChildSize = {
|
|
2
|
+
text: string;
|
|
3
|
+
width: number;
|
|
4
|
+
};
|
|
5
|
+
export type ChildWidthArray = Array<ChildSize>;
|
|
2
6
|
export type ResponsiveProps = {
|
|
3
7
|
items: Array<React.ReactElement<any>>;
|
|
4
8
|
menuItems: Array<React.ReactElement<any>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/types.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../src/UnderlineNav/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,SAAS,GAAG;IACtB,IAAI,EAAE,MAAM,CAAA;IACZ,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AACD,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,SAAS,CAAC,CAAA;AAC9C,MAAM,MAAM,eAAe,GAAG;IAE5B,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;IAErC,SAAS,EAAE,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAA;CAC1C,CAAA"}
|
package/package.json
CHANGED