Skip to content

Commit d152cef

Browse files
committed
fix pagination
1 parent 61c79bf commit d152cef

File tree

2 files changed

+21
-17
lines changed

2 files changed

+21
-17
lines changed

theme/foundations/colors.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const colors = {
2323
'50': '#e9e4ff',
2424
'100': '#c8c0ff',
2525
'200': '#a396ff',
26-
'300': '#8573ff',
26+
'300': 'rgba(74, 237, 237, 1)',
2727
'400': 'rgba(74, 237, 237, 1)',
2828
'500': '#5f4bee',
2929
'600': '#4f3fbd',

ui/shared/pagination/Pagination.tsx

+20-16
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import { Button, Flex, IconButton, chakra } from '@chakra-ui/react';
1+
import { Button, Flex, chakra } from '@chakra-ui/react';
22
import React from 'react';
33

44
import type { PaginationParams } from './types';
55

66
import Skeleton from 'ui/shared/chakra/Skeleton';
7-
import IconSvg from 'ui/shared/IconSvg';
87

98
interface Props extends PaginationParams {
109
className?: string;
@@ -38,18 +37,20 @@ const Pagination = ({ page, onNextPageClick, onPrevPageClick, resetPage, hasPage
3837
</Button>
3938
</Skeleton>
4039
<Skeleton isLoaded={ !showSkeleton } display="inline-block" mr={ 3 } borderRadius="base">
41-
<IconButton
42-
onClick={ onPrevPageClick }
40+
<Button
4341
size="sm"
4442
px="24px"
4543
py="12px"
4644
fontWeight={ 400 }
47-
aria-label="Prev page"
48-
w="36px"
45+
data-selected={ true }
4946
h={ 9 }
50-
icon={ <IconSvg name="arrows/east-mini" w={ 5 } h={ 5 }/> }
47+
minW="36px"
48+
cursor="unset"
5149
isDisabled={ !canGoBackwards || isLoading }
52-
/>
50+
onClick={ onPrevPageClick }
51+
>
52+
{ '<' }
53+
</Button>
5354
</Skeleton>
5455
<Skeleton isLoaded={ !showSkeleton } display="inline-block" borderRadius="base">
5556
<Button
@@ -66,18 +67,21 @@ const Pagination = ({ page, onNextPageClick, onPrevPageClick, resetPage, hasPage
6667
</Button>
6768
</Skeleton>
6869
<Skeleton isLoaded={ !showSkeleton } display="inline-block" ml={ 3 } borderRadius="base">
69-
<IconButton
70-
onClick={ onNextPageClick }
70+
{ '>' }
71+
<Button
72+
size="sm"
7173
px="24px"
7274
py="12px"
73-
h={ 9 }
7475
fontWeight={ 400 }
75-
size="sm"
76-
aria-label="Next page"
77-
w="36px"
78-
icon={ <IconSvg name="arrows/east-mini" w={ 5 } h={ 5 } transform="rotate(180deg)"/> }
76+
data-selected={ true }
77+
h={ 9 }
78+
minW="36px"
79+
cursor="unset"
7980
isDisabled={ !hasNextPage || isLoading }
80-
/>
81+
onClick={ onNextPageClick }
82+
>
83+
{ '<' }
84+
</Button>
8185
</Skeleton>
8286
{ /* not implemented yet */ }
8387
{ /* <Flex alignItems="center" width="132px" ml={ 16 } display={{ base: 'none', lg: 'flex' }}>

0 commit comments

Comments
 (0)