test performance of pagination (#434)

* test performance of pagination

* style pagination

* add to cards view
This commit is contained in:
saml33 2024-07-09 23:36:24 +10:00 committed by GitHub
parent 676f9e09a7
commit f892f2f7ed
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 97 additions and 46 deletions

View File

@ -1,27 +1,30 @@
import useListedMarketsWithMarketData, {
SerumMarketWithMarketData,
} from 'hooks/useListedMarketsWithMarketData'
import useMangoGroup from 'hooks/useMangoGroup'
import { ChangeEvent, useMemo, useState } from 'react'
import { useTranslation } from 'react-i18next'
import SpotTable from './SpotTable'
import {
ChevronLeftIcon,
ChevronRightIcon,
MagnifyingGlassIcon,
Squares2X2Icon,
TableCellsIcon,
} from '@heroicons/react/20/solid'
import { AllowedKeys } from 'utils/markets'
import useListedMarketsWithMarketData, {
SerumMarketWithMarketData,
} from 'hooks/useListedMarketsWithMarketData'
import useMangoGroup from 'hooks/useMangoGroup'
import useBanks from 'hooks/useBanks'
import useLocalStorageState from 'hooks/useLocalStorageState'
import SpotTable from './SpotTable'
import ButtonGroup from '@components/forms/ButtonGroup'
import SpotCards from './SpotCards'
import Input from '@components/forms/Input'
import EmptyState from '@components/nftMarket/EmptyState'
import { Bank } from '@blockworks-foundation/mango-v4'
import useBanks from 'hooks/useBanks'
import SheenLoader from '@components/shared/SheenLoader'
import { useViewport } from 'hooks/useViewport'
import useLocalStorageState from 'hooks/useLocalStorageState'
import { Bank } from '@blockworks-foundation/mango-v4'
import { TOKEN_REDUCE_ONLY_OPTIONS, TOKEN_WATCHLIST_KEY } from 'utils/constants'
import { DEFAULT_WATCHLIST } from './WatchlistButton'
import { AllowedKeys } from 'utils/markets'
import { useViewport } from 'hooks/useViewport'
import { IconButton } from '@components/shared/Button'
export type BankWithMarketData = {
bank: Bank
@ -32,8 +35,7 @@ const generateSearchTerm = (item: BankWithMarketData, searchValue: string) => {
const normalizedSearchValue = searchValue.toLowerCase()
const value = item.bank.name.toLowerCase()
const isMatchingWithName =
item.bank.name.toLowerCase().indexOf(normalizedSearchValue) >= 0
const isMatchingWithName = value.indexOf(normalizedSearchValue) >= 0
const matchingSymbolPercent = isMatchingWithName
? normalizedSearchValue.length / item.bank.name.length
: 0
@ -69,24 +71,13 @@ const sortTokens = (
const bIsNoBorrow =
b.bank.reduceOnly === TOKEN_REDUCE_ONLY_OPTIONS.NO_BORROWS
// prioritize tokens in the watchlist
if (aInWatchlist && !bInWatchlist) {
return -1 // a should come before b
} else if (!aInWatchlist && bInWatchlist) {
return 1 // b should come before a
}
if (aInWatchlist && !bInWatchlist) return -1
if (!aInWatchlist && bInWatchlist) return 1
if (!aIsReduce && bIsReduce) return -1
if (aIsReduce && !bIsReduce) return 1
if (!aIsNoBorrow && bIsNoBorrow) return -1
if (aIsNoBorrow && !bIsNoBorrow) return 1
if (!aIsReduce && bIsReduce) {
return -1 // a should come before b
} else if (aIsReduce && !bIsReduce) {
return 1 // b should come before a
}
if (!aIsNoBorrow && bIsNoBorrow) {
return -1 // a should come before b
} else if (aIsNoBorrow && !bIsNoBorrow) {
return 1 // b should come before a
}
let aValue: number | undefined
let bValue: number | undefined
if (sortByKey === 'change_24h') {
@ -96,16 +87,10 @@ const sortTokens = (
aValue = a?.market?.marketData?.[sortByKey]
bValue = b?.market?.marketData?.[sortByKey]
}
// handle marketData[sortByKey] is undefined
if (typeof aValue === 'undefined' && typeof bValue === 'undefined') {
return 0 // Consider them equal
}
if (typeof aValue === 'undefined') {
return 1 // b should come before a
}
if (typeof bValue === 'undefined') {
return -1 // a should come before b
}
if (typeof aValue === 'undefined' && typeof bValue === 'undefined') return 0
if (typeof aValue === 'undefined') return 1
if (typeof bValue === 'undefined') return -1
return bValue - aValue
})
@ -125,6 +110,8 @@ const Spot = () => {
const [sortByKey, setSortByKey] = useState<AllowedKeys>('quote_volume_24h')
const [search, setSearch] = useState('')
const [showTableView, setShowTableView] = useState(true)
const [currentPage, setCurrentPage] = useState(1)
const itemsPerPage = 20
const banksWithMarketData = useMemo(() => {
if (!banks.length || !group || !serumMarketsWithData.length) return []
@ -156,6 +143,16 @@ const Spot = () => {
setSearch(e.target.value)
}
const currentTokensToShow = useMemo(() => {
const start = (currentPage - 1) * itemsPerPage
const end = start + itemsPerPage
return sortedTokensToShow.slice(start, end)
}, [sortedTokensToShow, currentPage])
const handlePageChange = (newPage: number) => {
setCurrentPage(newPage)
}
return (
<div className="lg:-mt-10">
<div className="flex flex-col px-4 md:px-6 lg:flex-row lg:items-center lg:justify-end 2xl:px-12">
@ -210,13 +207,21 @@ const Spot = () => {
))}
</div>
) : sortedTokensToShow.length ? (
showTableView ? (
<div className="mt-6 border-t border-th-bkg-3">
<SpotTable tokens={sortedTokensToShow} />
</div>
) : (
<SpotCards tokens={sortedTokensToShow} />
)
<>
{showTableView ? (
<div className="mt-6 border-t border-th-bkg-3">
<SpotTable tokens={currentTokensToShow} />
</div>
) : (
<SpotCards tokens={currentTokensToShow} />
)}
<Pagination
currentPage={currentPage}
totalItems={sortedTokensToShow.length}
itemsPerPage={itemsPerPage}
onPageChange={handlePageChange}
/>
</>
) : (
<div className="px-4 pt-2 md:px-6 2xl:px-12">
<EmptyState text="No results found..." />
@ -227,3 +232,49 @@ const Spot = () => {
}
export default Spot
type PaginationProps = {
currentPage: number
totalItems: number
itemsPerPage: number
onPageChange: (page: number) => void
}
const Pagination = ({
currentPage,
totalItems,
itemsPerPage,
onPageChange,
}: PaginationProps) => {
const totalPages = Math.ceil(totalItems / itemsPerPage)
const handlePrevPage = () => {
if (currentPage > 1) onPageChange(currentPage - 1)
}
const handleNextPage = () => {
if (currentPage < totalPages) onPageChange(currentPage + 1)
}
return (
<div className="flex items-center justify-center space-x-3 py-4">
<IconButton
onClick={handlePrevPage}
disabled={currentPage === 1}
size="small"
>
<ChevronLeftIcon className="h-5 w-5" />
</IconButton>
<span className="text-th-fgd-3">
{currentPage} of {totalPages}
</span>
<IconButton
onClick={handleNextPage}
disabled={currentPage === totalPages}
size="small"
>
<ChevronRightIcon className="h-5 w-5" />
</IconButton>
</div>
)
}