Fix bad merge
This commit is contained in:
parent
d623431386
commit
a259e976ab
1 changed files with 2 additions and 11 deletions
|
|
@ -50,13 +50,7 @@ const FilterModal = (props: Props) => {
|
||||||
const [chargeAttackOpen, setChargeAttackOpen] = useState(false)
|
const [chargeAttackOpen, setChargeAttackOpen] = useState(false)
|
||||||
const [fullAutoOpen, setFullAutoOpen] = useState(false)
|
const [fullAutoOpen, setFullAutoOpen] = useState(false)
|
||||||
const [autoGuardOpen, setAutoGuardOpen] = useState(false)
|
const [autoGuardOpen, setAutoGuardOpen] = useState(false)
|
||||||
|
|
||||||
const [filterSet, setFilterSet] = useState<FilterSet>({})
|
const [filterSet, setFilterSet] = useState<FilterSet>({})
|
||||||
const [minWeaponCount, setMinWeaponCount] = useState(5)
|
|
||||||
const [minSummonCount, setMinSummonCount] = useState(2)
|
|
||||||
|
|
||||||
const [maxButtonsCount, setMaxButtonsCount] = useState(0)
|
|
||||||
const [maxTurnsCount, setMaxTurnsCount] = useState(0)
|
|
||||||
|
|
||||||
// Filter states
|
// Filter states
|
||||||
const [fullAuto, setFullAuto] = useState(props.defaultFilterSet.full_auto)
|
const [fullAuto, setFullAuto] = useState(props.defaultFilterSet.full_auto)
|
||||||
|
|
@ -71,11 +65,8 @@ const FilterModal = (props: Props) => {
|
||||||
props.defaultFilterSet.weapons_count
|
props.defaultFilterSet.weapons_count
|
||||||
)
|
)
|
||||||
const [minSummonCount, setMinSummonCount] = useState(
|
const [minSummonCount, setMinSummonCount] = useState(
|
||||||
props.filterSet.summons_count
|
|
||||||
)
|
|
||||||
const [minSummonCount, setMinSummonCount] = useState(DEFAULT_MIN_SUMMONS)
|
|
||||||
props.defaultFilterSet.summons_count
|
props.defaultFilterSet.summons_count
|
||||||
|
)
|
||||||
const [maxButtonsCount, setMaxButtonsCount] = useState(
|
const [maxButtonsCount, setMaxButtonsCount] = useState(
|
||||||
props.defaultFilterSet.button_count
|
props.defaultFilterSet.button_count
|
||||||
)
|
)
|
||||||
|
|
@ -118,7 +109,7 @@ const FilterModal = (props: Props) => {
|
||||||
setOriginalOnly(filterSet.original)
|
setOriginalOnly(filterSet.original)
|
||||||
}, [filterSet])
|
}, [filterSet])
|
||||||
|
|
||||||
function sendFilters() {
|
function openSelect(name: 'charge_attack' | 'full_auto' | 'auto_guard') {
|
||||||
setChargeAttackOpen(name === 'charge_attack' ? !chargeAttackOpen : false)
|
setChargeAttackOpen(name === 'charge_attack' ? !chargeAttackOpen : false)
|
||||||
setFullAutoOpen(name === 'full_auto' ? !fullAutoOpen : false)
|
setFullAutoOpen(name === 'full_auto' ? !fullAutoOpen : false)
|
||||||
setAutoGuardOpen(name === 'auto_guard' ? !autoGuardOpen : false)
|
setAutoGuardOpen(name === 'auto_guard' ? !autoGuardOpen : false)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue