fix(ott-2710): fix filters lexics

OTT-2710-match-filters
boyvanov 3 years ago
parent e2039415ff
commit 33bf0912dd
  1. 3
      src/features/HomePage/components/ClearFiltersPopup/index.tsx
  2. 4
      src/features/HomePage/components/Dropdown/index.tsx
  3. 4
      src/features/HomePage/components/MatchesFilters/index.tsx
  4. 28
      src/features/HomePage/components/MatchesFilters/styled.tsx

@ -25,8 +25,7 @@ export const ClearFiltersPopup = () => {
<T9n t='clear_filters' /> <T9n t='clear_filters' />
</PopupTitle> </PopupTitle>
<PopupText> <PopupText>
{/* <T9n t='clear_popup_message' /> */} <T9n t='clear_popup_message' />
<span>Do you want to clear all filter selections?</span>
</PopupText> </PopupText>
<ButtonsContainer> <ButtonsContainer>
<ConfirmButton onClick={confirmClear}> <ConfirmButton onClick={confirmClear}>

@ -29,6 +29,7 @@ import {
SearchInput, SearchInput,
BackButton, BackButton,
} from './styled' } from './styled'
import { Title } from '../MatchesFilters/styled'
const Label = ({ item }: TFilterItem) => ( const Label = ({ item }: TFilterItem) => (
isNumber(item) ? <>U{item}</> : <Name nameObj={item} /> isNumber(item) ? <>U{item}</> : <Name nameObj={item} />
@ -55,11 +56,10 @@ export const DropDown = ({
<FiltersList> <FiltersList>
<CommonButtonsBlock isArena={filterTitle === 'arena'}> <CommonButtonsBlock isArena={filterTitle === 'arena'}>
<SearchWithAllContainer> <SearchWithAllContainer>
{/* {isMobileDevice && (<T9n className='filter_title' t={filterTitle} />)} */}
{isMobileDevice && closeDropdownList {isMobileDevice && closeDropdownList
&& ( && (
<BackButton onClick={closeDropdownList} className='back_button'> <BackButton onClick={closeDropdownList} className='back_button'>
{filterTitle} {isMobileDevice && (<Title t={filterTitle} />)}
</BackButton> </BackButton>
)} )}
{filterTitle === 'arena' && ( {filterTitle === 'arena' && (

@ -21,6 +21,7 @@ import {
import { DropDown } from '../Dropdown' import { DropDown } from '../Dropdown'
import { TItem } from '../Dropdown/types' import { TItem } from '../Dropdown/types'
import { checkSize, truncateString } from './helpers' import { checkSize, truncateString } from './helpers'
import { Title } from '../MatchesFilters/styled'
type TProps = { type TProps = {
dropdownList: Array<TItem | number>, dropdownList: Array<TItem | number>,
@ -83,8 +84,7 @@ export const MatchesFilters = ({ isMobile }: TFiltersProps) => {
key={filterTitle} key={filterTitle}
onClick={toggleDropdownList(filterTitle)} onClick={toggleDropdownList(filterTitle)}
> >
{/* <T9n className='filter_title' t={filterTitle} /> */} <Title t={filterTitle} />
<span className='filter_title'>{filterTitle}</span>
<ActiveFilters> <ActiveFilters>
{map(shrinkedActiveFilters, (item) => ( {map(shrinkedActiveFilters, (item) => (
<ActiveFilter key={item}> <ActiveFilter key={item}>

@ -1,6 +1,8 @@
import { isMobileDevice } from 'config/userAgent'
import styled, { css } from 'styled-components/macro' import styled, { css } from 'styled-components/macro'
import { isMobileDevice } from 'config/userAgent'
import { T9n } from 'features/T9n'
export const MatchFiltersContainer = styled.div` export const MatchFiltersContainer = styled.div`
display: flex; display: flex;
flex-wrap: no-wrap; flex-wrap: no-wrap;
@ -14,12 +16,10 @@ ${isMobileDevice
border-top: 1px solid #505050; border-top: 1px solid #505050;
padding-top: 19px; padding-top: 19px;
gap: 22px; gap: 22px;
` ` : css`
: css`
gap: 30px; gap: 30px;
flex-direction: row; flex-direction: row;
padding-right: 10px; padding-right: 10px;`}
`}
` `
type TFilterContainer = { type TFilterContainer = {
@ -51,10 +51,6 @@ ${isMobileDevice
padding-left: 32px; padding-left: 32px;
flex-direction: column;`} flex-direction: column;`}
.filter_title {
cursor: pointer;
${isMobileDevice && 'margin-right: 6px;'}
}
${({ active }) => active && !isMobileDevice && css` ${({ active }) => active && !isMobileDevice && css`
:after { :after {
content: ''; content: '';
@ -70,7 +66,6 @@ ${({ active }) => active && !isMobileDevice && css`
cursor: auto; cursor: auto;
}`} }`}
:before { :before {
display: block; display: block;
position: absolute; position: absolute;
@ -112,12 +107,14 @@ ${({ active }) => active && !isMobileDevice && css`
export const ActiveFilters = styled.div` export const ActiveFilters = styled.div`
display: flex; display: flex;
flex-direction: row; flex-direction: row;
${isMobileDevice ${isMobileDevice
? css` ? css`
gap: 5px;` gap: 5px;`
: css` : css`
gap: 10px;`} gap: 10px;`}
` `
export const CloseButton = styled.div` export const CloseButton = styled.div`
background: url(/images/closeWhite.svg) no-repeat; background: url(/images/closeWhite.svg) no-repeat;
@ -130,8 +127,8 @@ ${isMobileDevice
height: 9px; height: 9px;
width: 9px; width: 9px;
background-size: 10px;`} background-size: 10px;`}
` `
export const ActiveFilter = styled.span` export const ActiveFilter = styled.span`
font-style: normal; font-style: normal;
font-weight: 600; font-weight: 600;
@ -144,6 +141,7 @@ border: 1px solid #FFFFFF;
border-radius: 16px; border-radius: 16px;
gap: 5px; gap: 5px;
cursor: pointer; cursor: pointer;
${isMobileDevice ${isMobileDevice
? css` ? css`
padding: 0 5px; padding: 0 5px;
@ -153,6 +151,7 @@ ${isMobileDevice
padding: 0 10px; padding: 0 10px;
font-size: 14px; font-size: 14px;
height: 17px; height: 17px;
:hover { :hover {
background: #ffff; background: #ffff;
color: #000000; color: #000000;
@ -161,7 +160,12 @@ ${isMobileDevice
background: url(/images/closeBlack.svg) no-repeat; background: url(/images/closeBlack.svg) no-repeat;
} }
}`} }`}
`
export const FiltersCount = styled(ActiveFilter)``
export const Title = styled(T9n)`
cursor: pointer;
${isMobileDevice ? css`margin-right: 6px;` : ''}
` `
export const FiltersCount = styled(ActiveFilter)``

Loading…
Cancel
Save