From 17d82a64a6a73a74ee176ab560189e8b94254a4f Mon Sep 17 00:00:00 2001 From: Samuel Newman Date: Mon, 2 Sep 2024 09:32:51 +0100 Subject: [PATCH 01/10] [Video] Remove hack from scrubber (#5063) * remove mouseleave, add pointer cancel * don't show time indicator if duration is 0 --- .../VideoEmbedInner/VideoWebControls.tsx | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx b/src/view/com/util/post-embeds/VideoEmbedInner/VideoWebControls.tsx index f2f2f719..2ff2f651 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 && ( )} { - 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}> Date: Mon, 2 Sep 2024 09:33:46 +0100 Subject: [PATCH 02/10] [Video] Misc player style tweaks (#5064) * use actual black rather than theme black * adjust time/mute indicators --- src/view/com/composer/videos/VideoPreview.tsx | 2 +- .../com/composer/videos/VideoPreview.web.tsx | 5 ++-- src/view/com/util/post-embeds/VideoEmbed.tsx | 2 +- .../com/util/post-embeds/VideoEmbed.web.tsx | 5 ++-- .../VideoEmbedInner/TimeIndicator.tsx | 6 ++-- .../VideoEmbedInner/VideoEmbedInnerNative.tsx | 29 ++++++++++--------- yarn.lock | 12 ++++---- 7 files changed, 31 insertions(+), 30 deletions(-) diff --git a/src/view/com/composer/videos/VideoPreview.tsx b/src/view/com/composer/videos/VideoPreview.tsx index 3a823b7e..199a1fff 100644 --- a/src/view/com/composer/videos/VideoPreview.tsx +++ b/src/view/com/composer/videos/VideoPreview.tsx @@ -43,7 +43,7 @@ export function VideoPreview({ a.overflow_hidden, a.border, t.atoms.border_contrast_low, - {backgroundColor: t.palette.black}, + {backgroundColor: 'black'}, ]}> void clear: () => void }) { - const t = useTheme() const ref = useRef(null) useEffect(() => { @@ -54,7 +53,7 @@ export function VideoPreview({ a.rounded_sm, {aspectRatio}, a.overflow_hidden, - {backgroundColor: t.palette.black}, + {backgroundColor: 'black'}, ]}>