Browse page selected layers #521
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,27 @@ | ||
| <script lang="ts"> | ||
| import { activeLayers, layerLegends } from "./stores"; | ||
|
|
||
| let container: HTMLDivElement | null = null; | ||
|
|
||
| function update( | ||
| container: HTMLDivElement | null, | ||
| activeLayers: Set<string>, | ||
| layerLegends: Map<string, HTMLDivElement>, | ||
| ) { | ||
| if (container) { | ||
| container.innerHTML = ""; | ||
| for (let l of activeLayers) { | ||
| let obj = layerLegends.get(l); | ||
| // Layers can be immediately active from the URL, before the DOM element is registered | ||
| if (obj) { | ||
| obj.style.display = "block"; | ||
| container.appendChild(obj); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| $: update(container, $activeLayers, $layerLegends); | ||
| </script> | ||
|
|
||
| <p><b>Selected layers</b></p> | ||
| <div bind:this={container} /> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| <script lang="ts"> | ||
| import { HelpButton } from "lib/common"; | ||
| import { SecondaryButton, Checkbox, CheckboxGroup } from "govuk-svelte"; | ||
| import { onDestroy } from "svelte"; | ||
| import { activeLayers, layerLegends } from "./stores"; | ||
|
|
||
| // Slots include: icon, controls, help | ||
|
|
||
| export let name: string; | ||
| export let title: string; | ||
| // This must be bound to state that controls the layer display and URL | ||
| export let show: boolean; | ||
|
|
||
| // If the layer is initially shown (from the URL state), make it active | ||
| if (show) { | ||
| $activeLayers.add(name); | ||
| $activeLayers = $activeLayers; | ||
| } | ||
|
|
||
| // The controls for each layer are defined in a layer component's optional | ||
| // "controls" slot, as well as the generic controls defined below in | ||
| // this component. The whole DOM element is bound here, then it's | ||
| // stored centrally in layerLegends . That lets ActiveLayersLegend | ||
| // later display the proper layer controls in one place. | ||
| let contents: HTMLDivElement | null = null; | ||
|
|
||
| $: if (contents) { | ||
| layerLegends.update((l) => { | ||
| // Initially hide the controls. Since layer components are defined under | ||
| // the left sidebar, they'd otherwise appear there. | ||
| contents!.style.display = "none"; | ||
| l.set(name, contents!); | ||
| return l; | ||
| }); | ||
| } | ||
|
|
||
| onDestroy(() => { | ||
| layerLegends.update((l) => { | ||
| l.delete(name); | ||
| return l; | ||
| }); | ||
| }); | ||
|
|
||
| function toggleActive() { | ||
| activeLayers.update((l) => { | ||
| if (l.has(name)) { | ||
| l.delete(name); | ||
| show = false; | ||
| } else { | ||
| l.add(name); | ||
| show = true; | ||
| } | ||
| return l; | ||
| }); | ||
| } | ||
|
|
||
| function remove() { | ||
| $activeLayers.delete(name); | ||
| $activeLayers = $activeLayers; | ||
| show = false; | ||
| } | ||
| </script> | ||
|
|
||
| <!-- For the left sidebar --> | ||
| <Checkbox checked={$activeLayers.has(name)} on:change={toggleActive}> | ||
| {title} | ||
| </Checkbox> | ||
|
|
||
| <!-- For the right panel --> | ||
| <div bind:this={contents}> | ||
| <CheckboxGroup small> | ||
| <div | ||
| style="display: flex; justify-content: space-between; white-space: nowrap" | ||
|
There was a problem hiding this comment. The nowrap thing is very weird and messes up vertical alignment. I can't make everything behave here, but we can iterate on it later |
||
| > | ||
| <Checkbox bind:checked={show}> | ||
| <slot name="icon" /> | ||
| {title} | ||
| </Checkbox> | ||
| <span> | ||
| <HelpButton> | ||
| <slot name="help" /> | ||
| </HelpButton> | ||
|
|
||
| <SecondaryButton on:click={remove}>X</SecondaryButton> | ||
| </span> | ||
| </div> | ||
| </CheckboxGroup> | ||
| {#if show} | ||
|
There was a problem hiding this comment. This is flexible. We might try using a collapsible card next. It should be easy to plug things in here and make them work for all layers |
||
| <slot name="controls" /> | ||
| {/if} | ||
| </div> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a trick I've been using in many other projects. One Svelte component logically grouping some functionality can define some controls that wind up in different parts of the page. In this case, we're going a bit beyond that by centrally collecting all of the controls by name.