@primer/react 0.0.0-20260312164945 → 0.0.0-20260312164952
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 -3
- package/dist/Autocomplete/AutocompleteMenu.d.ts.map +1 -1
- package/dist/Autocomplete/AutocompleteMenu.js +80 -38
- package/dist/TreeView/useRovingTabIndex.d.ts +0 -14
- package/dist/TreeView/useRovingTabIndex.d.ts.map +1 -1
- package/dist/TreeView/useRovingTabIndex.js +16 -94
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
# @primer/react
|
|
2
2
|
|
|
3
|
-
## 0.0.0-
|
|
3
|
+
## 0.0.0-20260312164952
|
|
4
4
|
|
|
5
5
|
### Minor Changes
|
|
6
6
|
|
|
@@ -12,9 +12,9 @@
|
|
|
12
12
|
|
|
13
13
|
- [#7625](https://github.com/primer/react/pull/7625) [`2e8c707`](https://github.com/primer/react/commit/2e8c70702d5096551049c29c8e79749bf63a919f) Thanks [@liuliu-dev](https://github.com/liuliu-dev)! - Banner: stack inline actions vertically on narrow viewports.
|
|
14
14
|
|
|
15
|
-
- [#
|
|
15
|
+
- [#7549](https://github.com/primer/react/pull/7549) [`a5ccd0c`](https://github.com/primer/react/commit/a5ccd0c98e1153c0dadf48eaf5d50bd95e624428) Thanks [@hectahertz](https://github.com/hectahertz)! - perf(Autocomplete): eliminate re-renders on arrow-key navigation by converting highlightedItem to a ref
|
|
16
16
|
|
|
17
|
-
- [#
|
|
17
|
+
- [#7654](https://github.com/primer/react/pull/7654) [`a09a60c`](https://github.com/primer/react/commit/a09a60cb8218adf8fe2ab71e46da76fbf8331bc6) Thanks [@copilot-swe-agent](https://github.com/apps/copilot-swe-agent)! - SelectPanel: use `100dvh` and `env(safe-area-inset-bottom)` in fullscreen-on-narrow mode to prevent content from being obscured by iOS Safari's browser chrome.
|
|
18
18
|
|
|
19
19
|
## 38.15.0
|
|
20
20
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AutocompleteMenu.d.ts","sourceRoot":"","sources":["../../src/Autocomplete/AutocompleteMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAA;AAK7E,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAA;AAGtD,OAAO,KAAK,EAAC,cAAc,EAAE,YAAY,EAAW,MAAM,gBAAgB,CAAA;AAI1E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAOrD,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAA;AAClD,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG;IAE3E,aAAa,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IACrG,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,cAAc,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;CACvG,CAAA;
|
|
1
|
+
{"version":3,"file":"AutocompleteMenu.d.ts","sourceRoot":"","sources":["../../src/Autocomplete/AutocompleteMenu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyD,MAAM,OAAO,CAAA;AAK7E,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAA;AAGtD,OAAO,KAAK,EAAC,cAAc,EAAE,YAAY,EAAW,MAAM,gBAAgB,CAAA;AAI1E,OAAO,KAAK,EAAC,SAAS,EAAC,MAAM,wBAAwB,CAAA;AAOrD,KAAK,gBAAgB,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,KAAK,IAAI,CAAA;AAClD,MAAM,MAAM,oBAAoB,GAAG,YAAY,CAAC,mBAAmB,EAAE,IAAI,CAAC,GAAG;IAE3E,aAAa,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;IACrG,IAAI,CAAC,EAAE,MAAM,CAAA;IAEb,cAAc,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,KAAK,CAAC,iBAAiB,CAAC,SAAS,CAAC,CAAC,GAAG,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,CAAA;CACvG,CAAA;AAoED,KAAK,qBAAqB,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,IAAI,oBAAoB,GAAG;IAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;CAAC,CAAA;AAE3F,MAAM,MAAM,6BAA6B,CAAC,CAAC,SAAS,qBAAqB,IAAI;IAC3E;;;OAGG;IACH,UAAU,CAAC,EAAE,CAAC,GAAG;QACf,aAAa,EAAE,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,UAAU,GAAG,eAAe,CAAC,KAAK,IAAI,CAAA;KACrE,CAAA;IAED;;OAEG;IACH,cAAc,CAAC,EAAE,KAAK,CAAC,SAAS,GAAG,KAAK,GAAG,IAAI,CAAA;IAE/C;;;OAGG;IACH,QAAQ,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,OAAO,CAAA;IAE1C;;;OAGG;IACH,KAAK,EAAE,CAAC,EAAE,CAAA;IAEV;;OAEG;IACH,OAAO,CAAC,EAAE,OAAO,CAAA;IAEjB;;OAEG;IAEH,eAAe,EAAE,MAAM,EAAE,CAAA;IAEzB;;;OAGG;IACH,aAAa,CAAC,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAA;IAE5D;;OAEG;IACH,gBAAgB,CAAC,EAAE,QAAQ,GAAG,UAAU,CAAA;IAExC;;OAEG;IACH,YAAY,CAAC,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAA;IAEtC;;OAEG;IACH,gBAAgB,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAA;IAEtC;;;;OAIG;IACH,wBAAwB,CAAC,EAAE,KAAK,CAAC,gBAAgB,CAAC,WAAW,GAAG,IAAI,CAAC,CAAA;IAErE,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC5B,CAAA;AAUD,iBAAS,gBAAgB,CAAC,CAAC,SAAS,qBAAqB,EAAE,KAAK,EAAE,6BAA6B,CAAC,CAAC,CAAC,qBAmRjG;kBAnRQ,gBAAgB;;;;AAuRzB,MAAM,MAAM,qBAAqB,GAAG,cAAc,CAAC,OAAO,gBAAgB,CAAC,CAAA;AAC3E,eAAe,gBAAgB,CAAA"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useContext, useRef, useState, useMemo
|
|
1
|
+
import React, { useContext, useRef, useEffect, useState, useMemo } from 'react';
|
|
2
2
|
import { debounce } from '@github/mini-throttle';
|
|
3
3
|
import { announce } from '@primer/live-region-element';
|
|
4
4
|
import { scrollIntoView } from '@primer/behaviors';
|
|
@@ -33,6 +33,41 @@ function getdefaultCheckedSelectionChange(setInputValueFn) {
|
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
35
|
const isItemSelected = (itemId, selectedItemIds) => selectedItemIds.includes(itemId);
|
|
36
|
+
|
|
37
|
+
/**
|
|
38
|
+
* Memoized wrapper around ActionList.Item that skips re-rendering when props
|
|
39
|
+
* haven't changed. Combined with the `highlightedItem` ref (instead of state),
|
|
40
|
+
* arrow-key navigation no longer triggers re-renders of the item list.
|
|
41
|
+
*/
|
|
42
|
+
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
43
|
+
const MemoizedAutocompleteItem = /*#__PURE__*/React.memo(function MemoizedAutocompleteItem({
|
|
44
|
+
item
|
|
45
|
+
}) {
|
|
46
|
+
const {
|
|
47
|
+
id,
|
|
48
|
+
onAction,
|
|
49
|
+
children,
|
|
50
|
+
text,
|
|
51
|
+
leadingVisual: LeadingVisual,
|
|
52
|
+
trailingVisual: TrailingVisual,
|
|
53
|
+
role,
|
|
54
|
+
...itemProps
|
|
55
|
+
} = item;
|
|
56
|
+
// Remove key from itemProps so it doesn't spread onto the DOM
|
|
57
|
+
delete itemProps.key;
|
|
58
|
+
return /*#__PURE__*/jsxs(ActionList.Item, {
|
|
59
|
+
onSelect: () => onAction(item),
|
|
60
|
+
...itemProps,
|
|
61
|
+
id: id,
|
|
62
|
+
"data-id": id,
|
|
63
|
+
role: role,
|
|
64
|
+
children: [LeadingVisual && /*#__PURE__*/jsx(ActionList.LeadingVisual, {
|
|
65
|
+
children: isElement(LeadingVisual) ? LeadingVisual : /*#__PURE__*/jsx(LeadingVisual, {})
|
|
66
|
+
}), children !== null && children !== void 0 ? children : text, TrailingVisual && /*#__PURE__*/jsx(ActionList.TrailingVisual, {
|
|
67
|
+
children: isElement(TrailingVisual) ? TrailingVisual : /*#__PURE__*/jsx(TrailingVisual, {})
|
|
68
|
+
})]
|
|
69
|
+
});
|
|
70
|
+
});
|
|
36
71
|
function getItemById(itemId, items) {
|
|
37
72
|
return items.find(item => item.id === itemId);
|
|
38
73
|
}
|
|
@@ -85,7 +120,19 @@ function AutocompleteMenu(props) {
|
|
|
85
120
|
} = props;
|
|
86
121
|
const listContainerRef = useRef(null);
|
|
87
122
|
const allItemsToRenderRef = useRef([]);
|
|
88
|
-
|
|
123
|
+
// Using a ref instead of state to avoid triggering a re-render of all items
|
|
124
|
+
// on every arrow-key press. The active styling was already handled via DOM by
|
|
125
|
+
// useFocusZone (data-is-active-descendant) before this change, but the
|
|
126
|
+
// previous useState caused React to re-render the entire item list anyway.
|
|
127
|
+
const highlightedItemRef = useRef();
|
|
128
|
+
const deferredInputValueRef = useRef(deferredInputValue);
|
|
129
|
+
const selectedItemIdsRef = useRef(selectedItemIds);
|
|
130
|
+
useEffect(() => {
|
|
131
|
+
deferredInputValueRef.current = deferredInputValue;
|
|
132
|
+
}, [deferredInputValue]);
|
|
133
|
+
useEffect(() => {
|
|
134
|
+
selectedItemIdsRef.current = selectedItemIds;
|
|
135
|
+
}, [selectedItemIds]);
|
|
89
136
|
const [sortedItemIds, setSortedItemIds] = useState(items.map(({
|
|
90
137
|
id: itemId
|
|
91
138
|
}) => itemId));
|
|
@@ -95,7 +142,6 @@ function AutocompleteMenu(props) {
|
|
|
95
142
|
...selectableItem,
|
|
96
143
|
role: 'option',
|
|
97
144
|
id: selectableItem.id,
|
|
98
|
-
active: (highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id) === selectableItem.id,
|
|
99
145
|
selected: selectionVariant === 'multiple' ? selectedItemIds.includes(selectableItem.id) : undefined,
|
|
100
146
|
onAction: item => {
|
|
101
147
|
const otherSelectedItemIds = selectedItemIds.filter(selectedItemId => selectedItemId !== item.id);
|
|
@@ -112,7 +158,7 @@ function AutocompleteMenu(props) {
|
|
|
112
158
|
}
|
|
113
159
|
}
|
|
114
160
|
};
|
|
115
|
-
}), [
|
|
161
|
+
}), [items, selectedItemIds, inputRef, onSelectedChange, selectionVariant, setAutocompleteSuggestion, setInputValue, setShowMenu]);
|
|
116
162
|
const itemSortOrderData = useMemo(() => sortedItemIds.reduce((acc, curr, i) => {
|
|
117
163
|
acc[curr] = i;
|
|
118
164
|
return acc;
|
|
@@ -126,7 +172,6 @@ function AutocompleteMenu(props) {
|
|
|
126
172
|
...addNewItem,
|
|
127
173
|
role: 'option',
|
|
128
174
|
key: addNewItem.id,
|
|
129
|
-
active: (highlightedItem === null || highlightedItem === void 0 ? void 0 : highlightedItem.id) === addNewItem.id,
|
|
130
175
|
selected: selectionVariant === 'multiple' ? selectedItemIds.includes(addNewItem.id) : undefined,
|
|
131
176
|
leadingVisual: () => /*#__PURE__*/jsx(PlusIcon, {}),
|
|
132
177
|
onAction: item => {
|
|
@@ -141,7 +186,7 @@ function AutocompleteMenu(props) {
|
|
|
141
186
|
setAutocompleteSuggestion('');
|
|
142
187
|
}
|
|
143
188
|
}
|
|
144
|
-
}] : [])], [sortedAndFilteredItemsToRender, addNewItem, setAutocompleteSuggestion, selectionVariant, setInputValue, generatedUniqueId,
|
|
189
|
+
}] : [])], [sortedAndFilteredItemsToRender, addNewItem, setAutocompleteSuggestion, selectionVariant, setInputValue, generatedUniqueId, selectedItemIds]);
|
|
145
190
|
React.useEffect(() => {
|
|
146
191
|
allItemsToRenderRef.current = allItemsToRender;
|
|
147
192
|
});
|
|
@@ -159,13 +204,28 @@ function AutocompleteMenu(props) {
|
|
|
159
204
|
activeDescendantFocus: inputRef,
|
|
160
205
|
onActiveDescendantChanged: (current, _previous, directlyActivated) => {
|
|
161
206
|
activeDescendantRef.current = current || null;
|
|
207
|
+
|
|
208
|
+
// Active styling was already handled via DOM before this change:
|
|
209
|
+
// useFocusZone sets `data-is-active-descendant` on the active element,
|
|
210
|
+
// and ActionList styles that attribute in CSS. The key change is that
|
|
211
|
+
// we no longer call setHighlightedItem (state), avoiding re-renders.
|
|
212
|
+
|
|
162
213
|
if (current) {
|
|
214
|
+
var _selectedItem$text;
|
|
215
|
+
const currentLi = current.closest('li');
|
|
163
216
|
const selectedItem = allItemsToRenderRef.current.find(item => {
|
|
164
|
-
|
|
165
|
-
return item.id === ((_current$closest = current.closest('li')) === null || _current$closest === void 0 ? void 0 : _current$closest.getAttribute('data-id'));
|
|
217
|
+
return item.id === (currentLi === null || currentLi === void 0 ? void 0 : currentLi.getAttribute('data-id'));
|
|
166
218
|
});
|
|
167
|
-
|
|
219
|
+
highlightedItemRef.current = selectedItem;
|
|
168
220
|
setIsMenuDirectlyActivated(directlyActivated);
|
|
221
|
+
|
|
222
|
+
// Update autocomplete suggestion inline (moved from the useEffect
|
|
223
|
+
// that previously depended on highlightedItem state)
|
|
224
|
+
if (selectedItem !== null && selectedItem !== void 0 && (_selectedItem$text = selectedItem.text) !== null && _selectedItem$text !== void 0 && _selectedItem$text.startsWith(deferredInputValueRef.current) && !selectedItemIdsRef.current.includes(selectedItem.id)) {
|
|
225
|
+
setAutocompleteSuggestion(selectedItem.text);
|
|
226
|
+
} else {
|
|
227
|
+
setAutocompleteSuggestion('');
|
|
228
|
+
}
|
|
169
229
|
}
|
|
170
230
|
if (current && customScrollContainerRef && customScrollContainerRef.current && directlyActivated) {
|
|
171
231
|
scrollIntoView(current, customScrollContainerRef.current, menuScrollMargins);
|
|
@@ -175,15 +235,16 @@ function AutocompleteMenu(props) {
|
|
|
175
235
|
}
|
|
176
236
|
}, [loading]);
|
|
177
237
|
useEffect(() => {
|
|
178
|
-
var
|
|
179
|
-
//
|
|
180
|
-
//
|
|
181
|
-
|
|
182
|
-
|
|
238
|
+
var _highlighted$text;
|
|
239
|
+
// When the input value changes, update the autocomplete suggestion based
|
|
240
|
+
// on the currently highlighted item (tracked via ref, not state).
|
|
241
|
+
const highlighted = highlightedItemRef.current;
|
|
242
|
+
if (highlighted !== null && highlighted !== void 0 && (_highlighted$text = highlighted.text) !== null && _highlighted$text !== void 0 && _highlighted$text.startsWith(deferredInputValue) && !selectedItemIds.includes(highlighted.id)) {
|
|
243
|
+
setAutocompleteSuggestion(highlighted.text);
|
|
183
244
|
} else {
|
|
184
245
|
setAutocompleteSuggestion('');
|
|
185
246
|
}
|
|
186
|
-
}, [
|
|
247
|
+
}, [deferredInputValue, selectedItemIds, setAutocompleteSuggestion]);
|
|
187
248
|
useEffect(() => {
|
|
188
249
|
const itemIdSortResult = [...sortedItemIds].sort(sortOnCloseFn ? sortOnCloseFn : getDefaultSortFn(itemId => isItemSelected(itemId, selectedItemIds)));
|
|
189
250
|
const sortResultMatchesState = itemIdSortResult.length === sortedItemIds.length && itemIdSortResult.every((element, index) => element === sortedItemIds[index]);
|
|
@@ -215,29 +276,10 @@ function AutocompleteMenu(props) {
|
|
|
215
276
|
id: `${id}-listbox`,
|
|
216
277
|
"aria-labelledby": ariaLabelledBy,
|
|
217
278
|
children: allItemsToRender.map(item => {
|
|
218
|
-
|
|
219
|
-
|
|
220
|
-
|
|
221
|
-
|
|
222
|
-
text,
|
|
223
|
-
leadingVisual: LeadingVisual,
|
|
224
|
-
trailingVisual: TrailingVisual,
|
|
225
|
-
key,
|
|
226
|
-
role,
|
|
227
|
-
...itemProps
|
|
228
|
-
} = item;
|
|
229
|
-
return /*#__PURE__*/jsxs(ActionList.Item, {
|
|
230
|
-
onSelect: () => onAction(item),
|
|
231
|
-
...itemProps,
|
|
232
|
-
id: id,
|
|
233
|
-
"data-id": id,
|
|
234
|
-
role: role,
|
|
235
|
-
children: [LeadingVisual && /*#__PURE__*/jsx(ActionList.LeadingVisual, {
|
|
236
|
-
children: isElement(LeadingVisual) ? LeadingVisual : /*#__PURE__*/jsx(LeadingVisual, {})
|
|
237
|
-
}), children !== null && children !== void 0 ? children : text, TrailingVisual && /*#__PURE__*/jsx(ActionList.TrailingVisual, {
|
|
238
|
-
children: isElement(TrailingVisual) ? TrailingVisual : /*#__PURE__*/jsx(TrailingVisual, {})
|
|
239
|
-
})]
|
|
240
|
-
}, key !== null && key !== void 0 ? key : id);
|
|
279
|
+
var _item$key;
|
|
280
|
+
return /*#__PURE__*/jsx(MemoizedAutocompleteItem, {
|
|
281
|
+
item: item
|
|
282
|
+
}, (_item$key = item.key) !== null && _item$key !== void 0 ? _item$key : item.id);
|
|
241
283
|
})
|
|
242
284
|
}) : emptyStateText !== false && emptyStateText !== null ? /*#__PURE__*/jsx("div", {
|
|
243
285
|
className: classes.EmptyStateWrapper,
|
|
@@ -5,20 +5,6 @@ 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
|
-
*/
|
|
22
8
|
export declare function getVisibleElement(element: HTMLElement, direction: 'next' | 'previous'): HTMLElement | undefined;
|
|
23
9
|
export declare function getFirstChildElement(element: HTMLElement): HTMLElement | undefined;
|
|
24
10
|
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
|
|
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,CAwB/G;AAED,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,103 +123,25 @@ 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
|
-
*/
|
|
141
126
|
function getVisibleElement(element, direction) {
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
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;
|
|
159
|
-
|
|
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
|
-
}
|
|
127
|
+
const root = element.closest('[role=tree]');
|
|
128
|
+
if (!root) return;
|
|
129
|
+
const walker = document.createTreeWalker(root, NodeFilter.SHOW_ELEMENT, node => {
|
|
130
|
+
if (!(node instanceof HTMLElement)) return NodeFilter.FILTER_SKIP;
|
|
131
|
+
return node.getAttribute('role') === 'treeitem' ? NodeFilter.FILTER_ACCEPT : NodeFilter.FILTER_SKIP;
|
|
132
|
+
});
|
|
133
|
+
let current = walker.firstChild();
|
|
134
|
+
while (current !== element) {
|
|
135
|
+
current = walker.nextNode();
|
|
136
|
+
}
|
|
137
|
+
let next = direction === 'next' ? walker.nextNode() : walker.previousNode();
|
|
175
138
|
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
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
|
-
}
|
|
139
|
+
// If next element is nested inside a collapsed subtree, continue iterating
|
|
140
|
+
while (next instanceof HTMLElement && (_next$parentElement = next.parentElement) !== null && _next$parentElement !== void 0 && _next$parentElement.closest('[role=treeitem][aria-expanded=false]')) {
|
|
141
|
+
var _next$parentElement;
|
|
142
|
+
next = direction === 'next' ? walker.nextNode() : walker.previousNode();
|
|
221
143
|
}
|
|
222
|
-
return undefined;
|
|
144
|
+
return next instanceof HTMLElement ? next : undefined;
|
|
223
145
|
}
|
|
224
146
|
function getFirstChildElement(element) {
|
|
225
147
|
const firstChild = element.querySelector('[role=treeitem]');
|
package/package.json
CHANGED