feat(in-142): pr fixes

pull/11/head
Ruslan Khayrullin 3 years ago
parent 49403a6746
commit 7488e1ebd2
  1. 4
      src/features/MatchPage/components/FinishedMatch/index.tsx
  2. 4
      src/features/MatchPage/store/hooks/index.tsx
  3. 4
      src/features/StreamPlayer/components/YoutubePlayer/index.tsx
  4. 4
      src/features/StreamPlayer/index.tsx

@ -18,7 +18,7 @@ import { useMatchPageStore } from '../../store'
export const FinishedMatch = () => { export const FinishedMatch = () => {
const [circleAnimation, setCircleAnimation] = useState<TCircleAnimation>(initialCircleAnimation) const [circleAnimation, setCircleAnimation] = useState<TCircleAnimation>(initialCircleAnimation)
const { const {
isOpenPopup, isOpenFiltersPopup,
profile, profile,
setPlayingProgress, setPlayingProgress,
} = useMatchPageStore() } = useMatchPageStore()
@ -52,7 +52,7 @@ export const FinishedMatch = () => {
<Fragment> <Fragment>
<MultiSourcePlayer <MultiSourcePlayer
setCircleAnimation={setCircleAnimation} setCircleAnimation={setCircleAnimation}
isOpenPopup={isOpenPopup} isOpenPopup={isOpenFiltersPopup}
chapters={chapters} chapters={chapters}
onPlayingChange={onPlayingChange} onPlayingChange={onPlayingChange}
onPlayerProgressChange={setPlayingProgress} onPlayerProgressChange={setPlayingProgress}

@ -41,7 +41,7 @@ export const useMatchPage = () => {
countOfFilters, countOfFilters,
filters, filters,
isEmptyFilters, isEmptyFilters,
isOpen: isOpenPopup, isOpen: isOpenFiltersPopup,
resetEvents, resetEvents,
resetPlayers, resetPlayers,
toggle: togglePopup, toggle: togglePopup,
@ -168,7 +168,7 @@ export const useMatchPage = () => {
hideProfileCard, hideProfileCard,
isEmptyFilters, isEmptyFilters,
isLiveMatch, isLiveMatch,
isOpenPopup, isOpenFiltersPopup,
isPlayFilterEpisodes, isPlayFilterEpisodes,
isStarted, isStarted,
likeImage, likeImage,

@ -7,7 +7,7 @@ import { PlayerWrapper } from '../../styled'
import { useVideoPlayer, Props } from '../../hooks' import { useVideoPlayer, Props } from '../../hooks'
export const YoutubePlayer = (props: Props) => { export const YoutubePlayer = (props: Props) => {
const { isOpenPopup, profile } = useMatchPageStore() const { isOpenFiltersPopup, profile } = useMatchPageStore()
const { const {
onMouseMove, onMouseMove,
@ -34,7 +34,7 @@ export const YoutubePlayer = (props: Props) => {
onTouchStart={onTouchStart} onTouchStart={onTouchStart}
onTouchEnd={onTouchEnd} onTouchEnd={onTouchEnd}
> >
{isOpenPopup && <FiltersPopup />} {isOpenFiltersPopup && <FiltersPopup />}
<YouTube <YouTube
videoId={key} videoId={key}
opts={{ opts={{

@ -30,7 +30,7 @@ import RewindMobile from './components/RewindMobile'
* HLS плеер, применяется на лайв и завершенных матчах * HLS плеер, применяется на лайв и завершенных матчах
*/ */
export const StreamPlayer = (props: Props) => { export const StreamPlayer = (props: Props) => {
const { isOpenPopup, profile } = useMatchPageStore() const { isOpenFiltersPopup, profile } = useMatchPageStore()
const { user } = useAuthStore() const { user } = useAuthStore()
const { const {
@ -96,7 +96,7 @@ export const StreamPlayer = (props: Props) => {
onTouchStart={onTouchStart} onTouchStart={onTouchStart}
onTouchEnd={onTouchEnd} onTouchEnd={onTouchEnd}
> >
{isOpenPopup && <FiltersPopup />} {isOpenFiltersPopup && <FiltersPopup />}
<LoaderWrapper buffering={buffering}> <LoaderWrapper buffering={buffering}>
<Loader color='#515151' /> <Loader color='#515151' />
</LoaderWrapper> </LoaderWrapper>

Loading…
Cancel
Save