6.7.4

Fixes #582

package.json

@@ -1,21 +1,30 @@
 {
   "name": "react-table",
-  "version": "6.7.0",
-  "description":
-    "A fast, lightweight, opinionated table and datagrid built on React",
+  "version": "6.7.4",
+  "description": "A fast, lightweight, opinionated table and datagrid built on React",
   "license": "MIT",
   "homepage": "https://github.com/react-tools/react-table#readme",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/react-tools/react-table.git"
   },
-  "keywords": ["react", "table", "react-table", "datagrid"],
+  "keywords": [
+    "react",
+    "table",
+    "react-table",
+    "datagrid"
+  ],
   "main": "lib/index.js",
-  "files": ["src/", "lib/", "react-table.js", "react-table.css", "media/*.png"],
+  "files": [
+    "src/",
+    "lib/",
+    "react-table.js",
+    "react-table.css",
+    "media/*.png"
+  ],
   "scripts": {
     "build:node": "babel src --out-dir lib --source-maps inline",
-    "build:css":
-      "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
+    "build:css": "rimraf react-table.css && stylus src/index.styl --compress -o react-table.css && yarn run css:autoprefix",
     "css:autoprefix": "postcss --use autoprefixer react-table.css -r",
     "watch": "npm-run-all --parallel watch:*",
     "watch:node": "onchange 'src/**/*.js' -i -- npm run build:node",
@@ -62,6 +71,10 @@
     "webpack": "^2.5.1"
   },
   "babel": {
-    "presets": ["es2015", "stage-2", "react"]
+    "presets": [
+      "es2015",
+      "stage-2",
+      "react"
+    ]
   }
 }

src/propTypes.js

@@ -1,4 +1,4 @@
-import PropTypes from 'prop-types'
+import PropTypes from "prop-types";
 
 export default {
   // General
@@ -55,140 +55,139 @@ export default {
   style: PropTypes.object,
 
   // Component decorators
-  getProps: PropTypes.object,
-  getTableProps: PropTypes.object,
-  getTheadGroupProps: PropTypes.object,
-  getTheadGroupTrProps: PropTypes.object,
-  getTheadGroupThProps: PropTypes.object,
-  getTheadProps: PropTypes.object,
-  getTheadTrProps: PropTypes.object,
-  getTheadThProps: PropTypes.object,
-  getTheadFilterProps: PropTypes.object,
-  getTheadFilterTrProps: PropTypes.object,
-  getTheadFilterThProps: PropTypes.object,
-  getTbodyProps: PropTypes.object,
-  getTrGroupProps: PropTypes.object,
-  getTrProps: PropTypes.object,
-  getTdProps: PropTypes.object,
-  getTfootProps: PropTypes.object,
-  getTfootTrProps: PropTypes.object,
-  getTfootTdProps: PropTypes.object,
-  getPaginationProps: PropTypes.object,
-  getLoadingProps: PropTypes.object,
-  getNoDataProps: PropTypes.object,
-  getResizerProps: PropTypes.object,
+  getProps: PropTypes.func,
+  getTableProps: PropTypes.func,
+  getTheadGroupProps: PropTypes.func,
+  getTheadGroupTrProps: PropTypes.func,
+  getTheadGroupThProps: PropTypes.func,
+  getTheadProps: PropTypes.func,
+  getTheadTrProps: PropTypes.func,
+  getTheadThProps: PropTypes.func,
+  getTheadFilterProps: PropTypes.func,
+  getTheadFilterTrProps: PropTypes.func,
+  getTheadFilterThProps: PropTypes.func,
+  getTbodyProps: PropTypes.func,
+  getTrGroupProps: PropTypes.func,
+  getTrProps: PropTypes.func,
+  getTdProps: PropTypes.func,
+  getTfootProps: PropTypes.func,
+  getTfootTrProps: PropTypes.func,
+  getTfootTdProps: PropTypes.func,
+  getPaginationProps: PropTypes.func,
+  getLoadingProps: PropTypes.func,
+  getNoDataProps: PropTypes.func,
+  getResizerProps: PropTypes.func,
 
   // Global Column Defaults
-  columns: PropTypes.shape({
-    // Renderers
-    Cell: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Header: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Footer: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Aggregated: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Pivot: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    PivotValue: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Expander: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.string,
-      PropTypes.func,
-    ]),
-    Filter: PropTypes.oneOfType([
-      PropTypes.element,
-      PropTypes.func,
-    ]),
+  columns: PropTypes.arrayOf(
+    PropTypes.shape({
+      // Renderers
+      Cell: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Header: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Footer: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Aggregated: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Pivot: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      PivotValue: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Expander: PropTypes.oneOfType([
+        PropTypes.element,
+        PropTypes.string,
+        PropTypes.func
+      ]),
+      Filter: PropTypes.oneOfType([PropTypes.element, PropTypes.func]),
 
-    // All Columns
-    sortable: PropTypes.bool, // use table default
-    resizable: PropTypes.bool, // use table default
-    filterable: PropTypes.bool, // use table default
-    show: PropTypes.bool,
-    minWidth: PropTypes.number,
+      // All Columns
+      sortable: PropTypes.bool, // use table default
+      resizable: PropTypes.bool, // use table default
+      filterable: PropTypes.bool, // use table default
+      show: PropTypes.bool,
+      minWidth: PropTypes.number,
 
-    // Cells only
-    className: PropTypes.string,
-    style: PropTypes.object,
-    getProps: PropTypes.object,
+      // Cells only
+      className: PropTypes.string,
+      style: PropTypes.object,
+      getProps: PropTypes.func,
 
-    // Pivot only
-    aggregate: PropTypes.func,
+      // Pivot only
+      aggregate: PropTypes.func,
 
-    // Headers only
-    headerClassName: PropTypes.string,
-    headerStyle: PropTypes.object,
-    getHeaderProps: PropTypes.object,
+      // Headers only
+      headerClassName: PropTypes.string,
+      headerStyle: PropTypes.object,
+      getHeaderProps: PropTypes.func,
 
-    // Footers only
-    footerClassName: PropTypes.string,
-    footerStyle: PropTypes.object,
-    getFooterProps: PropTypes.object,
-    filterMethod: PropTypes.func,
-    filterAll: PropTypes.bool,
-    sortMethod: PropTypes.func,
-  }),
+      // Footers only
+      footerClassName: PropTypes.string,
+      footerStyle: PropTypes.object,
+      getFooterProps: PropTypes.object,
+      filterMethod: PropTypes.func,
+      filterAll: PropTypes.bool,
+      sortMethod: PropTypes.func
+    })
+  ),
 
   // Global Expander Column Defaults
   expanderDefaults: PropTypes.shape({
     sortable: PropTypes.bool,
     resizable: PropTypes.bool,
     filterable: PropTypes.bool,
-    width: PropTypes.number,
+    width: PropTypes.number
   }),
 
   pivotDefaults: PropTypes.object,
 
   // Text
-  previousText: PropTypes.string,
-  nextText: PropTypes.string,
-  loadingText: PropTypes.string,
-  noDataText: PropTypes.string,
-  pageText: PropTypes.string,
-  ofText: PropTypes.string,
-  rowsText: PropTypes.string,
+  previousText: PropTypes.node,
+  nextText: PropTypes.node,
+  loadingText: PropTypes.node,
+  noDataText: PropTypes.node,
+  pageText: PropTypes.node,
+  ofText: PropTypes.node,
+  rowsText: PropTypes.node,
 
   // Components
-  TableComponent: PropTypes.element,
-  TheadComponent: PropTypes.element,
-  TbodyComponent: PropTypes.element,
-  TrGroupComponent: PropTypes.element,
-  TrComponent: PropTypes.element,
-  ThComponent: PropTypes.element,
-  TdComponent: PropTypes.element,
-  TfootComponent: PropTypes.element,
-  FilterComponent: PropTypes.element,
-  ExpanderComponent: PropTypes.element,
-  PivotValueComponent: PropTypes.element,
-  AggregatedComponent: PropTypes.element,
-  PivotComponent: PropTypes.element, // this is a computed default generated using
+  TableComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TheadComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TbodyComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TrGroupComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TrComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  ThComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TdComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  TfootComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  FilterComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  ExpanderComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  PivotValueComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  AggregatedComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  PivotComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]), // this is a computed default generated using
   // the ExpanderComponent and PivotValueComponent at run-time in methods.js
-  PaginationComponent: PropTypes.element,
-  PreviousComponent: PropTypes.element,
-  NextComponent: PropTypes.element,
-  LoadingComponent: PropTypes.element,
-  NoDataComponent: PropTypes.element,
-  ResizerComponent: PropTypes.element,
-  PadRowComponent: PropTypes.element,
-}
+  PaginationComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  PreviousComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  NextComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  LoadingComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  NoDataComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  ResizerComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element]),
+  PadRowComponent: PropTypes.oneOfType([PropTypes.func, PropTypes.element])
+};