style(#ott2955): fixed scroll container height

fix(#ott2955): package lock fix
keep-around/61a2661a1c7b0f958a65795b5393822fb1d16524
Farber Denis 3 years ago
parent 0eaff38e01
commit bc0c1a389f
  1. 54310
      package-lock.json
  2. 21
      src/features/UserFavorites/FavoritesTooltip/index.tsx
  3. 20
      src/features/UserFavorites/FavoritesTooltip/styled.tsx
  4. 10
      src/features/UserFavorites/index.tsx
  5. 5
      src/features/UserFavorites/styled.tsx

54310
package-lock.json generated

File diff suppressed because it is too large Load Diff

@ -0,0 +1,21 @@
import { UserFavorite } from 'requests'
import { Name } from 'features/Name'
import { TooltipWrapper } from './styled'
type TooltipBlockProps = {
favorite: UserFavorite,
topPosition: number,
}
export const FavoritesToolip = ({
favorite: {
info,
},
topPosition,
}: TooltipBlockProps) => (
<TooltipWrapper top={topPosition}>
<Name nameObj={info} />
</TooltipWrapper>
)

@ -0,0 +1,20 @@
import styled from 'styled-components/macro'
type TProps = {
top?: number,
}
export const TooltipWrapper = styled.div<TProps>`
background-color: #fff;
padding: 0 6px;
position: fixed;
top: ${({ top }) => top && `${top - 4}px`};
left: 4.2rem;
border-radius: 6px;
z-index: 5;
line-height: 1.0625rem;
color: #000;
font-weight: 400;
font-size: 0.6875rem;
white-space: nowrap;
`

@ -7,11 +7,11 @@ import { FavoritesActions } from 'requests'
import { Modal } from 'features/Modal'
import { Name } from 'features/Name'
import { ProfileLink } from 'features/ProfileLink'
import { Close } from '../../libs/objects/Close'
import { TooltipBlock } from './TooltipBlock'
import { FavoritesToolip } from './FavoritesTooltip'
import { useUserFavoritesStore } from './store'
import {
UserSportFavItemLogoWrapper,
@ -22,7 +22,6 @@ import {
ExclamationSign,
FavoriteModal,
Text,
TournamentNameTooltip,
ScrollWrapper,
} from './styled'
@ -69,9 +68,10 @@ export const UserFavorites = ({ marginTop }: Props) => {
})}
>
<Close size={9} />
<TournamentNameTooltip>
<Name nameObj={item.info} />
</TournamentNameTooltip>
<FavoritesToolip
topPosition={position}
favorite={item}
/>
</UserSportFavXWrapper>
<TooltipBlock
topPosition={position}

@ -30,11 +30,12 @@ export const UserSportFavWrapper = styled.aside`
export const ScrollWrapper = styled.div`
width: 4.35rem;
padding: 0.472rem 0.19rem 0 0.15rem;
height: calc(100vh - 15.96rem);
padding: 0.472rem 0.30rem 0 0.15rem;
height: calc(100vh - 14rem);
display: flex;
flex-direction: column;
align-items: center;
overflow-y: auto;
${customScrollbar}
`

Loading…
Cancel
Save