Robin-van-der-Linde/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge branch 'master' into develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-01-24 23:29:25 +01:00
commit 1a415f4815
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/UI/Popup/TagRendering/TagRenderingQuestion.svelte
View file

@ -54,7 +54,7 @@
*/ */
let checkedMappings: boolean[] let checkedMappings: boolean[]
let mappings: Mapping[] = config?.mappings let mappings: Mapping[] = config?.mappings ?? []
let searchTerm: UIEventSource<string> = new UIEventSource("") let searchTerm: UIEventSource<string> = new UIEventSource("")
let dispatch = createEventDispatcher<{ let dispatch = createEventDispatcher<{
@ -153,7 +153,7 @@
} }
}) })
$: { $: {
if (allowDeleteOfFreeform && $freeformInput === undefined && $freeformInputUnvalidated === "" && mappings.length === 0) { if (allowDeleteOfFreeform && $freeformInput === undefined && $freeformInputUnvalidated === "" && mappings?.length === 0) {
selectedTags = new Tag(config.freeform.key, "") selectedTags = new Tag(config.freeform.key, "")
} else { } else {
@ -172,8 +172,6 @@
} }
function onSave(e = undefined, deleteFreeform = false) { function onSave(e = undefined, deleteFreeform = false) {
console.log("On click", deleteFreeform, ">>>", selectedTags)
if (selectedTags === undefined) { if (selectedTags === undefined) {
return return
} }
@ -396,7 +394,7 @@
<!-- TagRenderingQuestion-buttons --> <!-- TagRenderingQuestion-buttons -->
<slot name="cancel" /> <slot name="cancel" />
<slot name="save-button" {selectedTags}> <slot name="save-button" {selectedTags}>
{#if allowDeleteOfFreeform && mappings.length === 0 && $freeformInput === undefined && $freeformInputUnvalidated === ""} {#if allowDeleteOfFreeform && mappings?.length === 0 && $freeformInput === undefined && $freeformInputUnvalidated === ""}
<button class="primary flex" on:click|stopPropagation|preventDefault={_ => onSave(_, true)}> <button class="primary flex" on:click|stopPropagation|preventDefault={_ => onSave(_, true)}>
<TrashIcon class="w-6 h-6 text-red-500" /> <TrashIcon class="w-6 h-6 text-red-500" />
<Tr t={Translations.t.general.eraseValue}/> <Tr t={Translations.t.general.eraseValue}/>