feat(in-239): stats scroll bug #190

Merged
andrey.dekterev merged 1 commits from IN-239-stats-scroll-bug into develop 3 years ago
  1. 3
      src/features/MatchPage/components/FinishedMatch/index.tsx
  2. 3
      src/features/MatchPage/components/LiveMatch/index.tsx
  3. 6
      src/features/MatchPage/components/MatchDescription/styled.tsx
  4. 7
      src/features/MatchPage/styled.tsx
  5. 2
      src/features/MatchSidePlaylists/index.tsx
  6. 8
      src/features/MatchSidePlaylists/styled.tsx

@ -18,6 +18,7 @@ export const FinishedMatch = () => {
access, access,
isOpenFiltersPopup, isOpenFiltersPopup,
profile, profile,
profileCardShown,
} = useMatchPageStore() } = useMatchPageStore()
const { const {
chapters, chapters,
@ -46,7 +47,7 @@ export const FinishedMatch = () => {
/> />
</Modal> </Modal>
<Container> <Container isHidden={!profileCardShown}>
{!isEmpty(chapters) && ( {!isEmpty(chapters) && (
<Fragment> <Fragment>
<MultiSourcePlayer <MultiSourcePlayer

@ -15,6 +15,7 @@ import { MatchDescription } from '../MatchDescription'
export const LiveMatch = () => { export const LiveMatch = () => {
const { const {
profile, profile,
profileCardShown,
selectedPlaylist, selectedPlaylist,
} = useMatchPageStore() } = useMatchPageStore()
@ -29,7 +30,7 @@ export const LiveMatch = () => {
} = useLiveMatch() } = useLiveMatch()
return ( return (
<Fragment> <Fragment>
<Container> <Container isHidden={!profileCardShown}>
{profile?.youtube_link ? ( {profile?.youtube_link ? (
<YoutubePlayer <YoutubePlayer
chapters={chapters} chapters={chapters}

@ -17,10 +17,8 @@ export const Description = styled.div<{isHidden?: boolean}>`
: ''}; : ''};
${({ isHidden }) => (isHidden && isMobileDevice ? css` ${({ isHidden }) => (isHidden && isMobileDevice ? css`
height: 0; display: none;
opacity: 0; ` : '')}
margin-bottom: 0;
` : '')}
` `
export const DescriptionInnerBlock = styled.div` export const DescriptionInnerBlock = styled.div`

@ -35,7 +35,7 @@ export const Wrapper = styled.div<WrapperProps>`
: '')}; : '')};
` `
export const Container = styled.div` export const Container = styled.div<{isHidden?: boolean}>`
width: 100%; width: 100%;
max-height: 896px; max-height: 896px;
display: flex; display: flex;
@ -63,4 +63,9 @@ export const Container = styled.div`
} }
` `
: ''}; : ''};
${({ isHidden }) => (isHidden && isMobileDevice
? css`
margin-bottom: 0;`
: '')}
` `

@ -60,6 +60,7 @@ export const MatchSidePlaylists = ({
hideProfileCard, hideProfileCard,
matchPlaylists: playlists, matchPlaylists: playlists,
profile, profile,
profileCardShown,
selectedTab, selectedTab,
showProfileCard, showProfileCard,
tournamentData, tournamentData,
@ -137,6 +138,7 @@ export const MatchSidePlaylists = ({
data-step={Steps.Welcome} data-step={Steps.Welcome}
highlighted={Boolean(isOpen) && currentStep === Steps.Welcome} highlighted={Boolean(isOpen) && currentStep === Steps.Welcome}
isTourOpen={Boolean(isOpen)} isTourOpen={Boolean(isOpen)}
isHidden={!profileCardShown}
> >
<TabsWrapper> <TabsWrapper>
<TabsGroup hasLessThanFourTabs={hasLessThanFourTabs}> <TabsGroup hasLessThanFourTabs={hasLessThanFourTabs}>

@ -11,6 +11,7 @@ import { T9n } from 'features/T9n'
type WrapperProps = { type WrapperProps = {
highlighted?: boolean, highlighted?: boolean,
isHidden?: boolean,
isTourOpen?: boolean, isTourOpen?: boolean,
} }
@ -37,7 +38,12 @@ export const Wrapper = styled.div<WrapperProps>`
} }
` `
: ''}; : ''};
${({ isHidden }) => (isHidden && isMobileDevice
? css`
padding-top: 50px;`
: '')}
${({ isTourOpen }) => (isTourOpen ${({ isTourOpen }) => (isTourOpen
? css` ? css`
overflow-y: initial; overflow-y: initial;

Loading…
Cancel
Save