8ddd735a7a
## Thinking Path > - Paperclip orchestrates AI agents for zero-human companies > - Operators sign in via the `/auth` page, which renders before any session exists > - The signed-in app has a theme toggle inside `SidebarAccountMenu`, but the signed-out `/auth` page has none — first-time visitors are stuck in whichever theme was hardcoded at boot > - Master's existing toggle was inline inside `SidebarAccountMenu.tsx` as a `MenuAction` row, not exported as a reusable widget; round-1 of this PR added a standalone `ThemeToggle` but punted on unifying the two surfaces > - This pull request makes `ThemeToggle` the canonical theme widget (one source of truth for label, icon, and toggle behaviour), used both as a compact icon button on `/auth` and as a full-width menu row in `SidebarAccountMenu` > - The benefit is a working pre-auth theme switch and zero risk of the two call sites drifting out of sync as the theme model evolves ## Linked Issues or Issue Description No existing issue covers this directly — problem described in-PR (feature-gap shape): - The signed-in app has a theme toggle inside `SidebarAccountMenu`, but the signed-out `/auth` page has none — first-time visitors are stuck in whichever theme was hardcoded at boot. - The existing toggle lived inline in `SidebarAccountMenu.tsx` as a `MenuAction` row, not exported as a reusable widget, so the two surfaces could drift apart as the theme model evolves. - This PR supersedes part of PR #3732 (the auth-page toggle slice); no standalone issue was filed for it. Duplicate-PR search: related open theme PRs #2769 and #4666 add in-app three-state system-theme toggles — different surface from this PR (unauthenticated auth page); sibling PR in this series: #5873. ## What Changed - **`ui/src/components/ThemeToggle.tsx`** — accepts `variant: "icon" | "menu-action"` (default `"icon"`) and an `onAfterToggle` callback. Both variants share `useTheme` and the same label/icon derivation. The `menu-action` variant matches the existing `MenuAction` row styling. - **`ui/src/components/SidebarAccountMenu.tsx`** — drops its inline `useTheme()` + `MenuAction`-for-the-theme-row in favor of `<ThemeToggle variant="menu-action" onAfterToggle={() => setOpen(false)} />`. Sun/Moon icon imports and theme state move with it. - **`ui/src/pages/Auth.tsx`** — unchanged from round 0; renders `<ThemeToggle />` at top-right of the `/auth` page (already using the default `icon` variant). - **`ui/src/components/ThemeToggle.test.tsx`** (new) — covers both variants, the `onAfterToggle` callback, and the label/icon flip across themes. - **`ui/src/components/SidebarAccountMenu.test.tsx`** — unchanged; its `ThemeContext` mock still works because `ThemeToggle` uses the same hook. ## Verification - `pnpm --filter @paperclipai/ui run typecheck` — clean. - `npx vitest run src/components/ThemeToggle.test.tsx src/components/SidebarAccountMenu.test.tsx` — 5 passed (4 new + 1 existing). - Manual: launched `pnpm dev` for the UI, mocked `/api/auth/get-session` 401, navigated to `/auth` — toggle is visible top-right, click flips light/dark. Screenshots committed. ## Risks Low. The change is structural — both call sites render the same widget that already worked on each surface independently. `SidebarAccountMenu`'s popover behaviour is preserved via `onAfterToggle`, and `ThemeContext` is untouched. ## Model Used Claude Opus 4.7 (1M context), extended thinking mode. ## Checklist - [x] I have searched GitHub for duplicate or related PRs and linked them above - [x] Thinking path traces from project context to this change - [x] Model used specified - [x] Checked ROADMAP.md — not in conflict with planned core work - [x] Tests run locally and pass - [x] Added tests for the new ThemeToggle component (both variants) - [x] UI change — before/after screenshots in `docs/pr-screenshots/pr-5874/` - [x] No documentation updates required (purely internal refactor + new component) - [x] Documented risks above - [x] Will address all Greptile and reviewer comments before merge Supersedes part of #3732. --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com> Co-authored-by: Devin Foley <devin@paperclip.ing>
108 lines
3.1 KiB
TypeScript
108 lines
3.1 KiB
TypeScript
// @vitest-environment jsdom
|
|
|
|
import { act } from "react";
|
|
import { createRoot } from "react-dom/client";
|
|
import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
|
|
import { ThemeToggle } from "./ThemeToggle";
|
|
|
|
const mockToggleTheme = vi.hoisted(() => vi.fn());
|
|
const mockTheme = vi.hoisted(() => ({ value: "dark" as "dark" | "light" }));
|
|
|
|
vi.mock("../context/ThemeContext", () => ({
|
|
useTheme: () => ({
|
|
theme: mockTheme.value,
|
|
toggleTheme: mockToggleTheme,
|
|
}),
|
|
}));
|
|
|
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
(globalThis as any).IS_REACT_ACT_ENVIRONMENT = true;
|
|
|
|
async function flushReact() {
|
|
await act(async () => {
|
|
await Promise.resolve();
|
|
});
|
|
}
|
|
|
|
describe("ThemeToggle", () => {
|
|
let container: HTMLDivElement;
|
|
|
|
beforeEach(() => {
|
|
container = document.createElement("div");
|
|
document.body.appendChild(container);
|
|
mockTheme.value = "dark";
|
|
});
|
|
|
|
afterEach(() => {
|
|
container.remove();
|
|
document.body.innerHTML = "";
|
|
vi.clearAllMocks();
|
|
});
|
|
|
|
it("renders an icon button by default with the 'switch to light' label when current theme is dark", async () => {
|
|
const root = createRoot(container);
|
|
await act(async () => {
|
|
root.render(<ThemeToggle />);
|
|
});
|
|
await flushReact();
|
|
|
|
const button = container.querySelector("button");
|
|
expect(button).not.toBeNull();
|
|
expect(button?.getAttribute("aria-label")).toBe("Switch to light mode");
|
|
expect(button?.getAttribute("title")).toBe("Switch to light mode");
|
|
|
|
await act(async () => {
|
|
button?.click();
|
|
});
|
|
expect(mockToggleTheme).toHaveBeenCalledTimes(1);
|
|
|
|
await act(async () => root.unmount());
|
|
});
|
|
|
|
it("renders a menu-action row when variant='menu-action' and includes the description text", async () => {
|
|
const root = createRoot(container);
|
|
await act(async () => {
|
|
root.render(<ThemeToggle variant="menu-action" />);
|
|
});
|
|
await flushReact();
|
|
|
|
expect(container.textContent).toContain("Switch to light mode");
|
|
expect(container.textContent).toContain("Toggle the app appearance.");
|
|
|
|
await act(async () => root.unmount());
|
|
});
|
|
|
|
it("calls onAfterToggle after toggling (used by SidebarAccountMenu to close the popover)", async () => {
|
|
const onAfterToggle = vi.fn();
|
|
const root = createRoot(container);
|
|
await act(async () => {
|
|
root.render(<ThemeToggle variant="menu-action" onAfterToggle={onAfterToggle} />);
|
|
});
|
|
await flushReact();
|
|
|
|
const button = container.querySelector("button");
|
|
await act(async () => {
|
|
button?.click();
|
|
});
|
|
|
|
expect(mockToggleTheme).toHaveBeenCalledTimes(1);
|
|
expect(onAfterToggle).toHaveBeenCalledTimes(1);
|
|
|
|
await act(async () => root.unmount());
|
|
});
|
|
|
|
it("flips label and icon when current theme is light", async () => {
|
|
mockTheme.value = "light";
|
|
const root = createRoot(container);
|
|
await act(async () => {
|
|
root.render(<ThemeToggle />);
|
|
});
|
|
await flushReact();
|
|
|
|
const button = container.querySelector("button");
|
|
expect(button?.getAttribute("aria-label")).toBe("Switch to dark mode");
|
|
|
|
await act(async () => root.unmount());
|
|
});
|
|
});
|