From e9ec611180cd1e6c5385cd71910bd23c951a61c4 Mon Sep 17 00:00:00 2001
From: Danni <drobins@adobe.com>
Date: Mon, 23 Mar 2020 18:56:44 -0700
Subject: [PATCH 1/2] remove clearbtn if readOnly

---
 packages/@react-spectrum/searchfield/src/SearchField.tsx   | 6 +++---
 .../@react-spectrum/searchfield/test/SearchField.test.js   | 7 +++++++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/packages/@react-spectrum/searchfield/src/SearchField.tsx b/packages/@react-spectrum/searchfield/src/SearchField.tsx
index 0067164f425..050741455e9 100644
--- a/packages/@react-spectrum/searchfield/src/SearchField.tsx
+++ b/packages/@react-spectrum/searchfield/src/SearchField.tsx
@@ -25,8 +25,8 @@ import {useSearchFieldState} from '@react-stately/searchfield';
 function SearchField(props: SpectrumSearchFieldProps, ref: RefObject<TextFieldRef>) {
   props = useProviderProps(props);
   let defaultIcon = (
-    <Magnifier 
-      data-testid="searchicon" 
+    <Magnifier
+      data-testid="searchicon"
       UNSAFE_className={
         classNames(
           styles,
@@ -86,7 +86,7 @@ function SearchField(props: SpectrumSearchFieldProps, ref: RefObject<TextFieldRe
       icon={icon}
       onChange={state.setValue}
       value={state.value}
-      wrapperChildren={state.value !== '' && clearButton} />
+      wrapperChildren={(state.value !== '' && !props.isReadOnly) && clearButton} />
   );
 }
 
diff --git a/packages/@react-spectrum/searchfield/test/SearchField.test.js b/packages/@react-spectrum/searchfield/test/SearchField.test.js
index 283bde99ab2..0539c745990 100644
--- a/packages/@react-spectrum/searchfield/test/SearchField.test.js
+++ b/packages/@react-spectrum/searchfield/test/SearchField.test.js
@@ -273,4 +273,11 @@ describe('Search', () => {
       expect(onClear).toBeCalledTimes(0);
     }
   });
+
+  it('SearchField doesn\'t show clear button if isReadOnly is true', () => {
+    let tree = render(<SearchField isReadOnly={true} value="puppy" />);
+    let clearButton = tree.queryByLabelText('Clear search');
+    expect(clearButton).toBe(null);
+
+  });
 });

From f89924eea8aaa979a832bc2d5e73339773dfc968 Mon Sep 17 00:00:00 2001
From: Danni <drobins@adobe.com>
Date: Mon, 23 Mar 2020 19:12:47 -0700
Subject: [PATCH 2/2] linty

---
 packages/@react-spectrum/searchfield/test/SearchField.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/@react-spectrum/searchfield/test/SearchField.test.js b/packages/@react-spectrum/searchfield/test/SearchField.test.js
index 0539c745990..790f49e30f7 100644
--- a/packages/@react-spectrum/searchfield/test/SearchField.test.js
+++ b/packages/@react-spectrum/searchfield/test/SearchField.test.js
@@ -275,7 +275,7 @@ describe('Search', () => {
   });
 
   it('SearchField doesn\'t show clear button if isReadOnly is true', () => {
-    let tree = render(<SearchField isReadOnly={true} value="puppy" />);
+    let tree = render(<SearchField isReadOnly value="puppy" />);
     let clearButton = tree.queryByLabelText('Clear search');
     expect(clearButton).toBe(null);