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.

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

Make elements keyboard accessible #83

Merged
merged 1 commit into from
May 27, 2017
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
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ assets/**/*.css
build
lib
es
.vscode
.vscode
coverage/
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,17 @@
"pub": "rc-tools run pub --babel-runtime",
"lint": "rc-tools run lint",
"lint:fix": "rc-tools run lint --fix",
"karma": "rc-tools run karma",
"saucelabs": "rc-tools run saucelabs",
"test": "rc-tools run test",
"chrome-test": "rc-tools run chrome-test",
"coverage": "rc-tools run coverage"
"karma": "rc-test run karma",
"saucelabs": "rc-test run saucelabs",
"test": "rc-test run test",
"chrome-test": "rc-test run chrome-test",
"coverage": "rc-test run coverage"
},
"devDependencies": {
"expect.js": "0.3.x",
"pre-commit": "1.x",
"rc-select": "5.x",
"rc-test": "^6.0.1",
"rc-tools": "6.x",
"react": "^15.2.1",
"react-addons-test-utils": "^15.3.1",
Expand Down
9 changes: 8 additions & 1 deletion src/Pager.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,13 @@ const Pager = (props) => {
}

return (
<li title={props.showTitle ? props.page : null} className={cls} onClick={props.onClick}>
<li
title={props.showTitle ? props.page : null}
className={cls}
onClick={props.onClick}
onKeyPress={props.onKeyPress}
tabIndex="0"
>
<a>{props.page}</a>
</li>
);
Expand All @@ -29,6 +35,7 @@ Pager.propTypes = {
showTitle: PropTypes.bool,
rootPrefixCls: PropTypes.string,
onClick: PropTypes.func,
onKeyPress: PropTypes.func,
};

export default Pager;
22 changes: 22 additions & 0 deletions src/Pagination.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,12 @@ class Pagination extends React.Component {
return this.state.current < this._calcPage();
}

_runIfEnter(event, callback) {
if (event.key === 'Enter' || event.charCode === 13) {
callback();
}
}

render() {
const props = this.props;
const locale = props.locale;
Expand All @@ -211,6 +217,8 @@ class Pagination extends React.Component {
<li
title={props.showTitle ? locale.prev_page : null}
onClick={this._prev}
tabIndex="0"
onKeyPress={(evt) => this._runIfEnter(evt, this._prev)}
className={`${this._hasPrev() ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`}
aria-disabled={!this._hasPrev()}
>
Expand All @@ -233,6 +241,8 @@ class Pagination extends React.Component {
<li
title={props.showTitle ? locale.next_page : null}
onClick={this._next}
tabIndex="0"
onKeyPress={(evt) => this._runIfEnter(evt, this._next)}
className={`${this._hasNext() ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={!this._hasNext()}
>
Expand All @@ -250,6 +260,7 @@ class Pagination extends React.Component {
locale={locale}
rootPrefixCls={prefixCls}
onClick={this._handleChange.bind(this, i)}
onKeyPress={(evt) => this._runIfEnter(evt, this._handleChange.bind(this, i))}
key={i}
page={i}
active={active}
Expand All @@ -265,6 +276,8 @@ class Pagination extends React.Component {
title={props.showTitle ? prevItemTitle : null}
key="prev"
onClick={this._jumpPrev}
tabIndex="0"
onKeyPress={(evt) => this._runIfEnter(evt, this._jumpPrev)}
className={`${prefixCls}-jump-prev`}
>
<a />
Expand All @@ -274,7 +287,9 @@ class Pagination extends React.Component {
<li
title={props.showTitle ? nextItemTitle : null}
key="next"
tabIndex="0"
onClick={this._jumpNext}
onKeyPress={(evt) => this._runIfEnter(evt, this._jumpNext)}
className={`${prefixCls}-jump-next`}
>
<a />
Expand All @@ -286,6 +301,7 @@ class Pagination extends React.Component {
last
rootPrefixCls={prefixCls}
onClick={this._handleChange.bind(this, allPages)}
onKeyPress={(evt) => this._runIfEnter(evt, this._handleChange.bind(this, allPages))}
key={allPages}
page={allPages}
active={false}
Expand All @@ -297,6 +313,7 @@ class Pagination extends React.Component {
locale={props.locale}
rootPrefixCls={prefixCls}
onClick={this._handleChange.bind(this, 1)}
onKeyPress={(evt) => this._runIfEnter(evt, this._handleChange.bind(this, 1))}
key={1}
page={1}
active={false}
Expand All @@ -322,6 +339,7 @@ class Pagination extends React.Component {
locale={props.locale}
rootPrefixCls={prefixCls}
onClick={this._handleChange.bind(this, i)}
onKeyPress={(evt) => this._runIfEnter(evt, this._handleChange.bind(this, i))}
key={i}
page={i}
active={active}
Expand Down Expand Up @@ -378,6 +396,8 @@ class Pagination extends React.Component {
<li
title={props.showTitle ? locale.prev_page : null}
onClick={this._prev}
tabIndex="0"
onKeyPress={(evt) => this._runIfEnter(evt, this._prev)}
className={`${!prevDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-prev`}
aria-disabled={prevDisabled}
>
Expand All @@ -387,6 +407,8 @@ class Pagination extends React.Component {
<li
title={props.showTitle ? locale.next_page : null}
onClick={this._next}
tabIndex="0"
onKeyPress={(evt) => this._runIfEnter(evt, this._next)}
className={`${!nextDisabled ? '' : `${prefixCls}-disabled`} ${prefixCls}-next`}
aria-disabled={nextDisabled}
>
Expand Down
5 changes: 2 additions & 3 deletions tests/Pagination.spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
/* eslint func-names: 0, no-console: 0 */
import expect from 'expect.js';
import Pagination from '../';
import Pagination from '../src';
import React from 'react';
import TestUtils from 'react-addons-test-utils';
import ReactDOM from 'react-dom';
import TwoPagination from './helper/two-pagination';

const Simulate = TestUtils.Simulate;

Expand Down Expand Up @@ -185,8 +186,6 @@ describe('Controlled Pagination', () => {
});

describe('Controlled Pagination', () => {
const TwoPagination = require('./helper/two-pagination');

let entry = null;
const container = document.createElement('div');
document.body.appendChild(container);
Expand Down
2 changes: 1 addition & 1 deletion tests/helper/two-pagination.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import 'rc-select/assets/index.css';
import Pagination from 'rc-pagination';
import Pagination from '../../src';
import React from 'react';
import Select from 'rc-select';

Expand Down