extract collapsible tree component

website/src/lib/assets/layers.ts

@@ -381,10 +381,6 @@ export const opacities: { [key: string]: number; } = {
 };
 
 export type LayerTreeType = { [key: string]: LayerTreeType | boolean; };
-export type CollapsedInfoTreeType<T> = {
-    self: T;
-    children: { [key: string]: CollapsedInfoTreeType<T>; };
-};
 
 // Hierarchy containing all basemaps
 export const basemapTree: LayerTreeType = {

website/src/lib/components/collapsible-tree/CollapsibleTree.svelte

@@ -0,0 +1,10 @@
+<script lang="ts">
+	import { setContext } from 'svelte';
+	import { writable } from 'svelte/store';
+
+	let open = writable<Record<string, boolean>>({});
+
+	setContext('collapsible-tree-state', open);
+</script>
+
+<slot />

website/src/lib/components/collapsible-tree/CollapsibleTreeNode.svelte

@@ -0,0 +1,37 @@
+<script lang="ts">
+	import * as Collapsible from '$lib/components/ui/collapsible';
+	import { Button } from '$lib/components/ui/button';
+	import { ChevronDown, ChevronUp } from 'lucide-svelte';
+	import { getContext } from 'svelte';
+	import type { Writable } from 'svelte/store';
+
+	export let id: string;
+
+	let open = getContext<Writable<Record<string, boolean>>>('collapsible-tree-state');
+
+	open.update((value) => {
+		if (!value.hasOwnProperty(id)) {
+			value[id] = true;
+		}
+		return value;
+	});
+</script>
+
+<Collapsible.Root bind:open={$open[id]}>
+	<Collapsible.Trigger class="w-full">
+		<Button
+			variant="ghost"
+			class="w-full flex flex-row justify-between py-0 px-1 h-fit hover:bg-background"
+		>
+			<slot name="trigger" />
+			{#if $open[id]}
+				<ChevronUp size="16" />
+			{:else}
+				<ChevronDown size="16" />
+			{/if}
+		</Button>
+	</Collapsible.Trigger>
+	<Collapsible.Content class="ml-1">
+		<slot name="content" />
+	</Collapsible.Content>
+</Collapsible.Root>

website/src/lib/components/layer-control/LayerTree.svelte

@@ -1,21 +1,20 @@
 <script lang="ts">
 	import LayerTreeNode from './LayerTreeNode.svelte';
-	import { type CollapsedInfoTreeType, type LayerTreeType } from '$lib/assets/layers';
+	import { type LayerTreeType } from '$lib/assets/layers';
+	import CollapsibleTree from '$lib/components/collapsible-tree/CollapsibleTree.svelte';
 
 	export let layerTree: LayerTreeType;
 	export let name: string;
 	export let selected: string | undefined = undefined;
 	export let multiple: boolean = false;
 
-	let open: CollapsedInfoTreeType<boolean> = {
-		self: true,
-		children: {}
-	};
 	export let checked: LayerTreeType = {};
 </script>
 
 <form>
 	<fieldset class="min-w-64">
-		<LayerTreeNode {name} node={layerTree} bind:selected {multiple} bind:open bind:checked />
+		<CollapsibleTree>
+			<LayerTreeNode {name} node={layerTree} bind:selected {multiple} bind:checked />
+		</CollapsibleTree>
 	</fieldset>
 </form>

website/src/lib/components/layer-control/LayerTreeNode.svelte

@@ -1,12 +1,9 @@
 <script lang="ts">
 	import { Label } from '$lib/components/ui/label';
 	import { Checkbox } from '$lib/components/ui/checkbox';
-	import { Button } from '$lib/components/ui/button';
+	import CollapsibleTreeNode from '../collapsible-tree/CollapsibleTreeNode.svelte';
-	import * as Collapsible from '$lib/components/ui/collapsible';
 
-	import { ChevronDown, ChevronUp } from 'lucide-svelte';
+	import { type LayerTreeType } from '$lib/assets/layers';
-
-	import { type CollapsedInfoTreeType, type LayerTreeType } from '$lib/assets/layers';
 	import { anySelectedLayer } from './utils';
 
 	import { _ } from 'svelte-i18n';
@@ -16,19 +13,8 @@
 	export let selected: string | undefined = undefined;
 	export let multiple: boolean = false;
 
-	export let open: CollapsedInfoTreeType<boolean>;
 	export let checked: LayerTreeType;
 
-	if (!Array.isArray(node)) {
-		Object.keys(node).forEach((id) => {
-			if (!open.children.hasOwnProperty(id)) {
-				open.children[id] = {
-					self: true,
-					children: {}
-				};
-			}
-		});
-	}
 	Object.keys(node).forEach((id) => {
 		if (!checked.hasOwnProperty(id)) {
 			if (typeof node[id] == 'boolean') {
@@ -40,7 +26,7 @@
 	});
 </script>
 
-<div class="flex flex-col gap-1">
+<div class="flex flex-col gap-0.5">
 	{#each Object.keys(node) as id}
 		{#if typeof node[id] == 'boolean'}
 			{#if node[id]}
@@ -62,31 +48,12 @@
 				</div>
 			{/if}
 		{:else if anySelectedLayer(node[id])}
-			<Collapsible.Root bind:open={open.children[id].self} class="ml-1">
+			<CollapsibleTreeNode {id}>
-				<Collapsible.Trigger class="w-full"
+				<span slot="trigger">{$_(`layers.label.${id}`)}</span>
-					><Button
+				<div slot="content">
-						variant="ghost"
+					<svelte:self node={node[id]} {name} bind:selected {multiple} bind:checked={checked[id]} />
-						class="w-full flex flex-row justify-between py-0 px-1 h-fit hover:bg-background"
+				</div>
-					>
+			</CollapsibleTreeNode>
-						<span class="mr-2">{$_(`layers.label.${id}`)}</span>
-						{#if open.children[id].self}
-							<ChevronUp size="16" />
-						{:else}
-							<ChevronDown size="16" />
-						{/if}
-					</Button></Collapsible.Trigger
-				>
-				<Collapsible.Content class="ml-1">
-					<svelte:self
-						node={node[id]}
-						{name}
-						bind:selected
-						{multiple}
-						bind:open={open.children[id]}
-						bind:checked={checked[id]}
-					/>
-				</Collapsible.Content>
-			</Collapsible.Root>
 		{/if}
 	{/each}
 </div>