Skip to content

fix: Picker default text display #8959

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 2, 2025
Merged

fix: Picker default text display #8959

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
97391fa
fix: Picker SelectedValue default slot display
snowystinger Oct 2, 2025
fe8fa58
add an identifier so we can display the default text slot
snowystinger Oct 2, 2025
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
30 changes: 19 additions & 11 deletions packages/@react-spectrum/s2/src/Picker.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -532,7 +532,7 @@ const PickerButton = createHideableComponent(function PickerButton<T extends obj
})}>
{(renderProps) => (
<>
<SelectValue className={valueStyles({isQuiet}) + ' ' + raw('&> :not([slot=icon], [slot=avatar], [slot=label]) {display: none;}')}>
<SelectValue className={valueStyles({isQuiet}) + ' ' + raw('&> :not([slot=icon], [slot=avatar], [slot=label], [data-slot=label]) {display: none;}')}>
{({selectedItems, defaultChildren}) => {
return (
<Provider
Expand All @@ -556,16 +556,24 @@ const PickerButton = createHideableComponent(function PickerButton<T extends obj
[TextContext, {
slots: {
description: {},
[DEFAULT_SLOT]: {styles: style({
display: 'block',
flexGrow: 1,
truncate: true
})},
label: {styles: style({
display: 'block',
flexGrow: 1,
truncate: true
})}
[DEFAULT_SLOT]: {
styles: style({
display: 'block',
flexGrow: 1,
truncate: true
}),
// @ts-ignore
'data-slot': 'label'
},
label: {
styles: style({
display: 'block',
flexGrow: 1,
truncate: true
}),
// @ts-ignore not technically necessary, but good for consistency
'data-slot': 'label'
}
}
}],
[InsideSelectValueContext, true]
Expand Down
6 changes: 3 additions & 3 deletions packages/@react-spectrum/s2/stories/Picker.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,17 +153,17 @@ export const WithAvatars: Story = {
<Picker {...args}>
<PickerItem textValue="User One">
<Avatar slot="avatar" src={SRC_URL_1} />
<Text slot="label">User One</Text>
<Text>User One</Text>
<Text slot="description">user.one@example.com</Text>
</PickerItem>
<PickerItem textValue="User Two">
<Avatar slot="avatar" src={SRC_URL_2} />
<Text slot="label">User Two</Text>
<Text>User Two</Text>
<Text slot="description">user.two@example.com<br />123-456-7890</Text>
</PickerItem>
<PickerItem textValue="User Three">
<Avatar slot="avatar" src={SRC_URL_2} />
<Text slot="label">User Three</Text>
<Text>User Three</Text>
</PickerItem>
</Picker>
),
Expand Down
Loading