rename pageNumber to pageIndex

itsolutions-dev · Jun 5, 2017 · 6d0c59e · 6d0c59e
1 parent a9cac37
commit 6d0c59e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/src/Table/Table.js b/src/Table/Table.js
@@ -5,7 +5,7 @@ import { toArray, flatten, cloneWithProps /* , toLowerCase */ } from '../utils';
 
 type TableProps = {
   component: string | Function,
-  pageNumber: number,
+  pageIndex: number,
   pageSize: number,
   pagination: Function,
   onPageChange: Function,
@@ -31,7 +31,7 @@ export default class Table extends React.Component {
   onPageChange = (...params: any) => {
     this.setState({
       ...this.state,
-      pageNumber: params[0],
+      pageIndex: params[0],
     });
   };
 
@@ -81,8 +81,8 @@ export default class Table extends React.Component {
     */
   };
 
-  getPageNumber = () =>
-    [this.props.pageNumber, this.state.pageNumber, 0].reduce(
+  getpageIndex = () =>
+    [this.props.pageIndex, this.state.pageIndex, 0].reduce(
       (acc, cur) => (typeof acc === 'number' ? acc : cur),
     );
 
@@ -91,7 +91,7 @@ export default class Table extends React.Component {
       dataset,
       component,
       onPageChange,
-      pageNumber,
+      pageIndex,
       pageSize,
       pagination,
       children,
@@ -110,8 +110,8 @@ export default class Table extends React.Component {
       childrenArray = [children];
     }
     let filteredDataset = dataset;
-    if (pagination !== undefined || pageNumber !== undefined) {
-      const currentPointer = this.getPageNumber() * pageSize;
+    if (pagination !== undefined || pageIndex !== undefined) {
+      const currentPointer = this.getpageIndex() * pageSize;
       filteredDataset = filteredDataset.slice(
         currentPointer,
         currentPointer + pageSize,
@@ -205,7 +205,7 @@ export default class Table extends React.Component {
     const {
       component,
       onPageChange,
-      pageNumber,
+      pageIndex,
       pageSize,
       pagination,
       search,
@@ -219,6 +219,7 @@ export default class Table extends React.Component {
     const Component = component;
     const Pagination = pagination;
     const SearchComponent = searchComponent;
+    const actualPageIndex = this.getpageIndex();
     return (
       <span>
         {SearchComponent &&
@@ -233,7 +234,8 @@ export default class Table extends React.Component {
           <Pagination
             items={dataset.length}
             pageSize={pageSize}
-            pageNumber={this.getPageNumber()}
+            pageIndex={actualPageIndex}
+            pageNumber={actualPageIndex + 1}
             onPageChange={onPageChange || this.onPageChange}
           />}
       </span>

diff --git a/test/table.spec.js b/test/table.spec.js
@@ -403,28 +403,28 @@ describe('table', () => {
       expectComponentToMatch(
         <Table
           dataset={dataset}
-          pageNumber={0}
+          pageIndex={0}
           pageSize={20}
           pagination={props => <div {...props} />}
         />,
         <span>
           <table />
-          <div items={2} pageNumber={0} pageSize={20} />
+          <div items={2} pageIndex={0} pageNumber={1} pageSize={20} />
         </span>,
       );
 
       expectComponentToMatch(
         <Table dataset={dataset} pagination={props => <div {...props} />} />,
         <span>
           <table />
-          <div items={2} pageNumber={0} pageSize={10} />
+          <div items={2} pageIndex={0} pageNumber={1} pageSize={10} />
         </span>,
       );
     });
 
     it('should render the correct page', () => {
       expectComponentToMatch(
-        <Table dataset={[...Array(10).keys()]} pageNumber={2} pageSize={3}>
+        <Table dataset={[...Array(10).keys()]} pageIndex={2} pageSize={3}>
           <tbody tablifyBody>
             <tr tablifyRow>
               <Td />
@@ -449,7 +449,7 @@ describe('table', () => {
       );
 
       expectComponentToMatch(
-        <Table dataset={[...Array(7).keys()]} pageNumber={2} pageSize={3}>
+        <Table dataset={[...Array(7).keys()]} pageIndex={2} pageSize={3}>
           <tbody tablifyBody>
             <tr tablifyRow>
               <Td />
@@ -499,13 +499,13 @@ describe('table', () => {
         rendered,
         Table,
       );
-      expect(table.state.pageNumber).toEqual(undefined);
+      expect(table.state.pageIndex).toEqual(undefined);
       const button = ReactTestUtils.findRenderedDOMComponentWithTag(
         rendered,
         'button',
       );
       ReactTestUtils.Simulate.click(button);
-      expect(table.state.pageNumber).toEqual(42);
+      expect(table.state.pageIndex).toEqual(42);
     });
   });