Skip to content

Commit

Permalink
fix: actively playing video restarts due to query re-fetches (#1174)
Browse files Browse the repository at this point in the history
Co-authored-by: Maham Akif <maham.akif@A006-00821.local>
  • Loading branch information
mahamakifdar19 and Maham Akif authored Sep 6, 2024
1 parent 9158bd7 commit 334d87c
Show file tree
Hide file tree
Showing 2 changed files with 59 additions and 2 deletions.
3 changes: 2 additions & 1 deletion src/components/video/VideoJS.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ const VideoJS = ({ options, onReady, customOptions }) => {
videoRef.current.appendChild(videoElement);

playerRef.current = videojs(videoElement, playerOptions, handlePlayerReady);
} else {
} else if (playerOptions?.sources[0]?.src !== playerRef?.current?.currentSrc()) {
// Only update player if the source changes
playerRef.current.autoplay(playerOptions.autoplay);
playerRef.current.src(playerOptions.sources);

Expand Down
58 changes: 57 additions & 1 deletion src/components/video/tests/VideoJS.test.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React from 'react';
import { waitFor } from '@testing-library/react';
import { renderWithRouter } from '../../../utils/tests';
import VideoJS from '../VideoJS';
import { useTranscripts } from '../data';
import { useTranscripts, usePlayerOptions } from '../data';

// Mocking the 'videojs-vjstranscribe' and 'useTranscripts' hook
jest.mock('videojs-vjstranscribe');
Expand Down Expand Up @@ -185,4 +185,60 @@ describe('VideoJS', () => {
expect(container.querySelector('video-js')).toBeFalsy();
});
});

it('Updates player source when src changes', () => {
const mockPlayerInstance = {
autoplay: jest.fn(),
src: jest.fn(),
currentSrc: jest.fn(),
};
const addTextTracks = jest.fn();

// eslint-disable-next-line global-require
require('video.js').videojs.mockImplementation(() => mockPlayerInstance);

// Initial mock return value for currentSrc
mockPlayerInstance.currentSrc.mockReturnValue('https://initial-domain.com/initial.m3u8');

const initialOptions = {
autoplay: true,
responsive: true,
fluid: true,
controls: true,
sources: [{ src: 'https://initial-domain.com/initial.m3u8', type: 'application/x-mpegURL' }],
};

const updatedOptions = {
autoplay: true,
responsive: true,
fluid: true,
controls: true,
sources: [{ src: 'https://test-domain.com/test-prefix/id.m3u8', type: 'application/x-mpegURL' }],
};

usePlayerOptions.mockReturnValueOnce(initialOptions).mockReturnValueOnce(updatedOptions);

// Simulate the logic that checks and updates the player source
const mockUpdatePlayerSource = (playerOptions) => {
if (playerOptions?.sources[0]?.src !== mockPlayerInstance.currentSrc()) {
mockPlayerInstance.autoplay(playerOptions.autoplay);
mockPlayerInstance.src(playerOptions.sources);
addTextTracks();
}
};

// Simulate the initial state
mockUpdatePlayerSource(initialOptions);

expect(mockPlayerInstance.autoplay).not.toHaveBeenCalled();
expect(mockPlayerInstance.src).not.toHaveBeenCalled();
expect(addTextTracks).not.toHaveBeenCalled();

// Simulate the source change
mockUpdatePlayerSource(updatedOptions);

expect(mockPlayerInstance.autoplay).toHaveBeenCalledWith(updatedOptions.autoplay);
expect(mockPlayerInstance.src).toHaveBeenCalledWith([{ src: 'https://test-domain.com/test-prefix/id.m3u8', type: 'application/x-mpegURL' }]);
expect(addTextTracks).toHaveBeenCalled();
});
});

0 comments on commit 334d87c

Please sign in to comment.