Skip to content

Commit f6815ba

Browse files
committed
fix(web): refresh changed local videos without interrupting playback
1 parent 83bf9c8 commit f6815ba

2 files changed

Lines changed: 60 additions & 36 deletions

File tree

‎apps/web/src/components/chat/ChatMarkdownMedia.browser.test.tsx‎

Lines changed: 53 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ vi.mock(import("~/state/assets"), async (original) => {
1515
return AsyncResult.success({
1616
relativeUrl: `data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7#${assetQuery.mints}`,
1717
expiresAt: Number.MAX_SAFE_INTEGER,
18+
fileRevision: String(assetQuery.mints),
1819
});
1920
}).pipe(Atom.keepAlive),
2021
);
@@ -60,37 +61,59 @@ function setup() {
6061
}
6162

6263
describe("ChatMarkdownAssetImage", () => {
63-
it("refreshes repeated local images together after a new chat revision", async () => {
64-
setup();
65-
const images = (revision: string) => (
66-
<WorkspaceMutationIdContext value={revision}>
67-
{["first", "second"].map((alt) => (
68-
<ChatMarkdownAssetImage
69-
key={alt}
70-
environmentId={EnvironmentId.make("environment-1")}
71-
resource={{
72-
_tag: "media-file",
73-
threadId: ThreadId.make("thread-1"),
74-
path: "/tmp/render.png",
75-
}}
76-
alt={alt}
77-
/>
78-
))}
79-
</WorkspaceMutationIdContext>
80-
);
81-
await using screen = await render(images("message-1"));
82-
using errors = vi.spyOn(console, "error");
83-
await vi.waitFor(() => expect(assetQuery.mints).toBe(2));
84-
const previousSrc = screen.getByRole("img", { name: "first" }).element().getAttribute("src");
64+
it.each(["image", "video"] as const)(
65+
"refreshes repeated local %s embeds together after a new chat revision",
66+
async (kind) => {
67+
setup();
68+
const images = (revision: string) => (
69+
<WorkspaceMutationIdContext value={revision}>
70+
{["first", "second"].map((alt) => (
71+
<ChatMarkdownAssetImage
72+
key={alt}
73+
kind={kind}
74+
environmentId={EnvironmentId.make("environment-1")}
75+
resource={{
76+
_tag: "media-file",
77+
threadId: ThreadId.make("thread-1"),
78+
path: `/tmp/render.${kind === "video" ? "mp4" : "png"}`,
79+
}}
80+
alt={alt}
81+
/>
82+
))}
83+
</WorkspaceMutationIdContext>
84+
);
85+
await using screen = await render(images("message-1"));
86+
using errors = vi.spyOn(console, "error");
87+
await vi.waitFor(() => expect(assetQuery.mints).toBe(2));
88+
const previousSrc = (
89+
kind === "image"
90+
? screen.getByRole("img", { name: "first" })
91+
: screen.getByLabelText("first", { exact: true })
92+
)
93+
.element()
94+
.getAttribute("src");
8595

86-
await screen.rerender(images("message-2"));
87-
await vi.waitFor(() => expect(assetQuery.mints).toBe(3));
88-
const first = screen.getByRole("img", { name: "first" });
89-
const second = screen.getByRole("img", { name: "second" });
90-
await expect.element(first).not.toHaveAttribute("src", previousSrc);
91-
await expect.element(second).toHaveAttribute("src", first.element().getAttribute("src"));
92-
expect(errors).not.toHaveBeenCalled();
93-
});
96+
if (kind === "video") {
97+
for (const video of document.querySelectorAll("video")) {
98+
video.dispatchEvent(new Event("loadedmetadata"));
99+
}
100+
}
101+
102+
await screen.rerender(images("message-2"));
103+
await vi.waitFor(() => expect(assetQuery.mints).toBe(3));
104+
const first =
105+
kind === "image"
106+
? screen.getByRole("img", { name: "first" })
107+
: screen.getByLabelText("first", { exact: true });
108+
const second =
109+
kind === "image"
110+
? screen.getByRole("img", { name: "second" })
111+
: screen.getByLabelText("second", { exact: true });
112+
await expect.element(first).not.toHaveAttribute("src", previousSrc);
113+
await expect.element(second).toHaveAttribute("src", first.element().getAttribute("src"));
114+
expect(errors).not.toHaveBeenCalled();
115+
},
116+
);
94117

95118
it("does not re-mint an unchanged workspace image's URL on remount", async () => {
96119
setup();

‎apps/web/src/components/chat/ChatMarkdownMedia.tsx‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ const CHAT_MARKDOWN_WORKSPACE_IMAGE_CLASS_NAME = cn(
7474
export const MarkdownLinkContext = createContext(false);
7575
/**
7676
* A surface's workspace mutation id, for markdown that does not receive one as a prop.
77-
* Read only by host-file images, so a change re-mints their URLs without re-rendering rows.
77+
* Read only by host-file media, so a change re-mints their URLs without re-rendering rows.
7878
*/
7979
export const WorkspaceMutationIdContext = createContext<string | null | undefined>(undefined);
8080

@@ -286,13 +286,15 @@ export function ChatMarkdownVideo(props: {
286286
readonly sourceFailed?: boolean | undefined;
287287
readonly style?: CSSProperties | undefined;
288288
readonly mediaIdentity?: string | undefined;
289+
readonly revision?: string | null | undefined;
289290
readonly actionsSource?: MediaActionSource | undefined;
290291
readonly onRetry?: (() => Promise<unknown>) | undefined;
291292
}) {
292293
return (
293294
<MediaVideoPlayer
294295
key={props.mediaIdentity ?? props.copyMarkdown ?? props.src}
295296
src={props.src}
297+
revision={props.revision}
296298
sourceFailed={props.sourceFailed}
297299
label={props.alt}
298300
originalUrl={props.originalUrl}
@@ -345,19 +347,17 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props
345347
readonly onImageExpand?: ((preview: ExpandedImagePreview) => void) | undefined;
346348
}) {
347349
const resource = props.resource;
348-
const mutableImage =
349-
props.kind !== "video" &&
350-
(resource._tag === "media-file" || resource._tag === "workspace-file");
350+
const mutableMedia = resource._tag === "media-file" || resource._tag === "workspace-file";
351351
const workspaceMutationId =
352352
props.workspaceMutationId !== undefined
353353
? props.workspaceMutationId
354-
: mutableImage
354+
: mutableMedia
355355
? use(WorkspaceMutationIdContext)
356356
: undefined;
357357
const assetUrl = useAssetUrlState(
358358
props.environmentId,
359359
resource,
360-
mutableImage ? workspaceMutationId : undefined,
360+
mutableMedia ? workspaceMutationId : undefined,
361361
);
362362
const refreshAssetUrl = useAssetUrlRefresh(props.environmentId, resource);
363363
const path =
@@ -419,6 +419,7 @@ export const ChatMarkdownAssetImage = memo(function ChatMarkdownAssetImage(props
419419
originalUrl={props.originalUrl}
420420
style={props.style}
421421
mediaIdentity={JSON.stringify([props.environmentId, props.resource, props.srcFragment])}
422+
revision={mutableMedia && assetUrl._tag === "Success" ? assetUrl.fileRevision : undefined}
422423
onRetry={refreshAssetUrl}
423424
actionsSource={actionsSource}
424425
/>

0 commit comments

Comments
 (0)