@primer/react 38.44.0-rc.10e0a080a → 38.44.0-rc.d33706de4
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 +2 -0
- package/dist/SelectPanel/SelectPanel.js +85 -38
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -10,6 +10,8 @@
|
|
|
10
10
|
|
|
11
11
|
- [#8533](https://github.com/primer/react/pull/8533) [`714cb96`](https://github.com/primer/react/commit/714cb96adbdc0aec951f7a131f44f221b10ef3ae) Thanks [@rickyzhangca](https://github.com/rickyzhangca)! - Table.SelectionHeader: Preserve the mixed checkbox state when using a callback ref.
|
|
12
12
|
|
|
13
|
+
- [#8613](https://github.com/primer/react/pull/8613) [`f733dcb`](https://github.com/primer/react/commit/f733dcb2b086c6da7902bfecfcf68cd61c7daab3) Thanks [@alexus37](https://github.com/alexus37)! - SelectPanel: Improve rendering performance when opening and updating items or selection
|
|
14
|
+
|
|
13
15
|
- [#8590](https://github.com/primer/react/pull/8590) [`f83d6a9`](https://github.com/primer/react/commit/f83d6a9350f85784e51d9632dfc881cf805976f7) Thanks [@donjo](https://github.com/donjo)! - SegmentedControl: Match unselected hover backgrounds in the subtle variant to invisible buttons.
|
|
14
16
|
|
|
15
17
|
## 38.43.0
|
|
@@ -57,6 +57,10 @@ const areItemsEqual = (itemA, itemB) => {
|
|
|
57
57
|
const doesItemsIncludeItem = (items, item) => {
|
|
58
58
|
return items.some((i) => areItemsEqual(i, item));
|
|
59
59
|
};
|
|
60
|
+
const getSelectedItems = (selected) => {
|
|
61
|
+
if (isMultiSelectVariant(selected)) return selected;
|
|
62
|
+
return selected ? [selected] : [];
|
|
63
|
+
};
|
|
60
64
|
const defaultRenderAnchor = (props) => {
|
|
61
65
|
const { children, ...rest } = props;
|
|
62
66
|
return /* @__PURE__ */ jsx(ButtonComponent, {
|
|
@@ -69,13 +73,35 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
69
73
|
var _listProps$groupMetad;
|
|
70
74
|
const titleId = useId$1();
|
|
71
75
|
const subtitleId = useId$1();
|
|
72
|
-
const [dataLoadedOnce, setDataLoadedOnce] = useState(false);
|
|
73
|
-
const [isLoading, setIsLoading] = useState(false);
|
|
74
76
|
const [filterValue, setInternalFilterValue] = useProvidedStateOrCreate(externalFilterValue, void 0, "");
|
|
75
77
|
const { safeSetTimeout, safeClearTimeout } = useSafeTimeout();
|
|
76
78
|
const loadingDelayTimeoutId = useRef(null);
|
|
77
79
|
const loadingManagedInternally = loading === void 0;
|
|
78
80
|
const loadingManagedExternally = !loadingManagedInternally;
|
|
81
|
+
const [loadingState, setLoadingState] = useState(() => ({
|
|
82
|
+
dataLoadedOnce: items.length > 0,
|
|
83
|
+
isLoading: loadingManagedInternally && open && items.length === 0,
|
|
84
|
+
items,
|
|
85
|
+
open
|
|
86
|
+
}));
|
|
87
|
+
if (loadingState.items !== items || loadingState.open !== open) {
|
|
88
|
+
let { dataLoadedOnce, isLoading } = loadingState;
|
|
89
|
+
if (loadingState.items !== items) {
|
|
90
|
+
if (loadingManagedExternally) dataLoadedOnce ||= items.length > 0;
|
|
91
|
+
else if (isLoading || items.length > 0) {
|
|
92
|
+
dataLoadedOnce = true;
|
|
93
|
+
isLoading = false;
|
|
94
|
+
}
|
|
95
|
+
}
|
|
96
|
+
if (loadingState.open !== open && open && loadingManagedInternally && !dataLoadedOnce && items.length === 0) isLoading = true;
|
|
97
|
+
setLoadingState({
|
|
98
|
+
dataLoadedOnce,
|
|
99
|
+
isLoading,
|
|
100
|
+
items,
|
|
101
|
+
open
|
|
102
|
+
});
|
|
103
|
+
}
|
|
104
|
+
const { dataLoadedOnce, isLoading } = loadingState;
|
|
79
105
|
const [inputRef, setInputRef] = React.useState(null);
|
|
80
106
|
const [listContainerElement, setListContainerElement] = useState(null);
|
|
81
107
|
const [needsNoItemsAnnouncement, setNeedsNoItemsAnnouncement] = useState(false);
|
|
@@ -84,7 +110,18 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
84
110
|
regular: false,
|
|
85
111
|
wide: false
|
|
86
112
|
}, false);
|
|
87
|
-
const
|
|
113
|
+
const itemsAreEmpty = items.length === 0;
|
|
114
|
+
const [sortState, setSortState] = useState(() => ({
|
|
115
|
+
itemsWereEmpty: itemsAreEmpty,
|
|
116
|
+
open,
|
|
117
|
+
selected: getSelectedItems(selected)
|
|
118
|
+
}));
|
|
119
|
+
if (sortState.open !== open || sortState.itemsWereEmpty !== itemsAreEmpty) setSortState({
|
|
120
|
+
itemsWereEmpty: itemsAreEmpty,
|
|
121
|
+
open,
|
|
122
|
+
selected: sortState.open !== open || sortState.itemsWereEmpty && !itemsAreEmpty ? getSelectedItems(selected) : sortState.selected
|
|
123
|
+
});
|
|
124
|
+
const selectedOnSort = sortState.selected;
|
|
88
125
|
const initialHeightRef = useRef(0);
|
|
89
126
|
const initialScaleRef = useRef(1);
|
|
90
127
|
const noticeRef = useRef(null);
|
|
@@ -98,14 +135,20 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
98
135
|
const { isReferenced, labelId } = useFormControlContext();
|
|
99
136
|
const selectedValueId = id ? `${id}-selected-value` : void 0;
|
|
100
137
|
const isSingleSelectModal = variant === "modal" && !isMultiSelectVariant(selected);
|
|
101
|
-
const
|
|
102
|
-
|
|
103
|
-
setIntermediateSelected(isSingleSelectModal ? selected : void 0);
|
|
104
|
-
}, [
|
|
138
|
+
const selectedForSingleSelectModal = isSingleSelectModal && !isMultiSelectVariant(selected) ? selected : void 0;
|
|
139
|
+
const [intermediateSelectionState, setIntermediateSelectionState] = useState(() => ({
|
|
105
140
|
isSingleSelectModal,
|
|
106
141
|
open,
|
|
107
|
-
selected
|
|
108
|
-
|
|
142
|
+
selected,
|
|
143
|
+
value: selectedForSingleSelectModal
|
|
144
|
+
}));
|
|
145
|
+
if (intermediateSelectionState.isSingleSelectModal !== isSingleSelectModal || intermediateSelectionState.open !== open || intermediateSelectionState.selected !== selected) setIntermediateSelectionState({
|
|
146
|
+
isSingleSelectModal,
|
|
147
|
+
open,
|
|
148
|
+
selected,
|
|
149
|
+
value: selectedForSingleSelectModal
|
|
150
|
+
});
|
|
151
|
+
const intermediateSelected = intermediateSelectionState.value;
|
|
109
152
|
const onListContainerRefChanged = useCallback((node) => {
|
|
110
153
|
setListContainerElement(node);
|
|
111
154
|
if (!node && needsNoItemsAnnouncement) setNeedsNoItemsAnnouncement(false);
|
|
@@ -114,19 +157,34 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
114
157
|
setInputRef(ref);
|
|
115
158
|
}, [setInputRef]);
|
|
116
159
|
const resetSort = useCallback(() => {
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
160
|
+
const nextSelected = getSelectedItems(selected);
|
|
161
|
+
setSortState((current) => {
|
|
162
|
+
if (current.selected === nextSelected) return current;
|
|
163
|
+
return {
|
|
164
|
+
...current,
|
|
165
|
+
selected: nextSelected
|
|
166
|
+
};
|
|
167
|
+
});
|
|
120
168
|
}, [selected]);
|
|
121
169
|
const onFilterChange = useCallback((value, e) => {
|
|
122
170
|
if (loadingManagedInternally) {
|
|
123
171
|
if (loadingDelayTimeoutId.current) safeClearTimeout(loadingDelayTimeoutId.current);
|
|
124
172
|
if (dataLoadedOnce) loadingDelayTimeoutId.current = safeSetTimeout(() => {
|
|
125
|
-
|
|
173
|
+
setLoadingState((current) => {
|
|
174
|
+
return current.isLoading ? current : {
|
|
175
|
+
...current,
|
|
176
|
+
isLoading: true
|
|
177
|
+
};
|
|
178
|
+
});
|
|
126
179
|
announceLoading();
|
|
127
180
|
}, LONG_DELAY_MS);
|
|
128
181
|
else {
|
|
129
|
-
if (items.length === 0)
|
|
182
|
+
if (items.length === 0) setLoadingState((current) => {
|
|
183
|
+
return current.isLoading ? current : {
|
|
184
|
+
...current,
|
|
185
|
+
isLoading: true
|
|
186
|
+
};
|
|
187
|
+
});
|
|
130
188
|
loadingDelayTimeoutId.current = safeSetTimeout(() => {
|
|
131
189
|
announceLoading();
|
|
132
190
|
}, LONG_DELAY_MS);
|
|
@@ -185,14 +243,6 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
185
243
|
if (open) {
|
|
186
244
|
if (items.length === 0 && !(isLoading || loading)) setNeedsNoItemsAnnouncement(true);
|
|
187
245
|
}
|
|
188
|
-
if (loadingManagedExternally) {
|
|
189
|
-
if (items.length > 0) setDataLoadedOnce(true);
|
|
190
|
-
return;
|
|
191
|
-
}
|
|
192
|
-
if (isLoading || items.length > 0) {
|
|
193
|
-
setIsLoading(false);
|
|
194
|
-
setDataLoadedOnce(true);
|
|
195
|
-
}
|
|
196
246
|
if (loadingDelayTimeoutId.current) safeClearTimeout(loadingDelayTimeoutId.current);
|
|
197
247
|
}, [items]);
|
|
198
248
|
useEffect(() => {
|
|
@@ -347,8 +397,18 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
347
397
|
return;
|
|
348
398
|
}
|
|
349
399
|
if (isSingleSelectModal) {
|
|
350
|
-
if ((intermediateSelected === null || intermediateSelected === void 0 ? void 0 : intermediateSelected.id) === item.id)
|
|
351
|
-
|
|
400
|
+
if ((intermediateSelected === null || intermediateSelected === void 0 ? void 0 : intermediateSelected.id) === item.id) setIntermediateSelectionState({
|
|
401
|
+
isSingleSelectModal,
|
|
402
|
+
open,
|
|
403
|
+
selected,
|
|
404
|
+
value: void 0
|
|
405
|
+
});
|
|
406
|
+
else setIntermediateSelectionState({
|
|
407
|
+
isSingleSelectModal,
|
|
408
|
+
open,
|
|
409
|
+
selected,
|
|
410
|
+
value: item
|
|
411
|
+
});
|
|
352
412
|
return;
|
|
353
413
|
}
|
|
354
414
|
onSelectedChange(item === selected ? void 0 : item);
|
|
@@ -372,23 +432,10 @@ function Panel({ open, onOpenChange, renderAnchor = defaultRenderAnchor, anchorR
|
|
|
372
432
|
isItemCurrentlySelected,
|
|
373
433
|
isSingleSelectModal,
|
|
374
434
|
intermediateSelected,
|
|
435
|
+
open,
|
|
375
436
|
shouldOrderSelectedFirst,
|
|
376
437
|
selectedOnSort
|
|
377
438
|
]);
|
|
378
|
-
const prevItemsRef = useRef(items);
|
|
379
|
-
useEffect(() => {
|
|
380
|
-
if (prevItemsRef.current !== items) {
|
|
381
|
-
if (prevItemsRef.current.length === 0 && items.length > 0) resetSort();
|
|
382
|
-
prevItemsRef.current = items;
|
|
383
|
-
}
|
|
384
|
-
}, [items, resetSort]);
|
|
385
|
-
const prevOpenRef = useRef(open);
|
|
386
|
-
useEffect(() => {
|
|
387
|
-
if (prevOpenRef.current !== open) {
|
|
388
|
-
resetSort();
|
|
389
|
-
prevOpenRef.current = open;
|
|
390
|
-
}
|
|
391
|
-
}, [open, resetSort]);
|
|
392
439
|
const focusTrapSettings = useMemo(() => ({ initialFocusRef: inputRef || void 0 }), [inputRef]);
|
|
393
440
|
const extendedTextInputProps = useMemo(() => {
|
|
394
441
|
return {
|
package/package.json
CHANGED