gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2024-09-21 09:07:41 +03:00
Code Issues Packages Projects Releases Wiki Activity

Use clearer properties and refactor to svelte 5

Browse Source
This commit is contained in:
Caleb Owens 2024-06-18 10:50:55 +02:00
parent 9ba247ec50
commit 219d3c9f2d
No known key found for this signature in database
2 changed files with 32 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/src/lib/components/Branches.svelte
View File

@ -109,19 +109,23 @@
</script>
<div class="branch-list">
<BranchesHeader count={$filteredBranches$?.length ?? 0} filtersActive={$filtersActive}>
<FilterPopupMenu
slot="context-menu"
let:visible
{visible}
{includePrs}
{includeRemote}
{includeStashed}
{hideBots}
{hideInactive}
showPrCheckbox={githubService.isEnabled}
on:action
/>
<BranchesHeader
totalBranchCount={$branches$.length}
filteredBranchCount={$filteredBranches$?.length}
filtersActive={$filtersActive}
>
{#snippet contextMenu({ visible })}
<FilterPopupMenu
{visible}
{includePrs}
{includeRemote}
{includeStashed}
{hideBots}
{hideInactive}
showPrCheckbox={githubService.isEnabled}
on:action
/>
{/snippet}
</BranchesHeader>
{#if $branches$?.length > 0}
<ScrollableContainer

23
app/src/lib/components/BranchesHeader.svelte
View File

@ -2,12 +2,19 @@
import { clickOutside } from '$lib/clickOutside';
import Badge from '$lib/components/Badge.svelte';
import Button from '$lib/components/Button.svelte';
import type { Snippet } from 'svelte';
export let count: number | undefined;
export let filtersActive = false;
interface Props {
filteredBranchCount?: number;
totalBranchCount: number;
filtersActive: boolean;
contextMenu: Snippet<[{ visible: boolean }]>;
}
let visible = false;
let filterButton: HTMLDivElement;
const { filteredBranchCount, totalBranchCount, filtersActive, contextMenu }: Props = $props();
let visible = $state(false);
let filterButton = $state<HTMLDivElement>();
function onFilterClick(e: Event) {
visible = !visible;
@ -20,11 +27,11 @@
<div class="branches-title">
<span class="text-base-14 text-bold">Branches</span>
{#if count !== undefined}
<Badge {count} />
{#if filteredBranchCount !== undefined}
<Badge count={filteredBranchCount} />
{/if}
</div>
{#if (count && count > 0) || filtersActive}
{#if totalBranchCount > 0}
<div class="header__filter-btn" bind:this={filterButton}>
<Button
style="ghost"
@ -38,7 +45,7 @@
class="filter-popup-menu"
use:clickOutside={{ trigger: filterButton, handler: () => (visible = false) }}
>
<slot name="context-menu" {visible} />
{@render contextMenu({ visible })}
</div>
</div>
{/if}