midgard/mapcomplete
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

MultiAnswer option with rendering only shows up once

Browse source
This commit is contained in:
pietervdvn 2021-03-14 03:14:45 +01:00
parent 5af94b012c
commit 857e4fe114
1 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
UI/Popup/TagRenderingAnswer.ts
View file

@ -44,17 +44,25 @@ export default class TagRenderingAnswer extends UIElement {
// The render value doesn't work well with multi-answers (checkboxes), so we have to check for them manually // The render value doesn't work well with multi-answers (checkboxes), so we have to check for them manually
if (this._configuration.multiAnswer) { if (this._configuration.multiAnswer) {
let freeformKeyUsed = this._configuration.freeform?.key === undefined; // If it is undefined, it is "used" already, or at least we don't have to check for it anymore
const applicableThens: Translation[] = Utils.NoNull(this._configuration.mappings.map(mapping => { const applicableThens: Translation[] = Utils.NoNull(this._configuration.mappings.map(mapping => {
if (mapping.if === undefined) { if (mapping.if === undefined) {
return mapping.then; return mapping.then;
} }
if (TagUtils.MatchesMultiAnswer(mapping.if, tags)) { if (TagUtils.MatchesMultiAnswer(mapping.if, tags)) {
if(!freeformKeyUsed){
if(mapping.if.usedKeys().indexOf(this._configuration.freeform.key) >= 0){
freeformKeyUsed = true;
}
}
return mapping.then; return mapping.then;
} }
return undefined; return undefined;
})) }))
if (this._configuration.freeform !== undefined && tags[this._configuration.freeform.key] !== undefined) { if (!freeformKeyUsed
&& tags[this._configuration.freeform.key] !== undefined) {
applicableThens.push(this._configuration.render) applicableThens.push(this._configuration.render)
} }