From 3bced1f4860f5582c937aaba744150f8b4f8afe8 Mon Sep 17 00:00:00 2001 From: Sebastian Martinez Date: Thu, 13 Jan 2022 17:23:50 +0100 Subject: [PATCH] Improve display of project dropdowns Signed-off-by: Sebastian Martinez --- src/base/projects/BranchSelector.svelte | 5 +++-- src/base/projects/Header.svelte | 22 +++++++++++++--------- 2 files changed, 16 insertions(+), 11 deletions(-) diff --git a/src/base/projects/BranchSelector.svelte b/src/base/projects/BranchSelector.svelte index 5b84785d6..a187aa745 100644 --- a/src/base/projects/BranchSelector.svelte +++ b/src/base/projects/BranchSelector.svelte @@ -6,10 +6,11 @@ export let branches: [string, string][]; export let project: Info; export let revision: string; + export let toggleDropdown: (input: string) => void; + export let branchesDropdown = false; const dispatch = createEventDispatcher(); - let branchesDropdown = false; const switchBranch = (name: string) => { dispatch("revisionChanged", name); }; @@ -89,7 +90,7 @@ {#if branches.length > 0} -
branchesDropdown = !branchesDropdown} class="stat branch" class:not-allowed={!branches}> +
toggleDropdown("branch")} class="stat branch" class:not-allowed={!branches}> {#if commit === project.head} {project.meta.defaultBranch} diff --git a/src/base/projects/Header.svelte b/src/base/projects/Header.svelte index 32727c0c9..adf21a274 100644 --- a/src/base/projects/Header.svelte +++ b/src/base/projects/Header.svelte @@ -22,10 +22,13 @@ export let content: ProjectContent; export let revision: string; - // Whether the clone dropdown is visible. - let cloneDropdown = false; - // Whether the seed dropdown is visible. - let seedDropdown = false; + let dropdownState: { [key: string]: boolean } = { clone: false, seed: false, branch: false }; + function toggleDropdown(input: string) { + Object.keys(dropdownState).map((key: string) => { + if (input === key) dropdownState[key] = !dropdownState[key]; + else dropdownState[key] = false; + }); + } // Switches between the browser and commit view const toggleContent = (input: ProjectContent) => { @@ -206,7 +209,8 @@
- updateRevision(event.detail)} />
{#if anchors} @@ -250,12 +254,12 @@
{#if config.seed.git.host} -
(cloneDropdown = !cloneDropdown)}> +
toggleDropdown("clone")}> Clone