gitbutlerapp/gitbutler
1
1
Fork 0
mirror of https://github.com/gitbutlerapp/gitbutler.git synced 2025-01-06 01:27:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1609 from gitbutlerapp/sort-branches-by-order

Browse Source 
Sort branches by order
This commit is contained in:
Nikita Galaiko 2023-11-15 13:50:34 +01:00 committed by GitHub
commit 590f2a1924
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/ui/src/routes/[projectId]/board/Board.svelte
View File

@ -29,6 +29,8 @@
let priorPosition = 0;
let dropPosition = 0;
$: activeBranches = branches?.filter((b) => b.active) || [];
function handleEmpty() {
const emptyIndex = branches?.findIndex((item) => !item.files || item.files.length == 0);
if (emptyIndex && emptyIndex != -1) {
@ -36,8 +38,6 @@
}
branches = branches;
}
$: activeBranches = branches?.filter((b) => b.active);
</script>
{#if branchesState.isLoading || baseBranchState.isLoading}
@ -77,9 +77,9 @@
if (!branches) return;
e.preventDefault();
if (priorPosition != dropPosition) {
const el = branches.splice(priorPosition, 1);
branches.splice(dropPosition, 0, ...el);
branches.forEach((branch, i) => {
const el = activeBranches.splice(priorPosition, 1);
activeBranches.splice(dropPosition, 0, ...el);
activeBranches.forEach((branch, i) => {
if (branch.order !== i) {
branchController.updateBranchOrder(branch.id, i);
}
@ -87,7 +87,7 @@
}
}}
>
{#each branches.filter((c) => c.active) as branch (branch.id)}
{#each activeBranches.sort((a, b) => a.order - b.order) as branch (branch.id)}
<div
class="h-full"
role="group"