Skip to content

fix(ux): spamming cmd + , no longer stack opening settings #2757

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamesx0416 wants to merge 3 commits into
base: main
Choose a base branch
from
+6 −3
Open

fix(ux): spamming cmd + , no longer stack opening settings #2757

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea54c3d
Replace settings route when reopening settings
jamesx0416 May 19, 2026
a954a23
Merge branch 'main' into t3code/01790fbd
jamesx0416 Jun 20, 2026
916a1b2
fix: check settings route boundary
jamesx0416 Jun 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions apps/web/src/components/AppSidebarLayout.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, type ReactNode } from "react";
import { useNavigate } from "@tanstack/react-router";
import { useEffect, useRef, type ReactNode } from "react";
import { useLocation, useNavigate } from "@tanstack/react-router";

import ThreadSidebar from "./Sidebar";
import { Sidebar, SidebarProvider, SidebarRail } from "./ui/sidebar";
Expand All @@ -9,6 +9,9 @@ const THREAD_SIDEBAR_MIN_WIDTH = 13 * 16;
const THREAD_MAIN_CONTENT_MIN_WIDTH = 40 * 16;
export function AppSidebarLayout({ children }: { children: ReactNode }) {
const navigate = useNavigate();
const pathname = useLocation({ select: (location) => location.pathname });
const pathnameRef = useRef(pathname);
pathnameRef.current = pathname;

useEffect(() => {
const onMenuAction = window.desktopBridge?.onMenuAction;
Expand All @@ -18,7 +21,7 @@ export function AppSidebarLayout({ children }: { children: ReactNode }) {

const unsubscribe = onMenuAction((action) => {
if (action === "open-settings") {
void navigate({ to: "/settings" });
void navigate({ to: "/settings", replace: /^\/settings(\/|$)/.test(pathnameRef.current) });
}
});

Expand Down
Loading