Skip to content

Commit 95882c9

Browse files
authored
Merge pull request #9827 from gitbutlerapp/stackview-assignedstackid-preview
Use assignedStackId and update preview rendering
2 parents 41b0fbd + 658c5a4 commit 95882c9

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

apps/desktop/src/components/StackView.svelte

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,9 @@
9999
const assignedKey = $derived(
100100
$lastAddedAssigned?.key ? readKey($lastAddedAssigned.key) : undefined
101101
);
102+
const assignedStackId = $derived(
103+
assignedKey?.type === 'worktree' ? assignedKey.stackId : undefined
104+
);
102105
103106
const commitId = $derived(selection.current?.commitId);
104107
const branchName = $derived(selection.current?.branchName);
@@ -543,16 +546,16 @@
543546
{/if}
544547

545548
<!-- BOTTOM SECTION: File Preview (no resizer) -->
546-
{#if assignedKey || selectedFile}
549+
{#if assignedStackId || selectedFile}
547550
<ReduxResult {projectId} result={previewChangeResult?.current}>
548551
{#snippet children(previewChange)}
549552
{@const diffResult = diffService.getDiff(projectId, previewChange)}
550553
{@const diffData = diffResult.current.data}
551554

552555
<div class="file-preview-section">
553-
{#if assignedKey?.type === 'worktree' && assignedKey.stackId}
556+
{#if assignedStackId}
554557
<ConfigurableScrollableContainer zIndex="var(--z-lifted)">
555-
{@render assignedChangePreview(assignedKey.stackId)}
558+
{@render assignedChangePreview(assignedStackId)}
556559
</ConfigurableScrollableContainer>
557560
{:else if selectedFile}
558561
<Drawer>

0 commit comments

Comments
 (0)