From 17d82a64a6a73a74ee176ab560189e8b94254a4f Mon Sep 17 00:00:00 2001
From: Samuel Newman <mozzius@protonmail.com>
Date: Mon, 2 Sep 2024 09:32:51 +0100
Subject: [Video] Remove hack from scrubber (#5063)

* remove mouseleave, add pointer cancel

* don't show time indicator if duration is 0
---
 .../post-embeds/VideoEmbedInner/VideoWebControls.tsx   | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

(limited to 'src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx')

diff --git a/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx b/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx
index f2f2f7194..2ff2f6516 100644
--- a/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx
+++ b/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx
@@ -253,7 +253,7 @@ export function Controls({
         style={a.flex_1}
         onPress={onPressEmptySpace}
       />
-      {active && !showControls && !focused && (
+      {active && !showControls && !focused && duration > 0 && (
         <TimeIndicator time={Math.floor(duration - currentTime)} />
       )}
       <View
@@ -475,21 +475,8 @@ function Scrubber({
     if (isFirefox && scrubberActive) {
       document.body.classList.add('force-no-clicks')
 
-      const abortController = new AbortController()
-      const {signal} = abortController
-      document.documentElement.addEventListener(
-        'mouseleave',
-        () => {
-          isSeekingRef.current = false
-          onSeekEnd()
-          setScrubberActive(false)
-        },
-        {signal},
-      )
-
       return () => {
         document.body.classList.remove('force-no-clicks')
-        abortController.abort()
       }
     }
   }, [scrubberActive, onSeekEnd])
@@ -548,7 +535,8 @@ function Scrubber({
         }}
         onPointerDown={onPointerDown}
         onPointerMove={onPointerMove}
-        onPointerUp={onPointerUp}>
+        onPointerUp={onPointerUp}
+        onPointerCancel={onPointerUp}>
         <View
           style={[
             a.w_full,
-- 
cgit 1.4.1

