From 20aabf902efae358082a6f9fda1ae2b3bfbb67ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guzm=C3=A1n?= <guzlosan@gmail.com>
Date: Wed, 10 Sep 2025 17:54:07 +0200
Subject: [PATCH 1/2] Add autoFocusOption prop

---
 packages/react-select/src/Select.tsx | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/Select.tsx
index 146d084e20..596a344f96 100644
--- a/packages/react-select/src/Select.tsx
+++ b/packages/react-select/src/Select.tsx
@@ -92,6 +92,8 @@ export interface Props<
   ariaLiveMessages?: AriaLiveMessages<Option, IsMulti, Group>;
   /** Focus the control when it is mounted */
   autoFocus?: boolean;
+  /** Focus an option when no inputValue is given */
+  autoFocusOption?: boolean;
   /** Remove the currently focused option when the user presses backspace when Select isClearable or isMulti */
   backspaceRemovesValue: boolean;
   /** Remove focus from the input when the user selects an option (handy for dismissing the keyboard on touch devices) */
@@ -281,6 +283,7 @@ export interface Props<
 
 export const defaultProps = {
   'aria-live': 'polite',
+  autoFocusOption: true,
   backspaceRemovesValue: true,
   blurInputOnSelect: isTouchCapable(),
   captureMenuScroll: !isTouchCapable(),
@@ -529,11 +532,17 @@ function getNextFocusedOption<
   Option,
   IsMulti extends boolean,
   Group extends GroupBase<Option>
->(state: State<Option, IsMulti, Group>, options: Options<Option>) {
+>(
+  props: Props<Option, IsMulti, Group>,
+  state: State<Option, IsMulti, Group>,
+  options: Options<Option>,
+) {
   const { focusedOption: lastFocusedOption } = state;
-  return lastFocusedOption && options.indexOf(lastFocusedOption) > -1
-    ? lastFocusedOption
-    : options[0];
+  const { autoFocusOption } = props;
+  if (lastFocusedOption && options.indexOf(lastFocusedOption) > -1) {
+    return lastFocusedOption;
+  }
+  return (!props.inputValue && !autoFocusOption) ? null : options[0];
 }
 
 const getFocusedOptionId = <Option,>(
@@ -740,7 +749,7 @@ export default class Select<
       const focusedValue = clearFocusValueOnUpdate
         ? getNextFocusedValue(state, selectValue)
         : null;
-      const focusedOption = getNextFocusedOption(state, focusableOptions);
+      const focusedOption = getNextFocusedOption(props, state, focusableOptions);
       const focusedOptionId = getFocusedOptionId(
         focusableOptionsWithIds,
         focusedOption
@@ -903,6 +912,7 @@ export default class Select<
 
   openMenu(focusOption: 'first' | 'last') {
     const { selectValue, isFocused } = this.state;
+    const { autoFocusOption } = this.props;
     const focusableOptions = this.buildFocusableOptions();
     let openAtIndex = focusOption === 'first' ? 0 : focusableOptions.length - 1;
 
@@ -920,7 +930,7 @@ export default class Select<
       {
         inputIsHiddenAfterUpdate: false,
         focusedValue: null,
-        focusedOption: focusableOptions[openAtIndex],
+        focusedOption: autoFocusOption ? focusableOptions[openAtIndex] : null,
         focusedOptionId: this.getFocusedOptionId(focusableOptions[openAtIndex]),
       },
       () => this.onMenuOpen()

From a38c87e0171d5311279dc6ab88c9528b1a166b10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Guzm=C3=A1n?= <guzlosan@gmail.com>
Date: Thu, 11 Sep 2025 10:27:56 +0200
Subject: [PATCH 2/2] Prettify code

---
 packages/react-select/src/Select.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/react-select/src/Select.tsx b/packages/react-select/src/Select.tsx
index 596a344f96..d2fc5bb257 100644
--- a/packages/react-select/src/Select.tsx
+++ b/packages/react-select/src/Select.tsx
@@ -535,14 +535,14 @@ function getNextFocusedOption<
 >(
   props: Props<Option, IsMulti, Group>,
   state: State<Option, IsMulti, Group>,
-  options: Options<Option>,
+  options: Options<Option>
 ) {
   const { focusedOption: lastFocusedOption } = state;
   const { autoFocusOption } = props;
   if (lastFocusedOption && options.indexOf(lastFocusedOption) > -1) {
     return lastFocusedOption;
   }
-  return (!props.inputValue && !autoFocusOption) ? null : options[0];
+  return !props.inputValue && !autoFocusOption ? null : options[0];
 }
 
 const getFocusedOptionId = <Option,>(
@@ -749,7 +749,11 @@ export default class Select<
       const focusedValue = clearFocusValueOnUpdate
         ? getNextFocusedValue(state, selectValue)
         : null;
-      const focusedOption = getNextFocusedOption(props, state, focusableOptions);
+      const focusedOption = getNextFocusedOption(
+        props,
+        state,
+        focusableOptions
+      );
       const focusedOptionId = getFocusedOptionId(
         focusableOptionsWithIds,
         focusedOption