From 2fc858e0091b6397292a85a616a0a2101b742d53 Mon Sep 17 00:00:00 2001 From: boyvanov Date: Wed, 22 Sep 2021 12:48:04 +0300 Subject: [PATCH] fix(ott-1590): fix onPause --- src/features/MultiSourcePlayer/hooks/index.tsx | 14 +++++++------- src/features/MultiSourcePlayer/index.tsx | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/features/MultiSourcePlayer/hooks/index.tsx b/src/features/MultiSourcePlayer/hooks/index.tsx index fa4f1425..c16f91c3 100644 --- a/src/features/MultiSourcePlayer/hooks/index.tsx +++ b/src/features/MultiSourcePlayer/hooks/index.tsx @@ -9,7 +9,6 @@ import size from 'lodash/size' import { useFullscreen } from 'features/StreamPlayer/hooks/useFullscreen' import { useVolume } from 'features/VideoPlayer/hooks/useVolume' -import { useMatchPopupStore } from 'features/MatchPopup' import { useObjectState } from 'hooks' @@ -170,6 +169,10 @@ export const useMultiSourcePlayer = ({ playNextChapter() } + const onPause = () => { + setPlayerState({ playing: false }) + } + useEffect(() => { onPlayingChange(playing) }, [playing, onPlayingChange]) @@ -195,13 +198,9 @@ export const useMultiSourcePlayer = ({ playNextChapter, ]) - const { selectedPlaylist } = useMatchPopupStore() - useEffect(() => { - if (selectedPlaylist) { - startPlaying() - } - }, [selectedPlaylist, startPlaying]) + startPlaying() + }, [chapters, startPlaying]) return { activeChapterIndex, @@ -218,6 +217,7 @@ export const useMultiSourcePlayer = ({ onEnded, onError: handleError, onLoadedProgress, + onPause, onPlayedProgress, onPlayerClick, onProgressChange, diff --git a/src/features/MultiSourcePlayer/index.tsx b/src/features/MultiSourcePlayer/index.tsx index f21d2fbb..18011175 100644 --- a/src/features/MultiSourcePlayer/index.tsx +++ b/src/features/MultiSourcePlayer/index.tsx @@ -52,6 +52,7 @@ export const MultiSourcePlayer = (props: Props) => { onError, onFullscreenClick, onLoadedProgress, + onPause, onPlayedProgress, onPlayerClick, onProgressChange, @@ -104,6 +105,7 @@ export const MultiSourcePlayer = (props: Props) => { onLoadedProgress={firstPlayerActive ? onLoadedProgress : undefined} onPlayedProgress={firstPlayerActive ? onPlayedProgress : undefined} onEnded={onEnded} + onPause={firstPlayerActive ? onPause : undefined} onError={onError} onReady={onReady} /> @@ -119,6 +121,7 @@ export const MultiSourcePlayer = (props: Props) => { onLoadedProgress={!firstPlayerActive ? onLoadedProgress : undefined} onPlayedProgress={!firstPlayerActive ? onPlayedProgress : undefined} onEnded={onEnded} + onPause={!firstPlayerActive ? onPause : undefined} onError={onError} onReady={onReady} />