Skip to content

Commit 2326c3e

Browse files
author
Brain
committed
Complete attachment pane routing and accessible upload status
Signed-off-by: Brain <1a02c72794dcd0f07058a353bc3a81f4028b8c77c92c87fce6d5c8b85970a20b@buzz.block.builderlab.xyz>
1 parent 2068b31 commit 2326c3e

5 files changed

Lines changed: 344 additions & 3 deletions

File tree

‎src/bundled/sessions/SessionsPage.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
useRelayConnection,
1717
} from "../../features/relay/react";
1818
import { ChannelTimeline } from "../../features/messages/ChannelTimeline";
19+
import { rejectUnhandledFileDrop } from "../../features/messages/use-file-drop";
1920
import { MessageComposer } from "../../features/messages/MessageComposer";
2021
import { readView, writeView } from "../../shared/view-state";
2122
import { SessionsWorkspace } from "./SessionsWorkspace";
@@ -204,7 +205,13 @@ function SessionWork({
204205
[navigator, targetForLink],
205206
);
206207
return (
207-
<div className={styles.work}>
208+
// biome-ignore lint/a11y/noStaticElementInteractions: pane file-drop fallback; the composer provides a keyboard-accessible picker.
209+
<div
210+
className={styles.work}
211+
data-attachment-drop-zone=""
212+
onDragOver={rejectUnhandledFileDrop}
213+
onDrop={rejectUnhandledFileDrop}
214+
>
208215
<SessionHeading channel={channel} parentName={parentName} />
209216
<SessionColumn>
210217
<div className={styles.timeline}>

‎src/features/messages/ComposerAttachments.tsx‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,13 @@ function AttachmentItem({
135135
<span className={styles.name} title={item.file.name}>
136136
{item.file.name}
137137
</span>
138-
<span className={styles.hint}>
138+
<span
139+
className={styles.hint}
140+
role="status"
141+
aria-live="polite"
142+
aria-atomic="true"
143+
>
144+
<span className="sr-only">{item.file.name}: </span>
139145
{size} · {status}
140146
</span>
141147
{failed && <span className={styles.hint}>Preview unavailable</span>}

‎src/features/messages/MediaReviewViewer.tsx‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import type { RelaySession } from "../relay/session";
1717
import type { ThreadView } from "../relay/threads";
1818
import { useRowProfiles } from "../relay/react";
1919
import { useKnownAgentPubkeys } from "../agents/use-known";
20+
import { rejectUnhandledFileDrop } from "./use-file-drop";
2021
import { MessageComposer } from "./MessageComposer";
2122
import { ImageReviewStage } from "./ImageReviewStage";
2223
import { MessageRow } from "./MessageRow";
@@ -263,7 +264,13 @@ function ReviewShell({
263264
/>
264265
) : null}
265266
</div>
266-
<aside className={styles.mediaReviewConversation}>
267+
<aside
268+
className={styles.mediaReviewConversation}
269+
aria-label="Media comments"
270+
data-attachment-drop-zone=""
271+
onDragOver={rejectUnhandledFileDrop}
272+
onDrop={rejectUnhandledFileDrop}
273+
>
267274
{rootId && source ? (
268275
<>
269276
<ReviewComments
Lines changed: 319 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,319 @@
1+
// @vitest-environment jsdom
2+
import "@testing-library/jest-dom/vitest";
3+
import { File as NodeFile } from "node:buffer";
4+
import {
5+
act,
6+
cleanup,
7+
createEvent,
8+
fireEvent,
9+
render,
10+
screen,
11+
waitFor,
12+
within,
13+
} from "@testing-library/react";
14+
import { StrictMode, useRef, type ReactNode } from "react";
15+
import { afterEach, expect, it, vi } from "vitest";
16+
import { SessionsPage } from "../../bundled/sessions/SessionsPage";
17+
import { writeView } from "../../shared/view-state";
18+
import { SESSION_CHANNEL_DESCRIPTION } from "../sessions/metadata";
19+
import { createRelaySession } from "../relay/session";
20+
import { keypair, message, roster, signed } from "../relay/testing";
21+
import { MessageComposer } from "./MessageComposer";
22+
import { MediaReviewViewer } from "./MediaReviewViewer";
23+
import { useFileDrop } from "./use-file-drop";
24+
25+
const owners: ReturnType<typeof createRelaySession>[] = [];
26+
afterEach(() => {
27+
cleanup();
28+
for (const owner of owners.splice(0)) owner.dispose();
29+
localStorage.clear();
30+
vi.unstubAllGlobals();
31+
});
32+
const empty: readonly never[] = [];
33+
const contributions = { snapshot: () => empty, subscribe: () => () => {} };
34+
const extensions = { tools: contributions, inline: contributions };
35+
const image = { kind: "image" as const, url: "https://fixture.test/image.png" };
36+
const file = () =>
37+
new NodeFile(["notes"], "notes.txt", {
38+
type: "text/plain",
39+
}) as unknown as File;
40+
function deferred<T>() {
41+
let resolve!: (value: T) => void;
42+
const promise = new Promise<T>((done) => {
43+
resolve = done;
44+
});
45+
return { promise, resolve };
46+
}
47+
async function fixture(archived = false) {
48+
// jsdom has no layout observer; these assertions concern event ownership, not geometry.
49+
vi.stubGlobal(
50+
"ResizeObserver",
51+
class {
52+
observe() {}
53+
unobserve() {}
54+
disconnect() {}
55+
},
56+
);
57+
const viewer = keypair(),
58+
relay = keypair();
59+
const root = message(viewer, "work", "Image", 1, [
60+
["imeta", `url ${image.url}`, "m image/png"],
61+
]);
62+
const comment = message(viewer, "work", "Existing review comment", 2, [
63+
["e", root.id, "", "reply"],
64+
]);
65+
const membership = roster(relay, "work", [viewer.pubkey]);
66+
const channel = signed(relay, {
67+
kind: 39000,
68+
content: "",
69+
tags: [
70+
["d", "work"],
71+
["name", "Work"],
72+
["t", "stream"],
73+
["private"],
74+
["about", SESSION_CHANNEL_DESCRIPTION],
75+
...(archived ? [["archived", "true"]] : []),
76+
],
77+
});
78+
const uploaded = {
79+
name: "notes.txt",
80+
type: "text/plain",
81+
size: 5,
82+
sha256: "a".repeat(64),
83+
url: `https://fixture.test/media/${"a".repeat(64)}.txt`,
84+
};
85+
const upload = vi.fn(async (_file: File, _signal: AbortSignal) => uploaded);
86+
const owner = createRelaySession(
87+
{
88+
viewer: viewer.pubkey,
89+
relayAuthor: relay.pubkey,
90+
scope: "https://fixture.test",
91+
media: (url) => url,
92+
uploadAttachment: upload,
93+
query: async (filters) =>
94+
filters.flatMap((filter) => {
95+
if (filter.kinds?.some((kind) => kind === 39000 || kind === 39002))
96+
return [channel, membership];
97+
if (filter.ids)
98+
return [root, comment].filter((event) =>
99+
filter.ids?.includes(event.id),
100+
);
101+
if (filter.depth_limit)
102+
return filter.thread_cursor === undefined ||
103+
filter.thread_cursor < comment.created_at
104+
? [comment]
105+
: [];
106+
return [];
107+
}),
108+
writer: {
109+
kinds: [9],
110+
sign: async (event) => signed(viewer, event),
111+
publish: async () => {},
112+
},
113+
},
114+
{ outboxStorage: { load: () => [], save() {} } },
115+
);
116+
owners.push(owner);
117+
owner.session.channels.ensureList();
118+
await waitFor(() =>
119+
expect(owner.session.channels.list().status).toBe("ready"),
120+
);
121+
await waitFor(() =>
122+
expect(owner.session.channels.list().channels).toHaveLength(1),
123+
);
124+
const scope = `https://fixture.test:${viewer.pubkey}`;
125+
const snapshot = {
126+
status: "ready" as const,
127+
generation: 0,
128+
scope,
129+
session: owner.session,
130+
viewer: viewer.pubkey,
131+
};
132+
const relayData = {
133+
snapshot: () => snapshot,
134+
subscribe: () => () => {},
135+
retry() {},
136+
disconnect() {},
137+
clearCache: owner.clearCache,
138+
};
139+
return { owner, scope, relayData, upload, uploaded, root };
140+
}
141+
function OuterComposer({
142+
children,
143+
attach,
144+
}: {
145+
children: ReactNode;
146+
attach(files: readonly File[]): void;
147+
}) {
148+
const ref = useRef<HTMLFormElement>(null);
149+
useFileDrop(ref, true, attach);
150+
return (
151+
<div data-attachment-drop-zone="">
152+
<form ref={ref} aria-label="Other composer" />
153+
{children}
154+
</div>
155+
);
156+
}
157+
function drop(target: HTMLElement, type: "drop" | "dragOver" = "drop") {
158+
const transfer = {
159+
types: ["Files"],
160+
files: [file()],
161+
dropEffect: "uninitialized",
162+
};
163+
const event = createEvent[type](target, {
164+
dataTransfer: transfer,
165+
bubbles: true,
166+
cancelable: true,
167+
});
168+
fireEvent(target, event);
169+
return { event, transfer };
170+
}
171+
172+
it.each([false, true])(
173+
"the production Sessions timeline owns drops and rejects an unavailable composer (archived=%s)",
174+
async (archived) => {
175+
const h = await fixture(archived);
176+
writeView(h.scope, "sessions:selected", "work");
177+
const other = vi.fn();
178+
render(
179+
<StrictMode>
180+
<OuterComposer attach={other}>
181+
<SessionsPage relay={h.relayData} extensions={extensions} />
182+
</OuterComposer>
183+
</StrictMode>,
184+
);
185+
const timeline = await screen.findByLabelText("Channel message history");
186+
const form = screen.getByRole("form", { name: "Send a message to Work" });
187+
const button = within(form).getByRole("button", { name: "Attach files" });
188+
await waitFor(() =>
189+
archived ? expect(button).toBeDisabled() : expect(button).toBeEnabled(),
190+
);
191+
expect(timeline.closest("form")).toBeNull();
192+
const over = drop(timeline, "dragOver");
193+
expect(over.event.defaultPrevented).toBe(true);
194+
expect(over.transfer.dropEffect).toBe(archived ? "none" : "copy");
195+
expect(drop(timeline).event.defaultPrevented).toBe(true);
196+
if (archived) {
197+
expect(
198+
within(form).queryByRole("region", { name: "Attachments" }),
199+
).toBeNull();
200+
expect(h.upload).not.toHaveBeenCalled();
201+
} else {
202+
await waitFor(() =>
203+
expect(within(form).getByRole("status")).toHaveTextContent(
204+
"notes.txt: 1 KB · Ready",
205+
),
206+
);
207+
expect(h.upload).toHaveBeenCalledTimes(1);
208+
expect(h.upload.mock.calls[0]?.[0].name).toBe("notes.txt");
209+
}
210+
expect(other).not.toHaveBeenCalled();
211+
},
212+
);
213+
214+
it.each([false, true])(
215+
"the portaled media comments own drops, including when their composer is absent (unavailable=%s)",
216+
async (unavailable) => {
217+
const h = await fixture();
218+
const other = vi.fn();
219+
const session = unavailable
220+
? {
221+
...h.owner.session,
222+
thread() {
223+
throw new Error("Unavailable review");
224+
},
225+
}
226+
: h.owner.session;
227+
const view = render(
228+
<StrictMode>
229+
<OuterComposer attach={other}>
230+
<MediaReviewViewer
231+
attachment={image}
232+
session={session}
233+
scope={h.scope}
234+
channelId="work"
235+
channelName="Work"
236+
messageId={h.root.id}
237+
initialTime={0}
238+
close={() => {}}
239+
/>
240+
</OuterComposer>
241+
</StrictMode>,
242+
);
243+
const pane = screen.getByRole("complementary", { name: "Media comments" });
244+
expect(view.container.contains(pane)).toBe(false); // Actual document.body portal.
245+
const target = unavailable
246+
? within(pane).getByText("Error: Unavailable review")
247+
: await within(pane).findByText("Existing review comment");
248+
expect(target.closest("form")).toBeNull();
249+
if (!unavailable)
250+
await waitFor(() =>
251+
expect(
252+
within(pane).getByRole("button", { name: "Attach files" }),
253+
).toBeEnabled(),
254+
);
255+
const over = drop(target, "dragOver");
256+
expect(over.event.defaultPrevented).toBe(true);
257+
expect(over.transfer.dropEffect).toBe(unavailable ? "none" : "copy");
258+
expect(drop(target).event.defaultPrevented).toBe(true);
259+
if (unavailable) {
260+
expect(pane.querySelector("form")).toBeNull();
261+
expect(h.upload).not.toHaveBeenCalled();
262+
} else {
263+
await waitFor(() =>
264+
expect(within(pane).getByRole("status")).toHaveTextContent(
265+
"notes.txt: 1 KB · Ready",
266+
),
267+
);
268+
expect(h.upload).toHaveBeenCalledTimes(1);
269+
}
270+
expect(other).not.toHaveBeenCalled();
271+
},
272+
);
273+
274+
it("announces preparation, upload and readiness politely while editor focus stays put", async () => {
275+
const h = await fixture();
276+
const header = deferred<ArrayBuffer>();
277+
const upload = deferred<typeof h.uploaded>();
278+
h.upload.mockImplementation(() => upload.promise);
279+
const source = file();
280+
vi.spyOn(source, "slice").mockReturnValue({
281+
arrayBuffer: () => header.promise,
282+
} as Blob);
283+
render(
284+
<MessageComposer
285+
session={h.owner.session}
286+
scope={h.scope}
287+
channelId="work"
288+
channelName="Work"
289+
/>,
290+
);
291+
const editor = screen.getByRole("textbox");
292+
editor.focus();
293+
fireEvent.paste(editor, {
294+
clipboardData: { items: [{ kind: "file", getAsFile: () => source }] },
295+
});
296+
const status = screen.getByRole("status");
297+
expect(status).toHaveAttribute("aria-live", "polite");
298+
expect(status).toHaveAttribute("aria-atomic", "true");
299+
expect(status).toHaveTextContent("notes.txt: 1 KB · Preparing…");
300+
expect(editor).toHaveFocus();
301+
const send = screen.getByRole("button", { name: "Send message" });
302+
expect(send).toBeDisabled();
303+
await act(async () => {
304+
header.resolve(new ArrayBuffer(0));
305+
});
306+
expect(status).toHaveTextContent("notes.txt: 1 KB · Uploading…");
307+
expect(editor).toHaveFocus();
308+
expect(send).toBeDisabled();
309+
await act(async () => {
310+
upload.resolve(h.uploaded);
311+
});
312+
expect(status).toHaveTextContent("notes.txt: 1 KB · Ready");
313+
expect(editor).toHaveFocus();
314+
expect(send).toBeEnabled();
315+
expect(screen.getAllByRole("status")).toHaveLength(1);
316+
expect(
317+
screen.getByRole("region", { name: "Attachments" }),
318+
).not.toHaveAttribute("aria-live");
319+
});

‎tests/fixtures/relay-composer.tsx‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import { createRoot } from "react-dom/client";
33
import { ToastProvider } from "../../src/shared/design-system/ui/Toast";
44
import { Context } from "@deepseek-ai/cordis";
5+
import { TemplateProvidersService } from "../../src/features/channel-templates/provider";
56
import { ChannelsPage } from "../../src/bundled/channels/ChannelsPage";
67
import { PanelsService } from "../../src/features/panels/service";
78
import { PagesService } from "../../src/features/pages/service";
@@ -133,6 +134,7 @@ createRoot(container).render(
133134
<ToastProvider>
134135
<div style={{ height: "100vh" }}>
135136
<ChannelsPage
137+
providers={new TemplateProvidersService(root)}
136138
relay={data}
137139
panels={new PanelsService(root)}
138140
pages={new PagesService(root)}

0 commit comments

Comments
 (0)