Skip to content

Remove clear button in Search if readOnly #305

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devongovett merged 4 commits into from
Mar 24, 2020
Merged

Remove clear button in Search if readOnly #305

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9ec611
remove clearbtn if readOnly
Mar 24, 2020
f89924e
linty
Mar 24, 2020
c56688f
Merge branch 'master' into search_clear
dannify Mar 24, 2020
f7eed15
Merge branch 'master' into search_clear
dannify Mar 24, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/@react-spectrum/searchfield/src/SearchField.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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} />
);
}

Expand Down
7 changes: 7 additions & 0 deletions packages/@react-spectrum/searchfield/test/SearchField.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 value="puppy" />);
let clearButton = tree.queryByLabelText('Clear search');
expect(clearButton).toBe(null);

});
});