mirror of
https://seed.radicle.dev/rad:z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git
synced 2026-11-21 14:20:42 +08:00
Persist sidebar across navigations to preserve scroll position
Move AppSidebar out of per-route view components into App.svelte so it
is never unmounted on navigation. This fixes the sidebar scroll position
resetting to the top whenever the user opens a repository or navigates
between Issues, Patches and the repo home view.
Also removes the redundant invoke<Config>("config") call from each repo
route loader — the value is now taken from sidebarData.config, which
loadSidebarData() already fetches.
This commit is contained in:
+37
-15
@@ -1,6 +1,7 @@
|
||||
<script lang="ts">
|
||||
import type { Config } from "@bindings/config/Config";
|
||||
import type { ErrorWrapper } from "@bindings/error/ErrorWrapper";
|
||||
import type { RepoInfo } from "@bindings/repo/RepoInfo";
|
||||
|
||||
import { listen } from "@tauri-apps/api/event";
|
||||
import { getCurrentWindow } from "@tauri-apps/api/window";
|
||||
@@ -20,12 +21,14 @@
|
||||
import { invoke } from "@app/lib/invoke";
|
||||
import { hide } from "@app/lib/modal";
|
||||
import * as router from "@app/lib/router";
|
||||
import { isLoadedRepoRoute } from "@app/lib/router/definitions";
|
||||
import {
|
||||
setUnlistenNodeEvents,
|
||||
unlistenNodeEvents,
|
||||
} from "@app/lib/startup.svelte";
|
||||
import { isMac, unreachable } from "@app/lib/utils";
|
||||
|
||||
import AppSidebar from "@app/components/AppSidebar.svelte";
|
||||
import { codeFont } from "@app/components/CodeFontSwitch.svelte";
|
||||
import {
|
||||
followSystemTheme,
|
||||
@@ -50,6 +53,11 @@
|
||||
|
||||
const activeRouteStore = router.activeRouteStore;
|
||||
|
||||
const activeRepo = $derived.by((): RepoInfo | undefined => {
|
||||
const route = $activeRouteStore;
|
||||
return isLoadedRepoRoute(route) ? route.params.repo : undefined;
|
||||
});
|
||||
|
||||
const DRAG_REGION_HEIGHT = 32;
|
||||
const INTERACTIVE_TAGS = new Set([
|
||||
"a",
|
||||
@@ -144,6 +152,13 @@
|
||||
align-items: center;
|
||||
height: 100%;
|
||||
}
|
||||
.layout {
|
||||
display: grid;
|
||||
grid-template-columns: auto 1fr;
|
||||
grid-template-rows: 100%;
|
||||
height: 100%;
|
||||
overflow: hidden;
|
||||
}
|
||||
</style>
|
||||
|
||||
<svelte:document
|
||||
@@ -194,20 +209,27 @@
|
||||
{:else if showSpinner}
|
||||
<div class="spinner"><Spinner /></div>
|
||||
{/if}
|
||||
{:else if $activeRouteStore.resource === "inbox"}
|
||||
<InboxView {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "guide"}
|
||||
<GuideView {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.home"}
|
||||
<RepoHome {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.issue"}
|
||||
<Issue {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.issues"}
|
||||
<Issues {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.patch"}
|
||||
<Patch {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.patches"}
|
||||
<Patches {...$activeRouteStore.params} />
|
||||
{:else}
|
||||
{unreachable($activeRouteStore)}
|
||||
<div class="layout">
|
||||
<AppSidebar
|
||||
sidebarData={$activeRouteStore.params.sidebarData}
|
||||
{activeRepo} />
|
||||
{#if $activeRouteStore.resource === "inbox"}
|
||||
<InboxView {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "guide"}
|
||||
<GuideView {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.home"}
|
||||
<RepoHome {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.issue"}
|
||||
<Issue {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.issues"}
|
||||
<Issues {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.patch"}
|
||||
<Patch {...$activeRouteStore.params} />
|
||||
{:else if $activeRouteStore.resource === "repo.patches"}
|
||||
<Patches {...$activeRouteStore.params} />
|
||||
{:else}
|
||||
{unreachable($activeRouteStore)}
|
||||
{/if}
|
||||
</div>
|
||||
{/if}
|
||||
|
||||
Reference in New Issue
Block a user