Merge pull request #2 from lionix-team/v2.0.1

small fixings
lionix-team · Aug 5, 2019 · 09df350 · 09df350
2 parents 1677fe1 + 7a0db42
commit 09df350
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "react-laravel-paginex",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "Laravel Pagination with ReactJS (customizable)",
   "main": "dist/index.js",
   "scripts": {

diff --git a/src/Pagination.jsx b/src/Pagination.jsx
@@ -56,8 +56,8 @@ class Pagination extends Component {
         let pagination = (<div></div>);
         if (Object.keys(paginationData).length) {
             let options = this.state.options;
-            let current = paginationData.current_page ? paginationData.current_page : paginationData.meta.current_page,
-                last = paginationData.last_page ? paginationData.last_page : paginationData.meta.last_page,
+            let current = paginationData.hasOwnProperty('current_page') ? paginationData.current_page : paginationData.meta.current_page,
+                last = paginationData.hasOwnProperty('last_page') ? paginationData.last_page : paginationData.meta.last_page,
                 delta = parseInt(options.numbersCountForShow),
                 left = current - delta,
                 right = current + delta + 1,
@@ -81,8 +81,8 @@ class Pagination extends Component {
                 l = i;
             }
 
-            let nextPageUrl = paginationData.next_page_url ? paginationData.next_page_url : paginationData.meta.next_page_url;
-            let prevPageUrl = paginationData.prev_page_url ? paginationData.prev_page_url : paginationData.meta.prev_page_url;
+            let nextPageUrl = paginationData.hasOwnProperty('next_page_url') ? paginationData.next_page_url : paginationData.links.next;
+            let prevPageUrl = paginationData.hasOwnProperty('prev_page_url') ? paginationData.prev_page_url : paginationData.links.prev;
             pagination = (
                 <ul className={options.containerClass}>
                     {prevPageUrl ?