contrapunctus/MapComplete
1
0
Fork 0
forked from MapComplete/MapComplete
Code Pull requests Activity

Merge develop

Browse source
This commit is contained in:
Pieter Vander Vennet 2024-09-17 02:36:38 +02:00
commit 5a9f8f0a0a
62 changed files with 4448 additions and 710 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/UI/Popup/MoveWizard.svelte
View file

@ -104,6 +104,7 @@
snapToLayers={$reason.snapTo}
targetLayer={layer}
dontShow={[id]}
maxDistanceInMeters={200}
/>
<div class="absolute bottom-0 left-0">
<OpenBackgroundSelectorButton {state} />

20
src/UI/Popup/TagRendering/TagRenderingEditable.svelte
View file

@ -48,16 +48,14 @@
}
let htmlElem: HTMLDivElement
$: {
if (editMode && htmlElem !== undefined && config.IsKnown($tags)) {
// EditMode switched to true yet the answer is already known, so the person wants to make a change
// Make sure that the question is in the scrollview!
function enableEditMode(){
editMode = true
// EditMode switched to true yet the answer is already known, so the person wants to make a change
// Make sure that the question is in the scrollview!
window.setTimeout(() => {
// Some delay is applied to give Svelte the time to render the _question_
window.setTimeout(() => {
Utils.scrollIntoView(<any>htmlElem)
}, 50)
}
Utils.scrollIntoView(<any>htmlElem)
}, 50)
}
const _htmlElement = new UIEventSource<HTMLElement>(undefined)
@ -132,9 +130,7 @@
<EditButton
arialabel={config.editButtonAriaLabel}
ariaLabelledBy={answerId}
on:click={() => {
editMode = true
}}
on:click={() => enableEditMode()}
/>
{/if}
</div>

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

@ -343,7 +343,7 @@
{#if question !== undefined}
<div class={clss}>
<form
class="relative flex flex-col overflow-y-auto px-2"
class="relative flex flex-col overflow-y-auto px-4"
style="max-height: 75vh"
on:submit|preventDefault={() => {
/*onSave(); This submit is not needed and triggers too early, causing bugs: see #1808*/
@ -351,7 +351,7 @@
>
<fieldset>
<legend>
<div class="sticky top-0 justify-between pt-1 font-bold" style="z-index: 11">
<div class="sticky top-0 justify-between pt-4 pb-2 font-bold" style="z-index: 11">
<SpecialTranslation t={question} {tags} {state} {layer} feature={selectedElement} />
</div>
@ -557,7 +557,7 @@
{/if}
<div class="flex flex-wrap-reverse items-stretch justify-end sm:flex-nowrap self-end flex-grow">
<div class="flex flex-wrap-reverse items-stretch justify-end sm:flex-nowrap self-end flex-grow mt-4 mb-2">
<!-- TagRenderingQuestion-buttons -->
<slot name="cancel" />
@ -590,7 +590,7 @@
<TagHint {state} tags={selectedTags} currentProperties={$tags} />
<span class="flex flex-wrap">
{#if $featureSwitchIsTesting}
<div class="alert">Testmode &nbsp;</div>
<div class="alert" style="padding: 0; margin: 0; margin-right: 0.5rem">Testmode &nbsp;</div>
{/if}
{#if $featureSwitchIsTesting || $featureSwitchIsDebugging}
<a class="small" on:click={() => console.log("Configuration is ", config)}>