Address review comments

Expensify · Mar 26, 2024 · 2f89b25 · 2f89b25
1 parent f6af188
commit 2f89b25
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 7 deletions.
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.tsx b/src/components/VideoPlayer/BaseVideoPlayer.tsx
@@ -104,19 +104,30 @@ function BaseVideoPlayer({
 
     const handlePlaybackStatusUpdate = useCallback(
         (status: AVPlaybackStatus) => {
-            const isVideoPlaying = 'isPlaying' in status ? status.isPlaying : false;
+            if (!status.isLoaded) {
+                preventPausingWhenExitingFullscreen(false);
+                setIsPlaying(false);
+                setIsLoading(false); // when video is ready to display duration is not NaN
+                setIsBuffering(false);
+                setDuration(videoDuration * 1000);
+                setPosition(0);
+
+                onPlaybackStatusUpdate(status);
+                return;
+            }
+            const isVideoPlaying = status.isPlaying;
             // eslint-disable-next-line @typescript-eslint/prefer-nullish-coalescing
-            const currentDuration = 'durationMillis' in status ? status.durationMillis || videoDuration * 1000 : videoDuration * 1000;
-            const currentPositon = 'positionMillis' in status ? status.positionMillis || 0 : 0;
+            const currentDuration = status.durationMillis || videoDuration * 1000;
+            const currentPositon = status.positionMillis || 0;
 
-            if (status.isLoaded && shouldReplayVideo(status, isVideoPlaying, currentDuration, currentPositon)) {
+            if (shouldReplayVideo(status, isVideoPlaying, currentDuration, currentPositon)) {
                 videoPlayerRef.current?.setStatusAsync({positionMillis: 0, shouldPlay: true});
             }
 
             preventPausingWhenExitingFullscreen(isVideoPlaying);
             setIsPlaying(isVideoPlaying);
-            setIsLoading(!status.isLoaded || Number.isNaN(status.durationMillis)); // when video is ready to display duration is not NaN
-            setIsBuffering('isBuffering' in status && status.isBuffering);
+            setIsLoading(Number.isNaN(status.durationMillis)); // when video is ready to display duration is not NaN
+            setIsBuffering(status.isBuffering);
             setDuration(currentDuration);
             setPosition(currentPositon);
 

diff --git a/src/components/VideoPlayer/IconButton.tsx b/src/components/VideoPlayer/IconButton.tsx
@@ -17,7 +17,7 @@ type IconButtonProps = {
     shouldForceRenderingTooltipBelow?: boolean;
 };
 
-function IconButton({src, fill = 'white', onPress = () => {}, style = {}, hoverStyle = {}, tooltipText = '', small = false, shouldForceRenderingTooltipBelow = false}: IconButtonProps) {
+function IconButton({src, fill = 'white', onPress, style, hoverStyle, tooltipText = '', small = false, shouldForceRenderingTooltipBelow = false}: IconButtonProps) {
     const styles = useThemeStyles();
     return (
         <Tooltip