From 9a657c5551e4350427a164f48fb0a4d772aec5e0 Mon Sep 17 00:00:00 2001
From: Tom Schindl <tom.schindl@bestsolution.at>
Date: Tue, 1 Dec 2020 20:33:18 +0100
Subject: [PATCH] provide autofocus property

---
 packages/@react-spectrum/picker/src/Picker.tsx           | 4 +++-
 .../@react-spectrum/picker/stories/Picker.stories.tsx    | 9 ++++++++-
 packages/@react-types/select/src/index.d.ts              | 4 +++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/packages/@react-spectrum/picker/src/Picker.tsx b/packages/@react-spectrum/picker/src/Picker.tsx
index 4ea1c424f18..c8ebda2f9d6 100644
--- a/packages/@react-spectrum/picker/src/Picker.tsx
+++ b/packages/@react-spectrum/picker/src/Picker.tsx
@@ -55,7 +55,8 @@ function Picker<T extends object>(props: SpectrumPickerProps<T>, ref: DOMRef<HTM
     isRequired,
     necessityIndicator,
     menuWidth,
-    name
+    name,
+    autoFocus
   } = props;
 
   let {styleProps} = useStyleProps(props);
@@ -212,6 +213,7 @@ function Picker<T extends object>(props: SpectrumPickerProps<T>, ref: DOMRef<HTM
           isQuiet={isQuiet}
           isDisabled={isDisabled}
           validationState={validationState}
+          autoFocus={autoFocus}
           UNSAFE_className={classNames(styles, 'spectrum-Dropdown-trigger', {'is-hovered': isHovered})}>
           <SlotProvider
             slots={{
diff --git a/packages/@react-spectrum/picker/stories/Picker.stories.tsx b/packages/@react-spectrum/picker/stories/Picker.stories.tsx
index 18325e38c93..29a43f5d07a 100644
--- a/packages/@react-spectrum/picker/stories/Picker.stories.tsx
+++ b/packages/@react-spectrum/picker/stories/Picker.stories.tsx
@@ -500,7 +500,14 @@ storiesOf('Picker', module)
       <AsyncLoadingExample />
     )
   )
-  .add('resize', () => <ResizePicker />);
+  .add('resize', () => <ResizePicker />)
+  .add('autofocus', () => (
+    <Picker label="Test" autoFocus>
+      <Item key="One">One</Item>
+      <Item key="Two">Two</Item>
+      <Item key="Three">Three</Item>
+    </Picker>
+  ));
 
 function AsyncLoadingExample() {
   interface Pokemon {
diff --git a/packages/@react-types/select/src/index.d.ts b/packages/@react-types/select/src/index.d.ts
index afb5a692530..ece6c0eeef5 100644
--- a/packages/@react-types/select/src/index.d.ts
+++ b/packages/@react-types/select/src/index.d.ts
@@ -59,5 +59,7 @@ export interface SpectrumPickerProps<T> extends AriaSelectProps<T>, SpectrumLabe
   /**
    * The name of the Picker input, used when submitting an HTML form.
    */
-  name?: string
+  name?: string,
+  /** Whether the element should receive focus on render. */
+  autoFocus?: boolean
 }