Skip to content
Merged
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
4 changes: 3 additions & 1 deletion src/KeyCode.js → src/KeyCode.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export default {
const KeyCode = {
ZERO: 48,
NINE: 57,

Expand All @@ -12,3 +12,5 @@ export default {
ARROW_UP: 38,
ARROW_DOWN: 40,
};

export default KeyCode;
58 changes: 38 additions & 20 deletions src/Options.jsx → src/Options.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,28 @@
import React from 'react';
import KEYCODE from './KeyCode';

class Options extends React.Component {
interface Props {
disabled: boolean;
locale: any;
rootPrefixCls: string;
selectPrefixCls: string;
current: number;
pageSize: number;
pageSizeOptions: (string | number)[];
goButton: boolean | string;
changeSize: (size: number) => void;
quickGo: (value: number) => void;
buildOptionText?: (value: string | number) => string;
selectComponentClass: React.ComponentType<any> & {
Option?: React.ComponentType<any>;
};
}

interface State {
goInputText: string;
}

class Options extends React.Component<Props, State> {
static defaultProps = {
pageSizeOptions: ['10', '20', '50', '100'],
};
Expand All @@ -11,33 +32,32 @@ class Options extends React.Component {
goInputText: '',
};

getValidValue() {
getValidValue = () => {
const { goInputText } = this.state;
// eslint-disable-next-line no-restricted-globals
return !goInputText || isNaN(goInputText) ? undefined : Number(goInputText);
}
return !goInputText || Number.isNaN(goInputText)
? undefined
: Number(goInputText);
};

buildOptionText = (value) => `${value} ${this.props.locale.items_per_page}`;
buildOptionText = (value: string) =>
`${value} ${this.props.locale.items_per_page}`;

changeSize = (value) => {
changeSize = (value: number) => {
this.props.changeSize(Number(value));
};

handleChange = (e) => {
this.setState({
goInputText: e.target.value,
});
handleChange = (e: React.ChangeEvent<HTMLInputElement>) => {
this.setState({ goInputText: e.target.value });
};

handleBlur = (e) => {
handleBlur = (e: React.FocusEvent<HTMLInputElement, Element>) => {
const { goButton, quickGo, rootPrefixCls } = this.props;
const { goInputText } = this.state;
if (goButton || goInputText === '') {
return;
}
this.setState({
goInputText: '',
});
this.setState({ goInputText: '' });
if (
e.relatedTarget &&
(e.relatedTarget.className.indexOf(`${rootPrefixCls}-item-link`) >= 0 ||
Expand All @@ -48,15 +68,13 @@ class Options extends React.Component {
quickGo(this.getValidValue());
};

go = (e) => {
go = (e: any) => {
const { goInputText } = this.state;
if (goInputText === '') {
return;
}
if (e.keyCode === KEYCODE.ENTER || e.type === 'click') {
this.setState({
goInputText: '',
});
this.setState({ goInputText: '' });
this.props.quickGo(this.getValidValue());
}
};
Expand All @@ -72,9 +90,9 @@ class Options extends React.Component {
}
return pageSizeOptions.concat([pageSize.toString()]).sort((a, b) => {
// eslint-disable-next-line no-restricted-globals
const numberA = isNaN(Number(a)) ? 0 : Number(a);
const numberA = Number.isNaN(Number(a)) ? 0 : Number(a);
// eslint-disable-next-line no-restricted-globals
const numberB = isNaN(Number(b)) ? 0 : Number(b);
const numberB = Number.isNaN(Number(b)) ? 0 : Number(b);
return numberA - numberB;
});
}
Expand Down
34 changes: 0 additions & 34 deletions src/Pager.jsx

This file was deleted.

65 changes: 65 additions & 0 deletions src/Pager.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
/* eslint react/prop-types: 0 */
import classNames from 'classnames';
import React from 'react';

interface Props {
last?: boolean;
locale?: any;
rootPrefixCls: string;
page: number;
active?: boolean;
className?: string;
showTitle: boolean;
onClick?: (page: number) => void;
onKeyPress?: (
e: React.KeyboardEvent<HTMLLIElement>,
onClick: Props['onClick'],
page: Props['page'],
) => void;
itemRender?: (
page: number,
type: 'page' | 'prev' | 'next' | 'jump-prev' | 'jump-next',
element: React.ReactNode,
) => React.ReactNode;
}

const Pager: React.FC<Props> = (props) => {
const {
rootPrefixCls,
page,
active,
className,
showTitle,
onClick,
onKeyPress,
itemRender,
} = props;
const prefixCls = `${rootPrefixCls}-item`;
const cls = classNames(prefixCls, `${prefixCls}-${page}`, {
[`${prefixCls}-active`]: active,
[`${prefixCls}-disabled`]: !page,
[props.className]: className,
});

const handleClick = () => {
onClick(page);
};

const handleKeyPress = (e: React.KeyboardEvent<HTMLLIElement>) => {
onKeyPress(e, onClick, page);
};

return (
<li
title={showTitle ? page.toString() : null}
className={cls}
onClick={handleClick}
onKeyPress={handleKeyPress}
tabIndex={0}
>
{itemRender(page, 'page', <a rel="nofollow">{page}</a>)}
</li>
);
};

export default Pager;
Loading