From 505db8d43ed0b545d48f0ef2b752c2877368fcca Mon Sep 17 00:00:00 2001
From: Tanner Linsley <tannerlinsley@gmail.com>
Date: Wed, 18 Jan 2017 09:08:05 -0700
Subject: [PATCH] Fixed a bug present when no column groups are used.

---
 src/index.js          |  2 +-
 stories/ServerSide.js | 44 ++++++++++++++++++++++++++-----------------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/index.js b/src/index.js
index 4ed0015..e06a435 100644
--- a/src/index.js
+++ b/src/index.js
@@ -662,7 +662,7 @@ export default React.createClass({
           columns: column.columns.map(decorateAndAddToAll)
         }
       } else {
-        decorateAndAddToAll(column)
+        return decorateAndAddToAll(column)
       }
     })
 
diff --git a/stories/ServerSide.js b/stories/ServerSide.js
index 7546c15..219df7d 100644
--- a/stories/ServerSide.js
+++ b/stories/ServerSide.js
@@ -69,21 +69,15 @@ const ServerSide = React.createClass({
         <div className='table-wrap'>
           <ReactTable
             columns={[{
-              header: 'Name',
-              columns: [{
-                header: 'First Name',
-                accessor: 'firstName'
-              }, {
-                header: 'Last Name',
-                id: 'lastName',
-                accessor: d => d.lastName
-              }]
+              header: 'First Name',
+              accessor: 'firstName'
             }, {
-              header: 'Info',
-              columns: [{
-                header: 'Age',
-                accessor: 'age'
-              }]
+              header: 'Last Name',
+              id: 'lastName',
+              accessor: d => d.lastName
+            }, {
+              header: 'Age',
+              accessor: 'age'
             }]}
             manual // Forces table not to paginate or sort automatically, so we can handle it server-side
             defaultPageSize={10}
@@ -161,14 +155,30 @@ export default React.createClass({
 
     return (
       <ReactTable
-        columns={columns}
-        manual // This forces table not to paginate or sort automatically, so we can handle things server-side
+        columns={[{
+          header: 'Name',
+          columns: [{
+            header: 'First Name',
+            accessor: 'firstName'
+          }, {
+            header: 'Last Name',
+            id: 'lastName',
+            accessor: d => d.lastName
+          }]
+        }, {
+          header: 'Info',
+          columns: [{
+            header: 'Age',
+            accessor: 'age'
+          }]
+        }]}
+        manual // Forces table not to paginate or sort automatically, so we can handle it server-side
+        defaultPageSize={10}
         data={this.state.data} // Set the rows to be displayed
         pages={this.state.pages} // Display the total number of pages
         loading={this.state.loading} // Display the loading overlay when we need it
         onChange={this.fetchData} // Request new data when things change
       />
-    )
   }
 })
   `