fix(react-grid): fix incorrect initial options handling (#797)

DevExpress · Mar 2, 2018 · 1220664 · 1220664
1 parent b409c11
commit 1220664
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/packages/dx-react-grid/src/plugins/paging-state.jsx b/packages/dx-react-grid/src/plugins/paging-state.jsx
@@ -10,7 +10,7 @@ export class PagingState extends React.PureComponent {
 
     this.state = {
       currentPage: props.currentPage || props.defaultCurrentPage,
-      pageSize: props.pageSize || props.defaultPageSize,
+      pageSize: props.pageSize !== undefined ? props.pageSize : props.defaultPageSize,
     };
 
     const stateHelper = createStateHelper(

diff --git a/packages/dx-react-grid/src/plugins/paging-state.test.jsx b/packages/dx-react-grid/src/plugins/paging-state.test.jsx
@@ -24,9 +24,9 @@ describe('PagingState', () => {
     propertyName: 'currentPage',
     defaultDeps,
     values: [
+      0,
       1,
       2,
-      3,
     ],
     actions: [{
       actionName: 'setCurrentPage',
@@ -39,9 +39,9 @@ describe('PagingState', () => {
     propertyName: 'pageSize',
     defaultDeps,
     values: [
+      0,
       1,
       2,
-      3,
     ],
     actions: [{
       actionName: 'setPageSize',