diff --git a/.gitignore b/.gitignore
index 72c9f4f..f100702 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,3 +9,4 @@ react-table.css
 .idea
 .DS_Store
 .history
+.vscode
\ No newline at end of file
diff --git a/src/lifecycle.js b/src/lifecycle.js
index 2e1a923..8623cf6 100644
--- a/src/lifecycle.js
+++ b/src/lifecycle.js
@@ -1,9 +1,7 @@
 export default Base =>
   class extends Base {
-    constructor (props) {
-      super(props)
-
-      this.state = this.calculateNewResolvedState(this.getDataModel(this.getResolvedState(), true))
+    UNSAFE_componentWillMount () {
+      this.setStateWithData(this.getDataModel(this.getResolvedState(), true))
     }
 
     componentDidMount () {