diff --git a/src/features/MatchPage/index.tsx b/src/features/MatchPage/index.tsx index d91caede..6b3960d5 100644 --- a/src/features/MatchPage/index.tsx +++ b/src/features/MatchPage/index.tsx @@ -61,6 +61,9 @@ const MatchPageComponent = () => { // eslint-disable-next-line react-hooks/exhaustive-deps }, [profile, profileType]) + const playFromScout = profile?.has_video && !profile?.live + const playFromOTT = !profile?.has_video && (profile?.live || profile?.storage) + // TODO Добавить попап 'Данный матч ещё не начался' if (!isStarted && profile?.live === false) { const sportName = history.location.pathname.split('/')[1] @@ -78,8 +81,8 @@ const MatchPageComponent = () => { {playFromOTT && ( )} @@ -90,7 +93,6 @@ const MatchPageComponent = () => { tournamentData={tournamentData} /> )} - diff --git a/src/features/MatchSidePlaylists/components/MatchPlaylists/index.tsx b/src/features/MatchSidePlaylists/components/MatchPlaylists/index.tsx index d7325b6c..77d640b8 100644 --- a/src/features/MatchSidePlaylists/components/MatchPlaylists/index.tsx +++ b/src/features/MatchSidePlaylists/components/MatchPlaylists/index.tsx @@ -54,7 +54,7 @@ export const MatchPlaylists = ({ onSelect?.(playlist)} > diff --git a/src/features/MultiSourcePlayer/components/ProgressBar/hooks.tsx b/src/features/MultiSourcePlayer/components/ProgressBar/hooks.tsx index 2eb366b6..b080af87 100644 --- a/src/features/MultiSourcePlayer/components/ProgressBar/hooks.tsx +++ b/src/features/MultiSourcePlayer/components/ProgressBar/hooks.tsx @@ -12,6 +12,8 @@ export type Props = { duration: number, loadedProgress: number, onPlayedProgressChange: (progress: number, seeking: boolean) => void, + onTouchEnd?: () => any, + onTouchStart?: () => any, playedProgress: number, } diff --git a/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx b/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx index a1132956..3f2b55bb 100644 --- a/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx +++ b/src/features/MultiSourcePlayer/components/ProgressBar/index.tsx @@ -1,8 +1,8 @@ import { useSlider } from 'features/StreamPlayer/hooks/useSlider' import { TimeTooltip } from 'features/StreamPlayer/components/TimeTooltip' import { Scrubber } from 'features/StreamPlayer/components/ProgressBar/styled' +import { Chapters } from 'features/StreamPlayer/components/Chapters' -import { Chapters } from '../Chapters' import type { Props } from './hooks' import { useProgressBar } from './hooks' import { ProgressBarList } from './styled' diff --git a/src/features/StreamPlayer/styled.tsx b/src/features/StreamPlayer/styled.tsx index 77c305f9..4dba9ee2 100644 --- a/src/features/StreamPlayer/styled.tsx +++ b/src/features/StreamPlayer/styled.tsx @@ -119,7 +119,7 @@ export const PlayerWrapper = styled.div` ` type LoaderWrapperProps = { - buffering: boolean, + buffering?: boolean, } export const LoaderWrapper = styled.div`