Skip to content

Commit 9a91177

Browse files
t3dotggclaude
andauthored
fix(web): sidebar Back always returns to the main app (pingdotgg#13516)
Co-authored-by: Claude Opus 5.5 (1M context) <[email protected]>
1 parent 720490a commit 9a91177

4 files changed

Lines changed: 52 additions & 40 deletions

File tree

‎apps/web/src/components/AppSidebarLayout.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import LegacyThreadSidebar from "./LegacySidebar";
3535
import ThreadSidebar from "./Sidebar";
3636
import { SettingsSidebarNav } from "./settings/SettingsSidebarNav";
3737
import { SidebarChromeHeader } from "./sidebar/SidebarChrome";
38+
import { MainAppLocationTracker } from "./sidebar/mainAppLocation";
3839
import { useSidebarStageBackdropVariant } from "./SidebarStageBackdrop";
3940
import { useProjects } from "../state/entities";
4041
import {
@@ -321,6 +322,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {
321322
{children}
322323
<SidebarControl />
323324
<NavigationHistoryShortcuts />
325+
<MainAppLocationTracker />
324326
</SidebarProvider>
325327
</PanelAnimationSuppressionProvider>
326328
);

‎apps/web/src/components/sidebar/SidebarChrome.tsx‎

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { ArrowLeftIcon, ChartNoAxesColumnIcon, SettingsIcon } from "lucide-react";
22
import type { ReactNode } from "react";
33
import { memo, useCallback } from "react";
4-
import { Link, useCanGoBack, useLocation, useNavigate } from "@tanstack/react-router";
4+
import { Link, useLocation, useNavigate } from "@tanstack/react-router";
55

66
import { useEnvironmentIdentificationMode } from "../../hooks/useSettings";
77
import { cn } from "../../lib/utils";
@@ -24,6 +24,7 @@ import {
2424
} from "../ui/sidebar";
2525
import { Tooltip, TooltipPopup, TooltipTrigger } from "../ui/tooltip";
2626
import { readPullRequestListPreferences } from "../pullRequest/pullRequestListPreferences";
27+
import { isSidebarUtilityPage, useNavigateToMainApp } from "./mainAppLocation";
2728
import { SidebarThreadUndoNotice } from "./SidebarThreadUndoNotice";
2829
import { SidebarProviderUpdatePill } from "./SidebarProviderUpdatePill";
2930
import { SidebarUpdateArchitectureWarning, SidebarUpdatePill } from "./SidebarUpdatePill";
@@ -127,19 +128,10 @@ function SidebarUtilityItem({
127128

128129
export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {
129130
const navigate = useNavigate();
130-
const canGoBack = useCanGoBack();
131+
const navigateToMainApp = useNavigateToMainApp();
131132
const { isMobile, setOpenMobile } = useSidebar();
132-
const currentFooterPage = useLocation({
133-
select: (location) =>
134-
/^\/settings(?:\/|$)/.test(location.pathname)
135-
? "settings"
136-
: /^\/projects\/[^/]+\/?$/.test(location.pathname)
137-
? "project-settings"
138-
: location.pathname === "/usage"
139-
? "usage"
140-
: location.pathname === "/pull-requests"
141-
? "pull-requests"
142-
: null,
133+
const isOnUtilityPage = useLocation({
134+
select: (location) => isSidebarUtilityPage(location.pathname),
143135
});
144136
const { environments } = useEnvironments();
145137
// The page reads every connected server, so one of them offering pull requests is enough for
@@ -173,16 +165,12 @@ export const SidebarUtilityMenu = memo(function SidebarUtilityMenu() {
173165

174166
const handleBackClick = useCallback(() => {
175167
closeMobileSidebar();
176-
if (canGoBack) {
177-
window.history.back();
178-
return;
179-
}
180-
void navigate({ to: "/" });
181-
}, [canGoBack, closeMobileSidebar, navigate]);
168+
void navigateToMainApp();
169+
}, [closeMobileSidebar, navigateToMainApp]);
182170

183171
return (
184172
<SidebarMenu className="flex-row items-center">
185-
{currentFooterPage ? (
173+
{isOnUtilityPage ? (
186174
<SidebarMenuItem className="min-w-0 flex-1">
187175
<SidebarMenuButton onClick={handleBackClick}>
188176
<ArrowLeftIcon />
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
import { useLocation, useNavigate } from "@tanstack/react-router";
2+
import { useCallback, useEffect } from "react";
3+
4+
// Settings, Usage, and Pull Requests replace the sidebar utility row with a
5+
// Back button. Everything else is the main app. Legacy `/projects/<key>` links
6+
// redirect into settings, so they count too and are never remembered.
7+
export function isSidebarUtilityPage(pathname: string) {
8+
return (
9+
pathname === "/settings" ||
10+
pathname.startsWith("/settings/") ||
11+
pathname.startsWith("/projects/") ||
12+
pathname === "/usage" ||
13+
pathname === "/pull-requests"
14+
);
15+
}
16+
17+
let mainAppHref: string | null = null;
18+
19+
// Mount once in the app shell. Records the latest main app URL so Back can
20+
// return there no matter how many utility pages were visited since.
21+
export function MainAppLocationTracker() {
22+
const href = useLocation({
23+
select: (location) => (isSidebarUtilityPage(location.pathname) ? null : location.href),
24+
});
25+
useEffect(() => {
26+
if (href !== null) mainAppHref = href;
27+
}, [href]);
28+
return null;
29+
}
30+
31+
// Leaves a utility page for the last main app URL, or the thread list when
32+
// the app was opened directly on a utility page.
33+
export function useNavigateToMainApp() {
34+
const navigate = useNavigate();
35+
return useCallback(() => navigate({ href: mainAppHref ?? "/" }), [navigate]);
36+
}

‎apps/web/src/routes/settings.tsx‎

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,12 @@
1-
import {
2-
Outlet,
3-
createFileRoute,
4-
redirect,
5-
useCanGoBack,
6-
useLocation,
7-
useNavigate,
8-
} from "@tanstack/react-router";
9-
import { useCallback, useEffect, useState, type ReactNode } from "react";
1+
import { Outlet, createFileRoute, redirect, useLocation } from "@tanstack/react-router";
2+
import { useEffect, useState, type ReactNode } from "react";
103
import { RotateCcwIcon } from "lucide-react";
114
import { Button } from "../components/ui/button";
125
import { useSettingsRestore } from "../components/settings/SettingsPanels";
136

147
import { SettingsBreadcrumb } from "../components/settings/SettingsBreadcrumb";
158
import { SidebarInset } from "../components/ui/sidebar";
9+
import { useNavigateToMainApp } from "../components/sidebar/mainAppLocation";
1610
import { WorkspacePageHeader } from "../components/WorkspacePageHeader";
1711
import { isElectron } from "../env";
1812
import {
@@ -117,17 +111,9 @@ function SettingsScopeBoundary({ pathname, children }: { pathname: string; child
117111

118112
function SettingsContentLayout() {
119113
const location = useLocation();
120-
const navigate = useNavigate();
121-
const canGoBack = useCanGoBack();
114+
const navigateToMainApp = useNavigateToMainApp();
122115
const { search } = useSettingsScope();
123116
const [restoreSignal, setRestoreSignal] = useState(0);
124-
const navigateBackWithinApp = useCallback(() => {
125-
if (canGoBack) {
126-
window.history.back();
127-
return;
128-
}
129-
void navigate({ to: "/" });
130-
}, [canGoBack, navigate]);
131117

132118
useEffect(() => {
133119
const onKeyDown = (event: KeyboardEvent) => {
@@ -140,15 +126,15 @@ function SettingsContentLayout() {
140126
activeElement.blur();
141127
}
142128

143-
navigateBackWithinApp();
129+
void navigateToMainApp();
144130
}
145131
};
146132

147133
window.addEventListener("keydown", onKeyDown);
148134
return () => {
149135
window.removeEventListener("keydown", onKeyDown);
150136
};
151-
}, [navigateBackWithinApp]);
137+
}, [navigateToMainApp]);
152138

153139
return (
154140
<SidebarInset className="h-dvh min-h-0 overflow-hidden overscroll-y-none isolate">

0 commit comments

Comments
 (0)