@@ -30,12 +30,10 @@ class FilterGroup extends Component {
30
30
this . props . onGroupSelectChange ( key , true ) ;
31
31
} ;
32
32
33
- onDeselectAllClick = ( {
34
- currentTarget : {
35
- dataset : { key } ,
36
- } ,
37
- } ) => {
38
- this . props . onGroupSelectChange ( key , false ) ;
33
+ onDeselectAllClick = ( e ) => {
34
+ this . props . onGroupSelectChange ( e . currentTarget . dataset . key , false ) ;
35
+ e . stopPropagation ( ) ;
36
+ e . preventDefault ( ) ;
39
37
} ;
40
38
41
39
attachFiltersClicks ( ) {
@@ -52,7 +50,7 @@ class FilterGroup extends Component {
52
50
this . filtersContainerRef
53
51
) ;
54
52
const deselectAllRefs = findRefs (
55
- "button .deselectAll" ,
53
+ "span .deselectAll" ,
56
54
this . filtersContainerRef
57
55
) ;
58
56
@@ -87,7 +85,8 @@ class FilterGroup extends Component {
87
85
88
86
getFirstSelected ( filterKey , values ) {
89
87
const sortedValues = this . getSortedValues ( filterKey , values ) ;
90
- return sortedValues . find ( ( [ _name , filterObject ] ) => filterObject . selected ) [ 0 ] || "" ;
88
+ const firstSelected = sortedValues . find ( ( [ _name , filterObject ] ) => filterObject . selected ) ;
89
+ return firstSelected ? firstSelected [ 0 ] : "" ;
91
90
}
92
91
93
92
getNumberOfSelectedFilters = ( filterKey , values ) => {
@@ -109,10 +108,13 @@ class FilterGroup extends Component {
109
108
110
109
return `
111
110
<div class="pill-container body-small" tabindex="1">
112
- <div class="pill ${ numberToDisplay !== "" ? "has-value" : "" } ">
111
+ <div class="pill ${ numberOfSelectedFilters > 0 ? "has-value" : "" } ">
113
112
<span class="filter-name">${ filterKey . substring ( 1 ) } </span>
114
113
${ firstSelected } ${ numberToDisplay }
115
- <span class="icon-button close"/>
114
+ <span
115
+ class="icon-button close deselectAll"
116
+ data-key="${ filterKey } "
117
+ />
116
118
</div>
117
119
<ul>
118
120
${ this . getSortedValues ( filterKey , values )
@@ -125,6 +127,11 @@ class FilterGroup extends Component {
125
127
data-key="${ filterKey } "
126
128
data-selected="${ data . selected } "
127
129
data-value="${ key } "
130
+ ${ this . isActive (
131
+ data . selected
132
+ ) } ${ this . isVisible (
133
+ data . visible
134
+ ) } "
128
135
>
129
136
${ key }
130
137
</li>`
0 commit comments