Merge branch 'master' of github.com:react-component/pagination

Author: afc163

README.md

@@ -6,8 +6,8 @@ React Pagination Component.
 [![NPM version][npm-image]][npm-url]
 [![build status][travis-image]][travis-url]
 [![Test coverage][coveralls-image]][coveralls-url]
-[![gemnasium deps][gemnasium-image]][gemnasium-url]
-[![node version][node-image]][node-url]
+[![Dependencies](https://img.shields.io/david/react-component/pagination.svg?style=flat-square)](https://david-dm.org/react-component/pagination)
+[![DevDependencies](https://img.shields.io/david/dev/react-component/pagination.svg?style=flat-square)](https://david-dm.org/react-component/pagination?type=dev)
 [![npm download][download-image]][download-url]
 
 [npm-image]: http://img.shields.io/npm/v/rc-pagination.svg?style=flat-square
@@ -16,10 +16,6 @@ React Pagination Component.
 [travis-url]: https://travis-ci.org/react-component/pagination
 [coveralls-image]: https://img.shields.io/coveralls/react-component/pagination.svg?style=flat-square
 [coveralls-url]: https://coveralls.io/r/react-component/pagination?branch=master
-[gemnasium-image]: http://img.shields.io/gemnasium/react-component/pagination.svg?style=flat-square
-[gemnasium-url]: https://gemnasium.com/react-component/pagination
-[node-image]: https://img.shields.io/badge/node.js-%3E=_0.10-green.svg?style=flat-square
-[node-url]: http://nodejs.org/download/
 [download-image]: https://img.shields.io/npm/dm/rc-pagination.svg?style=flat-square
 [download-url]: https://npmjs.org/package/rc-pagination
 

package.json

@@ -57,14 +57,15 @@
     "rc-select": "6.x",
     "rc-test": "^6.0.1",
     "rc-tools": "6.x",
-    "react": "^16.0.0",
-    "react-dom": "^16.0.0"
+    "react": "^16.5.2",
+    "react-dom": "^16.5.2"
   },
   "pre-commit": [
     "lint"
   ],
   "dependencies": {
     "babel-runtime": "6.x",
-    "prop-types": "^15.5.7"
+    "prop-types": "^15.5.7",
+    "react-lifecycles-compat": "^3.0.4"
   }
 }

src/Pagination.jsx

@@ -4,6 +4,7 @@ import Pager from './Pager';
 import Options from './Options';
 import KEYCODE from './KeyCode';
 import LOCALE from './locale/zh_CN';
+import { polyfill } from 'react-lifecycles-compat';
 
 function noop() {
 }
@@ -18,7 +19,15 @@ function defaultItemRender(page, type, element) {
   return element;
 }
 
-export default class Pagination extends React.Component {
+function calculatePage(p, state, props) {
+  let pageSize = p;
+  if (typeof pageSize === 'undefined') {
+    pageSize = state.pageSize;
+  }
+  return Math.floor((props.total - 1) / pageSize) + 1;
+}
+
+class Pagination extends React.Component {
   static propTypes = {
     prefixCls: PropTypes.string,
     current: PropTypes.number,
@@ -93,28 +102,6 @@ export default class Pagination extends React.Component {
     };
   }
 
-  componentWillReceiveProps(nextProps) {
-    if ('current' in nextProps) {
-      this.setState({
-        current: nextProps.current,
-        currentInputValue: nextProps.current,
-      });
-    }
-
-    if ('pageSize' in nextProps) {
-      const newState = {};
-      let current = this.state.current;
-      const newCurrent = this.calculatePage(nextProps.pageSize);
-      current = current > newCurrent ? newCurrent : current;
-      if (!('current' in nextProps)) {
-        newState.current = current;
-        newState.currentInputValue = current;
-      }
-      newState.pageSize = nextProps.pageSize;
-      this.setState(newState);
-    }
-  }
-
   componentDidUpdate(prevProps, prevState) {
     // When current page change, fix focused style of prev item
     // A hacky solution of https://github.com/ant-design/ant-design/issues/8948
@@ -129,12 +116,40 @@ export default class Pagination extends React.Component {
     }
   }
 
-  getJumpPrevPage() {
+  static getDerivedStateFromProps(props, state) {
+    let newState = {};
+
+    if ('current' in props) {
+      newState = {
+        current: props.current,
+        currentInputValue: props.current,
+      };
+    }
+
+    if ('pageSize' in props) {
+      let current = state.current;
+      const newCurrent = calculatePage(props.pageSize, state, props);
+      current = current > newCurrent ? newCurrent : current;
+
+      if (!('current' in props)) {
+        newState.current = current;
+        newState.currentInputValue = current;
+      }
+      newState.pageSize = props.pageSize;
+    }
+
+    return newState;
+  }
+
+  getJumpPrevPage = () => {
     return Math.max(1, this.state.current - (this.props.showLessItems ? 3 : 5));
   }
 
-  getJumpNextPage() {
-    return Math.min(this.calculatePage(), this.state.current + (this.props.showLessItems ? 3 : 5));
+  getJumpNextPage = () => {
+    return Math.min(
+      calculatePage(undefined, this.state, this.props),
+      this.state.current + (this.props.showLessItems ? 3 : 5)
+    );
   }
 
   /**
@@ -156,14 +171,6 @@ export default class Pagination extends React.Component {
     this.paginationNode = node;
   }
 
-  calculatePage = (p) => {
-    let pageSize = p;
-    if (typeof pageSize === 'undefined') {
-      pageSize = this.state.pageSize;
-    }
-    return Math.floor((this.props.total - 1) / pageSize) + 1;
-  }
-
   isValid = (page) => {
     return isInteger(page) && page >= 1 && page !== this.state.current;
   }
@@ -204,7 +211,7 @@ export default class Pagination extends React.Component {
 
   changePageSize = (size) => {
     let current = this.state.current;
-    const newCurrent = this.calculatePage(size);
+    const newCurrent = calculatePage(size, this.state, this.props);
     current = current > newCurrent ? newCurrent : current;
     // fix the issue:
     // Once 'total' is 0, 'current' in 'onShowSizeChange' is 0, which is not correct.
@@ -231,8 +238,9 @@ export default class Pagination extends React.Component {
   handleChange = (p) => {
     let page = p;
     if (this.isValid(page)) {
-      if (page > this.calculatePage()) {
-        page = this.calculatePage();
+      const currentPage = calculatePage(undefined, this.state, this.props);
+      if (page > currentPage) {
+        page = currentPage;
       }
 
       if (!('current' in this.props)) {
@@ -263,14 +271,6 @@ export default class Pagination extends React.Component {
     }
   }
 
-  getJumpPrevPage() {
-    return Math.max(1, this.state.current - (this.props.showLessItems ? 3 : 5));
-  }
-
-  getJumpNextPage() {
-    return Math.min(this.calculatePage(), this.state.current + (this.props.showLessItems ? 3 : 5));
-  }
-
   jumpPrev = () => {
     this.handleChange(this.getJumpPrevPage());
   }
@@ -284,7 +284,7 @@ export default class Pagination extends React.Component {
   }
 
   hasNext = () => {
-    return this.state.current < this.calculatePage();
+    return this.state.current < calculatePage(undefined, this.state, this.props);
   }
 
   runIfEnter = (event, callback, ...restParams) => {
@@ -325,7 +325,7 @@ export default class Pagination extends React.Component {
     const locale = props.locale;
 
     const prefixCls = props.prefixCls;
-    const allPages = this.calculatePage();
+    const allPages = calculatePage(undefined, this.state, this.props);
     const pagerList = [];
     let jumpPrev = null;
     let jumpNext = null;
@@ -647,3 +647,7 @@ export default class Pagination extends React.Component {
     );
   }
 }
+
+polyfill(Pagination);
+
+export default Pagination;

src/locale/ro_RO.js

@@ -0,0 +1,15 @@
+export default {
+  // Options.jsx
+  items_per_page: '/ pagină',
+  jump_to: 'Mergi la',
+  jump_to_confirm: 'confirm',
+  page: '',
+
+  // Pagination.jsx
+  prev_page: 'Pagina Anterioară',
+  next_page: 'Pagina Următoare',
+  prev_5: '5 Pagini Anterioare',
+  next_5: '5 Pagini Următoare',
+  prev_3: '3 Pagini Anterioare',
+  next_3: '3 Pagini Următoare',
+};