Merge pull request #37270 from software-mansion-labs/@Skalakid/fix-re…

…turning-to-previous-thread Fix app returns to previous thread when scrubbing video in thread
Expensify · Mar 4, 2024 · 5a6d2e5 · 5a6d2e5
2 parents a23caa4 + 283981c
commit 5a6d2e5
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/src/components/VideoPlayer/BaseVideoPlayer.js b/src/components/VideoPlayer/BaseVideoPlayer.js
@@ -174,7 +174,12 @@ function BaseVideoPlayer({
 
     return (
         <>
-            <View style={style}>
+            {/* We need to wrap the video component in a component that will catch unhandled pointer events. Otherwise, these
+            events will bubble up the tree, and it will cause unexpected press behavior. */}
+            <PressableWithoutFeedback
+                accessibilityRole="button"
+                style={[styles.cursorDefault, style]}
+            >
                 <Hoverable>
                     {(isHovered) => (
                         <View style={[styles.w100, styles.h100]}>
@@ -246,7 +251,7 @@ function BaseVideoPlayer({
                         </View>
                     )}
                 </Hoverable>
-            </View>
+            </PressableWithoutFeedback>
             <VideoPopoverMenu
                 isPopoverVisible={isPopoverVisible}
                 hidePopover={hidePopoverMenu}