1+ import { settlePromise } from "@t3tools/client-runtime/state/runtime" ;
2+ import { AsyncResult } from "effect/reactivity" ;
13import { PlayIcon , RotateCwIcon , TriangleAlertIcon } from "lucide-react" ;
2- import { useCallback , useEffect , useRef , useState , type CSSProperties } from "react" ;
4+ import { useEffect , useState , type CSSProperties } from "react" ;
35
46import { cn } from "../../lib/utils" ;
57import { prepareVideoFirstFrame } from "../../lib/videoFirstFrame" ;
@@ -42,37 +44,33 @@ export function MediaVideoPlayer({
4244 onRetry,
4345 actionsSource,
4446} : MediaVideoPlayerProps ) {
45- const videoRef = useRef < HTMLVideoElement > ( null ) ;
47+ // State, not a ref: the element remounts on retry and failure, and effects must rebind to it.
48+ const [ video , setVideo ] = useState < HTMLVideoElement | null > ( null ) ;
4649 const [ playbackSource , setPlaybackSource ] = useState < {
4750 src : string ;
4851 revision : string | null ;
4952 } | null > ( null ) ;
53+ const [ playingVideo , setPlayingVideo ] = useState < HTMLVideoElement | null > ( null ) ;
5054 const [ failedSrc , setFailedSrc ] = useState < string | null > ( null ) ;
5155 const [ retrying , setRetrying ] = useState ( false ) ;
5256 const [ loadAttempt , setLoadAttempt ] = useState ( 0 ) ;
5357 const [ preloadedSrc , setPreloadedSrc ] = useState < string | null > ( null ) ;
5458 const src = playbackSource ?. src ?? latestSrc ;
5559 const sourceRevision = playbackSource === null ? revision : playbackSource . revision ;
5660 const failed = src !== null ? failedSrc === src : sourceFailed ;
61+ const preloaded = preloadedSrc === src || typeof IntersectionObserver === "undefined" ;
5762
5863 // Re-signing must not reset the playhead. Changed files refresh once playback pauses.
59- const refreshPausedRevision = useCallback ( ( ) => {
60- const video = videoRef . current ;
61- if ( video === null || video . paused || video . ended ) {
62- setPlaybackSource ( ( current ) =>
63- current !== null && current . revision !== revision ? null : current ,
64- ) ;
65- }
66- } , [ revision ] ) ;
67- useEffect ( refreshPausedRevision , [ refreshPausedRevision ] ) ;
64+ if (
65+ playbackSource !== null &&
66+ playbackSource . revision !== revision &&
67+ ( video === null || playingVideo !== video )
68+ ) {
69+ setPlaybackSource ( null ) ;
70+ }
6871
6972 useEffect ( ( ) => {
70- const video = videoRef . current ;
71- if ( ! video || preload === "metadata" || preloadedSrc === src ) return ;
72- if ( typeof IntersectionObserver === "undefined" ) {
73- setPreloadedSrc ( src ) ;
74- return ;
75- }
73+ if ( ! video || preload === "metadata" || preloaded ) return ;
7674 let active = true ;
7775 const observer = new IntersectionObserver (
7876 ( entries ) => {
@@ -87,10 +85,9 @@ export function MediaVideoPlayer({
8785 active = false ;
8886 observer . disconnect ( ) ;
8987 } ;
90- } , [ src , preload , preloadedSrc , failed , loadAttempt ] ) ;
88+ } , [ video , src , preload , preloaded ] ) ;
9189
9290 useEffect ( ( ) => {
93- const video = videoRef . current ;
9491 if ( ! video ) return ;
9592 const pauseWhenHidden = ( ) => {
9693 // Native fullscreen can hide the inline page while this video is still visible.
@@ -108,21 +105,22 @@ export function MediaVideoPlayer({
108105 video . removeEventListener ( "webkitendfullscreen" , pauseWhenHidden ) ;
109106 video . pause ( ) ;
110107 } ;
111- } , [ src , failed , loadAttempt ] ) ;
108+ } , [ video ] ) ;
112109
113110 const retry = async ( ) => {
114111 if ( retrying ) return ;
115112 setRetrying ( true ) ;
116- try {
113+ const result = await settlePromise ( async ( ) => {
117114 await onRetry ?.( ) ;
115+ } ) ;
116+ if ( AsyncResult . isSuccess ( result ) ) {
118117 setPlaybackSource ( null ) ;
119118 setFailedSrc ( null ) ;
120119 setLoadAttempt ( ( current ) => current + 1 ) ;
121- } catch {
120+ } else {
122121 setFailedSrc ( src ) ;
123- } finally {
124- setRetrying ( false ) ;
125122 }
123+ setRetrying ( false ) ;
126124 } ;
127125
128126 const player = (
@@ -161,26 +159,30 @@ export function MediaVideoPlayer({
161159 ) : src !== null && ! failed ? (
162160 < video
163161 key = { loadAttempt }
164- ref = { videoRef }
162+ ref = { setVideo }
165163 src = { src }
166164 aria-label = { label || "Video preview" }
167165 aria-hidden = { onOpen ? true : undefined }
168166 autoPlay = { onOpen ? false : autoPlay }
169167 controls = { ! onOpen }
170168 muted = { onOpen ? true : undefined }
171169 playsInline
172- preload = { preload === "metadata" || preloadedSrc === src ? "metadata" : "none" }
170+ preload = { preload === "metadata" || preloaded ? "metadata" : "none" }
173171 className = { cn (
174172 "aspect-video max-h-full w-full bg-black object-contain" ,
175173 onOpen && "pointer-events-none" ,
176174 videoClassName ,
177175 ) }
178176 style = { style }
179177 onLoadedMetadata = { ( event ) => prepareVideoFirstFrame ( event . currentTarget ) }
180- onPlay = { ( ) => setPlaybackSource ( { src, revision : sourceRevision } ) }
181- onPause = { refreshPausedRevision }
182- onEnded = { refreshPausedRevision }
178+ onPlay = { ( event ) => {
179+ setPlayingVideo ( event . currentTarget ) ;
180+ setPlaybackSource ( { src, revision : sourceRevision } ) ;
181+ } }
182+ onPause = { ( ) => setPlayingVideo ( null ) }
183+ onEnded = { ( ) => setPlayingVideo ( null ) }
183184 onError = { ( ) => {
185+ setPlayingVideo ( null ) ;
184186 if ( latestSrc !== null && src !== latestSrc ) setPlaybackSource ( null ) ;
185187 else setFailedSrc ( src ) ;
186188 } }
0 commit comments