Merge pull request #224 from eddyson-de/remove-config-paging

ignore config.paging (fixes #219)
eddyson-de · Jan 13, 2017 · c2f7dae · c2f7dae
2 parents 07b4098 + 3c4010f
commit c2f7dae
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/lib/Ardagryd.js b/lib/Ardagryd.js
@@ -216,8 +216,12 @@ const buildConfigFromProps = (props) => {
 };
 
 const Ardagryd = (props)=>{
+    // TODO: eventually, we want to ignore props.config altogether
+    const copyOfPropsConfig = Object.assign({}, props.config);
+    delete copyOfPropsConfig.paging;
+
     //Merge custom and default config
-    const config = Object.assign({}, defaultConfig, props.config, buildConfigFromProps(props));
+    const config = Object.assign({}, defaultConfig, copyOfPropsConfig, buildConfigFromProps(props));
 
     //Get components from config
     const Grid = config.grid;

diff --git a/lib/proptypes.js b/lib/proptypes.js
@@ -1,5 +1,6 @@
 import { PropTypes } from 'react';
 import { ASCENDING, DESCENDING } from './constants';
+import deprecated from 'react-prop-types/lib/deprecated';
 
 const filterConfigSingle = PropTypes.shape({
     columnName: PropTypes.string.isRequired,
@@ -61,7 +62,7 @@ const globalConfig = PropTypes.shape({
     toolbar: PropTypes.func,
     showToolbar: PropTypes.bool,
     showColumnsWithoutConfig: PropTypes.bool,
-    paging: PropTypes.oneOfType([PropTypes.number, PropTypes.oneOf([false])]),
+    paging: deprecated(PropTypes.oneOfType([PropTypes.number, PropTypes.oneOf([false])]), 'use <Pager rowsPerPage=... /> instead'),
     sortValueGetter: PropTypes.func,
     filterFunction: PropTypes.func
 });