Merge pull request #986 from robertup/dev-971

#971 Page Up and Page Down load all data even if there is only one page
metasfresh · Jul 6, 2017 · af0b17f · af0b17f
2 parents 6a82e3c + ac4089e
commit af0b17f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/src/components/shortcuts/PaginationContextShortcuts.js b/src/components/shortcuts/PaginationContextShortcuts.js
@@ -8,7 +8,7 @@ class PaginationContextShortcuts extends Component {
 
     handleShortcuts = (action, event) => {
         const {
-            handleFirstPage, handleLastPage, handlePrevPage, handleNextPage
+            handleFirstPage, handleLastPage, handlePrevPage, handleNextPage, pages
         } = this.props;
 
         switch (action) {
@@ -20,10 +20,14 @@ class PaginationContextShortcuts extends Component {
                 return handleLastPage();
             case 'NEXT_PAGE':
                 event.preventDefault();
-                return handleNextPage();
+                if (pages > 1)
+                    return handleNextPage();
+                return;
             case 'PREV_PAGE':
                 event.preventDefault();
-                return handlePrevPage();
+                if (pages > 1)
+                    return handlePrevPage();
+                return;
         }
     }
 

diff --git a/src/components/table/TablePagination.js b/src/components/table/TablePagination.js
@@ -317,6 +317,7 @@ class TablePagination extends Component {
                         }
                         handleNextPage={() => handleChangePage('up')}
                         handlePrevPage={() => handleChangePage('down')}
+                        pages={pages}
                     />
                 }
             </div>