diff --git a/cypress/e2e/project.spec.ts b/cypress/e2e/project.spec.ts
index f7a2718b7..0c450322c 100644
--- a/cypress/e2e/project.spec.ts
+++ b/cypress/e2e/project.spec.ts
@@ -90,7 +90,7 @@ describe("Project view", () => {
cy.get("div.stat.contributor-count").should("have.text", "1 contributor(s)");
cy.get("div.stat.branch").should("have.class", "not-allowed").should("have.text", "main");
cy.get("div.hash.desktop").should("have.text", "56e4e02");
- cy.get("div.clone").click();
+ cy.get("div.clone-button").click();
});
it("Peer selector", () => {
diff --git a/src/Dropdown.svelte b/src/Dropdown.svelte
index 57ce7a561..b7e0aa08c 100644
--- a/src/Dropdown.svelte
+++ b/src/Dropdown.svelte
@@ -3,7 +3,6 @@
export let items: { key: string; value: string; badge: string | null }[];
export let selected: string | null = null;
- export let visible = false;
const dispatch = createEventDispatcher();
const onSelect = (item: string) => {
@@ -32,16 +31,14 @@
}
-{#if visible}
-
- {#each items as {key, value, badge}}
- {#if key && value}
-
onSelect(value)} title={value}>{@html key}
- {#if badge}
- {badge}
- {/if}
-
- {/if}
- {/each}
-
-{/if}
+
+ {#each items as {key, value, badge}}
+ {#if key && value}
+
onSelect(value)} title={value}>{@html key}
+ {#if badge}
+ {badge}
+ {/if}
+
+ {/if}
+ {/each}
+
diff --git a/src/Floating.svelte b/src/Floating.svelte
new file mode 100644
index 000000000..9e1c24f74
--- /dev/null
+++ b/src/Floating.svelte
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+ {#if expanded}
+
+ {/if}
+
diff --git a/src/Header.svelte b/src/Header.svelte
index fe5a2cede..f048af82e 100644
--- a/src/Header.svelte
+++ b/src/Header.svelte
@@ -11,6 +11,7 @@
import { Profile, ProfileType } from "@app/profile";
import Avatar from '@app/Avatar.svelte';
import Search from '@app/Search.svelte';
+ import Floating from "@app/Floating.svelte";
import Icon from "./Icon.svelte";
import MobileNavbar from "./MobileNavbar.svelte";
import SeedDropdown from "./SeedDropdown.svelte";
@@ -20,11 +21,6 @@
let sessionButtonHover = false;
let mobileNavbarDisplayed = false;
- let seedDropdown = false;
-
- function toggleDropdown() {
- seedDropdown = !seedDropdown;
- }
function toggleNavbar() {
mobileNavbarDisplayed = !mobileNavbarDisplayed;
@@ -175,10 +171,14 @@
{#if session && Object.keys(session.siwe).length > 0}
-
- Seeds
-
-
+
+
+ Seeds
+
+
+
+
+
{/if}
diff --git a/src/SeedDropdown.svelte b/src/SeedDropdown.svelte
index c5973e586..e38061619 100644
--- a/src/SeedDropdown.svelte
+++ b/src/SeedDropdown.svelte
@@ -4,9 +4,9 @@
import type { Config } from "@app/config";
import Dropdown from "@app/Dropdown.svelte";
import type { SeedSession } from "@app/siwe";
+ import { closeFocused } from "@app/Floating.svelte";
export let seeds: { [key: string]: SeedSession };
- export let visible = false;
export let config: Config;
// When a user signs into a new seed we want to update the seed listing
@@ -24,9 +24,8 @@
{
- visible = false;
+ closeFocused();
navigate(`/seeds/${item.detail}`);
}}
/>
diff --git a/src/base/projects/BranchSelector.spec.ts b/src/base/projects/BranchSelector.spec.ts
index 60e197ced..7a835c9d8 100644
--- a/src/base/projects/BranchSelector.spec.ts
+++ b/src/base/projects/BranchSelector.spec.ts
@@ -18,7 +18,6 @@ const defaultProps = {
},
branches: { "master": "e678629cd37c770c640a2cd997fc76303c815772" },
revision: "e678629cd37c770c640a2cd997fc76303c815772",
- toggleDropdown: () => "branch"
};
describe('Logic', () => {
@@ -61,9 +60,9 @@ describe('Logic', () => {
"feature-branch": "29e8b7b0f3019b8e8a6d9bfb0964ee78f4ff12f5",
"xyz": "debf82ef3623ec11751a993bda85bac2ff1c6f00",
},
- branchesDropdown: true
}
});
+ cy.get("div.commit div.stat.branch").click();
cy.get("div.dropdown div.dropdown-item")
.first()
.should("contain.text", "feature-branch")
@@ -148,19 +147,21 @@ describe("Events", () => {
props: {
...defaultProps,
revision: "feature-branch",
- branchesDropdown: true,
branches: {
"feature-branch": "29e8b7b0f3019b8e8a6d9bfb0964ee78f4ff12f5",
"xyz": "debf82ef3623ec11751a993bda85bac2ff1c6f00",
}
}
});
- const branchLabel = getByText("xyz");
- const mock = cy.spy();
- component.$on("branchChanged", mock);
+ cy.get("div.commit div.stat.branch").click().then(() => {
+ const branchLabel = getByText("xyz");
- fireEvent.click(branchLabel);
- expect(mock).to.have.been.calledOnce;
+ const mock = cy.spy();
+ component.$on("branchChanged", mock);
+
+ fireEvent.click(branchLabel);
+ expect(mock).to.have.been.calledOnce;
+ });
});
});
diff --git a/src/base/projects/BranchSelector.svelte b/src/base/projects/BranchSelector.svelte
index a7894faa8..975d5b0ad 100644
--- a/src/base/projects/BranchSelector.svelte
+++ b/src/base/projects/BranchSelector.svelte
@@ -3,12 +3,11 @@
import { ProjectInfo, Branches, getOid } from "@app/project";
import { formatCommit } from "@app/utils";
import Dropdown from "@app/Dropdown.svelte";
+ import Floating from "@app/Floating.svelte";
export let branches: Branches;
export let project: ProjectInfo;
export let revision: string;
- export let toggleDropdown: (input: string) => void;
- export let branchesDropdown = false;
const dispatch = createEventDispatcher();
const switchBranch = (name: string) => {
@@ -43,6 +42,7 @@
color: var(--color-secondary);
background-color: var(--color-secondary-background);
border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
+ user-select: none;
}
.commit .branch.not-allowed {
cursor: not-allowed;
@@ -71,20 +71,20 @@
{#if branchList.length > 0}
{#if branchLabel}
-
+
showSelector && toggleDropdown("branch")}
- >
+ class:not-allowed={!showSelector}>
{branchLabel}
- switchBranch(e.detail)} />
-
+
+ switchBranch(e.detail)} />
+
+
{formatCommit(commit)}
diff --git a/src/base/projects/CloneButton.svelte b/src/base/projects/CloneButton.svelte
new file mode 100644
index 000000000..6627fdc83
--- /dev/null
+++ b/src/base/projects/CloneButton.svelte
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+ Clone
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/base/projects/Header.svelte b/src/base/projects/Header.svelte
index e06c4e40c..cec35f300 100644
--- a/src/base/projects/Header.svelte
+++ b/src/base/projects/Header.svelte
@@ -1,13 +1,12 @@
{#if peers.length > 0}
updatePeer(event.detail)} />
{/if}
@@ -146,8 +103,6 @@
{branches}
{project}
{revision}
- {toggleDropdown}
- bind:branchesDropdown={dropdownState.branch}
on:branchChanged={(event) => updateRevision(event.detail)} />
{#if !noAnchor}
@@ -161,36 +116,7 @@
{/if}
{#if seed.git.host}
-
- toggleDropdown("clone")}>
- Clone
-
-
-
-
-
-
-
-
-
+
{/if}
{#if seed.api.host}
diff --git a/src/base/projects/Patch/PatchTabBar.svelte b/src/base/projects/Patch/PatchTabBar.svelte
index e3055d6ec..d6e2cea63 100644
--- a/src/base/projects/Patch/PatchTabBar.svelte
+++ b/src/base/projects/Patch/PatchTabBar.svelte
@@ -1,5 +1,6 @@
-
-
- toggleDropdown("peer")} class="stat peer" class:not-allowed={!peers}>
+
+
+
{#if meta}
@@ -84,11 +84,13 @@
{/if}
+
+
+
switchPeer(e.detail)}
/>
-
-
+
+