From aadb3c936a79382d111949eea1ffb1356bf9ed97 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 18 Feb 2026 15:40:41 -0600
Subject: [PATCH 1/4] docs: improve custom Render Value Picker example

---
 packages/dev/s2-docs/pages/s2/Picker.mdx | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/packages/dev/s2-docs/pages/s2/Picker.mdx b/packages/dev/s2-docs/pages/s2/Picker.mdx
index 012c6e136e1..ab7574f3a65 100644
--- a/packages/dev/s2-docs/pages/s2/Picker.mdx
+++ b/packages/dev/s2-docs/pages/s2/Picker.mdx
@@ -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 (
@@ -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 -///
       >

From e7a65fb17ee8dc2c678f6f9137fc9a25b03d5cc9 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Wed, 18 Feb 2026 18:16:50 -0600
Subject: [PATCH 2/4] fix empty tree story

---
 .../tree/stories/TreeView.stories.tsx          | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
index b678f3fc406..a7bfc390d5c 100644
--- a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
+++ b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
@@ -383,10 +383,22 @@ export function renderEmptyState(): JSX.Element {
   );
 }
 
-export const EmptyTree: StoryObj<typeof TreeExampleDynamic> = {
-  ...TreeExampleDynamic,
+export const EmptyTree: StoryObj<typeof TreeView> = {
+  render: (args: SpectrumTreeViewProps<unknown>) => (
+    <div style={{width: '300px', resize: 'both', height: '90vh', overflow: 'auto'}}>
+      <TreeView aria-label="test empty tree" onExpandedChange={action('onExpandedChange')} onSelectionChange={action('onSelectionChange')} {...args}>
+        {(item: any) => (
+          <DynamicTreeItem
+            id={item.id}
+            icon={item.icon}
+            childItems={item.childItems}
+            textValue={item.name}
+            name={item.name} />
+        )}
+      </TreeView>
+    </div>
+  ),
   args: {
-    ...TreeExampleDynamic.args,
     items: [],
     renderEmptyState
   },

From d7481544bb9a02c3730974d7871836e3ca7b81b6 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Thu, 19 Feb 2026 10:15:35 -0600
Subject: [PATCH 3/4] fix order of TreeExampleStatic spread

---
 .../tree/stories/TreeView.stories.tsx           | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
index a7bfc390d5c..c0501dce2aa 100644
--- a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
+++ b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
@@ -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}>
@@ -331,7 +332,6 @@ export const TreeExampleDynamic: StoryObj<typeof TreeView> = {
       </TreeView>
     </div>
   ),
-  ...TreeExampleStatic,
   parameters: undefined
 };
 
@@ -384,20 +384,7 @@ export function renderEmptyState(): JSX.Element {
 }
 
 export const EmptyTree: StoryObj<typeof TreeView> = {
-  render: (args: SpectrumTreeViewProps<unknown>) => (
-    <div style={{width: '300px', resize: 'both', height: '90vh', overflow: 'auto'}}>
-      <TreeView aria-label="test empty tree" onExpandedChange={action('onExpandedChange')} onSelectionChange={action('onSelectionChange')} {...args}>
-        {(item: any) => (
-          <DynamicTreeItem
-            id={item.id}
-            icon={item.icon}
-            childItems={item.childItems}
-            textValue={item.name}
-            name={item.name} />
-        )}
-      </TreeView>
-    </div>
-  ),
+  ...TreeExampleDynamic,
   args: {
     items: [],
     renderEmptyState

From 23bc0778a7ad322c77f4cafa5916e7cff1ae3818 Mon Sep 17 00:00:00 2001
From: Reid Barber <reid@reidbarber.com>
Date: Thu, 19 Feb 2026 10:18:02 -0600
Subject: [PATCH 4/4] revert EmptyTree back to original

---
 packages/@react-spectrum/tree/stories/TreeView.stories.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
index c0501dce2aa..e81a319b30c 100644
--- a/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
+++ b/packages/@react-spectrum/tree/stories/TreeView.stories.tsx
@@ -383,9 +383,10 @@ export function renderEmptyState(): JSX.Element {
   );
 }
 
-export const EmptyTree: StoryObj<typeof TreeView> = {
+export const EmptyTree: StoryObj<typeof TreeExampleDynamic> = {
   ...TreeExampleDynamic,
   args: {
+    ...TreeExampleDynamic.args,
     items: [],
     renderEmptyState
   },