5.1.1

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-table",
-  "version": "6.0.0",
+  "version": "5.1.1",
   "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/tannerlinsley/react-table#readme",

src/componentMethods.js

@@ -12,6 +12,7 @@ export default {
       expanderColumnWidth,
       SubComponent,
       page,
+      pages,
       pageSize
     } = this.getResolvedState(nextProps, nextState)
 
@@ -214,7 +215,8 @@ export default {
       resolvedData = groupRecursively(resolvedData, pivotBy)
     }
 
-    const newPages = Math.ceil(resolvedData.length / pageSize)
+    const newPages = _.getFirstDefined(pages, Math.ceil(resolvedData.length / pageSize))
+    const newPage = page > newPages ? newPage - 1 : page
 
     return {
       resolvedData,
@@ -223,7 +225,7 @@ export default {
       headerGroups,
       allDecoratedColumns,
       hasHeaderGroups,
-      page: (page + 1) > newPages ? newPages - 1 : page
+      page: Math.max(newPage, 0)
     }
   },
   getSortedData (resolvedState) {

src/index.js

@@ -746,12 +746,16 @@ export default React.createClass({
                   {...tdProps.rest}
                 >
                   {typeof Cell === 'function' ? (
-                    <Cell
-                      {...rowInfo}
-                      value={rowInfo.rowValues[column.id]}
-                    />
-                  ) : typeof Cell !== 'undefined' ? Cell
-                  : rowInfo.rowValues[column.id]}
+                    Cell.prototype.isReactComponent ? (
+                      <Cell
+                        {...rowInfo}
+                        value={rowInfo.rowValues[column.id]}
+                      />
+                    ) : Cell({
+                      ...rowInfo,
+                      value: rowInfo.rowValues[column.id]
+                    })
+                  ) : rowInfo.rowValues[column.id]}
                 </TdComponent>
               )
             })}