From 8792bd95a0a2c6ecf24ef717e09cdcd7d7667a9e Mon Sep 17 00:00:00 2001
From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Wed, 2 Aug 2017 08:59:48 -0600
Subject: [PATCH] Move onFetchData for better timing and reliability

Fixes #294
---
 src/lifecycle.js | 12 +++++++++++-
 src/methods.js   |  4 ----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/lifecycle.js b/src/lifecycle.js
index ebae901..22a00cf 100644
--- a/src/lifecycle.js
+++ b/src/lifecycle.js
@@ -114,6 +114,16 @@ export default Base =>
         )
       }
 
-      return this.setState(newResolvedState, cb)
+      return this.setState(newResolvedState, () => {
+        cb && cb()
+        if (
+          oldState.page !== newResolvedState.page ||
+          oldState.pageSize !== newResolvedState.pageSize ||
+          oldState.sorted !== newResolvedState.sorted ||
+          oldState.filtered !== newResolvedState.filtered
+        ) {
+          this.fireFetchData()
+        }
+      })
     }
   }
diff --git a/src/methods.js b/src/methods.js
index d700038..f457428 100644
--- a/src/methods.js
+++ b/src/methods.js
@@ -454,7 +454,6 @@ export default Base =>
       }
       this.setStateWithData(newState, () => {
         onPageChange && onPageChange(page)
-        this.fireFetchData()
       })
     }
 
@@ -473,7 +472,6 @@ export default Base =>
         },
         () => {
           onPageSizeChange && onPageSizeChange(newPageSize, newPage)
-          this.fireFetchData()
         }
       )
     }
@@ -586,7 +584,6 @@ export default Base =>
         },
         () => {
           onSortedChange && onSortedChange(newSorted, column, additive)
-          this.fireFetchData()
         }
       )
     }
@@ -615,7 +612,6 @@ export default Base =>
         },
         () => {
           onFilteredChange && onFilteredChange(newFiltering, column, value)
-          this.fireFetchData()
         }
       )
     }