Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion apps/web/src/components/ChatView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1027,7 +1027,9 @@ export default function ChatView({ threadId }: ChatViewProps) {
replace: true,
search: (previous) => {
const rest = stripDiffSearchParams(previous);
return diffOpen ? { ...rest, diff: undefined } : { ...rest, diff: "1" };
return diffOpen
? { ...rest, clearDiff: "1" as const }
: { ...rest, diff: "1" };
},
});
}, [diffOpen, navigate, threadId]);
Expand Down
46 changes: 42 additions & 4 deletions apps/web/src/routes/_chat.$threadId.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { ThreadId } from "@t3tools/contracts";
import { createFileRoute, retainSearchParams, useNavigate } from "@tanstack/react-router";
import { createFileRoute, stripSearchParams, useNavigate } from "@tanstack/react-router";
import { Suspense, lazy, type ReactNode, useCallback, useEffect } from "react";

import ChatView from "../components/ChatView";
Expand All @@ -20,6 +20,36 @@ const DIFF_INLINE_SIDEBAR_WIDTH_STORAGE_KEY = "chat_diff_sidebar_width";
const DIFF_INLINE_DEFAULT_WIDTH = "clamp(28rem,48vw,44rem)";
const DIFF_INLINE_SIDEBAR_MIN_WIDTH = 26 * 16;
const COMPOSER_COMPACT_MIN_LEFT_CONTROLS_WIDTH_PX = 208;
const CLEAR_DIFF_SEARCH_VALUE = "1";

type ChatThreadRouteSearch = DiffRouteSearch & {
clearDiff?: typeof CLEAR_DIFF_SEARCH_VALUE;
};

function shouldClearDiff(value: unknown): boolean {
return value === CLEAR_DIFF_SEARCH_VALUE || value === 1 || value === true;
}

function parseChatThreadRouteSearch(search: Record<string, unknown>): ChatThreadRouteSearch {
const parsed = parseDiffRouteSearch(search);
return shouldClearDiff(search.clearDiff)
? { ...parsed, clearDiff: CLEAR_DIFF_SEARCH_VALUE }
: parsed;
}

function retainDiffUnlessCleared({
search,
next,
}: {
search: ChatThreadRouteSearch;
next: (newSearch: ChatThreadRouteSearch) => ChatThreadRouteSearch;
}): ChatThreadRouteSearch {
const result = next(search);
if (result.clearDiff === CLEAR_DIFF_SEARCH_VALUE || "diff" in result) {
return result;
}
return search.diff ? { ...result, diff: search.diff } : result;
}

const DiffPanelSheet = (props: {
children: ReactNode;
Expand Down Expand Up @@ -170,7 +200,12 @@ function ChatThreadRouteView() {
void navigate({
to: "/$threadId",
params: { threadId },
search: { diff: undefined },
search: (previous) => {
return {
...stripDiffSearchParams(previous),
clearDiff: CLEAR_DIFF_SEARCH_VALUE,
};
},
});
}, [navigate, threadId]);
const openDiff = useCallback(() => {
Expand Down Expand Up @@ -225,9 +260,12 @@ function ChatThreadRouteView() {
}

export const Route = createFileRoute("/_chat/$threadId")({
validateSearch: (search) => parseDiffRouteSearch(search),
validateSearch: (search) => parseChatThreadRouteSearch(search),
search: {
middlewares: [retainSearchParams<DiffRouteSearch>(["diff"])],
middlewares: [
retainDiffUnlessCleared,
stripSearchParams<ChatThreadRouteSearch>(["clearDiff"]),
],
},
component: ChatThreadRouteView,
});