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

Style: Allow a layer to open the popup-view in a floatover

Browse source
This commit is contained in:
Pieter Vander Vennet 2023-05-05 01:00:15 +02:00
parent 377c411143
commit 65a4303dd6
4 changed files with 16 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Models/ThemeConfig/Json/LayerConfigJson.ts
View file

@ -399,4 +399,9 @@ export interface LayerConfigJson {
* no-question-hint-check: disables a check in MiscTagRenderingChecks which complains about 'div', 'span' or 'class=subtle'-HTML elements in the tagRendering
*/
"#"?: string | "no-question-hint-check"
/**
* If set, open the selectedElementView in a floatOver instead of on the right
*/
popupInFloatover?: boolean
}

3
Models/ThemeConfig/LayerConfig.ts
View file

@ -69,6 +69,7 @@ export default class LayerConfig extends WithContextLoader {
public readonly syncSelection: typeof LayerConfig.syncSelectionAllowed[number] // this is a trick to conver a constant array of strings into a type union of these values
public readonly _needsFullNodeDatabase = false
public readonly popupInFloatover
constructor(json: LayerConfigJson, context?: string, official: boolean = true) {
context = context + "." + json.id
@ -414,6 +415,8 @@ export default class LayerConfig extends WithContextLoader {
": showIf. Did you mean 'isShown' instead?"
)
}
this.popupInFloatover = json.popupInFloatover ?? false
}
public defaultIcon(): BaseUIElement | undefined {

8
UI/ThemeViewGUI.svelte
View file

@ -121,12 +121,18 @@
</If>
</div>
<If condition={selectedViewElement.map(v => v !== undefined && selectedLayer.data !== undefined,[ selectedLayer] )}>
<If condition={selectedViewElement.map(v => v !== undefined && selectedLayer.data !== undefined && !selectedLayer.data.popupInFloatover,[ selectedLayer] )}>
<ModalRight on:close={() => {selectedElement.setData(undefined)}}>
<ToSvelte construct={new VariableUiElement(selectedViewElement)}></ToSvelte>
</ModalRight>
</If>
<If condition={selectedViewElement.map(v => v !== undefined && selectedLayer.data !== undefined && selectedLayer.data.popupInFloatover,[ selectedLayer] )}>
<FloatOver on:close={() => {selectedElement.setData(undefined)}}>
<ToSvelte construct={new VariableUiElement(selectedViewElement)}></ToSvelte>
</FloatOver>
</If>
<If condition={state.guistate.themeIsOpened}>
<!-- Theme page -->
<FloatOver on:close={() => state.guistate.themeIsOpened.setData(false)}>

1
assets/layers/last_click/last_click.json
View file

@ -10,6 +10,7 @@
},
"name": null,
"titleIcons": [],
"popupInFloatover": true,
"title": {
"mappings": [
{