Merge branch 'master' into snyk-fix-57c948c723a91e9b62d6da7d2facad2d

Author: ashvin27

example/dist/0.9089abcc883df2250569.hot-update.js

@@ -1,10 +1,16 @@
 import React, { Component, Fragment } from 'react';
-import ReactDatatable from '../../lib/index.js';
-// import ReactDatatable from '../../src/index.js';
+// import ReactDatatable from '../../lib/index.js';
+import ReactDatatable from '../../src/index.js';
+import users from '../data/data.json';
 
 class UserList extends Component {
     constructor(props) {
         super(props);
+        this.state = {
+            loading: true,
+            users: []
+        };
+
         this.deleteUser = this.deleteUser.bind(this);
         this.columns = [
             {
@@ -93,7 +99,7 @@ class UserList extends Component {
                     last: "Last"
                 }
             },
-            pagination: "advance",
+            pagination: "basic", //advance
             show_length_menu: true,
             show_filter: true,
             show_pagination: true,
@@ -131,6 +137,15 @@ class UserList extends Component {
         ]
     }
 
+    componentDidMount () {
+        setTimeout(() => {
+            this.setState({
+                loading: false,
+                users: users
+            })
+        }, 5000);
+    }
+
     editUser(user) {
         console.log("Edit User", user);
     }
@@ -148,10 +163,11 @@ class UserList extends Component {
             <div>
                 <ReactDatatable
                     config={this.config}
-                    records={this.props.users}
+                    records={this.state.users}
                     columns={this.columns}
                     onPageChange={this.pageChange.bind(this)}
                     extraButtons={this.extraButtons}
+                    loading={this.state.loading}
                 />
             </div>
         )

example/dist/9089abcc883df2250569.hot-update.json

@@ -1,23 +1,18 @@
 import React, { Component } from 'react';
 import UserList from './UserList.js';
-import users from '../data/data.json'
 
 class Users extends Component {
     constructor(props) {
         super(props);
         this.state = {
-            users: users
+            users: []
         };
     }
-
-    componentDidMount() {
-    }
 
     render() {
         return (
             <div className="container">
-                {/* <h2>Restaurants:</h2> */}
-                <UserList users={this.state.users}/>
+                <UserList />
             </div>
         )
     }

example/dist/index.js

@@ -21,4 +21,10 @@ th.sortable {
 }
 .asrt-pagination {
     margin: 0;
+}
+.asrt-td-loading {
+    background-color: #fff;
+}
+.asrt-loading-textwrap{
+    padding: 5px 0px;
 }