pull/2773/head
Uku Taht 4 years ago
parent fdd1ab65d3
commit 12e7ac869e

@ -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) {
<div onClick={toggleOpen} className="pl-2 pr-4 py-1 flex flex-1 items-center flex-wrap w-full dark:bg-gray-900 dark:text-gray-300 rounded-md shadow-sm border border-gray-300 dark:border-gray-700 hover:border-gray-400 dark:hover:border-gray-200 focus-within:border-indigo-500">
{ props.values.map((value) => {
return (
<span key={value.value} className="bg-indigo-100 rounded-sm px-2 py-0.5 mx-1 my-0.5 text-sm">{value.label} <button onClick={() => removeOption(value)} className="font-bold ml-1">&times;</button></span>
<span key={value.value} className="bg-indigo-100 rounded-sm px-2 py-0.5 mx-1 my-0.5 text-sm">{value.label} <button onClick={(e) => removeOption(value, e)} className="font-bold ml-1">&times;</button></span>
)
})
}

@ -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
}
}

Loading…
Cancel
Save