Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion src/Pager.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import type { PaginationProps } from './interface';
export interface PagerProps extends Pick<PaginationProps, 'itemRender'> {
rootPrefixCls: string;
page: number;
pageLabel?: string;
active?: boolean;
className?: string;
style?: React.CSSProperties;
Expand All @@ -22,6 +23,7 @@ const Pager: React.FC<PagerProps> = (props) => {
const {
rootPrefixCls,
page,
pageLabel,
active,
className,
style,
Expand Down Expand Up @@ -50,7 +52,14 @@ const Pager: React.FC<PagerProps> = (props) => {
onKeyPress(e, onClick, page);
};

const pager = itemRender(page, 'page', <a rel="nofollow">{page}</a>);
const pager = itemRender(
page,
'page',
<a tabIndex={-1} aria-hidden="true" rel="nofollow">
{page}
</a>,
);
const pagerLabel = `${pageLabel} ${page}`.trim();

return pager ? (
<li
Expand All @@ -60,6 +69,9 @@ const Pager: React.FC<PagerProps> = (props) => {
onClick={handleClick}
onKeyDown={handleKeyPress}
tabIndex={0}
role="button"
aria-label={pagerLabel}
aria-current={active ? 'page' : undefined}
>
{pager}
</li>
Expand Down
66 changes: 45 additions & 21 deletions src/Pagination.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import {
warning,
} from '@rc-component/util';
import React, { useEffect } from 'react';
import isEnterOrSpaceKey from './isEnterOrSpaceKey';
import type { PaginationProps } from './interface';
import zhCN from './locale/zh_CN';
import Options from './Options';
Expand Down Expand Up @@ -116,12 +117,15 @@ const Pagination: React.FC<PaginationProps> = (props) => {

function getItemIcon(
icon: React.ReactNode | React.ComponentType<PaginationProps>,
label: string,
_label: string,
title?: string,
) {
let iconNode = icon || (
<button
type="button"
aria-label={label}
tabIndex={-1}
aria-hidden="true"
title={title}
className={`${prefixCls}-item-link`}
/>
);
Comment thread
ZQDesigned marked this conversation as resolved.
Expand Down Expand Up @@ -246,52 +250,59 @@ const Pagination: React.FC<PaginationProps> = (props) => {
handleChange(jumpNextPage);
}

function runIfEnter(
function runIfEnterOrSpace(
event: React.KeyboardEvent<HTMLLIElement>,
callback: (...args: any[]) => void,
...restParams: any[]
) {
if (
event.key === 'Enter' ||
event.charCode === KeyCode.ENTER ||
event.keyCode === KeyCode.ENTER
) {
if (isEnterOrSpaceKey(event)) {
event.preventDefault();
callback(...restParams);
Comment thread
ZQDesigned marked this conversation as resolved.
}
Comment thread
ZQDesigned marked this conversation as resolved.
}

function runIfEnterPrev(event: React.KeyboardEvent<HTMLLIElement>) {
runIfEnter(event, prevHandle);
runIfEnterOrSpace(event, prevHandle);
}

function runIfEnterNext(event: React.KeyboardEvent<HTMLLIElement>) {
runIfEnter(event, nextHandle);
runIfEnterOrSpace(event, nextHandle);
}

function runIfEnterJumpPrev(event: React.KeyboardEvent<HTMLLIElement>) {
runIfEnter(event, jumpPrevHandle);
runIfEnterOrSpace(event, jumpPrevHandle);
}

function runIfEnterJumpNext(event: React.KeyboardEvent<HTMLLIElement>) {
runIfEnter(event, jumpNextHandle);
runIfEnterOrSpace(event, jumpNextHandle);
}

function renderPrev(prevPage: number) {
const prevPageTitle = locale.prev_page || 'prev page';
const prevButton = itemRender(
prevPage,
'prev',
getItemIcon(prevIcon, 'prev page'),
getItemIcon(
Comment thread
ZQDesigned marked this conversation as resolved.
prevIcon,
prevPageTitle,
showTitle ? prevPageTitle : undefined,
),
);
return React.isValidElement<HTMLButtonElement>(prevButton)
? React.cloneElement(prevButton, { disabled: !hasPrev })
: prevButton;
}

function renderNext(nextPage: number) {
const nextPageTitle = locale.next_page || 'next page';
const nextButton = itemRender(
nextPage,
'next',
getItemIcon(nextIcon, 'next page'),
getItemIcon(
nextIcon,
nextPageTitle,
showTitle ? nextPageTitle : undefined,
),
);
return React.isValidElement<HTMLButtonElement>(nextButton)
? React.cloneElement(nextButton, { disabled: !hasNext })
Expand Down Expand Up @@ -335,9 +346,10 @@ const Pagination: React.FC<PaginationProps> = (props) => {
const pagerProps: PagerProps = {
rootPrefixCls: prefixCls,
onClick: handleChange,
onKeyPress: runIfEnter,
onKeyPress: runIfEnterOrSpace,
showTitle,
itemRender,
pageLabel: locale.page,
page: -1,
className: paginationClassNames?.item,
style: styles?.item,
Expand Down Expand Up @@ -436,40 +448,50 @@ const Pagination: React.FC<PaginationProps> = (props) => {
const jumpPrevContent = itemRender(
jumpPrevPage,
'jump-prev',
getItemIcon(jumpPrevIcon, 'prev page'),
getItemIcon(
jumpPrevIcon,
prevItemTitle,
showTitle ? prevItemTitle : undefined,
),
);
const jumpNextContent = itemRender(
jumpNextPage,
'jump-next',
getItemIcon(jumpNextIcon, 'next page'),
getItemIcon(
jumpNextIcon,
nextItemTitle,
showTitle ? nextItemTitle : undefined,
),
);

if (showPrevNextJumpers) {
jumpPrev = jumpPrevContent ? (
<li
title={showTitle ? prevItemTitle : null}
key="prev"
onClick={jumpPrevHandle}
tabIndex={0}
onKeyDown={runIfEnterJumpPrev}
className={clsx(`${prefixCls}-jump-prev`, {
[`${prefixCls}-jump-prev-custom-icon`]: !!jumpPrevIcon,
})}
role="button"
aria-label={prevItemTitle}
>
{jumpPrevContent}
</li>
) : null;

jumpNext = jumpNextContent ? (
<li
title={showTitle ? nextItemTitle : null}
key="next"
onClick={jumpNextHandle}
tabIndex={0}
onKeyDown={runIfEnterJumpNext}
className={clsx(`${prefixCls}-jump-next`, {
[`${prefixCls}-jump-next-custom-icon`]: !!jumpNextIcon,
})}
role="button"
aria-label={nextItemTitle}
>
{jumpNextContent}
</li>
Expand Down Expand Up @@ -542,7 +564,6 @@ const Pagination: React.FC<PaginationProps> = (props) => {
const prevDisabled = !hasPrev || !allPages;
prev = (
<li
title={showTitle ? locale.prev_page : null}
onClick={prevHandle}
tabIndex={prevDisabled ? null : 0}
onKeyDown={runIfEnterPrev}
Expand All @@ -551,6 +572,8 @@ const Pagination: React.FC<PaginationProps> = (props) => {
})}
style={styles?.item}
aria-disabled={prevDisabled}
role="button"
aria-label={locale.prev_page}
>
{prev}
</li>
Expand All @@ -571,7 +594,6 @@ const Pagination: React.FC<PaginationProps> = (props) => {

next = (
<li
title={showTitle ? locale.next_page : null}
onClick={nextHandle}
tabIndex={nextTabIndex}
onKeyDown={runIfEnterNext}
Expand All @@ -580,6 +602,8 @@ const Pagination: React.FC<PaginationProps> = (props) => {
})}
style={styles?.item}
aria-disabled={nextDisabled}
role="button"
aria-label={locale.next_page}
>
{next}
</li>
Expand Down
17 changes: 17 additions & 0 deletions src/isEnterOrSpaceKey.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
import { KeyCode } from '@rc-component/util';

interface KeyboardEventLike {
key?: string;
charCode?: number;
keyCode?: number;
}

export default function isEnterOrSpaceKey(event: KeyboardEventLike) {
return (
event.key === 'Enter' ||
event.key === ' ' ||
event.key === 'Spacebar' ||
event.charCode === KeyCode.ENTER ||
event.keyCode === KeyCode.ENTER
);
}
Loading
Loading