Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/four-penguins-dance.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@primer/react": patch
---

fix(SelectPanel): prioritize message over loading status
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ export const HeightInitialWithUnderflowingItemsAfterFetch = () => {
placeholder="Select labels" // button text when no items are selected
open={open}
onOpenChange={onOpenChange}
loading={filteredItems.length === 0 && !filter}
loading={fetchedItems.length === 0}
items={filteredItems}
selected={selected}
onSelectedChange={setSelected}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -679,14 +679,17 @@ export const CustomisedNoResults: StoryObj<typeof SelectPanel> = {
const [open, setOpen] = useState(false)
const filterTimerId = useRef<number | null>(null)
const {safeSetTimeout, safeClearTimeout} = useSafeTimeout()
const [loading, setLoading] = useState(false)
const onFilterChange = (value: string) => {
setFilterValue(value)
if (filterTimerId.current) {
safeClearTimeout(filterTimerId.current)
}
setLoading(true)

filterTimerId.current = safeSetTimeout(() => {
setFilteredItems(items.filter(item => item.text.toLowerCase().startsWith(value.toLowerCase())))
setLoading(false)
}, 2000) as unknown as number
}

Expand All @@ -713,6 +716,7 @@ export const CustomisedNoResults: StoryObj<typeof SelectPanel> = {
onFilterChange={onFilterChange}
showItemDividers={true}
initialLoadingType={initialLoadingType}
loading={loading}
height={height}
overlayProps={{maxHeight: height === 'auto' || height === 'initial' ? 'xlarge' : height}}
message={filteredItems.length === 0 ? NoResultsMessage(filterValue) : undefined}
Expand Down
2 changes: 1 addition & 1 deletion packages/react/src/SelectPanel/SelectPanel.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ function Panel({
selectionVariant={isSingleSelectModal ? 'radio' : isMultiSelectVariant(selected) ? 'multiple' : 'single'}
items={itemsToRender}
textInputProps={extendedTextInputProps}
loading={loading || isLoading}
loading={loading || (isLoading && !message)}
loadingType={loadingType()}
// hack because the deprecated ActionList does not support this prop
{...{
Expand Down
Loading