mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-21 22:30:41 +08:00
Simplify BranchSelector
There’s no need for the outer `if branches.length > 0`. We already disable the dropdown unless `branches.length > 1`. Signed-off-by: Thomas Scholtes <geigerzaehler@axiom.fm>
This commit is contained in:
@@ -12,7 +12,7 @@
|
||||
export let selectedCommitId: string;
|
||||
export let branches: Array<{ name: string; route: Route }>;
|
||||
|
||||
$: showSelector = branches.length > 1;
|
||||
$: hideDropdown = branches.length <= 1;
|
||||
$: selectedCommitShortId = utils.formatCommit(selectedCommitId);
|
||||
</script>
|
||||
|
||||
@@ -21,91 +21,64 @@
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
line-height: initial;
|
||||
|
||||
font-family: var(--font-family-monospace);
|
||||
}
|
||||
.commit .branch {
|
||||
padding: 0.5rem 0.75rem;
|
||||
color: var(--color-secondary);
|
||||
}
|
||||
.branch-name {
|
||||
height: 2rem;
|
||||
padding: 0.5rem 0.75rem;
|
||||
background-color: var(--color-secondary-2);
|
||||
border-radius: var(--border-radius-small) 0 0 var(--border-radius-small);
|
||||
}
|
||||
.commit .branch.not-allowed {
|
||||
.branch-name.not-allowed {
|
||||
cursor: not-allowed;
|
||||
}
|
||||
.branch:hover:not(.not-allowed) {
|
||||
.branch-name:hover:not(.not-allowed) {
|
||||
background-color: var(--color-foreground-2);
|
||||
}
|
||||
.commit .hash {
|
||||
display: inline-block;
|
||||
.commit-id {
|
||||
height: 2rem;
|
||||
line-height: initial;
|
||||
color: var(--color-secondary);
|
||||
background-color: var(--color-secondary-1);
|
||||
padding: 0.5rem 0.75rem;
|
||||
background-color: var(--color-secondary-1);
|
||||
border-radius: 0 var(--border-radius-small) var(--border-radius-small) 0;
|
||||
}
|
||||
.commit .hash.unlabeled {
|
||||
.commit-id.standalone {
|
||||
border-radius: var(--border-radius-small);
|
||||
}
|
||||
.stat {
|
||||
font-family: var(--font-family-monospace);
|
||||
padding: 0.5rem 0.75rem;
|
||||
height: 2rem;
|
||||
line-height: initial;
|
||||
background: var(--color-foreground-1);
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="commit" title="Current branch">
|
||||
<!-- Check for branches listing feature -->
|
||||
{#if branches.length > 0}
|
||||
{#if selectedBranch}
|
||||
<Floating disabled={!showSelector}>
|
||||
<div
|
||||
slot="toggle"
|
||||
title="Change branch"
|
||||
class="stat branch"
|
||||
class:not-allowed={!showSelector}>
|
||||
{selectedBranch}
|
||||
</div>
|
||||
<svelte:fragment slot="modal">
|
||||
<Dropdown items={branches}>
|
||||
<svelte:fragment slot="item" let:item>
|
||||
<Link route={item.route} on:afterNavigate={() => closeFocused()}>
|
||||
<DropdownItem
|
||||
selected={item.name === selectedBranch}
|
||||
size="tiny">
|
||||
{item.name}
|
||||
</DropdownItem>
|
||||
</Link>
|
||||
</svelte:fragment>
|
||||
</Dropdown>
|
||||
</svelte:fragment>
|
||||
</Floating>
|
||||
<div class="hash layout-desktop">
|
||||
{selectedCommitShortId}
|
||||
{#if selectedBranch}
|
||||
<Floating disabled={hideDropdown}>
|
||||
<div
|
||||
slot="toggle"
|
||||
title="Change branch"
|
||||
class="branch-name"
|
||||
class:not-allowed={hideDropdown}>
|
||||
{selectedBranch}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="unlabeled hash layout-desktop">
|
||||
{selectedCommitId}
|
||||
</div>
|
||||
{/if}
|
||||
<div class="hash layout-mobile">
|
||||
{selectedCommitShortId}
|
||||
</div>
|
||||
<!-- If there is no branch listing available, show default branch name if commit is head and else show entire commit -->
|
||||
{:else if selectedBranch}
|
||||
<div class="stat branch not-allowed">
|
||||
{selectedBranch}
|
||||
</div>
|
||||
<div class="hash">
|
||||
<Dropdown slot="modal" items={branches}>
|
||||
<Link
|
||||
slot="item"
|
||||
let:item
|
||||
route={item.route}
|
||||
on:afterNavigate={() => closeFocused()}>
|
||||
<DropdownItem selected={item.name === selectedBranch} size="tiny">
|
||||
{item.name}
|
||||
</DropdownItem>
|
||||
</Link>
|
||||
</Dropdown>
|
||||
</Floating>
|
||||
<div class="commit-id">
|
||||
{selectedCommitShortId}
|
||||
</div>
|
||||
{:else}
|
||||
<div class="unlabeled hash layout-desktop">
|
||||
<div class="commit-id standalone layout-desktop">
|
||||
{selectedCommitId}
|
||||
</div>
|
||||
<div class="hash layout-mobile">
|
||||
<div class="commit-id standalone layout-mobile">
|
||||
{selectedCommitShortId}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user