From e5278fd240ad2f2229b5331071541334bdd4f82c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C5=ABdolfs=20O=C5=A1i=C5=86=C5=A1?= Date: Tue, 28 Jan 2025 16:05:05 -0600 Subject: [PATCH] Add expand, collapse, expand all and collapse all buttons --- src/components/Changeset.svelte | 4 ++- src/components/Changeset/FileDiff.svelte | 4 ++- src/components/File.svelte | 39 ++++++++++++++++++++---- src/components/Icon.svelte | 30 ++++++++++++++++++ src/components/Revision.svelte | 35 ++++++++++++++++----- 5 files changed, 97 insertions(+), 15 deletions(-) diff --git a/src/components/Changeset.svelte b/src/components/Changeset.svelte index 8669c6074..6cced8c26 100644 --- a/src/components/Changeset.svelte +++ b/src/components/Changeset.svelte @@ -6,9 +6,10 @@ interface Props { diff: Diff; repoId: string; + expanded?: boolean; } - const { diff }: Props = $props(); + const { diff, expanded = true }: Props = $props(); - + {#snippet leftHeader()} {#if (headerBadgeCaption === "moved" || headerBadgeCaption === "copied") && oldFilePath} diff --git a/src/components/File.svelte b/src/components/File.svelte index da09a47cd..6d673324f 100644 --- a/src/components/File.svelte +++ b/src/components/File.svelte @@ -1,13 +1,23 @@ -
+
+ { + expanded = !expanded; + if (!expanded && header) { + await tick(); + header.scrollIntoView({ behavior: "smooth", block: "nearest" }); + } + }}> + + {@render leftHeader()}
-
- {@render children()} -
+{#if expanded} +
+ {@render children()} +
+{/if} diff --git a/src/components/Icon.svelte b/src/components/Icon.svelte index c50f934b2..5752d5b55 100644 --- a/src/components/Icon.svelte +++ b/src/components/Icon.svelte @@ -19,6 +19,7 @@ | "chevron-down" | "chevron-right" | "clock" + | "collapse" | "collapse-panel" | "comment" | "comment-checkmark" @@ -28,6 +29,7 @@ | "dashboard" | "delegate" | "diff" + | "expand" | "expand-panel" | "eye" | "face" @@ -256,6 +258,20 @@ + {:else if name === "collapse"} + + + + + + + + + + + + + {:else if name === "collapse-panel"} @@ -416,6 +432,20 @@ + {:else if name === "expand"} + + + + + + + + + + + + + {:else if name === "expand-panel"} diff --git a/src/components/Revision.svelte b/src/components/Revision.svelte index 8fad0edad..5ba85a33c 100644 --- a/src/components/Revision.svelte +++ b/src/components/Revision.svelte @@ -28,6 +28,7 @@ import NodeId from "@app/components/NodeId.svelte"; import ThreadComponent from "@app/components/Thread.svelte"; import Markdown from "./Markdown.svelte"; + import NakedButton from "./NakedButton.svelte"; interface Props { rid: string; @@ -48,6 +49,7 @@ let hideDiscussion = $state(false); let hideReviews = $state(false); let topLevelReplyOpen = $state(false); + let filesExpanded = $state(true); const threads = $derived( ((revision.discussion && @@ -385,18 +387,37 @@
(hideChanges = !hideChanges)}> - Changes + style:margin-bottom={hideChanges ? undefined : "1rem"}> +
(hideChanges = !hideChanges)}> + Changes +
+ {#if !hideChanges} +
+ (filesExpanded = !filesExpanded)}> + {#if filesExpanded === true} + + Collapse all + {:else} + + Expand all + {/if} + +
+ {/if}
{#await loadHighlightedDiff(rid, revision.base, revision.head)} Loading… {:then diff} - + {/await}