Merge pull request #42157 from KMichel1030/fix/issue-40735

Playing video is not paused when opening attachment modal. #40735

src/components/VideoPlayer/BaseVideoPlayer.tsx

@@ -223,22 +223,25 @@ function BaseVideoPlayer({
             return;
         }
 
-        // If we are uploading a new video, we want to immediately set the video player ref.
+        // If we are uploading a new video, we want to pause previous playing video and immediately set the video player ref.
+        if (currentVideoPlayerRef.current) {
+            pauseVideo();
+        }
         currentVideoPlayerRef.current = videoPlayerRef.current;
-    }, [url, currentVideoPlayerRef, isUploading]);
+    }, [url, currentVideoPlayerRef, isUploading, pauseVideo]);
 
     const isCurrentlyURLSetRef = useRef<boolean>();
     isCurrentlyURLSetRef.current = isCurrentlyURLSet;
 
     useEffect(
         () => () => {
-            if (!isCurrentlyURLSetRef.current) {
+            if (shouldUseSharedVideoElement || !isCurrentlyURLSetRef.current) {
                 return;
             }
 
             setCurrentlyPlayingURL(null);
         },
-        [setCurrentlyPlayingURL],
+        [setCurrentlyPlayingURL, shouldUseSharedVideoElement],
     );
     // update shared video elements
     useEffect(() => {