diff --git a/modules/search/instant-search/components/search-filters.jsx b/modules/search/instant-search/components/search-filters.jsx index b428756c6614..0b56c62b8952 100644 --- a/modules/search/instant-search/components/search-filters.jsx +++ b/modules/search/instant-search/components/search-filters.jsx @@ -22,9 +22,16 @@ export default class SearchFilters extends Component { this.props.onChange && this.props.onChange(); }; - onClearFilters = () => { - clearFiltersFromQuery(); - this.props.onChange && this.props.onChange(); + onClearFilters = event => { + event.preventDefault(); + + if ( + event.type === 'click' || + ( event.type === 'keydown' && ( event.key === 'Enter' || event.key === ' ' ) ) + ) { + clearFiltersFromQuery(); + this.props.onChange && this.props.onChange(); + } }; hasActiveFilters() { @@ -94,12 +101,16 @@ export default class SearchFilters extends Component { return (
{ this.hasActiveFilters() && ( - + { __( 'Clear filters', 'jetpack' ) } + ) } { get( this.props.widget, 'filters' ) .map( configuration => diff --git a/modules/search/instant-search/components/search-filters.scss b/modules/search/instant-search/components/search-filters.scss index 679a4ebb94c8..d88a531f227e 100644 --- a/modules/search/instant-search/components/search-filters.scss +++ b/modules/search/instant-search/components/search-filters.scss @@ -19,6 +19,6 @@ cursor: pointer; } -.jetpack-instant-search__clear-filters-button { +.jetpack-instant-search__clear-filters-link { margin-bottom: 1em; }