Feature: Changing defaultSorting now updates the sorting model

tannerlinsley · tannerlinsley · commit 9e95b331df42 · 2017-03-01T15:50:36.000-07:00
diff --git a/docs/iframe.html b/docs/iframe.html
@@ -16,7 +16,7 @@
       <body>
         <div id="root"></div>
         <div id="error-display"></div>
-        <script src="static/preview.7549a2f8d9b5e6663c7a.bundle.js"></script>
+        <script src="static/preview.742092f25ec9b6802477.bundle.js"></script>
       </body>
     </html>
   
diff --git a/docs/static/preview.742092f25ec9b6802477.bundle.js b/docs/static/preview.742092f25ec9b6802477.bundle.js
diff --git a/docs/static/preview.742092f25ec9b6802477.bundle.js.map b/docs/static/preview.742092f25ec9b6802477.bundle.js.map
diff --git a/src/lifecycle.js b/src/lifecycle.js
@@ -26,7 +26,7 @@ export default {
   },
 
   componentWillMount () {
-    this.setStateWithData(this.getDataModel())
+    this.setStateWithData(this.getDataModel(this.getResolvedState()))
   },
 
   componentDidMount () {
@@ -37,14 +37,18 @@ export default {
     const oldState = this.getResolvedState()
     const newState = this.getResolvedState(nextProps, nextState)
 
+    if (oldState.defaultSorting !== newState.defaultSorting) {
+      newState.sorting = newState.defaultSorting
+    }
+
     // Props that trigger a data update
     if (
       oldState.data !== newState.data ||
       oldState.columns !== newState.columns ||
       oldState.pivotBy !== newState.pivotBy ||
       oldState.sorting !== newState.sorting
     ) {
-      this.setStateWithData(this.getDataModel(nextProps, nextState))
+      this.setStateWithData(this.getDataModel(newState))
     }
   },
 
diff --git a/src/methods.js b/src/methods.js
@@ -1,7 +1,7 @@
 import _ from './utils'
 
 export default {
-  getDataModel (nextProps, nextState) {
+  getDataModel (newState) {
     const {
       columns,
       pivotBy = [],
@@ -14,7 +14,7 @@ export default {
       page,
       pages,
       pageSize
-    } = this.getResolvedState(nextProps, nextState)
+    } = newState
 
     // Determine Header Groups
     let hasHeaderGroups = false
@@ -219,6 +219,7 @@ export default {
     const newPage = page > newPages ? newPage - 1 : page
 
     return {
+      ...newState,
       resolvedData,
       pivotColumn,
       allVisibleColumns,
diff --git a/stories/ServerSide.js b/stories/ServerSide.js
@@ -48,13 +48,13 @@ const ServerSide = React.createClass({
     }
   },
   fetchData (state, instance) {
-    console.log(state, instance)
     // Whenever the table model changes, or the user sorts or changes pages, this method gets called and passed the current table model.
     // You can set the `loading` prop of the table to true to use the built-in one or show you're own loading bar if you want.
     this.setState({loading: true})
     // Request the data however you want.  Here, we'll use our mocked service we created earlier
     requestData(state.pageSize, state.page, state.sorting)
       .then((res) => {
+        console.log(res.rows)
         // Now just get the rows of data to your React Table (and update anything else like total pages or loading)
         this.setState({
           data: res.rows,
