ntr/mnml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

combiner fixes

Browse Source
This commit is contained in:
ntr 2019-10-15 11:36:15 +11:00
parent f2a516b5f0
commit eaf50c3a26
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/vbox.component.jsx
View File

@ -248,15 +248,24 @@ function Vbox(args) {
function onClick(e) { function onClick(e) {
if (vboxSelecting) clearVboxSelected(); if (vboxSelecting) clearVboxSelected();
if (reclaiming) return sendVboxReclaim(i); if (reclaiming) return sendVboxReclaim(i);
// 4 things selected
if (combiner.length > 2) return combinerChange([i]); if (combiner.length > 2) return combinerChange([i]);
// removing
const combinerIndex = combiner.indexOf(i); const combinerIndex = combiner.indexOf(i);
if (combinerIndex > -1) { if (combinerIndex > -1) {
return combinerChange(without(combiner, i)); return combinerChange(without(combiner, i));
} }
combiner.push(i); combiner.push(i);
// invalid combo
const combinerItems = combiner.map(j => vbox.bound[j]);
if (!itemInfo.combos.some(combo => combinerItems.every(c => combo.components.includes(c)))) {
return combinerChange([i]);
}
return combinerChange(combiner); return combinerChange(combiner);
} }