Merge pull request #194 from eddyson-de/move-rows-per-page-to-pager

move page size default to Pager
eddyson-de · Nov 29, 2016 · e4c9b9d · e4c9b9d
2 parents 227294a + c21d442
commit e4c9b9d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 9 deletions.
diff --git a/lib/Ardagryd.js b/lib/Ardagryd.js
@@ -16,7 +16,7 @@ import GridCell from './GridCell';
 import GridRow from './GridRow';
 
 
-import { DESCENDING, DEFAULT_ITEMS_PER_PAGE } from './constants';
+import { DESCENDING } from './constants';
 
 import { filterConfigFromProp, sortConfigFromProp } from './utils';
 import { columnsConfig as columnsConfigPropType, sortConfig as sortConfigPropType, filterConfig as filterConfigPropType, globalConfig as globalConfigPropType } from './proptypes';
@@ -198,10 +198,9 @@ const buildConfigFromProps = (props) => {
         } else if (type === Pager){
             let { rowsPerPage } = props;
             if (rowsPerPage < 1){
-                rowsPerPage = DEFAULT_ITEMS_PER_PAGE;
-                throw new Error(`Invalid prop value for "rowsPerPage" on "Pager" component: ${rowsPerPage}. Using default: ${DEFAULT_ITEMS_PER_PAGE}.`);
+                throw new Error(`Invalid prop value for "rowsPerPage" on "Pager" component: ${rowsPerPage}.`);
             }
-            result.paging = rowsPerPage ? rowsPerPage : DEFAULT_ITEMS_PER_PAGE;
+            result.paging = rowsPerPage;
             result.pager = child;
         } else if (type === GridCell){
             result.cell = child.props;
@@ -260,9 +259,6 @@ const Ardagryd = (props)=>{
     const usePaging = paging !== undefined && paging !== false && objects.length > paging;
     let pager = null;
     if (usePaging){
-        if (paging < 1){
-            throw new Error(`Invalid value for config.paging: ${paging}`);
-        }
         pagedObjects = objects.slice(skip, skip+paging);
 
         const rest = objects.length % paging;
@@ -316,7 +312,6 @@ const defaultConfig = {
     toolbar: ToolbarDefault,
     showToolbar: true,
     showColumnsWithoutConfig: true, //show all columns which are not explicitly hidden
-    paging: DEFAULT_ITEMS_PER_PAGE,
     sortValueGetter: ({value}) => {
         if (value){
             const valueType = typeof value;

diff --git a/lib/Pager.js b/lib/Pager.js
@@ -2,6 +2,8 @@ import React, { Component, PropTypes } from 'react';
 import Pagination from 'react-bootstrap/lib/Pagination';
 import Glyphicon from 'react-bootstrap/lib/Glyphicon';
 
+import { DEFAULT_ITEMS_PER_PAGE } from './constants';
+
 class Pager extends Component {
     constructor(props){
         super(props);
@@ -43,8 +45,27 @@ if (process.env.NODE_ENV !== 'production'){
     Pager.propTypes = {
         currentPage : PropTypes.number.isRequired,
         numberOfPages : PropTypes.number.isRequired,
-        onChange : PropTypes.func.isRequired
+        onChange : PropTypes.func.isRequired,
+        rowsPerPage : (props, propName, componentName) => {
+            const raw = props[propName];
+            if (raw === undefined){
+                return new Error(
+                  'Required prop `' + propName + '` was not specified in `' + componentName + '`.'
+                );
+            }
+            const value = Number(raw);
+            if (Number.isNaN(value) || value < 1) {
+                return new Error(
+                  'Invalid prop `' + propName + '`=`'+raw+'` supplied to' +
+                  ' `' + componentName + '`. Only positive numbers (>0) are accepted'
+                );
+            }
+        }
     };
 }
 
+Pager.defaultProps = {
+    rowsPerPage : DEFAULT_ITEMS_PER_PAGE
+};
+
 export default Pager;