Skip to content

fix early play and pause video when switching to image #72944

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasperhuangg merged 3 commits into from
Oct 22, 2025
Merged

fix early play and pause video when switching to image #72944

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6a709ae
fix early play and pause video when switching to image
M00rish Oct 19, 2025
8446ba0
Merge branch 'Expensify:main' into videoplayfix
M00rish Oct 20, 2025
7e072c0
Merge branch 'Expensify:main' into videoplayfix
M00rish Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/components/Attachments/AttachmentView/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
}: AttachmentViewProps) {
const [transaction] = useOnyx(`${ONYXKEYS.COLLECTION.TRANSACTION}${getNonEmptyStringOnyxID(transactionID)}`, {canBeMissing: true});
const {translate} = useLocalize();
const {updateCurrentURLAndReportID, playVideo} = usePlaybackContext();
const {updateCurrentURLAndReportID, currentlyPlayingURL, playVideo} = usePlaybackContext();

const attachmentCarouselPagerContext = useContext(AttachmentCarouselPagerContext);
const {onAttachmentError} = attachmentCarouselPagerContext ?? {};
Expand All @@ -144,11 +144,12 @@
if (!isFocused && !isInFocusedModal && !(file && isUsedInAttachmentModal)) {
return;
}
updateCurrentURLAndReportID(isVideo && typeof source === 'string' ? source : undefined, reportID);
if (isVideo && typeof source === 'string') {
const videoSource = isVideo && typeof source === 'string' ? source : undefined;
updateCurrentURLAndReportID(videoSource, reportID);
if (videoSource && currentlyPlayingURL === videoSource) {
playVideo();
}
}, [file, isFocused, isInFocusedModal, isUsedInAttachmentModal, isVideo, reportID, source, updateCurrentURLAndReportID, playVideo]);
}, [file, isFocused, isInFocusedModal, isUsedInAttachmentModal, isVideo, reportID, source, updateCurrentURLAndReportID, playVideo, currentlyPlayingURL]);

const [imageError, setImageError] = useState(false);

Expand Down Expand Up @@ -312,7 +313,7 @@
</>
);
}
imageSource = previewSource?.toString() ?? imageSource;

Check warning on line 316 in src/components/Attachments/AttachmentView/index.tsx

View workflow job for this annotation

GitHub Actions / ESLint check 

'previewSource' may use Object's default stringification format ('[object Object]') when stringified
}

return (
Expand Down
2 changes: 1 addition & 1 deletion src/components/VideoPlayerContexts/PlaybackContext/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ function PlaybackContextProvider({children}: ChildrenProps) {

if (!url) {
if (currentlyPlayingURL) {
video.stop();
video.pause();
}
return;
}
Expand Down
Loading