From e6d26f6dcd1b1755c95ac2cd19ceb083d123dbc1 Mon Sep 17 00:00:00 2001
From: Michael Jordan <mijordan@adobe.com>
Date: Tue, 29 Nov 2022 12:33:44 -0500
Subject: [PATCH 1/2] fix(#3800): MobileSearchAutocomplete: focused style
 persists on blur

---
 .../autocomplete/src/MobileSearchAutocomplete.tsx               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx b/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
index 19057471192..f16e086f971 100644
--- a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
+++ b/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
@@ -227,7 +227,7 @@ const SearchAutocompleteButton = React.forwardRef(function SearchAutocompleteBut
 
   return (
     <div
-      {...mergeProps(hoverProps, focusProps, buttonProps)}
+      {...mergeProps(buttonProps, focusProps, hoverProps)}
       aria-haspopup="dialog"
       ref={ref}
       style={{...style, outline: 'none'}}

From 25e19a0c4d01ebac59a819acdf060d2c7b195205 Mon Sep 17 00:00:00 2001
From: Rob Snow <rsnow@adobe.com>
Date: Mon, 19 Dec 2022 17:45:15 -0600
Subject: [PATCH 2/2] Fix event handler so it can be chained

---
 packages/@react-aria/interactions/src/useFocus.ts               | 2 +-
 .../autocomplete/src/MobileSearchAutocomplete.tsx               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/@react-aria/interactions/src/useFocus.ts b/packages/@react-aria/interactions/src/useFocus.ts
index fc3bfbcc018..77f43d62716 100644
--- a/packages/@react-aria/interactions/src/useFocus.ts
+++ b/packages/@react-aria/interactions/src/useFocus.ts
@@ -75,7 +75,7 @@ export function useFocus(props: FocusProps): FocusResult {
   return {
     focusProps: {
       onFocus: (!isDisabled && (onFocusProp || onFocusChange || onBlurProp)) ? onFocus : undefined,
-      onBlur: (!isDisabled && (onBlurProp || onFocusChange)) ? onBlur : null
+      onBlur: (!isDisabled && (onBlurProp || onFocusChange)) ? onBlur : undefined
     }
   };
 }
diff --git a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx b/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
index f16e086f971..19057471192 100644
--- a/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
+++ b/packages/@react-spectrum/autocomplete/src/MobileSearchAutocomplete.tsx
@@ -227,7 +227,7 @@ const SearchAutocompleteButton = React.forwardRef(function SearchAutocompleteBut
 
   return (
     <div
-      {...mergeProps(buttonProps, focusProps, hoverProps)}
+      {...mergeProps(hoverProps, focusProps, buttonProps)}
       aria-haspopup="dialog"
       ref={ref}
       style={{...style, outline: 'none'}}