Skip to content

Commit ab16220

Browse files
committed
perf(web): ignore thread typing in sidebar drafts
1 parent 15fe283 commit ab16220

2 files changed

Lines changed: 72 additions & 1 deletion

File tree

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
import { scopeProjectRef, scopeThreadRef } from "@t3tools/client-runtime/environment";
2+
import { EnvironmentId, ProjectId, ThreadId } from "@t3tools/contracts";
3+
import { expect, it, vi } from "vite-plus/test";
4+
5+
import { act, render } from "../../../test/render";
6+
import { DraftId, useComposerDraftStore } from "../../composerDraftStore";
7+
import { SidebarDraftBlock } from "./SidebarDraftBlock";
8+
9+
it("keeps draft previews current through edits, promotion and removal", async () => {
10+
const initial = useComposerDraftStore.getState();
11+
using _store = {
12+
[Symbol.dispose]: () => useComposerDraftStore.setState(initial, true),
13+
};
14+
useComposerDraftStore.setState({
15+
draftsByThreadKey: {},
16+
draftThreadsByThreadKey: {},
17+
logicalProjectDraftThreadKeyByLogicalProjectKey: {},
18+
});
19+
const environmentId = EnvironmentId.make("draft-preview-environment");
20+
const projectRef = scopeProjectRef(environmentId, ProjectId.make("draft-preview-project"));
21+
const draftId = DraftId.make("draft-preview");
22+
const threadId = ThreadId.make("draft-preview-thread");
23+
await using screen = await render(
24+
<ul>
25+
<SidebarDraftBlock
26+
projectByKey={new Map()}
27+
projectDisplayNameByKey={new Map()}
28+
scopedProjectKeys={null}
29+
routeDraftId={null}
30+
onNavigateToDraft={vi.fn()}
31+
onDraftContextMenu={vi.fn()}
32+
/>
33+
</ul>,
34+
);
35+
const row = screen.getByTestId("sidebar-draft-row");
36+
await expect.element(row).not.toBeInTheDocument();
37+
38+
await act(() => {
39+
initial.setProjectDraftThreadId(projectRef, draftId, { threadId });
40+
initial.setPrompt(draftId, "First draft preview");
41+
});
42+
await expect.element(row).toHaveAccessibleName("First draft preview, Unsent draft");
43+
44+
await act(() =>
45+
initial.setPrompt(scopeThreadRef(environmentId, ThreadId.make("other")), "Other composer"),
46+
);
47+
await act(() => initial.setPrompt(draftId, "Updated draft preview"));
48+
await expect.element(row).toHaveAccessibleName("Updated draft preview, Unsent draft");
49+
50+
await act(() => initial.markDraftThreadPromoting(draftId));
51+
await expect.element(row).not.toBeInTheDocument();
52+
await act(() => initial.clearDraftThread(draftId));
53+
54+
const nextDraftId = DraftId.make("next-draft-preview");
55+
await act(() => {
56+
initial.setProjectDraftThreadId(projectRef, nextDraftId, { threadId: ThreadId.make("next") });
57+
initial.setPrompt(nextDraftId, "Next draft preview");
58+
});
59+
await expect.element(row).toHaveAccessibleName("Next draft preview, Unsent draft");
60+
await act(() => initial.clearDraftThread(nextDraftId));
61+
await expect.element(row).not.toBeInTheDocument();
62+
});

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

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import {
88
type MouseEvent as ReactMouseEvent,
99
} from "react";
1010
import type { EnvironmentProject } from "@t3tools/client-runtime/state/shell";
11+
import { useShallow } from "zustand/react/shallow";
1112
import { cn } from "~/lib/utils";
1213
import { resolveSidebarRowAccessibility } from "../Sidebar.logic";
1314
import { ProjectFavicon, type ProjectFaviconProject } from "../ProjectFavicon";
@@ -147,7 +148,15 @@ export const SidebarDraftBlock = memo(function SidebarDraftBlock(props: {
147148
onDraftContextMenu: (draftId: DraftId, position: { x: number; y: number }) => void;
148149
}) {
149150
const draftThreadsByThreadKey = useComposerDraftStore((store) => store.draftThreadsByThreadKey);
150-
const draftsByThreadKey = useComposerDraftStore((store) => store.draftsByThreadKey);
151+
const draftsByThreadKey = useComposerDraftStore(
152+
useShallow((store) =>
153+
Object.fromEntries(
154+
Object.keys(store.draftThreadsByThreadKey).map(
155+
(key) => [key, store.draftsByThreadKey[key]] as const,
156+
),
157+
),
158+
),
159+
);
151160
const [frozenActive, setFrozenActive] = useState<{
152161
routeDraftId: string | null;
153162
row: SidebarDraftRowData | null;

0 commit comments

Comments
 (0)