@devries-cameron20 / t3code Mirror · read-only / commits / 0c901edf57
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

Mirrored from https://github.com/Camo67/t3code.git

Synced Nov 22, 15:45 UTC

refactor(web): video previews attach listeners on their element and share one visibility observer (#25630)

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>

Julius Marminge committed Oct 26, 2026 at 15:13 UTC 0c901edf578f43aed615b8fdad713919c4ca3ead
2 files changed +64 -33
apps/web/src/components/media/MediaVideoPlayer.browser.test.tsx
+36 -1
@@ -1,4 +1,4 @@
1 -import { describe, expect, it } from "vite-plus/test";
1 +import { describe, expect, it, vi } from "vite-plus/test";
2
3 import { act, render, stubGlobal, type Screen } from "../../../test/render";
4 import { MediaVideoPlayer } from "./MediaVideoPlayer";
@@ -10,6 +10,18 @@ class HiddenIntersectionObserver {
10 disconnect() {}
11 }
12
13 +class VisibleIntersectionObserver {
14 + constructor(private readonly callback: IntersectionObserverCallback) {}
15 + observe(target: Element) {
16 + this.callback(
17 + [{ target, isIntersecting: true } as IntersectionObserverEntry],
18 + this as unknown as IntersectionObserver,
19 + );
20 + }
21 + unobserve() {}
22 + disconnect() {}
23 +}
24 +
25 function expectVideoSrc(screen: Screen, src: string) {
26 return expect.element(screen.getByLabelText("clip")).toHaveAttribute("src", src);
27 }
@@ -55,4 +67,27 @@ describe("MediaVideoPlayer", () => {
67 await screen.rerender(<MediaVideoPlayer src={null} label="clip" revision="mutation-2" />);
68 await expectVideoSrc(screen, "/asset/first/clip.mp4");
69 });
70 +
71 + it("starts loading metadata once the player scrolls near the viewport", async () => {
72 + using _observer = stubGlobal("IntersectionObserver", VisibleIntersectionObserver);
73 + await using screen = await render(<MediaVideoPlayer src="/asset/clip.mp4" label="clip" />);
74 +
75 + await expect.element(screen.getByLabelText("clip")).toHaveAttribute("preload", "metadata");
76 + });
77 +
78 + it("keeps a playing video playing when the player rerenders", async () => {
79 + using _observer = stubGlobal("IntersectionObserver", HiddenIntersectionObserver);
80 + await using screen = await render(
81 + <MediaVideoPlayer src="/asset/clip.mp4" label="clip" className="w-40" />,
82 + );
83 + const video = screen.getByLabelText("clip").element() as HTMLVideoElement;
84 + using pause = vi.spyOn(video, "pause");
85 + await act(() => {
86 + video.dispatchEvent(new Event("play"));
87 + });
88 +
89 + await screen.rerender(<MediaVideoPlayer src="/asset/clip.mp4" label="clip" className="w-48" />);
90 +
91 + expect(pause).not.toHaveBeenCalled();
92 + });
93 });
apps/web/src/components/media/MediaVideoPlayer.tsx
+28 -32
@@ -1,8 +1,9 @@
1 import { settlePromise } from "@t3tools/client-runtime/state/runtime";
2 import { AsyncResult } from "effect/reactivity";
3 import { PlayIcon, RotateCwIcon, TriangleAlertIcon } from "lucide-react";
4 -import { useEffect, useState, type CSSProperties } from "react";
4 +import { useState, type CSSProperties } from "react";
5
6 +import { observeIntersection } from "../../lib/observeIntersection";
7 import { cn } from "../../lib/utils";
8 import { prepareVideoFirstFrame } from "../../lib/videoFirstFrame";
9 import { Button } from "../ui/button";
@@ -44,13 +45,11 @@ export function MediaVideoPlayer({
45 onRetry,
46 actionsSource,
47 }: MediaVideoPlayerProps) {
47 - // Use state so effects rebind when retry or failure remounts the video.
48 - const [video, setVideo] = useState<HTMLVideoElement | null>(null);
48 const [playbackSource, setPlaybackSource] = useState<{
49 src: string;
50 revision: string | null;
51 } | null>(null);
53 - const [playingVideo, setPlayingVideo] = useState<HTMLVideoElement | null>(null);
52 + const [playing, setPlaying] = useState(false);
53 const [failedSrc, setFailedSrc] = useState<string | null>(null);
54 const [retrying, setRetrying] = useState(false);
55 const [loadAttempt, setLoadAttempt] = useState(0);
@@ -65,33 +64,15 @@ export function MediaVideoPlayer({
64 playbackSource !== null &&
65 playbackSource.revision !== revision &&
66 (latestSrc !== null || sourceFailed) &&
68 - (video === null || playingVideo !== video)
67 + !playing
68 ) {
69 setPlaybackSource(
70 revision !== null && latestSrc !== null ? { src: latestSrc, revision } : null,
71 );
72 }
73
75 - useEffect(() => {
76 - if (!video || preload === "metadata" || preloaded) return;
77 - let active = true;
78 - const observer = new IntersectionObserver(
79 - (entries) => {
80 - if (!active || !entries.some((entry) => entry.isIntersecting)) return;
81 - setPreloadedSrc(src);
82 - observer.disconnect();
83 - },
84 - { rootMargin: "200px" },
85 - );
86 - observer.observe(video);
87 - return () => {
88 - active = false;
89 - observer.disconnect();
90 - };
91 - }, [video, src, preload, preloaded]);
92 -
93 - useEffect(() => {
94 - if (!video) return;
74 + // Retry and failure remount the element, so its listeners live and die with it.
75 + const attachVideo = (video: HTMLVideoElement) => {
76 const pauseWhenHidden = () => {
77 // Native fullscreen can hide the inline page while this video is still visible.
78 const fullscreen =
@@ -107,8 +88,22 @@ export function MediaVideoPlayer({
88 document.removeEventListener("fullscreenchange", pauseWhenHidden);
89 video.removeEventListener("webkitendfullscreen", pauseWhenHidden);
90 video.pause();
91 + // A detached element's pause event never reaches onPause.
92 + setPlaying(false);
93 };
111 - }, [video]);
94 + };
95 +
96 + // On the wrapper, not the video: re-running the video's ref callback would pause playback.
97 + const observePreload = (player: HTMLSpanElement) => {
98 + if (src === null || failed || preload === "metadata" || preloaded) return;
99 + return observeIntersection(
100 + player,
101 + (entry) => {
102 + if (entry.isIntersecting) setPreloadedSrc(src);
103 + },
104 + { rootMargin: "200px" },
105 + );
106 + };
107
108 const retry = async () => {
109 if (retrying) return;
@@ -128,6 +123,7 @@ export function MediaVideoPlayer({
123
124 const player = (
125 <span
126 + ref={observePreload}
127 className={cn("relative inline-block align-middle", className)}
128 style={style}
129 data-markdown-copy={copyMarkdown}
@@ -162,7 +158,7 @@ export function MediaVideoPlayer({
158 ) : src !== null && !failed ? (
159 <video
160 key={loadAttempt}
165 - ref={setVideo}
161 + ref={attachVideo}
162 src={src}
163 aria-label={label || "Video preview"}
164 aria-hidden={onOpen ? true : undefined}
@@ -181,14 +177,14 @@ export function MediaVideoPlayer({
177 prepareVideoFirstFrame(event.currentTarget);
178 if (sourceRevision !== null) setPlaybackSource({ src, revision: sourceRevision });
179 }}
184 - onPlay={(event) => {
185 - setPlayingVideo(event.currentTarget);
180 + onPlay={() => {
181 + setPlaying(true);
182 setPlaybackSource({ src, revision: sourceRevision });
183 }}
188 - onPause={() => setPlayingVideo(null)}
189 - onEnded={() => setPlayingVideo(null)}
184 + onPause={() => setPlaying(false)}
185 + onEnded={() => setPlaying(false)}
186 onError={() => {
191 - setPlayingVideo(null);
187 + setPlaying(false);
188 setPlaybackSource(null);
189 if (latestSrc === null || src === latestSrc) setFailedSrc(src);
190 }}