Fix current change when pageSize Change

Author: afc163

examples/sizer.js

@@ -11,6 +11,7 @@ const Hello = React.createClass({
     return {pageSize: 20};
   },
   onShowSizeChange(current, pageSize) {
+    console.log(current);
     this.setState({
       pageSize: pageSize,
     });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "rc-pagination",
-  "version": "1.5.1",
+  "version": "1.5.2",
   "description": "pagination ui component for react",
   "keywords": [
     "react",

src/Pagination.jsx

@@ -53,13 +53,21 @@ class Pagination extends React.Component {
     if ('current' in nextProps) {
       this.setState({
         current: nextProps.current,
+        _current: nextProps.current,
       });
     }
 
     if ('pageSize' in nextProps) {
-      this.setState({
-        pageSize: nextProps.pageSize,
-      });
+      const newState = {};
+      let current = this.state.current;
+      const newCurrent = this._calcPage(nextProps.pageSize);
+      current = current > newCurrent ? newCurrent : current;
+      if (!('current' in nextProps)) {
+        newState.current = current;
+        newState._current = current;
+      }
+      newState.pageSize = nextProps.pageSize;
+      this.setState(newState);
     }
   }
 
@@ -110,20 +118,19 @@ class Pagination extends React.Component {
 
   _changePageSize(size) {
     let current = this.state.current;
-
+    const newCurrent = this._calcPage(size);
+    current = current > newCurrent ? newCurrent : current;
     if (typeof size === 'number') {
       if (!('pageSize' in this.props)) {
         this.setState({
           pageSize: size,
         });
-
-        if (this.state.current > this._calcPage(size)) {
-          current = this._calcPage(size);
-          this.setState({
-            current: current,
-            _current: current,
-          });
-        }
+      }
+      if (!('current' in this.props)) {
+        this.setState({
+          current: current,
+          _current: current,
+        });
       }
     }
     this.props.onShowSizeChange(current, size);