Skip to content

[pull] main from adobe:main #302

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
pull merged 1 commit into from
Feb 20, 2026
Merged

[pull] main from adobe:main #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion packages/@react-spectrum/tree/stories/TreeView.stories.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,7 @@ const DynamicTreeItem = (props) => {
};

export const TreeExampleDynamic: StoryObj<typeof TreeView> = {
...TreeExampleStatic,
render: (args: SpectrumTreeViewProps<unknown>) => (
<div style={{width: '300px', resize: 'both', height: '90vh', overflow: 'auto'}}>
<TreeView disabledKeys={['reports-1AB']} aria-label="test dynamic tree" items={rows} onExpandedChange={action('onExpandedChange')} onSelectionChange={action('onSelectionChange')} {...args}>
Expand All @@ -331,7 +332,6 @@ export const TreeExampleDynamic: StoryObj<typeof TreeView> = {
</TreeView>
</div>
),
...TreeExampleStatic,
parameters: undefined
};

Expand Down
11 changes: 6 additions & 5 deletions packages/dev/s2-docs/pages/s2/Picker.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,15 +249,16 @@ Use the `renderValue` prop to provide a custom element to display selected items

```tsx render
"use client";
import {Avatar, Picker, PickerItem, Text} from '@react-spectrum/s2';
import {style} from '@react-spectrum/s2/style' with {type: 'macro'};
import {Avatar, AvatarGroup, Picker, PickerItem, Text} from '@react-spectrum/s2';

///- begin collapse -///
let users = [
{id: 'abraham-baker', avatar: 'https://www.untitledui.com/images/avatars/abraham-baker', name: 'Abraham Baker', email: 'abraham@example.com'},
{id: 'adriana-sullivan', avatar: 'https://www.untitledui.com/images/avatars/adriana-sullivan', name: 'Adriana Sullivan', email: 'adriana@example.com'},
{id: 'jonathan-kelly', avatar: 'https://www.untitledui.com/images/avatars/jonathan-kelly', name: 'Jonathan Kelly', email: 'jonathan@example.com'},
{id: 'zara-bush', avatar: 'https://www.untitledui.com/images/avatars/zara-bush', name: 'Zara Bush', email: 'zara@example.com'}
];
///- end collapse -///

function Example() {
return (
Expand All @@ -268,11 +269,11 @@ function Example() {
selectionMode={"multiple"}
///- begin highlight -///
renderValue={(selectedItems) => (
<div className={style({ display: 'flex', gap: 4, height: '80%' })}>
<AvatarGroup aria-label="Selected users">
{selectedItems.map(item => (
<Avatar slot={null} key={item.id} src={item.avatar} alt={item.name} />
<Avatar key={item.id} src={item.avatar} alt={item.name} />
))}
</div>
</AvatarGroup>
)}
///- end highlight -///
>
Expand Down
Loading