From 6f5c71ed5a17147d5fc8c9da9f194a61f18fbb30 Mon Sep 17 00:00:00 2001 From: Pieter Vander Vennet Date: Mon, 12 Jun 2023 10:17:13 +0200 Subject: [PATCH] Fix: multianswer would not accept last option --- Models/ThemeConfig/TagRenderingConfig.ts | 6 +++++- UI/Popup/TagRendering/TagRenderingQuestion.svelte | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Models/ThemeConfig/TagRenderingConfig.ts b/Models/ThemeConfig/TagRenderingConfig.ts index cf88c2ed6..9ba3cfd35 100644 --- a/Models/ThemeConfig/TagRenderingConfig.ts +++ b/Models/ThemeConfig/TagRenderingConfig.ts @@ -680,7 +680,11 @@ export default class TagRenderingConfig { ]) ) } - return TagUtils.FlattenMultiAnswer([...selectedMappings, ...unselectedMappings]) + const and = TagUtils.FlattenMultiAnswer([...selectedMappings, ...unselectedMappings]) + if(and.and.length === 0){ + return undefined + } + return and } else { // Is at least one mapping shown in the answer? const someMappingIsShown = this.mappings.some(m => { diff --git a/UI/Popup/TagRendering/TagRenderingQuestion.svelte b/UI/Popup/TagRendering/TagRenderingQuestion.svelte index fd5d44a11..52a121221 100644 --- a/UI/Popup/TagRendering/TagRenderingQuestion.svelte +++ b/UI/Popup/TagRendering/TagRenderingQuestion.svelte @@ -46,7 +46,7 @@ // We received a new config -> reinit unit = layer.units.find(unit => unit.appliesToKeys.has(config.freeform?.key)) - if (config.mappings?.length > 0 && (checkedMappings === undefined || checkedMappings?.length < config.mappings.length)) { + if (config.mappings?.length > 0 && (checkedMappings === undefined || (checkedMappings?.length + 1) < config.mappings.length)) { checkedMappings = [...config.mappings.map(_ => false), false /*One element extra in case a freeform value is added*/]; } if (config.freeform?.key) {