Move onFetchData for better timing and reliability

tannerlinsley · tannerlinsley · commit 8792bd95a0a2 · 2017-08-02T08:59:54.000-06:00
Fixes TanStack#294
diff --git 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
@@ -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()
         }
       )
     }

Original file line number	Diff line number	Diff line change
`@@ -114,6 +114,16 @@ export default Base =>`
`114`	`114`	`)`
`115`	`115`	`}`
`116`	`116`
`117`		`- return this.setState(newResolvedState, cb)`
	`117`	`+ return this.setState(newResolvedState, () => {`
	`118`	`+ cb && cb()`
	`119`	`+ if (`
	`120`	`+ oldState.page !== newResolvedState.page \|\|`
	`121`	`+ oldState.pageSize !== newResolvedState.pageSize \|\|`
	`122`	`+ oldState.sorted !== newResolvedState.sorted \|\|`
	`123`	`+ oldState.filtered !== newResolvedState.filtered`
	`124`	`+ ) {`
	`125`	`+ this.fireFetchData()`
	`126`	`+ }`
	`127`	`+ })`
`118`	`128`	`}`
`119`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -454,7 +454,6 @@ export default Base =>`
`454`	`454`	`}`
`455`	`455`	`this.setStateWithData(newState, () => {`
`456`	`456`	`onPageChange && onPageChange(page)`
`457`		`- this.fireFetchData()`
`458`	`457`	`})`
`459`	`458`	`}`
`460`	`459`
`@@ -473,7 +472,6 @@ export default Base =>`
`473`	`472`	`},`
`474`	`473`	`() => {`
`475`	`474`	`onPageSizeChange && onPageSizeChange(newPageSize, newPage)`
`476`		`- this.fireFetchData()`
`477`	`475`	`}`
`478`	`476`	`)`
`479`	`477`	`}`
`@@ -586,7 +584,6 @@ export default Base =>`
`586`	`584`	`},`
`587`	`585`	`() => {`
`588`	`586`	`onSortedChange && onSortedChange(newSorted, column, additive)`
`589`		`- this.fireFetchData()`
`590`	`587`	`}`
`591`	`588`	`)`
`592`	`589`	`}`
`@@ -615,7 +612,6 @@ export default Base =>`
`615`	`612`	`},`
`616`	`613`	`() => {`
`617`	`614`	`onFilteredChange && onFilteredChange(newFiltering, column, value)`
`618`		`- this.fireFetchData()`
`619`	`615`	`}`
`620`	`616`	`)`
`621`	`617`	`}`