diff --git a/assets/js/dashboard/components/combobox.js b/assets/js/dashboard/components/combobox.js
index 3253ab767..9b2e1ba9c 100644
--- a/assets/js/dashboard/components/combobox.js
+++ b/assets/js/dashboard/components/combobox.js
@@ -40,18 +40,21 @@ export default function PlausibleCombobox(props) {
}
function selectOption(option) {
- props.onChange([...props.values, option])
- if (searchRef.current.value !== '') {
+ props.onChange([...props.values, option], () => {
+ setOptions(options.filter(o => o != option))
searchRef.current.value = ''
- fetchOptions('')
- }
- searchRef.current.focus()
+ searchRef.current.focus()
+ })
}
- function removeOption(option) {
+ function removeOption(option, e) {
+ e.stopPropagation()
const newValues = props.values.filter((val) => val.value !== option.value)
- props.onChange(newValues)
- searchRef.current.focus()
+ props.onChange(newValues, () => {
+ searchRef.current.focus()
+ setOpen(true)
+ fetchOptions(searchRef.current.value)
+ })
}
const handleClick = useCallback((e) => {
@@ -73,7 +76,7 @@ export default function PlausibleCombobox(props) {
{ props.values.map((value) => {
return (
- {value.label}
+ {value.label}
)
})
}
diff --git a/assets/js/dashboard/stats/modals/filter.js b/assets/js/dashboard/stats/modals/filter.js
index ecfe4ad86..e781633f3 100644
--- a/assets/js/dashboard/stats/modals/filter.js
+++ b/assets/js/dashboard/stats/modals/filter.js
@@ -108,12 +108,12 @@ class FilterModal extends React.Component {
}
onChange(filterName) {
- return (selection) => {
+ return (selection, callback) => {
this.setState(prevState => ({
formState: Object.assign(prevState.formState, {
[filterName]: Object.assign(prevState.formState[filterName], { clauses: selection })
})
- }))
+ }), callback)
}
}
@@ -144,7 +144,17 @@ class FilterModal extends React.Component {
const propsFilter = formFilters.prop_key ? { [formFilters.prop_key]: '!(none)' } : null
return { ...query, filters: { ...query.filters, props: propsFilter } }
} else {
- return { ...query, filters: { ...query.filters, ...formFilters, [filter]: null } }
+ return { ...query, filters: { ...query.filters, ...formFilters, [filter]: this.negate(formFilters[filter]) } }
+ }
+ }
+
+ negate(filterVal) {
+ if (!filterVal) {
+ return filterVal
+ } else if (filterVal.startsWith('!')) {
+ return filterVal
+ } else {
+ return '!' + filterVal
}
}