Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 19 additions & 2 deletions src/lib/components/tree/ConfigTree.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,18 @@
let treeProps: TreeProperties;
let treeRoot: Tree.Node;
let filteredConfigs: Config[] = [];
let manuallyExpanded: string[] = [];

function sameIds(a: string[], b: string[]) {
if (a.length !== b.length) return false;
const set = new Set(a);
return b.every((id) => set.has(id));
}

function handleExpandedChange(event: CustomEvent<string[]>) {
if (sameIds(manuallyExpanded, event.detail)) return;
manuallyExpanded = event.detail;
}

export function debounced<T>(store: Writable<T>, delay = 300) {
let timeout: ReturnType<typeof setTimeout>;
Expand Down Expand Up @@ -74,7 +86,12 @@
treeProps = {
root: treeRoot,
selected: selected?.id,
expanded: treeRoot.getIncludingNodes(selected?.id),
expanded: Array.from(
new Set([
...treeRoot.getIncludingNodes(selected?.id),
...manuallyExpanded,
]),
),
scrollBehaviour: {
scrollToIndex: scrollToSelectionTrigger > 0,
scrollTrigger: scrollToSelectionTrigger,
Expand Down Expand Up @@ -253,7 +270,7 @@
}
</script>

<TreeComponent {...treeProps}>
<TreeComponent {...treeProps} on:expandedChange={handleExpandedChange}>
<svelte:fragment slot="folder" let:item let:expanded let:level>
{@const data = getFolderData(item)}
<TreeFolder
Expand Down
7 changes: 6 additions & 1 deletion src/lib/components/tree/ProfileCloudTreeItem.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,12 @@
<slot name="type-label">{data.type}</slot>
</div>
{#if $item.children.length > 0}
<div class="trigger-container" use:itemFunction {...itemProps}>
<div
class="trigger-container"
use:itemFunction
{...itemProps}
on:click|stopPropagation
>
<svg
width="14"
height="11"
Expand Down
13 changes: 9 additions & 4 deletions src/lib/components/tree/TreeComponent.svelte
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<script lang="ts">
import { createTreeView } from "@melt-ui/svelte";
import type { TreeView } from "@melt-ui/svelte";
import { setContext, tick } from "svelte";
import { createEventDispatcher, setContext, tick } from "svelte";
import TreeNode from "./TreeNode.svelte";
import type { AbstractTreeNode } from "./TreeNode.svelte";
import type { FolderSlotProps, ItemSlotProps } from "./TreeChild.svelte";
Expand All @@ -27,6 +27,8 @@
item: ItemSlotProps;
}

const dispatch = createEventDispatcher<{ expandedChange: string[] }>();

export let root: AbstractTreeNode<any>;
export let expanded: string[] = [];
export let selected: string | undefined = undefined;
Expand All @@ -51,18 +53,21 @@
curr: string[];
next: string[];
}) {
let result: string[];
if (next.length > curr.length) {
const diff = next.find((e) => !curr.includes(e))!;
const rootNodes = get(root).children.map((e) => get(e).id);
if (rootNodes.includes(diff)) {
const others = next.filter((e) => !rootNodes.includes(e));
return [...others, diff];
result = [...others, diff];
} else {
return next;
result = next;
}
} else {
return next;
result = next;
}
dispatch("expandedChange", result);
return result;
}

let scrollTimeout: any;
Expand Down
Loading