Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(multi-select): add selected preview #413

Merged
merged 5 commits into from
Aug 8, 2024
Merged

feat(multi-select): add selected preview #413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
35d7873
feat(multi-select): add selected preview
Daryl-L Aug 2, 2024
1b0ff2f
style(tag): use translation
Daryl-L Aug 7, 2024
ef5b90d
fix(xudts): font
Daryl-L Aug 7, 2024
7392a0f
fix(multi-select): use translation
Daryl-L Aug 8, 2024
a768eb7
feat(multi-select): language
Daryl-L Aug 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/components/FilterSortContainer/index.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,19 @@
.filterSortContainerOnMobile {
display: flex;
flex-wrap: wrap;
flex-wrap: nowrap;
justify-content: space-between;
gap: 20px;

ul {
max-width: 100%;
display: flex;
flex-wrap: wrap;
margin: 0;

li {
width: 50%;
list-style-type: none;
text-wrap: nowrap;

&:nth-child(odd) {
text-align: left;
Expand Down
149 changes: 86 additions & 63 deletions src/components/MultiFilterButton/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { Link, useLocation } from 'react-router-dom'
import { Popover } from 'antd'
import { useTranslation } from 'react-i18next'
import { useEffect, useMemo, useState } from 'react'
import { ReactComponent as FilterIcon } from '../../assets/filter_icon.svg'
import { ReactComponent as SelectedIcon } from '../../assets/selected-icon.svg'
import { ReactComponent as NotSelectedIcon } from '../../assets/not-selected-icon.svg'
Expand All @@ -17,81 +18,103 @@ export function MultiFilterButton({
filterList: { key: string; value: string; to: string; title: string | JSX.Element }[]
isMobile?: boolean
}) {
const { t } = useTranslation()
const [selected, setSelected] = useState<string>('')
const { t, i18n } = useTranslation()
const params = useSearchParams(filterName)
const filter = params[filterName]
const types = filter?.split(',').filter(t => !!t) ?? []

const types = useMemo(() => filter?.split(',').filter(t => !!t) ?? [], [filter])

useEffect(() => {
const filterMap = new Map<string, string>(filterList.map(f => [f.key, f.value]))
setSelected(
types
.map(item => filterMap.get(item))
.filter(item => item)
.join(','),
)
}, [filter, filterList, types])

const isAllSelected = types.length === filterList.length
const isNoneSelected = types.length === 0
const search = new URLSearchParams(useLocation().search)
const location = useLocation()
const search = new URLSearchParams(location.search)
search.delete(filterName)
search.delete('page')

return (
<Popover
className={styles.container}
placement="bottomRight"
trigger={isMobile ? 'click' : 'hover'}
overlayClassName={styles.antPopover}
content={
<div className={styles.filterItems}>
<div className={styles.selectTitle}>
<h2>{t('components.multi_filter_button.select')}</h2>
<Link
key="all"
to={() => {
const newSearch = new URLSearchParams(search)
if (isNoneSelected) {
newSearch.append(filterName, filterList.map(f => f.value).join(','))
}
<div className={styles.container}>
{!!selected && (
<div className={styles.selected}>
<span className={styles.selectedItems}>{selected}</span>
<span>+{types.length}</span>
</div>
)}
<Popover
placement="bottomRight"
trigger={isMobile ? 'click' : 'hover'}
overlayClassName={styles.antPopover}
content={
<div className={styles.filterItems}>
<div className={styles.selectTitle}>
<h2>{t('components.multi_filter_button.select')}</h2>
<Link
key="all"
to={() => {
const newSearch = new URLSearchParams(search)
if (isNoneSelected) {
newSearch.append(filterName, filterList.map(f => f.key).join(','))
}

return `${filterList[0].to}?${newSearch.toString()}`
}}
>
{types.length > 0 ? (
<>{isAllSelected ? <SelectedIcon /> : <PartialSelectedIcon />}</>
) : (
<NotSelectedIcon />
)}
</Link>
</div>
{filterList.map(f => (
<Link
key={f.key}
to={() => {
const subTypes = new Set(types)
if (subTypes.has(f.value)) {
subTypes.delete(f.value)
} else {
subTypes.add(f.value)
}
return `/${i18n.language}${filterList[0].to}?${newSearch.toString()}`
}}
>
{types.length > 0 ? (
<>{isAllSelected ? <SelectedIcon /> : <PartialSelectedIcon />}</>
) : (
<NotSelectedIcon />
)}
</Link>
</div>
{filterList.map(f => (
<Link
key={f.key}
to={() => {
const subTypes = new Set(types)
if (subTypes.has(f.key)) {
subTypes.delete(f.key)
} else {
subTypes.add(f.key)
}

const newSearch = new URLSearchParams(search)
if (subTypes.size === 0) {
newSearch.delete(filterName)
} else {
newSearch.append(filterName, Array.from(subTypes).join(','))
}
return `${f.to}?${newSearch.toString()}`
}}
data-is-active={types.includes(f.value)}
>
{f.title}
{types.includes(f.value) ? <SelectedIcon /> : <NotSelectedIcon />}
</Link>
))}
const newSearch = new URLSearchParams(search)
if (subTypes.size === 0) {
newSearch.delete(filterName)
} else {
newSearch.append(filterName, Array.from(subTypes).join(','))
}
return `/${i18n.language}${f.to}?${newSearch.toString()}`
}}
data-is-active={types.includes(f.key)}
>
{f.title}
{types.includes(f.key) ? <SelectedIcon /> : <NotSelectedIcon />}
</Link>
))}
</div>
}
>
<div style={{ display: 'flex', alignItems: 'center' }}>
<FilterIcon
className={styles.filter}
// if the filter is the empty string, display highlight
// if the filter is the string list, display highlight
// if the filter is undefined, not display highlight
data-changed={filter !== undefined}
/>
</div>
}
>
<FilterIcon
className={styles.filter}
// if the filter is the empty string, display highlight
// if the filter is the string list, display highlight
// if the filter is undefined, not display highlight
data-changed={filter !== undefined}
/>
</Popover>
</Popover>
</div>
)
}

Expand Down
33 changes: 31 additions & 2 deletions src/components/MultiFilterButton/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,11 @@
border: none;
outline: none;
background: none;
display: inline-flex;
vertical-align: text-top;
gap: 4px;
cursor: pointer;
width: 70%;
display: flex;
align-items: center;
}

.antPopover {
Expand All @@ -31,6 +33,33 @@
}
}

.selected {
border-radius: 48px;
border: 1px solid var(--primary-dimmed-color);
background: var(--secondary-color);
display: flex;
padding: 4px 8px;
align-items: center;
align-content: flex-start;
gap: 4px;
flex-wrap: nowrap;
margin-left: 4px;
color: var(--primary-color);
font-size: 12px;
font-style: normal;
font-weight: 500;
line-height: normal;
align-self: center;
max-width: 85%;

.selectedItems {
max-width: 95%;
text-overflow: ellipsis;
white-space: nowrap;
overflow: hidden;
}
}

.filterItems {
display: flex;
flex-direction: column;
Expand Down
108 changes: 55 additions & 53 deletions src/pages/NftCollections/List.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { scriptToHash } from '@nervosnetwork/ckb-sdk-utils'
import { Popover, Tooltip } from 'antd'
import classNames from 'classnames'
import { Trans, useTranslation } from 'react-i18next'
import { TFunction } from 'i18next'
import { Link } from '../../components/Link'
import SortButton from '../../components/SortButton'
import { handleNftImgError, patchMibaoImg } from '../../utils/util'
Expand Down Expand Up @@ -46,56 +47,57 @@ function useFilterList(): Record<'title' | 'value', string>[] {
]
}

const filterList = [
{
key: 'invalid',
value: 'invalid',
title: <NFTTag key="invalid" tagName="invalid" />,
to: '/nft-collections',
},
{
key: 'suspicious',
value: 'suspicious',
title: <NFTTag key="suspicious" tagName="suspicious" />,
to: '/nft-collections',
},
{
key: 'out-of-length-range',
value: 'out-of-length-range',
title: <NFTTag key="out-of-length-range" tagName="out-of-length-range" />,
to: '/nft-collections',
},
{
key: 'rgb++',
value: 'rgb++',
title: <NFTTag key="rgb++" tagName="rgb++" />,
to: '/nft-collections',
},
{
key: 'duplicate',
value: 'duplicate',
title: <NFTTag key="duplicate" tagName="duplicate" />,
to: '/nft-collections',
},
{
key: 'layer-1-asset',
value: 'layer-1-asset',
title: <NFTTag key="layer-1-asset" tagName="layer-1-asset" />,
to: '/nft-collections',
},
{
key: 'layer-2-asset',
value: 'layer-2-asset',
title: <NFTTag key="layer-2-asset" tagName="layer-2-asset" />,
to: '/nft-collections',
},
{
key: 'supply-limited',
value: 'supply-limited',
title: <NFTTag key="supply-limited" tagName="supply-limited" />,
to: '/nft-collections',
},
].filter(f => whiteList.includes(f.key))
const getFilterList = (t: TFunction) =>
[
{
key: 'invalid',
value: t('xudt.tags.invalid'),
title: <NFTTag key="invalid" tagName="invalid" />,
to: '/nft-collections',
},
{
key: 'suspicious',
value: t('xudt.tags.suspicious'),
title: <NFTTag key="suspicious" tagName="suspicious" />,
to: '/nft-collections',
},
{
key: 'out-of-length-range',
value: t('xudt.tags.out-of-length-range'),
title: <NFTTag key="out-of-length-range" tagName="out-of-length-range" />,
to: '/nft-collections',
},
{
key: 'rgb++',
value: t('xudt.tags.rgb++'),
title: <NFTTag key="rgb++" tagName="rgb++" />,
to: '/nft-collections',
},
{
key: 'duplicate',
value: t('xudt.tags.duplicate'),
title: <NFTTag key="duplicate" tagName="duplicate" />,
to: '/nft-collections',
},
{
key: 'layer-1-asset',
value: t('xudt.tags.layer-1-asset'),
title: <NFTTag key="layer-1-asset" tagName="layer-1-asset" />,
to: '/nft-collections',
},
{
key: 'layer-2-asset',
value: t('xudt.tags.layer-2-asset'),
title: <NFTTag key="layer-2-asset" tagName="layer-2-asset" />,
to: '/nft-collections',
},
{
key: 'supply-limited',
value: t('xudt.tags.supply-limited'),
title: <NFTTag key="supply-limited" tagName="supply-limited" />,
to: '/nft-collections',
},
].filter(f => whiteList.includes(f.key))

export const isTxFilterType = (s?: string): boolean => {
return s ? ['all', 'm_nft', 'nrc721', 'cota', 'spore'].includes(s) : false
Expand Down Expand Up @@ -141,7 +143,7 @@ const Tags = () => {
return (
<div className={styles.colTags}>
{t('xudt.title.tags')}
<MultiFilterButton filterName="tags" key="" filterList={filterList} />
<MultiFilterButton filterName="tags" key="" filterList={getFilterList(t)} />
</div>
)
}
Expand Down Expand Up @@ -367,9 +369,9 @@ export const ListOnMobile: React.FC<{ isLoading: boolean; list: NFTCollection[]
<SimpleSortHeader sortField="transactions" fieldI18n={t('nft.transactions')} />
<HolderMinterSort />
<SimpleSortHeader sortField="timestamp" fieldI18n={t('nft.created_time')} />
<div>
<div style={{ display: 'flex', flexWrap: 'nowrap', maxWidth: '100%' }}>
{t('xudt.title.tags')}
<MultiFilterButton filterName="tags" key="" filterList={filterList} />
<MultiFilterButton filterName="tags" key="" filterList={getFilterList(t)} />
</div>
</FilterSortContainerOnMobile>
</Card>
Expand Down
4 changes: 3 additions & 1 deletion src/pages/NftCollections/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,8 +67,10 @@
}

.colTags {
max-width: 100%;
width: 100%;
display: flex;
flex-wrap: wrap;
flex-wrap: nowrap;
align-items: center;
}

Expand Down
Loading