Skip to content
Open
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
11 changes: 11 additions & 0 deletions apps/web/src/components/Sidebar.logic.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
resolveSidebarNewThreadEnvMode,
resolveThreadRowClassName,
resolveThreadStatusPill,
shouldHideSidebarAfterThreadAction,
shouldClearThreadSelectionOnMouseDown,
} from "./Sidebar.logic";

Expand Down Expand Up @@ -84,6 +85,16 @@ describe("resolveSidebarNewThreadEnvMode", () => {
});
});

describe("shouldHideSidebarAfterThreadAction", () => {
it("hides the sidebar after thread actions on mobile", () => {
expect(shouldHideSidebarAfterThreadAction(true)).toBe(true);
});

it("keeps the sidebar open after thread actions on desktop", () => {
expect(shouldHideSidebarAfterThreadAction(false)).toBe(false);
});
});

describe("resolveThreadStatusPill", () => {
const baseThread = {
interactionMode: "plan" as const,
Expand Down
4 changes: 4 additions & 0 deletions apps/web/src/components/Sidebar.logic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ export function resolveSidebarNewThreadEnvMode(input: {
return input.requestedEnvMode ?? input.defaultEnvMode;
}

export function shouldHideSidebarAfterThreadAction(isMobile: boolean): boolean {
return isMobile;
}

export function resolveThreadRowClassName(input: {
isActive: boolean;
isSelected: boolean;
Expand Down
14 changes: 14 additions & 0 deletions apps/web/src/components/Sidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,11 @@ import {
resolveSidebarNewThreadEnvMode,
resolveThreadRowClassName,
resolveThreadStatusPill,
shouldHideSidebarAfterThreadAction,
shouldClearThreadSelectionOnMouseDown,
} from "./Sidebar.logic";
import { useCopyToClipboard } from "~/hooks/useCopyToClipboard";
import { useSidebar } from "~/components/ui/sidebar";

const EMPTY_KEYBINDINGS: ResolvedKeybindingsConfig = [];
const THREAD_PREVIEW_LIMIT = 6;
Expand Down Expand Up @@ -253,6 +255,7 @@ function SortableProjectItem({
}

export default function Sidebar() {
const { isMobile, setOpenMobile } = useSidebar();
const projects = useStore((store) => store.projects);
const threads = useStore((store) => store.threads);
const markThreadUnread = useStore((store) => store.markThreadUnread);
Expand Down Expand Up @@ -383,6 +386,13 @@ export default function Sidebar() {
});
}, []);

const hideSidebarAfterThreadAction = useCallback(() => {
if (!shouldHideSidebarAfterThreadAction(isMobile)) {
return;
}
setOpenMobile(false);
}, [isMobile, setOpenMobile]);

const focusMostRecentThreadForProject = useCallback(
(projectId: ProjectId) => {
const latestThread = threads
Expand Down Expand Up @@ -844,6 +854,7 @@ export default function Sidebar() {
clearSelection();
}
setSelectionAnchor(threadId);
hideSidebarAfterThreadAction();
void navigate({
to: "/$threadId",
params: { threadId },
Expand All @@ -855,6 +866,7 @@ export default function Sidebar() {
rangeSelectTo,
selectedThreadIds.size,
setSelectionAnchor,
hideSidebarAfterThreadAction,
toggleThreadSelection,
],
);
Expand Down Expand Up @@ -1424,6 +1436,7 @@ export default function Sidebar() {
onClick={(event) => {
event.preventDefault();
event.stopPropagation();
hideSidebarAfterThreadAction();
void handleNewThread(project.id, {
envMode: resolveSidebarNewThreadEnvMode({
defaultEnvMode: appSettings.defaultThreadEnvMode,
Expand Down Expand Up @@ -1492,6 +1505,7 @@ export default function Sidebar() {
clearSelection();
}
setSelectionAnchor(thread.id);
hideSidebarAfterThreadAction();
void navigate({
to: "/$threadId",
params: { threadId: thread.id },
Expand Down