Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: click the entire header to toggle layer editor and legend panel. #2670

Merged
merged 2 commits into from
Jan 8, 2024
Merged

fix: click the entire header to toggle layer editor and legend panel. #2670

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
504edea
fix: click the entire header to toggle layer editor and legend panel.
JinIgarashi Jan 8, 2024
0fabc5e
changeset
JinIgarashi Jan 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .changeset/gentle-jokes-call.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"geohub": patch
---

fix: click the entire header to toggle layer editor and legend panel.
5 changes: 5 additions & 0 deletions .changeset/small-lamps-end.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"geohub": patch
---

fix: click the entire header to toggle layer editor and legend panel.
90 changes: 16 additions & 74 deletions sites/geohub/src/components/pages/map/layers/LayerEdit.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<script lang="ts">
import { clean, getLayerStyle } from '$lib/helper';
import FloatingPanel from '$components/util/FloatingPanel.svelte';
import { getLayerStyle } from '$lib/helper';
import {
EDITING_LAYER_STORE_CONTEXT_KEY,
EDITING_MENU_SHOWN_CONTEXT_KEY,
Expand All @@ -23,8 +24,6 @@
$legendReadonly = false;
setContext(LEGEND_READONLY_CONTEXT_KEY, legendReadonly);

let isExpanded = true;

const handleClose = () => {
$editingLayerStore = undefined;
$editingMenuShownStore = false;
Expand All @@ -34,35 +33,17 @@
{#if $editingLayerStore}
{@const type = getLayerStyle($map, $editingLayerStore.id)?.type}
<div class="layer-editor">
<div class="editor-header has-background-light is-flex is-align-items-center px-2">
<span class="layer-name is-size-6">{clean($editingLayerStore.name)}</span>
<div class="header-buttons pl-2">
<button
class="button px-0 chevron-button {isExpanded ? 'is-expanded' : ''}"
on:click={() => {
isExpanded = !isExpanded;
}}
>
<span class="icon is-small">
<i class="fa-solid fa-chevron-down"></i>
</span>
</button>
<button class="button pl-2" on:click={handleClose}>
<span class="icon is-small">
<i class="fas fa-xmark"></i>
</span>
</button>
</div>
</div>
<div class="editor-contents px-2 pb-2" hidden={!isExpanded}>
{#if type}
{#if type === 'raster'}
<RasterLayer bind:layer={$editingLayerStore} />
{:else}
<VectorLayer bind:layer={$editingLayerStore} />
<FloatingPanel title={$editingLayerStore.name} on:close={handleClose}>
<div class="editor-contents">
{#if type}
{#if type === 'raster'}
<RasterLayer bind:layer={$editingLayerStore} />
{:else}
<VectorLayer bind:layer={$editingLayerStore} />
{/if}
{/if}
{/if}
</div>
</div>
</FloatingPanel>
</div>
{/if}

Expand All @@ -74,49 +55,10 @@
width: 350px;

z-index: 20;
background-color: white;

.editor-header {
.layer-name {
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
word-break: break-all;
}

.header-buttons {
margin-left: auto;
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 5px;

.chevron-button {
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-ms-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
transition: all 0.3s ease;

&.is-expanded {
transform: rotate(-180deg);
-webkit-transform: rotate(-180deg);
-moz-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
-o-transform: rotate(-180deg);
transition: rotateZ(-180deg);
}
}
.button {
border: none;
background: transparent;
}
}
}
}

.editor-contents {
overflow-y: auto;
max-height: 70vh;
}
.editor-contents {
overflow-y: auto;
max-height: 70vh;
}
</style>
67 changes: 8 additions & 59 deletions sites/geohub/src/components/pages/map/plugins/MaplibreLegendControl.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<script lang="ts">
import RasterSimpleLayer from '$components/pages/map/layers/raster/RasterSimpleLayer.svelte';
import VectorSimpleLayer from '$components/pages/map/layers/vector/VectorSimpleLayer.svelte';
import FloatingPanel from '$components/util/FloatingPanel.svelte';
import { getLayerStyle, initTooltipTippy } from '$lib/helper';
import { draggable, type DragOptions } from '@neodrag/svelte';
import { Loader } from '@undp-data/svelte-undp-design';
Expand All @@ -60,8 +61,6 @@
export let show = true;
export let readonly = true;

let isExpanded = true;

const legendReadonly: LegendReadonlyStore = createLegendReadonlyStore();
$legendReadonly = readonly;
setContext(LEGEND_READONLY_CONTEXT_KEY, legendReadonly);
Expand Down Expand Up @@ -136,32 +135,12 @@
</button>

<div class="contents {show ? 'is-active' : ''}" bind:this={contentDiv} use:draggable={dragOptions}>
<div class="legend-header has-background-light is-flex is-align-items-center px-2">
<span class="is-size-6">Legend</span>
<div class="header-buttons pl-2">
<button
class="button px-0 chevron-button {isExpanded ? 'is-expanded' : ''}"
on:click={() => {
isExpanded = !isExpanded;
}}
>
<span class="icon is-small">
<i class="fa-solid fa-chevron-down"></i>
</span>
</button>
<button
class="button pl-2"
on:click={() => {
show = false;
}}
>
<span class="icon is-small">
<i class="fas fa-xmark"></i>
</span>
</button>
</div>
</div>
<div hidden={!isExpanded}>
<FloatingPanel
title="Legend"
on:close={() => {
show = false;
}}
>
<div class="is-flex is-align-items-center layer-header pt-2">
<div class="layer-header-buttons buttons">
{#key $layerList}
Expand Down Expand Up @@ -264,7 +243,7 @@
</div>
{/if}
</div>
</div>
</FloatingPanel>
</div>

<style lang="scss">
Expand All @@ -285,36 +264,6 @@
display: none;
width: $width;

.legend-header {
.header-buttons {
margin-left: auto;
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 5px;

.chevron-button {
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-ms-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
transition: all 0.3s ease;

&.is-expanded {
transform: rotate(-180deg);
-webkit-transform: rotate(-180deg);
-moz-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
-o-transform: rotate(-180deg);
transition: rotateZ(-180deg);
}
}
.button {
border: none;
background: transparent;
}
}
}

.layer-header-buttons {
margin-left: auto;
}
Expand Down
96 changes: 96 additions & 0 deletions sites/geohub/src/components/util/FloatingPanel.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
<script lang="ts">
import { clean, handleEnterKey } from '$lib/helper';
import { createEventDispatcher } from 'svelte';

const dispatch = createEventDispatcher();

export let title: string;
export let isExpanded = true;

const handleClose = () => {
dispatch('close');
};
</script>

<div class="floating-panel">
<div class="header has-background-light is-flex is-align-items-center px-2">
<div
class="header-title is-size-6"
role="button"
tabindex="0"
on:click={() => {
isExpanded = !isExpanded;
}}
on:keydown={handleEnterKey}
>
{clean(title)}
</div>
<div class="header-buttons pl-2">
<button
class="button px-0 chevron-button {isExpanded ? 'is-expanded' : ''}"
on:click={() => {
isExpanded = !isExpanded;
}}
>
<span class="icon is-small">
<i class="fa-solid fa-chevron-down"></i>
</span>
</button>
<button class="button pl-2" on:click={handleClose}>
<span class="icon is-small">
<i class="fas fa-xmark"></i>
</span>
</button>
</div>
</div>
<div class="contents px-2 pb-2" hidden={!isExpanded}>
<slot />
</div>
</div>

<style lang="scss">
.floating-panel {
background-color: white;

.header {
cursor: pointer;

.header-title {
width: 100%;
overflow: hidden;
display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
word-break: break-all;
}

.header-buttons {
margin-left: auto;
display: grid;
grid-template-columns: repeat(2, 1fr);
gap: 5px;

.chevron-button {
-webkit-transition: all 0.3s ease;
-moz-transition: all 0.3s ease;
-ms-transition: all 0.3s ease;
-o-transition: all 0.3s ease;
transition: all 0.3s ease;

&.is-expanded {
transform: rotate(-180deg);
-webkit-transform: rotate(-180deg);
-moz-transform: rotate(-180deg);
-ms-transform: rotate(-180deg);
-o-transform: rotate(-180deg);
transition: rotateZ(-180deg);
}
}
.button {
border: none;
background: transparent;
}
}
}
}
</style>
Loading