Feature: Changing defaultSorting now updates the sorting model

src/lifecycle.js

@@ -26,7 +26,7 @@ export default {
   },
 
   componentWillMount () {
-    this.setStateWithData(this.getDataModel())
+    this.setStateWithData(this.getDataModel(this.getResolvedState()))
   },
 
   componentDidMount () {
@@ -37,6 +37,10 @@ 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 ||
@@ -44,7 +48,7 @@ export default {
       oldState.pivotBy !== newState.pivotBy ||
       oldState.sorting !== newState.sorting
     ) {
-      this.setStateWithData(this.getDataModel(nextProps, nextState))
+      this.setStateWithData(this.getDataModel(newState))
     }
   },
 

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,