From 4202e89c0f65027b61d013b46130aee1a3b24b7b Mon Sep 17 00:00:00 2001
From: mertsincan <sincan.mert@gmail.com>
Date: Mon, 9 Sep 2019 14:25:19 +0300
Subject: [PATCH] Fixed #1003 - DataTable has null state under certain
 conditions

---
 src/components/datatable/DataTable.js | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/components/datatable/DataTable.js b/src/components/datatable/DataTable.js
index fead4dd6d3..68be571ce2 100644
--- a/src/components/datatable/DataTable.js
+++ b/src/components/datatable/DataTable.js
@@ -192,29 +192,25 @@ export class DataTable extends Component {
 
     constructor(props) {
         super(props);
-        let state = {};
+        this.state = {};
 
         if (!this.props.onPage) {
-            state.first = props.first;
-            state.rows = props.rows;
+            this.state.first = props.first;
+            this.state.rows = props.rows;
         }
 
         if (!this.props.onSort) {
-            state.sortField = props.sortField;
-            state.sortOrder = props.sortOrder;
-            state.multiSortMeta = props.multiSortMeta;
+            this.state.sortField = props.sortField;
+            this.state.sortOrder = props.sortOrder;
+            this.state.multiSortMeta = props.multiSortMeta;
         }
 
         if (!this.props.onFilter) {
-            state.filters = props.filters;
+            this.state.filters = props.filters;
         }
 
         if (this.isStateful()) {
-            this.restoreState(state);
-        }
-
-        if (Object.keys(state).length) {
-            this.state = state;
+            this.restoreState(this.state);
         }
 
         this.onPageChange = this.onPageChange.bind(this);
@@ -1200,6 +1196,7 @@ export class DataTable extends Component {
         let columns = React.Children.toArray(this.props.children);
 
         if(columns && columns.length) {
+            debugger;
             if(this.props.reorderableColumns && this.state.columnOrder) {
                 let orderedColumns = [];
                 for(let columnKey of this.state.columnOrder) {